Added translation for "recommended" string

1 files changed, 4999 insertions, 4304 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index 8d147552d..f20b3562a 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -1,18 +1,20 @@
 # translation of DrakX-cy.po to Cymraeg
 # Copyright (C) 2003 Free Software Foundation, Inc.
-# Rhoslyn Prys <rhoslyn.prys@ntlworld.com>
-# Rhoslyn Prys <rhoslyn.prys@ntlworld.com>, 2003
+# Rhoslyn Prys <rhoslyn.prys@ntlworld.com>, 2003,2004,2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX-cy\n"
-"POT-Creation-Date: 2004-10-07 21:57+0200\n"
-"PO-Revision-Date: 2004-09-15 19:06+0200\n"
+"Project-Id-Version: Mandrake DrakX.cy\n"
+"POT-Creation-Date: 2005-02-24 14:10+0100\n"
+"PO-Revision-Date: 2005-02-25 17:35-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
-"Language-Team: Cymraeg <rhoslyn.prys@meddal.org.uk>\n"
+"Language-Team: Cymraeg <post@meddal.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Welsh\n"
+"X-Poedit-Country: UNITED KINGDOM\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../move/move.pm:292
 #, c-format
@@ -36,7 +38,7 @@ msgstr ""
 
 #: ../move/move.pm:448 ../move/move.pm:460
 #, c-format
-msgid "Key isn't writable"
+msgid "Key is not writable"
 msgstr "Nid yw'r allwedd yn ysgrifennadwy"
 
 #: ../move/move.pm:450
@@ -61,7 +63,7 @@ msgstr "Parhau heb allwedd USB"
 #: ../move/move.pm:462
 #, c-format
 msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
+"The USB key seems to have write protection enabled, but we can not safely\n"
 "unplug it now.\n"
 "\n"
 "\n"
@@ -75,7 +77,7 @@ msgstr ""
 "Cliciwch y botwm i ailgychwyn y peiriant, tynnwch yr allwedd, diffodd y\n"
 "diogelu, ailosod y plwg a chychwyn Mandrake Move eto."
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1317
 #, c-format
 msgid "Reboot"
 msgstr "Ailgychwyn"
@@ -83,7 +85,7 @@ msgstr "Ailgychwyn"
 #: ../move/move.pm:473
 #, c-format
 msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"Your USB key does not have any valid Windows (FAT) partitions.\n"
 "We need one to continue (beside, it's more standard so that you\n"
 "will be able to move and access your files from machines\n"
 "running Windows). Please plug in an USB key containing a\n"
@@ -108,7 +110,7 @@ msgstr ""
 #: ../move/move.pm:483
 #, c-format
 msgid ""
-"We didn't detect any USB key on your system. If you\n"
+"We did not detect any USB key on your system. If you\n"
 "plug in an USB key now, Mandrake Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
@@ -170,58 +172,61 @@ msgid "Please wait, detecting and configuring devices..."
 msgstr "Arhoswch, canfod a ffurfweddu dyfeisiau..."
 
 #: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:223
-#: diskdrake/interactive.pm:236 diskdrake/interactive.pm:377
-#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:515
-#: diskdrake/interactive.pm:520 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:167
-#: install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117
-#: interactive/http.pm:118 network/netconnect.pm:995 network/netconnect.pm:999
-#: network/netconnect.pm:1004 network/netconnect.pm:1045
-#: network/netconnect.pm:1049 network/netconnect.pm:1187
-#: network/netconnect.pm:1192 network/netconnect.pm:1210
-#: network/netconnect.pm:1393 printer/printerdrake.pm:238
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227
+#: diskdrake/interactive.pm:240 diskdrake/interactive.pm:393
+#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:541
+#: diskdrake/interactive.pm:546 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:183
+#: install_any.pm:1564 install_any.pm:1587 install_steps.pm:82
+#: install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:1037
+#: network/netconnect.pm:1041 network/netconnect.pm:1046
+#: network/netconnect.pm:1072 network/netconnect.pm:1141
+#: network/netconnect.pm:1145 network/netconnect.pm:1283
+#: network/netconnect.pm:1288 network/netconnect.pm:1306
+#: network/netconnect.pm:1491 printer/printerdrake.pm:238
 #: printer/printerdrake.pm:245 printer/printerdrake.pm:270
 #: printer/printerdrake.pm:416 printer/printerdrake.pm:421
 #: printer/printerdrake.pm:434 printer/printerdrake.pm:444
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:1182
-#: printer/printerdrake.pm:1229 printer/printerdrake.pm:1266
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1314
-#: printer/printerdrake.pm:1328 printer/printerdrake.pm:1418
-#: printer/printerdrake.pm:1498 printer/printerdrake.pm:1502
-#: printer/printerdrake.pm:1506 printer/printerdrake.pm:1555
-#: printer/printerdrake.pm:1612 printer/printerdrake.pm:1616
-#: printer/printerdrake.pm:1630 printer/printerdrake.pm:1740
-#: printer/printerdrake.pm:1744 printer/printerdrake.pm:1781
-#: printer/printerdrake.pm:1846 printer/printerdrake.pm:1864
-#: printer/printerdrake.pm:1873 printer/printerdrake.pm:1882
-#: printer/printerdrake.pm:1893 printer/printerdrake.pm:1955
-#: printer/printerdrake.pm:2408 printer/printerdrake.pm:2672
-#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3188
-#: printer/printerdrake.pm:3192 printer/printerdrake.pm:3196
-#: printer/printerdrake.pm:3606 printer/printerdrake.pm:3846
-#: printer/printerdrake.pm:3866 printer/printerdrake.pm:3942
-#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4123
-#: standalone/drakTermServ:379 standalone/drakTermServ:731
-#: standalone/drakTermServ:738 standalone/drakTermServ:933
-#: standalone/drakTermServ:1403 standalone/drakTermServ:1408
-#: standalone/drakTermServ:1415 standalone/drakTermServ:1426
-#: standalone/drakTermServ:1447 standalone/drakauth:37
-#: standalone/drakbackup:512 standalone/drakbackup:626
-#: standalone/drakbackup:1128 standalone/drakbackup:1161
-#: standalone/drakbackup:1665 standalone/drakbackup:1821
-#: standalone/drakbackup:2416 standalone/drakbackup:4105
-#: standalone/drakbackup:4325 standalone/drakbug:235 standalone/drakbug:254
-#: standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648
-#: standalone/drakconnect:651 standalone/drakconnect:670
-#: standalone/drakfloppy:297 standalone/drakfloppy:301
-#: standalone/drakfloppy:307 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:604 standalone/draksplash:21
-#: standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:635
+#: printer/printerdrake.pm:1288 printer/printerdrake.pm:1335
+#: printer/printerdrake.pm:1372 printer/printerdrake.pm:1416
+#: printer/printerdrake.pm:1420 printer/printerdrake.pm:1434
+#: printer/printerdrake.pm:1524 printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1609 printer/printerdrake.pm:1613
+#: printer/printerdrake.pm:1662 printer/printerdrake.pm:1719
+#: printer/printerdrake.pm:1723 printer/printerdrake.pm:1737
+#: printer/printerdrake.pm:1848 printer/printerdrake.pm:1852
+#: printer/printerdrake.pm:1889 printer/printerdrake.pm:1957
+#: printer/printerdrake.pm:1975 printer/printerdrake.pm:1984
+#: printer/printerdrake.pm:1993 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2066 printer/printerdrake.pm:2159
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:2949
+#: printer/printerdrake.pm:2955 printer/printerdrake.pm:3501
+#: printer/printerdrake.pm:3505 printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3965 printer/printerdrake.pm:4205
+#: printer/printerdrake.pm:4225 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366 printer/printerdrake.pm:4483
+#: standalone/drakTermServ:392 standalone/drakTermServ:753
+#: standalone/drakTermServ:760 standalone/drakTermServ:779
+#: standalone/drakTermServ:998 standalone/drakTermServ:1478
+#: standalone/drakTermServ:1483 standalone/drakTermServ:1490
+#: standalone/drakTermServ:1502 standalone/drakTermServ:1523
+#: standalone/drakauth:35 standalone/drakbackup:511 standalone/drakbackup:625
+#: standalone/drakbackup:1127 standalone/drakbackup:1160
+#: standalone/drakbackup:1671 standalone/drakbackup:1827
+#: standalone/drakbackup:2421 standalone/drakbackup:4110
+#: standalone/drakbackup:4330 standalone/drakbug:191 standalone/drakclock:124
+#: standalone/drakconnect:649 standalone/drakconnect:652
+#: standalone/drakconnect:671 standalone/drakfloppy:297
+#: standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209
+#: standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:604
+#: standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107
+#: standalone/finish-install:39 standalone/logdrake:169
 #: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
-#: standalone/scannerdrake:196 standalone/scannerdrake:255
-#: standalone/scannerdrake:684 standalone/scannerdrake:695
-#: standalone/scannerdrake:834 standalone/scannerdrake:845
-#: standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: standalone/scannerdrake:202 standalone/scannerdrake:261
+#: standalone/scannerdrake:715 standalone/scannerdrake:726
+#: standalone/scannerdrake:865 standalone/scannerdrake:876
+#: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "Gwall"
@@ -229,7 +234,7 @@ msgstr "Gwall"
 #: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
+"An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 "Digwyddodd gwall ond wn i ddim sut i ddelio ag ef yn dwt.\n"
@@ -301,8 +306,8 @@ msgid "No CDROM support"
 msgstr "Dim cefnogaeth CD-ROM"
 
 #: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
-#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1030
+#: diskdrake/interactive.pm:1083
 #, c-format
 msgid "Read carefully!"
 msgstr "Darllenwch yn ofalus!"
@@ -310,7 +315,7 @@ msgstr "Darllenwch yn ofalus!"
 #: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
-"You can't use another CDROM when the following programs are running: \n"
+"You can not use another CDROM when the following programs are running: \n"
 "%s"
 msgstr ""
 "Methu defnyddio CD-ROM pan fo'r rhaglenni canlynol yn rhedeg:\n"
@@ -366,22 +371,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "16 MB neu fwy"
 
-#: Xconfig/card.pm:155
+#: Xconfig/card.pm:159
 #, c-format
 msgid "X server"
 msgstr "Gweinydd X"
 
-#: Xconfig/card.pm:156
+#: Xconfig/card.pm:160
 #, c-format
 msgid "Choose an X server"
 msgstr "Dewiswch weinydd X"
 
-#: Xconfig/card.pm:188
+#: Xconfig/card.pm:192
 #, c-format
 msgid "Multi-head configuration"
 msgstr " ffurfweddiad amlben"
 
-#: Xconfig/card.pm:189
+#: Xconfig/card.pm:193
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -390,62 +395,62 @@ msgstr ""
 "Mae eich system yn cynnal ffurfweddiad amlben.\n"
 "Beth hoffech ei wneud?"
 
-#: Xconfig/card.pm:255
+#: Xconfig/card.pm:262
 #, c-format
-msgid "Can't install Xorg package: %s"
+msgid "Can not install Xorg package: %s"
 msgstr "Methu gosod pecyn Xorg: %s"
 
-#: Xconfig/card.pm:265
+#: Xconfig/card.pm:272
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Dewiswch faint cof eich cerdyn graffeg"
 
-#: Xconfig/card.pm:352
+#: Xconfig/card.pm:349
 #, c-format
 msgid "Xorg configuration"
 msgstr "Ffurfweddiad Xorg"
 
-#: Xconfig/card.pm:354
+#: Xconfig/card.pm:351
 #, c-format
 msgid "Which configuration of Xorg do you want to have?"
 msgstr "Pa ffurfweddiad Xorg hoffech ei gael?"
 
-#: Xconfig/card.pm:387
+#: Xconfig/card.pm:384
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Ffurfweddu pob pen yn annibynnol"
 
-#: Xconfig/card.pm:388
+#: Xconfig/card.pm:385
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Defnyddiwch estyniad Xinerama"
 
-#: Xconfig/card.pm:393
+#: Xconfig/card.pm:390
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Ffurfweddu cerdyn \"%s\" %s yn unig"
 
-#: Xconfig/card.pm:405 Xconfig/various.pm:23
+#: Xconfig/card.pm:402 Xconfig/various.pm:23
 #, c-format
 msgid "Xorg %s"
 msgstr "Xorg: %s"
 
-#: Xconfig/card.pm:412 Xconfig/various.pm:22
+#: Xconfig/card.pm:409 Xconfig/various.pm:22
 #, c-format
 msgid "Xorg %s with 3D hardware acceleration"
 msgstr "Xorg %s gyda chyflymu caledwedd 3D"
 
-#: Xconfig/card.pm:414
+#: Xconfig/card.pm:411
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with Xorg %s."
 msgstr "Mae modd i'ch cerdyn gael cefnogaeth cyflymu caledwedd 3D gyda Xorg %s"
 
-#: Xconfig/card.pm:420
+#: Xconfig/card.pm:417
 #, c-format
 msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "Xorg %s gyda chyflymu caledwedd 3D ARBROFOL"
 
-#: Xconfig/card.pm:422
+#: Xconfig/card.pm:419
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with Xorg %s,\n"
@@ -454,16 +459,16 @@ msgstr ""
 "Mae modd i'ch cerdyn gael cefnogaeth cyflymu caledwedd 3D gyda Xorg %s \n"
 "SYLWER CEFNOGAETH ARBROFOL YW HON AC FE ALL RHEWI EICH CYFRIFIADUR."
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:117 any.pm:914
 #, c-format
 msgid "Custom"
 msgstr "Arddull"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:88 printer/printerdrake.pm:712
-#: printer/printerdrake.pm:3937 printer/printerdrake.pm:4382
-#: standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:174
-#: standalone/net_applet:160 standalone/scannerdrake:446
+#: install_steps_interactive.pm:86 printer/printerdrake.pm:737
+#: printer/printerdrake.pm:4296 printer/printerdrake.pm:4742
+#: standalone/draksplash:120 standalone/logdrake:174 standalone/net_applet:183
+#: standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -473,12 +478,12 @@ msgstr "Gadael"
 msgid "Graphic Card"
 msgstr "Cerdyn Graffeg"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:111
 #, c-format
 msgid "Monitor"
 msgstr "Monitor"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:221
 #, c-format
 msgid "Resolution"
 msgstr "Cydraniad"
@@ -488,19 +493,19 @@ msgstr "Cydraniad"
 msgid "Test"
 msgstr "Prawf"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:437
 #: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
+#: standalone/drakfont:493 standalone/drakfont:555
 #, c-format
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: Xconfig/main.pm:167
+#: Xconfig/main.pm:168
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
-msgstr ""
+msgstr "Mae eich ffeil ffurfweddu Xorg wedi torri, byddwn yn ei anwybyddu."
 
-#: Xconfig/main.pm:184
+#: Xconfig/main.pm:186
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -513,38 +518,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Dewiswch fonitor ar gyfer #%d"
 
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
 #, c-format
 msgid "Choose a monitor"
 msgstr "Dewiswch fonitor"
 
-#: Xconfig/monitor.pm:117
+#: Xconfig/monitor.pm:118
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: Xconfig/monitor.pm:118 mouse.pm:49
+#: Xconfig/monitor.pm:119 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Generig"
 
-#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
-#: standalone/harddrake2:83
+#: Xconfig/monitor.pm:120 standalone/drakconnect:569 standalone/harddrake2:52
+#: standalone/harddrake2:86
 #, c-format
 msgid "Vendor"
 msgstr "Gwerthwr"
 
-#: Xconfig/monitor.pm:129
+#: Xconfig/monitor.pm:130
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Methodd ymholiad Plug'n Play. Dewiswch y dangosydd cywir"
 
-#: Xconfig/monitor.pm:134
+#: Xconfig/monitor.pm:135
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -567,12 +572,12 @@ msgstr ""
 "hynny.\n"
 "Os oes gennych amheuaeth, dewiswch raddfa is."
 
-#: Xconfig/monitor.pm:141
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Graddfa adfywio lorweddol"
 
-#: Xconfig/monitor.pm:142
+#: Xconfig/monitor.pm:143
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Graddfa adfywio fertigol"
@@ -597,7 +602,7 @@ msgstr "65 mil o liwiau (16 did)"
 msgid "16 million colors (24 bits)"
 msgstr "16 miliwn o liwiau (24 did)"
 
-#: Xconfig/resolution_and_depth.pm:135
+#: Xconfig/resolution_and_depth.pm:133
 #, c-format
 msgid "Resolutions"
 msgstr "Cyfraniadau"
@@ -612,45 +617,45 @@ msgstr "Dewiswch y cydraniad a'r dyfnder lliw"
 msgid "Graphics card: %s"
 msgstr "Cerdyn graffeg: %s"
 
-#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
-#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: Xconfig/resolution_and_depth.pm:285 interactive.pm:424
+#: interactive/gtk.pm:768 interactive/http.pm:103 interactive/http.pm:156
 #: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakTermServ:201 standalone/drakTermServ:474
-#: standalone/drakbackup:3962 standalone/drakbackup:4022
-#: standalone/drakbackup:4066 standalone/drakconnect:165
-#: standalone/drakconnect:850 standalone/drakconnect:937
-#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
-#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
-#: ugtk2.pm:1122 ugtk2.pm:1145
+#: standalone/drakTermServ:199 standalone/drakTermServ:490
+#: standalone/drakbackup:3967 standalone/drakbackup:4027
+#: standalone/drakbackup:4071 standalone/drakconnect:165
+#: standalone/drakconnect:849 standalone/drakconnect:936
+#: standalone/drakconnect:1035 standalone/drakfont:576 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:409 ugtk2.pm:506
+#: ugtk2.pm:900 ugtk2.pm:923
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
-#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
+#: install_steps_interactive.pm:826 interactive.pm:425 interactive/gtk.pm:772
 #: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
 #: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
-#: standalone/drakautoinst:217 standalone/drakbackup:3888
-#: standalone/drakbackup:3892 standalone/drakbackup:3950
-#: standalone/drakconnect:164 standalone/drakconnect:935
-#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
-#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
-#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3579
+#: standalone/drakautoinst:217 standalone/drakbackup:3893
+#: standalone/drakbackup:3897 standalone/drakbackup:3955
+#: standalone/drakconnect:164 standalone/drakconnect:934
+#: standalone/drakconnect:1034 standalone/drakfont:668 standalone/drakfont:745
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343
+#: ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513 ugtk2.pm:900
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
-#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
-#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
-#: standalone/drakbackup:3884 standalone/drakbug:128
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:519
+#: interactive/gtk.pm:638 interactive/gtk.pm:640 standalone/drakTermServ:284
+#: standalone/drakbackup:3889 standalone/drakbug:104
 #: standalone/drakconnect:160 standalone/drakconnect:245
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
-#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
-#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
+#: standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:336
+#: standalone/draksec:338 standalone/draksec:356 standalone/draksec:358
+#: ugtk2.pm:1031 ugtk2.pm:1032
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
@@ -681,12 +686,12 @@ msgstr ""
 "%s\n"
 "Ceisiwch newid paramedrau"
 
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Gadael mewn %d eiliad"
 
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "A'i hwn yw'r gosodiad cywir?"
@@ -787,20 +792,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Pa norm mae eich teledu'n ei ddefnyddio?"
 
-#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
-#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
-#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
-#: standalone/service_harddrake:199
+#: any.pm:140 harddrake/sound.pm:191 install_any.pm:652 interactive.pm:462
+#: standalone/drakconnect:167 standalone/drakconnect:613 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:231
+#: standalone/service_harddrake:204
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: any.pm:116
+#: any.pm:140
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Wrthi'n gosod cychwynnwr"
 
-#: any.pm:127
+#: any.pm:151
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -810,17 +815,22 @@ msgid ""
 "\n"
 "Assign a new Volume ID?"
 msgstr ""
+"Mae LILO eisiau neilltuo enw Cyfrol newydd i yrrwr %s.  Er hynny, mae newid\n"
+"enw Cyfrol disg cychwyn Windows NT, 2000, neu XP yn wall angheuol.\n"
+"Nid yw'r rhybudd hwn yn cynnwys 95, 98, neu i ddisgiau data NT.\n"
+"\n"
+"Neilltuo enw Cyfrol newydd?"
 
-#: any.pm:138
+#: any.pm:162
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "Methodd gosod cychwynnwr. Digwyddodd y gwall canlynol:"
 
-#: any.pm:144
+#: any.pm:168
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" enable the bootloader.  If you do not see the bootloader prompt at\n"
 " reboot, hold down Command-Option-O-F at reboot and enter:\n"
 " setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
@@ -833,7 +843,7 @@ msgstr ""
 " Yna teipiwch: shut-down\n"
 "Wrth gychwyn eto dylech weld anogwr y cychwynnwr."
 
-#: any.pm:181
+#: any.pm:206
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -848,260 +858,258 @@ msgstr ""
 "\n"
 "Gyda pha ddisg ydych chi'n cychwyn?"
 
-#: any.pm:204 help.pm:739
+#: any.pm:229 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Adran gyntaf o'r disg (MBR)"
 
-#: any.pm:205
+#: any.pm:230
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Adran gyntaf o'r rhaniad gwraidd"
 
-#: any.pm:207
+#: any.pm:232
 #, c-format
 msgid "On Floppy"
 msgstr "Ar Ddisg Meddal"
 
-#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
+#: any.pm:234 help.pm:739 printer/printerdrake.pm:3962
 #, c-format
 msgid "Skip"
 msgstr "Hepgor"
 
-#: any.pm:213
+#: any.pm:238
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Gosodiad LILO/grub"
 
-#: any.pm:214
+#: any.pm:239
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Lle rydych chi eisiau gosod y cychwynnwr?"
 
-#: any.pm:239 standalone/drakboot:307
+#: any.pm:264 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Ffurfweddu'r Math o Gychwyn"
 
-#: any.pm:241 any.pm:275
+#: any.pm:266 any.pm:298
 #, c-format
 msgid "Bootloader main options"
 msgstr "Prif ddewisiadau Bootloader"
 
-#: any.pm:245
+#: any.pm:270
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Rhowch faint RAM mewn MB"
 
-#: any.pm:247
+#: any.pm:272
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Dewis Nid yw 'cyfyngu dewisiadau llinell orchymyn' o werth heb gyfrinair"
 
-#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176
 #, c-format
 msgid "The passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
-#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
-#: install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176 diskdrake/interactive.pm:1270
 #, c-format
 msgid "Please try again"
 msgstr "Ceisiwch eto"
 
-#: any.pm:253 any.pm:278
+#: any.pm:278 any.pm:301
 #, c-format
 msgid "Bootloader to use"
 msgstr "Bootloader ar waith"
 
-#: any.pm:255 any.pm:280
+#: any.pm:280 any.pm:303
 #, c-format
 msgid "Boot device"
 msgstr "Dyfais cychwyn"
 
-#: any.pm:257
+#: any.pm:282
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Oedi cyn cychwyn y ddelwedd rhagosodedig"
 
-#: any.pm:258
+#: any.pm:283
 #, c-format
 msgid "Enable ACPI"
 msgstr "Galluogi ACPI"
 
-#: any.pm:260
+#: any.pm:285
 #, c-format
 msgid "Force no APIC"
 msgstr "Gorfodi dim APIC"
 
-#: any.pm:262
+#: any.pm:287
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Peidio Gorfodi APIC Lleol"
 
-#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1220 network/netconnect.pm:595
-#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
-#: standalone/drakbackup:1647 standalone/drakbackup:3490
-#: standalone/drakups:295
+#: any.pm:289 any.pm:633 authentication.pm:181 diskdrake/smbnfs_gtk.pm:180
+#: network/netconnect.pm:633 printer/printerdrake.pm:1596
+#: printer/printerdrake.pm:1716 standalone/drakbackup:1653
+#: standalone/drakbackup:3495 standalone/drakups:295
 #, c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
+#: any.pm:290 any.pm:634 authentication.pm:182
 #, c-format
 msgid "Password (again)"
 msgstr "Cyfrinair (eto)"
 
-#: any.pm:266
+#: any.pm:291
 #, c-format
 msgid "Restrict command line options"
 msgstr "Cyfyngu dewisiadau llinell orchymyn"
 
-#: any.pm:266
+#: any.pm:291
 #, c-format
 msgid "restrict"
 msgstr "cyfyngu"
 
-#: any.pm:268
+#: any.pm:293
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Glanhau /tmp bob tro fyddwch yn cychwyn"
 
-#: any.pm:269
+#: any.pm:294
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Union faint o RAM os oes angen (canfod %dMB)"
 
-#: any.pm:279
+#: any.pm:302
 #, c-format
 msgid "Init Message"
 msgstr "Neges Init"
 
-#: any.pm:281
+#: any.pm:304
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Agor Oedi Cadarnwedd"
 
-#: any.pm:282
+#: any.pm:305
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Goramser cychwyn y cnewyllyn"
 
-#: any.pm:283
+#: any.pm:306
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Galluogi cychwyn o CD?"
 
-#: any.pm:284
+#: any.pm:307
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Galluogi Cychwyn OF?"
 
-#: any.pm:285
+#: any.pm:308
 #, c-format
 msgid "Default OS?"
 msgstr "System Weithredu Rhagosodedig?"
 
-#: any.pm:338
+#: any.pm:361
 #, c-format
 msgid "Image"
 msgstr "Delwedd"
 
-#: any.pm:339 any.pm:349
+#: any.pm:362 any.pm:372
 #, c-format
 msgid "Root"
 msgstr "Gwraidd"
 
-#: any.pm:340 any.pm:362
+#: any.pm:363 any.pm:385
 #, c-format
 msgid "Append"
 msgstr "Atodi"
 
-#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
+#: any.pm:365 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Modd fideo"
 
-#: any.pm:344
+#: any.pm:367
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:345
+#: any.pm:368
 #, c-format
 msgid "Network profile"
 msgstr "Proffil rhwydwaith"
 
-#: any.pm:354 any.pm:359 any.pm:361
+#: any.pm:377 any.pm:382 any.pm:384
 #, c-format
 msgid "Label"
 msgstr "Label"
 
-#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: any.pm:379 any.pm:389 harddrake/v4l.pm:275 standalone/drakfloppy:84
 #: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: any.pm:363
+#: any.pm:386
 #, c-format
 msgid "Initrd-size"
 msgstr "Maint intrd"
 
-#: any.pm:365
+#: any.pm:388
 #, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: any.pm:376
+#: any.pm:399
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Nid yw label wag yn cael ei chaniatáu"
 
-#: any.pm:377
+#: any.pm:400
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Rhaid enwi delwedd cnewyllyn"
 
-#: any.pm:377
+#: any.pm:400
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Rhaid pennu rhaniad gwraidd"
 
-#: any.pm:378
+#: any.pm:401
 #, c-format
 msgid "This label is already used"
 msgstr "Mae'r label hwn yn cael ei ddefnyddio eisoes"
 
-#: any.pm:392
+#: any.pm:415
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Pa fath o gofnod ydych chi eisiau ei ychwanegu?"
 
-#: any.pm:393
+#: any.pm:416
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:393
+#: any.pm:416
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Systemau Gweithredu eraill (SunOS..)"
 
-#: any.pm:394
+#: any.pm:417
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Systemau Gweithredu Eraill (MacOS...)"
 
-#: any.pm:394
+#: any.pm:417
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Systemau Gweithredu Eraill (Windows...)"
 
-#: any.pm:422
+#: any.pm:445
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1110,74 +1118,74 @@ msgstr ""
 "Dyma'r cofnodion gwahanol ar eich dewislen cychwyn hyd yma.\n"
 "Mae modd i chi ychwanegu rhagor neu newid y rhai presennol."
 
-#: any.pm:572
+#: any.pm:592
 #, c-format
 msgid "access to X programs"
 msgstr "mynediad i raglenni  X"
 
-#: any.pm:573
+#: any.pm:593
 #, c-format
 msgid "access to rpm tools"
 msgstr "mynediad i offer rpm"
 
-#: any.pm:574
+#: any.pm:594
 #, c-format
 msgid "allow \"su\""
 msgstr "caniatáu \"su\""
 
-#: any.pm:575
+#: any.pm:595
 #, c-format
 msgid "access to administrative files"
 msgstr "mynediad i ffeiliau gweinyddol"
 
-#: any.pm:576
+#: any.pm:596
 #, c-format
 msgid "access to network tools"
 msgstr "mynediad i offer rhwydwaith"
 
-#: any.pm:577
+#: any.pm:597
 #, c-format
 msgid "access to compilation tools"
 msgstr "mynediad i offer crynhoad"
 
-#: any.pm:582
+#: any.pm:602
 #, c-format
 msgid "(already added %s)"
 msgstr "(wedi ychwanegu %s yn barod)"
 
-#: any.pm:587
+#: any.pm:607
 #, c-format
 msgid "This password is too simple"
 msgstr "Mae'r cyfrinair yn rhy syml"
 
-#: any.pm:588
+#: any.pm:608
 #, c-format
 msgid "Please give a user name"
 msgstr "Rhowch enw defnyddiwr"
 
-#: any.pm:589
+#: any.pm:609
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
 "Rhaid i'r enw defnyddiwr gynnwys dim ond llythrennau bach, rhifau, '-' a '_'"
 
-#: any.pm:590
+#: any.pm:610
 #, c-format
 msgid "The user name is too long"
 msgstr "Mae'r enw defnyddiwr yn rhy hir"
 
-#: any.pm:591
+#: any.pm:611
 #, c-format
 msgid "This user name has already been added"
 msgstr "Mae'r enw defnyddiwr wedi ei ychwanegu yn barod"
 
-#: any.pm:595
+#: any.pm:615
 #, c-format
 msgid "Add user"
 msgstr "Ychwanegu defnyddiwr"
 
-#: any.pm:596
+#: any.pm:616
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1186,77 +1194,77 @@ msgstr ""
 "Rhowch enw defnyddiwr\n"
 "%s"
 
-#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: any.pm:619 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
 #: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
 #: interactive/http.pm:151 printer/printerdrake.pm:191
-#: printer/printerdrake.pm:376 printer/printerdrake.pm:4382
-#: standalone/drakbackup:2703 standalone/scannerdrake:637
-#: standalone/scannerdrake:787
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4742
+#: standalone/drakbackup:2708 standalone/scannerdrake:668
+#: standalone/scannerdrake:818
 #, c-format
 msgid "Done"
 msgstr "Gorffen"
 
-#: any.pm:600 help.pm:51
+#: any.pm:620 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Derbyn defnyddiwr"
 
-#: any.pm:611
+#: any.pm:631
 #, c-format
 msgid "Real name"
 msgstr "Enw cywir"
 
-#: any.pm:612 standalone/drakbackup:1642
+#: any.pm:632 standalone/drakbackup:1648
 #, c-format
 msgid "Login name"
 msgstr "Enw mewngofnodi"
 
-#: any.pm:615
+#: any.pm:635
 #, c-format
 msgid "Shell"
 msgstr "Cragen"
 
-#: any.pm:617
+#: any.pm:637
 #, c-format
 msgid "Icon"
 msgstr "Eicon"
 
-#: any.pm:664 security/l10n.pm:14
+#: any.pm:684 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
-msgstr "Awtomewngofnodi"
+msgstr "Awto mewngofnodi"
 
-#: any.pm:665
+#: any.pm:685
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "Mewngofnodi'n awtomatig ar gyfer un defnyddiwr."
 
-#: any.pm:666 help.pm:51
+#: any.pm:686 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Ydych chi eisiau defnyddio'r nodwedd?"
 
-#: any.pm:667
+#: any.pm:687
 #, c-format
 msgid "Choose the default user:"
 msgstr "Dewis y defnyddiwr rhagosodedig:"
 
-#: any.pm:668
+#: any.pm:688
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Dewiswch y rheolwr ffenestr i redeg:"
 
-#: any.pm:680
+#: any.pm:700
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Dewiswch iaith i'w defnyddio."
 
-#: any.pm:681
-#, fuzzy, c-format
+#: any.pm:701
+#, c-format
 msgid "Language choice"
-msgstr "Dewis gyda llaw"
+msgstr "Dewis iaith"
 
-#: any.pm:707
+#: any.pm:727
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1267,57 +1275,59 @@ msgstr ""
 "pa iaith yr hoffech ei osod. Byddant ar gael pan fydd eich gosodiad\n"
 "wedi ei gwblhau a phan fyddwch yn ailgychwyn eich system."
 
-#: any.pm:725 help.pm:647
+#: any.pm:746 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Defnyddio Unicode drwy ragosodiad"
 
-#: any.pm:726 help.pm:647
+#: any.pm:747 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Pob iaith"
 
-#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
+#: any.pm:786 help.pm:566 help.pm:855 install_steps_interactive.pm:946
 #, c-format
 msgid "Country / Region"
 msgstr "Gwlad / Ardal"
 
-#: any.pm:766
+#: any.pm:787
 #, c-format
 msgid "Please choose your country."
 msgstr "Dewiswch eich gwlad."
 
-#: any.pm:768
+#: any.pm:789
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Dyma restr lawn o'r gwledydd sydd ar gael"
 
-#: any.pm:769
+#: any.pm:790
 #, c-format
 msgid "Other Countries"
 msgstr "Gwledydd eraill"
 
-#: any.pm:777
+#: any.pm:798
 #, c-format
 msgid "Input method:"
 msgstr "Dull mewnbwn:"
 
-#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#: any.pm:799 install_any.pm:388 network/netconnect.pm:323
+#: network/netconnect.pm:328 printer/printerdrake.pm:99
+#: printer/printerdrake.pm:2111
 #, c-format
 msgid "None"
 msgstr "Dim"
 
-#: any.pm:912
+#: any.pm:914
 #, c-format
 msgid "No sharing"
 msgstr "Peidio rhannu"
 
-#: any.pm:912
+#: any.pm:914
 #, c-format
 msgid "Allow all users"
 msgstr "Caniatáu pob defnyddiwr"
 
-#: any.pm:916
+#: any.pm:918
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1332,7 +1342,7 @@ msgstr ""
 "\n"
 "\"Addasu\" caniatáu cyfran i'r defnyddwyr.\n"
 
-#: any.pm:928
+#: any.pm:930
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -1341,7 +1351,7 @@ msgstr ""
 "NFS: system rhannu ffeiliau traddodiadol Unix, sydd â llai o gefnogaeth ar "
 "Mac a Windows."
 
-#: any.pm:931
+#: any.pm:933
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -1350,29 +1360,29 @@ msgstr ""
 "SMB: system rhannu ffeiliau sy'n cael ei ddefnyddio yn Windows, Mac OSX a "
 "nifer o systemau Linux diweddar."
 
-#: any.pm:939
+#: any.pm:941
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr ""
 "Gallwch allforio gan ddefnyddio NFS neu SMB. Pa un hoffech chi ei ddefnyddio?"
 
-#: any.pm:964
+#: any.pm:966
 #, c-format
 msgid "Launch userdrake"
 msgstr "Cychwyn userdrake"
 
-#: any.pm:964 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481
-#: printer/printerdrake.pm:3482 printer/printerdrake.pm:3483
-#: printer/printerdrake.pm:4676 standalone/drakTermServ:289
-#: standalone/drakbackup:4084 standalone/drakbug:151 standalone/drakfont:500
-#: standalone/drakfont:594 standalone/net_monitor:123
-#: standalone/printerdrake:559
+#: any.pm:966 printer/printerdrake.pm:3802 printer/printerdrake.pm:3805
+#: printer/printerdrake.pm:3806 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:5036 standalone/drakTermServ:294
+#: standalone/drakbackup:4089 standalone/drakbug:126 standalone/drakfont:499
+#: standalone/drakfont:595 standalone/net_monitor:123
+#: standalone/printerdrake:547
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: any.pm:966
+#: any.pm:968
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1396,52 +1406,57 @@ msgstr "LDAP"
 msgid "NIS"
 msgstr "NIS"
 
-#: authentication.pm:19 authentication.pm:127
+#: authentication.pm:19
+#, c-format
+msgid "Smart Card"
+msgstr "Cerdyn clyfar"
+
+#: authentication.pm:20 authentication.pm:148
 #, c-format
 msgid "Windows Domain"
 msgstr "Parth Windows"
 
-#: authentication.pm:20
+#: authentication.pm:21
 #, c-format
 msgid "Active Directory with SFU"
 msgstr "Cyfeiriadur byw gyda SFU"
 
-#: authentication.pm:21
+#: authentication.pm:22
 #, c-format
 msgid "Active Directory with Winbind"
 msgstr "Cyfeiriadur Byw gyda Winbind"
 
-#: authentication.pm:30
+#: authentication.pm:51
 #, c-format
 msgid "Local file:"
 msgstr "Ffeil leol:"
 
-#: authentication.pm:30
+#: authentication.pm:51
 #, c-format
 msgid ""
 "Use local for all authentication and information user tell in local file"
 msgstr "Defnyddio lleol ar gyfer pob dilysiad a gwybodaeth mewn ffeil leol"
 
-#: authentication.pm:31
+#: authentication.pm:52
 #, c-format
 msgid "LDAP:"
 msgstr "LDAP:"
 
-#: authentication.pm:31
+#: authentication.pm:52
 #, c-format
 msgid ""
 "Tells your computer to use LDAP for some or all authentication. LDAP "
 "consolidates certain types of information within your organization."
 msgstr ""
 "Dweud wrth eich cyfrifiadur i ddefnyddio LDAP ar gyfer rhai neu'r holl "
-"dilysiad. Mae LDAP yn crynhoi mathau arbennig o wybodaeth o fewn eich corff."
+"ddilysiad. Mae LDAP yn crynhoi mathau arbennig o wybodaeth o fewn eich corff."
 
-#: authentication.pm:32
+#: authentication.pm:53
 #, c-format
 msgid "NIS:"
 msgstr "NIS:"
 
-#: authentication.pm:32
+#: authentication.pm:53
 #, c-format
 msgid ""
 "Allows you to run a group of computers in the same Network Information "
@@ -1450,12 +1465,12 @@ msgstr ""
 "Caniatáu i chi redeg grŵp o gyfrifiaduron yn yr un parth Gwasanaeth "
 "Gwybodaeth Rhwydwaith gyda chyfrinair cyffredin a ffeil grŵp."
 
-#: authentication.pm:33
+#: authentication.pm:54
 #, c-format
 msgid "Windows Domain:"
 msgstr "Parth Windows:"
 
-#: authentication.pm:33
+#: authentication.pm:54
 #, c-format
 msgid ""
 "Winbind allows the system to retrieve information and authenticate users in "
@@ -1464,12 +1479,12 @@ msgstr ""
 "Mae Winbind yn caniatáu i'r system estyn gwybodaeth a dilysu defnyddwyr mewn "
 "parth Windows."
 
-#: authentication.pm:34
+#: authentication.pm:55
 #, c-format
 msgid "Active Directory with SFU:"
 msgstr "Cyfeiriadur Byw gyda SFU:"
 
-#: authentication.pm:34 authentication.pm:35
+#: authentication.pm:55 authentication.pm:56
 #, c-format
 msgid ""
 "Kerberos is a secure system for providing network authentication services."
@@ -1477,103 +1492,104 @@ msgstr ""
 "Mae Kerberos yn system ddiogel ar gyfer darparu gwasanaethau dilysu "
 "rhwydwaith."
 
-#: authentication.pm:35
+#: authentication.pm:56
 #, c-format
 msgid "Active Directory with Winbind:"
 msgstr "Cyfeiriadur Byw gyda Winbind:"
 
-#: authentication.pm:60
+#: authentication.pm:81
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Dilysu LDAP"
 
-#: authentication.pm:61
+#: authentication.pm:82
 #, c-format
 msgid "LDAP Base dn"
 msgstr "Sail dn LDAP"
 
-#: authentication.pm:62 share/compssUsers.pl:101
+#: authentication.pm:83 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "Gweinydd LDAP"
 
-#: authentication.pm:75 fsedit.pm:21
+#: authentication.pm:96 fsedit.pm:21
 #, c-format
 msgid "simple"
 msgstr "syml"
 
-#: authentication.pm:76
+#: authentication.pm:97
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: authentication.pm:77
+#: authentication.pm:98
 #, c-format
 msgid "SSL"
 msgstr "SSL"
 
-#: authentication.pm:78
+#: authentication.pm:99
 #, c-format
 msgid "security layout (SASL/Kerberos)"
 msgstr "trefn diogelwch (SASL/Kerberos)"
 
-#: authentication.pm:85 authentication.pm:123
+#: authentication.pm:106 authentication.pm:144
 #, c-format
 msgid "Authentication Active Directory"
 msgstr "Cyfeiriadur Byw Dilysu"
 
-#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:107 authentication.pm:146 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Parth"
 
-#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: authentication.pm:109 diskdrake/dav.pm:63 help.pm:146
 #: printer/printerdrake.pm:135 share/compssUsers.pl:81
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Server"
 msgstr "Gweinydd"
 
-#: authentication.pm:89
+#: authentication.pm:110
 #, c-format
 msgid "LDAP users database"
 msgstr "Cronfa ddata defnyddwyr LDAP"
 
-#: authentication.pm:90
+#: authentication.pm:111
 #, c-format
 msgid "Use Anonymous BIND "
 msgstr "Defnydd BIND anhysbys"
 
-#: authentication.pm:91
+#: authentication.pm:112
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr "Defnyddiwr LDAP â chaniatâd i bori'r Cyfeiriadur Gweithredol"
 
-#: authentication.pm:92
+#: authentication.pm:113
 #, c-format
 msgid "Password for user"
 msgstr "Cyfrinair ar gyfer defnyddwyr"
 
-#: authentication.pm:93
+#: authentication.pm:114
 #, c-format
 msgid "Encryption"
 msgstr "Amgryptiad"
 
-#: authentication.pm:104
+#: authentication.pm:125
 #, c-format
 msgid "Authentication NIS"
 msgstr "Dilysu LDAP"
 
-#: authentication.pm:105
+#: authentication.pm:126
 #, c-format
 msgid "NIS Domain"
 msgstr "Parth NIS"
 
-#: authentication.pm:106
+#: authentication.pm:127
 #, c-format
 msgid "NIS Server"
 msgstr "Gweinydd NIS"
 
-#: authentication.pm:111
+#: authentication.pm:132
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1591,8 +1607,8 @@ msgid ""
 msgstr ""
 "I hyn weithio gyda 2WK PDC, bydd angen i chi gael y gweinyddwr i redeg C:"
 "\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add ac "
-"ailgychwyn y gweinydd.Bydd angen hefyd yr enw defnyddiwr/cyfrinair "
-"Gweinyddiaeth Parth i uno'r peiriant â'r parth Windows(NM).\n"
+"ailgychwyn y gweinydd. Bydd angen hefyd yr enw defnyddiwr/cyfrinair "
+"Gweinyddiaeth Parth i uno'r peiriant â pharth Windows (NM).\n"
 "Os nad yw'r rhwydwaith wedi ei alluogi eto, bydd DrakX yn ceisio ymuno â'r "
 "parth ar ôl y cam o gychwyn y rhwydwaith.\n"
 "Os bydd y cam hwn yn methu am ryw reswm ac nid yw dilysiad yn gweithio, "
@@ -1601,38 +1617,70 @@ msgstr ""
 "system.\n"
 "Bydd y gorchymyn 'wbinfo -t' yn gwirio a yw eich cyfrinachau dilysu'n addas."
 
-#: authentication.pm:123
+#: authentication.pm:144
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Dilysu Parth Windows"
 
-#: authentication.pm:128
+#: authentication.pm:149
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Enw Defnyddiwr Gweinyddiaeth Parth"
 
-#: authentication.pm:129
+#: authentication.pm:150
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Cyfrinair Gweinyddol y Parth"
 
-#: authentication.pm:130
+#: authentication.pm:151
 #, c-format
 msgid "Use Idmap for store UID/SID "
 msgstr "Defnyddio Idmap i storio UID/SID "
 
-#: authentication.pm:131
+#: authentication.pm:152
 #, c-format
 msgid "Default Idmap "
 msgstr "Idmap rhagosodedig"
 
-#: authentication.pm:231
+#: authentication.pm:165
+#, c-format
+msgid "Set administrator (root) password and network authentication methods"
+msgstr "Gosod cyfrinair gweinyddwr (root) gwraidd a dulliau dilysu rhwydwaith"
+
+#: authentication.pm:166
 #, c-format
-msgid "Can't use broadcast with no NIS domain"
+msgid "Set administrator (root) password"
+msgstr "Gosod cyfrinair gweinyddwr (root"
+
+#: authentication.pm:167 standalone/drakvpn:1125
+#, c-format
+msgid "Authentication method"
+msgstr "Dull dilysu"
+
+#. -PO: keep this short or else the buttons will not fit in the window
+#: authentication.pm:172 help.pm:722
+#, c-format
+msgid "No password"
+msgstr "Dim cyfrinair"
+
+#: authentication.pm:178
+#, c-format
+msgid "This password is too short (it must be at least %d characters long)"
+msgstr "Mae'r cyfrinair yn rhy syml ( rhaid iddo fod o leiaf %d nod o hyd)"
+
+#: authentication.pm:183 network/netconnect.pm:328 network/netconnect.pm:634
+#: standalone/drakauth:23 standalone/drakauth:25 standalone/drakconnect:459
+#, c-format
+msgid "Authentication"
+msgstr "Dilysu"
+
+#: authentication.pm:296
+#, c-format
+msgid "Can not use broadcast with no NIS domain"
 msgstr "Methu defnyddio darlledu heb barth NIS"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:673
+#: bootloader.pm:728
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1647,37 +1695,37 @@ msgstr ""
 "aros am y cychwyn rhagosodedig\n"
 "\n"
 
-#: bootloader.pm:787
+#: bootloader.pm:815
 #, c-format
 msgid "LILO with graphical menu"
-msgstr "Lilo gyda dewislen graffigol"
+msgstr "Lilo gyda dewislen raffigol"
 
-#: bootloader.pm:788
+#: bootloader.pm:816
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO gyda dewislen testun"
 
-#: bootloader.pm:789
+#: bootloader.pm:817
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:790
+#: bootloader.pm:818
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:852
+#: bootloader.pm:881
 #, c-format
 msgid "not enough room in /boot"
 msgstr "dim digon o le yn /boot"
 
-#: bootloader.pm:1266
+#: bootloader.pm:1295
 #, c-format
-msgid "You can't install the bootloader on a %s partition\n"
+msgid "You can not install the bootloader on a %s partition\n"
 msgstr "Nid oes modd gosod y cychwynnwr ar raniad %s\n"
 
-#: bootloader.pm:1311
+#: bootloader.pm:1340
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
@@ -1686,16 +1734,16 @@ msgstr ""
 "Rhaid i ffurfweddiad eich cychwynnwr gael ei ddiweddaru am i'r rhaniadau "
 "gael eu hail rifo."
 
-#: bootloader.pm:1326
+#: bootloader.pm:1355
 #, c-format
 msgid ""
-"The bootloader can't be installed correctly. You have to boot rescue and "
+"The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
 "Methu gosod eich cychwynnwr yn iawn, Rhaid defnyddio achub cychwyn a dewis "
 "\"%s\""
 
-#: bootloader.pm:1327
+#: bootloader.pm:1356
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Ail osod Cychwynnwr"
@@ -1735,94 +1783,115 @@ msgstr "1 munud"
 msgid "%d seconds"
 msgstr "%d eiliad"
 
-#: common.pm:197
-#, c-format
-msgid "Can't make screenshots before partitioning"
-msgstr "Meth creu lluniau o'r sgrin cyn rhannu"
-
-#: common.pm:204
-#, c-format
-msgid "Screenshots will be available after install in %s"
-msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s"
-
-#: common.pm:269
+#: common.pm:240
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesu ar goll"
 
-#: common.pm:272
+#: common.pm:243
 #, c-format
 msgid "consolehelper missing"
 msgstr "consolehelper ar goll"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
-#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
-#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
-#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
-#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
-#: network/netconnect.pm:47
-#, c-format
-msgid "France"
-msgstr "Ffrainc"
-
-#: crypto.pm:15 lang.pm:229
+#: crypto.pm:14 crypto.pm:43 lang.pm:202 network/adsl_consts.pm:50
+#: network/adsl_consts.pm:58 network/adsl_consts.pm:66
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Austria"
+msgstr "Awstria"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
-#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
-#: network/adsl_consts.pm:85 network/netconnect.pm:50
+#: crypto.pm:15 crypto.pm:34 lang.pm:209 network/adsl_consts.pm:74
+#: network/adsl_consts.pm:82 network/adsl_consts.pm:93
+#: network/adsl_consts.pm:101 network/netconnect.pm:50
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:235
+#: crypto.pm:16 lang.pm:230 network/adsl_consts.pm:780
+#: network/adsl_consts.pm:788 network/adsl_consts.pm:798
+#, c-format
+msgid "Switzerland"
+msgstr "Y Swistir"
+
+#: crypto.pm:17 lang.pm:237
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: crypto.pm:18 crypto.pm:35 lang.pm:243 network/adsl_consts.pm:319
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
-#: network/adsl_consts.pm:418
+#: crypto.pm:19 crypto.pm:36 lang.pm:244 network/adsl_consts.pm:437
+#: network/adsl_consts.pm:445
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
+#: crypto.pm:20 crypto.pm:33 lang.pm:262 network/adsl_consts.pm:343
+#: network/adsl_consts.pm:354 network/adsl_consts.pm:365
+#: network/adsl_consts.pm:375 network/adsl_consts.pm:385
+#: network/adsl_consts.pm:396 network/adsl_consts.pm:407
+#: network/adsl_consts.pm:417 network/adsl_consts.pm:427
+#: network/netconnect.pm:47
+#, c-format
+msgid "France"
+msgstr "Ffrainc"
+
+#: crypto.pm:21 crypto.pm:37 lang.pm:275 network/adsl_consts.pm:455
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:340
+#: crypto.pm:22 lang.pm:286 network/adsl_consts.pm:463
 #, c-format
-msgid "Norway"
-msgstr "Norwy"
+msgid "Hungary"
+msgstr "Hwngari"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
+#: crypto.pm:23 crypto.pm:42 lang.pm:295 network/adsl_consts.pm:489
+#: network/adsl_consts.pm:499 network/adsl_consts.pm:509
+#: network/adsl_consts.pm:517 network/netconnect.pm:49 standalone/drakxtv:47
 #, c-format
-msgid "Sweden"
-msgstr "Sweden"
+msgid "Italy"
+msgstr "Yr Eidal"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
-#: network/netconnect.pm:48
+#: crypto.pm:24 crypto.pm:41 lang.pm:347 network/adsl_consts.pm:545
+#: network/adsl_consts.pm:553 network/adsl_consts.pm:561
+#: network/adsl_consts.pm:569 network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
-#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
-#: network/netconnect.pm:49 standalone/drakxtv:47
+#: crypto.pm:25 crypto.pm:38 lang.pm:348 network/adsl_consts.pm:577
+#: network/adsl_consts.pm:582 network/adsl_consts.pm:587
+#: network/adsl_consts.pm:592 network/adsl_consts.pm:597
+#: network/adsl_consts.pm:602 network/adsl_consts.pm:607
 #, c-format
-msgid "Italy"
-msgstr "Yr Eidal"
+msgid "Norway"
+msgstr "Norwy"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
-#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
+#: crypto.pm:26 lang.pm:360 network/adsl_consts.pm:614
+#: network/adsl_consts.pm:624
 #, c-format
-msgid "Austria"
-msgstr "Awstria"
+msgid "Poland"
+msgstr "Gwlad Pwyl"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
+#: crypto.pm:27 crypto.pm:39 lang.pm:377 network/adsl_consts.pm:772
+#, c-format
+msgid "Sweden"
+msgstr "Sweden"
+
+#: crypto.pm:28 lang.pm:382
+#, c-format
+msgid "Slovakia"
+msgstr "Slofacia"
+
+#: crypto.pm:29 lang.pm:406
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: crypto.pm:40 crypto.pm:75 lang.pm:411 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
@@ -1845,18 +1914,18 @@ msgstr ""
 msgid "New"
 msgstr "Newydd"
 
-#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:443 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Dadosod"
 
-#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:440 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Gosod"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
-#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:435
+#: diskdrake/interactive.pm:653 diskdrake/interactive.pm:672
 #: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
@@ -1877,13 +1946,13 @@ msgstr "Rhaid i'r URL gychwyn gyda http:// neu https://"
 msgid "Server: "
 msgstr "Gweinydd:"
 
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:504
+#: diskdrake/interactive.pm:1166 diskdrake/interactive.pm:1241
 #, c-format
 msgid "Mount point: "
 msgstr "Pwynt gosod:"
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1248
 #, c-format
 msgid "Options: %s"
 msgstr "Dewisiadau: %s"
@@ -1930,8 +1999,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "Cliciwch ar raniad"
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
-#: standalone/drakbackup:2938 standalone/drakbackup:2998
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482
+#: standalone/drakbackup:2943 standalone/drakbackup:3003
 #, c-format
 msgid "Details"
 msgstr "Manylion"
@@ -1941,207 +2010,218 @@ msgstr "Manylion"
 msgid "No hard drives found"
 msgstr "Heb ganfod gyrwyr caled"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Ext2"
 msgstr "Ext2"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Journalised FS"
-msgstr "Jwrnaleiddiwyd FS"
+msgstr "FS jwrnaleiddiwyd"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Swap"
 msgstr "Swap"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
-#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
+#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:284 mouse.pm:168
+#: services.pm:162 standalone/drakbackup:1609 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1181
 #, c-format
 msgid "Empty"
 msgstr "Gwag"
 
-#: diskdrake/hd_gtk.pm:330
+#: diskdrake/hd_gtk.pm:343
 #, c-format
 msgid "Filesystem types:"
 msgstr "Mathau o system ffeiliau:"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:362 diskdrake/hd_gtk.pm:368
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Defnyddiwch \"%s\" yn lle hynny"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:459
+#, c-format
+msgid "Create"
+msgstr "Creu"
+
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368
+#: diskdrake/interactive.pm:436 diskdrake/interactive.pm:606
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
-#: standalone/harddrake2:101
+#: standalone/harddrake2:106 standalone/harddrake2:115
 #, c-format
 msgid "Type"
 msgstr "Math"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
-#, c-format
-msgid "Create"
-msgstr "Creu"
-
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
-#: standalone/drakperm:124 standalone/printerdrake:242
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:444
+#: standalone/drakperm:124 standalone/printerdrake:235
 #, c-format
 msgid "Delete"
 msgstr "Dileu"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:368
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Defnyddiwch \"Dadosod\" yn gyntaf"
 
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
 #, c-format
 msgid "Choose another partition"
 msgstr "Dewiswch raniad arall"
 
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
 #, c-format
 msgid "Choose a partition"
 msgstr "Dewiswch raniad"
 
-#: diskdrake/interactive.pm:216
+#: diskdrake/interactive.pm:220
 #, c-format
 msgid "Exit"
 msgstr "Gadael"
 
-#: diskdrake/interactive.pm:249 help.pm:530
+#: diskdrake/interactive.pm:253 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Dadwneud"
 
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Arbenigwr > Cyffredinol"
 
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Cyffredinol > Arbenigwr"
 
-#: diskdrake/interactive.pm:268
+#: diskdrake/interactive.pm:272
 #, c-format
 msgid "Continue anyway?"
 msgstr "Parhau beth bynnag?"
 
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:275
+#, c-format
+msgid ""
+"You should format partition %s.\n"
+"Otherwise no entry for mount point %s will be written in fstab.\n"
+"Quit anyway?"
+msgstr ""
+"Dylech fformatio rhaniad %s.\n"
+"Fel arall ni fydd mynediad i bwynt gosod %s yn cael ei ysgrifennu yn fstab.\n"
+"Gadael beth bynnag?"
+
+#: diskdrake/interactive.pm:282
 #, c-format
 msgid "Quit without saving"
 msgstr "Gorffen heb gadw"
 
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:282
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Gorffen heb ysgrifennu'r tabl rhaniadau?"
 
-#: diskdrake/interactive.pm:278
+#: diskdrake/interactive.pm:287
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Ydych eisiau cadw newidiadau /etc/fstab"
 
-#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
+#: diskdrake/interactive.pm:294 install_steps_interactive.pm:329
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr ""
 "Bydd angen i chi ail gychwyn cyn i'r newidiadau yn eich tabl rhaniad ddigwydd"
 
-#: diskdrake/interactive.pm:298 help.pm:530
+#: diskdrake/interactive.pm:307 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Clirio i gyd"
 
-#: diskdrake/interactive.pm:299 help.pm:530
+#: diskdrake/interactive.pm:308 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Awto ddynodi"
 
-#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
-#: help.pm:855 install_steps_interactive.pm:124
+#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:122
 #, c-format
 msgid "More"
 msgstr "Rhagor"
 
-#: diskdrake/interactive.pm:305
+#: diskdrake/interactive.pm:314
 #, c-format
 msgid "Hard drive information"
 msgstr "Gwybodaeth am y ddisg galed"
 
-#: diskdrake/interactive.pm:337
+#: diskdrake/interactive.pm:346
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Mae pob rhaniad cynradd wedi ei ddefnyddio"
 
-#: diskdrake/interactive.pm:338
+#: diskdrake/interactive.pm:347
 #, c-format
-msgid "I can't add any more partitions"
+msgid "I can not add any more partitions"
 msgstr "Does dim modd ychwanegu rhaniadau ychwanegol"
 
-#: diskdrake/interactive.pm:339
+#: diskdrake/interactive.pm:348
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
 msgstr "I gael mwy o raniadau, dilëwch un i greu rhaniad estynedig"
 
-#: diskdrake/interactive.pm:350 help.pm:530
+#: diskdrake/interactive.pm:359 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Cadw'r tabl rhaniad"
 
-#: diskdrake/interactive.pm:351 help.pm:530
+#: diskdrake/interactive.pm:360 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Adfer y tabl rhaniad"
 
-#: diskdrake/interactive.pm:352 help.pm:530
+#: diskdrake/interactive.pm:361 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Achub y tabl rhaniadau"
 
-#: diskdrake/interactive.pm:354 help.pm:530
+#: diskdrake/interactive.pm:363 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Ail-lwytho'r tabl rhaniad"
 
-#: diskdrake/interactive.pm:356
+#: diskdrake/interactive.pm:365
 #, c-format
 msgid "Removable media automounting"
 msgstr "Cyfrwng symudadwy'n awto-osod"
 
-#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
+#: diskdrake/interactive.pm:376 diskdrake/interactive.pm:402
 #, c-format
 msgid "Select file"
 msgstr "Dewiswch ffeil"
 
-#: diskdrake/interactive.pm:372
+#: diskdrake/interactive.pm:388
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -2150,120 +2230,90 @@ msgstr ""
 "Nid yw'r tabl rhaniad wrth gefn yr un maint\n"
 "Parhau?"
 
-#: diskdrake/interactive.pm:386 harddrake/sound.pm:246 keyboard.pm:351
-#: lang.pm:1046 network/netconnect.pm:470 printer/printerdrake.pm:1037
-#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2075
-#: printer/printerdrake.pm:2110 printer/printerdrake.pm:2414
-#: printer/printerdrake.pm:3330 printer/printerdrake.pm:3611
-#: printer/printerdrake.pm:3733 printer/printerdrake.pm:4823
-#: standalone/drakTermServ:315 standalone/drakTermServ:1045
-#: standalone/drakTermServ:1101 standalone/drakTermServ:1769
-#: standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:165
-#: standalone/drakclock:225 standalone/drakconnect:972
-#: standalone/drakfloppy:291 standalone/drakups:27 standalone/scannerdrake:51
-#: standalone/scannerdrake:909
-#, c-format
-msgid "Warning"
-msgstr "Rhybudd"
-
-#: diskdrake/interactive.pm:387
-#, c-format
-msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
-msgstr ""
-"Rhowch ddisg meddal yn y gyrrwr\n"
-"Mi fydd yr holl wybodaeth ar y disg meddal yma yn cael ei golli"
-
-#: diskdrake/interactive.pm:398
+#: diskdrake/interactive.pm:417
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "Yn ceisio achub y tabl rhaniadau"
 
-#: diskdrake/interactive.pm:404
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Detailed information"
 msgstr "Gwybodaeth fanwl"
 
-#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:438 diskdrake/interactive.pm:743
 #, c-format
 msgid "Resize"
 msgstr "Newid maint"
 
-#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
-#, c-format
-msgid "Move"
-msgstr "Symud"
-
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:439
 #, c-format
 msgid "Format"
 msgstr "Fformatio"
 
-#: diskdrake/interactive.pm:423
+#: diskdrake/interactive.pm:441
 #, c-format
 msgid "Add to RAID"
 msgstr "Ychwanegu i RAID"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:442
 #, c-format
 msgid "Add to LVM"
 msgstr "Ychwanegu i LVM"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:445
 #, c-format
 msgid "Remove from RAID"
 msgstr "Tynnu o RAID"
 
-#: diskdrake/interactive.pm:428
+#: diskdrake/interactive.pm:446
 #, c-format
 msgid "Remove from LVM"
 msgstr "Tynnu o LVM"
 
-#: diskdrake/interactive.pm:429
+#: diskdrake/interactive.pm:447
 #, c-format
 msgid "Modify RAID"
 msgstr "Newid RAID"
 
-#: diskdrake/interactive.pm:430
+#: diskdrake/interactive.pm:448
 #, c-format
 msgid "Use for loopback"
 msgstr "Defnyddiwch ar gyfer cylchol"
 
-#: diskdrake/interactive.pm:472
+#: diskdrake/interactive.pm:497
 #, c-format
 msgid "Create a new partition"
 msgstr "Creu rhaniad newydd"
 
-#: diskdrake/interactive.pm:475
+#: diskdrake/interactive.pm:500
 #, c-format
 msgid "Start sector: "
 msgstr "Sector dechreuol: "
 
-#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
+#: diskdrake/interactive.pm:502 diskdrake/interactive.pm:899
 #, c-format
 msgid "Size in MB: "
 msgstr "Maint mewn MB: "
 
-#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:503 diskdrake/interactive.pm:900
 #, c-format
 msgid "Filesystem type: "
 msgstr "Math o system ffeilio"
 
-#: diskdrake/interactive.pm:483
+#: diskdrake/interactive.pm:508
 #, c-format
 msgid "Preference: "
 msgstr "Dewis"
 
-#: diskdrake/interactive.pm:486
+#: diskdrake/interactive.pm:511
 #, c-format
 msgid "Logical volume name "
 msgstr "Enw cyfrol resymegol"
 
-#: diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:541
 #, c-format
 msgid ""
-"You can't create a new partition\n"
+"You can not create a new partition\n"
 "(since you reached the maximal number of primary partitions).\n"
 "First remove a primary partition and create an extended partition."
 msgstr ""
@@ -2271,244 +2321,219 @@ msgstr ""
 "(gan eich bod wedi cyrraedd y nifer uchaf o raniadau cynradd).\n"
 "Diddymwch raniad cynradd a chreu rhaniad estynedig."
 
-#: diskdrake/interactive.pm:545
+#: diskdrake/interactive.pm:571
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Tynnu'r ffeil gylchol?"
 
-#: diskdrake/interactive.pm:564
+#: diskdrake/interactive.pm:590
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr ""
 "Wedi newid math raniad %s, bydd yr holl ddata ar y rhaniad yn cael ei golli"
 
-#: diskdrake/interactive.pm:576
+#: diskdrake/interactive.pm:602
 #, c-format
 msgid "Change partition type"
 msgstr "Newid math y rhaniad"
 
-#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:603 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Pa fath o system ffeil  ydych chi eisiau?"
 
-#: diskdrake/interactive.pm:585
+#: diskdrake/interactive.pm:611
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Newid o ext2 i ext3"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:640
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "Lle'r hoffech chi osod y ffeil gylchol %s?"
 
-#: diskdrake/interactive.pm:615
+#: diskdrake/interactive.pm:641
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Lle'r ydych am osod dyfais %s?"
 
-#: diskdrake/interactive.pm:620
+#: diskdrake/interactive.pm:646
 #, c-format
 msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
+"Can not unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 "Methu dadsetio'r pwynt gosod gan fod y rhaniad yn cael ei ddefnyddio ar "
 "gyfer cylch-ôl\n"
 "Tynnu'r cylch-ôl yn gyntaf"
 
-#: diskdrake/interactive.pm:645
+#: diskdrake/interactive.pm:671
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Lle'r ydych am osod %s?"
 
-#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: diskdrake/interactive.pm:695 diskdrake/interactive.pm:774
 #: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "Newid maint"
 
-#: diskdrake/interactive.pm:669
+#: diskdrake/interactive.pm:695
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "Cyfrifo ffiniau system ffeiliau FAT"
 
-#: diskdrake/interactive.pm:705
+#: diskdrake/interactive.pm:731
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Nid oes modd newid maint y rhaniad"
 
-#: diskdrake/interactive.pm:710
+#: diskdrake/interactive.pm:736
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "Dylai'r holl ddata ar y rhaniad gael ei gadw wrth gefn"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:738
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr ""
 "Ar ôl newid maint rhaniad %s, bydd yr holl ddata ar y rhaniad yma yn cael ei "
 "golli"
 
-#: diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:743
 #, c-format
 msgid "Choose the new size"
 msgstr "Dewiswch y maint newydd"
 
-#: diskdrake/interactive.pm:718
+#: diskdrake/interactive.pm:744
 #, c-format
 msgid "New size in MB: "
 msgstr "Maint mewn MB: "
 
-#: diskdrake/interactive.pm:761 install_interactive.pm:196
+#: diskdrake/interactive.pm:787 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
 "filesystem checks will be run on your next boot into Windows(TM)"
 msgstr ""
-"I sicrhau cywirdeb data'r rhaniad ar ôl ailfeintiol'r rhaniad(au),bydd \n"
+"I sicrhau cywirdeb data'r rhaniad ar ôl ail-feintioli’r rhaniad(au), bydd \n"
 "gwiriadau'r system ffeiliau'n cael eu gwneud wrth i chi ail gychwyn Windows "
 "(TM)"
 
-#: diskdrake/interactive.pm:784
-#, c-format
-msgid "Which disk do you want to move it to?"
-msgstr "Pa ddisg hoffech chi symud iddo?"
-
-#: diskdrake/interactive.pm:785
-#, c-format
-msgid "Sector"
-msgstr "Sector"
-
-#: diskdrake/interactive.pm:786
-#, c-format
-msgid "Which sector do you want to move it to?"
-msgstr "Pa sector hoffech chi symud ato?"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving"
-msgstr "Symud"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving partition..."
-msgstr "Yn symud rhaniad.."
-
-#: diskdrake/interactive.pm:810
+#: diskdrake/interactive.pm:825
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Dewis RAID presennol i ychwanegu ato"
 
-#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
+#: diskdrake/interactive.pm:827 diskdrake/interactive.pm:844
 #, c-format
 msgid "new"
 msgstr "newydd"
 
-#: diskdrake/interactive.pm:826
+#: diskdrake/interactive.pm:842
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Dewis LVM presennol i ychwanegu ato"
 
-#: diskdrake/interactive.pm:832
+#: diskdrake/interactive.pm:848
 #, c-format
 msgid "LVM name?"
 msgstr "Enw LVM"
 
-#: diskdrake/interactive.pm:869
+#: diskdrake/interactive.pm:884
 #, c-format
-msgid "This partition can't be used for loopback"
+msgid "This partition can not be used for loopback"
 msgstr "Nid oes modd defnyddio'r rhaniad ar gyfer cylchol"
 
-#: diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:897
 #, c-format
 msgid "Loopback"
 msgstr "Cylch-ôl"
 
-#: diskdrake/interactive.pm:883
+#: diskdrake/interactive.pm:898
 #, c-format
 msgid "Loopback file name: "
 msgstr "Enw ffeil gylchol"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:903
 #, c-format
 msgid "Give a file name"
 msgstr "Rhowch enw ffeil"
 
-#: diskdrake/interactive.pm:891
+#: diskdrake/interactive.pm:906
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr ""
 "Mae'r ffeil yn cael ei ddefnyddio eisoes gam cylchol arall, dewiswch un arall"
 
-#: diskdrake/interactive.pm:892
+#: diskdrake/interactive.pm:907
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Defnyddiwch hwn?"
 
-#: diskdrake/interactive.pm:915
+#: diskdrake/interactive.pm:930
 #, c-format
 msgid "Mount options"
 msgstr "Dewisiadau gosod"
 
-#: diskdrake/interactive.pm:922
+#: diskdrake/interactive.pm:937
 #, c-format
 msgid "Various"
 msgstr "Amrywiol"
 
-#: diskdrake/interactive.pm:987
+#: diskdrake/interactive.pm:1002
 #, c-format
 msgid "device"
 msgstr "dyfais"
 
-#: diskdrake/interactive.pm:988
+#: diskdrake/interactive.pm:1003
 #, c-format
 msgid "level"
 msgstr "lefel"
 
-#: diskdrake/interactive.pm:989
+#: diskdrake/interactive.pm:1004
 #, c-format
 msgid "chunk size in KiB"
 msgstr "Maint darn yn KiB"
 
-#: diskdrake/interactive.pm:1006
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Byddwch ofalus: mae'r weithred hon yn beryglus."
 
-#: diskdrake/interactive.pm:1021
+#: diskdrake/interactive.pm:1036
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Pa fath o raniad ?"
 
-#: diskdrake/interactive.pm:1059
+#: diskdrake/interactive.pm:1074
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Mi fydd angen i chi ailgychwyn cyn i'r newidiadau ddod i rym"
 
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1083
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Mae tabl rhaniad disg %s yn mynd i gael ei ysgrifennu i'r ddisg!"
 
-#: diskdrake/interactive.pm:1081
+#: diskdrake/interactive.pm:1096
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr ""
 "Wedi fformatio rhaniad %s, bydd yr holl ddata ar y rhaniad yn cael ei golli"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Symud ffeiliau i'r rhaniad newydd"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
 #, c-format
 msgid "Hide files"
 msgstr "Cuddio ffeiliau"
 
-#: diskdrake/interactive.pm:1102
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2517,103 +2542,108 @@ msgstr ""
 "Mae cyfarwyddiadur %s eisoes yn cynnwys peth data\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1113
+#: diskdrake/interactive.pm:1124
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Symud ffeiliau i'r rhaniad newydd"
 
-#: diskdrake/interactive.pm:1117
+#: diskdrake/interactive.pm:1128
 #, c-format
 msgid "Copying %s"
 msgstr "Copïo %s"
 
-#: diskdrake/interactive.pm:1121
+#: diskdrake/interactive.pm:1132
 #, c-format
 msgid "Removing %s"
 msgstr "Tynnu %s"
 
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1146
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "Mae rhaniad %s yn cael ei alw'n %s"
 
-#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1147
+#, c-format
+msgid "Partitions have been renumbered: "
+msgstr "Mae'r rhaniadau wedi eu hail-rifo"
+
+#: diskdrake/interactive.pm:1167 diskdrake/interactive.pm:1226
 #, c-format
 msgid "Device: "
 msgstr "Dyfais: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1168
 #, c-format
 msgid "Devfs name: "
 msgstr "Enw devfs:"
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1169
 #, c-format
 msgid "Volume label: "
 msgstr "Label y gyfrol:"
 
-#: diskdrake/interactive.pm:1159
+#: diskdrake/interactive.pm:1170
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Llythyren disg DOS: %s (dim ond dyfalu)\n"
 
-#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1235
+#: diskdrake/interactive.pm:1174 diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1244
 #, c-format
 msgid "Type: "
 msgstr "Math: "
 
-#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
+#: diskdrake/interactive.pm:1178 install_steps_gtk.pm:296
 #, c-format
 msgid "Name: "
 msgstr "Enw : "
 
-#: diskdrake/interactive.pm:1174
+#: diskdrake/interactive.pm:1185
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Dechrau: sector %s\n"
 
-#: diskdrake/interactive.pm:1175
+#: diskdrake/interactive.pm:1186
 #, c-format
 msgid "Size: %s"
 msgstr "Maint: %s"
 
-#: diskdrake/interactive.pm:1177
+#: diskdrake/interactive.pm:1188
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sector"
 
-#: diskdrake/interactive.pm:1179
+#: diskdrake/interactive.pm:1190
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "Silindr %d i silindr %d\n"
 
-#: diskdrake/interactive.pm:1180
+#: diskdrake/interactive.pm:1191
 #, c-format
 msgid "Number of logical extents: %d"
 msgstr "Enw cyfrol resymegol: %d"
 
-#: diskdrake/interactive.pm:1181
+#: diskdrake/interactive.pm:1192
 #, c-format
 msgid "Formatted\n"
 msgstr "Wedi ei fformatio\n"
 
-#: diskdrake/interactive.pm:1182
+#: diskdrake/interactive.pm:1193
 #, c-format
 msgid "Not formatted\n"
 msgstr "Heb ei fformatio\n"
 
-#: diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1194
 #, c-format
 msgid "Mounted\n"
 msgstr "Gosodwyd\n"
 
-#: diskdrake/interactive.pm:1184
+#: diskdrake/interactive.pm:1195
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1197
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2622,7 +2652,7 @@ msgstr ""
 "Ffeil(iau) Cylch-ôl:\n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1198
 #, c-format
 msgid ""
 "Partition booted by default\n"
@@ -2631,27 +2661,27 @@ msgstr ""
 "Cychwyn y rhaniad fel rhagosodwyd\n"
 "    (ar gyfer cychwyn MS-DOS, nid ar gyfer lilo)\n"
 
-#: diskdrake/interactive.pm:1189
+#: diskdrake/interactive.pm:1200
 #, c-format
 msgid "Level %s\n"
 msgstr "Lefel %s\n"
 
-#: diskdrake/interactive.pm:1190
+#: diskdrake/interactive.pm:1201
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "Maint darn %d KiB\n"
 
-#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1202
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Disg RAID %s\n"
 
-#: diskdrake/interactive.pm:1193
+#: diskdrake/interactive.pm:1204
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Enw ffeil gylchol: %s"
 
-#: diskdrake/interactive.pm:1196
+#: diskdrake/interactive.pm:1207
 #, c-format
 msgid ""
 "\n"
@@ -2660,11 +2690,11 @@ msgid ""
 "probably leave it alone.\n"
 msgstr ""
 "\n"
-"Mwy na thebyd rhaniad Gyrrwr\n"
+"Mwy na thebyg rhaniad Gyrrwr\n"
 "yw'r rhaniad hwn. Gwell gadael\n"
-"llonnydd iddo.\n"
+"llonydd iddo.\n"
 
-#: diskdrake/interactive.pm:1199
+#: diskdrake/interactive.pm:1210
 #, c-format
 msgid ""
 "\n"
@@ -2677,69 +2707,69 @@ msgstr ""
 "hwn ar gyfer cychwyniad\n"
 "dwbl eich system\n"
 
-#: diskdrake/interactive.pm:1218
+#: diskdrake/interactive.pm:1227
 #, c-format
 msgid "Read-only"
 msgstr "Darllen yn unig"
 
-#: diskdrake/interactive.pm:1219
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid "Size: %s\n"
 msgstr "Maint: %s\n"
 
-#: diskdrake/interactive.pm:1220
+#: diskdrake/interactive.pm:1229
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometreg: %s silindr, %s pen, %s sector\n"
 
-#: diskdrake/interactive.pm:1221
+#: diskdrake/interactive.pm:1230
 #, c-format
 msgid "Info: "
 msgstr "Gwybodaeth:"
 
-#: diskdrake/interactive.pm:1222
+#: diskdrake/interactive.pm:1231
 #, c-format
 msgid "LVM-disks %s\n"
-msgstr "Dias LVM %s\n"
+msgstr "Disg LVM %s\n"
 
-#: diskdrake/interactive.pm:1223
+#: diskdrake/interactive.pm:1232
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Tabl rhaniad math: %s\n"
 
-#: diskdrake/interactive.pm:1224
+#: diskdrake/interactive.pm:1233
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "ar sianel %d id %d\n"
 
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Allwedd amgryptio system ffeil : "
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1266
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Dewiswch eich allwedd amgryptio system ffeiliau"
 
-#: diskdrake/interactive.pm:1260
+#: diskdrake/interactive.pm:1269
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr ""
 "Mae'r allwedd amgryptio'n rhy syml (mae'n rhaid bod o leiaf %d nod o hyd)"
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1270
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Nid yw'r allweddi amgryptio'n cyd-fynd"
 
-#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
-#: standalone/drakconnect:395
+#: diskdrake/interactive.pm:1273 network/netconnect.pm:1136
+#: standalone/drakconnect:397
 #, c-format
 msgid "Encryption key"
 msgstr "Allwedd amgryptio"
 
-#: diskdrake/interactive.pm:1265
+#: diskdrake/interactive.pm:1274
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Allwedd amgryptio (eto)"
@@ -2751,7 +2781,7 @@ msgstr "Newid y math"
 
 #: diskdrake/smbnfs_gtk.pm:163
 #, c-format
-msgid "Can't login using username %s (bad password?)"
+msgid "Can not login using username %s (bad password?)"
 msgstr ""
 "Methu mewngofnodi gan ddefnyddio enw defnyddiwr %s (cyfrinair anghywir?)"
 
@@ -2778,7 +2808,7 @@ msgstr ""
 "Rhowch eich enw defnyddiwr, cyfrinair ac enw parth i gael mynediad i'r "
 "gwesteiwr."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3494
 #, c-format
 msgid "Username"
 msgstr "Enw defnyddiwr"
@@ -2808,52 +2838,52 @@ msgstr "Mae pecyn gorfodol %s ar goll"
 msgid "Installing packages..."
 msgstr "Gosod pecynnau..."
 
-#: do_pkgs.pm:216
+#: do_pkgs.pm:217
 #, c-format
 msgid "Removing packages..."
 msgstr "Tynnu pecyn..."
 
-#: fs.pm:445 fs.pm:494
+#: fs.pm:487 fs.pm:536
 #, c-format
 msgid "Mounting partition %s"
 msgstr "Yn fformatio rhaniad %s"
 
-#: fs.pm:446 fs.pm:495
+#: fs.pm:488 fs.pm:537
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "methodd gosod rhaniad %s yng nghyfeiriadur %s"
 
-#: fs.pm:466 fs.pm:473
+#: fs.pm:508 fs.pm:515
 #, c-format
 msgid "Checking %s"
 msgstr "Gwirio %s"
 
-#: fs.pm:511 partition_table.pm:387
+#: fs.pm:553 partition_table.pm:391
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "gwall dadosod %s: %s"
 
-#: fs.pm:543
+#: fs.pm:585
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "Galluogi rhaniad cyfnewid %s"
 
-#: fs/format.pm:39 fs/format.pm:46
+#: fs/format.pm:44 fs/format.pm:51
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Yn fformatio rhaniad %s"
 
-#: fs/format.pm:43
+#: fs/format.pm:48
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Creu a fformatio ffeil %s"
 
-#: fs/format.pm:78
+#: fs/format.pm:83
 #, c-format
-msgid "I don't know how to format %s in type %s"
+msgid "I do not know how to format %s in type %s"
 msgstr "Nid wyf yn gwybod sut i fformatio %s ym math %s"
 
-#: fs/format.pm:80
+#: fs/format.pm:88 fs/format.pm:90
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "methodd  fformatio %s o %s"
@@ -2864,7 +2894,7 @@ msgid ""
 "Do not update inode access times on this file system\n"
 "(e.g, for faster access on the news spool to speed up news servers)."
 msgstr ""
-"Peidiwich diweddaru amser mynediad inode ar y system ffeiliau\n"
+"Peidiwch ddiweddaru amser mynediad inode ar y system ffeiliau\n"
 "(e.e. ar gyfer mynediad cynt ar y cylch newyddion i gyflymu gweinyddion "
 "newyddion)."
 
@@ -2875,7 +2905,7 @@ msgid ""
 "the -a option will not cause the file system to be mounted)."
 msgstr ""
 "Dim ond ei osod yn benodol (h.y.,\n"
-"bydd y dewis -a yn achosi i'r systrm gael ei osod)."
+"bydd y dewis -a yn achosi i'r system gael ei osod)."
 
 #: fs/mount_options.pm:118
 #, c-format
@@ -2890,9 +2920,9 @@ msgid ""
 "file system. This option might be useful for a server that has file systems\n"
 "containing binaries for architectures other than its own."
 msgstr ""
-"Peidio caniatáu gweithrediad unrhyw deueuddiau ar system ffeil wedi ei\n"
+"Peidio caniatáu gweithrediad unrhyw dueddiad ar system ffeil wedi ei\n"
 "gosod. Gall y dewis fod yn ddefnyddiol ar gyfer gweinydd sydd ganddo\n"
-"systemau ffeiliau yn cynnwys deueiddiau fel pensaerniaeth gwahanol i'w un ei "
+"systemau ffeiliau yn cynnwys tueddiad fel pensaernïaeth wahanol i'w un ei "
 "hun."
 
 #: fs/mount_options.pm:124
@@ -2902,7 +2932,7 @@ msgid ""
 "bits to take effect. (This seems safe, but is in fact rather unsafe if you\n"
 "have suidperl(1) installed.)"
 msgstr ""
-"Peidio gadael i didiau enw-defnyddiwr-set neu enw-grwp-set\n"
+"Peidio gadael i didau enw-defnyddiwr-set neu enw-grwp-set\n"
 "i gymryd effaith. (Mae i weld yn ddiogel on mae braidd yn anniogel os\n"
 "yw uidperl(1) wedi ei osod.)"
 
@@ -2926,12 +2956,12 @@ msgid ""
 "(unless overridden by subsequent options, as in the option line\n"
 "user,exec,dev,suid )."
 msgstr ""
-"Caniatau i ddefnyddiwr cyffredin osod y system ffeil. Mae \n"
+"Caniatáu i ddefnyddiwr cyffredin osod y system ffeil. Mae \n"
 "enw'r defnyddiwr gosod yn cael ei ysgrifennu i mtab fel ei fod yn gallu "
 "dadosod\n"
 "y system ffeil eto. Mae'r dewis yn arwyddo dewisiadau noexec, nosuid, and "
 "nodev\n"
-"(ac onibai ei fod wedi ddiystyru gan ddewisiadau dilynnol, fel yn y llinell "
+"(ac oni bai ei fod wedi diystyru gan ddewisiadau dilynol, fel yn y llinell "
 "dewis\n"
 "user,exec,dev,suid )."
 
@@ -2945,14 +2975,14 @@ msgstr "Rhoi mynediad ysgrifennu i ddefnyddwyr cyffredin"
 msgid "Give read-only access to ordinary users"
 msgstr "Rhoi mynediad darllen yn unig i ddefnyddwyr cyffredin"
 
-#: fs/type.pm:364
+#: fs/type.pm:370
 #, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
+msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "Does dim modd defnyddio JFS ar raniadau llai na 16MB"
 
-#: fs/type.pm:365
+#: fs/type.pm:371
 #, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "Does dim modd defnyddio ReiserFS ar gyfer rhaniadau llai na 32MB"
 
 #: fsedit.pm:25
@@ -2965,10 +2995,11 @@ msgstr "gyda /usr"
 msgid "server"
 msgstr "Gweinydd"
 
-#: fsedit.pm:168
+#: fsedit.pm:184
 #, c-format
 msgid ""
-"I can't read the partition table of device %s, it's too corrupted for me :(\n"
+"I can not read the partition table of device %s, it's too corrupted for me :"
+"(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
 "The other solution is to not allow DrakX to modify the partition table.\n"
 "(the error is %s)\n"
@@ -2982,22 +3013,22 @@ msgstr ""
 "\n"
 "Ydych chi'n cytuno i golli'r holl raniadau?\n"
 
-#: fsedit.pm:385
+#: fsedit.pm:401
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Rhaid i bwyntiau gosod gynnwys / arweiniol"
 
-#: fsedit.pm:386
+#: fsedit.pm:402
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Dylai enw'r pwyntiau gosod gynnwys llythrennau a  rhifau'n unig"
 
-#: fsedit.pm:387
+#: fsedit.pm:403
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Mae yna eisoes raniad gyda phwynt gosod %s\n"
 
-#: fsedit.pm:389
+#: fsedit.pm:405
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -3005,15 +3036,15 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 "Rydych wedi dewis meddalwedd rhannu RAID fel gwraidd (/)\n"
-"Nid oes cychwynnwr yn gallu trin hwn heb rhaniad /boot\n"
+"Nid oes cychwynnwr yn gallu trin hwn heb raniad /boot\n"
 "Cofiwch ychwanegu rhaniad /boot"
 
-#: fsedit.pm:392
+#: fsedit.pm:408
 #, c-format
-msgid "You can't use a LVM Logical Volume for mount point %s"
+msgid "You can not use a LVM Logical Volume for mount point %s"
 msgstr "Does dim modd defnyddio Cyfrol Resymegol LVM ar gyfer pwynt gosod %s"
 
-#: fsedit.pm:394
+#: fsedit.pm:410
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -3021,24 +3052,24 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 "Rydych wedi dewis Cyfrol Resymegol LVM fel gwraidd (/)\n"
-"Nid oes cychwynnwr yn gallu trin hwn heb rhaniad /boot\n"
+"Nid oes cychwynnwr yn gallu trin hwn heb raniad /boot\n"
 "Cofiwch ychwanegu rhaniad /boot"
 
-#: fsedit.pm:397
+#: fsedit.pm:413
 #, c-format
 msgid ""
-"You may not be able to install lilo (since lilo doesn't handle a LV on "
+"You may not be able to install lilo (since lilo does not handle a LV on "
 "multiple PVs)"
 msgstr ""
 "Efallai na fydd modd i chi osod lilo (gan nad yw lilo'n trin LV ar PV "
 "lluosog)"
 
-#: fsedit.pm:400 fsedit.pm:402
+#: fsedit.pm:416 fsedit.pm:418
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Dylai'r cyfeiriadur aros o fewn y system ffeilio gwraidd"
 
-#: fsedit.pm:404 fsedit.pm:406
+#: fsedit.pm:420 fsedit.pm:422
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -3047,27 +3078,22 @@ msgstr ""
 "Mae angen gwir system ffeilio (ext2, reiserfs,  xfs, neu jfs)) ar gyfer y "
 "pwynt gosod\n"
 
-#: fsedit.pm:408
+#: fsedit.pm:424
 #, c-format
-msgid "You can't use an encrypted file system for mount point %s"
+msgid "You can not use an encrypted file system for mount point %s"
 msgstr "Nid oes modd defnyddio Cyfrol Resymegol LVM ar gyfer pwynt gosod %s"
 
-#: fsedit.pm:469
+#: fsedit.pm:485
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Nid oes digon o le ar gyfer awto ddynodi"
 
-#: fsedit.pm:471
+#: fsedit.pm:487
 #, c-format
 msgid "Nothing to do"
 msgstr "Dim i'w wneud"
 
-#: fsedit.pm:569
-#, c-format
-msgid "Error opening %s for writing: %s"
-msgstr "Gwall wrth agos %s ar gyfer ysgrifennu %s"
-
-#: harddrake/data.pm:61
+#: harddrake/data.pm:61 install_any.pm:1505
 #, c-format
 msgid "Floppy"
 msgstr "Disg Meddal"
@@ -3077,12 +3103,12 @@ msgstr "Disg Meddal"
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:81
+#: harddrake/data.pm:81 install_any.pm:1506
 #, c-format
-msgid "Disk"
+msgid "Hard Disk"
 msgstr "Disg"
 
-#: harddrake/data.pm:90
+#: harddrake/data.pm:90 install_any.pm:1507
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
@@ -3097,7 +3123,7 @@ msgstr "Llosgwyr CD/DVD"
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:120 standalone/drakbackup:2045
+#: harddrake/data.pm:120 standalone/drakbackup:2051
 #, c-format
 msgid "Tape"
 msgstr "Tâp"
@@ -3127,135 +3153,140 @@ msgstr "Cerdyn sain"
 msgid "Webcam"
 msgstr "Camera Gwe"
 
-#: harddrake/data.pm:181
+#: harddrake/data.pm:180
 #, c-format
 msgid "Processors"
 msgstr "Prosesyddion"
 
-#: harddrake/data.pm:191
+#: harddrake/data.pm:190
 #, c-format
 msgid "ISDN adapters"
 msgstr "Addaswyr ISDN"
 
-#: harddrake/data.pm:201
+#: harddrake/data.pm:200
 #, c-format
 msgid "Ethernetcard"
 msgstr "Cerdyn Ethernet"
 
-#: harddrake/data.pm:219 network/netconnect.pm:484
+#: harddrake/data.pm:218 network/netconnect.pm:518
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:229
+#: harddrake/data.pm:228
 #, c-format
 msgid "ADSL adapters"
 msgstr "Addaswyr ADSL"
 
-#: harddrake/data.pm:243
+#: harddrake/data.pm:242
 #, c-format
-msgid "AGP controllers"
-msgstr "Rheolyddion AGP"
+msgid "Memory"
+msgstr "Cof"
 
-#: harddrake/data.pm:252
+#: harddrake/data.pm:251
 #, c-format
-msgid "Bridges and system controllers"
-msgstr "Rheolyddion pontydd a system"
+msgid "AGP controllers"
+msgstr "Rheolyddion AGP"
 
-#: harddrake/data.pm:261 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
+#: harddrake/data.pm:260 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:978
 #, c-format
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: harddrake/data.pm:271
+#: harddrake/data.pm:270
 #, c-format
 msgid "Joystick"
 msgstr "Ffon hud"
 
-#: harddrake/data.pm:281
+#: harddrake/data.pm:280
 #, c-format
 msgid "(E)IDE/ATA controllers"
 msgstr "Rheolyddion (E)IDE/ATA"
 
-#: harddrake/data.pm:290
+#: harddrake/data.pm:289
 #, c-format
 msgid "SATA controllers"
 msgstr "Rheolyddion SATA"
 
-#: harddrake/data.pm:299
+#: harddrake/data.pm:298
 #, c-format
 msgid "Firewire controllers"
 msgstr "Rheolyddion firewire"
 
-#: harddrake/data.pm:308
+#: harddrake/data.pm:307
 #, c-format
 msgid "PCMCIA controllers"
 msgstr "Rheolyddion PCMCIA"
 
-#: harddrake/data.pm:321
+#: harddrake/data.pm:316
 #, c-format
 msgid "SCSI controllers"
 msgstr "Rheolyddion SCSI"
 
-#: harddrake/data.pm:330
+#: harddrake/data.pm:325
 #, c-format
 msgid "USB controllers"
 msgstr "Rheolyddion USB"
 
-#: harddrake/data.pm:339
+#: harddrake/data.pm:334
 #, c-format
 msgid "USB ports"
 msgstr "Pyrth USB"
 
-#: harddrake/data.pm:348
+#: harddrake/data.pm:343
 #, c-format
 msgid "SMBus controllers"
 msgstr "Rheolyddion SMBus"
 
-#: harddrake/data.pm:357
+#: harddrake/data.pm:352
+#, c-format
+msgid "Bridges and system controllers"
+msgstr "Rheolyddion pontydd a system"
+
+#: harddrake/data.pm:361
 #, c-format
 msgid "UPS"
 msgstr "UPS"
 
-#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
-#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#: harddrake/data.pm:370 help.pm:855 install_steps_interactive.pm:118
+#: install_steps_interactive.pm:938 standalone/keyboarddrake:28
 #, c-format
 msgid "Keyboard"
 msgstr "Bysellfwrdd"
 
-#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#: harddrake/data.pm:383 help.pm:855 install_steps_interactive.pm:971
 #, c-format
 msgid "Mouse"
 msgstr "Llygoden"
 
-#: harddrake/data.pm:393
+#: harddrake/data.pm:397
 #, c-format
 msgid "Scanner"
 msgstr "Sganiwr"
 
-#: harddrake/data.pm:403 standalone/harddrake2:431
+#: harddrake/data.pm:407 standalone/harddrake2:439
 #, c-format
 msgid "Unknown/Others"
 msgstr "Anhysbys/Eraill"
 
-#: harddrake/data.pm:431
+#: harddrake/data.pm:435
 #, c-format
 msgid "cpu # "
 msgstr "cpu # "
 
-#: harddrake/sound.pm:170 standalone/drakconnect:169
-#: standalone/drakconnect:613
+#: harddrake/sound.pm:191 standalone/drakconnect:169
+#: standalone/drakconnect:615
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Arhoswch...Gosod y ffurfweddiad"
 
-#: harddrake/sound.pm:206
+#: harddrake/sound.pm:227
 #, c-format
 msgid "No alternative driver"
 msgstr "Dim gyrwyr eraill"
 
-#: harddrake/sound.pm:207
+#: harddrake/sound.pm:228
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3264,12 +3295,12 @@ msgstr ""
 "Nid oes gyrrwr OSS/ALSA  arall hysbys ar gyfer eich cerdyn sain (%s) sy'n "
 "defnyddio \"%s\" ar hyn o bryd"
 
-#: harddrake/sound.pm:213
+#: harddrake/sound.pm:234
 #, c-format
 msgid "Sound configuration"
 msgstr "Ffurfweddiad sain"
 
-#: harddrake/sound.pm:215
+#: harddrake/sound.pm:236
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3278,7 +3309,10 @@ msgstr ""
 "Yma gallwch ddewis gyrrwr arall (un ai OSS neu ALSA) ar gyfer eich cerdyn "
 "sain (%s)"
 
-#: harddrake/sound.pm:217
+#. -PO: here the first %s is either "OSS" or "ALSA", 
+#. -PO: the second %s is the name of the current driver
+#. -PO: and the third %s is the name of the default driver
+#: harddrake/sound.pm:241
 #, c-format
 msgid ""
 "\n"
@@ -3291,7 +3325,7 @@ msgstr ""
 "Mae eich cerdyn yn defnyddio'r gyrrwr %s\"%s\" ar hyn o bryd ( y gyrrwr "
 "arferol ar ei gyfer yw \"%s\")"
 
-#: harddrake/sound.pm:219
+#: harddrake/sound.pm:243
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3310,12 +3344,12 @@ msgid ""
 "- the new ALSA api that provides many enhanced features but requires using "
 "the ALSA library.\n"
 msgstr ""
-"OSS (Open Sound System) oedd yr API sain cyntaf. Mae'n API sail annibynnol o "
+"OSS (Open Sound System) oedd yr API sain gyntaf. Mae'n API sail annibynnol o "
 "systemau gweithredu ( mae ar gael ar gyfer y rhan fwyaf o systemau unices) "
 "on mae'n API elfennol iawn a chyfyng.\n"
 "Mae gyrwyr OSS hefyd yn ail ddyfeisio'r hyn sy'n bod eisoes.\n"
 "\n"
-"Mae ALSA (Advanced Linux Sound Architecture) yn bensaerniaeth fodiwlaidd "
+"Mae ALSA (Advanced Linux Sound Architecture) yn bensaernïaeth fodiwlaidd "
 "sy'n \n"
 "cynnal ystod eang o gardiau ISA, USB a PCI.\n"
 "\n"
@@ -3326,17 +3360,34 @@ msgstr ""
 "- api ALSA newydd sy'n darparu llawer o nodweddion gell ond sydd angen "
 "defnyddio llyfrgell ALSA.\n"
 
-#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
+#: harddrake/sound.pm:257 harddrake/sound.pm:342 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "Gyrrwr:"
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:262
 #, c-format
 msgid "Trouble shooting"
 msgstr "Datrys problemau"
 
-#: harddrake/sound.pm:246
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1039
+#: network/netconnect.pm:504 printer/printerdrake.pm:1142
+#: printer/printerdrake.pm:2142 printer/printerdrake.pm:2228
+#: printer/printerdrake.pm:2274 printer/printerdrake.pm:2341
+#: printer/printerdrake.pm:2376 printer/printerdrake.pm:2684
+#: printer/printerdrake.pm:2691 printer/printerdrake.pm:3643
+#: printer/printerdrake.pm:3970 printer/printerdrake.pm:4092
+#: printer/printerdrake.pm:5183 standalone/drakTermServ:325
+#: standalone/drakTermServ:1111 standalone/drakTermServ:1172
+#: standalone/drakTermServ:1821 standalone/drakbackup:510
+#: standalone/drakbackup:609 standalone/drakboot:165 standalone/drakclock:224
+#: standalone/drakconnect:971 standalone/drakfloppy:291 standalone/drakups:27
+#: standalone/scannerdrake:51 standalone/scannerdrake:940
+#, c-format
+msgid "Warning"
+msgstr "Rhybudd"
+
+#: harddrake/sound.pm:270
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3351,12 +3402,12 @@ msgstr ""
 "\n"
 "Bydd y gyrrwr \"%s|\"'n cael ei ddefnyddio ar y cychwyn"
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:278
 #, c-format
 msgid "No open source driver"
 msgstr "Dim gyrrwr cod agored"
 
-#: harddrake/sound.pm:255
+#: harddrake/sound.pm:279
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3365,33 +3416,33 @@ msgstr ""
 "Nid oes gyrrwr rhydd ar gyfer eich cerdyn sain (%s) ond mae gyrrwr "
 "perchnogol yn \"%s\" ."
 
-#: harddrake/sound.pm:258
+#: harddrake/sound.pm:282
 #, c-format
 msgid "No known driver"
 msgstr "Dim gyrrwr hysbys"
 
-#: harddrake/sound.pm:259
+#: harddrake/sound.pm:283
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Nid oes gyrrwr hysbys ar gyfer eich cerdyn sain (%s)"
 
-#: harddrake/sound.pm:263
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Unknown driver"
 msgstr "Gyrrwr anhysbys"
 
-#: harddrake/sound.pm:264
+#: harddrake/sound.pm:288
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
 msgstr "Gwall. Nid yw gyrrwr \"%s\" wedi ei restru"
 
-#: harddrake/sound.pm:278
+#: harddrake/sound.pm:302
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Datrys problemau sain"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:281
+#: harddrake/sound.pm:305
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3417,35 +3468,36 @@ msgstr ""
 "Prawf gwall sain - rhedeg y gorchmynion canlynol:\n"
 "\n"
 "\n"
-"- \"lspcidrake -v | fgrep AUDIO\" pa yrrwyr i'w defnyddio\n"
+"- \"lspcidrake -v | fgrep AUDIO\" pa yrwyr i'w defnyddio\n"
 "drwy ragosodiad\n"
 "\n"
-"- \"grep sound-slot /etc/modules.conf\" pa yrrwyr mae'n defnyddio\n"
+"- \"grep sound-slot /etc/modules.conf\" pa yrwyr mae'n defnyddio\n"
+"- \"/sbin/fuser -v /dev/dsp\" pa raglen sy'n defnyddio'r cerdyn sain.\n"
 "ar hyn o bryd\n"
 "\n"
 "- \"/sbin/lsmod\" gwirio os yw ei yrrwr wedi ei lwytho\n"
 "a'i peidio\n"
 "\n"
 "- \"/sbin/chkconfig --list sound\" a \"/sbin/chkconfig --list alsa\" dangos\n"
-"os yw sain a gwasanaethau alsa services sydd wedi eu ffurfweddu yn rhedwg\n"
+"os yw sain a gwasanaethau alsa services sydd wedi eu ffurfweddu yn rhedeg\n"
 "ar initlevel 3\n"
 "\n"
 "- \"aumix -q\" a yw'r sain wedi ei ddistewi a'i peidio\n"
 "\n"
 "- \"/sbin/fuser -v /dev/dsp\" pa rhaglen sy'n defnyddio'r cerdyn sain.\n"
 
-#: harddrake/sound.pm:307
+#: harddrake/sound.pm:331
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Dewis gyrrwr fy hun"
 
-#: harddrake/sound.pm:310
+#: harddrake/sound.pm:334
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Dewis gyrrwr ar hap"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:313
+#: harddrake/sound.pm:337
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3454,7 +3506,7 @@ msgid ""
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
-"Os ydych yn siwr eich bod yn gwybod pa yrrwr sydd angen ar gyfer eich\n"
+"Os ydych yn siŵr eich bod yn gwybod pa yrrwr sydd angen ar gyfer eich\n"
 "cerdyn yna dewiswch un o'r rhestr uchod\n"
 "\n"
 "Y gyrrwr presennol ar gyfer eich cerdyn \"%s\"  yw \"%s\" "
@@ -3537,11 +3589,11 @@ msgid ""
 msgstr ""
 "Cyn parhau dylech ddarllen amodau'r drwydded yn ofalus. Mae'n ymwneud\n"
 "â holl ddosbarthiad Mandrakelinux. Os ydych yn cytuno â'r holl amodau,\n"
-"cliciwch blwch \"%s\". Os nad, bydd clicio ar y botwm \"%s\" yn\n"
+"cliciwch flwch \"%s\". Os nad, bydd clicio ar y botwm \"%s\" yn\n"
 "ail gychwyn eich cyfrifiadur."
 
-#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "Derbyn"
@@ -3551,16 +3603,17 @@ msgstr "Derbyn"
 msgid ""
 "GNU/Linux is a multi-user system which means each user can have his or her\n"
 "own preferences, own files and so on. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point won't be authorized\n"
+"system administrator, the users you add at this point will not be "
+"authorized\n"
 "to change anything except their own files and their own configurations,\n"
 "protecting the system from unintentional or malicious changes which could\n"
 "impact on the system as a whole. You'll have to create at least one regular\n"
 "user for yourself -- this is the account which you should use for routine,\n"
 "day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
 "anything and everything, it may also be very dangerous! A very simple\n"
-"mistake could mean that your system won't work any more. If you make a\n"
+"mistake could mean that your system will not work any more. If you make a\n"
 "serious mistake as a regular user, the worst that can happen is that you'll\n"
-"lose some information, but you won't affect the entire system.\n"
+"lose some information, but you will not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
@@ -3581,7 +3634,7 @@ msgid ""
 "\n"
 "When you're finished adding users, you'll be asked to choose a user who\n"
 "will be automatically logged into the system when the computer boots up. If\n"
-"you're interested in that feature (and don't care much about local\n"
+"you're interested in that feature (and do not care much about local\n"
 "security), choose the desired user and window manager, then click on\n"
 "\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
@@ -3631,23 +3684,23 @@ msgstr ""
 "a dim gwahaniaeth am ddiogelwch, dewiswch y defnyddiwr a rheolwr ffenestr\n"
 "a chlicio \"%s\". Os nad dad-diciwch blwch \"%s\" ."
 
-#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#: help.pm:51 printer/printerdrake.pm:1595 printer/printerdrake.pm:1715
 #, c-format
 msgid "User name"
 msgstr "Enw defnyddiwr"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247
-#: interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280
-#: network/tools.pm:198 printer/printerdrake.pm:3268
-#: standalone/drakTermServ:372 standalone/drakbackup:3941
-#: standalone/drakbackup:4035 standalone/drakbackup:4052
-#: standalone/drakbackup:4070 ugtk2.pm:515
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
+#: install_steps_gtk.pm:689 interactive.pm:424 interactive/newt.pm:317
+#: network/netconnect.pm:278 network/tools.pm:182 printer/printerdrake.pm:3581
+#: standalone/drakTermServ:382 standalone/drakbackup:3946
+#: standalone/drakbackup:4040 standalone/drakbackup:4057
+#: standalone/drakbackup:4075 ugtk2.pm:506
 #, c-format
 msgid "Next"
 msgstr "Nesaf"
 
 #: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
-#: interactive.pm:371
+#: interactive.pm:385
 #, c-format
 msgid "Advanced"
 msgstr "Uwch"
@@ -3686,41 +3739,14 @@ msgid ""
 "\"second lowest SCSI ID\", etc."
 msgstr ""
 "Dyma'r rhaniadau Linux sydd wedi canfod ar eich disg caled.\n"
-"Gallwch gadw'r dewisiadau sydd wedi eu gwneud gan y dewin, mae'n nhw'n iawn\n"
+"Gallwch gadw'r dewisiadau sydd wedi eu gwneud gan y dewin, maen nhw'n iawn\n"
 "ar gyfer y rhan fwyaf o osodiadau. Os ydych am wneud newidiadau, rhaid i chi "
-"ol eiaf\n"
-"ddiffinio rhaniad gwraidd (\"/\"). Peidiwch dewis rhaniad sy'n rhy fach neu "
-"fyddwch\n"
-"yn methu llwytho digon o feddalwedd. Os hoffech gadw eich data ar raniad "
-"arall,\n"
-"bydd angen i chi greu rhaniad ar gyfer \"/home\"( ond dim ond os oes mwy nag "
-"un\n"
-"rhaniad Linux ar gael)\n"
-"Mae pob rhaniad yn cael ei restri fel hyn: \"Enw\", \"Maint\".\n"
-"\n"
-"Mae \"Enw\" yn cael ei drefnu: \"math o ddisg caled\", rhif y disg caled\",\n"
-"\"rhif rhaniad\" (e.e, \"hda1\").\n"
-"\n"
-"\"Math o ddisg caled\" yw \"hdos mai disg caled IDE sydd gennych a\n"
-"\"sd\" os mai SCSI yw'r disg caled.\n"
-"\n"
-"Mae \"Rhif Disg Caled\" yn llythyren ar ôl \"hd\" neu \"sd\". Ar gyfer\n"
-"disg caled IDE mae:\n"
-"\n"
-" * \"a\" yn golygu \"prif ddisg caled ar y rheolwr IDE cyntaf\",\n"
-"\n"
-" * \"b\" yn golygu \"disg caled gwas ar y rheolwr IDE cyntaf\",\n"
-"\n"
-" * \"c\" yn golygu \"prif ddisg caled ar yr ail reolwr IDE\",\n"
-"\n"
-" * \"d\" yn golygu \"disg caled gwas ar yr ail reolwr IDE\".\n"
-"\n"
-"Gyda disgiau caled SCSI, mae \"a\" yn golygu \"ID SCSI isaf \", a \"b\" yn "
-"golygu\n"
-"\"ID SCSI ail isaf\", ag ati."
+"o leiaf\n"
+"ddiffinio rhaniad gwraidd (\"/\"). Peidiwch ddewis rhaniad sy'n rhy fach neu "
+"fidicon"
 
 #: help.pm:85
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
@@ -3728,12 +3754,14 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mae gosodiad Mandrakelinux yn cynnwys nifer o CD-ROMau. Mae DrakX\n"
+"Mae gosodiad Mandrakelinux i'w gael ar nifer o CD-ROMau. Mae DrakX\n"
 "yn gwybod os yw pecyn penodol wedi ei leoli ar CD-ROM arall a bydd yn bwrw\n"
-"allan y CD cyfredol a gofyn am y llall."
+"allan y CD cyfredol a gofyn am y llall. Os nad yw'r CD angenrheidiol "
+"gennych\n"
+"wrth law, cliciwch \"%s\", ac ni fydd y pecynnau hynny'n cael eu gosod."
 
 #: help.pm:92
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "It's now time to specify which programs you wish to install on your system.\n"
 "There are thousands of packages available for Mandrakelinux, and to make it\n"
@@ -3793,54 +3821,56 @@ msgid ""
 msgstr ""
 "Mae'n amser penderfynu pa raglenni rydych am eu gosod ar eich\n"
 "system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrakelinux, ond\n"
-"does dim disgwyl i chi wybod amdanyn nhw i gyd.\n"
-"\n"
-"Mae pecynnau wedi eu trefnu i grwpiau yn dibynnu ar ddefnydd penodol\n"
-"eich peiriant. Mae gan Mandrakelinux bedair gosodiad rhagosodedig. Mae\n"
-"modd meddwl amdanynt fel blychau ar gyfer pecynnau amrywiol, fel mae modd\n"
-"i \"Man Gwaith\" fod a rhaglenni o \"Datblygu\" wedi eu gosod.\n"
+"i'w gwneud hi'n haws eu rheoli maent wedi cael eu gosod mewn grwpiau\n"
+"o raglenni tebyg.\n"
 "\n"
-"Mae'r pecynnau wedi eu didoli yn grwpiau sy'n cyfateb i ddefnydd penodol\n"
-"ar eich peiriant. Mae'r grwpiau wedi eu rhannu yn bedair adran:\n"
+"Mae Mandrakelinux wedi trefnu'r grwpiau pecynnau i bedwar categori. Mae\n"
+"modd dewis a dethol rhaglenni o'r categorïau gwahanol, fel bo \"Man Gwaith"
+"\"\n"
+"yn medru cael rhaglenni o'r categori \"Gweinydd\".\n"
 "\n"
 " * \"%s\": os ydych yn bwriadu defnyddio eich peiriant fel man\n"
 "gwaith yna dewiswch un o'r grwpiau cyfatebol.\n"
 "\n"
 " * \"%s\": os yw'r peiriant yn cael ei ddefnyddio i raglennu, dewiswch\n"
-" y grwpiau perthnasol\n"
+" y grwpiau perthnasol. Bydd y grŵp arbennig \"LSB\" yn ffurfweddu\n"
+"eich system fel ei fos yn cyd-fynd gymaint ag y bo modd gyda manyleb\n"
+"Linux Standard Base.\n"
+"\n"
+"   Bydd dewis grŵp \"LSB\" hefyd yn gosod cnewyllyn cyfres \"2.4\",\n"
+"yn lle'r \"2.6\" rhagosodedig. Mae hyn i sicrhau cydymffurfiad llawn\n"
+"y system gyda LSB. Er hynny, os nad ydych yn dewis grŵp \"LSB\"\n"
+"bydd eich system yn cydymffurfio bron yn 100%% gyda LSB.\n"
 "\n"
-" * \"%s\": os ydych am i'r peiriant gael ei ddefnyddio fel\n"
-"gweinydd bydd modd i chi ddewis y gwasanaethau cyffredin rydych am\n"
-"eu cael ar eich peiriant.\n"
+" * \"%s\": os yw'n fwriad defnyddio eich peiriant fel gweinydd dewiswch\n"
+" y gwasanaethau cyffredin rydych am eu gosod ar eich peiriant.\n"
 "\n"
 " * \"%s\": dyma'r lle i ddewis eich amgylchedd graffigol.\n"
 "Rhaid dewis o leiaf un er mwyn cael man gwaith graffigol!\n"
 "\n"
-"Bydd symud cyrchwr y llygoden dros enw grwp yn amlygu esboniad byr am y\n"
-"grwp hwnnw. Os ydych wedi dad-ddewis pob grwp wrth wneud gosodiad\n"
-"arferol ac nid uwchraddiad), bydd dialog yn ymddangos a chynnig\n"
-"dewisiadau amrywiol ar gyfer y gosodiad lleiaf\n"
+"Bydd symud cyrchwr y llygoden dros enw grŵp yn amlygu esboniad byr am y\n"
+"grŵp hwnnw.\n"
 "\n"
-" * \"%s\" Gosod y nifer lleiaf o becynnau i gael berdd gwaith graffigol\n"
-"i weithio.\n"
+"Ticiwch flwch \"%s\", sy'n ddefnyddiol os ydych yn gyfarwydd â'r\n"
+"pecynnau sydd ar gael neu os ydych am gael rheolaeth lwyr dros\n"
+"beth fydd yn cael ei osod.\n"
 "\n"
-" * \"%s\" Gosod y system sylfaenol yn ogystal\n"
-"â gwasanaethau elfennol a'u dogfennau. Mae'r gosodiad hwn yn addas\n"
-"ar gyfer gosod gweinydd.\n"
+"Os fyddwch yn cychwyn y gosod ym modd \"%s\" gallwch ddad-ddewis\n"
+"pob grŵp ac atal gosod unrhyw becynnau newydd. Mae hyn yn ddefnyddiol\n"
+"ar gyfer trwsio neu ddiweddaru system bresennol.\n"
 "\n"
-" * \"%s\" Gosod y lleiafswm posibl i greu system Linux\n"
-"llinell orchymyn weithredol. Tua 65MB o faint.\n"
+"Os ydych wedi dad-ddewis pob grŵp wrth wneud gosodiad\n"
+"arferol ac nid uwchraddiad), bydd dialog yn ymddangos a chynnig\n"
+"dewisiadau amrywiol ar gyfer y gosodiad lleiaf\n"
 "\n"
-"Mae clicio blwch \"%s\". yn ddefnyddiol os ydych\n"
-"yn gyfarwydd gyda'r pecynnau sy'n cael eu cynnig neu os ydych eisiau\n"
-"rheolaeth lwyr dros yr hyn sy'n cael ei osod\n"
+" * \"%s\" Gosod y nifer lleiaf o becynnau i gael bwrdd gwaith graffigol\n"
+"i weithio.\n"
 "\n"
-"Os ydych wedi cychwyn gosod ym modd \"%s\", bydd modd i\n"
-"chi ddad-ddewis pob grwp er mwyn osgoi gosod unrhyw becyn newydd.\n"
-"Mae hyn yn ddefnyddiol ar gyfer trwsio neu ddiweddaru system sy'n bod "
-"eisoes.\n"
+" * \"%s\" Gosod y system sylfaenol yn ogystal â gwasanaethau elfennol\n"
+"a'u dogfennau. Mae'r gosodiad hwn yn addas ar gyfer gosod gweinydd.\n"
 "\n"
-" "
+" * \"%s\" Gosod y lleiafswm posibl o becynnau i greu system Linux \n"
+"llinell orchymyn weithredol. Cyfanswm maint y gosodiad fydd tua 65MB."
 
 #: help.pm:146 share/compssUsers.pl:23
 #, c-format
@@ -3858,7 +3888,7 @@ msgstr "Datblygiad"
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
 
-#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
 #, c-format
 msgid "Individual package selection"
 msgstr "Dewis pecynnau unigol."
@@ -3884,7 +3914,7 @@ msgid "Truly minimal install"
 msgstr "Gosodiad lleiaf posibl"
 
 #: help.pm:149
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "If you choose to install packages individually, the installer will present\n"
 "a tree containing all packages classified by groups and subgroups. While\n"
@@ -3901,7 +3931,8 @@ msgid ""
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you don't know what a particular service is supposed to do or\n"
+"finalized. If you do not know what a particular service is supposed to do "
+"or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
 "\n"
@@ -3919,28 +3950,29 @@ msgid ""
 "another installation. See the second tip of the last step on how to create\n"
 "such a floppy."
 msgstr ""
-"Os ydych wedi dweud wrth y rhaglen osod  eich bod am ddewis pecynnau'n\n"
-"unigol bydd coeden yn cynnwys yr holl becynnau wedi eu dosbarthu yn ôl\n"
-"grwp ac isgrwp yn ymddangos. Wrth bori'r goeden, gallwch ddewis grwp\n"
-"cyfan, isgrwp neu becyn unigol.\n"
+"Os ydych wedi dewis gosod pecynnau'n unigol unigol, bydd y gosodwr\n"
+"yn cyflwyno coeden sy'n cynnwys yr holl becynnau wedi eu dosbarthu yn ôl\n"
+"grwp ac isgrwp. Wrth bori'r goeden, gallwch ddewis grwp cyfan, isgrwp \n"
+"neu becyn unigol.\n"
 "\n"
 "Pryd bynnag fyddwch wedi dewis pecyn ar y goeden, bydd disgrifiad yn\n"
 "ymddangos ar y dde. \n"
-"!! Os oes pecyn gweinydd wedi ei ddewis yn fwriadol neu am ei fod yn rhan\n"
+"\n"
+"!! Os oes pecyn gweinydd wedi ei ddewis, yn fwriadol neu am ei fod yn rhan\n"
 "o grwp cyfan, bydd angen i chi gadarnhau eich bod eisiau i'r gweinyddion\n"
 "gael eu gosod. Ym Mandrakelinux mae unrhyw weinydd sydd wedi ei\n"
 "osod yn cael ei gychwyn fel rhagosodiad wrth gychwyn. Hyd yn oed os ydynt\n"
 "yn ddiogel a doedd dim materion pryder pan gafodd y dosbarthiad ei ryddhau,\n"
 "mae'n bosibl i fylchau diogelwch gael eu darganfod wedi i'r fersiwn hwn o\n"
 "Mandrakelinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
-"gwasanaeth arbennig i fod i'w wneud na pham mae wedi ei osod, yna cliciwch\n"
-"\"%s\". Bydd clicio \"%s\" yn gosod y gwasanaethau hynny a byddant yn\n"
-"cael eu cychwyn yn ddiofyn drwy ragosodiad!!\n"
+"gwasanaeth arbennig i fod i'w wneud na pham mae wedi ei osod, yna\n"
+"cliciwch\"%s\". Bydd clicio \"%s\" yn gosod y gwasanaethau hynny a\n"
+"byddant yncael eu cychwyn yn awtomatig drwy ragosodiad!!\n"
 "\n"
-"Mae'r dewis \"%s\"yn analluogi'r deialog rhybudd sy'n\n"
-"ymddangos bob tro fydd y gosodwr yn dewis pecyn yn awtomatig.\n"
-"Mae hyn yn digwydd am ei fod wedi penderfynu ei fod angen bodloni\n"
-"dibyniad gyda phecyn arall er mwyn cwblhau'r gosodiad yn llwyddiannus\n"
+"Mae'r dewis \"%s\"yn analluogi'r deialog rhybudd sy'nymddangos bob\n"
+" tro fydd y gosodwr yn dewis pecyn yn awtomatig. Mae hyn yn digwydd\n"
+"am ei fod wedi penderfynu ei fod angen bodlon dibyniad gyda phecyn arall\n"
+"er mwyn cwblhau'r gosodiad yn llwyddiannus\n"
 "\n"
 "Mae'r eicon disg medal bychan ar waelod y rhestr yn caniatáu llwytho'r\n"
 "rhestr pecynnau dewiswyd yn ystod gosodiad blaenorol. Bydd clicio\n"
@@ -3948,19 +3980,20 @@ msgstr ""
 "ddiwedd gosodiad arall. Gwelwch yr ail neges o'r cam diwethaf ar sut i\n"
 "greu disg meddal o'r fath."
 
-#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:722
-#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2503
-#: standalone/draksec:54 standalone/harddrake2:299 ugtk2.pm:1121
-#: wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:792
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2508
+#: standalone/draksec:54 standalone/harddrake2:306 standalone/net_applet:255
+#: ugtk2.pm:899 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:722 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:711
-#: standalone/drakbackup:2503 standalone/drakgw:290 standalone/drakgw:291
-#: standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55
-#: standalone/harddrake2:298 ugtk2.pm:1121 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:792 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:736
+#: standalone/drakbackup:2508 standalone/drakgw:287 standalone/drakgw:288
+#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
+#: standalone/harddrake2:305 standalone/net_applet:259 ugtk2.pm:899
+#: wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
@@ -3971,7 +4004,7 @@ msgid "Automatic dependencies"
 msgstr "Dibyniaethau awtomatig"
 
 #: help.pm:183
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\"%s\": clicking on the \"%s\" button will open the printer configuration\n"
 "wizard. Consult the corresponding chapter of the ``Starter Guide'' for more\n"
@@ -3979,25 +4012,25 @@ msgid ""
 "manual is similar to the one used during installation."
 msgstr ""
 "\"%s\": mae clicio ar y botwm\"%s\" yn agor dewin ffurfweddu argraffydd.\n"
-"Darllenwch y pennawd penodol yn y 'Starter Guide'am ragor o \n"
-"wybodaeth am sut i osod argraffydd newydd. Mae'r rhyngwyneb\n"
+"Darllenwch y pennawd penodol yn y 'Starter Guide' am ragor o \n"
+"wybodaeth ar sut i osod argraffydd newydd. Mae'r rhyngwyneb yn y llawlyfr\n"
 "yn debyg i'r un welwyd wrth osod y system."
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
-#: standalone/drakbackup:2329 standalone/drakbackup:2333
-#: standalone/drakbackup:2337 standalone/drakbackup:2341
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
+#: standalone/drakbackup:2333 standalone/drakbackup:2337
+#: standalone/drakbackup:2341 standalone/drakbackup:2345
 #, c-format
 msgid "Configure"
 msgstr "Ffurfweddu"
 
 #: help.pm:189
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
 "DrakX will list all services available on the current installation. Review\n"
-"each one of them carefully and uncheck those which aren't needed at boot\n"
+"each one of them carefully and uncheck those which are not needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
@@ -4005,7 +4038,8 @@ msgid ""
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you probably don't want to start any services which you don't need.\n"
+"server: you probably do not want to start any services which you do not "
+"need.\n"
 "Please remember that some services can be dangerous if they're enabled on a\n"
 "server. In general, select only those services you really need. !!"
 msgstr ""
@@ -4026,11 +4060,10 @@ msgstr ""
 "hangen. Cofiwch fod cael nifer o wasanaethau wedi eu galluogi ar y "
 "gweinydd,\n"
 "fod yn beryglus. Yn gyffredinol, dim ond dewis y gwasanaethau mae'n rhaid eu "
-"cael.\n"
-"!!"
+"cael !!"
 
 #: help.pm:206
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
 "local time according to the time zone you selected. If the clock on your\n"
@@ -4047,19 +4080,18 @@ msgid ""
 msgstr ""
 "Mae GNU/Linux yn rheoli amser drwy GMT (Greenwich Mean Time)\n"
 "a'i drosi i amser lleol yn ôl y parth amser rydych wedi ei ddewis.\n"
-"Mae'n bosib dad-ddewis hyn drwy ddad-ddewis \"%s\" fel bod y cloc caledwedd "
-"yr un a chloc y system yr un peth.\n"
-"Mae hyn yn ddefnyddiol pan fo'r peiriant yn westai i system arall megis\n"
-"Windows.\n"
+"Mae'n bosib dad-ddewis hyn drwy ddad-ddewis \"%s\" fel bod y cloc\n"
+"caledwedd yr un a chloc y system yr un peth. Mae hyn yn ddefnyddiol\n"
+"pan fo'r peiriant yn westai i system arall.\n"
 "\n"
-"Bydd y dewis \"%s\" yn rheoli'r cloc yn awtomatig\n"
-"drwy gysylltu â gweinydd amser ar y Rhyngrwyd. Yn y rhestr sy'n cael ei\n"
-"gynnig dewiswch yr agosaf atoch. Rhaid i'ch cyswllt â'r we fod yn gweithio\n"
+"Bydd y dewis \"%s\" yn rheoli'r cloc yn awtomatig drwy gysylltu \n"
+"â gweinydd amser ar y Rhyngrwyd. Yn y rhestr sy'n cael ei gynnig \n"
+"dewiswch yr agosaf atoch. Rhaid i'ch cyswllt â'r we fod yn gweithio\n"
 "i hyn ddigwydd. Bydd yn gosod ar eich peiriant wasanaethwr amser fydd\n"
 "o ddewis yn medru cael ei ddefnyddio gan beiriannau eraill ar eich "
 "rhwydwaith."
 
-#: help.pm:217 install_steps_interactive.pm:887
+#: help.pm:217 install_steps_interactive.pm:873
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "Cloc caledwedd wedi ei osod i GMT"
@@ -4082,7 +4114,7 @@ msgid ""
 "with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs."
 msgstr ""
-"Cerdyn Greaffig\n"
+"Cerdyn Graffeg\n"
 "\n"
 "    Mae'r gosodwr fel rheol yn canfod ac yn ffurfweddu'n awtomatig\n"
 "y cerdyn graffig sydd ar eich cyfrifiadur. Os nad yw hyn yn wir,\n"
@@ -4093,7 +4125,7 @@ msgstr ""
 "ar eich cyfer."
 
 #: help.pm:231
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
@@ -4156,10 +4188,12 @@ msgstr ""
 "WindowMaker, etc) sy'n dod gyda Mandrakelinux yn dibynnu arno.\n"
 "\n"
 "Byddwch yn derbyn rhestr o baramedrau gwahanol i'w newid i gael\n"
-"y dangosiad graffigol gorau: Cerdyn Graffig\n"
+"y dangosiad graffigol gorau:\n"
+"\n"
+" Cerdyn Graffeg\n"
 "\n"
 "    Mae'r gosodwr fel rheol yn canfod ac yn ffurfweddu'n awtomatig\n"
-"y cerdyn graffig sydd ar eich cyfrifiadur. Os nad yw hyn yn wir,\n"
+"y cerdyn graffeg sydd ar eich cyfrifiadur. Os nad yw hyn yn wir,\n"
 "dewiswch eich cerdyn.\n"
 "\n"
 "  Mewn achos lle mae gweinyddion eraill i'w cael i'ch cerdyn, gyda\n"
@@ -4186,13 +4220,13 @@ msgstr ""
 "\n"
 "Prawf\n"
 "\n"
-"  bydd y system yn ceisio agor sgrîn graffigol yn unol â'r cydraniad "
+"  Bydd y system yn ceisio agor sgrin graffigol yn unol â'r cydraniad "
 "dewisol.\n"
 "Os ydych yn gweld y neges yn ystod y prawf ac ateb \"%s\", yna bydd\n"
 "DrakX yn symud ymlaen i'r cam nesaf. Os nad ydych yn gweld y neges nesaf\n"
 "mae'n golygu fod rhan o'r drefn awtoganfod yn anghywir a bydd y prawf\n"
-"yn dod iben ar âl 12 eiliad, gan ddod a chi nôl i'r ddewislen. Newidiwch y\n"
-"gosodiadau nes i chi gael y sgrîn i edrych yn iawn.\n"
+"yn dod i ben ar ôl 12 eiliad, gan ddod a chi nôl i'r ddewislen. Newidiwch y\n"
+"gosodiadau nes i chi gael y sgrin i edrych yn iawn.\n"
 "\n"
 "\n"
 "\n"
@@ -4236,7 +4270,7 @@ msgstr ""
 "ar y dangosydd."
 
 #: help.pm:303
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "In the situation where different servers are available for your card, with\n"
 "or without 3D acceleration, you're asked to choose the server which best\n"
@@ -4247,7 +4281,7 @@ msgstr ""
 "ar eich cyfer."
 
 #: help.pm:308
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Options\n"
 "\n"
@@ -4264,7 +4298,7 @@ msgstr ""
 "llwyddiannus yn cael eich dangosydd i ffurfweddu'n gywir."
 
 #: help.pm:316
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You now need to decide where you want to install the Mandrakelinux\n"
 "operating system on your hard drive. If your hard drive is empty or if an\n"
@@ -4308,7 +4342,8 @@ msgid ""
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
 "your hard drive and replace them with your new Mandrakelinux system, choose\n"
-"this option. Be careful, because you won't be able to undo this operation\n"
+"this option. Be careful, because you will not be able to undo this "
+"operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
@@ -4326,67 +4361,63 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Yn awr mae angen i chi ddewis lle ar eich disg caled i osod eich\n"
-"system weithredu Linux Mandrake. Os yw eich disg caled yn wag neu\n"
-"os oes yna system weithredol eisoes yn cymryd yr holl le sydd ar gael,\n"
-"bydd angen i chi greu rhaniadau arno.Yn y bon, mae rhannu disg caled\n"
-"yn golygu ei rhannu'n rhesymegol i greu lle i osod eich system Mandrake\n"
+"Mae angen i chi nawr ddewis lle ar eich disg caled i osod eich system\n"
+"weithredu Mandrakelinux. Os yw eich disg caled yn wag neu os oes\n"
+"yna system weithredol eisoes yn cymryd yr holl le sydd ar gael, bydd\n"
+"angen i chi greu rhaniadau arno. Yn y bôn, mae rhannu disg caled yn\n"
+"golygu ei rhannu'n rhesymegol i greu lle i osod eich system Mandrake\n"
 "Linux newydd.\n"
 "\n"
-"Gan bo effaith y broses rannu'n ddidroi nôl  gan arwain at golli data os "
-"oes\n"
-"system weithredol eisoes ar y gyrrwr, rhall rhannu gall creu rhaniadau fod\n"
-"yn broses bygythiol a straenusos ydych yn ddefnyddiwr dibrofiad.\n"
-"Yn ffodus, mae gan DrakX  ddewin sy'n symleiddio'r broses. Cyn cychwyn,\n"
+"Gan fo effaith y broses rannu'n ddidroi nôl,  gan arwain at golli data os\n"
+"oes system weithredol eisoes ar y gyrrwr, gall creu rhaniadau fod yn\n"
+"broses anodd a straenus os ydych yn ddefnyddiwr dibrofiad. Yn ffodus,\n"
+"mae gan DrakX ddewin sy'n symleiddio'r broses. Cyn cychwyn, \n"
 "darllenwch y llawlyfr a chymerwch bwyll.\n"
 "\n"
 "Yn ddibynnol ar ffurfweddiad eich disg caled, mae dewisiadau ar gael:\n"
 "\n"
-" * \"%s\": mae'r dewis hwn yn arwain at greu rhaniadau\n"
-"awtomatig o'ch disg(iau) caled gwag. Bydd dim cwestiynau eraill os byddwch\n"
+" * \"%s\": mae'r dewis hwn yn arwain at greu rhaniadau awtomatig\n"
+"o'ch disg(iau) caled gwag. Bydd dim cwestiynau eraill os byddwch\n"
 "yn defnyddio'r dewis hwn.\n"
 "\n"
-" * \"%s\": mae'r dewin wedi canfod un neu fwy\n"
-"o raniadau Linux cyfredol ar eich disg caled. Os ydych am eu defnyddio,\n"
-"dewiswch y dewis hwn. Bydd gofyn i chi ddewis pwyntiau gosod cysylltiaedig\n"
-"â phob rhaniad. Mae'r pwyntiau gosod gosodedig wedi eu dewis, ac ar y\n"
-"cyfan mae'n syniad da cadw atynt.\n"
+" * \"%s\": mae'r dewin wedi canfod un neu fwy o raniadau Linux\n"
+"cyfredol ar eich disg caled. Os ydych am eu defnyddio, dewiswch y\n"
+"dewis hwn. Bydd gofyn i chi ddewis pwyntiau gosod yn gysylltiedig\n"
+"â phob rhaniad. Mae'r pwyntiau gosod gosodedig wedi eu dewis,\n"
+"ac ar y cyfan mae'n syniad da cadw atynt.\n"
 "\n"
-" * \"%s\": os yw Microsoft Windows ar\n"
-"eich disg caled ac yn cymryd y lle i gyd, bydd rhaid i chi greu lle ar gyfer "
-"data\n"
-"Linux. I wneud hynny gallwch ddileu eich rhaniad a data Microsoft Windows\n"
-"(Gw. atebion \"Dileu'r ddisg gyfan \" neu ail-lunio maint rhaniad FAT "
-"Microsoft\n"
-"Windows. Mae modd ail lunio maint y rhaniad heb golli data cynbelled eich\n"
-"bod wedi dad-ddarnio rhaniad Windows ac mae'n defnyddio fformat Windows.\n"
-"Argymellir cadw data wrth gefn hefyd.Argymhellir gwneud hyn os ydych am\n"
-"ddefnyddio Mandrakelinux a Microsoft Windows ar yr un cyfrifiadur.\n"
+" * \"%s\": os yw Microsoft Windows ar eich disg caled ac yn cymryd\n"
+"y lle i gyd, bydd rhaid i chi greu lle ar gyfer data Linux. I wneud hynny\n"
+"gallwch ddileu eich rhaniad a data Microsoft Windows (Gw. atebion\n"
+"\"Dileu'r ddisg gyfan \") neu ail-lunio maint rhaniad FAT Microsoft "
+"Windows.\n"
+"Mae modd ail lunio maint y rhaniad heb golli data cyn belled eich bod wedi\n"
+"dad-ddarnio rhaniad Windows ac mae'n defnyddio fformat Windows.\n"
+"Argymhellir cadw data wrth gefn hefyd. Argymhellir gwneud hyn os ydych\n"
+"am ddefnyddio Mandrakelinux a Microsoft Windows ar yr un cyfrifiadur.\n"
 "\n"
 "  Cyn gwneud y dewis hwn, cofiwch y bydd maint eich rhaniad Microsoft\n"
-"Windows yn llai nag yw ar hyn o bryd ar âl dilyn y drefn yma. Bydd\n"
-"gennych llai o le yn Microsoft Windows i gadw data neu i osod\n"
-"meddalwedd newydd.\n"
+"Windows yn llai nag yw ar hyn o bryd ar ol dilyn y drefn yma. Bydd gennych\n"
+"llai o le yn Microsoft Windows i gadw data neu i osod meddalwedd newydd\n"
 "\n"
-" * \"%s\" os ydych am ddileu'r holl ddata a rhaniadau\n"
-"presennol ar eich disg caled a'u cyfnewid am system Mandrakelinux,\n"
-"yna dewiswch hwn. Byddwch yn ofalus wrth wneud hyn gan na fydd\n"
-"modd troi'n ôl ar ôl cadarnhau.\n"
+" * \"%s\" os ydych am ddileu'r holl ddata a rhaniadau presennol ar\n"
+"eich disg caled a'u cyfnewid am system Mandrakelinux, yna dewiswch\n"
+"hwn. Byddwch yn ofalus wrth wneud hyn gan na fydd modd troi nôl\n"
+"ar ôl cadarnhau.\n"
 "\n"
 "  !! Os ydych yn dewis hwn, byddwch yn colli'r holl ddata ar eich disg.  !!\n"
 "\n"
-" * \"%s\": bydd hwn yn dileu popeth o'r disg caled a \n"
-"chychwyn popeth o'r newydd, gan gynnwys creu rhaniadau newydd.\n"
-"Bydd yr holl ddata ar y ddisg yn cael ei golli\n"
+" * \"%s\": Bydd y dewis yma'n ymddangos pam mae'r ddisg gyfan wedi\n"
+"ei chymryd gan Microsoft Windows. Bydd hwn yn dileu popeth o'r disg\n"
+"caled a chychwyn popeth o'r newydd, gan greu rhaniadau newydd.\n"
 "\n"
 "  !! Os ydych yn dewis hwn, byddwch yn colli'r holl ddata ar eich disg.  !!\n"
 "\n"
-" * \"%s\": dewiswch hwn os ydych am rannu'r disg caled\n"
-"gyda llaw. Byddwch ofalus - mae'n ddewis pwerus a pheryglus. Mae modd\n"
-"i chi golli'ch holl ddata. Peidiwch dewis hwn oni bai eich bod yn gwybod "
-"beth\n"
-"ydych yn ei wneud.. Am rhagor o wybodaeth ar sut i ddefnyddio DiskDrake, \n"
-"darllennwch adran \"Managing your Partitions\" yn y \"Starter Guide\"."
+" * \"%s\": dewiswch hwn os ydych am rannu'r disg caled gyda llaw.\n"
+"Byddwch ofalus - mae'n ddewis pwerus a pheryglus. Mae modd i chi \n"
+"golli'ch holl ddata. Peidiwch dewis hwn oni bai eich bod yn gwybod beth\n"
+"ydych yn ei wneud.. Am ragor o wybodaeth ar sut i ddefnyddio DiskDrake,\n"
+"darllenwch adran \"Managing your Partitions\" yn y \"Starter Guide\"."
 
 #: help.pm:374 install_interactive.pm:95
 #, c-format
@@ -4419,10 +4450,10 @@ msgid "Custom disk partitioning"
 msgstr "Rhannu disg unigol"
 
 #: help.pm:377
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Do not forget\n"
 "to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
 "boot-loader menu, giving you the choice of which operating system to start.\n"
@@ -4455,59 +4486,61 @@ msgid ""
 "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
 "/dev/fd0\"."
 msgstr ""
-"Dyna ni. Mae'r gosodiad wedi ei gwblhau ac mae eich system GNU/Linux\n"
-"yn barod i'w ddefnyddio. Cliciwch \"%s\" i ailgychwyn y cyfrifiadur.\n"
-"Mae modd i chi gychwyn GNU/Linux neu Windows, prun bynnag sydd\n"
-"orau gennych (os oes gennych y ddwy system ar eich peiriant), gynted\n"
-"ag y bydd eich peiriant yn ail gychwyn. \n"
+"Dyna ni, mae'r gosodiad wedi ei gwblhau ac mae eich system GNU/Linux\n"
+"yn barod i'w ddefnyddio. Cliciwch \"%s\" i ailgychwyn y cyfrifiadur. "
+"Peidiwch\n"
+"anghofio tynnu'r cyfrwng gosod (CD-ROM neu feddal). Y peth cyntaf i chi\n"
+"weld ar ôl i'ch cyfrifiadur gwblhau ei brofion caledwedd yw'r ddewislen\n"
+"llwytho, sy'n rhoi dewis o ba system i'w chychwyn.\n"
 "\n"
 "Mae'r botwm \"%s\" yn dangos dau fotwm arall:\n"
 "\n"
-" *\"%s\": i greu disg meddal gosod fydd yn creu\n"
-"gosodiad cyflawn heb gymorth gweithredwr, yn debyg i'r gosodiad sydd\n"
+" *\"%s\": i greu disg meddal gosod fydd yn creu yn awtomatig osodiad\n"
+"cyflawn heb gymorth gweithredwr, yn debyg i'r gosodiad sydd\n"
 "newydd ei ffurfweddu.\n"
 "\n"
 "Sylwer bod dau ddewis gwahanol i'w gael wedi clicio'r botwm:\n"
 "\n"
-" *\"%s\". Gosodiad rhannol awtomatig gan bod y cam o greu\n"
-"rhaniad yn cael ei hepgor.\n"
+" *\"%s\". Gosodiad rhannol awtomatig gan fod mai'r cam o greu\n"
+"rhaniad yw'r unig ran ryngweithiol o'r broses.\n"
 "\n"
 " *\"%s\".Gosodiad cwbl awtomatig: mae'r disg caled wedi ei\n"
 "ailysgrifennu'n llwyr, a'r holl ddata wedi ei golli.\n"
 "\n"
-"Mae hwn yn nodwedd ddefnyddiol iawn pan yn gosod ar nifer fawr o\n"
+"Mae hwn yn nodwedd ddefnyddiol iawn wrth osod ar nifer fawr o\n"
 "beiriannau tebyg. Gw. yr adran Auto install ar ein safle gwe.\n"
 "\n"
-" *\"%s\":(*): mae hyn yn cadw'r dewis o becynnau\n"
-"wnaed cynt. Yna wrth wneud gosodiad arall, rhowch ddisg meddal yn y\n"
-"gyrrwr a rhedeg y gosodiad gan fynd i'r sgrîn cymorth drwy wasgu'r fysell\n"
-"[F1], a chyflwyno >>linux defcfg=\"floppy\"<<.\n"
+"*\"%s\":(*): mae hwn yn cadw'r dewis o becynnau wnaed cynt.\n"
+"Wrth wneud gosodiad arall, rhowch ddisg meddal yn y gyrrwr a rhedeg\n"
+"y gosodiad gan fynd i'r sgrin cymorth drwy wasgu'r fysell [F1], \n"
+"a theipio >>linux defcfg=\"floppy\"<< a phwyso bysell [Enter].\n"
 "\n"
 "(*) Bydd angen disg meddal wedi ei fformatio fel FAT (i greu un yn\n"
-"GNU/Linux, teipiwch \"mformat a:\")"
+"GNU/Linux, teipiwch \"mformat a:\" neu \"fdformat /dev/fd0\" wedi\n"
+"ei ddilyn gan \"mkfs.vfat /dev/fd0\"."
 
 #: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Creu disg meddal awto gosod"
 
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
 #, c-format
 msgid "Replay"
 msgstr "Ail chwarae"
 
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
 #, c-format
 msgid "Automated"
 msgstr "Awtomeiddwyd"
 
-#: help.pm:409 install_steps_interactive.pm:1366
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Save packages selection"
 msgstr "Cadw'r dewis becynnau"
 
 #: help.pm:412
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "If you chose to reuse some legacy GNU/Linux partitions, you may wish to\n"
 "reformat some of them and erase any data they contain. To do so, please\n"
@@ -4515,12 +4548,13 @@ msgid ""
 "\n"
 "Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to "
+"reformat\n"
 "partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
 "Please be careful when selecting partitions. After the formatting is\n"
 "completed, all data on the selected partitions will be deleted and you\n"
-"won't be able to recover it.\n"
+"will not be able to recover it.\n"
 "\n"
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
@@ -4530,9 +4564,6 @@ msgid ""
 "Click on \"%s\" if you wish to select partitions which will be checked for\n"
 "bad blocks on the disk."
 msgstr ""
-"Rhaid i bob rhaniad sydd newydd eu henwi gael eu fformatio ar gyfer eu\n"
-"defnyddio (mae fformatio'n golygu creu system ffeilio)\n"
-"\n"
 "Efallai y byddwch eisiau ailfformatio rhai rhaniadau presennol i ddileu "
 "data\n"
 "sydd arnynt. Os ydych am wneud hynny, dewiswch y rhaniadau hynny hefyd.\n"
@@ -4555,17 +4586,17 @@ msgstr ""
 "Cliciwch \"%s\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"
 "gwallus ar y ddisg."
 
-#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404
-#: interactive/newt.pm:316 printer/printerdrake.pm:3266
-#: standalone/drakTermServ:351 standalone/drakbackup:3901
-#: standalone/drakbackup:3940 standalone/drakbackup:4051
-#: standalone/drakbackup:4066 ugtk2.pm:513
+#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:425
+#: interactive/newt.pm:316 printer/printerdrake.pm:3579
+#: standalone/drakTermServ:361 standalone/drakbackup:3906
+#: standalone/drakbackup:3945 standalone/drakbackup:4056
+#: standalone/drakbackup:4071 ugtk2.pm:504
 #, c-format
 msgid "Previous"
 msgstr "Blaenorol"
 
 #: help.pm:434
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "By the time you install Mandrakelinux, it's likely that some packages will\n"
 "have been updated since the initial release. Bugs may have been fixed,\n"
@@ -4579,8 +4610,8 @@ msgid ""
 "will appear: review the selection, and press \"%s\" to retrieve and install\n"
 "the selected package(s), or \"%s\" to abort."
 msgstr ""
-"Ar yr adeg pan fyddwch yn gosod Mandrakelinux, mae'n debygol y bydd\n"
-"rhai pecynnau wedi eu diweddaru ers y rhyddhad cychwynnol. Bydd rhai \n"
+"Erbyn i chi osod Mandrakelinux, mae'n debygol y bydd rhai \n"
+"pecynnau wedi eu diweddaru ers y rhyddhad cychwynnol. Bydd rhai \n"
 "gwallau wedi eu cywiro a materion diogelwch wedi eu datrys. I ganiatáu\n"
 "i chi fanteisio ar hyn mae cynnig i chi eu llwytho i lawr o'r rhyngrwyd.\n"
 "Dewiswch \"%s\" os oes gennych gyswllt gweithredol â'r rhyngrwyd,\n"
@@ -4591,14 +4622,14 @@ msgstr ""
 "pecynnau yn ymddangos: Wedi i chi benderfynu ar eich dewis, cliciwch\n"
 "\"%s\" i estyn a gosod y pecynnau hynny neu \"%s\" i beidio."
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
-#: install_steps_interactive.pm:158 standalone/drakbackup:4098
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
+#: install_steps_interactive.pm:156 standalone/drakbackup:4103
 #, c-format
 msgid "Install"
 msgstr "Gosodiad"
 
 #: help.pm:447
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "At this point, DrakX will allow you to choose the security level you desire\n"
 "for your machine. As a rule of thumb, the security level should be set\n"
@@ -4606,25 +4637,25 @@ msgid ""
 "exposed to the Internet. The trade-off that a higher security level is\n"
 "generally obtained at the expense of ease of use.\n"
 "\n"
-"If you don't know what to choose, keep the default option. You'll be able\n"
+"If you do not know what to choose, keep the default option. You'll be able\n"
 "to change it later with the draksec tool, which is part of Mandrakelinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
 "security. Security messages will be sent to that address."
 msgstr ""
-"Yma mae angen dewis lefel diogelwch ar gyfer y peiriant. Fel rheol,\n"
-"y mwyaf agored yw'r peiriant, y mwyaf pwysig yw'r data yr uchaf\n"
+"Yma mae DrakX yn caniatáu i chi ddewis lefel diogelwch y peiriant. Fel\n"
+"rheol, y mwyaf agored yw'r peiriant, y mwyaf pwysig yw'r data'r uchaf\n"
 "ddylai'r lefel diogelwch fod neu fod gan y peiriant gysylltiad uniongyrchol\n"
 "gyda'r rhyngrwyd. Er hynny, mae diogelwch yn dod ar draul\n"
 "hwylustod. \n"
 "\n"
-"Os nad ydych yn siwr beth i'w ddewis, dewiswch y rhagosodedig. Byddwch\n"
+"Os nad ydych yn siŵr beth i'w ddewis, dewiswch y rhagosodedig. Byddwch\n"
 "yn gallu newid y lefel diogelwch yn ddiweddarach gyda draksec o\n"
 "Ganolfan Rheoli Mandrake.\n"
 "\n"
 "Mae maes \"%s\" yn gallu dweud wrth y system o'r defnyddiwr sydd â\n"
-"chyfrifoldeb am ddiogelwch.Bydd negeseuon diogelwch yn cael eu hanfon\n"
+"chyfrifoldeb am ddiogelwch. Bydd negeseuon diogelwch yn cael eu hanfon\n"
 "at y cyfeiriad hwnnw. "
 
 #: help.pm:458
@@ -4662,7 +4693,7 @@ msgid ""
 "floppy disk.\n"
 "\n"
 " * \"%s\": if your partition table is damaged, you can try to recover it\n"
-"using this option. Please be careful and remember that it doesn't always\n"
+"using this option. Please be careful and remember that it does not always\n"
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
@@ -4851,19 +4882,19 @@ msgstr ""
 " Windows (\"C:\" yw'r ddisg  neu raniad cyntaf)."
 
 #: help.pm:564
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\"%s\": check the current country selection. If you're not in this country,\n"
-"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"click on the \"%s\" button and choose another. If your country is not in "
+"the\n"
 "list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
-"\"%s\":gwiriwch y dewis gwlad. Os nad ydych yn y wlad hon\n"
-"cliciwch y botwm \"%s\"a dewis un arall. Os nad yw eich\n"
-"gwlad ar y rhestr gyntaf, cliciwch \"%s\" i wdrych ar y rhestr\n"
-"gyflawn."
+"\"%s\":gwiriwch y dewis gwlad. Os nad ydych yn y wlad hon cliciwch y\n"
+"botwm \"%s\"a dewis un arall. Os nad yw eich gwlad ar y rhestr gyntaf,\n"
+"cliciwch \"%s\" i edrych ar y rhestr gyflawn."
 
 #: help.pm:569
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
@@ -4879,7 +4910,7 @@ msgid ""
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mandrakelinux system. Your current partitioning\n"
-"scheme and user data won't be altered. Most of the other configuration\n"
+"scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
@@ -4893,11 +4924,13 @@ msgstr ""
 "system Mandrakelinux presennol.\n"
 "\n"
 " *\"%s\" Ar y cyfan, mae hwn yn tynnu'r hen system gyfan oddi ar eich\n"
-"cyfrifiadur. Os ydych am newid rhaniadau eich disgiau caled, neu newid y\n"
-"system ffeil, dylech ddewis hwn. Er hynny, yn ddibynnol ar eich trefn\n"
-"rhannu, mae modd atal peth o'ch data rhag cael ei ysgrifennu drosto gan\n"
-"y gosodiad newydd.\n"
-" *\"%s\": mae'r dosbarth gosod hwn yn caniatáu i chi ddiweddaru'r\n"
+"cyfrifiadur. Er hynny, yn ddibynnol ar eich trefn rhannu, mae modd atal\n"
+"peth o'ch data (yn arbennig, cyfeiriaduron \"home\" ) rhag cael ei "
+"ysgrifennu drosto. Os ydych am newid rhaniadau eich disgiau caled, neu newid "
+"y\n"
+"system ffeil, dylech ddewis hwn.\n"
+"\n"
+" *\"%s\": Mae'r dosbarth gosod hwn yn caniatáu i chi ddiweddaru'r\n"
 "pecynnau sydd wedi eu gosod ar eich system Mandrakelinux. Bydd eich\n"
 "rhaniadau presenol a'ch data personol yn cael eu cadw. Bydd y rhan fwyaf\n"
 "o'r camau ffurfweddu ar gael fel gyda'r gosod arferol.\n"
@@ -4907,7 +4940,7 @@ msgstr ""
 "fersiynau cyn Mandrakelinux \"8.1\" yn cael ei gymeradwyo."
 
 #: help.pm:591
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Depending on the language you chose (), DrakX will automatically select a\n"
 "particular type of keyboard configuration. Check that the selection suits\n"
@@ -4917,7 +4950,7 @@ msgid ""
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard don't match. In either case, this installation step\n"
+"country-set keyboard do not match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
 "Click on the \"%s\" button to be shown a list of supported keyboards.\n"
@@ -4928,8 +4961,11 @@ msgid ""
 msgstr ""
 "Fel arfer mae DrakX yn dewis y bysellfwrdd cywir ar eich cyfer ( gan "
 "ddibynnu pa\n"
-" iaith rydych wedi ei ddewis) ac ni fyddwch yn gweld y cam hwn. Er hynny,\n"
-"efallai nad oes gennych fysellfwrdd sy'n cyfateb yn union i'ch iaith: e.e., "
+" iaith rydych wedi ei ddewis(). Gwiriwch fod y dewis yn addas neu dewiswch "
+"gynllun\n"
+"bysellfwrdd arall.\n"
+"\n"
+"Efallai nad oes gennych fysellfwrdd sy'n cyfateb yn union i'ch iaith: e.e., "
 "os ydych\n"
 "yn Americanwr sy'n siarad Cymraeg, efallai eich bod am gadw eich "
 "bysellfwrdd\n"
@@ -4938,9 +4974,8 @@ msgstr ""
 "yn y\n"
 " gosodiad a dewis y bysellfwrdd perthnasol o'r rhestr.\n"
 "\n"
-"Cliciwch ar fotwm \"%s\" i dderbyn y rhestr lawn o fysellfyrddau sy'n cael "
-"eu\n"
-" cynnal.\n"
+"Cliciwch ar fotwm \"%s\" i dderbyn y rhestr o fysellfyrddau sy'n cael eu "
+"cynnal.\n"
 " \n"
 "Os fyddwch yn dewis cynllun bysellfwrdd wedi ei seilio ar wyddor an-"
 "Lladinaidd, \n"
@@ -4949,7 +4984,7 @@ msgstr ""
 "bysellfwrdd rhwng cynlluniau Lladin ac an-Lladin."
 
 #: help.pm:609
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The first step is to choose your preferred language.\n"
 "\n"
@@ -4991,25 +5026,41 @@ msgid ""
 "by the entire system. Running the command as a regular user will only\n"
 "change the language settings for that particular user."
 msgstr ""
-"Dewiswch eich dewis iaith ar gyfer y gosod a'r defnydd o'r system yn\n"
-"effeithio iaith y ddogfennaeth, y gosodwr a'r system yn gyffredinol.\n"
-"Dewiswch eich ardal ac yna eich iaith.\n"
+"Y cam cyntaf yw dewis eich hoff iaith.\n"
+"\n"
+"Bydd eich dewis iaith yn effeithio ar iaith y gosodwr, y ddogfennaeth\n"
+" a'r system yn gyffredinol. Dewiswch yr ardal lle rydych ac yna eich iaith.\n"
 "\n"
 "Bydd clicio ar y botwm \"%s\" yn caniatáu i chi ddewis ieithoedd eraill\n"
 "i'w gosod ar eich peiriant gwaith. Bydd dewis ieithoedd eraill yn gosod\n"
 "ffeiliau  penodol sy'n cynnwys dogfennaeth a rhaglenni yn yr ieithoedd\n"
 "hynny. Er enghraifft, os ydych yn westeiwr ar gyfer defnyddwyr o Sbaen,\n"
-"dewiswch Cymraeg fel y rhagosodedig yng ngolwg coeden ac yn yr Uwch\n"
-"cliciwch ar \"%s\". \n"
+"dewiswch Gymraeg fel y rhagosodedig yng ngolwg coeden ac yn yr Uwch\n"
+"adran cliciwch \"%s\". \n"
+"\n"
+"Ynghylch cefnogaeth UTF-8 (unicode): Amgodiad nod newydd yw Unicode\n"
+"sydd i gynnwys pob iaith. Er hynny, mae cefnogaeth i bob iaith o fewn\n"
+"GNU/Linux yn dal yn cael ei ddatblygu Oherwydd hynn mae defnydd\n"
+"Mandrakelinux o UTF-8 yn ddibynnol ar ddewis y defnyddiwr:\n"
+"\n"
+" * Os ydych yn dewis iaith gyda hen amgodiad cryf (ieithoedd lladin1\n"
+"Rwsieg, Siapanëeg, Tsieinëeg, Corëeg, Thai, Groeg, Twrceg, y rhan\n"
+" fwyaf o ieithoedd iso-8859-2) bydd yr hen amgodiad yn cael ei ddefnyddio;\n"
+"\n"
+" * Bydd ieithoedd eraill yn defnyddio unicode drwy ragosodiad;\n"
+"\n"
+" * Os oes angen dwy neu fwy o ieithoedd, ac nid yw'r ddwy iaith yn "
+"defnyddio'r\n"
+"un amgodiad, yna bydd unicode yn cael ei ddefnyddio drwy'r holl system\n"
+"\n"
+" * Yn olaf, mae modd gorfodi'r defnydd o unicode drwy'r system gyfan ar\n"
+"gais y defnyddiwr drwy ddewis  \"%s\" yn annibynnol o ba iaith sydd wedi cêl "
+"ei ddewis.\n"
 "\n"
 "Sylwer bod modd gosod mwy nag un iaith. Mae modd i chi ddewis mwy\n"
 "nag un, neu hyd yn oed eu gosod i gyd, drwy ddewis y blwch \"%s\".\n"
 "Mae dewis cefnogaeth i bob iaith yn golygu gosod cyfieithiadau, ffontiau, \n"
-"gwiryddion sillafu, ag ati, ar gyfer yr iaith honno.Hefyd, mae dewis\n"
-"\"%s\" yn gorfodi'r system i ddefnyddio unicode (UTF-8).\n"
-"Sylwer mai nodwedd arbrofol yw hon . Os ydych yn dewis ieithoedd\n"
-"gwahanol sy'n defnyddio amgodiad gwahanol bydd y gefnogaeth i utf-8\n"
-"yn cael ei osod, beth bynnag.\n"
+"gwiryddion sillafu, ag ati, ar gyfer yr iaith honno.\n"
 "\n"
 "I newid rhwng yr ieithoedd amrywiol sydd ar y system gallwch gychwyn\n"
 "y gorchymyn  \"/usr/sbin/localedrake\" fel \"root\" i newid yr iaith\n"
@@ -5022,7 +5073,7 @@ msgid "Espanol"
 msgstr "Sbaeneg"
 
 #: help.pm:650
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
@@ -5057,9 +5108,9 @@ msgid ""
 "Test the buttons and check that the mouse pointer moves on-screen as you\n"
 "move your mouse about."
 msgstr ""
-"Fel rheol does gan DrakX ddim problem yn canfod y fifer o fotymau ar eich\n"
+"Fel rheol does gan DrakX ddim problem yn canfod y nifer o fotymau ar eich\n"
 "llygoden. Os yw, bydd yn cymryd for gennych lygoden dau fotwm a bydd yn\n"
-"ffurfweddu efelychiad trydydd botwm. Mae modd \"pwyso\" trydydd botwm\n"
+"ffurfweddu efelychiad trydydd botwm. Mae modd pwyso trydydd botwm\n"
 "llygoden dau fotwm ar unwaith gan glicio'r botymau chwith a de. Bydd DrakX\n"
 "yn gwybod yn awtomatig p'un ai yw'r llygoden yn defnyddio rhyngwyneb PS/2\n"
 "cyfresol neu USB.\n"
@@ -5067,26 +5118,30 @@ msgstr ""
 "Lle mae gennych lygoden 3 botwm heb olwyn, cewch ddewis y llygoden sy'n\n"
 "dweud  \"%s\". Bydd DrakX yn ffurfweddu eich llygoden fel bod modd "
 "efelychu'r\n"
-"olwyn gydag ef: i wneud hynny pwyswch y botwm canol a symud eich llygodennôl "
-"a blaen.\n"
-"\n"
-"Os am rhyw rheswm yr hoffech nodi llygoden o fath gwahanol, dewiswch un\n"
-"o'r rhestr amgaëdig.\n"
-"\n"
-"If you choose a mouse other than the default, a test screen will be\n"
-"displayed. Use the buttons and wheel to verify that the settings are\n"
-"correct and that the mouse is working correctly. If the mouse is not\n"
-"working well, press the space bar or [Return] key to cancel the test and to\n"
-"go back to the list of choices.\n"
-"\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
-"select your mouse from a list. Be sure to select the one corresponding to\n"
-"the port that your mouse is attached to. After selecting a mouse and\n"
-"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
-"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
-"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
-"buttons and check that the mouse pointer moves on-screen as you move your\n"
-"mouse."
+"olwyn gydag ef: i wneud hynny pwyswch y botwm canol a symud eich llygoden "
+"nôl a blaen.\n"
+"\n"
+"Os am ryw reswm yr hoffech nodi llygoden o fath gwahanol, dewiswch un\n"
+"o'r rhestr amgaeëdig.\n"
+"\n"
+"Gallwch ddewis \"%s\" i ddewis math llygoden ``generic'' sy'n gweithio gyda\n"
+"bron bob llygoden.\n"
+"\n"
+"Os fyddwch yn dewis llygoden wahanol i'r rhagosodedig gyd sgrin\n"
+"profi'n cael ei ddangos. Defnyddiwch y botymau a'r olwyn i wirio fod\n"
+"y gosodiadau'n gywir a bod y llygoden yn gweithio'n iawn. Os nad yw'r\n"
+"llygoden yn gweithio'n dda, pwyswch y bar bylchu neu fysell [Return] i\n"
+"i ddiddymu'r prawf ac i fynd nôl i'r rhestr dewis.\n"
+"\n"
+"Ar brydiau nid yw llygod olwyn yn cael eu canfod yn awtomatig, felly bydd\n"
+"angen dewis eich llygoden o'r rhestr. Gwnewch yn siŵr eich bod yn dewis\n"
+"y porth sy'n cyfateb i le mae eich llygoden. Ar ôl dewis llygoden a "
+"phwyso'r\n"
+"botwm \"%s\" , bydd delwedd llygoden yn cael ei dangos ar y sgrin. Trowch\n"
+"olwyn y llygoden i sicrhau ei fod yn gweithio'n iawn. Unwaith i chi weld yr\n"
+"olwyn ar y sgrin yn symud wrth i chi droi'r olwyn. profwch y botymau a "
+"gwirio fod\n"
+"pwyntydd y llygoden yn symud ar y sgrin wrth i chi symud y llygoden."
 
 #: help.pm:681
 #, c-format
@@ -5094,9 +5149,9 @@ msgid "with Wheel emulation"
 msgstr "gydag efelychiad Olwyn"
 
 #: help.pm:681
-#, fuzzy, c-format
+#, c-format
 msgid "Universal | Any PS/2 & USB mice"
-msgstr "Unrhyw lygoden PS/2 ac USB"
+msgstr "Cyffredinol | Unrhyw lygoden PS/2 ac USB"
 
 #: help.pm:684
 #, c-format
@@ -5109,7 +5164,7 @@ msgstr ""
 "\"ttyS0\" yn GNU/Linux, e.e."
 
 #: help.pm:688
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
 "system: you must enter the \"root\" password. \"Root\" is the system\n"
@@ -5128,10 +5183,11 @@ msgid ""
 "characters long. Never write down the \"root\" password -- it makes it far\n"
 "too easy to compromise your system.\n"
 "\n"
-"One caveat: don't make the password too long or too complicated because you\n"
+"One caveat: do not make the password too long or too complicated because "
+"you\n"
 "must be able to remember it!\n"
 "\n"
-"The password won't be displayed on screen as you type it. To reduce the\n"
+"The password will not be displayed on screen as you type it. To reduce the\n"
 "chance of a blind typing error you'll need to enter the password twice. If\n"
 "you do happen to make the same typing error twice, you'll have to use this\n"
 "``incorrect'' password the first time you'll try to connect as \"root\".\n"
@@ -5140,7 +5196,7 @@ msgid ""
 "click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you don't know which\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
 "If you happen to have problems with remembering passwords, or if your\n"
@@ -5148,25 +5204,25 @@ msgid ""
 "everybody who uses your computer, you can choose to have \"%s\"."
 msgstr ""
 "Mae hwn yn fan pwysig ynghylch diogelwch eich system GNU/Linux; rhaid\n"
-"rhoi cyfrinair \"root\".\"root\" yw gweinyddwr y system a'r unig un sydd â'r "
+"rhoi cyfrinair \"root\".\"Root\" yw gweinyddwr y system a'r unig un sydd â'r "
 "hawl\n"
 "i wneud diweddariadau, ychwanegu defnyddwyr, newid ffurfweddiad cyffredinol\n"
 "y system, ac yn y blaen. Yn fyr mae \"root\" yn medru gwneud popeth! Dyna\n"
 "pam mae'n rhaid dewis cyfrinair sy'n anodd ei ddyfalu - bydd DrakX yn dweud\n"
-" wrthych os yw'n rhy hawdd. Fel y gwelwch, mae modd peidio gorfod cynnig\n"
-" cyfrinair, ond rydym yn argymell yn erbyn hyn, hyd yn oed am un rheswm:\n"
-" peidiwch â meddwl bod eich systemau gweithredu eraill yn ddiogel rhag\n"
-" camgymeriadau, gan eich bod wedi cychwyn o GNU/Linux. Gan fod \"root\" yn\n"
-" medru goresgyn unrhyw gyfyngiadau a dileu data'n anfwriadol ar bob "
-"rhaniad,\n"
-" drwy fynd at y rhaniadau'n ddi-hid, yna mae'n bwysig ei gwneud hi'n anodd "
+"wrthych os yw'n rhy hawdd. Fel y gwelwch, mae modd peidio gorfod cynnig\n"
+"cyfrinair, ond rydym yn argymell yn erbyn hyn, hyd yn oed am un rheswm:\n"
+"peidiwch â meddwl bod eich systemau gweithredu eraill yn ddiogel rhag\n"
+"camgymeriadau, gan eich bod wedi cychwyn o GNU/Linux. Gan fod \"root\" yn\n"
+"medru goresgyn unrhyw gyfyngiadau a dileu data'n anfwriadol ar bob rhaniad,\n"
+"drwy fynd at y rhaniadau'n ddi-hid, yna mae'n bwysig ei gwneud hi'n anodd "
 "bod\n"
-" yn \"root\".n\n"
+"yn \"root\".\n"
 "\n"
 "Dylai'r cyfrinair fod yn gyfuniad o rifau a llythrennau ac o leiaf 8 nod o "
 "hyd.\n"
-"Peidiwch ysgrifennu'r cyfrinair ar bapur - bydd yn ei gwneud hi'n rhy hawdd\n"
-"gwanhau'r system.\n"
+"Peidiwch ysgrifennu cyfrinair \"root\" ar bapur - bydd yn ei gwneud hi'n "
+"rhy\n"
+"hawdd gwanhau'r system.\n"
 "\n"
 "Er hynny, peidiwch â gwneud y cyfrinair yn rhy hir neu gymhleth am fod rhaid "
 "i\n"
@@ -5178,7 +5234,7 @@ msgstr ""
 "Os ydych\n"
 "yn digwydd gwneud yr un gwall teipio ddwywaith, bydd rhaid defnyddio'r "
 "cyfrinair\n"
-"\"anghywir\" i gychwyn y tro cyntaf.\n"
+"\"anghywir\" i gychwyn y tro cyntaf fel \"root\".\n"
 "\n"
 "Os hoffech i fynediad i'r cyfrifiadur gael ei reoli gan wasanaethwr dilysu, "
 "cliciwch\n"
@@ -5187,7 +5243,7 @@ msgstr ""
 "neu PDC Windows Domain, dewiswch un addas fel \"%s\",\n"
 "Os nad ydych yn gwybod,  gofynnwch i'ch gweinyddwr rhwydwaith\n"
 "\n"
-"Os ydych yn cael anhawsterau atgoffa cyfrineiriau, gallwch ddewis\n"
+"Os ydych yn cael anawsterau atgoffa cyfrineiriau, gallwch ddewis\n"
 "\"%s\", os na fydd eich cyfrifiadur yn cael cyswllt â'r we ac rydych\n"
 "yn ymddiried yn y defnyddiwr."
 
@@ -5196,14 +5252,8 @@ msgstr ""
 msgid "authentication"
 msgstr "dilysu"
 
-#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:722 install_steps_interactive.pm:1211
-#, c-format
-msgid "No password"
-msgstr "Dim cyfrinair"
-
 #: help.pm:725
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A boot loader is a little program which is started by the computer at boot\n"
 "time. It's responsible for starting up the whole system. Normally, the boot\n"
@@ -5216,12 +5266,14 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"If DrakX can not determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
-"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"Choosing \"%s\" will not install any boot loader. Use this option only if "
+"you\n"
 "know what you're doing."
 msgstr ""
-"Cychwynnydd GNU/Linux yw LILO a GRUB. Fel rheol mae'r rhan yma'n\n"
+"Rhaglen fechan yw'r cychwynnwr sy'n cael ei gychwyn gan y cyfrifiadur.\n"
+"Mae'n gyfrifol am gychwyn y system i gyd. Fel rheol mae'r rhan yma'n\n"
 "digwydd yn awtomatig. Bydd DrakX yn dadansoddi'r adran cychwyn\n"
 "disg a gweithredu yn â'r yr hyn mae'n ei ganfod yno.\n"
 "\n"
@@ -5237,15 +5289,15 @@ msgstr ""
 " dewis \"%s\" yn gosod cychwynnydd. Dim ond ar gyfer y gwybodus."
 
 #: help.pm:742
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other\n"
 "operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
-" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
 "within networks.) It's recommended that you use \"pdq\" if this is your\n"
 "first experience with GNU/Linux.\n"
@@ -5260,7 +5312,7 @@ msgid ""
 "\"%s\" includes graphical front-ends for printing or choosing printer\n"
 "options and for managing the printer.\n"
 "\n"
-"If you make a choice now, and later find that you don't like your printing\n"
+"If you make a choice now, and later find that you do not like your printing\n"
 "system you may change it by running PrinterDrake from the Mandrakelinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
@@ -5268,44 +5320,45 @@ msgstr ""
 "bod systemau eraill yn cynnig un i chi, ond mae Mandrake yn cynnig dwy.\n"
 "Mae 'r systemau'n addas gar gyfer ffurfweddiad arbennig.\n"
 "\n"
-" *\"%s\" - sy'n golygu \"print, don't queue\", yw'r dewis os oes gennych\n"
+" *\"%s\" - sy'n golygu \"print, do not queue\", yw'r dewis os oes gennych\n"
 "gysylltiad uniongyrchol â'ch argraffydd a'ch bod eisiau medru tynnu allan o "
 "waith\n"
 "argraffu pan fo'r papur wedi mynd yn sownd ac nad oes gennych argraffyddion\n"
 "wedi eu cysylltu drwy rwydwaith. (Dim ond rhwydweithiau syml mae \"%s\" yn "
 "ei\n"
-"drin ac mae'n araf ar rwydweithiau) Dewiswch \"pdq\" os mai dyma yw eich\n"
+"drin ac mae'n araf ar rwydweithiau). Dewiswch \"pdq\" os mai dyma yw eich\n"
 "tro cyntaf yn GNU/Linux.\n"
+"\n"
 " *\"%s\" - \"Common Unix Printing System\". Mae hwn yn dda ar gyfer\n"
 "argraffu i argraffyddion lleol a hanner ffordd rownd y byd. Mae'n symlach, "
 "yn\n"
-"medru gweithredu fel gwasanaethwr neu cleient ar gyfer yr hen system \"lpd"
+"gallu gweithredu fel gwasanaethwr neu gleient ar gyfer yr hen system \"lpd"
 "\"\n"
-"felly mae'n cydweddi â'r systemau sydd wedi mynd o'i flaen. Mae'n gallu "
-"gwneud\n"
-"nifer o driciau, ond mae bron mor syml i'w osod  \"pdq\". Os ydych amgen "
-"hwn\n"
-"i efelychu gwasanaethwr \"lpd\", yna rhaid cychwyn daemon \"cups-lpd\".\n"
-"Mae gan \"%s\" wyneb graffigol ar gyfer argraffu neu rheoli'r argraffu.\n"
+"ac felly mae'n cydweddi â'r systemau sydd wedi mynd o'i flaen. Mae'n gallu\n"
+"gwneud nifer o driciau, ond mae bron mor syml i'w osod  \"pdq\". Os ydych\n"
+"amgen hwn i efelychu gwasanaethwr \"lpd\", yna rhaid cychwyn aemon\n"
+"\"cups-lpd\". Mae gan \"%s\" wyneb graffigol ar gyfer argraffu dewis\n"
+"argraffydd neu reoli'r argraffu.\n"
+"\n"
 "\n"
 "Os ydych yn dewis yn awr ac yn ddiweddarach yn penderfynu eich bod\n"
 "am newid eich system argraffu gallwch ei newid drwy gyfrwng PrinterDrake\n"
-"yng Nghanolfan Rheoli Mandrake a chlicio'r botwm arbenigwr."
+"yng Nghanolfan Rheoli Mandrake a chlicio'r botwm %s."
 
 #: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:118
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
 #: help.pm:765
-#, fuzzy, c-format
+#, c-format
 msgid "Expert"
-msgstr "Modd Uwch"
+msgstr "Arbenigwr"
 
 #: help.pm:768
 #, c-format
@@ -5332,7 +5385,8 @@ msgstr ""
 "SCSI'n cael ei ganfod bydd DrakX yn awtomatig yn gosod y gyrrwr priodol.\n"
 "\n"
 "Oherwydd nad yw canfod caledwedd bob tro'n canfod darn o galedwedd,\n"
-"gall DrakX fethu canfod eich dsgiau caled. Os felly, bydd rhaid i chi bennu\n"
+"gall DrakX fethu canfod eich disgiau caled. Os felly, bydd rhaid i chi "
+"bennu\n"
 "eich caledwedd â llaw.\n"
 "\n"
 "Os ydych wedi pennu eich addaswr PCI SCS gyda llaw, bydd DrakX yn\n"
@@ -5345,10 +5399,10 @@ msgstr ""
 " chi ffurfweddu'r gyrrwr gyda llaw. "
 
 #: help.pm:786
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver."
 msgstr ""
 "\"%s\":  os yw cerdyn sain yn cael ei ganfod ar eich cyfrifiadur, bydd \n"
@@ -5356,14 +5410,14 @@ msgstr ""
 "cyfrifiadur sy'n cael ei ddangos, yna cliciwch ar y botwm a dewis\n"
 "gyrrwr arall."
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
-#: install_steps_interactive.pm:1036
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1005
+#: install_steps_interactive.pm:1022
 #, c-format
 msgid "Sound card"
 msgstr "Cerdyn sain"
 
 #: help.pm:791
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "As a review, DrakX will present a summary of information it has gathered\n"
 "about your system. Depending on the hardware installed on your machine, you\n"
@@ -5376,7 +5430,7 @@ msgid ""
 "\n"
 " * \"%s\": check the current country selection. If you're not in this\n"
 "country, click on the \"%s\" button and choose another. If your country\n"
-"isn't in the list shown, click on the \"%s\" button to get the complete\n"
+"is not in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
 " * \"%s\": by default, DrakX deduces your time zone based on the country\n"
@@ -5392,18 +5446,18 @@ msgid ""
 "presented in our manual is similar to the one used during installation.\n"
 "\n"
 " * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver.\n"
 "\n"
 " * \"%s\": if you have a TV card, this is where information about its\n"
-"configuration will be displayed. If you have a TV card and it isn't\n"
+"configuration will be displayed. If you have a TV card and it is not\n"
 "detected, click on \"%s\" to try to configure it manually.\n"
 "\n"
 " * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
 "the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
@@ -5448,7 +5502,6 @@ msgstr ""
 " *\"%s\": Mae DrakX yn dyfalu eich parth amser yn ôl y wlad rydych\n"
 "wedi ei dewis. Mae modd clicio ar y botwm \"%s\" i'w gywiro.\n"
 "\n"
-"\n"
 " *\"%s\": gwirio ffurfweddiad y llygoden bresennol a chlicio ar y botwm\n"
 "i'w newid os oes angen.\n"
 "\n"
@@ -5462,43 +5515,49 @@ msgstr ""
 "ddangos yw'r un sydd ar eich system, yna cliciwch y botwm a dewis\n"
 "gyrrwr arall.\n"
 "\n"
-" *\"%s\": fel rheol bydd DrakX yn gosod eich rhyngwyneb\n"
-"i gydraniad  \"800x600\" neu \"1024x768\". Os nad yw hyn yn addas ar\n"
-"eich cyfer cliciwch y botwm \"%s\" i'w newid.\n"
-"\n"
-" *\"%s\": os oes cerdyn teledu wedi ei ganfod ar eich system\n"
+" * \"%s\": os oes cerdyn teledu wedi ei ganfod ar eich system\n"
 "bydd yn cael ei ddangos yma. Os oes gennych gerdyn ac nid yw wedi cael\n"
 "ei ganfod, cliciwch \"%s\" i geisio ei ffurfweddu â llaw.\n"
 "\n"
-" *\"%s\": os oes cerdyn ISDN wedi ei ganfod ar eich system bydd\n"
-"yn cael ei ddangos yma. Mae modd clicio ar \"%s\" i newid y\n"
-"paramedrau sy'n gysylltiedig â'r cerdyn.\n"
+" * \"%s\": cliciwch ar \"%s\" i newid paramedrau cysylltiedig â'r cerdyn\n"
+"os yw'r ffurfweddiad yn anghywir.\n"
 "\n"
-" *\"%s\": os ydych am ffurfweddu eich mynediad i'r Rhyngrwyd neu\n"
-"eich rhwydwaith lleol.\n"
+" *\"%s\": fel rheol bydd DrakX yn gosod eich rhyngwyneb\n"
+"i gydraniad  \"800x600\" neu \"1024x768\". Os nad yw hyn yn addas ar\n"
+"eich cyfer cliciwch y botwm \"%s\" i'w newid.\n"
+" \n"
+" * \"%s\": os ydych am ffurfweddu eich mynediad i'r Rhyngrwyd neu\n"
+"eich rhwydwaith lleol, mae modd gwneud hynny. Darllenwch y deunydd\n"
+"ysgrifenedig neu ddefnyddio Canolfan Reoli Mandrakelinux wedi i'r gosod\n"
+"orffen i fanteisio ar gymorth ar-lein llawn.\n"
 "\n"
-" *\"%s\": mae modd ail ddiffinio'r lefel diogelwch osodwyd yn\n"
+" * \"%s\": os ydych am ffurfweddu cyfeiriadau dirprwyol HTTP ac FTP os\n"
+"yw'r peiriant rydych yn ei osod i fod tu nôl i weinydd dirprwyol.\n"
+"\n"
+" * \"%s\": mae modd ail ddiffinio'r lefel diogelwch a osodwyd yn\n"
 "flaenorol ().\n"
 "\n"
 " *\"%s\": mae'n syniad da gosod mur cadarn i'ch amddiffyn rhag\n"
 "ymyriadau os ydych yn bwriadu cysylltu eich cyfrifiadur â'r Rhyngrwyd.\n"
-"Darllennwch y bennod perthnasol yn y \"Starter Guide\" am fanylion\n"
+"Darllenwch y bennod berthnasol yn y \"Starter Guide\" am fanylion\n"
 "gosodiadau mur cadarn.\n"
 "\n"
-" *\"%s\": os hoffech newid ffurfweddiad eich cychwynnwr\n"
-"cliciwch y botwm honno. Ar gyfer defnyddwyr profiadol.\n"
+" * \"%s\": os hoffech newid ffurfweddiad eich cychwynnwr\n"
+"cliciwch y botwm yma. Ar gyfer defnyddwyr profiadol. Darllenwch y\n"
+"deunydd ysgrifenedig  neu'r cymorth ar-lein am ffurfweddiad\n"
+"cychwynwyr yng Nghanolfan Rheoli Mandrakelinux.\n"
 "\n"
 " *\"%s\": yma bydd modd i chi wneud man newidiadau i'r\n"
 "gwasanaethau sy'n cael eu rhedeg ar eich cyfrifiadur. Os ydych yn\n"
 " bwriadu defnyddio'r cyfrifiadur fel gwasanaethwr mae'n syniad da\n"
 "darllen y gosodiadau'n fanwl."
 
-#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
+#: help.pm:855 install_steps_interactive.pm:964 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: help.pm:855 install_steps_interactive.pm:1052
+#: help.pm:855 install_steps_interactive.pm:1038
 #, c-format
 msgid "TV card"
 msgstr "Cerdyn Teledu"
@@ -5513,32 +5572,33 @@ msgstr "Cerdyn ISDN"
 msgid "Graphical Interface"
 msgstr "Rhyngwyneb Graffigol"
 
-#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
+#: help.pm:855 install_any.pm:1528 install_steps_interactive.pm:1056
+#: standalone/drakbackup:2036
 #, c-format
 msgid "Network"
 msgstr "Rhwydwaith"
 
-#: help.pm:855 install_steps_interactive.pm:1085
+#: help.pm:855 install_steps_interactive.pm:1071
 #, c-format
 msgid "Proxies"
 msgstr "Dirprwyon"
 
-#: help.pm:855 install_steps_interactive.pm:1096
+#: help.pm:855 install_steps_interactive.pm:1082
 #, c-format
 msgid "Security Level"
 msgstr "Lefel Diogelwch"
 
-#: help.pm:855 install_steps_interactive.pm:1110
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Firewall"
 msgstr "Mur Cadarn"
 
-#: help.pm:855 install_steps_interactive.pm:1124
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Bootloader"
 msgstr "Cychwynnwr ar waith"
 
-#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1123 services.pm:193
 #, c-format
 msgid "Services"
 msgstr "Gwasanaethau"
@@ -5586,7 +5646,7 @@ msgstr "<- Blaenorol"
 #: install2.pm:117
 #, c-format
 msgid ""
-"Can't access kernel modules corresponding to your kernel (file %s is "
+"Can not access kernel modules corresponding to your kernel (file %s is "
 "missing), this generally means your boot floppy in not in sync with the "
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
@@ -5599,79 +5659,100 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Rhaid fformatio %s hefyd"
 
-#: install_any.pm:390
+#: install_any.pm:376
 #, c-format
-msgid ""
-"The following installation media have been found.\n"
-"If you want to skip some of them, you can unselect them now."
-msgstr ""
-
-#: install_any.pm:411
-#, fuzzy, c-format
 msgid "Do you have further supplementary media?"
-msgstr "Oes gennych un arall?"
+msgstr "Oes gennych unrhyw gyfrwng ychwanegol arall?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:414
-#, fuzzy, c-format
+#: install_any.pm:379
+#, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
 "\n"
 "\n"
 "Do you have a supplementary installation media to configure?"
-msgstr "Oes gennych unrhyw ryngwyneb %s?"
+msgstr ""
+"Mae'r cyfrwng canlynol wedi eu canfod ac yn cael eu defnyddio yn ystod y "
+"gosod: %s.\n"
+"\n"
+"\n"
+"A oes gennych unrhyw gyfrwng gosod arall i'w ffurfweddu?"
 
-#: install_any.pm:420 printer/printerdrake.pm:2652
-#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
-#: standalone/scannerdrake:184 standalone/scannerdrake:235
-#: standalone/scannerdrake:242
+#: install_any.pm:388 printer/printerdrake.pm:2929
+#: printer/printerdrake.pm:2936 standalone/scannerdrake:182
+#: standalone/scannerdrake:190 standalone/scannerdrake:241
+#: standalone/scannerdrake:248
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: install_any.pm:420
+#: install_any.pm:388
 #, c-format
 msgid "Network (http)"
 msgstr "Rhwydwaith (http)"
 
-#: install_any.pm:420
+#: install_any.pm:388
 #, c-format
 msgid "Network (ftp)"
 msgstr "Rhwydwaith (ftp)"
 
-#: install_any.pm:464 standalone/drakbackup:112
+#: install_any.pm:436 standalone/drakbackup:112
 #, c-format
 msgid "No device found"
 msgstr "Heb ganfod dyfais"
 
-#: install_any.pm:468
+#: install_any.pm:440
 #, c-format
 msgid "Insert the CD"
-msgstr "Rhowch yr CD-ROM"
+msgstr "Rhowch y CD-ROM"
+
+#: install_any.pm:445
+#, c-format
+msgid "Unable to mount CD-ROM"
+msgstr "Methu gosod CD-ROM"
 
-#: install_any.pm:492
+#: install_any.pm:468
 #, c-format
 msgid "Insert the CD 1 again"
-msgstr "Rhowch yr CD-ROM (eto)"
+msgstr "Rhowch y CD-ROM (eto)"
 
-#: install_any.pm:502 install_any.pm:506
+#: install_any.pm:478 install_any.pm:482
 #, c-format
 msgid "URL of the mirror?"
 msgstr "URL y drych?"
 
-#: install_any.pm:532
-#, fuzzy, c-format
-msgid "Can't find hdlist file on this mirror"
-msgstr "Methu canfod %s ar %s"
+#: install_any.pm:515
+#, c-format
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
+msgstr "Methu canfod ffeil hdlist ar y drych"
+
+#: install_any.pm:633
+#, c-format
+msgid ""
+"Change your Cd-Rom!\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done."
+msgstr ""
+"Newidiwch eich CD-ROM\n"
+"\n"
+"Rhowch y CD-ROM \"%s\" yn eich gyrrwr a chlicio Iawn ar ôl gorffen"
+
+#: install_any.pm:652
+#, c-format
+msgid "Copying in progress"
+msgstr "Copïo ar waith"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:713
+#: install_any.pm:783
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
 "\n"
 "\n"
-"These servers are activated by default. They don't have any known security\n"
+"These servers are activated by default. They do not have any known security\n"
 "issues, but some new ones could be found. In that case, you must make sure\n"
 "to upgrade as soon as possible.\n"
 "\n"
@@ -5688,7 +5769,7 @@ msgstr ""
 "Ydych chi wir eisiau gosod y gweinyddion hyn?\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:736
+#: install_any.pm:806
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5702,36 +5783,22 @@ msgstr ""
 "\n"
 "Ydych chi am dynnu'r pecynnau hyn?\n"
 
-#: install_any.pm:1116
-#, c-format
-msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "Rhowch ddisg meddal wedi ei fformatio i FAT yng ngyrrwr %s"
-
-#: install_any.pm:1120
+#: install_any.pm:1214 partition_table.pm:603
 #, c-format
-msgid "This floppy is not FAT formatted"
-msgstr "Nid yw 'r disg meddal hwn wedi ei fformatio i FAT"
+msgid "Error reading file %s"
+msgstr "Gwall wrth ddarllen ffeil %s"
 
-#: install_any.pm:1132
+#: install_any.pm:1425
 #, c-format
-msgid ""
-"To use this saved packages selection, boot installation with ``linux "
-"defcfg=floppy''"
-msgstr ""
-"I ddefnyddio'r dewis o becynnau wedi eu cadw, cychwynnwch y gosodiad gyda "
-"``linux defcfg=floppy''"
+msgid "The following disk(s) were renamed:"
+msgstr "Mae'r disg(iau) hyn wedi eu hailenwi:"
 
-#: install_any.pm:1160 partition_table.pm:595
+#: install_any.pm:1427
 #, c-format
-msgid "Error reading file %s"
-msgstr "Gwall wrth ddarllen ffeil %s"
-
-#: install_any.pm:1361
-#, fuzzy, c-format
-msgid "%s (was %s)"
-msgstr "%s(Porth %s)"
+msgid "%s (previously named as %s)"
+msgstr "%s (ei enw blaenorol oedd %s)"
 
-#: install_any.pm:1396
+#: install_any.pm:1465
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5740,12 +5807,52 @@ msgstr ""
 "Digwyddodd gwall - ni chafwyd dyfeisiau dilys i greu systemau ffeil arnynt. "
 "Gwiriwch eich caledwedd am ffynhonnell yr anhawster."
 
-#: install_gtk.pm:160
+#: install_any.pm:1509
+#, c-format
+msgid "HTTP"
+msgstr "HTTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "FTP"
+msgstr "FTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "NFS"
+msgstr "NFS"
+
+#: install_any.pm:1532
+#, c-format
+msgid "Please choose a media"
+msgstr "Dewiswch gyfrwng"
+
+#: install_any.pm:1564
+#, c-format
+msgid "Bad media %s"
+msgstr "Cyfrwng drwg %s"
+
+#: install_any.pm:1576
+#, c-format
+msgid "File already exists. Overwrite it?"
+msgstr "Mae'r ffeil yn bodoli eisoes. Ysgrifennu drosti?"
+
+#: install_any.pm:1627
+#, c-format
+msgid "Can not make screenshots before partitioning"
+msgstr "Meth creu lluniau o'r sgrin cyn rhannu"
+
+#: install_any.pm:1634
+#, c-format
+msgid "Screenshots will be available after install in %s"
+msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s"
+
+#: install_gtk.pm:136
 #, c-format
 msgid "System installation"
 msgstr "Gosod y system"
 
-#: install_gtk.pm:163
+#: install_gtk.pm:139
 #, c-format
 msgid "System configuration"
 msgstr "Ffurfweddu'r system"
@@ -5773,7 +5880,7 @@ msgstr ""
 #: install_interactive.pm:67
 #, c-format
 msgid ""
-"You don't have a swap partition.\n"
+"You do not have a swap partition.\n"
 "\n"
 "Continue anyway?"
 msgstr ""
@@ -5883,10 +5990,10 @@ msgstr ""
 "ofalus: mae gwneud hyn yn beryglus. Os nad ydych wedi\n"
 "gwneud yn barod, dylech fynd allan o'r gosod, rhedeg\n"
 "\"chkdsk c:\" o'r Annogwr yn Windows (byddwch ofalus nid \n"
-"yw rhedeg \"scandisk\" yn ddigon, gwnewch yn siwr i ddefnyddio \n"
-"\"chkdsk\" o fewn Annogwr!), hefyd, defnyddiwch defrag ac ail\n"
+"yw rhedeg \"scandisk\" yn ddigon, gwnewch yn siŵr i ddefnyddio \n"
+"\"chkdsk\" o fewn Anogwr!), hefyd, defnyddiwch defrag ac ail\n"
 "gychwyn gosod. Dylech hefyd wneud copi wrth gefn\n"
-"o'ch data. Pan rydych yn siwr, cliciwch Iawn."
+"o'ch data. Pan rydych yn siŵr, cliciwch Iawn."
 
 #: install_interactive.pm:178
 #, c-format
@@ -5937,14 +6044,14 @@ msgstr "Defnyddiwch fdisk"
 #, c-format
 msgid ""
 "You can now partition %s.\n"
-"When you are done, don't forget to save using `w'"
+"When you are done, do not forget to save using `w'"
 msgstr ""
 "Gallwch rannu %s\n"
 "Wedi gorffen, peidiwch anghofio cadw gyda 'w'"
 
 #: install_interactive.pm:271
 #, c-format
-msgid "I can't find any room for installing"
+msgid "I can not find any room for installing"
 msgstr "Methu canfod lle ar gyfer gosod"
 
 #: install_interactive.pm:275
@@ -6097,7 +6204,7 @@ msgstr ""
 "Meddalwedd yn\n"
 "cynnwys, ond heb eu cyfyngu, i'r  casgliad o raglenni , dulliau, rheolau a "
 "dogfennau mewn\n"
-"perthynas â'r system weithredu a chydrannau gwahanol dosbarthiad "
+"perthynas â'r system weithredu a chydrannau gwahanol ddosbarthiad "
 "Mandrakelinux.\n"
 "\n"
 "\n"
@@ -6111,8 +6218,8 @@ msgstr ""
 "rydych yn\n"
 "amlwg yn derbyn ac yn llawn cytuno i gadw at delerau ac amodau'r Drwydded "
 "hon.\n"
-"Os ydych yn anghytuno ag unrhyw rhan o'r cytundeb, ni chewch ganiatâd i "
-"osod, dyblygu\n"
+"Os ydych yn anghytuno ag unrhyw ran o'r cytundeb, ni chewch ganiatâd i osod, "
+"dyblygu\n"
 "neu ddefnyddio'r Cynnyrch Meddalwedd.\n"
 "Bydd unrhyw ymgais i osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn "
 "modd\n"
@@ -6133,7 +6240,7 @@ msgstr ""
 "Ni fydd Mandrakesoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag "
 "y bydd y gyfraith yn\n"
 "caniatáu,  am unrhyw iawn o gwbl,\n"
-"arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gangynnwys heb "
+"arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gan gynnwys heb "
 "gyfyngu ar iawndal\n"
 "am golli busnes, tarfu ar fusnes, colled ariannol, costau cyfreithiol, a "
 "chosb o ganlyniad i achos llys,\n"
@@ -6169,13 +6276,13 @@ msgstr ""
 "amodau Trwydded Gyhoeddus\n"
 "Cyffredinol (General Public Licence (GPL)), GNU, fydd yn cael ei gyfeirio "
 "ato  o hyn ymlaen fel \"GPL\", neu\n"
-"drwyddedau cyffelyb.. Mae'r rhan fwyaf o'r trwyddedau'n caniatáu i chi "
+"drwyddedau cyffelyb. Mae'r rhan fwyaf o'r trwyddedau'n caniatáu i chi "
 "ddefnyddio, dyblygu, addasu neu\n"
 " ailddosbarthu'r cydrannau maent yn eu cynnwys. Darllenwch delerau ac amodau "
 "trwydded pob cydran cyn\n"
 "eu defnyddio. Dylai pob cwestiwn am drwydded cydran gael ei ofyn i awdur y "
 "gydran ac nid i Mandrakesoft.\n"
-"Mae'r rhaglenni ddatblygwyd gan Mandrakesoft yn cael eu llywodraethu o dan "
+"Mae'r rhaglenni a ddatblygwyd gan Mandrakesoft yn cael eu llywodraethu o dan "
 "Drwydded GLP. Mae'r dogfennau\n"
 " ysgrifennwyd gan Mandrakesoft S.A. yn cael eu llywodraethu gan drwydded "
 "benodol. Darllenwch y dogfennau\n"
@@ -6197,17 +6304,17 @@ msgstr ""
 "\n"
 "5. Cyfreithiau Llywodraethol\n"
 "\n"
-"Os bydd unrhyw rhan o'r cytundeb hwn yn cael ei ddal yn ddi-rym, "
+"Os bydd unrhyw ran o'r cytundeb hwn yn cael ei ddal yn ddi-rym, "
 "anghyfreithlon neu amherthnasol gan\n"
 "benderfyniad llys, bydd y rhan yma'n cael ei dynnu o'r cytundeb hwn. Byddwch "
 "yn parhau i fod yn rhwymedig\n"
 "i adrannau cymwys o'r cytundeb.\n"
-"Mae telerau ac amodau'r Drwydded hon yn cael eu llywodraethu gan Cyfreithiau "
+"Mae telerau ac amodau'r Drwydded hon yn cael eu llywodraethu gan Gyfreithiau "
 "Ffrainc. Mae'n ddymunol y\n"
 "bydd pob anghytundeb ar amodau'r drwydded yn cael eu datrys y tu allan i'r "
-"llys. Fel cam olaf, bydd yranghytundeb yn cael ei drosglwyddo i'r Llysoedd "
-"Barn, Paris - Ffrainc. Am unrhyw gwestiwn ynghylch yddogfen hon cysylltwch â "
-"Mandrakesoft S.A.  \n"
+"llys. Fel cam olaf, bydd yr anghytundeb yn cael ei drosglwyddo i'r Llysoedd "
+"Barn, Paris - Ffrainc. Am unrhyw gwestiwn ynghylch y ddogfen hon cysylltwch "
+"â Mandrakesoft S.A.  \n"
 
 #: install_messages.pm:90
 #, c-format
@@ -6220,11 +6327,11 @@ msgid ""
 "patent\n"
 "may be applicable to you, check your local laws."
 msgstr ""
-"Rhbudd: Mae'n bosibl nad yw Meddalwedd Rhad yn rhydd o batent, ac mae\n"
-"peth Meddalwedd Rhad wedi ei gyfyngu â phantent yn eich gwlad, e.e gall\n"
+"Rhybudd: Mae'n bosibl nad yw Meddalwedd Rhad yn rhydd o batent, ac mae\n"
+"peth Meddalwedd Rhad wedi ei gyfyngu â phatent yn eich gwlad, e.e. gall\n"
 "amgodwyr MP3 fod angen trwydded ar gyfer defnydd pellach\n"
 "(gw. http://www.mp3licensing.com am wybodaeth bellach. Os nad ydych yn\n"
-"siwr os yw'r patent yn berthnasol i chi, gwiriwch eich cyfreithiau lleol."
+"siŵr os yw'r patent yn berthnasol i chi, gwiriwch eich cyfreithiau lleol."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:98
@@ -6272,9 +6379,9 @@ msgstr ""
 " trwyddedau penodol cyn defnyddio neu ddosbarthu'r cydrannau hynny.\n"
 "\n"
 "Mae'r trwyddedau hynny'n atal yn gyffredinol, drosglwyddiad, dyblygu (ar "
-"wahân i\n"
+"wahan i\n"
 " bwrpas cadw wrth gefn), dosbarthu, cildroi peirianyddol, dadcydosod,\n"
-" dadgrynhoi neu newid y cydrannau. Bydd unrhyw dorri ar yr amodau hyn yn\n"
+" dad-grynhoi neu newid y cydrannau. Bydd unrhyw dorri ar yr amodau hyn yn\n"
 "terfynu eich hawl  o dan y drwydded benodol. Oni bai ei fod yn rhoi'r hawl i "
 "chi,\n"
 "nid oes modd i chi osod y rhaglenni ar fwy nag un system na'i addasu ar "
@@ -6314,7 +6421,7 @@ msgstr ""
 "\n"
 "Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o "
 "Mandrakelinux,\n"
-"cysylltwch a'r atodiad, sydd i'w gael yn:\n"
+"cysylltwch â'r atodiad, sydd i'w gael yn:\n"
 "\n"
 "\n"
 "%s\n"
@@ -6334,10 +6441,10 @@ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "Pwynt gosod dyblyg %s"
 
-#: install_steps.pm:477
+#: install_steps.pm:479
 #, c-format
 msgid ""
-"Some important packages didn't get installed properly.\n"
+"Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
 "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
@@ -6347,7 +6454,7 @@ msgstr ""
 "Gwiriwch y CD-ROM ar gyfrifiadur wedi ei osod gan ddefnyddio \"rpm -qpl "
 "media/main/*.rpm\"\n"
 
-#: install_steps.pm:603
+#: install_steps.pm:599
 #, c-format
 msgid "No floppy drive available"
 msgstr "Does dim disg meddal ar gael"
@@ -6357,7 +6464,7 @@ msgstr "Does dim disg meddal ar gael"
 msgid "Entering step `%s'\n"
 msgstr "Cychwyn cam '%s\"\n"
 
-#: install_steps_gtk.pm:184
+#: install_steps_gtk.pm:177
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -6365,323 +6472,346 @@ msgid ""
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Mae eich system yn brin o adnoddau. Efallai y cewch anhawsterau wrth osod\n"
+"Mae eich system yn brin o adnoddau. Efallai y cewch anawsterau wrth osod\n"
 "Mandrakelinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
 "testunol. I wneud hynny, gwasgwch F1 wrth gychwyn ar y CD-ROM ac yna rhoi "
 "'text'."
 
-#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
+#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
 #, c-format
 msgid "Package Group Selection"
-msgstr "Dewis  y Grwp Pecyn"
+msgstr "Dewis  y Grŵp Pecyn"
 
-#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Cyfanswm maint: %d/%d MB"
 
-#: install_steps_gtk.pm:309
+#: install_steps_gtk.pm:295
 #, c-format
 msgid "Bad package"
 msgstr "Pecyn gwallus"
 
-#: install_steps_gtk.pm:311
+#: install_steps_gtk.pm:297
 #, c-format
 msgid "Version: "
 msgstr "Fersiwn:"
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "Size: "
 msgstr "Maint:"
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:313
+#: install_steps_gtk.pm:299
 #, c-format
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: install_steps_gtk.pm:346
+#: install_steps_gtk.pm:332
 #, c-format
-msgid "You can't select/unselect this package"
+msgid "You can not select/unselect this package"
 msgstr "Does dim modd i chi ddewis/dad-ddewis y pecyn"
 
-#: install_steps_gtk.pm:350
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: install_steps_gtk.pm:351
+#: install_steps_gtk.pm:337
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "oherwydd %s annigonol"
 
-#: install_steps_gtk.pm:352
+#: install_steps_gtk.pm:338
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hyrwyddo %s"
 
-#: install_steps_gtk.pm:353
+#: install_steps_gtk.pm:339
 #, c-format
 msgid "in order to keep %s"
 msgstr "er mwyn cadw %s"
 
-#: install_steps_gtk.pm:358
+#: install_steps_gtk.pm:344
 #, c-format
 msgid ""
-"You can't select this package as there is not enough space left to install it"
+"You can not select this package as there is not enough space left to install "
+"it"
 msgstr "Nid oes modd i chi ddewis y pecyn hwn - does dim lle ar ôl i'w osod"
 
-#: install_steps_gtk.pm:361
+#: install_steps_gtk.pm:347
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Mae'r pecynnau canlynol i'w gosod"
 
-#: install_steps_gtk.pm:362
+#: install_steps_gtk.pm:348
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Bydd y pecynnau canlynol yn cael eu tynnu"
 
-#: install_steps_gtk.pm:386
+#: install_steps_gtk.pm:372
 #, c-format
-msgid "This is a mandatory package, it can't be unselected"
+msgid "This is a mandatory package, it can not be unselected"
 msgstr "Mae hwn yn becyn hanfodol, does dim modd ei ddad-ddewis"
 
-#: install_steps_gtk.pm:388
+#: install_steps_gtk.pm:374
 #, c-format
-msgid "You can't unselect this package. It is already installed"
+msgid "You can not unselect this package. It is already installed"
 msgstr "Does dim mod dad-ddewis y pecyn, mae wedi ei osod yn barod"
 
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:377
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
 "Are you sure you want to deselect it?"
 msgstr ""
 "Rhaid i'r pecyn gael ei uwchraddio\n"
-"Ydych chi'n siwr eich bod am ei ddad-ddewis?"
+"Ydych chi'n siŵr eich bod am ei ddad-ddewis?"
 
-#: install_steps_gtk.pm:394
+#: install_steps_gtk.pm:380
 #, c-format
-msgid "You can't unselect this package. It must be upgraded"
+msgid "You can not unselect this package. It must be upgraded"
 msgstr "Does dim mod dad-ddewis y pecyn hwn. Rhaid ei ddiweddaru"
 
-#: install_steps_gtk.pm:399
+#: install_steps_gtk.pm:385
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Dangoswch y pecynnau dewis awtomatig"
 
-#: install_steps_gtk.pm:404
+#: install_steps_gtk.pm:390
 #, c-format
-msgid "Load/Save on floppy"
-msgstr "Llwytho/Cadw ar ddisg meddal"
+msgid "Load/Save selection"
+msgstr "Llwytho/Cadw'r dewis"
 
-#: install_steps_gtk.pm:405
+#: install_steps_gtk.pm:391
 #, c-format
 msgid "Updating package selection"
 msgstr "Diweddaru'r dewis pecynnau"
 
-#: install_steps_gtk.pm:410
+#: install_steps_gtk.pm:396
 #, c-format
 msgid "Minimal install"
 msgstr "Gosodiad lleiaf"
 
-#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
+#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Dewiswch y pecynnau hoffech chi eu gosod"
 
-#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
+#: install_steps_gtk.pm:426 install_steps_interactive.pm:706
 #, c-format
 msgid "Installing"
 msgstr "Gosod"
 
-#: install_steps_gtk.pm:447
+#: install_steps_gtk.pm:433
 #, c-format
 msgid "Estimating"
 msgstr "Amcangyfrif"
 
-#: install_steps_gtk.pm:453
+#: install_steps_gtk.pm:482
+#, c-format
+msgid "No details"
+msgstr "Dim manylion"
+
+#: install_steps_gtk.pm:490
 #, c-format
 msgid "Time remaining "
 msgstr "Amser yn weddill"
 
-#: install_steps_gtk.pm:464
+#: install_steps_gtk.pm:497
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Arhoswch, paratoi i osod"
 
-#: install_steps_gtk.pm:474
-#, c-format
-msgid "No details"
-msgstr "Dim manylion"
-
-#: install_steps_gtk.pm:527
+#: install_steps_gtk.pm:512
 #, c-format
 msgid "%d packages"
 msgstr "%d pecyn"
 
-#: install_steps_gtk.pm:532
+#: install_steps_gtk.pm:517
 #, c-format
 msgid "Installing package %s"
 msgstr "Gosod pecynnau %s"
 
-#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745
+#: install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731
 #, c-format
 msgid "Refuse"
 msgstr "Gwrthod"
 
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
-#, fuzzy, c-format
+#: install_steps_gtk.pm:556 install_steps_interactive.pm:735
+#, c-format
 msgid ""
 "Change your Cd-Rom!\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
-"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
+"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Newidiwch eich CD-ROM\n"
 "\n"
-"Rhowch yr CD-ROM sydd wedi ei labeli \"%s\" yn eich gyrrwr a chlicio Iawn\n"
-"Os nad yw gennych, cliciwch Dileu i osgoi gosod o'r CD-ROM hwn."
+"Rhowch y CD-ROM \"%s\" yn eich gyrrwr a chlicio Iawn ar ôl gorffen\n"
+"Os nad yw gennych, cliciwch Dileu i osgoi gosod o'r CD-ROM hon."
 
-#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:746
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Roedd gwall wrth drefnu pecynnau"
 
-#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
-#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
+#: install_steps_interactive.pm:746 install_steps_interactive.pm:750
 #, c-format
 msgid "Go on anyway?"
 msgstr "Mynd yn ein blaen beth bynnag?"
 
-#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:575 install_steps_interactive.pm:750
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "Digwyddodd gwall wrth osod pecyn"
 
-#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
-#: install_steps_interactive.pm:1086
+#: install_steps_gtk.pm:617 install_steps_interactive.pm:920
+#: install_steps_interactive.pm:1072
 #, c-format
 msgid "not configured"
 msgstr "heb ffurfweddu"
 
-#: install_steps_interactive.pm:86
+#: install_steps_gtk.pm:680
 #, c-format
-msgid "Do you want to recover your system?"
-msgstr "Ydych chi eisiau adfer eich system?"
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+"Mae'r cyfrwng gosod canlynol wedi ei ganfod.\n"
+"Os hoffech hepgor rhai ohonynt, dad-ddewiswch nhw nawr."
 
-#: install_steps_interactive.pm:87
+#: install_steps_gtk.pm:684
+#, c-format
+msgid ""
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
+msgstr ""
+"Mae gennych y dewis i gopîo cynnwys y CD ar i'r disg caled cyn gosod "
+"Mandrakelinux.\n"
+"Bydd yna'n parhau o'r disg caled a bydd y pecynnau ar gael unwaith i'r "
+"system gael ei osod yn gyflawn."
+
+#: install_steps_gtk.pm:686
+#, c-format
+msgid "Copy whole CDs"
+msgstr "Copïo'r CDau cyfan"
+
+#: install_steps_interactive.pm:85
 #, c-format
 msgid "License agreement"
 msgstr "Cytundeb trwyddedu"
 
-#: install_steps_interactive.pm:91
-#, fuzzy, c-format
+#: install_steps_interactive.pm:89
+#, c-format
 msgid "Release Notes"
-msgstr "Ryddhad"
+msgstr "Nodiadau Ryddhau"
 
-#: install_steps_interactive.pm:121
+#: install_steps_interactive.pm:119
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Dewiswch gynllun eich bysellfwrdd"
 
-#: install_steps_interactive.pm:123
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "Dyma restr lawn o'r bysellfyrddau sydd ar gael"
 
-#: install_steps_interactive.pm:153
+#: install_steps_interactive.pm:151
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Gosod/Diweddaru"
 
-#: install_steps_interactive.pm:154
+#: install_steps_interactive.pm:152
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Gosod neu ddiweddaru?"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:158
 #, c-format
 msgid "Upgrade %s"
 msgstr "Diweddaru %s"
 
-#: install_steps_interactive.pm:170
+#: install_steps_interactive.pm:168
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Allwedd amgryptio ar gyfer %s"
 
-#: install_steps_interactive.pm:187
+#: install_steps_interactive.pm:185
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Dewiswch fath eich llygoden"
 
-#: install_steps_interactive.pm:196 standalone/mousedrake:46
+#: install_steps_interactive.pm:194 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Porth Llygoden"
 
-#: install_steps_interactive.pm:197 standalone/mousedrake:47
+#: install_steps_interactive.pm:195 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Dewiswch ba  borth cyfresol mae eich llygoden wedi cysylltu iddi"
 
-#: install_steps_interactive.pm:207
+#: install_steps_interactive.pm:205
 #, c-format
 msgid "Buttons emulation"
 msgstr "Efelychiad botymau"
 
-#: install_steps_interactive.pm:209
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Efelychiad Botwm 2"
 
-#: install_steps_interactive.pm:210
+#: install_steps_interactive.pm:208
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Efelychiad Botwm 3"
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "Ffurfweddu cardiau PCMCIA..."
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "Configuring IDE"
 msgstr "Ffurfweddu IDE"
 
-#: install_steps_interactive.pm:258 network/tools.pm:187
+#: install_steps_interactive.pm:256 network/tools.pm:172
 #, c-format
 msgid "No partition available"
 msgstr "dim rhaniadau ar gael"
 
-#: install_steps_interactive.pm:261
+#: install_steps_interactive.pm:259
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Sganio rhaniadau i ganfod pwyntiau gosod"
 
-#: install_steps_interactive.pm:268
+#: install_steps_interactive.pm:266
 #, c-format
 msgid "Choose the mount points"
 msgstr "Dewiswch y pwyntiau gosod"
 
-#: install_steps_interactive.pm:300
+#: install_steps_interactive.pm:312
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -6690,17 +6820,28 @@ msgstr ""
 "Nid oes lle rhydd ar gyfer yr ymlwythwr 1MB! Bydd y gosodiad yn parhau, ond "
 "i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn DiskDrake"
 
-#: install_steps_interactive.pm:337
+#: install_steps_interactive.pm:317
+#, c-format
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"Bydd angen i chi greu llwythwr mwdwl PPC PReP Boot! Bydd y gosodiad yn "
+"parhau, ond i gychwyn y system bydd rhaid i chi greu rhaniad ymlwythwr yn "
+"DiskDrake"
+
+#: install_steps_interactive.pm:353
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Dewiswch y rhaniadau rydych am eu fformatio"
 
-#: install_steps_interactive.pm:339
+#: install_steps_interactive.pm:355
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Gwirio blociau gwallus?"
 
-#: install_steps_interactive.pm:371
+#: install_steps_interactive.pm:383
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -6709,44 +6850,38 @@ msgstr ""
 "Wedi methu gwirio system ffeiliau %s. Hoffech chi drwsio'r gwallau? (gofal, "
 "mae modd colli data)"
 
-#: install_steps_interactive.pm:374
+#: install_steps_interactive.pm:386
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "Dim digon o le cyfnewid i gyflawni'r gosodiad, ychwanegwch ragor"
 
-#: install_steps_interactive.pm:381
+#: install_steps_interactive.pm:393
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr ""
 "Chwilio am y pecynnau sydd ar gael ac yn ailadeiladu cronfa ddata rpm..."
 
-#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
+#: install_steps_interactive.pm:394 install_steps_interactive.pm:452
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Casglu'r pecynnau sydd ar gael"
 
-#: install_steps_interactive.pm:385
+#: install_steps_interactive.pm:397
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Edrych ar becynnau wedi eu gosod yn barod"
 
-#: install_steps_interactive.pm:389
+#: install_steps_interactive.pm:401
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Canfod pecynnau i'w uwchraddio"
 
-#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr "Cysylltu â safle Mandrakelinux i estyn rhestr o'r drychau sydd ar gael"
-
-#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#: install_steps_interactive.pm:421 install_steps_interactive.pm:825
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Dewiswch ddrych lle mae modd estyn y pecynnau"
 
-#: install_steps_interactive.pm:451
+#: install_steps_interactive.pm:461
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -6755,44 +6890,35 @@ msgstr ""
 "Nid oes gan eich system ddigon o le ar ôl ar gyfer gosodiad neu uwchraddiad "
 "(%d> %d)"
 
-#: install_steps_interactive.pm:493
+#: install_steps_interactive.pm:495
 #, c-format
 msgid ""
-"Please choose load or save package selection on floppy.\n"
-"The format is the same as auto_install generated floppies."
+"Please choose load or save package selection.\n"
+"The format is the same as auto_install generated files."
 msgstr ""
-"Dewiswch llwytho neu ddewis cadw pecyn ar ddisg meddal.\n"
-"Mae'r fformat yr un ar ddisgiau meddal wedi eu cynhyrchu drwy auto_install."
-
-#: install_steps_interactive.pm:495
-#, c-format
-msgid "Load from floppy"
-msgstr "Llwytho o ddisg meddal"
-
-#: install_steps_interactive.pm:495
-#, c-format
-msgid "Save on floppy"
-msgstr "Cadw ar ddisg meddal"
+"Dewiswch lwytho neu gadw pecyn dewiswyd.\n"
+"Mae'r fformat yr un â ffeiliau cynhyrchwyd drwy auto_install."
 
-#: install_steps_interactive.pm:499
+#: install_steps_interactive.pm:497
 #, c-format
-msgid "Package selection"
-msgstr "Dewis pecynnau"
+msgid "Load"
+msgstr "Llwyth"
 
-#: install_steps_interactive.pm:499
+#: install_steps_interactive.pm:497 standalone/drakbackup:3924
+#: standalone/drakbackup:3997 standalone/logdrake:173
 #, c-format
-msgid "Loading from floppy"
-msgstr "Llwytho o ddisg meddal"
+msgid "Save"
+msgstr "Gorffen"
 
-#: install_steps_interactive.pm:504
+#: install_steps_interactive.pm:505
 #, c-format
-msgid "Insert a floppy containing package selection"
-msgstr "Rhowch ddisg meddal yn cynnwys dewis pecynnau yn y peiriant"
+msgid "Bad file"
+msgstr "Ffeil drwg"
 
 #: install_steps_interactive.pm:581
 #, c-format
 msgid "Selected size is larger than available space"
-msgstr "Mae'r maint ddewiswyd yn fwy na'r lle ar gael"
+msgstr "Mae'r maint a ddewiswyd yn fwy na'r lle ar gael"
 
 #: install_steps_interactive.pm:596
 #, c-format
@@ -6802,7 +6928,7 @@ msgstr "Math o osodiad"
 #: install_steps_interactive.pm:597
 #, c-format
 msgid ""
-"You haven't selected any group of packages.\n"
+"You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 "Nid ydych wedi dewis unrhyw grwpiau o becynnau.\n"
@@ -6818,12 +6944,12 @@ msgstr "Gyda dogfennaeth elfennol (argymhellir!)"
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Gosodiad bychan iawn (yn arbennig dim urpmi)"
 
-#: install_steps_interactive.pm:645 standalone/drakxtv:52
+#: install_steps_interactive.pm:641 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
-#: install_steps_interactive.pm:694
+#: install_steps_interactive.pm:680
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -6834,17 +6960,17 @@ msgstr ""
 "Os nad oes gennych un ohonynt, Cliciwch Diddymu.\n"
 "Os mae dim ond rhai CDau sydd ar goll, yna cliciwch Iawn."
 
-#: install_steps_interactive.pm:699
+#: install_steps_interactive.pm:685
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom wedi ei labelu \"%s\""
 
-#: install_steps_interactive.pm:720
+#: install_steps_interactive.pm:706
 #, c-format
 msgid "Preparing installation"
 msgstr "Paratoi'r gosodiad"
 
-#: install_steps_interactive.pm:729
+#: install_steps_interactive.pm:715
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6853,17 +6979,17 @@ msgstr ""
 "Gosod pecyn %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:778
+#: install_steps_interactive.pm:764
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ffurfweddiad ôl osod"
 
-#: install_steps_interactive.pm:784
+#: install_steps_interactive.pm:770
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Rhowch y disg meddal Diweddaru Modiwlau yn nisg %s"
 
-#: install_steps_interactive.pm:813
+#: install_steps_interactive.pm:799
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -6876,7 +7002,7 @@ msgid ""
 "Do you want to install the updates?"
 msgstr ""
 "Mae'n bosibl i chi llwytho i lawr y pecynnau diweddaraf sydd wedi eu\n"
-"ryddhau ers i'r dosbarthiad fod ar gael.Efallai bod bod gwallau amaterion "
+"ryddhau ers i'r dosbarthiad fod ar gael. Efallai bod gwallau a materion "
 "diogelwch wedi eu cywiro\n"
 "\n"
 "I lwytho'r pecynnau i lawr, bydd angen cyswllt gweithredol\n"
@@ -6884,72 +7010,78 @@ msgstr ""
 "\n"
 "Ydych chi am osod y diweddariadau?"
 
-#: install_steps_interactive.pm:853
+#: install_steps_interactive.pm:820
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr "Cysylltu â safle Mandrakelinux i estyn rhestr o'r drychau sydd ar gael"
+
+#: install_steps_interactive.pm:839
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Cysylltu â'r drych i estyn y rhestr o becynnau sydd ar gael"
 
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Methu canfod drych: %s."
 
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Hoffech chi geisio eto?"
 
-#: install_steps_interactive.pm:883 standalone/drakclock:46
+#: install_steps_interactive.pm:869 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Pa un yw eich parth amser?"
 
-#: install_steps_interactive.pm:888
+#: install_steps_interactive.pm:874
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Cydweddi amser awtomatig (defnyddio NTP)"
 
-#: install_steps_interactive.pm:896
+#: install_steps_interactive.pm:882
 #, c-format
 msgid "NTP Server"
 msgstr "Gweinydd NTP"
 
-#: install_steps_interactive.pm:938 steps.pm:30
+#: install_steps_interactive.pm:924 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
-#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
-#: install_steps_interactive.pm:1136 services.pm:135
-#: standalone/drakbackup:1593
+#: install_steps_interactive.pm:937 install_steps_interactive.pm:945
+#: install_steps_interactive.pm:963 install_steps_interactive.pm:970
+#: install_steps_interactive.pm:1122 services.pm:133
+#: standalone/drakbackup:1599
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
-#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:1004
+#: install_steps_interactive.pm:1021 install_steps_interactive.pm:1037
+#: install_steps_interactive.pm:1048
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:983 install_steps_interactive.pm:992
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Gweinydd CUPS pell"
 
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:983
 #, c-format
 msgid "No printer"
 msgstr "Nid oes argraffydd"
 
-#: install_steps_interactive.pm:1039
+#: install_steps_interactive.pm:1025
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "A oes gennych gerdyn sain ISA?"
 
-#: install_steps_interactive.pm:1041
+#: install_steps_interactive.pm:1027
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -6958,110 +7090,87 @@ msgstr ""
 "Rhedwch \"alsaconfig\" neu \"sndconfig\" wedi'r gosodiad i ffurfweddu'ch "
 "cerdyn sain"
 
-#: install_steps_interactive.pm:1043
+#: install_steps_interactive.pm:1029
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Heb ganfod cerdyn sain. Ceisiwch \"harddrake\" wedi'r gosodiad"
 
-#: install_steps_interactive.pm:1063
+#: install_steps_interactive.pm:1049
 #, c-format
 msgid "Graphical interface"
 msgstr "Rhyngwyneb graffigol"
 
-#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
+#: install_steps_interactive.pm:1055 install_steps_interactive.pm:1070
 #, c-format
 msgid "Network & Internet"
 msgstr "Rhwydwaith a'r Rhyngrwyd"
 
-#: install_steps_interactive.pm:1086
+#: install_steps_interactive.pm:1072
 #, c-format
 msgid "configured"
 msgstr "ffurfweddu"
 
-#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
+#: install_steps_interactive.pm:1081 install_steps_interactive.pm:1095
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Diogelwch"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
 #, c-format
 msgid "activated"
 msgstr "gweithredu"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
 #, c-format
 msgid "disabled"
 msgstr "anablwyd"
 
-#: install_steps_interactive.pm:1123
+#: install_steps_interactive.pm:1109
 #, c-format
 msgid "Boot"
 msgstr "Cychwyn"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1127
+#: install_steps_interactive.pm:1113
 #, c-format
 msgid "%s on %s"
 msgstr "%s ar %s"
 
-#: install_steps_interactive.pm:1141 services.pm:177
+#: install_steps_interactive.pm:1127 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "Gwasanaethau: %d wedi eu cychwyn ar gyfer %d wedi eu cofrestru"
 
-#: install_steps_interactive.pm:1151
+#: install_steps_interactive.pm:1137
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "Nid ydych wedi ffurfweddu X. Ydych chi'n siwr eich bod am wneud hyn?"
-
-#: install_steps_interactive.pm:1205
-#, c-format
-msgid "Set root password and network authentication methods"
-msgstr "Gosod dulliau gwirio cyfrinair gwraidd a rhwydwaith."
-
-#: install_steps_interactive.pm:1206
-#, c-format
-msgid "Set root password"
-msgstr "Gosod cyfrinair gwraidd"
+msgstr "Nid ydych wedi ffurfweddu X. Ydych chi'n siŵr eich bod am wneud hyn?"
 
 #: install_steps_interactive.pm:1217
 #, c-format
-msgid "This password is too short (it must be at least %d characters long)"
-msgstr "Mae'r cyfrinair yn rhy syml ( rhaid iddo fod o leiaf %d nod o hyd)"
-
-#: install_steps_interactive.pm:1222 network/netconnect.pm:596
-#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
-#, c-format
-msgid "Authentication"
-msgstr "Dilysu"
-
-#: install_steps_interactive.pm:1254
-#, c-format
 msgid "Preparing bootloader..."
 msgstr "Paratoi cychwynnwr"
 
-#: install_steps_interactive.pm:1264
+#: install_steps_interactive.pm:1227
 #, c-format
 msgid ""
-"You appear to have an OldWorld or Unknown\n"
-" machine, the yaboot bootloader will not work for you.\n"
-"The install will continue, but you'll\n"
-" need to use BootX or some other means to boot your machine"
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
 msgstr ""
-"Mae'n ymddangos fod gennychbeiriant OldWorld\n"
-"neu Anhysbys ac ni fydd cychwynydd yaboot\n"
-"yn gweithio ar eich cyfer\n"
-"Bydd y gosodiad yn parhau ond bydd\n"
-"rhaid defnyddio BootX i gychwyn\n"
-"eich peiriant."
+"Mae'n ymddangos fod gennych beiriant OldWorld neu Anhysbys ac ni fydd "
+"cychwynnydd yaboot yn gweithio ar eich cyfer Bydd y gosodiad yn parhau ond "
+"bydd rhaid defnyddio BootX i gychwyn eich peiriant. Ymresymiad y cnewyllyn "
+"ar gyfer y gwraidd yw: root=%s"
 
-#: install_steps_interactive.pm:1270
+#: install_steps_interactive.pm:1233
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Ydych chi eisiau defnyddio aboot?"
 
-#: install_steps_interactive.pm:1273
+#: install_steps_interactive.pm:1236
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7070,7 +7179,7 @@ msgstr ""
 "Gwall gosod aboot, \n"
 "ceisiwch orfodi gosodiad hyd yn oed os yw hynny'n dinistrio'r rhaniad cyntaf?"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1257
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -7079,22 +7188,22 @@ msgstr ""
 "Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu "
 "cyfyngu i'r Gweinyddwr."
 
-#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1286 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Rhowch ddisg meddal  yng ngyrrwr %s"
 
-#: install_steps_interactive.pm:1327
+#: install_steps_interactive.pm:1291
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Mewnosodwch ddisg meddal arall ar gyfer gyrwyr disg"
 
-#: install_steps_interactive.pm:1329
+#: install_steps_interactive.pm:1293
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creu disg meddal awto gosod"
 
-#: install_steps_interactive.pm:1341
+#: install_steps_interactive.pm:1305
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7105,12 +7214,12 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gorffen?"
 
-#: install_steps_interactive.pm:1356
+#: install_steps_interactive.pm:1321
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Creu disg meddal awto gosod"
 
-#: install_steps_interactive.pm:1358
+#: install_steps_interactive.pm:1323
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7120,7 +7229,7 @@ msgid ""
 "You may prefer to replay the installation.\n"
 msgstr ""
 "Mae modd awtomeiddio'r awto gosod, os hoffech\n"
-"chi, yn yr achos hwnnw bydd yn cymryd drosod y\n"
+"chi, yn yr achos hwnnw bydd yn cymryd drosodd y\n"
 "disg caled!!\n"
 "(mae hyn ar gyfer gosod ar flwch arall).\n"
 "\n"
@@ -7139,37 +7248,37 @@ msgid ""
 msgstr ""
 "  <Tab>/<Alt-Tab> rhwng elfennau  | <Space> yn dewis | <F12> y sgrin nesaf "
 
-#: interactive.pm:170
+#: interactive.pm:184
 #, c-format
 msgid "Choose a file"
 msgstr "Dewis ffeil"
 
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
-#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakbackup:1540
+#: standalone/drakfont:593 standalone/drakfont:660 standalone/drakups:297
 #: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
 #: standalone/drakvpn:694
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: interactive.pm:295 interactive/gtk.pm:482
+#: interactive.pm:309 interactive/gtk.pm:489
 #, c-format
 msgid "Modify"
 msgstr "Newid"
 
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakups:299
 #: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
 #: standalone/drakvpn:694
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
-#: interactive.pm:372
+#: interactive.pm:386
 #, c-format
 msgid "Basic"
 msgstr "Elfennol"
 
-#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
+#: interactive.pm:424 interactive/newt.pm:317 ugtk2.pm:506
 #, c-format
 msgid "Finish"
 msgstr "Gorffen"
@@ -7195,7 +7304,7 @@ msgid ""
 "Entries you'll have to fill:\n"
 "%s"
 msgstr ""
-"Gwybodaeth i'w gyflawyno:\n"
+"Gwybodaeth i'w gyflwyno:\n"
 "%s"
 
 #: interactive/stdio.pm:70
@@ -7221,7 +7330,7 @@ msgstr "Eich dewis? (rhagosodedig `%s'%s) "
 #: interactive/stdio.pm:104
 #, c-format
 msgid " enter `void' for void entry"
-msgstr "rhowch'gwag' am gofnod gwag"
+msgstr "rhowch 'gwag' am gofnod gwag"
 
 #: interactive/stdio.pm:122
 #, c-format
@@ -7236,7 +7345,7 @@ msgid ""
 "Your choice? "
 msgstr ""
 "Dewiswch y rhif cyntaf o'r amrediad 10 rydych am ei olygu,\n"
-"neu wasgwch Enter i barhau.\n"
+"neu bwyswch Enter i barhau.\n"
 "Eich dewis?"
 
 #: interactive/stdio.pm:138
@@ -7253,776 +7362,911 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Ail-gyflwyno"
 
-#: keyboard.pm:163 keyboard.pm:194
+#: keyboard.pm:170 keyboard.pm:204
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTZ)"
 msgstr "Tsiec (QWERTY)"
 
-#: keyboard.pm:164 keyboard.pm:196
+#: keyboard.pm:171 keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German"
 msgstr "Almaenaidd"
 
-#: keyboard.pm:165
+#: keyboard.pm:172
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:173 keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Spanish"
 msgstr "Sbaenaidd"
 
-#: keyboard.pm:167 keyboard.pm:207
+#: keyboard.pm:174 keyboard.pm:224
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Finnish"
-msgstr "Ffinaidd"
+msgstr "Ffinnaidd"
 
-#: keyboard.pm:168 keyboard.pm:208
+#: keyboard.pm:175 keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French"
 msgstr "Ffrengig"
 
-#: keyboard.pm:169 keyboard.pm:254
+#: keyboard.pm:176 keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Norwegian"
 msgstr "Norwyaidd"
 
-#: keyboard.pm:170
+#: keyboard.pm:177
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish"
 msgstr "Pwylaidd"
 
-#: keyboard.pm:171 keyboard.pm:264
+#: keyboard.pm:178 keyboard.pm:287
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian"
 msgstr "Rwsiaidd"
 
-#: keyboard.pm:173 keyboard.pm:268
+#: keyboard.pm:180 keyboard.pm:293
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swedish"
 msgstr "Swedaidd"
 
-#: keyboard.pm:174 keyboard.pm:287
+#: keyboard.pm:181 keyboard.pm:320
 #, c-format
 msgid "UK keyboard"
 msgstr "Bysellfwrdd DG"
 
-#: keyboard.pm:175 keyboard.pm:288
+#: keyboard.pm:182 keyboard.pm:323
 #, c-format
 msgid "US keyboard"
 msgstr "Bysellfwrdd UDA"
 
-#: keyboard.pm:177
+#: keyboard.pm:184
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albaniaidd"
 
-#: keyboard.pm:178
+#: keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (old)"
 msgstr "Armenaidd (hen)"
 
-#: keyboard.pm:179
+#: keyboard.pm:186
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armenaidd (teipiadur)"
 
-#: keyboard.pm:180
+#: keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armenaidd (ffonetig)"
 
-#: keyboard.pm:181
+#: keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Arabaidd"
 
-#: keyboard.pm:182
+#: keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Azerbaidjan (lladin)"
 
-#: keyboard.pm:183
+#: keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgaidd"
 
-#: keyboard.pm:184
+#: keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bengali"
-msgstr "Bengalaidd"
+"Bengali (Inscript-layout)"
+msgstr "Bengalaidd (gosodiad Inscript)"
 
-#: keyboard.pm:185
+#: keyboard.pm:192
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Bengali (Probhat)"
+msgstr "Bengalaidd (gosodiad Probhat)"
+
+#: keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bwlgaraidd (ffonetig)"
 
-#: keyboard.pm:186
+#: keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bwlgaraidd (BDS)"
 
-#: keyboard.pm:187
+#: keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasilaidd (ABNT-2)"
 
-#: keyboard.pm:188
+#: keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosniaidd"
 
-#: keyboard.pm:189
+#: keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Belarusaidd"
 
-#: keyboard.pm:191
+#: keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Swisaidd (gosodiad Almaeneg)"
 
-#: keyboard.pm:193
+#: keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Swisaidd (gosodiad Ffrengig)"
 
-#: keyboard.pm:195
+#: keyboard.pm:203
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Cherokee syllabics"
+msgstr ""
+"_: bysellfwrdd\n"
+"sillafog Cherokee"
+
+#: keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tsiec (QWERTY)"
 
-#: keyboard.pm:197
+#: keyboard.pm:207
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Almaenaidd (dim bysellau marw)"
 
-#: keyboard.pm:198
+#: keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanagari"
 
-#: keyboard.pm:199
+#: keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Danaidd"
 
-#: keyboard.pm:200
+#: keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (UDA)"
 
-#: keyboard.pm:201
+#: keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: keyboard.pm:202
+#: keyboard.pm:214
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (French)"
+msgstr ""
+"_: bysellfwrdd\n"
+"Dvorak (Ffrengig)"
+
+#: keyboard.pm:216
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (UK)"
+msgstr ""
+"_: bysellfwrdd\n"
+"Dvorak (DG)"
+
+#: keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwyaidd)"
 
-#: keyboard.pm:203
+#: keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (Polish)"
+msgstr ""
+"_: bysellfwrdd\n"
+"Dvorak (Pwylaidd)"
+
+#: keyboard.pm:220
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Swedaidd)"
 
-#: keyboard.pm:205
+#: keyboard.pm:221
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dzongkha/Tibetan"
+msgstr ""
+"_: bysellfwrdd\n"
+"Dzongkha/Tibetaidd"
+
+#: keyboard.pm:222
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Estonaidd"
 
-#: keyboard.pm:209
+#: keyboard.pm:226
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Faroese"
+msgstr ""
+"_: bysellfwrdd\n"
+"Ffaroaidd"
+
+#: keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Georgaidd (gosodiad \"Rwsiaidd\")"
 
-#: keyboard.pm:210
+#: keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Georgaidd (gosodiad \"Lladinaidd\")"
 
-#: keyboard.pm:211
+#: keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Groegaidd"
 
-#: keyboard.pm:212
+#: keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Groegaidd (polytonic)"
 
-#: keyboard.pm:213
+#: keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gujarati"
 
-#: keyboard.pm:214
+#: keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: keyboard.pm:216
+#: keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Hwngaraidd"
 
-#: keyboard.pm:217
+#: keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Croataidd"
 
-#: keyboard.pm:218
+#: keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Gwyddelig"
 
-#: keyboard.pm:219
+#: keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Israelaidd"
 
-#: keyboard.pm:220
+#: keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Israelaidd (Ffonetig)"
 
-#: keyboard.pm:221
+#: keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iranaidd"
 
-#: keyboard.pm:222
+#: keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Eislandaidd"
 
-#: keyboard.pm:223
+#: keyboard.pm:242
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Eidalaidd"
 
-#: keyboard.pm:224
+#: keyboard.pm:243
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktitut"
 
-#: keyboard.pm:229
+#: keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Siapaëaidd 106 bysell"
 
-#: keyboard.pm:230
+#: keyboard.pm:249
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: keyboard.pm:233
+#: keyboard.pm:252
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Bysellfwrdd Corëaidd"
 
-#: keyboard.pm:234
+#: keyboard.pm:254
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Kurdish (arabic script)"
+msgstr ""
+"_: bysellfwrdd\n"
+"Cwrdaidd (sgript arabaidd)"
+
+#: keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Bysellfwrdd Kyrgyz"
 
-#: keyboard.pm:235
+#: keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Lladin America"
 
-#: keyboard.pm:236
+#: keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laotiaidd"
 
-#: keyboard.pm:238
+#: keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (old)"
 msgstr "Lithuenaidd AZERTY (hen)"
 
-#: keyboard.pm:241
+#: keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (new)"
 msgstr "Lithuenaidd AZERTY (newydd)"
 
-#: keyboard.pm:243
+#: keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"number row\" QWERTY"
 msgstr "Lithuenaidd \"rhes rhif\" QWERTY"
 
-#: keyboard.pm:245
+#: keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lithuenaidd \"ffonetig\" QWERTY"
 
-#: keyboard.pm:246
+#: keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Latfiaidd"
 
-#: keyboard.pm:247
+#: keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malayalamaidd"
 
-#: keyboard.pm:248
+#: keyboard.pm:269
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Macedonaidd"
 
-#: keyboard.pm:249
+#: keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmar (Burma)"
 
-#: keyboard.pm:250
+#: keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongolaidd (cyrillic)"
 
-#: keyboard.pm:251
+#: keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Maltaidd (DU)"
 
-#: keyboard.pm:252
+#: keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Maltaidd (UDA)"
 
-#: keyboard.pm:253
+#: keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Isalmaenaidd"
 
-#: keyboard.pm:255
+#: keyboard.pm:276
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oriya"
 
-#: keyboard.pm:256
+#: keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Pwylaidd (gosodiad qwerty)"
 
-#: keyboard.pm:257
+#: keyboard.pm:278
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Pwylaidd (gosodiad qwerty)"
 
-#: keyboard.pm:258
+#: keyboard.pm:280
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Pashto"
+msgstr ""
+"_: bysellfwrdd\n"
+"Patsho"
+
+#: keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portiwgalaidd"
 
-#: keyboard.pm:260
+#: keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Canada (Quebec)"
 
-#: keyboard.pm:262
+#: keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Romanaidd (qwertz)"
 
-#: keyboard.pm:263
+#: keyboard.pm:286
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Romanaidd (qwerty)"
 
-#: keyboard.pm:265
+#: keyboard.pm:288
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Rwsiaidd (Ffonetig)"
 
-#: keyboard.pm:266
+#: keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (norwyaidd)"
 
-#: keyboard.pm:267
+#: keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (Swedaidd/Ffinaidd)"
 
-#: keyboard.pm:269
+#: keyboard.pm:292
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Sindhi"
+msgstr ""
+"_: bysellfwrdd\n"
+"Sindhi"
+
+#: keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Slfenaidd"
 
-#: keyboard.pm:270
+#: keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slofacaidd (QWERTZ)"
 
-#: keyboard.pm:271
+#: keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slofacaidd (QWERTY)"
 
-#: keyboard.pm:273
+#: keyboard.pm:298
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbaidd (cyrilig)"
 
-#: keyboard.pm:274
+#: keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Syriaidd"
 
-#: keyboard.pm:275
+#: keyboard.pm:300
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Syriaidd (ffonetig)"
 
-#: keyboard.pm:276
+#: keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: keyboard.pm:278
+#: keyboard.pm:303
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamil (cynllun TSCII)"
 
-#: keyboard.pm:279
+#: keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamil (cynllun teipiadur)"
 
-#: keyboard.pm:280
+#: keyboard.pm:305
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Thai"
-msgstr "Bysellfwrdd Thai"
+"Thai (Kedmanee)"
+msgstr ""
+"_: bysellfwrdd\n"
+"Thai (Kedmanee)"
 
-#: keyboard.pm:282
+#: keyboard.pm:306
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (TIS-820)"
+msgstr ""
+"_: bysellfwrdd\n"
+"Thai (TIS-820)"
+
+#: keyboard.pm:308
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (Pattachote)"
+msgstr ""
+"_: bysellfwrdd\n"
+"Thai (Pattachote)"
+
+#: keyboard.pm:311
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Tifinagh (+latin/arabic)"
+msgstr ""
+"_: bysellfwrdd\n"
+"Tifinagh (+lladin/arabeg"
+
+#: keyboard.pm:313
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Bysellfwrdd Tajig"
 
-#: keyboard.pm:283
+#: keyboard.pm:315
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Turkmen"
+msgstr ""
+"_: bysellfwrdd\n"
+"Turkmen"
+
+#: keyboard.pm:316
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (traditional \"F\" model)"
 msgstr "Twrcaidd (model traddodiadol \"F\")"
 
-#: keyboard.pm:284
+#: keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (modern \"Q\" model)"
 msgstr "Twrcaidd (model modern \"Q\")"
 
-#: keyboard.pm:286
+#: keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Wcranaidd"
 
-#: keyboard.pm:289
+#: keyboard.pm:322
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Urdu keyboard"
+msgstr ""
+"_: bysellfwrdd\n"
+"bysellfwrdd Urdu "
+
+#: keyboard.pm:324
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Bysellfwrdd UDA (rhyngwladol)"
 
-#: keyboard.pm:290
+#: keyboard.pm:325
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
-msgstr "Uzbekaidd (cyrillig)"
+msgstr "Uzbekaidd (Cyrilig)"
 
-#: keyboard.pm:292
+#: keyboard.pm:327
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Fietnamëaidd \"rhes rhifol\" QWERTY"
 
-#: keyboard.pm:293
+#: keyboard.pm:328
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Iwgoslafaidd (lladin)"
 
-#: keyboard.pm:300
+#: keyboard.pm:335
 #, c-format
 msgid "Right Alt key"
 msgstr "Bysell Alt dde"
 
-#: keyboard.pm:301
+#: keyboard.pm:336
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Y ddwy fysell Shift gyda'i gilydd"
 
-#: keyboard.pm:302
+#: keyboard.pm:337
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Bysellau Control a Shift gyda'i gilydd"
 
-#: keyboard.pm:303
+#: keyboard.pm:338
 #, c-format
 msgid "CapsLock key"
 msgstr "Bysell CapsLock"
 
-#: keyboard.pm:304
+#: keyboard.pm:339
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Bysellau Shift ac CapsLock gyda'i gilydd"
 
-#: keyboard.pm:305
+#: keyboard.pm:340
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Bysellau Ctrl ac Alt gyda'i gilydd"
 
-#: keyboard.pm:306
+#: keyboard.pm:341
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Bysellau Alt a Shift  gyda'i gilydd"
 
-#: keyboard.pm:307
+#: keyboard.pm:342
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Bysell \"Dewislen\""
 
-#: keyboard.pm:308
+#: keyboard.pm:343
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Bysell \"Windows\" chwith"
 
-#: keyboard.pm:309
+#: keyboard.pm:344
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Bysell \"Windows\" de"
 
-#: keyboard.pm:310
+#: keyboard.pm:345
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Y ddwy fysell Control gyda'i gilydd"
 
-#: keyboard.pm:311
+#: keyboard.pm:346
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Y ddwy fysell Alt gyda'i gilydd"
 
-#: keyboard.pm:312
+#: keyboard.pm:347
 #, c-format
 msgid "Left Shift key"
 msgstr "Bysell Shift chwith"
 
-#: keyboard.pm:313
+#: keyboard.pm:348
 #, c-format
 msgid "Right Shift key"
 msgstr "Bysell Alt dde"
 
-#: keyboard.pm:314
+#: keyboard.pm:349
 #, c-format
 msgid "Left Alt key"
 msgstr "Bysell Alt chwith"
 
-#: keyboard.pm:315
+#: keyboard.pm:350
 #, c-format
 msgid "Left Control key"
 msgstr "Bysell Control chwith"
 
-#: keyboard.pm:316
+#: keyboard.pm:351
 #, c-format
 msgid "Right Control key"
 msgstr "Bysell Control dde"
 
-#: keyboard.pm:347
+#: keyboard.pm:387
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
 "allow switching between the different keyboard layouts\n"
 "(eg: latin and non latin)"
 msgstr ""
-"Yma gallwch ddewis yr bysell neu gyfuniad o fysellau fydd yn\n"
+"Yma gallwch ddewis y fysell neu gyfuniad o fysellau fydd yn\n"
 "caniatáu newid rhwng bysellfyrddau gwahanol (e.e.: lladin neu\n"
 "arall)"
 
-#: keyboard.pm:352
+#: keyboard.pm:392
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -8036,1165 +8280,1145 @@ msgstr ""
 #. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
 #. -PO: or as "default:RTL", depending if your language is written from
 #. -PO: left to right, or from right to left; any other string is wrong.
-#: lang.pm:165
+#: lang.pm:173
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:182
+#: lang.pm:190
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:183
+#: lang.pm:191 network/adsl_consts.pm:826
 #, c-format
 msgid "United Arab Emirates"
 msgstr "United Arab Emirates"
 
-#: lang.pm:184
+#: lang.pm:192
 #, c-format
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: lang.pm:185
+#: lang.pm:193
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua a Barbuda"
 
-#: lang.pm:186
+#: lang.pm:194
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:187
+#: lang.pm:195
 #, c-format
 msgid "Albania"
 msgstr "Albania"
 
-#: lang.pm:188
+#: lang.pm:196
 #, c-format
 msgid "Armenia"
 msgstr "Armenia"
 
-#: lang.pm:189
+#: lang.pm:197
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: lang.pm:190
+#: lang.pm:198
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:191
+#: lang.pm:199
 #, c-format
 msgid "Antarctica"
 msgstr "Antarctica"
 
-#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
+#: lang.pm:200 network/adsl_consts.pm:40 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Yr Ariannin"
 
-#: lang.pm:193
+#: lang.pm:201
 #, c-format
 msgid "American Samoa"
 msgstr "American Samoa"
 
-#: lang.pm:195 standalone/drakxtv:48
+#: lang.pm:203 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: lang.pm:196
+#: lang.pm:204
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:197
+#: lang.pm:205
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: lang.pm:198
+#: lang.pm:206
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia ac Herzegovina"
 
-#: lang.pm:199
+#: lang.pm:207
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:200
+#: lang.pm:208
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:202
+#: lang.pm:210
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
+#: lang.pm:211 network/adsl_consts.pm:143 network/adsl_consts.pm:151
 #, c-format
 msgid "Bulgaria"
 msgstr "Bwlgaria"
 
-#: lang.pm:204
+#: lang.pm:212
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: lang.pm:205
+#: lang.pm:213
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:206
+#: lang.pm:214
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:207
+#: lang.pm:215
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:208
+#: lang.pm:216
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: lang.pm:209
+#: lang.pm:217
 #, c-format
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
-#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
+#: lang.pm:218 network/adsl_consts.pm:109 network/adsl_consts.pm:119
+#: network/adsl_consts.pm:127 network/adsl_consts.pm:135
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: lang.pm:211
+#: lang.pm:219
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: lang.pm:212
+#: lang.pm:220
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:213
+#: lang.pm:221
 #, c-format
 msgid "Bouvet Island"
 msgstr "Ynys Bouvet"
 
-#: lang.pm:214
+#: lang.pm:222
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:215
+#: lang.pm:223
 #, c-format
 msgid "Belarus"
 msgstr "Belarus"
 
-#: lang.pm:216
+#: lang.pm:224
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:217
+#: lang.pm:225
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: lang.pm:218
+#: lang.pm:226
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Ynysoedd Cocos (Keeling)"
 
-#: lang.pm:219
+#: lang.pm:227
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Congo (Kinshasa)"
 
-#: lang.pm:220
+#: lang.pm:228
 #, c-format
 msgid "Central African Republic"
 msgstr "Gweriniaeth Canol Affrica"
 
-#: lang.pm:221
+#: lang.pm:229
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Congo (Brazzaville)"
 
-#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
-#, c-format
-msgid "Switzerland"
-msgstr "Y Swisdir"
-
-#: lang.pm:223
+#: lang.pm:231
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: lang.pm:224
+#: lang.pm:232
 #, c-format
 msgid "Cook Islands"
 msgstr "Ynysoedd Cook"
 
-#: lang.pm:225
+#: lang.pm:233
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:226
+#: lang.pm:234
 #, c-format
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
-#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
-#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
-#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
-#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
-#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
-#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
-#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
-#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
-#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
+#: lang.pm:235 network/adsl_consts.pm:159 network/adsl_consts.pm:167
+#: network/adsl_consts.pm:175 network/adsl_consts.pm:183
+#: network/adsl_consts.pm:191 network/adsl_consts.pm:199
+#: network/adsl_consts.pm:207 network/adsl_consts.pm:215
+#: network/adsl_consts.pm:223 network/adsl_consts.pm:231
+#: network/adsl_consts.pm:239 network/adsl_consts.pm:247
+#: network/adsl_consts.pm:255 network/adsl_consts.pm:263
+#: network/adsl_consts.pm:271 network/adsl_consts.pm:279
+#: network/adsl_consts.pm:287 network/adsl_consts.pm:295
+#: network/adsl_consts.pm:303 network/adsl_consts.pm:311
 #, c-format
 msgid "China"
 msgstr "Tsieina"
 
-#: lang.pm:228
+#: lang.pm:236
 #, c-format
 msgid "Colombia"
 msgstr "Colombia"
 
-#: lang.pm:230
+#: lang.pm:238
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr "Serbia a Montenegro"
 
-#: lang.pm:231
+#: lang.pm:239
 #, c-format
 msgid "Cuba"
 msgstr "Ciwba"
 
-#: lang.pm:232
+#: lang.pm:240
 #, c-format
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: lang.pm:233
+#: lang.pm:241
 #, c-format
 msgid "Christmas Island"
 msgstr "Ynys Christmas"
 
-#: lang.pm:234
+#: lang.pm:242
 #, c-format
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: lang.pm:237
+#: lang.pm:245
 #, c-format
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:238 network/adsl_consts.pm:302
+#: lang.pm:246 network/adsl_consts.pm:327
 #, c-format
 msgid "Denmark"
 msgstr "Denmarc"
 
-#: lang.pm:239
+#: lang.pm:247
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:240
+#: lang.pm:248
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominican Republic"
 
-#: lang.pm:241
+#: lang.pm:249 network/adsl_consts.pm:30
 #, c-format
 msgid "Algeria"
 msgstr "Algeria"
 
-#: lang.pm:242
+#: lang.pm:250
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:243
+#: lang.pm:251
 #, c-format
 msgid "Estonia"
 msgstr "Estonia"
 
-#: lang.pm:244
+#: lang.pm:252
 #, c-format
 msgid "Egypt"
 msgstr "Yr Aifft"
 
-#: lang.pm:245
+#: lang.pm:253
 #, c-format
 msgid "Western Sahara"
 msgstr "Western Sahara"
 
-#: lang.pm:246
+#: lang.pm:254
 #, c-format
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
-#: network/adsl_consts.pm:551
+#: lang.pm:255 network/adsl_consts.pm:663 network/adsl_consts.pm:672
+#: network/adsl_consts.pm:682 network/adsl_consts.pm:692
+#: network/adsl_consts.pm:700 network/adsl_consts.pm:708
+#: network/adsl_consts.pm:716 network/adsl_consts.pm:724
+#: network/adsl_consts.pm:732 network/adsl_consts.pm:740
+#: network/adsl_consts.pm:748 network/adsl_consts.pm:756
+#: network/adsl_consts.pm:764
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: lang.pm:248
+#: lang.pm:256
 #, c-format
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: lang.pm:249 network/adsl_consts.pm:402
+#: lang.pm:257 network/adsl_consts.pm:335
 #, c-format
 msgid "Finland"
 msgstr "Y Ffindir"
 
-#: lang.pm:250
+#: lang.pm:258
 #, c-format
 msgid "Fiji"
 msgstr "Ffiji"
 
-#: lang.pm:251
+#: lang.pm:259
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Ynysoedd y Falkland (Malvinas)"
 
-#: lang.pm:252
+#: lang.pm:260
 #, c-format
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: lang.pm:253
+#: lang.pm:261
 #, c-format
 msgid "Faroe Islands"
 msgstr "Ynysoedd Faroe"
 
-#: lang.pm:255
+#: lang.pm:263
 #, c-format
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: lang.pm:264 network/adsl_consts.pm:836 network/adsl_consts.pm:846
 #: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: lang.pm:257
+#: lang.pm:265
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:258
+#: lang.pm:266
 #, c-format
 msgid "Georgia"
 msgstr "Georgia"
 
-#: lang.pm:259
+#: lang.pm:267
 #, c-format
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: lang.pm:260
+#: lang.pm:268
 #, c-format
 msgid "Ghana"
 msgstr "Ghana"
 
-#: lang.pm:261
+#: lang.pm:269
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:262
+#: lang.pm:270
 #, c-format
 msgid "Greenland"
 msgstr "Greenland"
 
-#: lang.pm:263
+#: lang.pm:271
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:264
+#: lang.pm:272
 #, c-format
 msgid "Guinea"
 msgstr "Guinea"
 
-#: lang.pm:265
+#: lang.pm:273
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:266
+#: lang.pm:274
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
-#: lang.pm:268
+#: lang.pm:276
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "De Georgia ac Ynysoedd De Sandwich"
 
-#: lang.pm:269
+#: lang.pm:277
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: lang.pm:270
+#: lang.pm:278
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:271
+#: lang.pm:279
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: lang.pm:272
+#: lang.pm:280
 #, c-format
 msgid "Guyana"
 msgstr "Guyana"
 
-#: lang.pm:273
+#: lang.pm:281
 #, c-format
 msgid "Hong Kong SAR (China)"
-msgstr "Tseina (Hong Kong)"
+msgstr "Tsiena (Hong Kong)"
 
-#: lang.pm:274
+#: lang.pm:282
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard a McDonald Islands"
 
-#: lang.pm:275
+#: lang.pm:283
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:276
+#: lang.pm:284
 #, c-format
 msgid "Croatia"
 msgstr "Croatia"
 
-#: lang.pm:277
+#: lang.pm:285
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:278 network/adsl_consts.pm:436
-#, c-format
-msgid "Hungary"
-msgstr "Hwngari"
-
-#: lang.pm:279
+#: lang.pm:287
 #, c-format
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
+#: lang.pm:288 network/adsl_consts.pm:471 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Iwerddon"
 
-#: lang.pm:281
+#: lang.pm:289 network/adsl_consts.pm:479
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: lang.pm:282
+#: lang.pm:290
 #, c-format
 msgid "India"
 msgstr "India"
 
-#: lang.pm:283
+#: lang.pm:291
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: lang.pm:284
+#: lang.pm:292
 #, c-format
 msgid "Iraq"
 msgstr "Irac"
 
-#: lang.pm:285
+#: lang.pm:293
 #, c-format
 msgid "Iran"
 msgstr "Iran"
 
-#: lang.pm:286
+#: lang.pm:294
 #, c-format
 msgid "Iceland"
 msgstr "Ynys yr Iâ"
 
-#: lang.pm:288
+#: lang.pm:296
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:289
+#: lang.pm:297
 #, c-format
 msgid "Jordan"
 msgstr "Yr Iorddonen"
 
-#: lang.pm:290
+#: lang.pm:298
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: lang.pm:291
+#: lang.pm:299
 #, c-format
 msgid "Kenya"
 msgstr "Kenya"
 
-#: lang.pm:292
+#: lang.pm:300
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: lang.pm:293
+#: lang.pm:301
 #, c-format
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: lang.pm:294
+#: lang.pm:302
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:295
+#: lang.pm:303
 #, c-format
 msgid "Comoros"
 msgstr "Comoros"
 
-#: lang.pm:296
+#: lang.pm:304
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts a Nevis"
 
-#: lang.pm:297
+#: lang.pm:305
 #, c-format
 msgid "Korea (North)"
 msgstr "Corea (Gogledd)"
 
-#: lang.pm:298
+#: lang.pm:306
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: lang.pm:299
+#: lang.pm:307
 #, c-format
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: lang.pm:300
+#: lang.pm:308
 #, c-format
 msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
-#: lang.pm:301
+#: lang.pm:309
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: lang.pm:302
+#: lang.pm:310
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:303
+#: lang.pm:311
 #, c-format
 msgid "Lebanon"
 msgstr "Libanus"
 
-#: lang.pm:304
+#: lang.pm:312
 #, c-format
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: lang.pm:305
+#: lang.pm:313
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:306
+#: lang.pm:314
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:307
+#: lang.pm:315
 #, c-format
 msgid "Liberia"
 msgstr "Liberia"
 
-#: lang.pm:308
+#: lang.pm:316
 #, c-format
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:309 network/adsl_consts.pm:479
+#: lang.pm:317 network/adsl_consts.pm:527
 #, c-format
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: lang.pm:310
+#: lang.pm:318
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: lang.pm:311
+#: lang.pm:319
 #, c-format
 msgid "Latvia"
 msgstr "Latfia"
 
-#: lang.pm:312
+#: lang.pm:320
 #, c-format
 msgid "Libya"
 msgstr "Libya"
 
-#: lang.pm:313 network/adsl_consts.pm:487
+#: lang.pm:321 network/adsl_consts.pm:535
 #, c-format
 msgid "Morocco"
 msgstr "Morocco"
 
-#: lang.pm:314
+#: lang.pm:322
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:315
+#: lang.pm:323
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:316
+#: lang.pm:324
 #, c-format
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: lang.pm:317
+#: lang.pm:325
 #, c-format
 msgid "Marshall Islands"
 msgstr "Ynysoedd Marshall"
 
-#: lang.pm:318
+#: lang.pm:326
 #, c-format
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: lang.pm:319
+#: lang.pm:327
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:320
+#: lang.pm:328
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:321
+#: lang.pm:329
 #, c-format
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: lang.pm:322
+#: lang.pm:330
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Ynysoedd Gogledd Mariana"
 
-#: lang.pm:323
+#: lang.pm:331
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:324
+#: lang.pm:332
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: lang.pm:325
+#: lang.pm:333
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:326
+#: lang.pm:334
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:327
+#: lang.pm:335
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:328
+#: lang.pm:336
 #, c-format
 msgid "Maldives"
 msgstr "Maldives"
 
-#: lang.pm:329
+#: lang.pm:337
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:330
+#: lang.pm:338
 #, c-format
 msgid "Mexico"
 msgstr "Mecsico"
 
-#: lang.pm:331
+#: lang.pm:339
 #, c-format
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: lang.pm:332
+#: lang.pm:340
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: lang.pm:333
+#: lang.pm:341
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:334
+#: lang.pm:342
 #, c-format
 msgid "New Caledonia"
 msgstr "Caledonia Newydd"
 
-#: lang.pm:335
+#: lang.pm:343
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:336
+#: lang.pm:344
 #, c-format
 msgid "Norfolk Island"
 msgstr "Ynys Norfolk"
 
-#: lang.pm:337
+#: lang.pm:345
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: lang.pm:338
+#: lang.pm:346
 #, c-format
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:341
+#: lang.pm:349
 #, c-format
 msgid "Nepal"
 msgstr "Nepal"
 
-#: lang.pm:342
+#: lang.pm:350
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:343
+#: lang.pm:351
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:344
+#: lang.pm:352
 #, c-format
 msgid "New Zealand"
 msgstr "Seland Newydd"
 
-#: lang.pm:345
+#: lang.pm:353
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:346
+#: lang.pm:354
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:347
+#: lang.pm:355
 #, c-format
 msgid "Peru"
 msgstr "Periw"
 
-#: lang.pm:348
+#: lang.pm:356
 #, c-format
 msgid "French Polynesia"
 msgstr "Polynesia Ffrengig"
 
-#: lang.pm:349
+#: lang.pm:357
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: lang.pm:350
+#: lang.pm:358
 #, c-format
 msgid "Philippines"
 msgstr "Philippines"
 
-#: lang.pm:351
+#: lang.pm:359
 #, c-format
 msgid "Pakistan"
 msgstr "Pacistan"
 
-#: lang.pm:352 network/adsl_consts.pm:503
-#, c-format
-msgid "Poland"
-msgstr "Gwlad Pwyl"
-
-#: lang.pm:353
+#: lang.pm:361
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre a Miquelon"
 
-#: lang.pm:354
+#: lang.pm:362
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:355
+#: lang.pm:363
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:356
+#: lang.pm:364
 #, c-format
 msgid "Palestine"
 msgstr "Palestina"
 
-#: lang.pm:357 network/adsl_consts.pm:513
+#: lang.pm:365 network/adsl_consts.pm:634
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: lang.pm:358
+#: lang.pm:366
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:359
+#: lang.pm:367
 #, c-format
 msgid "Palau"
 msgstr "Palau"
 
-#: lang.pm:360
+#: lang.pm:368
 #, c-format
 msgid "Qatar"
 msgstr "Qatar"
 
-#: lang.pm:361
+#: lang.pm:369
 #, c-format
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:362
+#: lang.pm:370
 #, c-format
 msgid "Romania"
 msgstr "Rwmania"
 
-#: lang.pm:363
+#: lang.pm:371 network/adsl_consts.pm:642
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: lang.pm:364
+#: lang.pm:372
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:365
+#: lang.pm:373
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: lang.pm:366
+#: lang.pm:374
 #, c-format
 msgid "Solomon Islands"
 msgstr "Ynysoedd Solomon"
 
-#: lang.pm:367
+#: lang.pm:375
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: lang.pm:368
+#: lang.pm:376
 #, c-format
 msgid "Sudan"
 msgstr "Swdan"
 
-#: lang.pm:370
+#: lang.pm:378
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: lang.pm:371
+#: lang.pm:379
 #, c-format
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: lang.pm:372 network/adsl_consts.pm:520
+#: lang.pm:380 network/adsl_consts.pm:652
 #, c-format
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: lang.pm:373
+#: lang.pm:381
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Ynysoedd Svalbard a Jan Mayen"
 
-#: lang.pm:374
-#, c-format
-msgid "Slovakia"
-msgstr "Slofacia"
-
-#: lang.pm:375
+#: lang.pm:383
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: lang.pm:376
+#: lang.pm:384
 #, c-format
 msgid "San Marino"
 msgstr "San Marino"
 
-#: lang.pm:377
+#: lang.pm:385
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:378
+#: lang.pm:386
 #, c-format
 msgid "Somalia"
 msgstr "Somalia"
 
-#: lang.pm:379
+#: lang.pm:387
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:380
+#: lang.pm:388
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome a Principe"
 
-#: lang.pm:381
+#: lang.pm:389
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:382
+#: lang.pm:390
 #, c-format
 msgid "Syria"
 msgstr "Syria"
 
-#: lang.pm:383
+#: lang.pm:391
 #, c-format
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: lang.pm:384
+#: lang.pm:392
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Ynysoedd Turks a Caicos"
 
-#: lang.pm:385
+#: lang.pm:393
 #, c-format
 msgid "Chad"
 msgstr "Chad"
 
-#: lang.pm:386
+#: lang.pm:394
 #, c-format
 msgid "French Southern Territories"
 msgstr "French Southern Territories"
 
-#: lang.pm:387
+#: lang.pm:395
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:388 network/adsl_consts.pm:585
+#: lang.pm:396 network/adsl_consts.pm:806
 #, c-format
 msgid "Thailand"
 msgstr "Gwlad Thail"
 
-#: lang.pm:389
+#: lang.pm:397
 #, c-format
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: lang.pm:390
+#: lang.pm:398
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:391
+#: lang.pm:399
 #, c-format
 msgid "East Timor"
 msgstr "Dwyrain Timor"
 
-#: lang.pm:392
+#: lang.pm:400
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: lang.pm:393
+#: lang.pm:401 network/adsl_consts.pm:816
 #, c-format
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: lang.pm:394
+#: lang.pm:402
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:395
+#: lang.pm:403
 #, c-format
 msgid "Turkey"
 msgstr "Twrci"
 
-#: lang.pm:396
+#: lang.pm:404
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad a Tobago"
 
-#: lang.pm:397
+#: lang.pm:405
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:398
-#, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: lang.pm:399
+#: lang.pm:407
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: lang.pm:400
+#: lang.pm:408
 #, c-format
 msgid "Ukraine"
-msgstr "Wcrain"
+msgstr "Wcráin"
 
-#: lang.pm:401
+#: lang.pm:409
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:402
+#: lang.pm:410
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: lang.pm:404
+#: lang.pm:412
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:405
+#: lang.pm:413
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: lang.pm:406
+#: lang.pm:414
 #, c-format
 msgid "Vatican"
 msgstr "Fatican"
 
-#: lang.pm:407
+#: lang.pm:415
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent a'r Grenadines"
 
-#: lang.pm:408
+#: lang.pm:416
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:409
+#: lang.pm:417
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Virgin Islands (British)"
 
-#: lang.pm:410
+#: lang.pm:418
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Virgin Islands (U.S.)"
 
-#: lang.pm:411
+#: lang.pm:419
 #, c-format
 msgid "Vietnam"
 msgstr "Fietnam"
 
-#: lang.pm:412
+#: lang.pm:420
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:413
+#: lang.pm:421
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis a Futuna"
 
-#: lang.pm:414
+#: lang.pm:422
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:415
+#: lang.pm:423
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:416
+#: lang.pm:424
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:417 standalone/drakxtv:49
+#: lang.pm:425 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "De Affrica"
 
-#: lang.pm:418
+#: lang.pm:426
 #, c-format
 msgid "Zambia"
 msgstr "Zambia"
 
-#: lang.pm:419
+#: lang.pm:427
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:1047
-#, fuzzy, c-format
+#: lang.pm:1040
+#, c-format
 msgid "You should install the following packages: %s"
-msgstr "Mae'r pecynnau canlynol angen eu gosod: %s!"
+msgstr "Mae angen un o'r pecynnau canlynol i osod %s:"
 
 #. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
-#: lang.pm:1050 standalone/scannerdrake:135
+#: lang.pm:1043 standalone/scannerdrake:135
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: lang.pm:1101
+#: lang.pm:1094
 #, c-format
 msgid "Welcome to %s"
 msgstr "Croeso i %s"
@@ -9204,12 +9428,12 @@ msgstr "Croeso i %s"
 msgid "Circular mounts %s\n"
 msgstr "Gosodiadau cylch %s\n"
 
-#: lvm.pm:116
+#: lvm.pm:111
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Tynnu'r cyfrolau rhesymegol yn gyntaf\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:1033
+#: modules/interactive.pm:21 standalone/drakconnect:1032
 #, c-format
 msgid "Parameters"
 msgstr "Paramedrau"
@@ -9249,19 +9473,39 @@ msgstr "Oes gennych unrhyw ryngwyneb %s?"
 msgid "See hardware info"
 msgstr "Gweler gwybodaeth am galedwedd"
 
+#: modules/interactive.pm:82
+#, c-format
+msgid "Installing driver for USB controller"
+msgstr "Gosod gyrrwr gyfer rheolwr USB"
+
+#: modules/interactive.pm:83
+#, c-format
+msgid "Installing driver for firewire controller %s"
+msgstr "Gosod gyrrwr gyfer rheolwr firewire %s "
+
+#: modules/interactive.pm:84
+#, c-format
+msgid "Installing driver for hard drive controller %s"
+msgstr "Gosod gyrrwr gyfer rheolwr disg caled %s "
+
+#: modules/interactive.pm:85
+#, c-format
+msgid "Installing driver for ethernet controller %s"
+msgstr "Gosod gyrrwr gyfer rheolwr ethernet %s "
+
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: modules/interactive.pm:87
+#: modules/interactive.pm:96
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Gosod gyrrwr %s ar gyfer cerdyn %s "
 
-#: modules/interactive.pm:87
+#: modules/interactive.pm:99
 #, c-format
 msgid "(module %s)"
 msgstr "(modiwl %s)"
 
-#: modules/interactive.pm:98
+#: modules/interactive.pm:109
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
@@ -9271,7 +9515,7 @@ msgstr ""
 "Sylwer: wrth greu unrhyw gyfeiriad bydd angen defnyddio rhagddodiad 0x, e.e. "
 "'0x123'"
 
-#: modules/interactive.pm:104
+#: modules/interactive.pm:115
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
@@ -9282,18 +9526,18 @@ msgstr ""
 "Mae'r dewisiadau yn fformat ``name=value name2=value2 ...''.\n"
 "e.e, ``io=0x300 irq=7''"
 
-#: modules/interactive.pm:106
+#: modules/interactive.pm:117
 #, c-format
 msgid "Module options:"
 msgstr "Dewisiadau modiwl:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:119
+#: modules/interactive.pm:130
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Pa yrrwr %s ddylwn drio?"
 
-#: modules/interactive.pm:128
+#: modules/interactive.pm:139
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -9313,17 +9557,17 @@ msgstr ""
 "unrhyw\n"
 "ddifrod."
 
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
 #, c-format
 msgid "Autoprobe"
 msgstr "Awtoholi"
 
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
 #, c-format
 msgid "Specify options"
 msgstr "Enwi dewisiadau"
 
-#: modules/interactive.pm:144
+#: modules/interactive.pm:155
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9340,22 +9584,22 @@ msgstr "rhif"
 #: modules/parameters.pm:51
 #, c-format
 msgid "%d comma separated numbers"
-msgstr "%d rhifau gwahanwyd gan collnod"
+msgstr "%d rhifau gwahanwyd gan gollnod"
 
 #: modules/parameters.pm:51
 #, c-format
 msgid "%d comma separated strings"
-msgstr "%d llinellau gwahanwyd gan collnod"
+msgstr "%d llinellau gwahanwyd gan gollnod"
 
 #: modules/parameters.pm:53
 #, c-format
 msgid "comma separated numbers"
-msgstr "rhifau gwahanwyd gan collnod"
+msgstr "rhifau gwahanwyd gan gollnod"
 
 #: modules/parameters.pm:53
 #, c-format
 msgid "comma separated strings"
-msgstr "llinellau collnod ranedig"
+msgstr "llinellau collnod rhanedig"
 
 #: mouse.pm:25
 #, c-format
@@ -9382,11 +9626,11 @@ msgstr "Llygoden Olwyn PS Generig"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
-#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
-#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
-#: network/netconnect.pm:624 network/netconnect.pm:629
-#: network/netconnect.pm:645 network/netconnect.pm:647
+#: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
+#: network/modem.pm:137 network/netconnect.pm:645 network/netconnect.pm:650
+#: network/netconnect.pm:662 network/netconnect.pm:667
+#: network/netconnect.pm:683 network/netconnect.pm:685
 #, c-format
 msgid "Automatic"
 msgstr "Awtomatig"
@@ -9534,9 +9778,9 @@ msgstr "Unrhyw lygoden PS/2 ac USB"
 #: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
 #, c-format
 msgid "Synaptics Touchpad"
-msgstr ""
+msgstr "Pad Cyffwrdd Synaptic"
 
-#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
+#: mouse.pm:93 standalone/drakconnect:360 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "dim"
@@ -9577,9 +9821,9 @@ msgid "use DHCP"
 msgstr "defnyddiwch dhccp"
 
 #: network/adsl.pm:22
-#, fuzzy, c-format
+#, c-format
 msgid "Alcatel Speedtouch USB"
-msgstr "Modem USB Alcatel Speedtouch"
+msgstr "Alcatel Speedtouch USB"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -9596,23 +9840,23 @@ msgstr "USB Sagem (defnyddio PPOA)"
 msgid "Sagem (using DHCP) USB"
 msgstr "USB Sagem (defnyddio DHCP)"
 
-#: network/adsl.pm:35 network/netconnect.pm:799
+#: network/adsl.pm:35 network/netconnect.pm:839
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Cysylltu â'r We"
 
-#: network/adsl.pm:36 network/netconnect.pm:800
+#: network/adsl.pm:36 network/netconnect.pm:840
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
 "Some connections use PPTP, a few use DHCP.\n"
-"If you don't know, choose 'use PPPoE'"
+"If you do not know, choose 'use PPPoE'"
 msgstr ""
 "Y ffordd mwyaf cyffredin i gysylltu â adsl yw PPPoE\n"
 "Mae rhai cysylltiadau'n defnyddio PPTP, a rhai DHCP.\n"
 "Os nad ydych yn gwybod pa un, dewiswch 'pppoe'."
 
-#: network/adsl.pm:41 network/netconnect.pm:804
+#: network/adsl.pm:41 network/netconnect.pm:844
 #, c-format
 msgid "ADSL connection type:"
 msgstr "Math o gysylltiad ADSL :"
@@ -9654,8 +9898,8 @@ msgstr "Gweinydd Telnet"
 
 #: network/drakfirewall.pm:48
 #, c-format
-msgid "Samba server"
-msgstr "Gweinydd Samba"
+msgid "Windows Files Sharing (SMB)"
+msgstr "Rhannu Ffeiliau Wondows (SMB)"
 
 #: network/drakfirewall.pm:54
 #, c-format
@@ -9690,7 +9934,7 @@ msgstr ""
 "\n"
 "Mae hwn yn ffurfweddu mur gwarchod personol ar gyfer y peiriant \n"
 "Mandrakelinux hwn. Am fur gwarchod pwrpasol pwerus, \n"
-"edrychwch ddosbarthiad arbennigol MandrakeSecurity Firewall."
+"edrychwch ddosbarthiad arbenigol MandrakeSecurity Firewall."
 
 #: network/drakfirewall.pm:158
 #, c-format
@@ -9702,7 +9946,7 @@ msgid ""
 msgstr ""
 "Ffurfweddwr Drakfirewall\n"
 "\n"
-"Gwnewch yn siwr eich bod wedi ffurfweddu eich mynediad\n"
+"Gwnewch yn siŵr eich bod wedi ffurfweddu eich mynediad\n"
 "Rhwydwaith/Rhyngrwyd gyda Drakconnect cyn mynd ymhellach."
 
 #: network/drakfirewall.pm:175
@@ -9746,107 +9990,107 @@ msgstr "Popeth (dim mur cadarn)"
 msgid "Other ports"
 msgstr "Pyrth eraill"
 
-#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
-#: network/netconnect.pm:567
+#: network/isdn.pm:125 network/netconnect.pm:490 network/netconnect.pm:602
+#: network/netconnect.pm:605
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "Heb ei restru - golygu gyda llaw"
 
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
 #, c-format
-msgid "I don't know"
+msgid "I do not know"
 msgstr "Dim syniad"
 
-#: network/isdn.pm:169 network/netconnect.pm:388
+#: network/isdn.pm:169 network/netconnect.pm:422
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:170 network/netconnect.pm:388
+#: network/isdn.pm:170 network/netconnect.pm:422
 #, c-format
 msgid "USB"
 msgstr "USB"
 
-#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
-#: network/netconnect.pm:612 network/netconnect.pm:629
-#: network/netconnect.pm:645
+#: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/netconnect.pm:650 network/netconnect.pm:667
+#: network/netconnect.pm:683
 #, c-format
 msgid "Manual"
 msgstr "Llaw"
 
-#: network/netconnect.pm:89 network/netconnect.pm:485
-#: network/netconnect.pm:489
+#: network/netconnect.pm:90 network/netconnect.pm:519
+#: network/netconnect.pm:523
 #, c-format
 msgid "Manual choice"
 msgstr "Dewis gyda llaw"
 
-#: network/netconnect.pm:89
+#: network/netconnect.pm:90
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Cerdyn ISDN mewnol"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, c-format
 msgid "Managed"
 msgstr "Rheolwyd"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, c-format
 msgid "Master"
 msgstr "Meistr"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:103
 #, c-format
 msgid "Repeater"
 msgstr "Eilydd"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:104
 #, c-format
 msgid "Secondary"
 msgstr "Eilradd"
 
-#: network/netconnect.pm:103
+#: network/netconnect.pm:105
 #, c-format
 msgid "Auto"
 msgstr "Awtomatig"
 
-#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: network/netconnect.pm:108 printer/printerdrake.pm:1354
 #: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "Ffurfweddiad gyda llaw"
 
-#: network/netconnect.pm:107
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP awtomatig (BOOTP/DHCP)"
 
-#: network/netconnect.pm:109
+#: network/netconnect.pm:111
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "IP awtomatig (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:112
+#: network/netconnect.pm:114
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protocol ar gyfer gweddill y byd"
 
-#: network/netconnect.pm:114 standalone/drakconnect:539
+#: network/netconnect.pm:116 standalone/drakconnect:541
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Protocol Ewropeaidd (EDSSI)"
 
-#: network/netconnect.pm:115 standalone/drakconnect:540
+#: network/netconnect.pm:117 standalone/drakconnect:542
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -9855,168 +10099,168 @@ msgstr ""
 "Protocol ar gyfer gweddill y byd\n"
 " dim D-Channel (llinell les)"
 
-#: network/netconnect.pm:151
+#: network/netconnect.pm:153
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Modem USB Alcatel Speedtouch"
 
-#: network/netconnect.pm:152
+#: network/netconnect.pm:154
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Modem USB Sagem"
 
-#: network/netconnect.pm:153
+#: network/netconnect.pm:155
 #, c-format
 msgid "Bewan modem"
 msgstr "Modem Bewan"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:156
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "Modem ECI Hi-Focus"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:160
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:159
+#: network/netconnect.pm:161
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Ffurfweddu TCP/IP  gyda llaw"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:162
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Point to Point Tunneling Protocol (PPTP)"
 
-#: network/netconnect.pm:161
+#: network/netconnect.pm:163
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP over Ethernet (PPPoE)"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:164
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:165
 #, c-format
 msgid "DSL over CAPI"
-msgstr ""
+msgstr "DSL dros CAPI"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:169
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Pont Ethernet LLC"
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:170
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Pont Ethernet VC"
 
-#: network/netconnect.pm:169
+#: network/netconnect.pm:171
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Trywydd IP LLC"
 
-#: network/netconnect.pm:170
+#: network/netconnect.pm:172
 #, c-format
 msgid "Routed IP VC"
 msgstr "Trywydd IP VC"
 
-#: network/netconnect.pm:171
+#: network/netconnect.pm:173
 #, c-format
 msgid "PPPoA LLC"
 msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:174
 #, c-format
 msgid "PPPoA VC"
 msgstr "PPPoA VC"
 
-#: network/netconnect.pm:176 standalone/drakconnect:474
+#: network/netconnect.pm:178 standalone/drakconnect:476
 #, c-format
 msgid "Script-based"
 msgstr "Seiliedig ar sgript"
 
-#: network/netconnect.pm:177 standalone/drakconnect:474
+#: network/netconnect.pm:179 standalone/drakconnect:476
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:178 standalone/drakconnect:474
+#: network/netconnect.pm:180 standalone/drakconnect:476
 #, c-format
 msgid "Terminal-based"
 msgstr "Seiliedig ar derfynell"
 
-#: network/netconnect.pm:179 standalone/drakconnect:474
+#: network/netconnect.pm:181 standalone/drakconnect:476
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:180 standalone/drakconnect:474
+#: network/netconnect.pm:182 standalone/drakconnect:476
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:236 standalone/drakconnect:59
+#: network/netconnect.pm:238 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Ffurfweddiad y Rhwydwaith a'r Rhyngrwyd"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected on port %s)"
-msgstr "(canfyddwyd ar borth %s)"
+msgstr "(canfuwyd ar borth %s)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
 #, c-format
 msgid "(detected %s)"
-msgstr "(canfyddwyd %s)"
+msgstr "(canfuwyd %s)"
 
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
 #, c-format
 msgid "(detected)"
 msgstr "(canfuwyd)"
 
-#: network/netconnect.pm:246
+#: network/netconnect.pm:248
 #, c-format
 msgid "Modem connection"
 msgstr "Cysylltiad modem"
 
-#: network/netconnect.pm:247
+#: network/netconnect.pm:249
 #, c-format
 msgid "ISDN connection"
 msgstr "Cysylltiad ISDN"
 
-#: network/netconnect.pm:248
+#: network/netconnect.pm:250
 #, c-format
 msgid "ADSL connection"
 msgstr "Cysylltiad ADSL"
 
-#: network/netconnect.pm:249
+#: network/netconnect.pm:251
 #, c-format
 msgid "Cable connection"
 msgstr "Cysylltiad cebl"
 
-#: network/netconnect.pm:250
+#: network/netconnect.pm:252
 #, c-format
 msgid "LAN connection"
 msgstr "cysylltiad LAN"
 
-#: network/netconnect.pm:251 network/netconnect.pm:265
+#: network/netconnect.pm:253 network/netconnect.pm:267
 #, c-format
 msgid "Wireless connection"
 msgstr "Cysylltiad diwyfr"
 
-#: network/netconnect.pm:261
+#: network/netconnect.pm:263
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Dewiswch y math o gysylltiad rydych am ei ffurfweddu"
 
-#: network/netconnect.pm:279
+#: network/netconnect.pm:277
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10029,130 +10273,141 @@ msgstr ""
 "\n"
 "Pwyswch \"%s\" i barhau."
 
-#: network/netconnect.pm:287 network/netconnect.pm:839
+#: network/netconnect.pm:285 network/netconnect.pm:879
 #, c-format
 msgid "Connection Configuration"
 msgstr "Ffurfweddiad y Cysylltiad"
 
-#: network/netconnect.pm:288 network/netconnect.pm:840
+#: network/netconnect.pm:286 network/netconnect.pm:880
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Llanwch neu ticiwch y maes islaw"
 
-#: network/netconnect.pm:295 standalone/drakconnect:530
+#: network/netconnect.pm:293 standalone/drakconnect:532
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ y cerdyn"
 
-#: network/netconnect.pm:296 standalone/drakconnect:531
+#: network/netconnect.pm:294 standalone/drakconnect:533
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Cof Cerdyn (DMA)"
 
-#: network/netconnect.pm:297 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:534
 #, c-format
 msgid "Card IO"
 msgstr "IO'r Cerdyn"
 
-#: network/netconnect.pm:298 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:535
 #, c-format
 msgid "Card IO_0"
 msgstr "IO_O y cerdyn"
 
-#: network/netconnect.pm:299
+#: network/netconnect.pm:297
 #, c-format
 msgid "Card IO_1"
 msgstr "IO_1 y cerdyn"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:298
 #, c-format
 msgid "Your personal phone number"
 msgstr "Eich rhif ffôn personol"
 
-#: network/netconnect.pm:301 network/netconnect.pm:843
+#: network/netconnect.pm:299 network/netconnect.pm:883
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Enw darparwr (eng. darparwr.net)"
 
-#: network/netconnect.pm:302 standalone/drakconnect:469
+#: network/netconnect.pm:300 standalone/drakconnect:471
 #, c-format
 msgid "Provider phone number"
 msgstr "Rhif ffôn y darparwr"
 
-#: network/netconnect.pm:303
+#: network/netconnect.pm:301
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Darparwr DNS 1 (dewisol)"
 
-#: network/netconnect.pm:304
+#: network/netconnect.pm:302
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Darparwr DNS 2 (dewisol)"
 
-#: network/netconnect.pm:305 standalone/drakconnect:420
+#: network/netconnect.pm:303 standalone/drakconnect:422
 #, c-format
 msgid "Dialing mode"
 msgstr "Modd deialu"
 
-#: network/netconnect.pm:306 standalone/drakconnect:425
-#: standalone/drakconnect:493
+#: network/netconnect.pm:304 standalone/drakconnect:427
+#: standalone/drakconnect:495
 #, c-format
 msgid "Connection speed"
 msgstr "Cyflymder y cysylltiad"
 
-#: network/netconnect.pm:307 standalone/drakconnect:430
+#: network/netconnect.pm:305 standalone/drakconnect:432
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Oediad yn y cysylltiad (mewn eiliadau)"
 
-#: network/netconnect.pm:310 network/netconnect.pm:846
-#: standalone/drakconnect:467
+#: network/netconnect.pm:308 network/netconnect.pm:329
+#: network/netconnect.pm:886 standalone/drakconnect:469
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Mewngofnod Cyfrif (enw defnyddiwr)"
 
-#: network/netconnect.pm:311 network/netconnect.pm:847
-#: standalone/drakconnect:468
+#: network/netconnect.pm:309 network/netconnect.pm:330
+#: network/netconnect.pm:887 standalone/drakconnect:470
 #, c-format
 msgid "Account Password"
 msgstr "Cyfrinair y Cyfrif"
 
-#: network/netconnect.pm:328 network/netconnect.pm:677
-#: network/netconnect.pm:880
+#: network/netconnect.pm:325
+#, c-format
+msgid "Cable: account options"
+msgstr "Cebl: dewisiadau cyfrif"
+
+#: network/netconnect.pm:328
+#, c-format
+msgid "Use BPALogin (needed for Telstra)"
+msgstr "Defnyddiwch BPALogin (ar gyfer Telstra)"
+
+#: network/netconnect.pm:362 network/netconnect.pm:715
+#: network/netconnect.pm:920
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "Dewis y rhyngwyneb rhwydwaith i'w ffurfweddu:"
 
-#: network/netconnect.pm:330 network/netconnect.pm:378
-#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
-#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
+#: network/netconnect.pm:364 network/netconnect.pm:412
+#: network/netconnect.pm:716 network/netconnect.pm:922
+#: network/netconnect.pm:1091 network/shorewall.pm:98
+#: standalone/drakconnect:684 standalone/drakgw:224 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "Dyfais Rhyngrwyd"
 
-#: network/netconnect.pm:331 network/netconnect.pm:339
+#: network/netconnect.pm:365 network/netconnect.pm:373
 #, c-format
 msgid "External ISDN modem"
 msgstr "Modem IDSN Allanol"
 
-#: network/netconnect.pm:377 standalone/harddrake2:192
+#: network/netconnect.pm:411 standalone/harddrake2:210
 #, c-format
 msgid "Select a device!"
 msgstr "Dewis dyfais!"
 
-#: network/netconnect.pm:386 network/netconnect.pm:396
-#: network/netconnect.pm:406 network/netconnect.pm:439
-#: network/netconnect.pm:453
+#: network/netconnect.pm:420 network/netconnect.pm:430
+#: network/netconnect.pm:440 network/netconnect.pm:473
+#: network/netconnect.pm:487
 #, c-format
 msgid "ISDN Configuration"
 msgstr "Ffurfweddiad ISDN"
 
-#: network/netconnect.pm:387
+#: network/netconnect.pm:421
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Pa fath o gerdyn sydd gennych?"
 
-#: network/netconnect.pm:397
+#: network/netconnect.pm:431
 #, c-format
 msgid ""
 "\n"
@@ -10162,186 +10417,191 @@ msgid ""
 "card.\n"
 msgstr ""
 "\n"
-"Os oes gennych gerdyn, dylai'r gwerthoedd ar y sgrîn nesaf fod yn gywir.\n"
+"Os oes gennych gerdyn ISA, dylai'r gwerthoedd ar y sgrin nesaf fod yn "
+"gywir.\n"
 "\n"
-"Os oes gennych gerdyn PCMCIA, rhaid i chi wybod irq ac io eich cerdyn.\n"
+"Os oes gennych gerdyn PCMCIA, rhaid i chi wybod \"irq\" ac \"o\" eich "
+"cerdyn.\n"
 
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
 #, c-format
 msgid "Continue"
 msgstr "Parhau"
 
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
 #, c-format
 msgid "Abort"
 msgstr "Peidio"
 
-#: network/netconnect.pm:407
+#: network/netconnect.pm:441
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Pa un o'r canlynol yw eich cerdyn IDSN?"
 
-#: network/netconnect.pm:425
+#: network/netconnect.pm:459
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
 "capabilities than the free driver (like sending faxes). Which driver do you "
 "want to use?"
 msgstr ""
+"Mae gyrrwr CAPI ar gael ar gyfer y modem. Mae gyrrwr CAPI'n cynnig mwy o "
+"swyddogaethau na'r gyrrwr rhydd (fel anfon ffacs). Pa yrrwr hoffech chi ei "
+"ddefnyddio?"
 
-#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
-#: standalone/harddrake2:117
+#: network/netconnect.pm:461 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:131
 #, c-format
 msgid "Driver"
 msgstr "Gyrrwr"
 
-#: network/netconnect.pm:439
+#: network/netconnect.pm:473
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Pa brotocol ydych chi eisiau ei ddefnyddio?"
 
-#: network/netconnect.pm:441 standalone/drakconnect:116
-#: standalone/drakconnect:309 standalone/drakconnect:538
+#: network/netconnect.pm:475 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:540
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: network/netconnect.pm:453
+#: network/netconnect.pm:487
 #, c-format
 msgid ""
 "Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+"If it is not listed, choose Unlisted."
 msgstr ""
 "Dewiswch eich darparwr.\n"
 "Os nad yw ar eich rhestr, dewiswch Heb ei Restri"
 
-#: network/netconnect.pm:455 network/netconnect.pm:563
-#: network/netconnect.pm:719
+#: network/netconnect.pm:489 network/netconnect.pm:601
+#: network/netconnect.pm:757
 #, c-format
 msgid "Provider:"
 msgstr "Darparwr:"
 
-#: network/netconnect.pm:470
+#: network/netconnect.pm:504
 #, c-format
 msgid ""
-"Your modem isn't supported by the system.\n"
+"Your modem is not supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
 "Nid yw'r system yn cynnal eich modem.\n"
 "Ewch i http://www.linmodems.org"
 
-#: network/netconnect.pm:482
+#: network/netconnect.pm:516
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Dewis y modem i'w ffurfweddu:"
 
-#: network/netconnect.pm:530
+#: network/netconnect.pm:568
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Dewiswch ba borth cyfresol mae eich modem wedi cysylltu iddo."
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:599
 #, c-format
 msgid "Select your provider:"
 msgstr "Dewis eich darparwr:"
 
-#: network/netconnect.pm:589
+#: network/netconnect.pm:627
 #, c-format
 msgid "Dialup: account options"
 msgstr "Deialu: dewisiadau cyfrif"
 
-#: network/netconnect.pm:592
+#: network/netconnect.pm:630
 #, c-format
 msgid "Connection name"
 msgstr "Enw'r cysylltiad"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:631
 #, c-format
 msgid "Phone number"
 msgstr "Rhif ffôn"
 
-#: network/netconnect.pm:594
+#: network/netconnect.pm:632
 #, c-format
 msgid "Login ID"
 msgstr "Dynodiad Mewngofnodi"
 
-#: network/netconnect.pm:609 network/netconnect.pm:642
+#: network/netconnect.pm:647 network/netconnect.pm:680
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Deialu: paramedrau'r IP"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:650
 #, c-format
 msgid "IP parameters"
 msgstr "Paramedrau IP"
 
-#: network/netconnect.pm:613 network/netconnect.pm:976
+#: network/netconnect.pm:651 network/netconnect.pm:1018
 #: printer/printerdrake.pm:454 standalone/drakconnect:116
-#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakconnect:325 standalone/drakconnect:879
 #: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "Cyfeiriad IP"
 
-#: network/netconnect.pm:614
+#: network/netconnect.pm:652
 #, c-format
 msgid "Subnet mask"
 msgstr "Masg Isnet"
 
-#: network/netconnect.pm:626
+#: network/netconnect.pm:664
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Deialu: paramedrau DNS"
 
-#: network/netconnect.pm:629
+#: network/netconnect.pm:667
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:630
+#: network/netconnect.pm:668
 #, c-format
 msgid "Domain name"
 msgstr "Enw parth"
 
-#: network/netconnect.pm:631 network/netconnect.pm:844
-#: standalone/drakconnect:998
+#: network/netconnect.pm:669 network/netconnect.pm:884
+#: standalone/drakconnect:997
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Gweinydd DNS Cyntaf (dewisol)"
 
-#: network/netconnect.pm:632 network/netconnect.pm:845
-#: standalone/drakconnect:999
+#: network/netconnect.pm:670 network/netconnect.pm:885
+#: standalone/drakconnect:998
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Ail Wasanaethwr DNS (dewisol)"
 
-#: network/netconnect.pm:633
+#: network/netconnect.pm:671
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Gosod enw'r gwesteiwr o'r IP"
 
-#: network/netconnect.pm:645 standalone/drakconnect:334
+#: network/netconnect.pm:683 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "Mynedfa"
 
-#: network/netconnect.pm:646
+#: network/netconnect.pm:684
 #, c-format
 msgid "Gateway IP address"
 msgstr "Cyfeiriad porth IP"
 
-#: network/netconnect.pm:677
+#: network/netconnect.pm:715
 #, c-format
 msgid "ADSL configuration"
 msgstr "Ffurfweddiad ADSL"
 
-#: network/netconnect.pm:717
+#: network/netconnect.pm:755
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Dewiswch eich darparwr ADSL"
 
-#: network/netconnect.pm:735
+#: network/netconnect.pm:773
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10349,35 +10609,35 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 "Rhaid cael meicrocod Alcatel.\n"
-"Mae modd ei ddarparu ar ddisg meddal neu o'ch rhaniad windows,\n"
-"neu ei adael tan rhywbryd eto."
+"Mae modd ei ddarparu ar ddisg meddal neu o'ch rhaniad Windows,\n"
+"neu ei adael tan rywbryd eto."
 
-#: network/netconnect.pm:739 network/netconnect.pm:744
+#: network/netconnect.pm:777 network/netconnect.pm:782
 #, c-format
 msgid "Use a floppy"
 msgstr "Defnyddiwch ddisg meddal"
 
-#: network/netconnect.pm:739 network/netconnect.pm:748
+#: network/netconnect.pm:777 network/netconnect.pm:786
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Defnyddio fy rhaniad Windows"
 
-#: network/netconnect.pm:739 network/netconnect.pm:751
+#: network/netconnect.pm:777 network/netconnect.pm:789
 #, c-format
 msgid "Do it later"
 msgstr "Gwneud yn hwyrach"
 
-#: network/netconnect.pm:758
+#: network/netconnect.pm:796
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Methodd copïo'r gadarnwedd, heb ganfod ffeil %s"
 
-#: network/netconnect.pm:765
+#: network/netconnect.pm:803
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Copïo'r gadarnwedd yn llwyddiant"
 
-#: network/netconnect.pm:780
+#: network/netconnect.pm:818
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10385,27 +10645,27 @@ msgid ""
 "%s\n"
 "and copy the mgmt.o in /usr/share/speedtouch"
 msgstr ""
-"Rahaid cael minicode Alcatel.\n"
+"Rhaid cael mincod Alcatel.\n"
 "Llwytho i lawr o\n"
 "%s\n"
-"achopio'r mgmt.o i /usr/share/speedtouch"
+"a chopïo’r mgmt.o i /usr/share/speedtouch"
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:889
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:850
+#: network/netconnect.pm:890
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:853
+#: network/netconnect.pm:893
 #, c-format
 msgid "Encapsulation:"
 msgstr "Mewngapsiwleiddio :"
 
-#: network/netconnect.pm:870
+#: network/netconnect.pm:910
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10413,29 +10673,34 @@ msgid ""
 "\n"
 "You can find a driver on http://eciadsl.flashtux.org/"
 msgstr ""
-"Methu cynnal modem ECI Hi-Focus oherwydd problem dorbarthu gyrrwr deuaidd.\n"
+"Methu cynnal modem ECI Hi-Focus oherwydd problem dosbarthu gyrrwr deuaidd.\n"
 "\n"
 "Mae modd canfod gyrrwr ar http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:882
+#: network/netconnect.pm:922
 #, c-format
 msgid "Manually load a driver"
-msgstr ""
+msgstr "Llwytho gyrrwr gyda llaw"
+
+#: network/netconnect.pm:922
+#, c-format
+msgid "Use a Windows driver (with ndiswrapper)"
+msgstr "Defnyddiwch yrrwr Windows (gydan ndiswrapper)"
 
-#: network/netconnect.pm:898
-#, fuzzy, c-format
+#: network/netconnect.pm:940
+#, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
 "Modifying the fields below will override this configuration.\n"
 "Do you really want to reconfigure this device?"
 msgstr ""
-"Rhybudd!! Cafodd y ddyfais hon ei ffurfweddu o'r blaen i gysylltu â'r "
+"RHYBUDD: Cafodd y ddyfais hon ei ffurfweddu o'r blaen i gysylltu â'r "
 "Rhyngrwyd.\n"
-"Derbyniwch y cynnig i gadw'r ddyfais wedi ei ffurfweddi.\n"
-"Bydd newid y meysydd islaw'n newid y ffurfweddiad."
+"Bydd newid y meysydd islaw'n newid y ffurfweddiad.\n"
+"Ydych am ail-ffurfweddu’r ddyfais?"
 
-#: network/netconnect.pm:912 network/netconnect.pm:1340
+#: network/netconnect.pm:954 network/netconnect.pm:1436
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -10444,17 +10709,17 @@ msgstr ""
 "Llongyfarchiadau, mae ffurfweddiad y rhwydwaith a'r Rhyngrwyd wedi ei "
 "gwblhau\n"
 
-#: network/netconnect.pm:929
+#: network/netconnect.pm:971
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Cydraniad enw gwesteiwr Zeroconf"
 
-#: network/netconnect.pm:930 network/netconnect.pm:963
+#: network/netconnect.pm:972 network/netconnect.pm:1005
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Ffurfweddu dyfais rhwydwaith %s (gyrrwr %s)"
 
-#: network/netconnect.pm:931
+#: network/netconnect.pm:973
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10463,7 +10728,7 @@ msgstr ""
 "Mae modd defnyddio'r protocolau canlynol i ffurfweddu cysylltiad ethernet. "
 "Dewiswch yr un i'w ddefnyddio."
 
-#: network/netconnect.pm:964
+#: network/netconnect.pm:1006
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10474,95 +10739,120 @@ msgstr ""
 "Dylai pob eitem ei roi fel cyfeiriad IP nodiant collnod degymol\n"
 "(e.e.1.2.3.4)."
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:1013
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Rhowch enw'r gwesteiwr o'r cyfeiriad DHCP"
 
-#: network/netconnect.pm:972
+#: network/netconnect.pm:1014
 #, c-format
 msgid "DHCP host name"
 msgstr "Enw gwesteiwr DHCP"
 
-#: network/netconnect.pm:977 standalone/drakconnect:328
-#: standalone/drakconnect:881 standalone/drakgw:323
+#: network/netconnect.pm:1019 standalone/drakconnect:330
+#: standalone/drakconnect:880 standalone/drakgw:320
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
 
-#: network/netconnect.pm:979 standalone/drakconnect:413
+#: network/netconnect.pm:1021 standalone/drakconnect:415
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "Dilynwch gyfernod cerdyn rhwydwaith (defnyddiol ar gyfer gliniadur)"
 
-#: network/netconnect.pm:980 standalone/drakconnect:414
+#: network/netconnect.pm:1022 standalone/drakconnect:416
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Plygio byw'r Rhwydwaith"
 
-#: network/netconnect.pm:982 standalone/drakconnect:408
+#: network/netconnect.pm:1024 standalone/drakconnect:410
 #, c-format
 msgid "Start at boot"
 msgstr "Cychwyn y peiriant"
 
-#: network/netconnect.pm:985 standalone/drakconnect:884
+#: network/netconnect.pm:1027 standalone/drakconnect:883
 #, c-format
 msgid "DHCP client"
 msgstr "Cleient DHCP"
 
-#: network/netconnect.pm:995 printer/printerdrake.pm:1498
-#: standalone/drakconnect:648
+#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
+#: standalone/drakconnect:649
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "dylai cyfeiriad IP fod mewn fformat  1.2.3.4"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1041
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
 msgstr "Rhybudd : cyfeiriad IP %s wedi ei gadw fel rheol !"
 
-#: network/netconnect.pm:1004 standalone/drakTermServ:1690
-#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#: network/netconnect.pm:1046 standalone/drakTermServ:1742
+#: standalone/drakTermServ:1743 standalone/drakTermServ:1744
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s yn cael ei ddefnyddio eisoes\n"
 
-#: network/netconnect.pm:1030 network/netconnect.pm:1059
+#: network/netconnect.pm:1067
+#, c-format
+msgid "Choose an ndiswrapper driver"
+msgstr "Dewis gyrrwr ndiswrapper"
+
+#: network/netconnect.pm:1068 network/netconnect.pm:1075
+#, c-format
+msgid "Install a new driver"
+msgstr "Gosod gyrrwr newydd"
+
+#: network/netconnect.pm:1068
+#, c-format
+msgid "Use already installed driver (%s)"
+msgstr "Defnyddiwch yrrwr presennol (%s)"
+
+#: network/netconnect.pm:1072 printer/printerdrake.pm:3644
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "Methu gosod pecyn %s!"
+
+#: network/netconnect.pm:1076
+#, c-format
+msgid "Please select the Windows driver (.inf file)"
+msgstr "Dewiswch y gyrrwr Windows (.inf file)"
+
+#: network/netconnect.pm:1126 network/netconnect.pm:1155
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Rhowch baramedrau diwyfr y cerdyn:"
 
-#: network/netconnect.pm:1033 standalone/drakconnect:380
+#: network/netconnect.pm:1129 standalone/drakconnect:382
 #, c-format
 msgid "Operating Mode"
 msgstr "Modd Gweithredu"
 
-#: network/netconnect.pm:1035 standalone/drakconnect:381
+#: network/netconnect.pm:1131 standalone/drakconnect:383
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Enw'r rhwydwaith (ESSID)"
 
-#: network/netconnect.pm:1036 standalone/drakconnect:382
+#: network/netconnect.pm:1132 standalone/drakconnect:384
 #, c-format
 msgid "Network ID"
 msgstr "Enw Rhwydwaith"
 
-#: network/netconnect.pm:1037 standalone/drakconnect:383
+#: network/netconnect.pm:1133 standalone/drakconnect:385
 #, c-format
 msgid "Operating frequency"
 msgstr "Amledd gweithredu"
 
-#: network/netconnect.pm:1038 standalone/drakconnect:384
+#: network/netconnect.pm:1134 standalone/drakconnect:386
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Trothwy sensitifrwydd"
 
-#: network/netconnect.pm:1039 standalone/drakconnect:385
+#: network/netconnect.pm:1135 standalone/drakconnect:387
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Didradd (mewn b/s)"
 
-#: network/netconnect.pm:1045
+#: network/netconnect.pm:1141
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10571,7 +10861,7 @@ msgstr ""
 "Dylai Frqu gael rhagosodiad k, M neu G (ee \"2.46G\" am donfedd 2.46 GHz ), "
 "neu ychwanegu '0' (sero)."
 
-#: network/netconnect.pm:1049
+#: network/netconnect.pm:1145
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10580,12 +10870,12 @@ msgstr ""
 "Dylai'r raddfa gael rhagosodiad K, M neu G (e.e.\"11M\" am 11M),  neu "
 "ychwanegi '0' (sero)."
 
-#: network/netconnect.pm:1062 standalone/drakconnect:396
+#: network/netconnect.pm:1158 standalone/drakconnect:398
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1063
+#: network/netconnect.pm:1159
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10598,8 +10888,8 @@ msgid ""
 "fixed\n"
 "or off."
 msgstr ""
-"Mae RTS/CTS yn cychwanegu ysgwyd llaw cyn trosglwyddo pob pecyn i wneud\n"
-"yn siwr y sianel yn glir. Mae hyn yn ychwanegu baich, ond mae'n cynyddu'r "
+"Mae RTS/CTS yn ychwanegu ysgwyd llaw cyn trosglwyddo pob pecyn i wneud\n"
+"yn siŵr y sianel yn glir. Mae hyn yn ychwanegu baich, ond mae'n cynyddu'r "
 "perfformiad\n"
 "yn achos cwgn cudd neu nifer fawr o gygnau gweithredol. Mae'r paramedr hwn "
 "yn gosod\n"
@@ -10608,17 +10898,17 @@ msgstr ""
 "i awto,\n"
 "gosodedig  neu ddiffodd"
 
-#: network/netconnect.pm:1070 standalone/drakconnect:397
+#: network/netconnect.pm:1166 standalone/drakconnect:399
 #, c-format
 msgid "Fragmentation"
 msgstr "Darniad"
 
-#: network/netconnect.pm:1071 standalone/drakconnect:398
+#: network/netconnect.pm:1167 standalone/drakconnect:400
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn Iwconfig"
 
-#: network/netconnect.pm:1072
+#: network/netconnect.pm:1168
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10631,15 +10921,15 @@ msgstr ""
 "ap, channel, commit, enc, power, retry, sens, txpower (nick wedi ei osod fel "
 "enw'r gwesteiwr).\n"
 "\n"
-"Gw. tudalen iwpriv(8) man am rhagor o wybodaeth"
+"Gw. tudalen iwpriv(8) man am ragor o wybodaeth"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:1079 standalone/drakconnect:399
+#: network/netconnect.pm:1175 standalone/drakconnect:401
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn lwspy"
 
-#: network/netconnect.pm:1080
+#: network/netconnect.pm:1176
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10651,19 +10941,19 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 "Mae lwspy yn cael ei ddefnyddio i osod rhestr o gyfeiriadau mewn\n"
-"rhyngwyneb rhwydwaith diwyfr a adrodd ar ansawdd y cyswllt ar gyfer pob un\n"
+"rhyngwyneb rhwydwaith diwyfr ac adrodd ar ansawdd y cyswllt ar gyfer pob un\n"
 "\n"
 "Mae'r wybodaeth yr un ar sydd ar gale yn /proc/net/wireless :\n"
-"ansawdd y cyswllt, cryfder y signal a lefel y swn.\n"
+"ansawdd y cyswllt, cryfder y signal a lefel y sŵn.\n"
 "\n"
 "Gw. tudalennau man iwpspy(8) am ragor o wybodaeth. "
 
-#: network/netconnect.pm:1088 standalone/drakconnect:400
+#: network/netconnect.pm:1184 standalone/drakconnect:402
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn Iwpriv"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1185
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10686,12 +10976,12 @@ msgstr ""
 "Mae iwpriv yn trin paramedrau a gosodiadau penodol pob gyrrwr (o gynharu\n"
 "ag iwconfig sy'n delio â rhai generig).\n"
 "\n"
-"Mewn theori dylai dogfennaeth y gyrrwyr hyn ddangos sut i ddefnyddio\n"
+"Mewn theori dylai dogfennaeth y gyrwyr hyn ddangos sut i ddefnyddio\n"
 "gorchmynion rhyngwyneb penodol a'u heffaith.\n"
 "\n"
-"Gw. tudalen iwpriv(8) man am rhagor o wybodaeth."
+"Gw. tudalen iwpriv(8) man am ragor o wybodaeth."
 
-#: network/netconnect.pm:1163
+#: network/netconnect.pm:1259
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10704,68 +10994,68 @@ msgstr ""
 "megis \"fymlwch.fynesg.fyngho.com\".\n"
 "Gallwch hefyd gynnig eich cyfeiriad IP os oes gennych un"
 
-#: network/netconnect.pm:1167
+#: network/netconnect.pm:1263
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr "Yn olaf mae modd i chi deipio cyfeiriadau IP eich gweinydd DNS."
 
-#: network/netconnect.pm:1169 standalone/drakconnect:997
+#: network/netconnect.pm:1265 standalone/drakconnect:996
 #, c-format
 msgid "Host name (optional)"
 msgstr "Enw gwesteiwr (dewisol)"
 
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1265
 #, c-format
 msgid "Host name"
 msgstr "Enw gwesteiwr"
 
-#: network/netconnect.pm:1171
+#: network/netconnect.pm:1267
 #, c-format
 msgid "DNS server 1"
 msgstr "Gweinydd DNS 1"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1268
 #, c-format
 msgid "DNS server 2"
 msgstr "Gweinydd DNS 2"
 
-#: network/netconnect.pm:1173
+#: network/netconnect.pm:1269
 #, c-format
 msgid "DNS server 3"
 msgstr "Gweinydd DNS 3"
 
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1270
 #, c-format
 msgid "Search domain"
 msgstr "Chwilio parth"
 
-#: network/netconnect.pm:1175
+#: network/netconnect.pm:1271
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 "Drwy ragosodiad bydd y parch chwilio'n cae ei osod o enw gwesteiwr cymwys"
 
-#: network/netconnect.pm:1176
+#: network/netconnect.pm:1272
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Mynedfa (e.e. %s)"
 
-#: network/netconnect.pm:1178
+#: network/netconnect.pm:1274
 #, c-format
 msgid "Gateway device"
 msgstr "Dyfais mynedfa"
 
-#: network/netconnect.pm:1187
+#: network/netconnect.pm:1283
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Dylai cyfeiriad DNS fod mewn fformat  1.2.3.4"
 
-#: network/netconnect.pm:1192 standalone/drakconnect:651
+#: network/netconnect.pm:1288 standalone/drakconnect:652
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Dylai cyfeiriad Porth fod mewn fformat  1.2.3.4"
 
-#: network/netconnect.pm:1203
+#: network/netconnect.pm:1299
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -10773,18 +11063,22 @@ msgid ""
 "its shared resources that are not managed by the network.\n"
 "It is not necessary on most networks."
 msgstr ""
+"Os hoffech chi rhowch enw parth Zeroconf.\n"
+"Dyma'r enw fydd eich cyfrifiadur yn ei ddefnyddio i hysbysu\n"
+"unrhyw un o'i adnoddau rhannwyd nad ydynt wedi eu rheoli gan\n"
+"rwydwaith. Nid oes angen gyda'r rhan fwyaf o rwydweithiau."
 
-#: network/netconnect.pm:1207
+#: network/netconnect.pm:1303
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Enw Gwesteiwr Zeroconf"
 
-#: network/netconnect.pm:1210
+#: network/netconnect.pm:1306
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Rhaid i enw gwesteiwr Zeroconf beidio cynnwys ."
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1316
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10795,52 +11089,52 @@ msgstr ""
 "Dewiswch ba un rydych am ei ddefnyddio.\n"
 "\n"
 
-#: network/netconnect.pm:1222
+#: network/netconnect.pm:1318
 #, c-format
 msgid "Internet connection"
 msgstr "Cysylltiad â'r Rhyngrwyd"
 
-#: network/netconnect.pm:1230
+#: network/netconnect.pm:1326
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "Mae'r ffurfweddu wedi ei gwblhau, hoffech eu gosod?"
 
-#: network/netconnect.pm:1240
+#: network/netconnect.pm:1336
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Ydych chi eisiau agor y cysylltiad wrth gychwyn y cyfrifiadur?"
 
-#: network/netconnect.pm:1258
-#, fuzzy, c-format
+#: network/netconnect.pm:1354
+#, c-format
 msgid "Automatically at boot"
-msgstr "Cychwyn y peiriant"
+msgstr "Yna awtomatig wrth gychwyn"
 
-#: network/netconnect.pm:1260
+#: network/netconnect.pm:1356
 #, c-format
 msgid "By using Net Applet in the system tray"
-msgstr ""
+msgstr "Drwy ddefnyddio Net Applet yn y gilfach"
 
-#: network/netconnect.pm:1262
+#: network/netconnect.pm:1358
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
-msgstr ""
+msgstr "Gyda llaw (bydd y rhyngwyneb yn dal i gychwyn wrth gychwyn)"
 
-#: network/netconnect.pm:1271
-#, fuzzy, c-format
+#: network/netconnect.pm:1367
+#, c-format
 msgid "How do you want to dial this connection?"
-msgstr "Ydych chi eisiau agor y cysylltiad wrth gychwyn y cyfrifiadur?"
+msgstr "Sut ydych am ddeialu’r cysylltiad?"
 
-#: network/netconnect.pm:1284
+#: network/netconnect.pm:1380
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "Rhaid i'r rhwydwaith gael ei ailgychwyn.  Ydych chi am ei ailgychwyn?"
 
-#: network/netconnect.pm:1291 network/netconnect.pm:1356
+#: network/netconnect.pm:1387 network/netconnect.pm:1452
 #, c-format
 msgid "Network Configuration"
 msgstr "Ffurfweddiad y Rhwydwaith"
 
-#: network/netconnect.pm:1292
+#: network/netconnect.pm:1388
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -10851,36 +11145,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1300
+#: network/netconnect.pm:1396
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Hoffech chi gysylltu â'r Rhyngrwyd nawr?"
 
-#: network/netconnect.pm:1308 standalone/drakconnect:1029
+#: network/netconnect.pm:1404 standalone/drakconnect:1028
 #, c-format
 msgid "Testing your connection..."
 msgstr "Profi eich cysylltiad..."
 
-#: network/netconnect.pm:1324
+#: network/netconnect.pm:1420
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Mae'r system wedi cysylltu â'r Rhyngrwyd."
 
-#: network/netconnect.pm:1325
+#: network/netconnect.pm:1421
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Am resymau diogelwch, bydd yn cael ei ddatgysylltu."
 
-#: network/netconnect.pm:1326
+#: network/netconnect.pm:1422
 #, c-format
 msgid ""
-"The system doesn't seem to be connected to the Internet.\n"
+"The system does not seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 "Nid yw'n ymddangos i'ch system gysylltu â'r Rhyngrwyd.\n"
 "Ailffurfweddwch eich cysylltiad."
 
-#: network/netconnect.pm:1343
+#: network/netconnect.pm:1439
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10890,18 +11184,18 @@ msgstr ""
 "amgylchedd X i osgoi unrhyw anawsterau'n perthyn i enwau gwesteiwr.\n"
 "."
 
-#: network/netconnect.pm:1344
+#: network/netconnect.pm:1440
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection doesn't "
+"Test your connection via net_monitor or mcc. If your connection does not "
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Digwyddod anhawsterau yn ystod y ffurfweddiad.\n"
 "Profwch eich cysylltiad drwy net_monitor neu mcc. Os nad yw eich cysylltiad "
 "yn gweithio, efallai y byddwch eisiau ailgychwyn y ffurfweddiad"
 
-#: network/netconnect.pm:1357
+#: network/netconnect.pm:1453
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10914,7 +11208,7 @@ msgstr ""
 "Cliciwch Iawn i gadw eich ffurfweddiad, neu ddileu i ail ffurfweddi eich "
 "cysylltiad Rhyngrwyd a Rhwydwaith.\n"
 
-#: network/netconnect.pm:1393
+#: network/netconnect.pm:1491
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10923,37 +11217,37 @@ msgstr ""
 "Digwyddodd gwall annisgwyl:\n"
 "%s"
 
-#: network/network.pm:316
+#: network/network.pm:319
 #, c-format
 msgid "Proxies configuration"
 msgstr "Ffurfweddiad dirprwyon"
 
-#: network/network.pm:317
+#: network/network.pm:320
 #, c-format
 msgid "HTTP proxy"
 msgstr "Dirprwy HTTP"
 
-#: network/network.pm:318
+#: network/network.pm:321
 #, c-format
 msgid "FTP proxy"
 msgstr "Dirprwy FTP"
 
-#: network/network.pm:321
+#: network/network.pm:324
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Dylai dirprwyon fod yn gyfanrif!"
 
-#: network/network.pm:322
+#: network/network.pm:325
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "Dylai'r URL ddechrau gyda 'ftp' neu 'http:'"
 
-#: network/shorewall.pm:28
+#: network/shorewall.pm:25
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Wedi canfod ffurfweddiad mur gwarchod!"
 
-#: network/shorewall.pm:29
+#: network/shorewall.pm:26
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10962,7 +11256,7 @@ msgstr ""
 "Rhybudd! Mae ffurfweddiad mur gwarchod wedi ei ganfod. Efallai bydd angen "
 "atgyweirio gyda llaw ar ôl y gosodiad."
 
-#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
+#: network/shorewall.pm:91 standalone/drakgw:217 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -10979,12 +11273,12 @@ msgstr ""
 "\t\teth0, neu eth1 fam gysylltiad cebl, \n"
 "\t\tippp+ am gysylltiad idsn.\n"
 
-#: network/tools.pm:197
+#: network/tools.pm:181
 #, c-format
 msgid "Insert floppy"
 msgstr "Rhowch ddisg meddal"
 
-#: network/tools.pm:198
+#: network/tools.pm:182
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -10993,25 +11287,25 @@ msgstr ""
 "Rhowch ddisg meddal wedi ei fformatio i FAT yng ngyrrwr %s gyda %s yng "
 "nghyfeiriadur gwraidd a phwyso %s"
 
-#: network/tools.pm:199
+#: network/tools.pm:187
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Gwall mynediad i'r disg meddal, methu gosod dyfais %s"
 
-#: partition_table.pm:393
+#: partition_table.pm:397
 #, c-format
 msgid "mount failed: "
 msgstr "maethodd y gosodiad"
 
-#: partition_table.pm:498
+#: partition_table.pm:502
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Nid yw'r rhaniad estynedig yn cael ei gynnal ar y platfform hwn"
 
-#: partition_table.pm:516
+#: partition_table.pm:520
 #, c-format
 msgid ""
-"You have a hole in your partition table but I can't use it.\n"
+"You have a hole in your partition table but I can not use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions."
 msgstr ""
@@ -11019,22 +11313,22 @@ msgstr ""
 "Yr unig ateb yw i symud eich rhaniadau cynradd fel bo'r twll nesaf at y "
 "rhaniadau estynedig "
 
-#: partition_table.pm:602
+#: partition_table.pm:611
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Methodd adfer o ffeil %s: %s"
 
-#: partition_table.pm:604
+#: partition_table.pm:613
 #, c-format
 msgid "Bad backup file"
 msgstr "Ffeil wrth gefn gwallus"
 
-#: partition_table.pm:624
+#: partition_table.pm:633
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Gwall wrth ysgrifennu i ffeil %s"
 
-#: partition_table/raw.pm:238
+#: partition_table/raw.pm:240
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11081,7 +11375,7 @@ msgstr "(ar %s)"
 msgid "(on this machine)"
 msgstr "(ar y peiriant hwn)"
 
-#: printer/cups.pm:115 standalone/printerdrake:203
+#: printer/cups.pm:115 standalone/printerdrake:187
 #, c-format
 msgid "Configured on other machines"
 msgstr "Ffurfweddu ar beiriannau eraill"
@@ -11091,60 +11385,60 @@ msgstr "Ffurfweddu ar beiriannau eraill"
 msgid "On CUPS server \"%s\""
 msgstr "Ar weinydd CUPS \"%s\""
 
-#: printer/cups.pm:117 printer/printerdrake.pm:4290
-#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
-#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
+#: printer/cups.pm:117 printer/printerdrake.pm:4650
+#: printer/printerdrake.pm:4660 printer/printerdrake.pm:4805
+#: printer/printerdrake.pm:4816 printer/printerdrake.pm:5011
 #, c-format
 msgid " (Default)"
 msgstr "(Rhagosodedig)"
 
-#: printer/data.pm:40
+#: printer/data.pm:56
 #, c-format
-msgid "PDQ - Print, Don't Queue"
-msgstr "PDQ - Print, Don't Queue"
+msgid "PDQ - Print, Do not Queue"
+msgstr "PDQ - Print, Do not Queue"
 
-#: printer/data.pm:41
+#: printer/data.pm:57
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:53
+#: printer/data.pm:69
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - Line Printer Daemon"
 
-#: printer/data.pm:54
+#: printer/data.pm:70
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:76
+#: printer/data.pm:91
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR New Generation"
 
-#: printer/data.pm:77
+#: printer/data.pm:92
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:103
+#: printer/data.pm:117
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Common Unix Printing System"
 
-#: printer/data.pm:132
+#: printer/data.pm:147
 #, c-format
 msgid "CUPS - Common Unix Printing System (remote server)"
 msgstr "CUPS - Common Unix Printing System (gweinydd pell)"
 
-#: printer/data.pm:133
+#: printer/data.pm:148
 #, c-format
 msgid "Remote CUPS"
 msgstr "CUPS pell"
 
-#: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466
+#: printer/detect.pm:153 printer/detect.pm:236 printer/detect.pm:438
+#: printer/detect.pm:475
 #, c-format
 msgid "Unknown Model"
 msgstr "Model anhysbys"
@@ -11164,7 +11458,7 @@ msgstr "Argraffydd pell"
 msgid "Printer on remote CUPS server"
 msgstr "Argraffydd ar weinydd CUPS pell"
 
-#: printer/main.pm:30 printer/printerdrake.pm:1521
+#: printer/main.pm:30 printer/printerdrake.pm:1628
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "Argraffydd ar weinydd lpd pell"
@@ -11184,7 +11478,7 @@ msgstr "Argraffydd ar weinydd SMB/Windows 95/98/NT"
 msgid "Printer on NetWare server"
 msgstr "Argraffydd ar weinydd NetWare"
 
-#: printer/main.pm:34 printer/printerdrake.pm:1525
+#: printer/main.pm:34 printer/printerdrake.pm:1632
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "Rhowch URI dyfais argraffydd"
@@ -11194,195 +11488,241 @@ msgstr "Rhowch URI dyfais argraffydd"
 msgid "Pipe job into a command"
 msgstr "Peipio'r gwaith i orchymyn"
 
-#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
-#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
-#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
+#. Translation of the "(recommended)" in printer driver entries
+#: printer/main.pm:45
+#, c-format
+msgid "recommended"
+msgstr "argymhellir"
+
+#: printer/main.pm:324 printer/main.pm:629 printer/main.pm:1664
+#: printer/main.pm:2699 printer/main.pm:2708 printer/printerdrake.pm:903
+#: printer/printerdrake.pm:2094 printer/printerdrake.pm:5048
 #, c-format
 msgid "Unknown model"
 msgstr "Model anhysbys"
 
-#: printer/main.pm:346 standalone/printerdrake:202
+#: printer/main.pm:349 standalone/printerdrake:186
 #, c-format
 msgid "Configured on this machine"
 msgstr "Ffurfweddwyd ar y peiriant hwn"
 
-#: printer/main.pm:352 printer/printerdrake.pm:1069
+#: printer/main.pm:355 printer/printerdrake.pm:1175
 #, c-format
 msgid " on parallel port #%s"
 msgstr " ar borth paralel #\"%s"
 
-#: printer/main.pm:355 printer/printerdrake.pm:1072
+#: printer/main.pm:358 printer/printerdrake.pm:1178
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", argraffydd USB #\"%s"
 
-#: printer/main.pm:357
+#: printer/main.pm:360
 #, c-format
 msgid ", USB printer"
-msgstr "argraffydd USB"
+msgstr ", argraffydd USB"
+
+#: printer/main.pm:364
+#, c-format
+msgid ", HP printer on a parallel port"
+msgstr ". Argraffydd HP ar borth paralel"
+
+#: printer/main.pm:366
+#, c-format
+msgid ", HP printer on USB"
+msgstr ", Argraffydd HP ar USB"
+
+#: printer/main.pm:368
+#, c-format
+msgid ", HP printer on HP JetDirect"
+msgstr ", Argraffydd HP ar HP JetDirect"
 
-#: printer/main.pm:362
+#: printer/main.pm:370
+#, c-format
+msgid ", HP printer"
+msgstr ", Argraffydd HP"
+
+#: printer/main.pm:376
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", dyfais amlbwrpas ar borth paralel #\"%s"
 
-#: printer/main.pm:365
+#: printer/main.pm:379
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", dyfais amlbwrpas ar borth paralel"
 
-#: printer/main.pm:367
+#: printer/main.pm:381
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", dyfais amlbwrpas ar USB"
 
-#: printer/main.pm:369
+#: printer/main.pm:383
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", dyfais amlbwrpas ar HP JetDirect"
 
-#: printer/main.pm:371
+#: printer/main.pm:385
 #, c-format
 msgid ", multi-function device"
 msgstr ",dyfais amlbwrpas"
 
-#: printer/main.pm:375
+#: printer/main.pm:389
 #, c-format
 msgid ", printing to %s"
 msgstr ", argraffu i %s"
 
-#: printer/main.pm:378
+#: printer/main.pm:392
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr "ar weinydd LPD  \"%s\", argraffydd \"%s\""
 
-#: printer/main.pm:381
+#: printer/main.pm:395
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", gwesteiwr TCP/IP  \"%s\", porth %s"
 
-#: printer/main.pm:386
+#: printer/main.pm:400
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr "ar weinydd SMB/Windows  \"%s\", rhannu \"%s\""
 
-#: printer/main.pm:391
+#: printer/main.pm:405
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr "ar weinydd Novell \"%s\", argraffydd \"%s\""
 
-#: printer/main.pm:394
+#: printer/main.pm:408
 #, c-format
 msgid ", using command %s"
 msgstr ", defnyddio gorchymyn %s"
 
-#: printer/main.pm:409
+#: printer/main.pm:423
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Porth paralel #\"%s"
 
-#: printer/main.pm:412 printer/printerdrake.pm:1090
-#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
+#: printer/main.pm:426 printer/printerdrake.pm:1196
+#: printer/printerdrake.pm:1223 printer/printerdrake.pm:1241
 #, c-format
 msgid "USB printer #%s"
 msgstr "Argraffydd USB #\"%s"
 
-#: printer/main.pm:414
+#: printer/main.pm:428
 #, c-format
 msgid "USB printer"
-msgstr "argraffydd USB"
+msgstr "Argraffydd USB"
+
+#: printer/main.pm:432
+#, c-format
+msgid "HP printer on a parallel port"
+msgstr "Argraffydd HP ar borth paralel"
 
-#: printer/main.pm:419
+#: printer/main.pm:434
+#, c-format
+msgid "HP printer on USB"
+msgstr "Argraffydd HP ar USB"
+
+#: printer/main.pm:436
+#, c-format
+msgid "HP printer on HP JetDirect"
+msgstr "Argraffydd HP ar HP JetDirect"
+
+#: printer/main.pm:438
+#, c-format
+msgid "HP printer"
+msgstr "Argraffydd HP"
+
+#: printer/main.pm:444
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Dyfais amlbwrpas ar borth paralel #\"%s"
 
-#: printer/main.pm:422
+#: printer/main.pm:447
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Dyfais amlbwrpas ar borth paralel"
 
-#: printer/main.pm:424
+#: printer/main.pm:449
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Dyfais amlbwrpas ar USB"
 
-#: printer/main.pm:426
+#: printer/main.pm:451
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Dyfais amlbwrpas ar HP JetDirect"
 
-#: printer/main.pm:428
+#: printer/main.pm:453
 #, c-format
 msgid "Multi-function device"
 msgstr "Dyfais amlbwrpas"
 
-#: printer/main.pm:432
+#: printer/main.pm:457
 #, c-format
 msgid "Prints into %s"
 msgstr "Argraffu i %s"
 
-#: printer/main.pm:435
+#: printer/main.pm:460
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "Gweinydd LPD  \"%s\", argraffydd \"%s\""
 
-#: printer/main.pm:438
+#: printer/main.pm:463
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "Gwesteiwr TCP/IP  \"%s\", porth %s"
 
-#: printer/main.pm:443
+#: printer/main.pm:468
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "Gweinydd SMB/Windows  \"%s\", rhannu \"%s\""
 
-#: printer/main.pm:448
+#: printer/main.pm:473
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Gweinydd Novell \"%s\", argraffydd \"%s\""
 
-#: printer/main.pm:451
+#: printer/main.pm:476
 #, c-format
 msgid "Uses command %s"
 msgstr "Defnyddio gorchymyn %s"
 
-#: printer/main.pm:453
+#: printer/main.pm:478
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:601 printer/printerdrake.pm:820
-#: printer/printerdrake.pm:2584
+#: printer/main.pm:626 printer/printerdrake.pm:849
+#: printer/printerdrake.pm:2861
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "Argraffydd crai (dim gyrrwr)"
 
-#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/main.pm:1176 printer/printerdrake.pm:205
 #: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr "Rhwydwaith(iau) lleol "
 
-#: printer/main.pm:1149 printer/printerdrake.pm:221
+#: printer/main.pm:1178 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Rhyngwyneb \"%s\""
 
-#: printer/main.pm:1151
+#: printer/main.pm:1180
 #, c-format
 msgid "Network %s"
 msgstr "Rhwydwaith %s"
 
-#: printer/main.pm:1153
+#: printer/main.pm:1182
 #, c-format
 msgid "Host %s"
 msgstr "Gwesteiwr %s"
 
-#: printer/main.pm:1182
+#: printer/main.pm:1211
 #, c-format
 msgid "%s (Port %s)"
-msgstr "%s(Porth %s)"
+msgstr "%s (Porth %s)"
 
 #: printer/printerdrake.pm:19
 #, c-format
@@ -11397,7 +11737,7 @@ msgid ""
 msgstr ""
 "Mae'r HP LaserJet 1000 angen cael ei gadarnwedd wedi ei lwytho i fyny ar ôl "
 "ei gychwyn. Estynnwch y pecyn gyrrwr Windows o safle gwe HP (nid yw'r "
-"gadarnwedd ar CD'r argraffydd yn gweithio) a thynnwch y ffeil cadarnwedd "
+"gadarnwedd ar CD yr argraffydd yn gweithio) a thynnwch y ffeil cadarnwedd "
 "ohono gan ddatgywasgu 'r ffeil 'exe' gyda rhaglen 'datgywasgu' a chwilio am "
 "y ffeil 'sihp1000.img'. Copïo'r ffeil i gyfeiriadur '/etc/printer'. Yna bydd "
 "yn cael ei ganfod gan y sgript llwytho awtomatig a'i lwytho pryd bynnag fydd "
@@ -11446,8 +11786,8 @@ msgstr "Rhannu argraffydd ar westeiwr/rhwydwaith:"
 msgid "Custom configuration"
 msgstr "Ffurfweddiad addasu"
 
-#: printer/printerdrake.pm:83 standalone/scannerdrake:562
-#: standalone/scannerdrake:579
+#: printer/printerdrake.pm:83 standalone/scannerdrake:593
+#: standalone/scannerdrake:610
 #, c-format
 msgid "No remote machines"
 msgstr "Dim cyfrifiaduron pell"
@@ -11481,7 +11821,7 @@ msgstr ""
 #: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
-msgstr "Modd argraffu testun Siapanaeëg"
+msgstr "Modd argraffu testun Siapanëeg"
 
 #: printer/printerdrake.pm:110
 #, c-format
@@ -11495,13 +11835,13 @@ msgid ""
 "activate this function on that remote machine."
 msgstr ""
 "Drwy gychwyn hwn bydd yn caniatáu argraffu testun plaen yn yr iaith "
-"Siapanaeëg. Defnyddiwch hwn os ydych wir angen argraffu testun yn "
-"Siapanaeëg, oherwydd os ydych yn ei ddefnyddio ni fydd modd argraffu nodau "
-"acennog mewn ffontiau Lladin ragor ac ni fydd modd newid ymyl tudalen na "
-"maint ffontiau, ag ati. Mae hyn yn effeithio ar argraffyddion sydd wedi eu "
-"diffinio ar y cyfrifiadur hwn. Os ydych am argraffu testun Siapanaeëg ar "
-"argraffydd sy'n gysylltiedig â chyfrifiadur pell, bydd angen cychwyn y "
-"nodwedd ar y cyfrifiadur hwnnw."
+"Siapanëeg. Defnyddiwch hwn os ydych wir angen argraffu testun yn Siapanëeg, "
+"oherwydd os ydych yn ei ddefnyddio ni fydd modd argraffu nodau acennog mewn "
+"ffontiau Lladin ragor ac ni fydd modd newid ymyl tudalen na maint ffontiau, "
+"ag ati. Mae hyn yn effeithio ar argraffyddion sydd wedi eu diffinio ar y "
+"cyfrifiadur hwn. Os ydych am argraffu testun Siapanëeg ar argraffydd sy'n "
+"gysylltiedig â chyfrifiadur pell, bydd angen cychwyn y nodwedd ar y "
+"cyfrifiadur hwnnw."
 
 #: printer/printerdrake.pm:117
 #, c-format
@@ -11524,7 +11864,7 @@ msgid ""
 "If some of these measures lead to problems for you, turn this option off, "
 "but then you have to take care of these points."
 msgstr ""
-"Pan mae'r dewis yma ar gael, gwneud yn siwr wrth gychwyn CUPS fod\n"
+"Pan mae'r dewis yma ar gael, gwneud yn siŵr wrth gychwyn CUPS fod\n"
 "\n"
 "- os yw LPD/LPRng wedi ei osod, na fydd CUPS yn ysgrifennu dros /etc/"
 "printcap\n"
@@ -11538,21 +11878,21 @@ msgstr ""
 "rhaid i chi ofalu amdanynt."
 
 #: printer/printerdrake.pm:132 printer/printerdrake.pm:500
-#: printer/printerdrake.pm:3933
+#: printer/printerdrake.pm:4292
 #, c-format
 msgid "Remote CUPS server and no local CUPS daemon"
-msgstr ""
+msgstr "Gweinydd CUPS pell a dim daemon CUPS lleol"
 
 #: printer/printerdrake.pm:135
-#, fuzzy, c-format
+#, c-format
 msgid "On"
-msgstr "Oman"
+msgstr "Ymlaen"
 
 #: printer/printerdrake.pm:137 printer/printerdrake.pm:492
 #: printer/printerdrake.pm:519
-#, fuzzy, c-format
+#, c-format
 msgid "Off"
-msgstr "diffodd "
+msgstr "Diffodd "
 
 #: printer/printerdrake.pm:138 printer/printerdrake.pm:501
 #, c-format
@@ -11562,6 +11902,10 @@ msgid ""
 "define local print queues then and if the specified server is down it cannot "
 "be printed at all from this machine."
 msgstr ""
+"Yn y modd hwn bydd y daemon CUPS lleol yn cael ei atal a bydd yr holl "
+"geisiadau argraffu'n mynd yn syth i'r gweinydd enwyd isod. Sylwch na fydd yn "
+"bosib diffinio rhesi argraffu lleol ac os bydd y gweinydd hwnnw i lawr nid "
+"oes modd ei argraffu o'r peiriant hwn."
 
 #: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
@@ -11684,7 +12028,7 @@ msgstr "IP'r gweinydd ar goll!"
 msgid "The entered IP is not correct.\n"
 msgstr "Nid yw'r IP'n gywir.\n"
 
-#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1852
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "Dylai rhif porth fod yn gyfanrif!"
@@ -11695,8 +12039,8 @@ msgid "This server is already in the list, it cannot be added again.\n"
 msgstr ""
 "Mae'r gwesteiwr ar y rhestr yn barod, does dim modd ei ychwanegu eto.\n"
 
-#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
-#: standalone/drakups:247 standalone/harddrake2:47
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1873
+#: standalone/drakups:247 standalone/harddrake2:50
 #, c-format
 msgid "Port"
 msgstr "Porth"
@@ -11704,44 +12048,45 @@ msgstr "Porth"
 #: printer/printerdrake.pm:489 printer/printerdrake.pm:505
 #: printer/printerdrake.pm:520 printer/printerdrake.pm:524
 #: printer/printerdrake.pm:530
-#, fuzzy, c-format
+#, c-format
 msgid "On, Name or IP of remote server:"
-msgstr "Argraffydd ar weinydd lpd pell"
+msgstr "mlaen, Enw neu IP gweinydd pell"
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
-#: printer/printerdrake.pm:4007
-#, fuzzy, c-format
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366
+#, c-format
 msgid "CUPS server name or IP address missing."
-msgstr "Cyfeiriad y gwesteiwr/rhwydwaith ar goll."
+msgstr "Mae enw gweinydd CUPS neu gyfeiriad IP ar goll."
 
 #: printer/printerdrake.pm:560 printer/printerdrake.pm:580
-#: printer/printerdrake.pm:649 printer/printerdrake.pm:714
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:796
-#: printer/printerdrake.pm:838 printer/printerdrake.pm:848
-#: printer/printerdrake.pm:1818 printer/printerdrake.pm:2004
-#: printer/printerdrake.pm:2021 printer/printerdrake.pm:2064
-#: printer/printerdrake.pm:2104 printer/printerdrake.pm:2147
-#: printer/printerdrake.pm:2184 printer/printerdrake.pm:2194
-#: printer/printerdrake.pm:2437 printer/printerdrake.pm:2442
-#: printer/printerdrake.pm:2579 printer/printerdrake.pm:2689
-#: printer/printerdrake.pm:3247 printer/printerdrake.pm:3312
-#: printer/printerdrake.pm:3361 printer/printerdrake.pm:3364
-#: printer/printerdrake.pm:3484 printer/printerdrake.pm:3549
-#: printer/printerdrake.pm:3621 printer/printerdrake.pm:3642
-#: printer/printerdrake.pm:3651 printer/printerdrake.pm:3745
-#: printer/printerdrake.pm:3837 printer/printerdrake.pm:3843
-#: printer/printerdrake.pm:3863 printer/printerdrake.pm:3969
-#: printer/printerdrake.pm:4076 printer/printerdrake.pm:4095
-#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4117
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4749
-#: printer/printerdrake.pm:4826 standalone/printerdrake:64
-#: standalone/printerdrake:84 standalone/printerdrake:566
+#: printer/printerdrake.pm:673 printer/printerdrake.pm:739
+#: printer/printerdrake.pm:766 printer/printerdrake.pm:825
+#: printer/printerdrake.pm:867 printer/printerdrake.pm:877
+#: printer/printerdrake.pm:1926 printer/printerdrake.pm:2137
+#: printer/printerdrake.pm:2169 printer/printerdrake.pm:2217
+#: printer/printerdrake.pm:2269 printer/printerdrake.pm:2286
+#: printer/printerdrake.pm:2330 printer/printerdrake.pm:2370
+#: printer/printerdrake.pm:2420 printer/printerdrake.pm:2454
+#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2714
+#: printer/printerdrake.pm:2719 printer/printerdrake.pm:2856
+#: printer/printerdrake.pm:2966 printer/printerdrake.pm:3560
+#: printer/printerdrake.pm:3625 printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3677 printer/printerdrake.pm:3808
+#: printer/printerdrake.pm:3908 printer/printerdrake.pm:3980
+#: printer/printerdrake.pm:4001 printer/printerdrake.pm:4010
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4196
+#: printer/printerdrake.pm:4202 printer/printerdrake.pm:4222
+#: printer/printerdrake.pm:4328 printer/printerdrake.pm:4435
+#: printer/printerdrake.pm:4454 printer/printerdrake.pm:4463
+#: printer/printerdrake.pm:4477 printer/printerdrake.pm:4673
+#: printer/printerdrake.pm:5109 printer/printerdrake.pm:5186
+#: standalone/printerdrake:67 standalone/printerdrake:554
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
-#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
-#: printer/printerdrake.pm:4077
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3909
+#: printer/printerdrake.pm:4436
 #, c-format
 msgid "Reading printer data..."
 msgstr "Darllen data argraffydd..."
@@ -11749,19 +12094,19 @@ msgstr "Darllen data argraffydd..."
 #: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
-msgstr "Ail gychwynCUPS"
+msgstr "Ail gychwyn CUPS"
 
-#: printer/printerdrake.pm:606
+#: printer/printerdrake.pm:608 printer/printerdrake.pm:628
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Dewiswch Gysylltiad Argraffydd"
 
-#: printer/printerdrake.pm:607
+#: printer/printerdrake.pm:609
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Sut mae'r argraffydd wedi ei gysylltu?"
 
-#: printer/printerdrake.pm:609
+#: printer/printerdrake.pm:611
 #, c-format
 msgid ""
 "\n"
@@ -11772,7 +12117,7 @@ msgstr ""
 "Nid oes angen ffurfweddu argraffyddion ar weinyddion CUPS pell: byddant yn "
 "cael eu canfod yn awtomatig."
 
-#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
+#: printer/printerdrake.pm:614 printer/printerdrake.pm:4675
 #, c-format
 msgid ""
 "\n"
@@ -11783,29 +12128,55 @@ msgstr ""
 "RHYBUDD: Nid oes cyswllt rhwydwaith lleol yn weithredol, nid oes modd canfod "
 "na phrofi argraffyddion pell!"
 
-#: printer/printerdrake.pm:619
+#: printer/printerdrake.pm:621
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
 msgstr ""
-"Awtoganfod argraffydd (Argraffyddion lleol, TCP/Socket, SMB, a URL dyfais)"
+"Awtoganfod argraffydd (Argraffyddion lleol, TCP/Socket, SMB, ac URL dyfais)"
+
+#: printer/printerdrake.pm:623
+#, c-format
+msgid "Modify timeout for network printer auto-detection"
+msgstr "Newid amser allan ar gyfer awtoganfod argraffyddion rhwydwaith "
+
+#: printer/printerdrake.pm:629
+#, c-format
+msgid "Enter the timeout for network printer auto-detection (in msec) here. "
+msgstr "Newid amser allan ar gyfer awtoganfod argraffyddion rhwydwaith "
+
+#: printer/printerdrake.pm:631
+#, c-format
+msgid ""
+"The longer you choose the timeout, the more reliable the detections of "
+"network printers will be, but the scan can take longer then, especially if "
+"there are many machines with local firewalls in the network. "
+msgstr ""
+"Yr hira bo'r amser allan, y mwyaf dibynadwy fydd canfod yr argraffyddion "
+"rhwydwaith, ond gall y canfod cymryd mwy o amser, yn arbennig os oes yna "
+"lawer o furiau cadarn lleol yn y rhwydwaith."
 
-#: printer/printerdrake.pm:649
+#: printer/printerdrake.pm:635
+#, c-format
+msgid "The timeout must be a positive integer number!"
+msgstr "Rhaid i'r amser allan fod yn rif cyfanrif positif!"
+
+#: printer/printerdrake.pm:673
 #, c-format
 msgid "Checking your system..."
 msgstr "Gwirio eich system..."
 
-#: printer/printerdrake.pm:665
+#: printer/printerdrake.pm:690
 #, c-format
 msgid "and one unknown printer"
 msgstr "ac un argraffydd anhysbys"
 
-#: printer/printerdrake.pm:667
+#: printer/printerdrake.pm:692
 #, c-format
 msgid "and %d unknown printers"
 msgstr "a %d argraffydd anhysbys"
 
-#: printer/printerdrake.pm:671
+#: printer/printerdrake.pm:696
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11818,7 +12189,7 @@ msgstr ""
 "%s%s\n"
 "wedi eu cysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:673
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11831,7 +12202,7 @@ msgstr ""
 "%s%s\n"
 "wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:674
+#: printer/printerdrake.pm:699
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11844,7 +12215,7 @@ msgstr ""
 "%s%s\n"
 "wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:678
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "\n"
@@ -11853,7 +12224,7 @@ msgstr ""
 "\n"
 "Mae un argraffydd anhysbys wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:679
+#: printer/printerdrake.pm:704
 #, c-format
 msgid ""
 "\n"
@@ -11862,7 +12233,7 @@ msgstr ""
 "\n"
 "Mae yna %d argraffydd anhysbys wedi eu cysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:682
+#: printer/printerdrake.pm:707
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
@@ -11870,37 +12241,37 @@ msgstr ""
 "Nid oes unrhyw argraffydd wedi ei ganfod wedi ei gysylltu'n uniongyrchol "
 "â'ch cyfrifiadur"
 
-#: printer/printerdrake.pm:685
+#: printer/printerdrake.pm:710
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr ""
-"(Gwnewch yn siwr bod eich argraffyddion wedi eu cysylltu â'u troi ymlaen).\n"
+"(Gwnewch yn siŵr bod eich argraffyddion wedi eu cysylltu â'u troi ymlaen).\n"
 
-#: printer/printerdrake.pm:698
+#: printer/printerdrake.pm:723
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
 "printers in the local network?\n"
 msgstr ""
-"Ydych chi am caniatáu argraffu ar yr argraffyddion enwir uchod neu ar yr "
+"Ydych chi am ganiatáu argraffu ar yr argraffyddion enwir uchod neu ar yr "
 "argraffyddion ar y rhwydwaith lleol?\n"
 
-#: printer/printerdrake.pm:699
+#: printer/printerdrake.pm:724
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "Ydych chi am alluogi argraffu ar argraffydd mewn rhwydwaith lleol?\n"
 
-#: printer/printerdrake.pm:701
+#: printer/printerdrake.pm:726
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "Ydych chi am alluogi argraffu ar yr argraffyddion enwi'r uchod?\n"
 
-#: printer/printerdrake.pm:702
+#: printer/printerdrake.pm:727
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
-msgstr "Ydych chi'n siwr eich bod am osod argraffu ar y peiriant hwn?\n"
+msgstr "Ydych chi'n siŵr eich bod am osod argraffu ar y peiriant hwn?\n"
 
-#: printer/printerdrake.pm:703
+#: printer/printerdrake.pm:728
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11909,42 +12280,42 @@ msgstr ""
 "NODYN: Yn dibynnu ar yr argraffydd a'r system argraffu bydd hyd at %d MB o "
 "feddalwedd ychwanegol yn cael ei osod."
 
-#: printer/printerdrake.pm:742
+#: printer/printerdrake.pm:767
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Chwilio am argraffyddion newydd..."
 
-#: printer/printerdrake.pm:797
+#: printer/printerdrake.pm:826
 #, c-format
 msgid "Found printer on %s..."
 msgstr "Wedi canfod argraffydd ar %s..."
 
-#: printer/printerdrake.pm:822
+#: printer/printerdrake.pm:851
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:823
+#: printer/printerdrake.pm:852
 #, c-format
 msgid " on "
 msgstr "ar "
 
-#: printer/printerdrake.pm:824 standalone/scannerdrake:137
+#: printer/printerdrake.pm:853 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
+#: printer/printerdrake.pm:858 printer/printerdrake.pm:2868
 #, c-format
 msgid "Printer model selection"
 msgstr "Dewis model yr argraffydd"
 
-#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
+#: printer/printerdrake.pm:859 printer/printerdrake.pm:2869
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "Pa fath o argraffydd sydd gennych?"
 
-#: printer/printerdrake.pm:831
+#: printer/printerdrake.pm:860
 #, c-format
 msgid ""
 "\n"
@@ -11957,7 +12328,7 @@ msgstr ""
 "Nid oedd Printerdrake yn gallu adnabod eich argraffydd %s. Dewiswch yr un "
 "cywir o'r rhestr."
 
-#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:863 printer/printerdrake.pm:2874
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -11966,24 +12337,25 @@ msgstr ""
 "Nid yw eich argraffydd wedi ei rhestri, dewiswch un cyfatebol (gw. llawlyfr "
 "eich argraffydd) neu un tebyg."
 
-#: printer/printerdrake.pm:839
+#: printer/printerdrake.pm:868
 #, c-format
 msgid "Configuring printer on %s..."
 msgstr "Ffurfweddu argraffydd ar %s ..."
 
-#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#: printer/printerdrake.pm:878 printer/printerdrake.pm:4455
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "Ffurfweddu argraffydd \"%s\" ..."
 
-#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
+#: printer/printerdrake.pm:1036 printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1107 printer/printerdrake.pm:2103
+#: printer/printerdrake.pm:2118 printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4861
 #, c-format
 msgid "Add a new printer"
 msgstr "Ychwanegu argraffydd newydd"
 
-#: printer/printerdrake.pm:933
+#: printer/printerdrake.pm:1037
 #, c-format
 msgid ""
 "\n"
@@ -12007,7 +12379,7 @@ msgstr ""
 "yn rhoi mynediad i'r holl yrwyr argraffyddion sydd ar gael, dewisiadau "
 "gyrwyr a mathau o gysylltiadau argraffyddion."
 
-#: printer/printerdrake.pm:946
+#: printer/printerdrake.pm:1050
 #, c-format
 msgid ""
 "\n"
@@ -12022,8 +12394,8 @@ msgid ""
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-"
 "detection of only the printers connected to this machine. So turn off the "
-"auto-detection of network and/or Windows-hosted printers when you don't need "
-"it.\n"
+"auto-detection of network and/or Windows-hosted printers when you do not "
+"need it.\n"
 "\n"
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
 "to set up your printer(s) now."
@@ -12047,7 +12419,7 @@ msgstr ""
 "Cliciwch \"Nesaf\" pan ydych yn barod, a \"Diddymu\" os nad ydych am osod "
 "eich argraffydd(ion) ar hyn o bryd."
 
-#: printer/printerdrake.pm:955
+#: printer/printerdrake.pm:1059
 #, c-format
 msgid ""
 "\n"
@@ -12074,7 +12446,7 @@ msgstr ""
 "Cliciwch \"Nesaf\" pan ydych yn barod, a \"Diddymu\" os nad ydych am osod "
 "eich argraffydd(ion) ar hyn o bryd."
 
-#: printer/printerdrake.pm:963
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid ""
 "\n"
@@ -12089,7 +12461,7 @@ msgid ""
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-"
 "detection of only the printers connected to this machine. So turn off the "
-"auto-detection of network printers when you don't need it.\n"
+"auto-detection of network printers when you do not need it.\n"
 "\n"
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
 "to set up your printer(s) now."
@@ -12112,7 +12484,7 @@ msgstr ""
 "Cliciwch \"Nesaf\" pan ydych yn barod, a \"Diddymu\" os nad ydych am osod "
 "eich argraffydd(ion) ar hyn o bryd."
 
-#: printer/printerdrake.pm:972
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid ""
 "\n"
@@ -12139,26 +12511,26 @@ msgstr ""
 "Cliciwch \"Nesaf\" pan ydych yn barod, a \"Diddymu\" os nad ydych am osod "
 "eich argraffydd(ion) ar hyn o bryd."
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Auto-detect printers connected to this machine"
-msgstr "Awto ganfod argraffyddion sy'n gysylltiedig a'r peiriant hwn"
+msgstr "Awto ganfod argraffyddion sy'n gysylltiedig â'r peiriant hwn"
 
-#: printer/printerdrake.pm:984
+#: printer/printerdrake.pm:1088
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr ""
 "Awtoganfod argraffyddion sy'n gysylltiedig yn uniongyrchol â'r rhwydwaith "
 "lleol"
 
-#: printer/printerdrake.pm:987
+#: printer/printerdrake.pm:1091
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Awtoganfod argraffyddion sy'n gysylltiedig â pheiriannau'n rhedeg Microsoft "
 "Windows"
 
-#: printer/printerdrake.pm:1003
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid ""
 "\n"
@@ -12178,73 +12550,74 @@ msgstr ""
 "rheol yn newislen \"Ffeil\").\n"
 "\n"
 "Os ydych am ychwanegu, tynnu neu ailenwi argraffydd, neu os ydych am newid y "
-"gosodiadau dewis rhagosodedig (mewnflwch papur, ansawdd y printiad,...), "
+"gosodiadau dewis rhagosodedig (mewnflwch papur, ansawdd yr argraffu...), "
 "dewiswch \"Argraffydd\" yn adran \"Caledwedd\" Canolfan Rheoli %s."
 
-#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
-#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
-#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
-#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
-#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
-#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
-#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
+#: printer/printerdrake.pm:1143 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1435 printer/printerdrake.pm:1525
+#: printer/printerdrake.pm:1663 printer/printerdrake.pm:1738
+#: printer/printerdrake.pm:1890 printer/printerdrake.pm:1976
+#: printer/printerdrake.pm:1985 printer/printerdrake.pm:1994
+#: printer/printerdrake.pm:2005 printer/printerdrake.pm:2143
+#: printer/printerdrake.pm:2229 printer/printerdrake.pm:2275
+#: printer/printerdrake.pm:2342 printer/printerdrake.pm:2377
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "Methu gosod pecynnau: %s!"
 
-#: printer/printerdrake.pm:1040
+#: printer/printerdrake.pm:1145
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Osgoi awto ganfod gweinydd Windows/SMB"
 
-#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
-#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
+#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1296
+#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Awto ganfod argraffydd"
 
-#: printer/printerdrake.pm:1046
+#: printer/printerdrake.pm:1151
 #, c-format
 msgid "Detecting devices..."
 msgstr "Canfod dyfeisiau..."
 
-#: printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1181
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", rhwydwaith argraffu \"%s\", porth %s"
 
-#: printer/printerdrake.pm:1078
+#: printer/printerdrake.pm:1184
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", argraffydd \"%s\" ar weinydd  SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1082
+#: printer/printerdrake.pm:1188
 #, c-format
 msgid "Detected %s"
-msgstr "Canfyddwyd %s"
+msgstr "Canfuwyd %s"
 
-#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1132
+#: printer/printerdrake.pm:1193 printer/printerdrake.pm:1220
+#: printer/printerdrake.pm:1238
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "Argraffydd ar borth paralel #\"%s"
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Argraffydd rhwydwaith \"%s\", porth %s"
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1202
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Argraffydd  \"%s\" ar weinydd SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1177
+#: printer/printerdrake.pm:1283
 #, c-format
 msgid "Local Printer"
 msgstr "Argraffydd Lleol"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1284
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12257,32 +12630,32 @@ msgstr ""
 "dev/,...., cyfatebol i LPT1:, LPT2,..., argraffydd USB 1af: /dev/usb/lp0,  "
 "ail argraffydd USB: /dev/usb/lp1,...)."
 
-#: printer/printerdrake.pm:1182
+#: printer/printerdrake.pm:1288
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Rhaid cynnig enw dyfais neu ffeil!"
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1297
 #, c-format
 msgid "No printer found!"
 msgstr "Heb ganfod argraffydd!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid "Local Printers"
 msgstr "Argraffyddion Lleol"
 
-#: printer/printerdrake.pm:1200
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Available printers"
 msgstr "Argraffyddion ar gael"
 
-#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1319
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "Mae'r argraffydd canlynol wedi ei awtoganfod"
 
-#: printer/printerdrake.pm:1206
+#: printer/printerdrake.pm:1312
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -12291,18 +12664,18 @@ msgstr ""
 "Os nad hwn yw'r un rydych am ei ffurfweddu, rhowch enw dyfais/enw ffeil ar y "
 "llinell mewnbwn."
 
-#: printer/printerdrake.pm:1207
+#: printer/printerdrake.pm:1313
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "Yn lle hynny, rhowch enw dyfais/ffeil ar y llinell mewnbwn"
 
-#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
+#: printer/printerdrake.pm:1314 printer/printerdrake.pm:1323
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "Dyma restr o argraffyddion wedi eu awtoganfod."
 
-#: printer/printerdrake.pm:1210
+#: printer/printerdrake.pm:1316
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -12311,7 +12684,7 @@ msgstr ""
 "Dewiswch yr argraffydd i'w osod neu rhowch enw dyfais/ffeil ar y llinell "
 "mewnbwn"
 
-#: printer/printerdrake.pm:1211
+#: printer/printerdrake.pm:1317
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -12320,7 +12693,7 @@ msgstr ""
 "Dewiswch yr argraffydd i drin y gwaith argraffu neu rhowch enw dyfais/ffeil "
 "ar y llinell mewnbwn"
 
-#: printer/printerdrake.pm:1215
+#: printer/printerdrake.pm:1321
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12331,12 +12704,12 @@ msgstr ""
 "argraffydd ei ganfod yn gywir neu byddai'n well gennych ffurfweddiad unigryw "
 "i'ch argraffydd, cychwynnwch \"Ffurfweddiad gyda Llaw\"."
 
-#: printer/printerdrake.pm:1216
+#: printer/printerdrake.pm:1322
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Does dim dewis arall ar gael ar hyn o bryd"
 
-#: printer/printerdrake.pm:1219
+#: printer/printerdrake.pm:1325
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12349,12 +12722,12 @@ msgstr ""
 "byddai'n well gennych ffurfweddiad unigryw i'ch argraffydd, cychwynnwch "
 "\"Ffurfweddiad gyda Llaw\"."
 
-#: printer/printerdrake.pm:1220
+#: printer/printerdrake.pm:1326
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Dewiswch yr argraffydd i drin y gwaith argraffu."
 
-#: printer/printerdrake.pm:1222
+#: printer/printerdrake.pm:1328
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -12363,12 +12736,12 @@ msgstr ""
 "Dewiswch y porth y mae eich argraffydd wedi cysylltu iddo neu rhowch enw "
 "dyfais/ffeil ar y llinell mewnbwn"
 
-#: printer/printerdrake.pm:1223
+#: printer/printerdrake.pm:1329
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Dewiswch y porth mae'r argraffydd wedi cysylltu iddo."
 
-#: printer/printerdrake.pm:1225
+#: printer/printerdrake.pm:1331
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12377,26 +12750,26 @@ msgstr ""
 " (Pyrth paralel: /dev/lp0, /dev/lp1, ..., yn cyfateb i LPT1:, LPT2:, ..., "
 "argraffydd USB cyntaf: /dev/usb/lp0, ail argraffydd USB : /dev/usb/lp1, ...)."
 
-#: printer/printerdrake.pm:1229
+#: printer/printerdrake.pm:1335
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Rhaid dewis/rhoi argraffydd/dyfais!"
 
-#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
-#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
-#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
-#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
-#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
+#: printer/printerdrake.pm:1375 printer/printerdrake.pm:1437
+#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1665
+#: printer/printerdrake.pm:1740 printer/printerdrake.pm:1892
+#: printer/printerdrake.pm:1978 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:1996 printer/printerdrake.pm:2007
 #, c-format
 msgid "Aborting"
 msgstr "Atal"
 
-#: printer/printerdrake.pm:1304
+#: printer/printerdrake.pm:1410
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Dewisiadau Argraffydd lpd Pell"
 
-#: printer/printerdrake.pm:1305
+#: printer/printerdrake.pm:1411
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -12405,63 +12778,63 @@ msgstr ""
 "I ddefnyddio argraffydd lpd pell, rhaid darparu enw gwesteiwr gweinydd yr "
 "argraffydd ac enw'r argraffydd ar y gweinydd hwnnw."
 
-#: printer/printerdrake.pm:1306
+#: printer/printerdrake.pm:1412
 #, c-format
 msgid "Remote host name"
 msgstr "Enw gwesteiwr pell"
 
-#: printer/printerdrake.pm:1307
+#: printer/printerdrake.pm:1413
 #, c-format
 msgid "Remote printer name"
 msgstr "Enw'r argraffydd pell"
 
-#: printer/printerdrake.pm:1310
+#: printer/printerdrake.pm:1416
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Mae enw'r gwesteiwr pell ar goll!"
 
-#: printer/printerdrake.pm:1314
+#: printer/printerdrake.pm:1420
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Mae enw'r argraffydd pell ar goll!"
 
-#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
-#: standalone/drakTermServ:429 standalone/drakTermServ:726
-#: standalone/drakTermServ:742 standalone/drakTermServ:1405
-#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
-#: standalone/drakbackup:513 standalone/drakbackup:619
-#: standalone/drakbackup:654 standalone/drakbackup:774
-#: standalone/harddrake2:237
+#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
+#: standalone/drakTermServ:445 standalone/drakTermServ:747
+#: standalone/drakTermServ:764 standalone/drakTermServ:1480
+#: standalone/drakTermServ:1488 standalone/drakTermServ:1500
+#: standalone/drakbackup:512 standalone/drakbackup:618
+#: standalone/drakbackup:653 standalone/drakbackup:773
+#: standalone/harddrake2:256
 #, c-format
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
 #, c-format
 msgid "Detected model: %s %s"
-msgstr "Canfyddwyd model %s %s"
+msgstr "Canfuwyd model %s %s"
 
-#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
+#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
 #, c-format
 msgid "Scanning network..."
 msgstr "Chwilio'r rhwydwaith..."
 
-#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1543 printer/printerdrake.pm:1564
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", argraffydd \"%s\" ar weinydd \"%s\""
 
-#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
+#: printer/printerdrake.pm:1546 printer/printerdrake.pm:1567
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Argraffydd \"%s\" ar weinydd \"%s\""
 
-#: printer/printerdrake.pm:1481
+#: printer/printerdrake.pm:1588
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Dewisiadau Argraffydd SMB (Windows 9x/NT)"
 
-#: printer/printerdrake.pm:1482
+#: printer/printerdrake.pm:1589
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12473,58 +12846,58 @@ msgstr ""
 "fod yn wahanol i'w enw gwesteiwr TCP/IP!) ac o bosibl cyfeiriad IP'r "
 "gweinydd argraffu, yn ogystal â'r enw rhannu ar gyfer yr argraffydd rydych "
 "am gael mynediad iddo ac unrhyw enw defnyddiwr, cyfrinair a gwybodaeth am "
-"grwp gwaith perthynol."
+"grŵp gwaith perthynol."
 
-#: printer/printerdrake.pm:1483
+#: printer/printerdrake.pm:1590
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
 "Os cafodd yr argraffydd ei awtoganfod, dewiswch ef o'r rhestr ac ychwanegu "
-"enw defnyddiwr, cyfrinair a/neu grwp gwaith yn ôl yr angen."
+"enw defnyddiwr, cyfrinair a/neu grŵp gwaith yn ôl yr angen."
 
-#: printer/printerdrake.pm:1485
+#: printer/printerdrake.pm:1592
 #, c-format
 msgid "SMB server host"
 msgstr "Gweinydd gwesteiwr SMB"
 
-#: printer/printerdrake.pm:1486
+#: printer/printerdrake.pm:1593
 #, c-format
 msgid "SMB server IP"
 msgstr "IP Gweinydd SMB"
 
-#: printer/printerdrake.pm:1487
+#: printer/printerdrake.pm:1594
 #, c-format
 msgid "Share name"
 msgstr "Rhannu enw"
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1597
 #, c-format
 msgid "Workgroup"
-msgstr "Grwp gwaith"
+msgstr "Grŵp gwaith"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1599
 #, c-format
 msgid "Auto-detected"
 msgstr "Awto ganfod"
 
-#: printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1609
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Rhaid rhoi un ai enw'r gweinydd neu IP'r gweinydd!"
 
-#: printer/printerdrake.pm:1506
+#: printer/printerdrake.pm:1613
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Mae enw rhannu Samba ar goll!"
 
-#: printer/printerdrake.pm:1512
+#: printer/printerdrake.pm:1619
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "RHYBUDD DIOGELWCH!"
 
-#: printer/printerdrake.pm:1513
+#: printer/printerdrake.pm:1620
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -12551,11 +12924,11 @@ msgstr ""
 "Oherwydd gwall ym mhensaernïaeth meddalwedd cleient Samba mae'r cyfrinair yn "
 "cael ei osod mewn testun plaen ar y llinell orchymyn y cleient Samba sy'n "
 "cael ei ddefnyddio i anfon gwaith argraffu i'r gweinydd Windows. Felly mae'n "
-"bosibl i bob defnyddiwr ar y peiriant i arddangos y cyfrinair ar y sgrîn "
+"bosibl i bob defnyddiwr ar y peiriant i arddangos y cyfrinair ar y sgrin "
 "drwy'r gorchymyn \"ps auxwww\".\n"
 "\n"
-"Rydym yn argymell eich bod yn defnyddio un o'r dulliau gwahanol hyn ( yn yr "
-"holl achosion hyn, rhaid i chi wneud yn siwr mae dim ond peiriannau o'ch "
+"Rydym yn argymell eich bod yn defnyddio un o'r dulliau gwahanol hyn (yn yr "
+"holl achosion hyn, rhaid i chi wneud yn siŵr mae dim ond peiriannau o'ch "
 "rhwydwaith lleol chi sydd â mynediad i'ch gweinydd Windows, e.e. drwy "
 "gyfrwng mur cadarn).\n"
 "\n"
@@ -12568,7 +12941,7 @@ msgstr ""
 "Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1523
+#: printer/printerdrake.pm:1630
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12580,7 +12953,7 @@ msgstr ""
 "a gosod argraffu o'r peiriant hwn gyda'r \"%s\" yn Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1526
+#: printer/printerdrake.pm:1633
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12593,12 +12966,12 @@ msgstr ""
 "\n"
 "Ydych chi am barhau i osod yr argraffydd hwn?"
 
-#: printer/printerdrake.pm:1604
+#: printer/printerdrake.pm:1711
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Dewisiadau Argraffydd NetWare"
 
-#: printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1712
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12606,47 +12979,47 @@ msgid ""
 "print queue name for the printer you wish to access and any applicable user "
 "name and password."
 msgstr ""
-"I argraffu ar argraffydd NetWare, rhaid i chi rhoi enw gweinydd argraffu "
+"I argraffu ar argraffydd NetWare, rhaid i chi roi enw gweinydd argraffu "
 "NetWare (Sylwer! Gall fod yn wahanol i'w enw gwesteiwr TCP/IP) yn ogystal "
 "â'r rhes waith argraffu am yr argraffydd rydych am gael mynediad iddo ac "
 "unrhyw enw defnyddiwr a chyfrinair perthnasol."
 
-#: printer/printerdrake.pm:1606
+#: printer/printerdrake.pm:1713
 #, c-format
 msgid "Printer Server"
 msgstr "Gweinydd Argraffydd"
 
-#: printer/printerdrake.pm:1607
+#: printer/printerdrake.pm:1714
 #, c-format
 msgid "Print Queue Name"
 msgstr "Enw Rhes Argraffu"
 
-#: printer/printerdrake.pm:1612
+#: printer/printerdrake.pm:1719
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Mae enw gweinydd NCP ar goll!"
 
-#: printer/printerdrake.pm:1616
+#: printer/printerdrake.pm:1723
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Mae enw rhes NCP ar goll"
 
-#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1797 printer/printerdrake.pm:1817
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", gwesteiwr \"%s\", porth %s"
 
-#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
+#: printer/printerdrake.pm:1800 printer/printerdrake.pm:1820
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ",Gwesteiwr  \"%s\", porth %s"
 
-#: printer/printerdrake.pm:1733
+#: printer/printerdrake.pm:1841
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Dewisiadau Argraffydd TCP/Soced"
 
-#: printer/printerdrake.pm:1735
+#: printer/printerdrake.pm:1843
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -12656,7 +13029,7 @@ msgstr ""
 "yr enw gwesteiwr neu IP a'r rhif porth dewisol (9100 yw'r rhagosodedig) i'r "
 "meysydd mewnbwn."
 
-#: printer/printerdrake.pm:1736
+#: printer/printerdrake.pm:1844
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12669,27 +13042,27 @@ msgstr ""
 "weinyddion HP JetDirect rhif y porth, fel rheol, yw 9100, gall amrywio ar "
 "weinyddion eraill. Gweler llawlyfr eich caledwedd"
 
-#: printer/printerdrake.pm:1740
+#: printer/printerdrake.pm:1848
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Mae enw'r gwesteiwr argraffu neu IP ar goll!"
 
-#: printer/printerdrake.pm:1763
+#: printer/printerdrake.pm:1871
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Enw'r gwesteiwr neu IP yr argraffydd"
 
-#: printer/printerdrake.pm:1819
+#: printer/printerdrake.pm:1927
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "Adnewyddu rhestr Dyfais URI..."
 
-#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
+#: printer/printerdrake.pm:1930 printer/printerdrake.pm:1932
 #, c-format
 msgid "Printer Device URI"
 msgstr "URI Dyfais Argraffu"
 
-#: printer/printerdrake.pm:1823
+#: printer/printerdrake.pm:1931
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12700,17 +13073,17 @@ msgstr ""
 "gyflawni manylyn un ai CUPS neu Foomatic. Sylwer nad yw pob math o URI cyn "
 "cael eu cynnal gan bob sbwlydd ."
 
-#: printer/printerdrake.pm:1846
+#: printer/printerdrake.pm:1957
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Rhaid cynnig URI dilys!"
 
-#: printer/printerdrake.pm:1949
+#: printer/printerdrake.pm:2060
 #, c-format
 msgid "Pipe into command"
 msgstr "Peipio i orchymyn"
 
-#: printer/printerdrake.pm:1950
+#: printer/printerdrake.pm:2061
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -12719,95 +13092,181 @@ msgstr ""
 "Yma gallwch bennu unrhyw fan lle dylid cyfeirio'r gwaith yn lle ei anfon at "
 "yr argraffydd."
 
-#: printer/printerdrake.pm:1951
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Command line"
 msgstr "Llinell orchymyn"
 
-#: printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2066
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Rhaid rhoi llinell gorchymyn!"
 
-#: printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:2104
+#, c-format
+msgid ""
+"On many HP printers there are special functions available, maintenance (ink "
+"level checking, nozzle cleaning. head alignment, ...) on all not too old "
+"inkjets, scanning on multi-function devices, and memory card access on "
+"printers with card readers. "
+msgstr ""
+"Ar lawer o argraffyddion HP mae yna swyddogaethau arbennig ar gael, cynnal "
+"(gwirio lefel yr inc, glanhau ffroenell, alinio'r pen...) ar inkjets gweddol "
+"ddiweddar, sganio ar ddyfeisiau amlbwrpas, a mynediad at gardiau cof ar "
+"argraffyddion gyda darllenwyr cardiau cof."
+
+#: printer/printerdrake.pm:2106
+#, c-format
+msgid ""
+"To access these extra functions on your HP printer, it must be set up with "
+"the appropriate software: "
+msgstr ""
+"I gael mynediad at y swyddogaethau ychwanegol hyn ar eich argraffydd HP, "
+"rhaid ei fod wedi ei osod gyda'r feddalwedd bwrpasol."
+
+#: printer/printerdrake.pm:2107
+#, c-format
+msgid ""
+"Either with the newer HPLIP which allows printer maintenance through the "
+"easy-to-use graphical application \"Toolbox\" and four-edge full-bleed on "
+"newer PhotoSmart models "
+msgstr ""
+"Un ai gyda'r HPLIP diweddaraf sy'n caniatáu cynnal argraffydd drwy raglen "
+"graffigol hawdd ei ddefnyddio \"Toolbox\" a phedair ymyl llif llawn ar "
+"fodelau PhotoSmart diweddaraf."
+
+#: printer/printerdrake.pm:2108
+#, c-format
+msgid ""
+"or with the older HPOJ which allows only scanner and memory card access, but "
+"could help you in case of failure of HPLIP. "
+msgstr ""
+"neu gyda'r HPOJ blaenorol sy'n caniatau mynediad at sganiwr a cherdyn cof, "
+"ond gall eich helpu os yw HPLIP yn methu."
+
+#: printer/printerdrake.pm:2110
+#, c-format
+msgid "What is your choice (choose \"None\" for non-HP printers)? "
+msgstr "Beth yw eich dewis (dewis \"Dim\" ar gyfer rhai heblaw HP)?"
+
+#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2112
+#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2144
+#: printer/printerdrake.pm:2170
+#, c-format
+msgid "HPLIP"
+msgstr "HPLIP"
+
+#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2114
+#: printer/printerdrake.pm:2270 printer/printerdrake.pm:2276
+#: printer/printerdrake.pm:2287
+#, c-format
+msgid "HPOJ"
+msgstr "HPOJ"
+
+#: printer/printerdrake.pm:2119
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
-"LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), "
-"an HP PhotoSmart or an HP LaserJet 2200?"
+"LaserJet 1100/1200/1220/3000/3200/3300/4345 with scanner, DeskJet 450, Sony "
+"IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
 "A yw eich argraffydd yn ddyfais amlbwrpas gan HP neu Sony (OfficeJet, PSC, "
-"LaserJet 1100/1200/1220/3200/3300 gyda sganiwr, DeskJet 450, Sony IJP-V100), "
-"HP PhotoSmart neu HP LaserJet 2200?"
+"LaserJet 1100/1200/1220/3000/3200/3300/4345 gyda sganiwr, DeskJet 450, Sony "
+"IJP-V100), HP PhotoSmart neu HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2270
 #, c-format
-msgid "Installing HPOJ package..."
-msgstr "Gosod pecyn HPOJ..."
+msgid "Installing %s package..."
+msgstr "Gosod pecyn %s..."
 
-#: printer/printerdrake.pm:2012
+#: printer/printerdrake.pm:2145 printer/printerdrake.pm:2277
 #, c-format
 msgid "Only printing will be possible on the %s."
-msgstr "Dim ond argraffu fydd yn bosibl ar %s."
+msgstr "Dim ond argraffu bydd yn bosibl ar %s."
+
+#: printer/printerdrake.pm:2160
+#, c-format
+msgid "Could not remove your old HPOJ configuration file %s for your %s! "
+msgstr "Methwyd tynnu eich hen ffeil ffurfweddiad HPOJ %s o'ch %s!"
+
+#: printer/printerdrake.pm:2162
+#, c-format
+msgid "Please remove the file manually and restart HPOJ."
+msgstr "Tynnwch y ffeil gyda llaw ac ailgychwyn HPLIP"
+
+#: printer/printerdrake.pm:2170 printer/printerdrake.pm:2287
+#, c-format
+msgid "Checking device and configuring %s..."
+msgstr "Gwirio'r ddyfais a ffurfweddu %s..."
 
-#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
+#: printer/printerdrake.pm:2189
 #, c-format
-msgid "Checking device and configuring HPOJ..."
-msgstr "Gwirio'r ddyfais a ffurfweddu HPOJ..."
+msgid "Which printer do you want to set up with HPLIP?"
+msgstr "Pa argraffydd hoffech ei osod gyda HPLIP?"
 
-#: printer/printerdrake.pm:2065
+#: printer/printerdrake.pm:2218 printer/printerdrake.pm:2331
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Gosod pecynnau SANE..."
 
-#: printer/printerdrake.pm:2078
+#: printer/printerdrake.pm:2231 printer/printerdrake.pm:2344
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "Ni fydd sganio'n bosibl ar %s"
 
-#: printer/printerdrake.pm:2105
+#: printer/printerdrake.pm:2246
+#, c-format
+msgid "Using and Maintaining your %s"
+msgstr "Defnyddio a Chynnal eich %s"
+
+#: printer/printerdrake.pm:2371
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Gosod pecynnau mtools..."
 
-#: printer/printerdrake.pm:2113
+#: printer/printerdrake.pm:2379
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "Ni fydd mynediad i gerdyn cof ar %s yn bosib."
 
-#: printer/printerdrake.pm:2128
+#: printer/printerdrake.pm:2395
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Sganio eich dyfais amlbwrpas HP"
 
-#: printer/printerdrake.pm:2136
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Mynediad i gerdyn cof ffoto ar eich dyfais HP amlbwrpas"
 
-#: printer/printerdrake.pm:2185
+#: printer/printerdrake.pm:2421
+#, c-format
+msgid "Configuring device..."
+msgstr "Ffurfweddu dyfais..."
+
+#: printer/printerdrake.pm:2455
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Gwneud porth argraffu ar gael ar gyfer CUPS..."
 
-#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
-#: printer/printerdrake.pm:2580
+#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2715
+#: printer/printerdrake.pm:2857
 #, c-format
 msgid "Reading printer database..."
 msgstr "Darllen cronfa ddata argraffydd..."
 
-#: printer/printerdrake.pm:2404
+#: printer/printerdrake.pm:2674
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Rhowch Enw'r Argraffydd a Sylw"
 
-#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3965
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr ""
 "Dylai enw'r argraffydd gynnwys llythrennau, rhifau a'r tanlinellu, yn unig"
 
-#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
+#: printer/printerdrake.pm:2684 printer/printerdrake.pm:3970
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -12816,7 +13275,18 @@ msgstr ""
 "Mae argraffydd \"%s\" yn bodoli eisoes,\n"
 "ydych chi wir eisiau ailysgrifennu ei ffurfweddiad?"
 
-#: printer/printerdrake.pm:2423
+#: printer/printerdrake.pm:2691
+#, c-format
+msgid ""
+"The printer name \"%s\" has more than 12 characters which can make the "
+"printer unaccessible from Windows clients. Do you really want to use this "
+"name?"
+msgstr ""
+"Mae gan enw argraffydd  \"%s\"  yn fwy na 12 nod. Gall hyn ei wneud yn "
+"amhosib cael mynediad o raglenni Windows. Ydych chi wir am ddefnyddio'r enw "
+"hwnnw?"
+
+#: printer/printerdrake.pm:2700
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12825,35 +13295,35 @@ msgstr ""
 "Mae pob argraffydd angen enw (e.e. \"argraffydd\". Nid oes angen llanw "
 "meysydd Disgrifiad a Lleoliad. Lle ar gyfer sylwadau'r defnyddiwr sydd yma."
 
-#: printer/printerdrake.pm:2424
+#: printer/printerdrake.pm:2701
 #, c-format
 msgid "Name of printer"
 msgstr "Enw'r argraffydd"
 
-#: printer/printerdrake.pm:2425 standalone/drakconnect:568
-#: standalone/harddrake2:34 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: printer/printerdrake.pm:2702 standalone/drakconnect:570
+#: standalone/harddrake2:37 standalone/printerdrake:211
+#: standalone/printerdrake:218
 #, c-format
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: printer/printerdrake.pm:2426 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: printer/printerdrake.pm:2703 standalone/printerdrake:211
+#: standalone/printerdrake:218
 #, c-format
 msgid "Location"
 msgstr "Lleoliad"
 
-#: printer/printerdrake.pm:2443
+#: printer/printerdrake.pm:2720
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Paratoi cronfa ddata argraffydd..."
 
-#: printer/printerdrake.pm:2559
+#: printer/printerdrake.pm:2836
 #, c-format
 msgid "Your printer model"
 msgstr "Model eich argraffydd"
 
-#: printer/printerdrake.pm:2560
+#: printer/printerdrake.pm:2837
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12872,25 +13342,25 @@ msgstr ""
 "Gall y dewis fod yn anghywir, yn arbennig os nad yw eich argraffydd yn cael "
 "ei enwi yn y gronfa ddata. Felly, edrychwch i weld â yw'r dewis yn gywir a "
 "chliciwch \"Model cywir\" os yw ac os nad yw, cliciwch \" Dewiswch y model "
-"gyda llaw\" fel bo modd i chi ddewis eich argraffydd gyda llaw ar y sgrîn "
+"gyda llaw\" fel bo modd i chi ddewis eich argraffydd gyda llaw ar y sgrin "
 "nesaf.\n"
 "\n"
 "Ar gyfer eich argraffydd mae Printerdrake wedi canfod\n"
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
+#: printer/printerdrake.pm:2842 printer/printerdrake.pm:2845
 #, c-format
 msgid "The model is correct"
 msgstr "Mae'r model yn gywir"
 
-#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
-#: printer/printerdrake.pm:2570
+#: printer/printerdrake.pm:2843 printer/printerdrake.pm:2844
+#: printer/printerdrake.pm:2847
 #, c-format
 msgid "Select model manually"
 msgstr "Dewiswch y model gyda llaw"
 
-#: printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2870
 #, c-format
 msgid ""
 "\n"
@@ -12905,12 +13375,12 @@ msgstr ""
 "Chwiliwch am y model cywir pan fo'r cyrchwr yn sefyll ar y model anghywir "
 "neu ar \"Argraffydd bras\"."
 
-#: printer/printerdrake.pm:2612
+#: printer/printerdrake.pm:2889
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Gosod ffeil PPD gan y cynhyrchwyr"
 
-#: printer/printerdrake.pm:2643
+#: printer/printerdrake.pm:2920
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12919,7 +13389,7 @@ msgstr ""
 "Mae pob argraffydd PostSgript yn cael ei ddarparu gyda ffeil PPD sy'n "
 "disgrifio dewisiadau a nodweddion yr argraffydd."
 
-#: printer/printerdrake.pm:2644
+#: printer/printerdrake.pm:2921
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
@@ -12928,12 +13398,12 @@ msgstr ""
 "Fel rheol mae'r ffeil ar CD sy'n cynnwys gyrwyr Windows a Mac sy'n dod "
 "gyda'r argraffydd."
 
-#: printer/printerdrake.pm:2645
+#: printer/printerdrake.pm:2922
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr "Gallwch ganfod y ffeiliau PPD ar safle gwe'r gwneuthurwr."
 
-#: printer/printerdrake.pm:2646
+#: printer/printerdrake.pm:2923
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
@@ -12942,7 +13412,7 @@ msgstr ""
 "Ow yw Windows wedi ei osod ar eich peiriant , mae'r ffeil PPD i'w gael ar "
 "eich rhaniad Windows, hefyd."
 
-#: printer/printerdrake.pm:2647
+#: printer/printerdrake.pm:2924
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -12952,7 +13422,7 @@ msgstr ""
 "Mae gosod a defnyddio'r ffeil PPD wrth osod yr argraffydd am y tro cyntaf yn "
 "gwneud pob dewis ar gael sy'n cydweddu gyda chaledwedd yr argraffydd."
 
-#: printer/printerdrake.pm:2648
+#: printer/printerdrake.pm:2925
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
@@ -12961,51 +13431,51 @@ msgstr ""
 "Yma cewch ddewis y ffeil PPD i'w osod ar eich peiriant, i'w ddefnyddio ar "
 "gyfer gosod eith peiriant."
 
-#: printer/printerdrake.pm:2650
+#: printer/printerdrake.pm:2927
 #, c-format
 msgid "Install PPD file from"
 msgstr "Gosod ffeil PPD o"
 
-#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
-#: standalone/scannerdrake:177 standalone/scannerdrake:186
-#: standalone/scannerdrake:236 standalone/scannerdrake:244
+#: printer/printerdrake.pm:2930 printer/printerdrake.pm:2938
+#: standalone/scannerdrake:183 standalone/scannerdrake:192
+#: standalone/scannerdrake:242 standalone/scannerdrake:250
 #, c-format
 msgid "Floppy Disk"
 msgstr "Disg Meddal"
 
-#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
-#: standalone/scannerdrake:178 standalone/scannerdrake:188
-#: standalone/scannerdrake:237 standalone/scannerdrake:246
+#: printer/printerdrake.pm:2931 printer/printerdrake.pm:2940
+#: standalone/scannerdrake:184 standalone/scannerdrake:194
+#: standalone/scannerdrake:243 standalone/scannerdrake:252
 #, c-format
 msgid "Other place"
 msgstr "Man arall"
 
-#: printer/printerdrake.pm:2669
+#: printer/printerdrake.pm:2946
 #, c-format
 msgid "Select PPD file"
 msgstr "Dewis ffeil PPD"
 
-#: printer/printerdrake.pm:2673
+#: printer/printerdrake.pm:2950
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "Nid yw ffeil PPD %s yn bodoli neu nid yw'n ddarllenadwy!"
 
-#: printer/printerdrake.pm:2679
+#: printer/printerdrake.pm:2956
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "Nid yw'r ffeil PPD %s yn cyd-fynd â manyleb PPD!"
 
-#: printer/printerdrake.pm:2690
+#: printer/printerdrake.pm:2967
 #, c-format
 msgid "Installing PPD file..."
 msgstr "Gosod ffeil PPD..."
 
-#: printer/printerdrake.pm:2807
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "Ffurfweddiad OKI winprinter "
 
-#: printer/printerdrake.pm:2808
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -13021,14 +13491,14 @@ msgstr ""
 "argraffydd wedi ei gysylltu i borth arall neu i flwch gweinydd argraffu, "
 "cysylltwch yr argraffydd i'r porth paralel cyntaf cyn argraffu tudalen "
 "brawf. Os na wnewch chi hynny, ni fydd yr argraffydd yn gweithio. Bydd eich "
-"gosodiad ynghylch ymath o gysylltiad yn cael ei anwybyddu gan y gyrrwr."
+"gosodiad ynghylch y math o gysylltiad yn cael ei anwybyddu gan y gyrrwr."
 
-#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
+#: printer/printerdrake.pm:3110 printer/printerdrake.pm:3140
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Ffurfweddiad inkjet Lexmark"
 
-#: printer/printerdrake.pm:2834
+#: printer/printerdrake.pm:3111
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -13040,7 +13510,7 @@ msgstr ""
 "argraffyddion lleol, yn unig. Cysylltwch eich argraffydd i borth lleol neu "
 "ffurfweddwch ef i'r peiriant mae'n gysylltiedig ag ef."
 
-#: printer/printerdrake.pm:2864
+#: printer/printerdrake.pm:3141
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -13062,12 +13532,12 @@ msgstr ""
 "dudalennau'r alinio'r pen argraffu gyda \"lexmarkmaintain\" a newid "
 "gosodiadau aliniad y pen gyda'r rhaglen."
 
-#: printer/printerdrake.pm:2874
+#: printer/printerdrake.pm:3151
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Ffurfweddiad Lexmark 125"
 
-#: printer/printerdrake.pm:2875
+#: printer/printerdrake.pm:3152
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -13078,37 +13548,38 @@ msgstr ""
 "Mae'r gyrwyr argraffydd inkjet sydd wedi eu darparu gan Lexmark yn cynnal "
 "argraffyddion lleol, yn unig wedi eu cysylltu drwy USB, dim argraffyddion ar "
 "beiriannau pell na blychau gweinydd argraffu.. Cysylltwch eich argraffydd i "
-"borth USB lleol neu ei ffurfweddu i'r peiriant mae wedi ei  gysylltiedu iddo."
+"borth USB lleol neu ei ffurfweddu i'r peiriant mae wedi ei  gysylltu iddo."
 
-#: printer/printerdrake.pm:2897
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3174
+#, c-format
 msgid "Samsung ML/QL-85G configuration"
-msgstr "Ffurfweddiad sain"
+msgstr "Ffurfweddiad Samsung ML/QL-85G"
 
-#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3175 printer/printerdrake.pm:3202
+#, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected on the "
 "first parallel port, no printers on remote machines or print server boxes or "
 "on other parallel ports. Please connect your printer to the first parallel "
 "port or configure it on the machine where it is connected to."
 msgstr ""
-"Mae'r gyrwyr argraffydd inkjet sydd wedi eu darparu gan Lexmark yn cynnal "
-"argraffyddion lleol, yn unig wedi eu cysylltu drwy USB, dim argraffyddion ar "
-"beiriannau pell na blychau gweinydd argraffu.. Cysylltwch eich argraffydd i "
-"borth USB lleol neu ei ffurfweddu i'r peiriant mae wedi ei  gysylltiedu iddo."
+"Mae'r gyrwyr yr argraffydd yma'n cynnal argraffyddion lleol, yn unig wedi eu "
+"cysylltu drwy 'r porth paralel cyntaf, dim argraffyddion ar beiriannau pell "
+"na blychau gweinydd argraffu ar byrth parallel eraill.  Cysylltwch eich "
+"argraffydd i'r porth paralel cyntaf neu ei ffurfweddu i'r peiriant mae wedi "
+"ei  gysylltu iddo."
 
-#: printer/printerdrake.pm:2924
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3201
+#, c-format
 msgid "Canon LBP-460/660 configuration"
-msgstr "Ffurfweddu TCP/IP  gyda llaw"
+msgstr "Ffurfweddiad Canon LBP-460/660"
 
-#: printer/printerdrake.pm:2943
+#: printer/printerdrake.pm:3220
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Llwytho Cadarnwedd i Fyny ar gyfer HP LaserJet 1000"
 
-#: printer/printerdrake.pm:3056
+#: printer/printerdrake.pm:3369
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13126,27 +13597,27 @@ msgstr ""
 "argraffiad ansawdd/cydraniad uchel iawn yn gallu arafu'r argraffu'n "
 "sylweddol.."
 
-#: printer/printerdrake.pm:3181
+#: printer/printerdrake.pm:3494
 #, c-format
 msgid "Printer default settings"
 msgstr "Gosod yr Argraffydd Rhagosodedig"
 
-#: printer/printerdrake.pm:3188
+#: printer/printerdrake.pm:3501
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Rhaid i ddewis %s fod yn gyfanrif"
 
-#: printer/printerdrake.pm:3192
+#: printer/printerdrake.pm:3505
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Rhaid i ddewis %s fod yn rhif!"
 
-#: printer/printerdrake.pm:3196
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Dewis %s allan o amrediad!"
 
-#: printer/printerdrake.pm:3247
+#: printer/printerdrake.pm:3560
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13155,12 +13626,12 @@ msgstr ""
 "Ydych chi am osod argraffydd  (\"%s\")\n"
 "fel yr argraffydd rhagosodedig?"
 
-#: printer/printerdrake.pm:3262
+#: printer/printerdrake.pm:3575
 #, c-format
 msgid "Test pages"
 msgstr "Tudalennau prawf"
 
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13173,57 +13644,52 @@ msgstr ""
 "argraffu ac ar argraffydd laser heb lawer o gof mae'n bosibl na ddaw o gwbl. "
 "Yn y rhan fwyaf o achosion, mae'r dudalen prawf safonol yn ddigonol."
 
-#: printer/printerdrake.pm:3267
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid "No test pages"
 msgstr "Dim tudalennau prawf"
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid "Print"
 msgstr "Argraffu"
 
-#: printer/printerdrake.pm:3293
+#: printer/printerdrake.pm:3606
 #, c-format
 msgid "Standard test page"
 msgstr "Tudalen prawf safonol"
 
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3609
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Prawf tudalen arall (Llythyr)"
 
-#: printer/printerdrake.pm:3299
+#: printer/printerdrake.pm:3612
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Prawf tudalen arall (A4)"
 
-#: printer/printerdrake.pm:3301
+#: printer/printerdrake.pm:3614
 #, c-format
 msgid "Photo test page"
 msgstr "Tudalen prawf llun"
 
-#: printer/printerdrake.pm:3305
+#: printer/printerdrake.pm:3618
 #, c-format
 msgid "Do not print any test page"
 msgstr "Peidiwch argraffu tudalennau prawf"
 
-#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
+#: printer/printerdrake.pm:3626 printer/printerdrake.pm:3809
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Argraffu tudalen(nau) prawf..."
 
-#: printer/printerdrake.pm:3331
-#, c-format
-msgid "Could not install the %s package!"
-msgstr "Methu gosod pecyn %s!"
-
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3646
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Osgoi prawf llun ffoto"
 
-#: printer/printerdrake.pm:3350
+#: printer/printerdrake.pm:3663
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13238,7 +13704,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3354
+#: printer/printerdrake.pm:3667
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13247,17 +13713,17 @@ msgstr ""
 "Mae tudalen(nau) prawf wedi eu hanfon at yr argraffydd.\n"
 "Gall gymryd amser cyn i'r argraffydd gychwyn.\n"
 
-#: printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3677
 #, c-format
 msgid "Did it work properly?"
 msgstr "A weithiodd hwnnw'n iawn?"
 
-#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
+#: printer/printerdrake.pm:3700 printer/printerdrake.pm:5049
 #, c-format
 msgid "Raw printer"
 msgstr "Argraffydd bras"
 
-#: printer/printerdrake.pm:3416
+#: printer/printerdrake.pm:3738
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -13270,7 +13736,7 @@ msgstr ""
 "\"xpp <file>\" neu \"kprinter <file>\". Mae'r offeryn graffigol yn caniatáu "
 "chi ddefnyddio'r argraffydd ac i newid gosodiadau dewis yn hawdd.\n"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3740
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -13281,8 +13747,8 @@ msgstr ""
 "deialogau argraffu mewn nifer o raglenni, ond  yma nid ydynt yn darparu'r "
 "enw ffeil am fod y ffeil i'r argraffydd yn cael ei ddarparu gan y rhaglen.\n"
 
-#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3743 printer/printerdrake.pm:3760
+#: printer/printerdrake.pm:3770
 #, c-format
 msgid ""
 "\n"
@@ -13295,7 +13761,7 @@ msgstr ""
 "tasg argraffu penodol. Ychwanegwch y gosodiadau angenrheidiol i'r llinell "
 "gorchymyn, e.e \"%s <file>\". "
 
-#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
+#: printer/printerdrake.pm:3746 printer/printerdrake.pm:3786
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -13306,7 +13772,7 @@ msgstr ""
 "ai'r rhestr isod neu cliciwch ar y botwm \"Rhestr dewis argraffu\".%s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3428
+#: printer/printerdrake.pm:3750
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -13316,7 +13782,7 @@ msgstr ""
 "presennol:\n"
 "\n"
 
-#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
+#: printer/printerdrake.pm:3755 printer/printerdrake.pm:3765
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13325,8 +13791,8 @@ msgstr ""
 "I argraffu ffeil o'r llinell orchymyn (ffenestr terfynell) defnyddiwch "
 "orchymyn \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
-#: printer/printerdrake.pm:3455
+#: printer/printerdrake.pm:3757 printer/printerdrake.pm:3767
+#: printer/printerdrake.pm:3777
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -13337,7 +13803,7 @@ msgstr ""
 "nifer o raglenni. Ond peidiwch â rhoi'r enw ffeil yma oherwydd bod y ffeil "
 "i'w argraffu wedi ei ddarparu gan y rhaglen.\n"
 
-#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
+#: printer/printerdrake.pm:3762 printer/printerdrake.pm:3772
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -13346,7 +13812,7 @@ msgstr ""
 "I edrych ar y rhestr o'r dewisiadau sydd ar gael ar gyfer yr argraffydd "
 "cyfredol cliciwch ar fotwm \"Rhestr dewisiadau argraffu\"."
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3775
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13355,7 +13821,7 @@ msgstr ""
 "I argraffu ffeil o'r llinell orchymyn (ffenestr terfynell) defnyddiwch y "
 "gorchymyn \"%s <file>\" neu \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3457
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13373,7 +13839,7 @@ msgstr ""
 "fydd yn stopio 'r holl waith argraffu'n syth pan fyddwch yn ei glicio. Mae "
 "hyn yn ddefnyddiol pan fydd y papur wedi mynd yn sownd, ag ati.\n"
 
-#: printer/printerdrake.pm:3461
+#: printer/printerdrake.pm:3783
 #, c-format
 msgid ""
 "\n"
@@ -13383,36 +13849,144 @@ msgid ""
 msgstr ""
 "\n"
 "Mae'r gorchmynion \"%s\" a \"%s\" hefyd yn caniatáu newid y gosodiadau dewis "
-"ar gyfer tasg argraffu penodol. Ychwanegwch y gosodiadau angenrheidiol i'r "
+"ar gyfer tasg argraffu benodol. Ychwanegwch y gosodiadau angenrheidiol i'r "
 "llinell gorchymyn, e.e \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3471
+#: printer/printerdrake.pm:3793
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Argraffu/Sganio/Cardiau Llun ar  \"%s\""
 
-#: printer/printerdrake.pm:3472
+#: printer/printerdrake.pm:3794
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Argraffu/Sganio ar  \"%s\""
 
-#: printer/printerdrake.pm:3474
+#: printer/printerdrake.pm:3796
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Argraffu/Mynediad Cardiau Llun ar  \"%s\""
 
-#: printer/printerdrake.pm:3475
+#: printer/printerdrake.pm:3798
+#, c-format
+msgid "Using/Maintaining the printer \"%s\""
+msgstr "Defnyddio/Cynnal argraffydd \"%s\""
+
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Argraffu ar argraffydd \"%s\""
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3805
 #, c-format
 msgid "Print option list"
 msgstr "Rhestr ddewis argraffu"
 
-#: printer/printerdrake.pm:3502
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3827
+#, c-format
+msgid ""
+"Your %s is set up with HP's HPLIP driver software. This way many special "
+"features of your printer are supported.\n"
+"\n"
+msgstr ""
+"Mae eich %s wedi ei osod gyda meddalwedd HPLIP HP. Fel hyn bydd nifer o "
+"nodweddion arbennig eich argraffydd yn cael eu cynnal.\n"
+"\n"
+
+#: printer/printerdrake.pm:3830
+#, c-format
+msgid ""
+"The scanner in your printer can be used with the usual SANE software, for "
+"example Kooka or XSane (Both in the Multimedia/Graphics menu). "
+msgstr ""
+"Mae modd defnyddio'r sganiwr yn eich argraffydd gyda'r feddalwedd SANE "
+"arferol, ee Kooka neu XSane (Y ddau yn newislen Amlgyfrwng/Graffigau). "
+
+#: printer/printerdrake.pm:3831
+#, c-format
+msgid ""
+"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"your scanner on the network.\n"
+"\n"
+msgstr ""
+"Rhedwch Scannerdrake (Caledwedd/Sganiwr yng Nghanolfan Rheoli Mandrakelinux) "
+"i rannu eich sganiwr ar y rhwydwaith.\n"
+"\n"
+
+#: printer/printerdrake.pm:3835
+#, c-format
+msgid ""
+"The memory card readers in your printer can be accessed like a usual USB "
+"mass storage device. "
+msgstr ""
+"Mae modd cael mynediad i'r darllennydd cerdyn cof ar eich argraffydd drwy'r "
+"ddyfais storio USB arferol."
+
+#: printer/printerdrake.pm:3836
+#, c-format
+msgid ""
+"After inserting a card a hard disk icon to access the card should appear on "
+"your desktop.\n"
+"\n"
+msgstr ""
+"Ar ôl gosod cerdyn bydd eicon disg caled yn ymddangos ar eich bwrdd gwaith i "
+"awgrymu mynediad\n"
+
+#: printer/printerdrake.pm:3838
+#, c-format
+msgid ""
+"The memory card readers in your printer can be accessed using HP's Printer "
+"Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access "
+"Photo Cards...\" button on the \"Functions\" tab. "
+msgstr ""
+"Mae modd cael mynediad at ddarllenydd cerdyn ar eich argraffydd drwy "
+"ddefnyddio Printer Toolbox HP (Dewislen: System/Monitro/HP Printer Toolbox) "
+"gan glicio ar fotwm \"Mynediad at Gardiau Ffoto..\" yn y tab \"Swyddogaethau"
+"\"."
+
+#: printer/printerdrake.pm:3839
+#, c-format
+msgid ""
+"Note that this is very slow, reading the pictures from the camera or a USB "
+"card reader is usually faster.\n"
+"\n"
+msgstr ""
+"Sylwch fod hyn yn araf iawn, mae darllen y lluniau o'r camera neu gerdyn USB "
+"fel arfer yn gynt.\n"
+
+#: printer/printerdrake.pm:3842
+#, c-format
+msgid ""
+"HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a "
+"lot of status monitoring and maintenance functions for your %s:\n"
+"\n"
+msgstr ""
+"Mae Printer Toolbox HP (Dewislen: System/Monitro/Printer Toolbox HP) yn "
+"cynnig llawer o swyddogaethau monitro statws a chynnal ar gyfer eich %s:\n"
+"\n"
+
+#: printer/printerdrake.pm:3843
+#, c-format
+msgid " - Ink level/status info\n"
+msgstr " - Lefel inc/statws\n"
+
+#: printer/printerdrake.pm:3844
+#, c-format
+msgid " - Ink nozzle cleaning\n"
+msgstr " - Glanhau ffroenell inc\n"
+
+#: printer/printerdrake.pm:3845
+#, c-format
+msgid " - Print head alignment\n"
+msgstr " - Aliniad pen argraffydd\n"
+
+#: printer/printerdrake.pm:3846
+#, c-format
+msgid " - Color calibration\n"
+msgstr " - Calibro lliw\n"
+
+#: printer/printerdrake.pm:3861
+#, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
 "Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the "
@@ -13426,17 +14000,19 @@ msgid ""
 "device, you only need to use \"scannerdrake\" if you want to share the "
 "scanner on the network."
 msgstr ""
-"Mae eich dyfais aml bwrpas HP wedi cael ei ffurfweddu'n awtomatig i fedru "
+"Mae eich dyfais aml bwrpas wedi cael ei ffurfweddu'n awtomatig i fedru "
 "sganio. Mae modd i chi sganio gyda \"scanimage\" (\"scanimage -d hp:%s\" i "
 "bennu pa un os oes gennych fwy nag un) o'r llinell orchymyn neu gyda rhag "
 "wynebau graffigol  \"xscanimage\" neu \"xsane\". Os ydych yn defnyddio GIMP, "
 "gallwch sganio hefyd, drwy ddewis y man priodol yn y ddewislen \"Ffeil\"/"
-"\"Cipio\". Galwch hefyd \"man scanimage\" ar y linell orchymyn i dderbyn mwy "
-"o wybodaeth.\n"
+"\"Cipio\". Galwch hefyd \"man scanimage\" ar y llinell orchymyn i dderbyn "
+"mwy o wybodaeth.\n"
 "\n"
-"Peidiwch defnyddio \"scannerdrake\" ar gyfer y ddyfais hon."
+"Peidiwch defnyddio \"scannerdrake\" ar gyfer gosod scanio ar y ddyfais hon, "
+"dim ond defnyddio \"scannerdrake\" os ydych am rannu'r sganiwr ar y "
+"rhwydwaith."
 
-#: printer/printerdrake.pm:3528
+#: printer/printerdrake.pm:3887
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13449,8 +14025,8 @@ msgid ""
 "can switch between drive letters with the field at the upper-right corners "
 "of the file lists."
 msgstr ""
-"Mae eich argraffydd wedi ei ffurfweddu'n awtomatig i rhoi fynediad i chi i'r "
-"gyrrwr cerdyn llun o'c cyfrifiadur. Mae modd i chi gael mynediad at eich "
+"Mae eich argraffydd wedi ei ffurfweddu'n awtomatig i roi mynediad i chi i'r "
+"gyrrwr cerdyn llun o’ch cyfrifiadur. Mae modd i chi gael mynediad at eich "
 "cardiau llun drwy'r rhaglen graffigol \"MtoolsFM\" (Dewislen: \"Rhaglenni\" -"
 "> \"Offer ffeil\" -> \"Rheolwr Ffeiliau MTools\") neu ar y llinell "
 "orchymyn:  \"mtools\" (\"man mtools\" am ragor o wybodaeth) Bydd ys system o "
@@ -13458,13 +14034,13 @@ msgstr ""
 "argraffydd HP gyda gyrwyr cerdyn llun. Yn _MToolsFM\" mae modd newid rhwng "
 "llythrennau gyrwyr drwy'r maes ar ben uchaf de'r rhestr."
 
-#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
-#: printer/printerdrake.pm:3632
+#: printer/printerdrake.pm:3929 printer/printerdrake.pm:3956
+#: printer/printerdrake.pm:3991
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "Trosglwyddo ffurfweddiad yr argraffydd"
 
-#: printer/printerdrake.pm:3571
+#: printer/printerdrake.pm:3930
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13473,13 +14049,13 @@ msgid ""
 "overtaken, but jobs will not be transferred.\n"
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
-"Mae modd i chi gopïo ffurfweddiad yr argraffydd fel wnaethoch o yspwlydd %s "
+"Mae modd i chi gopïo ffurfweddiad yr argraffydd fel gwnaethoch o yspwlydd %s "
 "i %s eich yspwlydd cyfredol. Bydd yr holl ddata ffurfweddi (enw argraffydd, "
-"disgrifiad, lleoliad, math o gysylltiad a gosodiadau dewis rhagosodedig) yn "
+"disgrifiad, lleoliad, math o gysylltiad â gosodiadau dewis rhagosodedig) yn "
 "cael eu trosi, ond ni fydd y gwaith argraffu'n cael eu trosi.\n"
 "Ni fydd yr holl waith argraffu'n cael eu trosi, am y rhesymau canlynol:\n"
 
-#: printer/printerdrake.pm:3574
+#: printer/printerdrake.pm:3933
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13488,7 +14064,7 @@ msgstr ""
 "Nid yw CUPS yn cefnogi argraffyddion ar weinyddion Novell neu argraffyddion "
 "sy'n anfon data mewn gorchymyn ffurf -rhydd.\n"
 
-#: printer/printerdrake.pm:3576
+#: printer/printerdrake.pm:3935
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13496,21 +14072,21 @@ msgid ""
 msgstr ""
 "Mae PDQ yn cynnal argraffyddion lleol,  LDP pell, a Socket/TCP, yn unig.\n"
 
-#: printer/printerdrake.pm:3578
+#: printer/printerdrake.pm:3937
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "Nid yw LPD na LPRng yn cynnal argraffyddion IPP.\n"
 
-#: printer/printerdrake.pm:3580
+#: printer/printerdrake.pm:3939
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
-"Yn ogystal, nid oes modd trosglwyddo rhesi grëwyd gan y rhaglen hon na "
+"Yn ogystal, nid oes modd trosglwyddo rhesi a grëwyd gan y rhaglen hon na "
 "\"foomatic-configure\"."
 
-#: printer/printerdrake.pm:3581
+#: printer/printerdrake.pm:3940
 #, c-format
 msgid ""
 "\n"
@@ -13521,7 +14097,7 @@ msgstr ""
 "Hefyd nid oes modd trosglwyddo argraffyddion ffurfweddwyd gyda ffeiliau PPD "
 "ddarparwyd gan eu gwneuthurwyr na gyrrwyr CUPS brodorol."
 
-#: printer/printerdrake.pm:3582
+#: printer/printerdrake.pm:3941
 #, c-format
 msgid ""
 "\n"
@@ -13529,20 +14105,20 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 "\n"
-"Nodwch yr argraffydd rydych am ei drosglwddo a chliciwch\n"
+"Nodwch yr argraffydd rydych am ei drosglwyddo a chliciwch\n"
 "\"Trosglwyddo\"."
 
-#: printer/printerdrake.pm:3585
+#: printer/printerdrake.pm:3944
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Peidio trosglwyddo argraffydd"
 
-#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
+#: printer/printerdrake.pm:3945 printer/printerdrake.pm:3961
 #, c-format
 msgid "Transfer"
 msgstr "Trosglwyddo"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3957
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13553,17 +14129,17 @@ msgstr ""
 "Cliciwch \"Trosglwyddo\" i ysgrifennu drosto.\n"
 "Mae modd i chi osod enw newydd arno neu ei hepgor."
 
-#: printer/printerdrake.pm:3619
+#: printer/printerdrake.pm:3978
 #, c-format
 msgid "New printer name"
 msgstr "Enw'r argraffydd newydd"
 
-#: printer/printerdrake.pm:3622
+#: printer/printerdrake.pm:3981
 #, c-format
 msgid "Transferring %s..."
 msgstr "Trosglwyddo %s..."
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3992
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13573,28 +14149,28 @@ msgstr ""
 "(\"%s\"). A ddylai fod yn argraffydd rhagosodedig y system argraffu newydd %"
 "s ?"
 
-#: printer/printerdrake.pm:3643
+#: printer/printerdrake.pm:4002
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Adnewyddu data'r argraffydd..."
 
-#: printer/printerdrake.pm:3652
+#: printer/printerdrake.pm:4011
 #, c-format
 msgid "Starting network..."
 msgstr "Cychwyn y rhwydwaith..."
 
-#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
-#: printer/printerdrake.pm:3701
+#: printer/printerdrake.pm:4054 printer/printerdrake.pm:4058
+#: printer/printerdrake.pm:4060
 #, c-format
 msgid "Configure the network now"
 msgstr "Ffurfweddwch y rhwydwaith"
 
-#: printer/printerdrake.pm:3696
+#: printer/printerdrake.pm:4055
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Nid yw swyddogaethau'r rhwydwaith wedi ei ffurfweddu"
 
-#: printer/printerdrake.pm:3697
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13604,15 +14180,15 @@ msgid ""
 msgstr ""
 "Ydych chi am ffurfweddi argraffydd pell. Mae hyn angen mynediad ar "
 "rwydwaith, ond nid yw eich rhwydwaith wedi ei ffurfweddu eto. Os ydych am "
-"fynd ymlaen heb ffurfweddiad rhwydwaith, ni bydd modd i chi ddefnyddio'r "
+"fynd ymlaen heb ffurfweddiad rhwydwaith, ni fydd modd i chi ddefnyddio'r "
 "argraffydd rydych yn ei ffurfweddu ar hyn o bryd. Beth ydych am ei wneud?"
 
-#: printer/printerdrake.pm:3700
+#: printer/printerdrake.pm:4059
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Parhau heb ffurfweddu'r rhwydwaith"
 
-#: printer/printerdrake.pm:3735
+#: printer/printerdrake.pm:4094
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13624,10 +14200,10 @@ msgstr ""
 "Nid oes modd cychwyn y ffurfweddiad rhwydwaith wnaed yn ystod y gosodiad. "
 "Gwiriwch p'un ai yw'r rhwydwaith yn darparu mynediad ar ôl cychwyn eich "
 "system a chywiro'r ffurfweddiad gan ddefnyddio Canolfan Rheoli %s, adran "
-"\"Rrhwydwaith a'r Rhyngrwyd\"/\"Cysylltiad\", ac yna gosod yr argraffydd, "
-"eto gan ddefnyddio Canolfan Rheoli %s, adran \"Caledwedd\"/\"Argraffydd\""
+"\"Rhwydwaith a'r Rhyngrwyd\"/\"Cysylltiad\", ac yna gosod yr argraffydd, eto "
+"gan ddefnyddio Canolfan Rheoli %s, adran \"Caledwedd\"/\"Argraffydd\""
 
-#: printer/printerdrake.pm:3736
+#: printer/printerdrake.pm:4095
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13638,27 +14214,27 @@ msgstr ""
 "Gwiriwch eich ffurfweddiad a'ch caledwedd. Yna ceisiwch ail ffurfweddi eich "
 "argraffydd."
 
-#: printer/printerdrake.pm:3746
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Ailgychwyn system argraffu..."
 
-#: printer/printerdrake.pm:3776
+#: printer/printerdrake.pm:4135
 #, c-format
 msgid "high"
 msgstr "uchel"
 
-#: printer/printerdrake.pm:3776
+#: printer/printerdrake.pm:4135
 #, c-format
 msgid "paranoid"
 msgstr "Paranoia"
 
-#: printer/printerdrake.pm:3778
+#: printer/printerdrake.pm:4137
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Gosod system argraffu yn lefel diogelwch %s"
 
-#: printer/printerdrake.pm:3779
+#: printer/printerdrake.pm:4138
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -13682,12 +14258,12 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau ffurfweddu argraffu ar y peiriant hwn?"
 
-#: printer/printerdrake.pm:3814
+#: printer/printerdrake.pm:4173
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Cychwyn y system argraffu wrth gychwyn y cyfrifiadur"
 
-#: printer/printerdrake.pm:3815
+#: printer/printerdrake.pm:4174
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13709,32 +14285,32 @@ msgstr ""
 "\n"
 "Ydych chi am i'r cychwyn awtomatig gael ei droi ymlaen eto?"
 
-#: printer/printerdrake.pm:3837
+#: printer/printerdrake.pm:4196
 #, c-format
 msgid "Checking installed software..."
 msgstr "Gwirio'r meddalwedd sydd wedi ei osod..."
 
-#: printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:4202
 #, c-format
 msgid "Removing %s..."
 msgstr "Tynnu %s..."
 
-#: printer/printerdrake.pm:3847
+#: printer/printerdrake.pm:4206
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "Methu tynnu'r system argraffu %s!"
 
-#: printer/printerdrake.pm:3863
+#: printer/printerdrake.pm:4222
 #, c-format
 msgid "Installing %s..."
 msgstr "Gosod %s..."
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4226
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "Methu gosod system argraffu %s!"
 
-#: printer/printerdrake.pm:3934
+#: printer/printerdrake.pm:4293
 #, c-format
 msgid ""
 "In this mode there is no local printing system, all printing requests go "
@@ -13742,47 +14318,56 @@ msgid ""
 "define local print queues then and if the specified server is down it cannot "
 "be printed at all from this machine."
 msgstr ""
+"Yn y modd hwn nid oes system argraffu a bydd yr holl geisiadau argraffu'n "
+"mynd yn syth i'r gweinydd enwyd isod. Sylwch na fydd yn bosib diffinio rhesi "
+"argraffu lleol ac os bydd y gweinydd hwnnw i lawr nid oes modd ei argraffu "
+"o'r peiriant hwn."
 
-#: printer/printerdrake.pm:3936
+#: printer/printerdrake.pm:4295
 #, c-format
 msgid ""
 "Enter the host name or IP of your CUPS server and click OK if you want to "
 "use this mode, click \"Quit\" otherwise."
 msgstr ""
+"Rhowch yr enw gwesteiwr neu IP eich gweinydd CUPS a chlicio Iawn os ydych am "
+"ddefnyddio'r modd yma, cliciwch \"Gadael\" fel arall."
 
-#: printer/printerdrake.pm:3950
+#: printer/printerdrake.pm:4309
 #, c-format
 msgid "Name or IP of remote server:"
 msgstr "Gwesteiwr neu IP ar weinydd pell:"
 
-#: printer/printerdrake.pm:3970
+#: printer/printerdrake.pm:4329
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Gosod yr Argraffydd Rhagosodedig"
 
-#: printer/printerdrake.pm:3989
-#, fuzzy, c-format
+#: printer/printerdrake.pm:4348
+#, c-format
 msgid "Local CUPS printing system or remote CUPS server?"
-msgstr "Argraffydd ar weinydd CUPS pell"
+msgstr "System argraffu CUPS lleol neu weinydd CUPS pell?"
 
-#: printer/printerdrake.pm:3990
+#: printer/printerdrake.pm:4349
 #, c-format
 msgid "The CUPS printing system can be used in two ways: "
-msgstr ""
+msgstr "Mae modd defnyddio system argraffu CUPS mewn dwy ffordd:"
 
-#: printer/printerdrake.pm:3992
+#: printer/printerdrake.pm:4351
 #, c-format
 msgid "1. The CUPS printing system can run locally. "
-msgstr ""
+msgstr "1. Mae modd rhedeg system argraffu CUPS yn lleol."
 
-#: printer/printerdrake.pm:3993
+#: printer/printerdrake.pm:4352
 #, c-format
 msgid ""
 "Then locally connected printers can be used and remote printers on other "
 "CUPS servers in the same network are automatically discovered. "
 msgstr ""
+"Yna mae modd defnyddio argraffyddion wedi eu cysylltu'n lleol ac mae modd "
+"canfod argraffyddion pell ar weinyddion CUPS eraill ar yr un rhwydwaith, yn "
+"awtomatig."
 
-#: printer/printerdrake.pm:3994
+#: printer/printerdrake.pm:4353
 #, c-format
 msgid ""
 "Disadvantage of this approach is, that more resources on the local machine "
@@ -13790,69 +14375,79 @@ msgid ""
 "daemon has to run in the background and needs some memory, and the IPP port "
 "(port 631) is opened. "
 msgstr ""
+"Anfantais hyn yw, bod angen mwy o adnoddau ar beiriannau lleol. Rhaid gosod "
+"pecynnau meddalwedd ychwanegol, rhaid rhedeg daemon CUPS yn y cefndir ac mae "
+"angen peth cof, ac mae porth IPP (porth 631) ar agor."
 
-#: printer/printerdrake.pm:3996
+#: printer/printerdrake.pm:4355
 #, c-format
 msgid "2. All printing requests are immediately sent to a remote CUPS server. "
 msgstr ""
+"2. Bydd pob cais argraffu'n cael ei anfon yn syth at weinydd CUPS pell."
 
-#: printer/printerdrake.pm:3997
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid ""
 "Here local resource occupation is reduced to a minimum. No CUPS daemon is "
 "started or port opened, no software infrastructure for setting up local "
 "print queues is installed, so less memory and disk space is used. "
 msgstr ""
+"Yma mae defnydd adnoddau lleol yn cael ei leihau. Ni fydd daemon CUPS yn "
+"cael ei gychwyn na phorth yn cael ei hagor, nid oes strwythur meddalwedd yn "
+"cael ei osod i drin rhesi argraffu, felly mae llai o gof a lle ar ddisg yn "
+"cael ei ddefnyddio."
 
-#: printer/printerdrake.pm:3998
+#: printer/printerdrake.pm:4357
 #, c-format
 msgid ""
 "Disadvantage is that it is not possible to define local printers then and if "
 "the specified server is down it cannot be printed at all from this machine. "
 msgstr ""
+"Yr anfantais yw nad oes modd diffinio argraffyddion lleol ac os yw'r "
+"gweinydd hwnnw i lawr nid oes modd argraffu o'r peiriant hwn."
 
-#: printer/printerdrake.pm:4000
+#: printer/printerdrake.pm:4359
 #, c-format
 msgid "How should CUPS be set up on your machine?"
-msgstr ""
+msgstr "Sutddylai CUPS gael ei osod ar eich peiriant?"
 
-#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
-#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#: printer/printerdrake.pm:4363 printer/printerdrake.pm:4378
+#: printer/printerdrake.pm:4382 printer/printerdrake.pm:4388
 #, c-format
 msgid "Remote server, specify Name or IP here:"
-msgstr ""
+msgstr "Gweinydd pell, rhowch Enw neu IP yma:"
 
-#: printer/printerdrake.pm:4018
-#, fuzzy, c-format
+#: printer/printerdrake.pm:4377
+#, c-format
 msgid "Local CUPS printing system"
-msgstr "Ffurfweddu'r system argraffu CUPS"
+msgstr "System argraffu CUPS lleol"
 
-#: printer/printerdrake.pm:4056
+#: printer/printerdrake.pm:4415
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Dewiswch Sbwlydd Argraffydd"
 
-#: printer/printerdrake.pm:4057
+#: printer/printerdrake.pm:4416
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Pa system argraffu(sbwlydd) ydych chi am ei ddefnyddio?"
 
-#: printer/printerdrake.pm:4105
+#: printer/printerdrake.pm:4464
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Methu ffurfweddu argraffydd \"%s\"!"
 
-#: printer/printerdrake.pm:4118
+#: printer/printerdrake.pm:4478
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Gosod Foomatic..."
 
-#: printer/printerdrake.pm:4124
+#: printer/printerdrake.pm:4484
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "Methu gosod pecynnau %s, methu cychwyn %s!"
 
-#: printer/printerdrake.pm:4314
+#: printer/printerdrake.pm:4674
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13862,49 +14457,49 @@ msgstr ""
 "Mae'r argraffyddion canlynol wedi eu ffurfweddu. Cliciwch ar un i newid ei "
 "osodiadau; ei wneud yn argraffydd rhagosodedig; i edrych am wybodaeth amdano."
 
-#: printer/printerdrake.pm:4344
+#: printer/printerdrake.pm:4704
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Arddangos pob  argraffydd CUPS pell sydd ar gael"
 
-#: printer/printerdrake.pm:4345
+#: printer/printerdrake.pm:4705
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Adnewyddu rhestr argraffyddion (dangos pob argraffydd CUPS pell sydd ar gael)"
 
-#: printer/printerdrake.pm:4356
+#: printer/printerdrake.pm:4716
 #, c-format
 msgid "CUPS configuration"
 msgstr "Ffurfweddiad CUPS"
 
-#: printer/printerdrake.pm:4368
+#: printer/printerdrake.pm:4728
 #, c-format
 msgid "Change the printing system"
 msgstr "Newidiwch y system argraffu"
 
-#: printer/printerdrake.pm:4377
+#: printer/printerdrake.pm:4737
 #, c-format
 msgid "Normal Mode"
 msgstr "Modd Arferol"
 
-#: printer/printerdrake.pm:4378
+#: printer/printerdrake.pm:4738
 #, c-format
 msgid "Expert Mode"
 msgstr "Modd Uwch"
 
-#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
-#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
+#: printer/printerdrake.pm:4992 printer/printerdrake.pm:5050
+#: printer/printerdrake.pm:5128 printer/printerdrake.pm:5137
 #, c-format
 msgid "Printer options"
 msgstr "Dewisiadau argraffydd"
 
-#: printer/printerdrake.pm:4668
+#: printer/printerdrake.pm:5028
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Newid ffurfweddiad yr argraffydd"
 
-#: printer/printerdrake.pm:4670
+#: printer/printerdrake.pm:5030
 #, c-format
 msgid ""
 "Printer %s%s\n"
@@ -13913,109 +14508,109 @@ msgstr ""
 "Argraffydd %s%s\n"
 "Beth ydych am ei newid ar yr argraffydd hwn?"
 
-#: printer/printerdrake.pm:4675
-#, fuzzy, c-format
+#: printer/printerdrake.pm:5035
+#, c-format
 msgid "This printer is disabled"
-msgstr "Nid oes modd newid maint y rhaniad"
+msgstr "Mae'r argraffydd wedi ei anablu"
 
-#: printer/printerdrake.pm:4677
+#: printer/printerdrake.pm:5037
 #, c-format
 msgid "Do it!"
 msgstr "Gwna!!"
 
-#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
+#: printer/printerdrake.pm:5042 printer/printerdrake.pm:5097
 #, c-format
 msgid "Printer connection type"
 msgstr "Math o gyswllt argraffydd"
 
-#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
+#: printer/printerdrake.pm:5043 printer/printerdrake.pm:5103
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Enw'r argraffydd, disgrifiad, lleoliad"
 
-#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
+#: printer/printerdrake.pm:5045 printer/printerdrake.pm:5121
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Gwneuthurwr yr argraffydd, model, gyrrwr"
 
-#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
+#: printer/printerdrake.pm:5046 printer/printerdrake.pm:5122
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Gwneuthurwr yr argraffydd, model"
 
-#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
+#: printer/printerdrake.pm:5052 printer/printerdrake.pm:5132
 #, c-format
 msgid "Set this printer as the default"
 msgstr "Gosod yr argraffydd fel y rhagosodedig"
 
-#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
-#: printer/printerdrake.pm:4780
-#, fuzzy, c-format
+#: printer/printerdrake.pm:5057 printer/printerdrake.pm:5138
+#: printer/printerdrake.pm:5140
+#, c-format
 msgid "Enable Printer"
-msgstr "Galluogi'r Gweinydd"
+msgstr "Galluogi'r argraffydd"
 
-#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
-#: printer/printerdrake.pm:4785
-#, fuzzy, c-format
+#: printer/printerdrake.pm:5060 printer/printerdrake.pm:5143
+#: printer/printerdrake.pm:5145
+#, c-format
 msgid "Disable Printer"
-msgstr "Analluogi'r Gweinydd"
+msgstr "Anablu'r Argraffydd"
 
-#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
+#: printer/printerdrake.pm:5061 printer/printerdrake.pm:5148
 #, c-format
 msgid "Print test pages"
 msgstr "Argraffu tudalennau prawf"
 
-#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
+#: printer/printerdrake.pm:5062 printer/printerdrake.pm:5150
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "Gwybod sut i ddefnyddio'r argraffydd"
 
-#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
+#: printer/printerdrake.pm:5063 printer/printerdrake.pm:5152
 #, c-format
 msgid "Remove printer"
 msgstr "Tynnu argraffydd"
 
-#: printer/printerdrake.pm:4750
+#: printer/printerdrake.pm:5110
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Tynnu hen argraffydd \"%s\"..."
 
-#: printer/printerdrake.pm:4781
-#, fuzzy, c-format
+#: printer/printerdrake.pm:5141
+#, c-format
 msgid "Printer \"%s\" is now enabled."
-msgstr "Argraffydd \"%s\" ar weinydd \"%s\""
+msgstr "Mae argraffydd\"%s\" wedi ei alluogi"
 
-#: printer/printerdrake.pm:4786
-#, fuzzy, c-format
+#: printer/printerdrake.pm:5146
+#, c-format
 msgid "Printer \"%s\" is now disabled."
-msgstr "Mae cyswllt VPN wedi ei analluogi."
+msgstr "Mae argraffydd \"%s\" wedi ei anablu"
 
-#: printer/printerdrake.pm:4823
+#: printer/printerdrake.pm:5183
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Ydych chi wir eisiau tynnu argraffydd \"%s\""
 
-#: printer/printerdrake.pm:4827
+#: printer/printerdrake.pm:5187
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Tynnu argraffydd \"%s\"..."
 
-#: printer/printerdrake.pm:4851
+#: printer/printerdrake.pm:5211
 #, c-format
 msgid "Default printer"
 msgstr "Argraffydd rhagosodedig"
 
-#: printer/printerdrake.pm:4852
+#: printer/printerdrake.pm:5212
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Mae argraffydd \"%s\" wedi ei osod fel yr argraffydd rhagosodedig."
 
-#: raid.pm:36
-#, fuzzy, c-format
-msgid "Can't add a partition to _formatted_ RAID %s"
-msgstr "Methu ychwanegu rhaniad to_formatted_RAID md%d"
+#: raid.pm:42
+#, c-format
+msgid "Can not add a partition to _formatted_ RAID %s"
+msgstr "Methu ychwanegu rhaniad to_formatted_RAID%s"
 
-#: raid.pm:132
+#: raid.pm:144
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Dim digon o raniadau ar gyfer RAID lefel %d\n"
@@ -14041,18 +14636,18 @@ msgid "Could not set permissions of firmware file %s!"
 msgstr "Methu gosod caniatâd ffeiliau cadarnwedd %s!"
 
 #: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
-#: standalone/scannerdrake:78 standalone/scannerdrake:340
-#: standalone/scannerdrake:415 standalone/scannerdrake:459
-#: standalone/scannerdrake:463 standalone/scannerdrake:485
-#: standalone/scannerdrake:550
+#: standalone/scannerdrake:78 standalone/scannerdrake:346
+#: standalone/scannerdrake:382 standalone/scannerdrake:446
+#: standalone/scannerdrake:490 standalone/scannerdrake:494
+#: standalone/scannerdrake:516 standalone/scannerdrake:581
 #, c-format
 msgid "Scannerdrake"
 msgstr "Scannerdrake"
 
-#: scanner.pm:201 standalone/scannerdrake:916
+#: scanner.pm:201 standalone/scannerdrake:947
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
-msgstr "Methu gosod y pecyn sydd ei angen i rannu eich sganiwr(sganwyr)."
+msgstr "Methu gosod y pecyn sydd ei angen i rannu eich sganiwr(wyr)."
 
 #: scanner.pm:202
 #, c-format
@@ -14077,11 +14672,11 @@ msgstr "Caniatáu/Gwrthod atsain icmp."
 #: security/help.pm:17
 #, c-format
 msgid "Allow/Forbid autologin."
-msgstr "Caniatáu Gwrthod awtomewngofnodi."
+msgstr "Caniatáu Gwrthod awto mewngofnodi."
 
 #. -PO: here "ALL" is a value in a pull-down menu; translate it the same as "ALL" is
 #: security/help.pm:21
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
 "\n"
@@ -14089,11 +14684,9 @@ msgid ""
 "\n"
 "Else only /etc/issue is allowed."
 msgstr ""
-"Ymresymiadau: (arg)\n"
-"\n"
 "Os yw \"ALL\"yn caniatáu /etc/issue a /etc/issue.net i fodoli.\n"
 "\n"
-"Os yw \"arg\" = NONE\n"
+"Os yw \\fIarg\\fP = NONE\n"
 "\n"
 "Dim materion heblaw caniatáu  /etc/issue."
 
@@ -14129,6 +14722,10 @@ msgid ""
 "\n"
 "See pam_xauth(8) for more details.'"
 msgstr ""
+"Caniatáu/gwrthod allforio dangosiad\n"
+"wrth basio o gyfrif root i ddefnyddiwr arall.\n"
+"\n"
+"Gw. am_xauth(8) a, ragor o fanylion.'"
 
 #: security/help.pm:40
 #, c-format
@@ -14154,7 +14751,7 @@ msgid ""
 "The argument specifies if clients are authorized to connect\n"
 "to the X server from the network on the tcp port 6000 or not."
 msgstr ""
-"Mae'r ymresymiad yn pennu os oes gan y defnyddiwr ganiatád i gysylltu\n"
+"Mae'r ymresymiad yn pennu os oes gan y defnyddiwr ganiatâd i gysylltu\n"
 "gyda'r  gweinydd X porth  tcp 6000 neu beidio."
 
 #. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
@@ -14201,7 +14798,7 @@ msgstr ""
 "security/msec/server i bwyntio at /etc/security/msec/server.\n"
 "<SERVER_LEVEL>. \n"
 "Mae /etc/security/msec/server yn cael ei ddefnyddio gan chkconfig --add\n"
-"at i benderfynnu ychwnaegu gwasanaeth os yw ar gael yn y\n"
+"at i benderfynu ychwanegu gwasanaeth os yw ar gael yn y\n"
 "ffeil wrth osod y pecynnau"
 
 #: security/help.pm:72
@@ -14220,7 +14817,7 @@ msgstr ""
 #: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
-msgstr "Galluogi/Analluogi adroddiadau syslog i gonsol 12"
+msgstr "Galluogi/Analluogi adroddiadau Salig i gonsol 12"
 
 #: security/help.pm:79
 #, c-format
@@ -14239,7 +14836,7 @@ msgstr "Rhybuddion Diogelwch:"
 #: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
-msgstr "Galluogi/Analluogi amddiffyn spwlio IP"
+msgstr "Galluogi/Analluogi amddiffyn sbwlio IP"
 
 #: security/help.pm:84
 #, c-format
@@ -14249,7 +14846,7 @@ msgstr "Galluogi/Analluogi libsafe os yw ar y system."
 #: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
-msgstr "Galluogi?Analluogi mewngofnodi pecynnau anarferol IPv4."
+msgstr "Galluogi/Analluogi mewngofnodi pecynnau anarferol IPv4."
 
 #: security/help.pm:88
 #, c-format
@@ -14261,7 +14858,7 @@ msgstr "Galluogi/Analluogi gwiriad diogelwch msec bob awr."
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
-" Galluogi su o aelodau grwp olwyn yn unig neu caniatáu su o unrhyw "
+" Galluogi su o aelodau grŵp olwyn yn unig neu ganiatáu su o unrhyw "
 "ddefnyddiwr."
 
 #: security/help.pm:92
@@ -14336,7 +14933,7 @@ msgstr ""
 "\n"
 "- dim cyfrinair yn /etc/shadow\n"
 "\n"
-"- defnyddwyr eraill gyda enw 0 ar wahan i gwraidd."
+"- defnyddwyr eraill gydag enw 0 ar wahân i wraidd."
 
 #: security/help.pm:117
 #, c-format
@@ -14385,7 +14982,7 @@ msgstr "os wedi ei osod i iawn, adrodd ar ffeiliau heb berchennog."
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
 msgstr ""
-"os wedi ei osod i iawn, gwirio ffeiliau/cyfeiriaduron ysgrifenadwy gan bawb."
+"os wedi ei osod i iawn, gwirio ffeiliau/cyfeiriaduron ysgrifennadwy gan bawb."
 
 #: security/help.pm:126
 #, c-format
@@ -14490,12 +15087,12 @@ msgstr ""
 #: security/l10n.pm:20
 #, c-format
 msgid "Export display when passing from root to the other users"
-msgstr ""
+msgstr "Allforio dangosiad wrth basio o root i ddefnyddwyr eraill"
 
 #: security/l10n.pm:21
 #, c-format
 msgid "Allow X Window connections"
-msgstr "Caniatáu cysylltiadai XWindows"
+msgstr "Caniatáu cysylltiadau XWindows"
 
 #: security/l10n.pm:22
 #, c-format
@@ -14551,7 +15148,7 @@ msgstr "Galluogi/Analluogi gwiriad diogelwch msec bob awr."
 #, c-format
 msgid "Enable su only from the wheel group members or for any user"
 msgstr ""
-"Galluogi su o aelodau grwp olwyn yn unig neu caniatáu su o unrhyw "
+"Galluogi su o aelodau grŵp olwyn yn unig neu ganiatáu su o unrhyw "
 "ddefnyddiwr."
 
 #: security/l10n.pm:33
@@ -14592,7 +15189,7 @@ msgstr "Hyd gyfrinair hanes"
 #: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
-msgstr "Hyd fyrraf cyfrinair a'r nifer o rifau a llythrennau mawr"
+msgstr "Hyd byrraf cyfrinair a'r nifer o rifau a llythrennau mawr"
 
 #: security/l10n.pm:41
 #, c-format
@@ -14667,7 +15264,7 @@ msgstr "Adrodd ar ffeiliau heb berchennog."
 #: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
-msgstr "Gwirio ffeiliau/cyfeiriaduron ysgrifenadwy gan bawb."
+msgstr "Gwirio ffeiliau/cyfeiriaduron ysgrifennadwy gan bawb."
 
 #: security/l10n.pm:56
 #, c-format
@@ -14782,7 +15379,7 @@ msgstr ""
 "Gyda'r lefel diogelwch hwn, mae defnydd y system fel gweinydd yn bosibl.\n"
 "Mae diogelwch yn ddigon uchel i ddefnyddio'r system fel gweinydd sy'n "
 "derbyn\n"
-"cysylltiad gan amryw o gleientiaid. Sylwer: os maei cleient yn unig yw eich "
+"cysylltiad gan amryw o gleientiaid. Sylwer: os mae i gleient yn unig yw eich "
 "peiriant ar y Rhyngrwyd, yna mae'n well i chi ddewis lefel is."
 
 #: security/level.pm:50
@@ -14791,7 +15388,7 @@ msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
 msgstr ""
-"Wedi ei seilio ar y lefel flaenorol, ond mae'r system yn hollol gaeëdig ac "
+"Wedi ei seilio ar y lefel flaenorol, ond mae'r system yn hollol gaeedig ac "
 "mae nodweddion diogelwch ar eu uchaf."
 
 #: security/level.pm:55
@@ -14852,7 +15449,7 @@ msgid ""
 "at was run, and runs batch commands when the load average is low enough."
 msgstr ""
 "Mae'n rhedeg gorchmynion wedi eu trefnu gan y gorchymyn at ar amser wedi \n"
-"ei bennu pan oedd at yn rhedeg, gan rhedeg gorchmynion swp pan fydd \n"
+"ei bennu pan oedd at yn rhedeg, gan redeg gorchmynion swp pan fydd \n"
 "cyfartaledd y llwyth yn ddigon isel."
 
 #: services.pm:25
@@ -14863,7 +15460,7 @@ msgid ""
 "basic\n"
 "UNIX cron, including better security and more powerful configuration options."
 msgstr ""
-"Mae cron yn rhaglen safonnol yn UNIX sy'n rhedeg rhaglenni sydd wedi eu \n"
+"Mae cron yn rhaglen safonol yn UNIX sy'n rhedeg rhaglenni sydd wedi eu \n"
 "pennu gan y defnyddiwr ar adegau penodol. Mae vixie cron yn ychwanegu \n"
 "nifer o ychwanegiadau i'r UNIX cron sylfaenol, yn cynnwys gwell diogelwch \n"
 "a dewisiadau ffurfweddu mwy pwerus."
@@ -14944,7 +15541,7 @@ msgstr ""
 "Mae'r pecyn hwn yn llwytho'r map bysellfwrdd rydych wedi \n"
 "ei ddewis fel yn /etc/sysconfig/keyboard. Mae modd dewis \n"
 "hwn wrth ddefnyddio'r rhaglen wasanaethu kbdconfig. \n"
-"Dylech adael hwn wedi ei alluogi ar gyfer y rhanfwyaf o beiriannau."
+"Dylech adael hwn wedi ei alluogi ar gyfer y rhan fwyaf o beiriannau."
 
 #: services.pm:45
 #, c-format
@@ -14952,7 +15549,7 @@ msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
 msgstr ""
-"Ailgreu awtomatic pennawd y cnewyllyn yn /boot ar\n"
+"Ail-greu awtomatig pennawd y cnewyllyn yn /boot ar\n"
 "gyfer /usr/include/linux{autoconf,version}.h"
 
 #: services.pm:47
@@ -15048,15 +15645,15 @@ msgstr ""
 #: services.pm:66
 #, c-format
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr "Cynnal OKI 4w ac argraffyddion windows cyffelyb."
+msgstr "Cynnal OKI 4w ac argraffyddion Windows cyffelyb."
 
 #: services.pm:67
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
-"modems in laptops.  It won't get started unless configured so it is safe to "
-"have\n"
-"it installed on machines that don't need it."
+"modems in laptops.  It will not get started unless configured so it is safe "
+"to have\n"
+"it installed on machines that do not need it."
 msgstr ""
 "Mae cynhaliaeth PCMICA fel rheol ar gyfer cynnal pethau fel \n"
 "ethernet a modem mewn gliniadur. Ni fydd yn cychwyn heb ei \n"
@@ -15114,8 +15711,8 @@ msgid ""
 msgstr ""
 "Mae'r daemon llwybrydd yn caniatáu i'r tabl llwybrydd IP awtomatig \n"
 "ddiweddaru drwy gyfrwng y protocol RIP. Tra bo RIP'n cael ei \n"
-"ddefnyddio'n eang ar rhwydweithiau bach, mae angen protocolau \n"
-"llwybrydd mwy cymleth ar gyfer rhwydweithiwu cymleth."
+"ddefnyddio'n eang ar rwydweithiau bach, mae angen protocolau \n"
+"llwybrydd mwy cymhleth ar gyfer rhwydweithiau cymhleth."
 
 #: services.pm:81
 #, c-format
@@ -15133,7 +15730,7 @@ msgid ""
 "logged in on other responding machines."
 msgstr ""
 "Mae protocol ruser yn caniatáu i ddefnyddwyr ar rwydwaith i adnabod\n"
-"pwy arall sydd wedi mewngofnodi ar beirianau eraill sy'n ymateb."
+"pwy arall sydd wedi mewngofnodi ar beiriannau eraill sy'n ymateb."
 
 #: services.pm:85
 #, c-format
@@ -15170,81 +15767,81 @@ msgstr "Llwytho'r gyrwyr ar gyfer eich dyfeisiau usb."
 msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 msgstr "Yn cychwyn Gweinydd Ffont  X (mae hyn yn orfodol i Xorg i redeg).."
 
-#: services.pm:117 services.pm:159
+#: services.pm:115 services.pm:157
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
 msgstr ""
 "Dewiswch ba wasanaethau ddylai gael eu cychwyn yn awtomatig wrth gychwyn y "
 "cyfrifiadur"
 
-#: services.pm:129
+#: services.pm:127
 #, c-format
 msgid "Printing"
 msgstr "Argraffu"
 
-#: services.pm:130
+#: services.pm:128
 #, c-format
 msgid "Internet"
 msgstr "Rhyngrwyd"
 
-#: services.pm:133
+#: services.pm:131
 #, c-format
 msgid "File sharing"
 msgstr "Rhannu Ffeiliau"
 
-#: services.pm:140
+#: services.pm:138
 #, c-format
 msgid "Remote Administration"
 msgstr "Gweinyddu Pell"
 
-#: services.pm:148
+#: services.pm:146
 #, c-format
 msgid "Database Server"
 msgstr "Gweinydd Cronfa Ddata"
 
-#: services.pm:211
+#: services.pm:209
 #, c-format
 msgid "running"
 msgstr "rhedeg"
 
-#: services.pm:211
+#: services.pm:209
 #, c-format
 msgid "stopped"
 msgstr "ataliwyd"
 
-#: services.pm:215
+#: services.pm:213
 #, c-format
 msgid "Services and daemons"
 msgstr "Gwasanaethau a daemonau"
 
-#: services.pm:221
+#: services.pm:219
 #, c-format
 msgid ""
 "No additional information\n"
 "about this service, sorry."
 msgstr "Dim gwybodaeth ychwanegol am y gwasanaeth hwn."
 
-#: services.pm:226 ugtk2.pm:1214
+#: services.pm:224 ugtk2.pm:1010
 #, c-format
 msgid "Info"
 msgstr "Gwybodaeth"
 
-#: services.pm:229
+#: services.pm:227
 #, c-format
 msgid "Start when requested"
 msgstr "Cychwyn yn ôl y gofyn"
 
-#: services.pm:229
+#: services.pm:227
 #, c-format
 msgid "On boot"
 msgstr "Cychwyn"
 
-#: services.pm:246
+#: services.pm:244
 #, c-format
 msgid "Start"
 msgstr "Cychwyn"
 
-#: services.pm:246
+#: services.pm:244
 #, c-format
 msgid "Stop"
 msgstr "Aros"
@@ -15267,16 +15864,18 @@ msgid ""
 "together with <b>a lot of applications</b> meeting every need you could even "
 "think of."
 msgstr ""
+"Mae Mandrakelinux yn <b>ddosbarthiad Linux</b> sy'n cynnwys y system graidd, "
+"sef, <b>system weithredu</b> (yn seiliedig ar gnewyllyn Linux) ynghyd â <b> "
+"llawer o raglenni</b> sy'n darparu ar gyfer pob angen."
 
 #: share/advertising/01.pl:19
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Mandrakelinux is the most <b>user-friendly</b> Linux distribution today. It "
 "is also one of the <b>most widely used</b> Linux distributions worldwide!"
 msgstr ""
-"Mae Mandrakelinux yn system weithredu Cod Agored sy'n cynnwys miloedd o'r "
-"rhaglenni gorau o'r byd Meddalwedd Rhydd. Mandrakelinux yw un o'r fersiynau "
-"mwyaf poblogaidd o Linux ar draws y byd i gyd!"
+"Mandrakelinux yw'r dosbarthiad Linux mwyaf <b>cyfeillgar</b> heddiw. Mae'n "
+"un o'r dosbarthiadau mwyaf <b>poblogaidd</b> o Linux ar draws y byd i gyd!"
 
 #: share/advertising/02.pl:13
 #, c-format
@@ -15284,35 +15883,36 @@ msgid "<b>Open Source</b>"
 msgstr "<b>Cod agored</b>"
 
 #: share/advertising/02.pl:15
-#, fuzzy, c-format
+#, c-format
 msgid "Welcome to the <b>world of open source</b>!"
-msgstr "Croeso i fyd Cod Agored!"
+msgstr "Croeso i <b>fyd Cod Agored</b>!"
 
 #: share/advertising/02.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Mandrakelinux is committed to the open source model. This means that this "
 "new release is the result of <b>collaboration</b> between <b>Mandrakesoft's "
 "team of developers</b> and the <b>worldwide community</b> of Mandrakelinux "
 "contributors."
 msgstr ""
-"Mae Mandrakelinux yn ymroddedig i Fodel Cod Agored ac mae'n parchu'r General "
-"Public Licence yn llaw. Mae'r fersiwn newydd yn ganlyniad cydweithrediad tîm "
-"o ddatblygwyr Mandrakesoft â chyfranwyr cymuned byd eang Mandrakelinux."
+"Mae Mandrakelinux yn ymroddedig i fodel cod agored. Mae'n golygu fod y "
+"rhyddhad newydd yn ganlyniad <b>cydweithrediad</b> rhwng <b>tîm o "
+"ddatblygwyr Mandrakesoft</b> a <b>chyfranwyr cymuned byd eang</b> cyfranwyr "
+"Mandrakelinux."
 
 #: share/advertising/02.pl:19
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "We would like to <b>thank</b> everyone who participated in the development "
 "of this latest release."
 msgstr ""
-"Hoffwn ni ddiolch i bawb sydd wedi cymryd rhan yn natblygiad y fersiwn "
+"Hoffwn <b>ddiolch</b> i bawb sydd wedi cymryd rhan yn natblygiad y fersiwn "
 "diweddaraf."
 
 #: share/advertising/03.pl:13
 #, c-format
 msgid "<b>The GPL</b>"
-msgstr "<b>Y trwydded GPL</b>"
+msgstr "<b>Y drwydded GPL</b>"
 
 #: share/advertising/03.pl:15
 #, c-format
@@ -15320,6 +15920,9 @@ msgid ""
 "Most of the software included in the distribution and all of the "
 "Mandrakelinux tools are licensed under the <b>General Public License</b>."
 msgstr ""
+"Mae'r rhan fwyaf o'r feddalwedd sydd wedi ei gynnwys ynghyd â holl offer "
+"Mandrakelinux wedi eu trwyddedu o dan y <b>Drwydded Gyhoeddus Cyffredinol "
+"(GPL)</b>"
 
 #: share/advertising/03.pl:17
 #, c-format
@@ -15328,6 +15931,9 @@ msgid ""
 "<b>freedom</b> to use, study, distribute and improve the software any way "
 "they want, provided they make the results available."
 msgstr ""
+"Y GPL yw craidd y model cod agored, mae'n caniatáu i bawb y <b>rhyddid</b> i "
+"ddefnyddio, astudio, dosbarthu a gwella meddalwedd mewn unrhyw ffordd, cyn "
+"belled â bod y canlyniad ar gael."
 
 #: share/advertising/03.pl:19
 #, c-format
@@ -15335,6 +15941,8 @@ msgid ""
 "The main benefit of this is that the number of developers is virtually "
 "<b>unlimited</b>, resulting in <b>very high quality</b> software."
 msgstr ""
+"Y brif fantais i hyn yw bod y nifer o ddatblygwyr yn <b>ddiderfyn</b>, yn "
+"golygu meddalwedd o<b>safon uchel iawn</b>."
 
 #: share/advertising/04.pl:13
 #, c-format
@@ -15349,6 +15957,10 @@ msgid ""
 "reporting to the development of new applications. The community plays a "
 "<b>key role</b> in the Mandrakelinux world."
 msgstr ""
+"Mae gan Mandrakelinux un o'r <b>cymunedau mwyaf</b> o ddefnyddwyr a "
+"datblygwyr. Mae rôl y gymuned yn eang iawn yn ymestyn o adrodd ar wallau i "
+"ddatblygu rhaglenni newydd. Mae'r gymuned yn chwarae <b>rhan allweddol</b> "
+"ym myd Mandrakelinux."
 
 #: share/advertising/04.pl:17
 #, c-format
@@ -15357,6 +15969,9 @@ msgid ""
 "mandrakelinux.com</b> or directly <b>www.mandrakelinux.com/en/cookerdevel."
 "php3</b> if you would like to get <b>involved</b> in the development."
 msgstr ""
+"I <b>ddysgu mwy</b> am ein cymuned egniol, ewch i <b>www.mandrakelinux.com</"
+"b> neu yn uniongyrchol at <b>www.mandrakelinux.com/ên/cookerdevel.php3</b> "
+"os hoffech <b>ymuno</b> â'r datblygiadau."
 
 #: share/advertising/05.pl:13
 #, c-format
@@ -15369,19 +15984,23 @@ msgid ""
 "You are now installing <b>Mandrakelinux Download</b>. This is the free "
 "version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
+"Rydych yn gosod <b> Mandrakelinux Llwytho i Lawr</b>. Hwn yw'r fersiwn rhydd "
+"mae Mandrakesoft am ei ddarparu <b>ar gael i bawb</b>."
 
 #: share/advertising/05.pl:17
 #, c-format
 msgid ""
 "The Download version <b>cannot include</b> all the software that is not open "
-"source. Therefore, you won't find in the Download version:"
+"source. Therefore, you will not find in the Download version:"
 msgstr ""
+"Nid yw'r fersiwn Llwytho i Lawr <b> yn gallu cynnwys</b> yr holl feddalwedd "
+"nad yw'n god agored. Felly bydd y canlynol ddim yn y fersiwn Llwytho i Lawr:"
 
 #: share/advertising/05.pl:18
 #, c-format
 msgid ""
 "\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
-msgstr ""
+msgstr "\t* <b>Gyrwyr perchnogol</b> (megis gyrwyr NVIDIA®, ATI™, ac ati.)."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -15389,83 +16008,88 @@ msgid ""
 "\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
 "Flash™, etc.)."
 msgstr ""
+"\t* <b>Meddalwedd perchnogol</b> (megis Acrobat® Reader®, RealPlayer®, "
+"Flash™, ac ati.)."
 
 #: share/advertising/05.pl:21
 #, c-format
 msgid ""
-"You won't have access to the <b>services included</b> in the other "
+"You will not have access to the <b>services included</b> in the other "
 "Mandrakesoft products either."
 msgstr ""
+"Ni fydd gennych fynediad i'r <b>gwasanaethau ynglwm</b> yn y cynnyrch "
+"Mandrakesoft eraill ychwaith."
 
 #: share/advertising/06.pl:13
 #, c-format
 msgid "<b>Discovery, Your First Linux Desktop</b>"
-msgstr ""
+msgstr "<b>Discovery, Eich Bwrdd Gwaith Linux Cyntaf</b>"
 
 #: share/advertising/06.pl:15
 #, c-format
 msgid "You are now installing <b>Mandrakelinux Discovery</b>."
-msgstr ""
+msgstr "Rydych yn gosod <b>Mandrake Discovery</b>"
 
 #: share/advertising/06.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Discovery is the <b>easiest</b> and most <b>user-friendly</b> Linux "
 "distribution. It includes a hand-picked selection of <b>premium software</b> "
 "for office, multimedia and Internet activities. Its menu is task-oriented, "
 "with a single application per task."
 msgstr ""
-"Disgovery yw'r fersiwn hawsaf a mwyaf cyfeillgar i'r defnyddiwr. Mae'n "
-"cynnwys y meddalwedd orau sydd wedi ei ddewis yn ofalus ar gyfer defnydd "
-"Swyddfa, Aml-gyfrwng a Rhyngrwyd."
+"Discovery yw'r fersiwn <b>hawsaf</b> a mwyaf <b>cyfeillgar</b> i'r "
+"defnyddiwr. Mae'n cynnwys y <b>meddalwedd orau</b> sydd wedi ei ddewis yn "
+"ofalus ar gyfer defnydd swyddfa, aml-gyfrwng a gweithgaredd rhyngrwyd. Mae "
+"ei ddewislenni yn cylchdroi o amgylch tasgau gydag un rhaglen i bob tasg."
 
 #: share/advertising/07.pl:13
 #, c-format
 msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
-msgstr ""
+msgstr "<b>PowerPack, Y Bwrdd Gwaith Linux Gorau</b>"
 
 #: share/advertising/07.pl:15
 #, c-format
 msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
-msgstr ""
+msgstr "Rydych yn gosod <b>Mandrakelinux PowerPack</b>"
 
 #: share/advertising/07.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "PowerPack is Mandrakesoft's <b>premier Linux desktop</b> product. PowerPack "
 "includes <b>thousands of applications</b> - everything from the most popular "
 "to the most advanced."
 msgstr ""
-"PowerPack yw prif gynnyrch bwrdd gwaith Linux Mandrakelinux. Yn ogystal â "
-"bod yr hawsaf a'r mwyaf cyfeillgar o ddosbarthiadau Linux, mae PowerPack yn "
-"cynnwys miloedd o raglenni - popeth o'r mwyaf poblogaidd i'r mwyaf technegol."
+"PowerPack yw <b>prif gynnyrch bwrdd gwaith Linux</b> Mandrakesoft. Mae "
+"PowerPack yn cynnwys <b>miloedd o raglenni</b> - popeth o'r mwyaf poblogaidd "
+"i'r mwyaf technegol."
 
 #: share/advertising/08.pl:13
 #, c-format
 msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
-msgstr ""
+msgstr "<b>PowerPack+, Ateb Linux ar gyfer Byrddau gwaith a Gweinyddion</b>"
 
 #: share/advertising/08.pl:15
 #, c-format
 msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
-msgstr ""
+msgstr "Rydych yn gosod <b>Mandrakelinux PowerPack+</b>."
 
 #: share/advertising/08.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "PowerPack+ is a <b>full-featured Linux solution</b> for small to medium-"
 "sized <b>networks</b>. PowerPack+ includes thousands of <b>desktop "
 "applications</b> and a comprehensive selection of world-class <b>server "
 "applications</b>."
 msgstr ""
-"Mae PowerPack+ yn ateb Linux llawn ar gyfer rhwydweithiau bach a chanolig. "
-"Mae PowerPack+ yn ychwanegu gwerth y pecyn safonol drwy ychwanegu dewis "
-"cynhwysfawr o raglenni gweinydd."
+"PowerPack+ <b>yr ateb Linux llawn</b> ar gyfer <b>rhwydweithiau</b> bach a "
+"chanolig. Mae PowerPack+ yn cynnwys miloedd o <b>raglenni bwrdd gwaith</b> a "
+"dewis cynhwysfawr o'r <b>raglenni gweinydd</b> mwyaf blaengar."
 
 #: share/advertising/09.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Mandrakesoft Products</b>"
-msgstr "<b>Mandrakestore</b>"
+msgstr "<b>Cynnyrch Mandrakesoft</b>"
 
 #: share/advertising/09.pl:15
 #, c-format
@@ -15473,26 +16097,29 @@ msgid ""
 "<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
 "products."
 msgstr ""
+"Mae <b>Mandrakesoft</b> wedi datblygu ystod eang o gynnyrch "
+"<b>Mandrakelinux</b>."
 
 #: share/advertising/09.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid "The Mandrakelinux 10.1 products are:"
-msgstr "Rhaglennig Diweddaru Mandrakelinux"
+msgstr "Cynnyrch Mandrakelinux 10.1 yw:"
 
 #: share/advertising/09.pl:18
 #, c-format
 msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
-msgstr ""
+msgstr "\t* <b>Discovery</b>, Eich Bwrdd Gwaith Linux Cyntaf."
 
 #: share/advertising/09.pl:19
 #, c-format
 msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
-msgstr ""
+msgstr "\t* <b>PowerPack</b>, Y Bwrdd Gwaith Linux Gorau."
 
 #: share/advertising/09.pl:20
 #, c-format
 msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
 msgstr ""
+"\t* <b>PowerPack+</b>, Ateb Linux ar gyfer Byrddau Gwaith a Gweinyddion."
 
 #: share/advertising/09.pl:21
 #, c-format
@@ -15500,11 +16127,13 @@ msgid ""
 "\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
 "making the most of your 64-bit processor."
 msgstr ""
+"\t* <b>Mandrakelinux 10.1 ar gyfer x86-64</b>, Ateb Mandrakelinux i wneud y "
+"gorau o'ch prosesydd 64-did."
 
 #: share/advertising/10.pl:13
 #, c-format
 msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
-msgstr ""
+msgstr "<b>Cynnyrch Mandrakesoft (Cynnyrch Nomad)</b>"
 
 #: share/advertising/10.pl:15
 #, c-format
@@ -15512,13 +16141,16 @@ msgid ""
 "Mandrakesoft has developed two products that allow you to use Mandrakelinux "
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
+"Mae Mandrakelinux wedi datblygu dau gynnyrch sy'n caniatáu i chi ddefnyddio "
+"Mandrakelinux <b>ar unrhyw gyfrifiadur</b> heb fod angen ei osod:"
 
 #: share/advertising/10.pl:16
 #, c-format
 msgid ""
 "\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
-"bootable CD-Rom."
+"bootable CD-ROM."
 msgstr ""
+"\t* <b>Move</b>, dosbarthiad Mandrakelinux sy'n rhedeg yn llwyr o CD-ROM byw."
 
 #: share/advertising/10.pl:17
 #, c-format
@@ -15526,11 +16158,13 @@ msgid ""
 "\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
+"\t* <b>GlobeTrotter</b>, dosbarthiad Mandrakelinux sydd wedi ei osod yn "
+"barod ar “LaCie Mobile Hard Drive” bychan iawn"
 
 #: share/advertising/11.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
-msgstr "Dewch i wybod am ein <b>Atebion Personol</b>"
+msgstr "<b>Cynnyrch Mandrakesoft (Atebion Proffesiynol)</b>"
 
 #: share/advertising/11.pl:15
 #, c-format
@@ -15538,21 +16172,25 @@ msgid ""
 "Below are the Mandrakesoft products designed to meet the <b>professional "
 "needs</b>:"
 msgstr ""
+"Isod mae cynnyrch Mandrakesoft sydd wedi eu cynllunio i ateb <b>anghenion "
+"proffesiynol</b>:"
 
 #: share/advertising/11.pl:16
 #, c-format
 msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
 msgstr ""
+"\t* <b>Y Bwrdd Gwaith Corfforaethol</b>, Bwrdd Gwaith Mandrakelinux ar gyfer "
+"Busnesau."
 
 #: share/advertising/11.pl:17
 #, c-format
 msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
-msgstr ""
+msgstr "\t* <b>Y Gweinydd Corfforaethol</b>, Ateb Gweinydd Mandrakelinux."
 
 #: share/advertising/11.pl:18
 #, c-format
 msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
-msgstr ""
+msgstr "\t* <b>Mur Cadarn Aml-Rhwydwaith</b>, Ateb Diogelwch Mandrakelinux."
 
 #: share/advertising/12.pl:13
 #, c-format
@@ -15565,13 +16203,18 @@ msgid ""
 "With your Discovery, you will be introduced to <b>KDE</b>, the most advanced "
 "and user-friendly <b>graphical desktop environment</b> available."
 msgstr ""
+"Gyda'ch pecyn Discovery, byddwch yn cael eich cyflwyno i <b>KDE</b>, yr "
+"<b>amgylchedd bwrdd gwaith graffigol</b> mwyaf blaengar a chyfeillgar, sydd "
+"ar gael."
 
 #: share/advertising/12.pl:17
 #, c-format
 msgid ""
 "KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
-"won't ever think of running another operating system!"
+"will not ever think of running another operating system!"
 msgstr ""
+"Bydd KDE yn gwneud eich <b>camau cyntaf</b> gyda Linux mor  <b>hawdd</b> "
+"byddwch wrth eich bodd!"
 
 #: share/advertising/12.pl:19
 #, c-format
@@ -15579,11 +16222,13 @@ msgid ""
 "KDE also includes a lot of <b>well integrated applications</b> such as "
 "Konqueror, the web browser and Kontact, the personal information manager."
 msgstr ""
+"Mae KDE hefyd yn cynnwys llawer o <b>raglenni wedi eu hintegreiddio’n dda</"
+"b> megis Konqueror, y porwr gwe a Kontact, y rheolwr gwybodaeth bersonol."
 
 #: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Choose your Favorite Desktop Environment</b>"
-msgstr "<b> Dewiswch amgylchedd Bwrdd Gwaith graffigol!</b>"
+msgstr "<b>Dewiswch eich Hoff Amgylchedd Bwrdd Gwaith</b>"
 
 #: share/advertising/13-a.pl:15
 #, c-format
@@ -15591,6 +16236,8 @@ msgid ""
 "With PowerPack, you will have the choice of the <b>graphical desktop "
 "environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
+"Gyda PowerPack, bydd gennych y dewis o <b>amgylchedd bwrdd gwaith graffigol</"
+"b>. Mae Mandrakesoft wedi dewis <b>KDE</b> fel yr un rhagosodedig."
 
 #: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
@@ -15598,6 +16245,8 @@ msgid ""
 "KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
 "desktop environment available. It includes a lot of integrated applications."
 msgstr ""
+"KDE yw un o'r amgylcheddau bwrdd gwaith graffigol <b>mwyaf blaengar</b> a "
+"<b>chyfeillgar</b> sydd ar gael. Mae'n cynnwys llawer o raglenni integredig."
 
 #: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
@@ -15605,6 +16254,8 @@ msgid ""
 "But we advise you to try all available ones (including <b>GNOME</b>, "
 "<b>IceWM</b>, etc.) and pick your favorite."
 msgstr ""
+"Ond cewch arbrofi gyda'r cyfan (gan gynnwys <b> GNOME</b>, <b>IceWM</b>, ac "
+"ati) a dewis eich ffefryn."
 
 #: share/advertising/13-b.pl:15
 #, c-format
@@ -15612,16 +16263,18 @@ msgid ""
 "With PowerPack+, you will have the choice of the <b>graphical desktop "
 "environment</b>. Mandrakesoft has chosen <b>KDE</b> as the default one."
 msgstr ""
+"Gyda PowerPack+, mae gennych y dewis o <b>amgylcheddau bwrdd gwaith "
+"graffigol</b>. Mae Mandrakesoft wedi dewis <b>KDE</b> fel y rhagosodedig."
 
 #: share/advertising/14.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>OpenOffice.org</b>"
-msgstr "OpenOffice.org Math"
+msgstr "<b>OpenOffice.org</b>"
 
 #: share/advertising/14.pl:15
 #, c-format
 msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
-msgstr ""
+msgstr "With Discovery, you will discover <b>OpenOffice.org</b>."
 
 #: share/advertising/14.pl:17
 #, c-format
@@ -15629,6 +16282,8 @@ msgid ""
 "It is a <b>full-featured office suite</b> that includes word processor, "
 "spreadsheet, presentation and drawing applications."
 msgstr ""
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 
 #: share/advertising/14.pl:19
 #, c-format
@@ -15636,6 +16291,8 @@ msgid ""
 "OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
 "documents such as Word, Excel and PowerPoint® files."
 msgstr ""
+"Mae OpenOffice.org yn gallu darllen ac ysgrifennu'r mathau mwyaf cyffredin o "
+"ddogfennau <b>Microsoft® Office</b> megis Word, Excel a PowerPoint®."
 
 #: share/advertising/15.pl:13
 #, c-format
@@ -15647,17 +16304,18 @@ msgstr "<b>Kontact</b>"
 msgid ""
 "Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
+"Mae Discovery yn cynnwys <b>Kontact</b>, <b>ateb grwpwar</b> newydd KDE."
 
 #: share/advertising/15.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "More than just a full-featured <b>e-mail client</b>, Kontact also includes "
 "an <b>address book</b>, a <b>calendar</b>, plus a tool for taking <b>notes</"
 "b>!"
 msgstr ""
-"Mwy na dim ond rhaglen e-bost cynhwysfawr, mae <b>Kontact</b> hefyd yn "
-"cynnwys llyfr cyfeiriadau, calendr ac amserlen, yn ogystal â rhaglen cymryd "
-"nodiadau!"
+"Yn fwy na <b>rhaglen e-bost</b> llawn, mae Kontact hefyd yn cynnwys <b>llyfr "
+"cyfeiriadau</b>, a <b>chalendr</b>, yn ogystal ag offeryn i gymryd "
+"<b>nodiadau</b>!"
 
 #: share/advertising/15.pl:19
 #, c-format
@@ -15665,6 +16323,7 @@ msgid ""
 "It is the easiest way to communicate with your contacts and to organize your "
 "time."
 msgstr ""
+"Dyma'r ffordd hawsaf i gyfathrebu gyda'ch cysylltiadau a threfnu eich amser."
 
 #: share/advertising/16.pl:13
 #, c-format
@@ -15674,22 +16333,22 @@ msgstr "<b>Crwydro'r Rhyngrwyd</b>"
 #: share/advertising/16.pl:15
 #, c-format
 msgid "Discovery will give you access to <b>every Internet resource</b>:"
-msgstr ""
+msgstr "Bydd Discovery yn rhoi mynediad i <b>bob adnodd ar y We</b>:"
 
 #: share/advertising/16.pl:16
-#, fuzzy, c-format
+#, c-format
 msgid "\t* Browse the <b>Web</b> with Konqueror."
-msgstr "\t* Pori'r We gyda <b>Gwe-lywiwr-Mozilla a Konqueror</b>"
+msgstr "\t* Pori'r <b>We</b> gyda Konqueror."
 
 #: share/advertising/16.pl:17
 #, c-format
 msgid "\t* <b>Chat</b> online with your friends using Kopete."
-msgstr ""
+msgstr "\t* <b>Sgwrsio</b> ar-lein gyda'ch ffrindiau drwy Kopete."
 
 #: share/advertising/16.pl:18
-#, fuzzy, c-format
+#, c-format
 msgid "\t* <b>Transfer</b> files with KBear."
-msgstr "Trosglwyddo ffeil gyda FTP"
+msgstr "\t* <b>Trosglwyddo</b> ffeiliau gyda KBear."
 
 #: share/advertising/16.pl:19 share/advertising/17.pl:19
 #: share/advertising/18.pl:22
@@ -15700,41 +16359,41 @@ msgstr "\t* ..."
 #: share/advertising/17.pl:13
 #, c-format
 msgid "<b>Enjoy our Multimedia Features</b>"
-msgstr ""
+msgstr "<b>Mwynhewch y Nodweddion Amlgyfrwng</b>"
 
 #: share/advertising/17.pl:15
 #, c-format
 msgid "Discovery will also make <b>multimedia</b> very easy for you:"
-msgstr ""
+msgstr "Bydd Discovery yn gwneud <b>aml-gyfrwng</b> yn hawdd iawn i chi:"
 
 #: share/advertising/17.pl:16
 #, c-format
 msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
-msgstr ""
+msgstr "\t* Gwylio eich hoff <b>fideos</b> gyda Kaffeine."
 
 #: share/advertising/17.pl:17
 #, c-format
 msgid "\t* Listen to your <b>music files</b> with amaroK."
-msgstr ""
+msgstr "\t* Gwrando ar eich <b>ffeiliau cerddoriaeth</b> gydag amaroK."
 
 #: share/advertising/17.pl:18
-#, fuzzy, c-format
+#, c-format
 msgid "\t* Edit and create <b>images</b> with the GIMP."
-msgstr "\t* Golygu delweddau a ffotograffau gyda <b>The Gimp</b>"
+msgstr "\t* Golygu a chreu <b>delweddau</b> gyda GIMP."
 
 #: share/advertising/18.pl:13
 #, c-format
 msgid "<b>Enjoy the Wide Range of Applications</b>"
-msgstr ""
+msgstr "<b>Mwynhau'r Ystod Eang o Raglenni</b>"
 
 #: share/advertising/18.pl:15
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
 "<b>all of your tasks</b>:"
 msgstr ""
-"Yn newislen Mandrakelinux cewch raglenni hawdd eu defnyddio ar gyfer pob "
-"tasg:"
+"Yn newislen Mandrakelinux byddwch yn canfod rhaglenni <b>hawdd eu defnyddio</"
+"b> ar gyfer <b>eich holl waith</b>:"
 
 #: share/advertising/18.pl:16
 #, c-format
@@ -15743,18 +16402,18 @@ msgstr ""
 "\t* Creu, golygu a rhannu dogfennau swyddfa gydag <b>OpenOffice.org</b>"
 
 #: share/advertising/18.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\t* Manage your personal data with the integrated personal information "
 "suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
-"\t* Rheoli eich data personol gyda chasgliad o raglenni gwybodaeth bersonol "
-"integredig: Kontact ac Evolution"
+"\t* Rheoli eich gwybodaeth bersonol gyda rhaglenni gwybodaeth bersonol "
+"integredig (PIM) <b>Kontact</b> ac <b>Evolution</b>."
 
 #: share/advertising/18.pl:18
 #, c-format
 msgid "\t* Browse the web with <b>Mozilla</b> and <b>Konqueror</b>."
-msgstr "\t* Pori'r We gyda <b>Gwe-lywiwr-Mozilla</b> a <b>Konqueror</b>"
+msgstr "\t* Pori'r We gyda <b>Gwe-lywiwr Mozilla</b> a <b>Konqueror</b>"
 
 #: share/advertising/18.pl:19
 #, c-format
@@ -15762,11 +16421,13 @@ msgid "\t* Participate in online chat with <b>Kopete</b>."
 msgstr "\t* Cymryd rhan mewn sgyrsiau ar-lein gyda <b>Kopete</b>"
 
 #: share/advertising/18.pl:20
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\t* Listen to your <b>audio CDs</b> and <b>music files</b>, watch your "
 "<b>videos</b>."
-msgstr "\t* Gwrando ar CDau a ffeiliau cerddoriaeth gyda KsCD a <b>Totem</b>"
+msgstr ""
+"\t* Gwrando ar eich <b>CDiau sain</b> a <b>ffeiliau cerddoriaeth</b>, gwylio "
+"eich  <b>fideos</b>."
 
 #: share/advertising/18.pl:21
 #, c-format
@@ -15783,6 +16444,8 @@ msgstr "<b>Amgylcheddau datblygu</b>"
 msgid ""
 "PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
+"Mae PowerPack yn rhoi'r offer gorau i chi i <b>ddatblygu</b> eich rhaglenni "
+"eich hun."
 
 #: share/advertising/19.pl:17
 #, c-format
@@ -15790,6 +16453,8 @@ msgid ""
 "You will enjoy the powerful, integrated development environment from KDE, "
 "<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
+"Byddwch yn gallu mwynhau'r amgylchedd datblygu integredig pwerus gan KDE, "
+"<b>KDevelop</b>, sy'n caniatáu i chi raglenni mewn nifer o ieithoedd."
 
 #: share/advertising/19.pl:19
 #, c-format
@@ -15797,16 +16462,20 @@ msgid ""
 "PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
 "b>, the associated debugger."
 msgstr ""
+"Mae PowerPack hefyd yn cynnwys <b>GCC</b>, y crynhöwr Linux blaenaf a "
+"<b>GDB</b>, y dadfygiwr cysylltiedig."
 
 #: share/advertising/20.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Development Editors</b>"
-msgstr "<b>Offer datblygu</b>"
+msgstr "<b>Golygyddion Datblygu</b>"
 
 #: share/advertising/20.pl:15
 #, c-format
 msgid "PowerPack will let you choose between those <b>popular editors</b>:"
 msgstr ""
+"Mae PowerPack yn caniatáu i chi ddewis rhwng y <b>golygyddion poblogaidd</b> "
+"hyn:"
 
 #: share/advertising/20.pl:16
 #, c-format
@@ -15828,9 +16497,9 @@ msgid ""
 msgstr "Vim: golygydd testun uwch gyda mwy o nodweddion na'r Vi safonol"
 
 #: share/advertising/21.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Development Languages</b>"
-msgstr "<b>Offer datblygu</b>"
+msgstr "<b>Ieithoedd Datblygu</b>"
 
 #: share/advertising/21.pl:15
 #, c-format
@@ -15838,16 +16507,18 @@ msgid ""
 "With all these <b>powerful tools</b>, you will be able to write applications "
 "in <b>dozens of programming languages</b>:"
 msgstr ""
+"Gyda'r holl <b>offer pwerus</b>hyn, bydd modd i chi ysgrifennu rhaglenni "
+"mewn <b>dwsinau o ieithoedd rhaglenni</b>:"
 
 #: share/advertising/21.pl:16
 #, c-format
 msgid "\t* The famous <b>C language</b>."
-msgstr ""
+msgstr "\t* Yr enwog <b>iaith C</b>."
 
 #: share/advertising/21.pl:17
 #, c-format
 msgid "\t* Object oriented languages:"
-msgstr ""
+msgstr "\t* Ieithoedd cyfeirio gwrthrych:"
 
 #: share/advertising/21.pl:18
 #, c-format
@@ -15891,11 +16562,14 @@ msgid ""
 "leading Linux compiler <b>GCC</b>, you will be able to create applications "
 "in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
+"Gydag amgylchedd datblygu integredig pwerus <b>KDevelop</b> â'r crynhöwr "
+"Linux blaenaf <b>GCC</b>, bydd modd i chi greu rhaglenni mewn <b>nifer o "
+"ieithoedd gwahanol </b> (C, C++, Java™, Perl, Python, ac ati)."
 
 #: share/advertising/23.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Groupware Server</b>"
-msgstr "<b>Gweinyddion</b>"
+msgstr "<b>Gweinydd Grwpwar</b>"
 
 #: share/advertising/23.pl:15
 #, c-format
@@ -15904,21 +16578,23 @@ msgid ""
 "<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
 "allow you to:"
 msgstr ""
+"Mae PowerPack+ yn rhoi mynediad i <b>Kolab</b>, <b>gweinydd grwpwar</b> "
+"llawn, fydd, diolch i'r cleient <b>Kontact</b>, yn caniatáu i chi i:"
 
 #: share/advertising/23.pl:16
-#, fuzzy, c-format
+#, c-format
 msgid "\t* Send and receive your <b>e-mails</b>."
-msgstr "\t* Anfon a derbyn e-bost"
+msgstr "\t* Anfon a derbyn eich <b>e-byst</b>."
 
 #: share/advertising/23.pl:17
 #, c-format
 msgid "\t* Share your <b>agendas</b> and your <b>address books</b>."
-msgstr ""
+msgstr "\t* Rannu eich <b>agendas</b> â'ch <b>llyfrau cyfeiriadau</b>."
 
 #: share/advertising/23.pl:18
 #, c-format
 msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
-msgstr ""
+msgstr "\t* Rheoli eich <b>memos</b> a'ch <b>rhestrau tasgau</b>."
 
 #: share/advertising/24.pl:13
 #, c-format
@@ -15947,11 +16623,13 @@ msgid "\t* <b>Apache</b>: The most widely used web server."
 msgstr "\t* <b>Apache</b>: Y gweinydd Gwe mwyaf poblogaidd"
 
 #: share/advertising/24.pl:18
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\t* <b>MySQL</b> and <b>PostgreSQL</b>: The world's most popular open source "
 "databases."
-msgstr "\t* <b>MySQL</b>: Cronfa ddata mwyaf poblogaidd y byd Cod Agored"
+msgstr ""
+"\t* <b>MySQL</b> a <b>PostgreSQL</b>: Y cronfeydd data cod agored mwyaf "
+"poblogaidd"
 
 #: share/advertising/24.pl:19
 #, c-format
@@ -15974,6 +16652,8 @@ msgid ""
 "\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
 "servers."
 msgstr ""
+"\t* <b>Postfix</b> a <b>Sendmail</b>: Gweinyddion e-bost pwerus a "
+"phoblogaidd."
 
 #: share/advertising/25.pl:13
 #, c-format
@@ -15981,31 +16661,32 @@ msgid "<b>Mandrakelinux Control Center</b>"
 msgstr "<b>Canolfan Rheoli Mandrakelinux</b>"
 
 #: share/advertising/25.pl:15
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The <b>Mandrakelinux Control Center</b> is an essential collection of "
 "Mandrakelinux-specific utilities designed to simplify the configuration of "
 "your computer."
 msgstr ""
-"Mae'r Ganolfan Rheoli Mandrakelinux yn gasgliad hanfodol o wasanaethau "
-"Mandrake penodol ar gyfer symlhau ffurfweddiad eich cyfrifiadur."
+"Mae <b>Canolfan Reoli Mandrakelinux</b> yn gasgliad hanfodol o wasanaethau "
+"ar gyfer Mandrakelinux swydd wedi eu cynllunio i symlhau ffurfweddiad eich "
+"cyfrifiadur."
 
 #: share/advertising/25.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You will immediately appreciate this collection of <b>more than 60</b> handy "
 "utilities for <b>easily configuring your system</b>: hardware devices, mount "
 "points, network and Internet, security level of your computer, etc."
 msgstr ""
-"Byddwch yn gwerthfawrogi'n syth y casgliad o wasanaethau defnyddiol ar gyfer "
-"ffurfwffurfweddu hawdd dyfeisiau caledwedd, diffinio pwyntiau gosod, gosod "
-"Rhwydwaith â'r Rhyngrwyd yn ei le, newid lefel diogelwch eich cyfrifiadur a "
-"bron i bopeth sy'n gysylltiedig â'r system."
+"Byddwch yn gwerthfawrogi'n syth y casgliad o <b>fwy na 60</b> o wasanaethau "
+"hwylus ar gyfer <b>ffurfweddu'ch system yn hawdd</b>: dyfeisiau caledwedd, "
+"pwyntiau gosod, rhwydwaith a Rhyngrwyd, lefel diogelwch eich cyfrifiadur, ac "
+"ati."
 
 #: share/advertising/26.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>The Open Source Model</b>"
-msgstr "<b>Dewis KDE,</b>"
+msgstr "<b>Y Model Cod Agored</b>"
 
 #: share/advertising/26.pl:15
 #, c-format
@@ -16017,25 +16698,32 @@ msgid ""
 "and the development of Mandrakelinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
+"Fel pob rhaglenni cyfrifiadurol, mae meddalwedd cod agored <b>yn golygu "
+"amser a phobl</b> ar gyfer datblygiad. Er mwyn parchu athroniaeth cod "
+"agored, mae Mandrakesoft yn gwerthu cynnyrch gwerth ychwanegol a "
+"gwasanaethau i <b>barhau i wella Mandrakelinux</b>. Os hoffech chi "
+"<b>gefnogi athroniaeth cod agored</b> a datblygiad Mandrakelinux, <b>os "
+"gwelwch chi'n dda</b> ystyriwch brynu ein cynnyrch neu ein gwasanaethau!"
 
 #: share/advertising/27.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Online Store</b>"
-msgstr "<b>MandrakeStore</b>"
+msgstr "<b>Siop Ar-lein</b>"
 
 #: share/advertising/27.pl:15
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "To learn more about Mandrakesoft products and services, you can visit our "
 "<b>e-commerce platform</b>."
 msgstr ""
-"Cewch holl gynnyrch a gwasanaethau Mandrakesoft yn <b>Mandrakestore</b> -- "
-"ein llwyfan gwasanaeth llawn."
+"I ddysgu rhagor am gynnyrch a gwasanaethau Mandrakesoft, ewch i'n "
+"<b>platfform e-fasnachu</b>."
 
 #: share/advertising/27.pl:17
 #, c-format
 msgid "There you can find all our products, services and third-party products."
 msgstr ""
+"Yno cewch ganfod ein holl gynnyrch, gwasanaethau a chynnyrch trydydd parti."
 
 #: share/advertising/27.pl:19
 #, c-format
@@ -16043,11 +16731,13 @@ msgid ""
 "This platform has just been <b>redesigned</b> to improve its efficiency and "
 "usability."
 msgstr ""
+"Mae'r platfform newydd gael ei <b>ail gynllunio</b> i wella ei "
+"effeithlonrwydd a'i ddefnyddioldeb."
 
 #: share/advertising/27.pl:21
 #, c-format
 msgid "Stop by today at <b>store.mandrakesoft.com</b>!"
-msgstr "Ewch i<b> store.mandrakesoft.com</b> heddiw."
+msgstr "Ewch i <b> store.mandrakesoft.com</b> heddiw."
 
 #: share/advertising/28.pl:13
 #, c-format
@@ -16060,22 +16750,25 @@ msgid ""
 "<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
 "product.."
 msgstr ""
+"<b>Mandrakeclub</b> yw'r <b>cydymaith perffaith</b> ar gyfer eich cynnyrch "
+"Mandrakelinux..."
 
 #: share/advertising/28.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Take advantage of <b>valuable benefits</b> by joining Mandrakeclub, such as:"
 msgstr ""
-"Cewch fanteisio ar freintiau ychwanegol, cynnyrch a gwasanaethau drwy ymuno "
-"â Mandrakeclub, e.e:"
+"Cewch fanteisio ar <b>freintiau gwerthfawr</b> drwy ymuno â Mandrakeclub, e."
+"e:"
 
 #: share/advertising/28.pl:18
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\t* <b>Special discounts</b> on products and services of our online store "
 "<b>store.mandrakesoft.com</b>."
 msgstr ""
-"\t* Gostyngiadau arbennig ar gyfer cynnyrch a gwasanaethau yn Mandrakestore"
+"\t* <b>Gostyngiadau arbennig</b> ar gyfer cynnyrch a gwasanaethau yn ein "
+"siop ar-lein <b>store.mandrakesoft.com</b>."
 
 #: share/advertising/28.pl:19
 #, c-format
@@ -16083,11 +16776,12 @@ msgid ""
 "\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
 "drivers)."
 msgstr ""
+"\t* Mynediad i <b>raglenni masnachol</b> (e.e. gyrwyr NVIDIA® or ATI™)."
 
 #: share/advertising/28.pl:20
-#, fuzzy, c-format
+#, c-format
 msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
-msgstr "\t* Cymryd rhan mewn sgyrsiau ar-lein gyda <b>Kopete</b>"
+msgstr "\t* Cymryd rhan mewn <b>fforymau defnyddwyr</b> Mandrakelinux."
 
 #: share/advertising/28.pl:21
 #, c-format
@@ -16095,6 +16789,8 @@ msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
 "Mandrakelinux <b>ISO images</b>."
 msgstr ""
+"\t* <b>Mynediad cynnar a breintiol</b>, cyn eu rhyddhau'n gyhoeddus, i "
+"<b>ddelweddau ISO</b> Mandrakelinux."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16107,6 +16803,8 @@ msgid ""
 "<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
 "offer its customers!"
 msgstr ""
+"<b>Mandrakeonline</b> yw'r gwasanaeth newydd gwerthfawr mae Mandrakesoft yn "
+"ei gynnig i 'w gwsmeriaid!"
 
 #: share/advertising/29.pl:17
 #, c-format
@@ -16114,11 +16812,15 @@ msgid ""
 "Mandrakeonline provides a wide range of valuable services for <b>easily "
 "updating</b> your Mandrakelinux systems:"
 msgstr ""
+"Mae Mandrakeonline yn darparu ystod eang o wasanaethau gwerthfawr ar gyfer "
+"<b>diweddaru'n hawdd</b> eich systemau your Mandrakelinux:"
 
 #: share/advertising/29.pl:18
 #, c-format
 msgid "\t* <b>Perfect</b> system security (automated software updates)."
 msgstr ""
+"\t* Diogelwch systemau <b>perffaith</b> (diweddaru meddalwedd yn "
+"awtomataidd)."
 
 #: share/advertising/29.pl:19
 #, c-format
@@ -16126,17 +16828,19 @@ msgid ""
 "\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
 "desktop)."
 msgstr ""
+"\t* <b>Hysbysu</b> am ddiweddariadau (drwy e-bost neu raglennig ar y bwrdd "
+"gwaith)."
 
 #: share/advertising/29.pl:20
 #, c-format
 msgid "\t* Flexible <b>scheduled</b> updates."
-msgstr ""
+msgstr "\t* Hyblyg <b>amserlen</b> diweddariadau."
 
 #: share/advertising/29.pl:21
 #, c-format
 msgid ""
 "\t* Management of <b>all your Mandrakelinux systems</b> with one account."
-msgstr ""
+msgstr "\t* Rheolaeth o'ch <b>holl systemau Mandrakelinux</b> gydag un cyfrif."
 
 #: share/advertising/30.pl:13
 #, c-format
@@ -16149,6 +16853,8 @@ msgid ""
 "Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
 "<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
+"Ydych chi angen <b>cymorth?</b> Mae arbenigwyr technegol Mandrakesoft i'w "
+"cael ar  <b>ein platfform cefnogaeth dechnegol </b> www.mandrakeexpert.com."
 
 #: share/advertising/30.pl:17
 #, c-format
@@ -16156,6 +16862,8 @@ msgid ""
 "Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
 "a lot of time."
 msgstr ""
+"Drwy gymorth <b>arbenigwyr cymwysedig Mandrakelinux</b>, byddwch yn abed "
+"llawer o amser."
 
 #: share/advertising/30.pl:19
 #, c-format
@@ -16163,6 +16871,8 @@ msgid ""
 "For any question related to Mandrakelinux, you have the possibility to "
 "purchase support incidents at <b>store.mandrakesoft.com</b>."
 msgstr ""
+"Am unrhyw gwestiwn am Mandrakelinux, mae gennych y gallu i brynu cefnogaeth "
+"ar gyfer unrhyw ddigwyddiad o <b>store.mandrakesoft.com</b>."
 
 #: share/compssUsers.pl:25
 #, c-format
@@ -16170,13 +16880,13 @@ msgid "Office Workstation"
 msgstr "Gweithfan Swyddfa"
 
 #: share/compssUsers.pl:27
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
-"gnumeric), ddarllenydd pdf, ag ati"
+"Rhaglenni swyddfa: prosesydd geiriau (OpenOffice.org Writer, Kword), "
+"taenlenni (OpenOffice.org Calc, Kspread), ddarllenydd pdf, ag ati"
 
 #: share/compssUsers.pl:28
 #, c-format
@@ -16184,7 +16894,7 @@ msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
+"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword), taenlenni (kspread, "
 "gnumeric), ddarllenydd pdf, ag ati"
 
 #: share/compssUsers.pl:33
@@ -16277,19 +16987,19 @@ msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
 
 #: share/compssUsers.pl:85
-#, fuzzy, c-format
+#, c-format
 msgid "Apache"
-msgstr "llwybr"
+msgstr "Apache"
 
 #: share/compssUsers.pl:88
-#, fuzzy, c-format
+#, c-format
 msgid "Groupware"
-msgstr "Grwp"
+msgstr "Grwpwar"
 
 #: share/compssUsers.pl:89
-#, fuzzy, c-format
+#, c-format
 msgid "Kolab Server"
-msgstr "Gweinydd Samba"
+msgstr "Gweinydd Kolab"
 
 #: share/compssUsers.pl:92 share/compssUsers.pl:133
 #, c-format
@@ -16302,49 +17012,49 @@ msgid "Internet gateway"
 msgstr "Porth i'r rhyngrwyd"
 
 #: share/compssUsers.pl:96
-#, fuzzy, c-format
+#, c-format
 msgid "Mail/News"
-msgstr "/Ffeil/_Newydd"
+msgstr "E-bost/Newyddion"
 
 #: share/compssUsers.pl:97
-#, fuzzy, c-format
+#, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Gweinydd e-bost Postfix"
+msgstr "Gweinydd e-bost Postfix, gweinydd newyddion Inn"
 
 #: share/compssUsers.pl:100
-#, fuzzy, c-format
+#, c-format
 msgid "Directory Server"
-msgstr "Cyfeiriadur i Adfer Ohono"
+msgstr "Cyfeiriadur Gweinydd"
 
 #: share/compssUsers.pl:104
-#, fuzzy, c-format
+#, c-format
 msgid "FTP Server"
-msgstr "Gweinydd NTP"
+msgstr "Gweinydd FTP"
 
 #: share/compssUsers.pl:105
 #, c-format
 msgid "ProFTPd"
-msgstr ""
+msgstr "ProFTPd"
 
 #: share/compssUsers.pl:108
-#, fuzzy, c-format
+#, c-format
 msgid "DNS/NIS"
-msgstr "DNS"
+msgstr "DNS/NIS"
 
 #: share/compssUsers.pl:109
-#, fuzzy, c-format
+#, c-format
 msgid "Domain Name and Network Information Server"
-msgstr "Gweinydd Enw Parth"
+msgstr "Gweinydd Enw Parth a Gwybodaeth Rhwydwaith"
 
 #: share/compssUsers.pl:112
-#, fuzzy, c-format
+#, c-format
 msgid "File and Printer Sharing Server"
-msgstr "Gweinydd Argraffydd"
+msgstr "Gweinydd Ffeil a Rhannu Argraffydd"
 
 #: share/compssUsers.pl:113
-#, fuzzy, c-format
+#, c-format
 msgid "NFS Server, Samba server"
-msgstr "Gweinydd Samba"
+msgstr "Gweinydd NSF, gweinydd Samba"
 
 #: share/compssUsers.pl:116 share/compssUsers.pl:129
 #, c-format
@@ -16352,7 +17062,7 @@ msgid "Database"
 msgstr "Cronfa Ddata"
 
 #: share/compssUsers.pl:117
-#, fuzzy, c-format
+#, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
 
@@ -16430,9 +17140,9 @@ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
 
 #: share/compssUsers.pl:179
-#, fuzzy, c-format
+#, c-format
 msgid "Utilities"
-msgstr "Philippines"
+msgstr "Gwasanaethau"
 
 #: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
 #, c-format
@@ -16440,34 +17150,34 @@ msgid "SSH Server"
 msgstr "Gweinydd SSH"
 
 #: share/compssUsers.pl:186
-#, fuzzy, c-format
+#, c-format
 msgid "Webmin"
-msgstr "Camera Gwe"
+msgstr "Webmin"
 
 #: share/compssUsers.pl:187
-#, fuzzy, c-format
+#, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Enwch Wasanaethwr Ffurfweddiad"
+msgstr "Gweinydd Ffurfweddiad Pell Webmin"
 
 #: share/compssUsers.pl:191
-#, fuzzy, c-format
+#, c-format
 msgid "Network Utilities/Monitoring"
-msgstr "Monitro'r Rhwydwaith"
+msgstr "Gwasanaethau Rhwydwaith/Monitro"
 
 #: share/compssUsers.pl:192
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
-msgstr ""
+msgstr "Offer monitro, cyfrifo prosesau, tcpdunp, nmap..."
 
 #: share/compssUsers.pl:196
-#, fuzzy, c-format
-msgid "MandrakeSoft Wizards"
-msgstr "<b>Mandrakestore</b>"
+#, c-format
+msgid "Mandrakesoft Wizards"
+msgstr "Dewiniaid Mandrakesoft"
 
 #: share/compssUsers.pl:197
-#, fuzzy, c-format
+#, c-format
 msgid "Wizards to configure server"
-msgstr "Methu ffurfweddu argraffydd \"%s\"!"
+msgstr "dewiniaid i ffurfweddu gweinydd"
 
 #: standalone.pm:21
 #, c-format
@@ -16542,10 +17252,10 @@ msgstr ""
 "OPTIONS:\n"
 "  --boot            - galluogi i ffurfweddu'r cychwynnwr\n"
 "  --splash          - galluogi i ffurfweddu thema cychwyn\n"
-"Modd rhag.:cynnig ffurffweddu nodwedd awto fewngofnodi"
+"Modd rhag.:cynnig ffurfweddu nodwedd awto fewngofnodi"
 
 #: standalone.pm:57
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "[OPTIONS] [PROGRAM_NAME]\n"
 "\n"
@@ -16554,12 +17264,12 @@ msgid ""
 "  --report          - program should be one of mandrakelinux tools\n"
 "  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
-"[DEWISIADAU] [ENW_RHAGLEN]\n"
+"[DEWISIADAU] [PROGRAM_NAME]\n"
 "\n"
 "DEWISIADAU:\n"
 "  --help            - argraffu'r neges cymorth.\n"
-"  --report          - dylai'r rhaglen fod yn un o offer mandrake\n"
-"  --incident        - ylai'r rhaglen fod yn un o offer mandrake"
+"  --report          - dylai'r rhaglen fod yn un o offer Mandrakelinux\n"
+"  --incident        - ylai'r rhaglen fod yn un o offer Mandrakelinux"
 
 #: standalone.pm:63
 #, c-format
@@ -16599,7 +17309,7 @@ msgstr ""
 "Rhaglen mewnforio a monitro ffontiau\n"
 "\n"
 "DEWISIADAU:\n"
-"--windows_import : mewnforio o bob rhaniad windows.\n"
+"--windows_import : mewnforio o bob rhaniad Windows.\n"
 "--xls_fonts      : dangos pob ffont sy'n bodoli o xls\n"
 "--install        : derbyn unrhyw ffeil ffont ac unrhyw gyfeiriadur.\n"
 "--uninstall      : dadosod unrhyw ffont neu gyfeiriadur ffont.\n"
@@ -16610,7 +17320,7 @@ msgstr ""
 "                 : and gs for ghostscript for only this one."
 
 #: standalone.pm:84
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "[OPTIONS]...\n"
 "Mandrakelinux Terminal Server Configurator\n"
@@ -16626,15 +17336,14 @@ msgid ""
 "--delclient      : delete a client machine from MTS (requires MAC address, "
 "IP, nbi image name)"
 msgstr ""
-"[DEWISIADAU]...\n"
-"Ffurfweddwr Gweinydd Terfynell Mandrake\n"
+"Ffurfweddwr Gweinydd Terfynell Mandrakelinux\n"
 "--enable         : galluogi MTS\n"
 "--disable        : analluogi MTS\n"
 "--start          : cychwyn MTS\n"
 "--stop           : atal MTS\n"
-"--adduser        : ychwanegu defnyddiwr system presennol i MTS (angen enw "
+"--adduser        : ychwanegu defnyddiwr system bresennol i MTS (angen enw "
 "defnyddiwr)\n"
-"--deluser        : dileu defnyddiwr system presennol o MTS (angen enw "
+"--deluser        : dileu defnyddiwr system bresennol o MTS (angen enw "
 "defnyddiwr)\n"
 "--addclient      : ychwanegu peiriant cleient i MTS (angen cyfeiriad MAC, "
 "IP, enw delwedd nbi)\n"
@@ -16662,7 +17371,7 @@ msgid ""
 "--disconnect : disconnect to internet if already connected\n"
 "--force : used with (dis)connect : force (dis)connection.\n"
 "--status : returns 1 if connected 0 otherwise, then exit.\n"
-"--quiet : don't be interactive. To be used with (dis)connect."
+"--quiet : do not be interactive. To be used with (dis)connect."
 msgstr ""
 "[OPTIONS]\n"
 "Rhaglen Cyswllt a Monitro'r Rhwydwaith a'r Rhyngrwyd\n"
@@ -16672,7 +17381,7 @@ msgstr ""
 "--disconnect : disconnect to internet if already connected\n"
 "--force : used with (dis)connect : force (dis)connection.\n"
 "--status : returns 1 if connected 0 otherwise, then exit.\n"
-"--quiet : don't be interactive. To be used with (dis)connect."
+"--quiet : do not be interactive. To be used with (dis)connect."
 
 #: standalone.pm:107
 #, c-format
@@ -16683,17 +17392,17 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      don't ask first confirmation question in "
+"  --no-confirmation      do not ask first confirmation question in "
 "MandrakeUpdate mode\n"
-"  --no-verify-rpm        don't verify packages signatures\n"
+"  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[DEWIS]...\n"
-"  --no-confirmation      don't ask first confirmation question in "
+"  --no-confirmation      do not ask first confirmation question in "
 "MandrakeUpdate mode\n"
-"  --no-verify-rpm        don't verify packages signatures\n"
+"  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
@@ -16729,27 +17438,32 @@ msgstr ""
 "Defnydd: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version] "
 
-#: standalone/XFdrake:85
+#: standalone/XFdrake:61
+#, c-format
+msgid "You need to reboot for changes to take effect"
+msgstr "Rhaid ailgychwyn i'r newidiadau ddod i rym"
+
+#: standalone/XFdrake:92
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Allgofnodwch ac yna defnyddiwch Ctrl Alt-BackSpace"
 
-#: standalone/XFdrake:89
+#: standalone/XFdrake:96
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
-msgstr "Rhaid allgofnodi ac i fewn eto i newidiadau ddigwydd."
+msgstr "Rhaid allgofnodi ac i mewn eto i newidiadau ddigwydd."
 
-#: standalone/drakTermServ:76
+#: standalone/drakTermServ:74
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Diwerth heb Wasanaethwr Terfynell"
 
-#: standalone/drakTermServ:108 standalone/drakTermServ:114
+#: standalone/drakTermServ:106 standalone/drakTermServ:112
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: mae %s angen enw gwesteiwr...\n"
 
-#: standalone/drakTermServ:125
+#: standalone/drakTermServ:123
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16758,67 +17472,77 @@ msgstr ""
 "%s: mae %s angen enw gwesteiwr, cyfeiriad MAC, IP, nbi-image, 0/1 ar gyfer "
 "THIN_CLIENT, 0/1 ar gyfer Ffurfweddiad Lleol...\n"
 
-#: standalone/drakTermServ:131
+#: standalone/drakTermServ:129
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: mae %s angen enw gwesteiwr...\n"
 
-#: standalone/drakTermServ:213 standalone/drakTermServ:216
+#: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Enwch Wasanaethwr Ffurfweddiad"
 
-#: standalone/drakTermServ:231
+#: standalone/drakTermServ:220
 #, c-format
 msgid "Enable Server"
 msgstr "Galluogi'r Gweinydd"
 
-#: standalone/drakTermServ:237
+#: standalone/drakTermServ:226
 #, c-format
 msgid "Disable Server"
 msgstr "Analluogi'r Gweinydd"
 
-#: standalone/drakTermServ:245
+#: standalone/drakTermServ:232
 #, c-format
 msgid "Start Server"
 msgstr "Cychwyn y Gweinydd"
 
-#: standalone/drakTermServ:251
+#: standalone/drakTermServ:238
 #, c-format
 msgid "Stop Server"
 msgstr "Atal y Gweinydd"
 
-#: standalone/drakTermServ:259
+#: standalone/drakTermServ:247
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Floppy/ISO"
 
-#: standalone/drakTermServ:263
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Net Boot Images"
 msgstr "Delweddau Cychwyn y Rhwyd"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:258
 #, c-format
 msgid "Add/Del Users"
 msgstr "Ychwanegu/Diddymu Defnyddwyr"
 
-#: standalone/drakTermServ:273
+#: standalone/drakTermServ:262
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Ychwanegu/Dileu Cleientiaid"
 
-#: standalone/drakTermServ:284 standalone/drakbug:47
+#: standalone/drakTermServ:270
+#, c-format
+msgid "Images"
+msgstr "Delweddau"
+
+#: standalone/drakTermServ:271
+#, c-format
+msgid "Clients/Users"
+msgstr "Cleientiaid/Defnyddwyr"
+
+#: standalone/drakTermServ:289 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Dewin Tro Cyntaf"
 
-#: standalone/drakTermServ:315 standalone/drakTermServ:316
+#: standalone/drakTermServ:325 standalone/drakTermServ:326
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr "Diffinio %s fel dm, ychwanegu defnyddiwr gdm i /etc/passwd$$CLIENT$$"
 
-#: standalone/drakTermServ:322
+#: standalone/drakTermServ:332
 #, c-format
 msgid ""
 "\n"
@@ -16842,7 +17566,7 @@ msgid ""
 msgstr ""
 "\n"
 " Bydd y Dewin yn:\n"
-" \t1) Gofyn i chi ddwis un ai cleient 'tennau' neu 'tew'.\n"
+" \t1) Gofyn i chi ddewis un ai cleient 'tenau' neu 'tew'.\n"
 "\t2) Gosod DHCP.\n"
 "\t\n"
 "Wedi gwneud hyn, bydd y Dewin yn:\n"
@@ -16851,30 +17575,35 @@ msgstr ""
 "nbis.                                                                \n"
 "    b) Gweithredu'r "
 "gweinydd.                                               \n"
-"    c) Cychwyn y gwasanaethwrr.                                           \n"
+"    c) Cychwyn y gwasanaethwr.                                           \n"
 "    d) Cydweddu'r ffeiliau cysgod fel bo'r holl ddefnyddwyr, gan gynnwys "
 "root, \n"
 "       yn cael eu hychwanegu at y ffeil cysgod$$CLIENT$$ "
 "file.                                              \n"
 "    e) Gofyn i chi wneud disg meddal cychwyn.\n"
-"    f) Os yw'n gleient tennauKDM.\n"
+"    f) Os yw'n gleient tenau KDM.\n"
 
-#: standalone/drakTermServ:367
+#: standalone/drakTermServ:377
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Diddymu'r Dewin"
 
-#: standalone/drakTermServ:379
+#: standalone/drakTermServ:392
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Cadwch ffurfweddiad dhcpd!"
 
-#: standalone/drakTermServ:407
+#: standalone/drakTermServ:420
 #, c-format
 msgid "Use thin clients."
 msgstr "Defnyddiwch gleientiaid tenau"
 
-#: standalone/drakTermServ:409
+#: standalone/drakTermServ:422
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr "Cydweddu gosodiadau bysellfwrdd clientX gyda gweinydd"
+
+#: standalone/drakTermServ:424
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16883,40 +17612,35 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 "Dewis y math o gleient rhagosodedig.\n"
-"    Cleient 'Tennau' sy'n rhedeg popeth oddi ar CPU/RAM gweinydd, gyda "
+"    Cleient 'Tenau' sy'n rhedeg popeth oddi ar CPU/RAM gweinydd, gyda "
 "dangosydd cleient.\n"
 "    Cleient 'Tew' sy'n defnyddio eu CPU/RAM eu hun ond system ffeiliau'r "
 "gweinydd."
 
-#: standalone/drakTermServ:421 standalone/drakTermServ:1034
-#, c-format
-msgid "Sync client X keyboard settings with server."
-msgstr "Cydweddu gosodiadau bysellfwrdd clientX gyda gweinydd"
-
-#: standalone/drakTermServ:428
+#: standalone/drakTermServ:444
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Creu delwedd cychwyn rhyngrwyd ar gyfer pob cnewyllyn"
 
-#: standalone/drakTermServ:429 standalone/drakTermServ:726
-#: standalone/drakTermServ:742
+#: standalone/drakTermServ:445 standalone/drakTermServ:747
+#: standalone/drakTermServ:764
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Bydd hyn yn cymryd rhai munudau"
 
-#: standalone/drakTermServ:433 standalone/drakTermServ:452
+#: standalone/drakTermServ:449 standalone/drakTermServ:468
 #, c-format
 msgid "Done!"
 msgstr "Gorffen!"
 
-#: standalone/drakTermServ:438
+#: standalone/drakTermServ:454
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 "Cydweddu rhestr defnyddwyr y gweinydd gyda'r rhestr cleient, gan gynnwys "
 "gwraidd."
 
-#: standalone/drakTermServ:458
+#: standalone/drakTermServ:474
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -16925,12 +17649,12 @@ msgstr ""
 "Er mwyn galluogi newidiadau i'r cleient tenau, rhaid i'r rheolwr arddangos "
 "gael ei gychwyn. Cychwyn?"
 
-#: standalone/drakTermServ:493
+#: standalone/drakTermServ:509
 #, c-format
 msgid "Terminal Server Overview"
-msgstr "Trosolwg Gweinydd Terfynnell"
+msgstr "Trosolwg Gweinydd Terfynell"
 
-#: standalone/drakTermServ:494
+#: standalone/drakTermServ:510
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16954,7 +17678,7 @@ msgstr ""
 "        \t/etc/dhcpd.conf.etherboot-pcimap.dylech greu'r ddelwedd etherboot "
 "ar gyfer o leiaf un                  \tcnewyllyn llawn."
 
-#: standalone/drakTermServ:500
+#: standalone/drakTermServ:516
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16975,20 +17699,20 @@ msgid ""
 msgstr ""
 "        - Cynnal /etc/dhcpd.conf:\n"
 "        \t\tIgychwyn cleient o'r rhyngrwyd mae pob cleient angen cofnod "
-"dhcpd.conf ei hun,        \t\tiddynodi cyfeiriad IPa delwedd cychwyn "
+"dhcpd.conf ei hun,        \t\tI ddynodi cyfeiriad IP a delwedd cychwyn "
 "rhyngrwyd i'r peiriant. Mae drakTermServ\n"
 "        \t\tyn gallu gosod/tynnu rhain\n"
 "\t\t\t\n"
 "        \t\t(Gall cardiau PCI hepgor y ddelwedd - bydd etherboot yn gofyn am "
-"y ddelwedd cywir. Dylech\n"
+"y ddelwedd gywir. Dylech\n"
 "        \t\thefyd ystyried pan fo etherboot yn chwilio am y ddelwedd, bydd "
-"yn disgwyl enwqau fel\n"
+"yn disgwyl enwau fel\n"
 "        \t\tboot-3c59x.nbi, yn lle boot-3c59x.2.4.19-16mdk.nbi).\n"
 "\t\t\t \n"
-"        \t\tMae stanzal dhcpd.conf arferol i gynnal cleient diddisg yn "
+"        \t\tMae stanza dhcpd.conf arferol i gynnal cleient di-ddisg yn "
 "edrych fel:"
 
-#: standalone/drakTermServ:518
+#: standalone/drakTermServ:534
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -17030,7 +17754,7 @@ msgstr ""
 "penodol ar\n"
 "\t\t\t beiriant cleient, mae defnyddio cynllun cyfeiriad sefydlog yn "
 "caniatáu defnyddio\n"
-"\t\t\tnodweddionffeiliau ffurfweddu cleient penodol mae ClusterNFS yn "
+"\t\t\tnodweddion ffeiliau ffurfweddu cleient penodol mae ClusterNFS yn "
 "darparu.\n"
 "\t\t\t\n"
 "\t\t\tSylwer: Mae'r cofnod \"#type\" yn cael ei ddefnyddio gan drakTermServ "
@@ -17062,7 +17786,7 @@ msgstr ""
 "        Note: You must stop/start the server after adding or changing "
 "clients."
 
-#: standalone/drakTermServ:538
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -17093,7 +17817,7 @@ msgstr ""
 "\t\t\t\n"
 "        \tWith SUBNET/MASK being defined for your network."
 
-#: standalone/drakTermServ:550
+#: standalone/drakTermServ:566
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -17105,11 +17829,11 @@ msgid ""
 msgstr ""
 "        - Cynnal %s:\n"
 "        \t\tAr gyfer defnyddwyr sy'n gallu mewngofnodi i system o gleient di "
-"ddisg, rhaid dybylgu eu cofnod \n"
+"ddisg, rhaid dyblygu eu cofnod \n"
 "        \t\t/etc/shadow yn %s. drakTermServ helps\n"
-"        \t\tiyn yr achos hwn drwy ychwanegu neu dynnu defnyddwyr o'r ffeil."
+"        \t\tyn yr achos hwn drwy ychwanegu neu dynnu defnyddwyr o'r ffeil."
 
-#: standalone/drakTermServ:554
+#: standalone/drakTermServ:570
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -17122,11 +17846,11 @@ msgstr ""
 "        - Cleient Unigol %s:\n"
 "        \t\tDrwy clusternfs, mae modd i bob cleient gael ei ffeiliau "
 "ffurfweddiad ei hun\n"
-"        \t\tar system ffeiliau gwraidd y gweinydd. Drwy ganiatau "
+"        \t\tar system ffeiliau gwraidd y gweinydd. Drwy ganiatáu "
 "ffurfweddiad caledwedd cleient,\n"
 "        \t\tbydd drakTermServ yn cynorthwyo i greu'r ffeiliau hyn."
 
-#: standalone/drakTermServ:559
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -17156,12 +17880,12 @@ msgstr ""
 "\n"
 "        Sylw: Mae galluogi ffurfweddiad cleient lleol yn galluogi "
 "mewngofnodi gwraidd i'r gweinydd\n"
-"        terfynel ar bob un o'ch peiriannau cleient sydd a'r nodwedd hon wedi "
-"ei alluogi. Mae modd diffodd\n"
+"        terfynell ar bob un o'ch peiriannau cleient sydd a'r nodwedd hon "
+"wedi ei alluogi. Mae modd diffodd\n"
 "        ffurfweddiad lleol, cadw'r ffeiliau ffurfweddu, un waith mae'r "
 "peiriant cleient wedi ei ffurfweddu"
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:584
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -17192,9 +17916,9 @@ msgid ""
 msgstr ""
 "        - /etc/xinetd.d/tftp:\n"
 "        \t\tBydd drakTermServ yn ffurfweddu'r ffeil i weithio ar y cyd gyda "
-"delweddau grewyd gan\n"
+"delweddau a grëwyd gan\n"
 "        \t\tmkinitrd-net, a'r cofnodion yn /etc/dhcpd.conf, i wasanaethu'r "
-"delwedd cychwyn i bob\n"
+"ddelwedd cychwyn i bob\n"
 "        \t\tcleient di-ddisg.\n"
 "\n"
 "        \t\tMae ffeil ffurfweddu TFTP nodweddiadol yn edrych fel hyn:\n"
@@ -17216,7 +17940,7 @@ msgstr ""
 "mkinitrd-net\n"
 "        \t\tyn gosod ei ddelweddau."
 
-#: standalone/drakTermServ:589
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -17234,8 +17958,8 @@ msgid ""
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
 "        - Creu disgiau meddal/CD cychwyn rhwydwaith (etherboot):\n"
-"        \t\tBydd peiriannau diddisg angen delwedd ROM ar y NIC , disg meddal "
-"cychwyn\n"
+"        \t\tBydd peiriannau di-ddisg angen delwedd ROM ar y NIC , disg "
+"meddal cychwyn\n"
 "        \t\tneu CD i gychwyn.  Bydd drakTermServ yn cynorthwyo i "
 "gynhyrchu'r \n"
 "        \t\tdelweddau hyn, yn seiliedig ar y NIC yn y peiriant cleient.\n"
@@ -17247,62 +17971,72 @@ msgstr ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:624
+#: standalone/drakTermServ:640
 #, c-format
 msgid "Boot Floppy"
 msgstr "Disg Meddal Cychwyn"
 
-#: standalone/drakTermServ:626
+#: standalone/drakTermServ:642
 #, c-format
 msgid "Boot ISO"
 msgstr "Cychwyn yr ISO"
 
-#: standalone/drakTermServ:628
+#: standalone/drakTermServ:644
 #, c-format
 msgid "PXE Image"
 msgstr "Delwedd PXE"
 
-#: standalone/drakTermServ:696
+#: standalone/drakTermServ:712
 #, c-format
 msgid "Default kernel version"
 msgstr "Fersiwn rhagosodedig y cnewyllyn"
 
-#: standalone/drakTermServ:724
+#: standalone/drakTermServ:715
+#, c-format
+msgid "Create PXE images."
+msgstr "Creu delwedd PXE"
+
+#: standalone/drakTermServ:745
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Adeiladu'r cnewyllyn cyfan -->"
 
-#: standalone/drakTermServ:731
+#: standalone/drakTermServ:753
 #, c-format
 msgid "No kernel selected!"
 msgstr "Heb ddewis cnewyllyn"
 
-#: standalone/drakTermServ:734
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Adeiladau NIC unigol -->"
 
-#: standalone/drakTermServ:738
+#: standalone/drakTermServ:760
 #, c-format
 msgid "No NIC selected!"
 msgstr "Heb ddewis NIC!"
 
-#: standalone/drakTermServ:741
+#: standalone/drakTermServ:763
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Adeiladu pob cnewyllyn -->"
 
-#: standalone/drakTermServ:749
+#: standalone/drakTermServ:774
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Dileu"
 
-#: standalone/drakTermServ:756
+#: standalone/drakTermServ:779
+#, c-format
+msgid "No image selected!"
+msgstr "Delwedd heb ei ddewis!"
+
+#: standalone/drakTermServ:782
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Dileu Pob NBI"
 
-#: standalone/drakTermServ:843
+#: standalone/drakTermServ:908
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -17310,30 +18044,30 @@ msgid ""
 "Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
 "Mae !!! yn dangos bod y cyfrinair yng nghronfa ddata'r system yn\n"
-"wahanol i'r un yng ngronfa ddata'r Gweinydd Terfynell.\n"
-"I fewngofnodi i'r Gwas.Terfynell dileu/ail ychwnaegu'r defnyddiwr."
+"wahanol i'r un yng nghronfa ddata'r Gweinydd Terfynell.\n"
+"I fewngofnodi i'r Gweinydd Terfynell i ddileu/ail ychwanegu’r defnyddiwr."
 
-#: standalone/drakTermServ:848
+#: standalone/drakTermServ:913
 #, c-format
 msgid "Add User -->"
 msgstr "Pob Defnyddiwr -->"
 
-#: standalone/drakTermServ:854
+#: standalone/drakTermServ:919
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Dileu Defnyddiwr"
 
-#: standalone/drakTermServ:890
+#: standalone/drakTermServ:955
 #, c-format
 msgid "type: %s"
 msgstr "math:  %s"
 
-#: standalone/drakTermServ:894
+#: standalone/drakTermServ:959
 #, c-format
 msgid "local config: %s"
 msgstr "Ffurfweddiad lleol: %s"
 
-#: standalone/drakTermServ:924
+#: standalone/drakTermServ:989
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -17342,67 +18076,76 @@ msgstr ""
 "Caniatáu ffurfweddiad\n"
 "caledwedd lleol"
 
-#: standalone/drakTermServ:933
+#: standalone/drakTermServ:998
 #, c-format
 msgid "No net boot images created!"
 msgstr "Heb greu delweddau cychwyn y rhwyd!"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:1017
 #, c-format
 msgid "Thin Client"
 msgstr "Cleient Tenau"
 
-#: standalone/drakTermServ:955
+#: standalone/drakTermServ:1021
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Caniatáu Cleientiaid Tenau"
 
-#: standalone/drakTermServ:956
+#: standalone/drakTermServ:1022
+#, c-format
+msgid ""
+"Sync client X keyboard\n"
+" settings with server."
+msgstr ""
+"Cydweddu gosodiadau\n"
+" bysellfwrdd clientX gyda gweinydd"
+
+#: standalone/drakTermServ:1023
 #, c-format
 msgid "Add Client -->"
 msgstr "Ychwanegu Cleient -->"
 
-#: standalone/drakTermServ:970
+#: standalone/drakTermServ:1037
 #, c-format
 msgid "type: fat"
 msgstr "math:  fat"
 
-#: standalone/drakTermServ:971
+#: standalone/drakTermServ:1038
 #, c-format
 msgid "type: thin"
 msgstr "math:  tenau"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:1045
 #, c-format
 msgid "local config: false"
 msgstr "ffurfweddiad lleol: false"
 
-#: standalone/drakTermServ:979
+#: standalone/drakTermServ:1046
 #, c-format
 msgid "local config: true"
 msgstr "ffurfweddiad lleol: true"
 
-#: standalone/drakTermServ:987
+#: standalone/drakTermServ:1054
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Golygu Cleient"
 
-#: standalone/drakTermServ:1013
+#: standalone/drakTermServ:1080
 #, c-format
 msgid "Disable Local Config"
 msgstr "Analluogi Ffurfweddiad Lleol"
 
-#: standalone/drakTermServ:1020
+#: standalone/drakTermServ:1087
 #, c-format
 msgid "Delete Client"
 msgstr "Diddymu Cleient"
 
-#: standalone/drakTermServ:1029
+#: standalone/drakTermServ:1096
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Ffurfweddu dhcpd..."
 
-#: standalone/drakTermServ:1045
+#: standalone/drakTermServ:1111
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -17411,181 +18154,181 @@ msgstr ""
 "Mae angen cychwyn y Rheolwr Dangosydd i'r newid ddigwydd.\n"
 "(ailgychwyn gwasanaeth dm - yn y consol)"
 
-#: standalone/drakTermServ:1085
+#: standalone/drakTermServ:1156
 #, c-format
-msgid "Thin clients won't work with autologin. Disable autologin?"
+msgid "Thin clients will not work with autologin. Disable autologin?"
 msgstr ""
 "Nid yw'r cleientiaid tennau'n gweithio gydag awto fewngofnodi. Anablu awto "
 "fewngofnodi?"
 
-#: standalone/drakTermServ:1101
+#: standalone/drakTermServ:1172
 #, c-format
 msgid "All clients will use %s"
 msgstr "Bydd pob cleient yn defnyddio %s"
 
-#: standalone/drakTermServ:1133
+#: standalone/drakTermServ:1204
 #, c-format
 msgid "Subnet:"
 msgstr "Isnet:"
 
-#: standalone/drakTermServ:1140
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Netmask:"
 msgstr "Netmask:"
 
-#: standalone/drakTermServ:1147
+#: standalone/drakTermServ:1218
 #, c-format
 msgid "Routers:"
 msgstr "Llwybryddion:"
 
-#: standalone/drakTermServ:1154
+#: standalone/drakTermServ:1225
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Masg Isnet"
 
-#: standalone/drakTermServ:1161
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Cyfeiriad Darlledu:"
 
-#: standalone/drakTermServ:1168
+#: standalone/drakTermServ:1239
 #, c-format
 msgid "Domain Name:"
 msgstr "Enw Parth:"
 
-#: standalone/drakTermServ:1176
+#: standalone/drakTermServ:1247
 #, c-format
 msgid "Name Servers:"
 msgstr "Enwi Gweinydd:"
 
-#: standalone/drakTermServ:1187
+#: standalone/drakTermServ:1258
 #, c-format
 msgid "IP Range Start:"
 msgstr "Cychwyn Amrediad IP:"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1259
 #, c-format
 msgid "IP Range End:"
 msgstr "Diwedd Amrediad IP:"
 
-#: standalone/drakTermServ:1230
+#: standalone/drakTermServ:1301
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "Atodi TS yn Gynwysiedig i'r Ffurfwediad Presennol"
 
-#: standalone/drakTermServ:1232
+#: standalone/drakTermServ:1303
 #, c-format
 msgid "Write Config"
 msgstr "Ysgrifennu ffurfweddu"
 
-#: standalone/drakTermServ:1248
+#: standalone/drakTermServ:1319
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Ffurfweddiad Gweinydd dhcpd"
 
-#: standalone/drakTermServ:1249
+#: standalone/drakTermServ:1320
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
 "from your running system.\n"
 "You can modify as needed."
 msgstr ""
-"Tynnwyd y rhanfwyaf o'r gwerthoedd\n"
+"Tynnwyd y rhan fwyaf o'r gwerthoedd\n"
 "hyn o'ch system ar waith.\n"
 "Gallwch eu newid yn ôl y galw."
 
-#: standalone/drakTermServ:1252
+#: standalone/drakTermServ:1323
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Pwll Cyfeiriad IP dynameg"
 
-#: standalone/drakTermServ:1399
+#: standalone/drakTermServ:1474
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Mewnosodwch ddisg meddal:"
 
-#: standalone/drakTermServ:1403
+#: standalone/drakTermServ:1478
 #, c-format
-msgid "Couldn't access the floppy!"
+msgid "Could not access the floppy!"
 msgstr "Methu cael mynediad i'r disg meddal!"
 
-#: standalone/drakTermServ:1405
+#: standalone/drakTermServ:1480
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Mae modd tynnu'r disg meddal nawr"
 
-#: standalone/drakTermServ:1408
+#: standalone/drakTermServ:1483
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Does dim gyrrwr disg meddal ar gael!"
 
-#: standalone/drakTermServ:1413
+#: standalone/drakTermServ:1488
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "Delwedd PXE yw %s/%s"
 
-#: standalone/drakTermServ:1415
+#: standalone/drakTermServ:1490
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Gwall ysgrifennu %s/%s"
 
-#: standalone/drakTermServ:1424
+#: standalone/drakTermServ:1500
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "%s yw'r ddelwedd ISO etherboot"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1502
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Aeth rhywbeth o'i le! - ydy mkisofs wedi ei osod?"
 
-#: standalone/drakTermServ:1447
+#: standalone/drakTermServ:1523
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Mae angen creu /etc/dhcpd.conf yn gyntaf"
 
-#: standalone/drakTermServ:1602
+#: standalone/drakTermServ:1683
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "%s passwd gwael yng Ngweinydd Terfynell - ail ysgrifennu...\n"
 
-#: standalone/drakTermServ:1615
+#: standalone/drakTermServ:1696
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "Nid yw %s yn ddefnyddiwr..\n"
 
-#: standalone/drakTermServ:1616
+#: standalone/drakTermServ:1697
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "Mae %s yn ddefnyddiwr Gweinydd Terfynell eisoes\n"
 
-#: standalone/drakTermServ:1618
+#: standalone/drakTermServ:1699
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "Methodd ychwanegu %s 'r Gweinydd Terfynell\n"
 
-#: standalone/drakTermServ:1620
+#: standalone/drakTermServ:1701
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "Ychwanegu %s i'r Gweinydd Terfynell\n"
 
-#: standalone/drakTermServ:1666
+#: standalone/drakTermServ:1718
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Dilëwyd %s...\n"
 
-#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
+#: standalone/drakTermServ:1720 standalone/drakTermServ:1793
 #, c-format
 msgid "%s not found...\n"
 msgstr "Heb ganfod %s...\n"
 
-#: standalone/drakTermServ:1769
+#: standalone/drakTermServ:1821
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr ""
 "Mae /etc/hosts.allow and /etc/hosts.deny wedi eu ffurfweddu - dim newid"
 
-#: standalone/drakTermServ:1921
+#: standalone/drakTermServ:1961
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Newidiodd ffurfweddiad - ailgychwyn clusternfs/dhcpd?"
@@ -17597,7 +18340,7 @@ msgstr "Gwall!"
 
 #: standalone/drakautoinst:39
 #, c-format
-msgid "I can't find needed image file `%s'."
+msgid "I can not find needed image file `%s'."
 msgstr "Methu canfod ffeil delwedd angenrheidiol '%s'."
 
 #: standalone/drakautoinst:41
@@ -17620,18 +18363,17 @@ msgid ""
 "\n"
 "Press ok to continue."
 msgstr ""
-"Rydych ar fin ffurfweddu disg meddal Gosod Awtomatig. Mae'r nodwedd hwn "
+"Rydych ar fin ffurfweddu disg meddal Gosod Awtomatig. Mae'r nodwedd hon "
 "braidd yn beryglus a dylid ei ddefnyddio gyda gofal.\n"
 "\n"
-"Gyda'r nodwedd hon, bydd modd ailchwarau'r gosodiad ar y cyfrifiadur, gan "
-"eich holi'n rhyngweithiol ar gyfer rhai cammau, er mwyn newid eu "
-"gwerthoedd.\n"
+"Gyda'r nodwedd hon, bydd modd ailchwarae’r gosodiad ar y cyfrifiadur, gan "
+"eich holi'n rhyngweithiol ar gyfer rhai camau, er mwyn newid eu gwerthoedd.\n"
 "\n"
 "\n"
 "I fod yn gwbl ddiogel ni fydd y rhannu a'r fformatio'n cael ei wneud yn "
 "awtomatig, beth bynnag wnewch chi wrth osod y cyfrifiadur.\n"
 "\n"
-"Cloiciwch iawn i barhau?"
+"Cliciwch iawn i barhau?"
 
 #: standalone/drakautoinst:60
 #, c-format
@@ -17666,12 +18408,12 @@ msgstr "Creu disg meddal awto gosod"
 #: standalone/drakautoinst:90
 #, c-format
 msgid "Insert another blank floppy in drive %s (for drivers disk)"
-msgstr "Rhowch ddisg meddal  yng ngyrrwr %s (ar gyfer disg gyrrwyr)"
+msgstr "Rhowch ddisg meddal  yng ngyrrwr %s (ar gyfer disg gyrwyr)"
 
 #: standalone/drakautoinst:91
 #, c-format
 msgid "Creating auto install floppy (drivers disk)"
-msgstr "Creu disg meddal awto gosod (disg gyrrwyr)"
+msgstr "Creu disg meddal awto gosod (disg gyrwyr)"
 
 #: standalone/drakautoinst:158
 #, c-format
@@ -17686,8 +18428,8 @@ msgstr ""
 "\n"
 "Mae paramedrau'r awto osod i'w cael yn yr adran ar y chwith"
 
-#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
-#: standalone/scannerdrake:375
+#: standalone/drakautoinst:252 standalone/drakgw:597 standalone/drakvpn:902
+#: standalone/scannerdrake:405
 #, c-format
 msgid "Congratulations!"
 msgstr "Llongyfarchiadau!"
@@ -17726,7 +18468,7 @@ msgstr "hd"
 msgid "tape"
 msgstr "tâp"
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:152
 #, c-format
 msgid ""
 "Expect is an extension to the TCL scripting language that allows interactive "
@@ -17735,30 +18477,30 @@ msgstr ""
 "Mae Expect yn estyniad o'r iaith sgriptio TCL sy'n caniatáu sesiynau "
 "rhyngweithiol heb ymyrraeth y defnyddiwr."
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:153
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "Cadw'r gyfrinach ar gyfer y system yn ffurfweddiad drakbackup."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr ""
 "Ar gyfer CD aml sesiwn, dim ond y sesiwn gyntaf fydd yn dileu'r cdrw. Fel "
-"arall bydd y cdrw yn cael ei ddileu cyn pob cadw."
+"arall bydd y cdrw yn cael ei ddileu cyn bob cadw."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
 "whether incremental or differential mode is used."
 msgstr ""
-"Bydd y dewis hwn yn cadw ffeiliau sydd wedi newid.Bydd ei union ymddygiad yn "
-"dibynnu ar ba un a'i modd cynyddol neu ddifferol sy'n cael eu defnyddio."
+"Bydd y dewis hwn yn cadw ffeiliau sydd wedi newid. Bydd ei union ymddygiad "
+"yn dibynnu ar ba un a'i modd cynyddol neu ddifferol sy'n cael eu defnyddio."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -17767,7 +18509,7 @@ msgstr ""
 "Dim ond ffeiliau sydd wedi newid neu sy'n newydd fydd cadw wrth gefn "
 "cynyddol yn eu cadw."
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -17776,16 +18518,17 @@ msgstr ""
 "Mae cadw wrth gefn differol yn cadw dim ond y ffeiliau sydd wedi newid neu "
 "sy'n newydd ers y fersiwn gwreiddiol 'sylfaenol'."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "This should be a local user or email address that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
-"Dylai hyn fod yn ddefnyddiwr lleol neu gyfeirydd e-bost rydych am i ganlyiad "
-"y copi wrth gefn ei anfon ato. Rhaid diffinio gweinydd e-bost gweithredol."
+"Dylai hyn fod yn ddefnyddiwr lleol neu gyfeirydd e-bost rydych am i "
+"ganlyniad y copi wrth gefn ei anfon ato. Rhaid diffinio gweinydd e-bost "
+"gweithredol."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17794,7 +18537,7 @@ msgstr ""
 "Ni fydd ffeiliau neu gardiau gwyllt wedi eu rhestri yn ffeil .backupignore "
 "ar frig y goeden cyfeiriadur yn cael eu cadw."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17805,7 +18548,7 @@ msgstr ""
 "ar y disg caled, ac yna eu symud i gyfrwng arall. Bydd galluogi hyn yn "
 "tynnu'r ffeiliau tar oddi ar y disg caled ar ôl creu'r copi wrth gefn."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -17816,7 +18559,7 @@ msgstr ""
 "defnyddio llwybr cyfeiriadur, byddwch yn defnyddio enw 'modiwl' ar gyfer y "
 "llwybr gwasanaeth."
 
-#: standalone/drakbackup:163
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17825,27 +18568,27 @@ msgstr ""
 "Mae Addasu'n caniatáu i chi enw eich dyddiad ac amser. Mae'r dewisiadau "
 "eraill yn defnyddio rhannau rhedeg yn /etc/crontab."
 
-#: standalone/drakbackup:327
+#: standalone/drakbackup:326
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "Dim cyfrwng wedi ei ddewis ar gyfer gweithredu cron."
 
-#: standalone/drakbackup:331
+#: standalone/drakbackup:330
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "Dim cyfnod wedi ei ddewis ar gyfer gweithredu cron."
 
-#: standalone/drakbackup:378
+#: standalone/drakbackup:377
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Nid yw interval cron ar gael ar gyfer di-wraidd"
 
-#: standalone/drakbackup:463 standalone/logdrake:437
+#: standalone/drakbackup:462 standalone/logdrake:437
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr "Nid yw \"%s\" yn e-bost dilys nac yn ddefnyddiwr lleol presennol!"
 
-#: standalone/drakbackup:467 standalone/logdrake:442
+#: standalone/drakbackup:466 standalone/logdrake:442
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -17854,22 +18597,22 @@ msgstr ""
 "Mae \"%s\" yn ddefnyddiwr lleol, ond nid ydych wedi dewis SMTP lleol, felly "
 "mae'n rhaid i chi ddefnyddio cyfeiriad e-bost cyfan!"
 
-#: standalone/drakbackup:476
+#: standalone/drakbackup:475
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "Rhestr defnyddwyr dilys wedi newid, ailysgrifennu ffeil ffurfweddu."
 
-#: standalone/drakbackup:478
+#: standalone/drakbackup:477
 #, c-format
 msgid "Old user list:\n"
 msgstr "Rhestr hen ddefnyddiwr:\n"
 
-#: standalone/drakbackup:480
+#: standalone/drakbackup:479
 #, c-format
 msgid "New user list:\n"
 msgstr "Rhestr defnyddiwr newydd:\n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:524
 #, c-format
 msgid ""
 "\n"
@@ -17879,7 +18622,7 @@ msgstr ""
 "                      Adroddiad DrakBackup  \n"
 "\n"
 
-#: standalone/drakbackup:526
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -17890,7 +18633,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:532
+#: standalone/drakbackup:531
 #, c-format
 msgid ""
 "\n"
@@ -17903,13 +18646,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:557 standalone/drakbackup:628
-#: standalone/drakbackup:684
+#: standalone/drakbackup:556 standalone/drakbackup:627
+#: standalone/drakbackup:683
 #, c-format
 msgid "Total progress"
 msgstr "Cyfanswm cynnydd"
 
-#: standalone/drakbackup:610
+#: standalone/drakbackup:609
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17917,47 +18660,47 @@ msgid ""
 "If you've already done this process you'll probably\n"
 " need to purge the entry from authorized_keys on the server."
 msgstr ""
-"%s yn bodoli, dileu?\n"
+"Mae %s yn bodoli, dileu?\n"
 "\n"
-"Rhybudd: Os ydych eisioes wedi dilyn y broses hon, bydd\n"
+"Rhybudd: Os ydych eisoes wedi dilyn y broses hon, bydd\n"
 " angen tynnu'r cofnod o authorized_keys ar y gweinydd."
 
-#: standalone/drakbackup:619
+#: standalone/drakbackup:618
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Bydd hyn yn cymryd amser i gynhyrchu'r allweddi"
 
-#: standalone/drakbackup:626
+#: standalone/drakbackup:625
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "Methu agor %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:642
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Dim cais am gyfrinair ar %s ym mhorth %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:643
 #, c-format
 msgid "Bad password on %s"
 msgstr "Cyfrinair gwallus yn %s"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:644
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Gwrthodwyd caniatâd wrth drosglwyddo %s i %s"
 
-#: standalone/drakbackup:646
+#: standalone/drakbackup:645
 #, c-format
-msgid "Can't find %s on %s"
+msgid "Can not find %s on %s"
 msgstr "Methu canfod %s ar %s"
 
-#: standalone/drakbackup:650
+#: standalone/drakbackup:649
 #, c-format
 msgid "%s not responding"
 msgstr "Nid yw %s yn ymateb"
 
-#: standalone/drakbackup:654
+#: standalone/drakbackup:653
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17968,53 +18711,53 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 "Roedd y trosglwyddiad yn llwyddiannus\n"
-"Efallai'r hoffechi wirio eich bod yn gallu mewngofnodi i'r gwasanaether "
+"Efallai'r hoffech wirio eich bod yn gallu mewngofnodi i'r gwasanaether "
 "gyda:\n"
 "\n"
 "ssh -i %s %s@%s\n"
 "heb dderbyn cais am gyfrinair"
 
-#: standalone/drakbackup:698
+#: standalone/drakbackup:697
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "Mae safle pell WebDAV eisoes wedi cydamseru!"
 
-#: standalone/drakbackup:702
+#: standalone/drakbackup:701
 #, c-format
 msgid "WebDAV transfer failed!"
-msgstr "Methodd trosglwyddiad WebDaAV!"
+msgstr "Methodd trosglwyddiad WebDAV!"
 
-#: standalone/drakbackup:723
+#: standalone/drakbackup:722
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
-msgstr "Dim CDR/DVDR yn y gyrrwr!"
+msgstr "Dim CD-R/DVD-R yn y gyrrwr!"
 
-#: standalone/drakbackup:727
+#: standalone/drakbackup:726
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Nid yw'n ymddangos fel cyfrwng cofnodi."
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:731
 #, c-format
 msgid "Not erasable media!"
 msgstr "Nid yw'n gyfrwng dileadwy!"
 
-#: standalone/drakbackup:774
+#: standalone/drakbackup:773
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Bydd yn cymryd ychydig o amser i ddileu'r cyfrwng."
 
-#: standalone/drakbackup:832
+#: standalone/drakbackup:831
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Anawsterau caniatâd wrth gael mynediad i'r CD."
 
-#: standalone/drakbackup:859
+#: standalone/drakbackup:858
 #, c-format
 msgid "No tape in %s!"
 msgstr "Dim tâp yn %s!"
 
-#: standalone/drakbackup:966
+#: standalone/drakbackup:965
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -18023,37 +18766,37 @@ msgstr ""
 "Wedi mynd tu hwnt i'r cwota wrth gefn\n"
 "%d Mb wedi ei ddefnyddio vs %d Mb ar gael."
 
-#: standalone/drakbackup:985 standalone/drakbackup:1018
+#: standalone/drakbackup:984 standalone/drakbackup:1017
 #, c-format
 msgid "Backup system files..."
 msgstr "Ffeiliau system wrth gefn"
 
-#: standalone/drakbackup:1019 standalone/drakbackup:1060
+#: standalone/drakbackup:1018 standalone/drakbackup:1059
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Ffeiliau cadw wrth gefn y Disg Caled"
 
-#: standalone/drakbackup:1059
+#: standalone/drakbackup:1058
 #, c-format
 msgid "Backup User files..."
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: standalone/drakbackup:1094
+#: standalone/drakbackup:1093
 #, c-format
 msgid "Backup Other files..."
 msgstr "Cadw wrth gefn ffeiliau eraill..."
 
-#: standalone/drakbackup:1095
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Cynnydd Disg Caled wrth Gefn..."
 
-#: standalone/drakbackup:1100
+#: standalone/drakbackup:1099
 #, c-format
 msgid "No changes to backup!"
 msgstr "Dim newid i'r ffeil wrth gefn!"
 
-#: standalone/drakbackup:1118 standalone/drakbackup:1142
+#: standalone/drakbackup:1117 standalone/drakbackup:1141
 #, c-format
 msgid ""
 "\n"
@@ -18064,7 +18807,7 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy %s:\n"
 "\n"
 
-#: standalone/drakbackup:1127
+#: standalone/drakbackup:1126
 #, c-format
 msgid ""
 "\n"
@@ -18075,18 +18818,18 @@ msgstr ""
 " Anhawster cysylltiad FTP: Nid oedd yn bosibl anfon eich ffeiliau wrth gefn "
 "drwy FTP.\n"
 
-#: standalone/drakbackup:1128
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr "Gwall wrth anfon ffeil drwy FTP. Cywirwch eich ffurfweddiad FTP."
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:1129
 #, c-format
 msgid "file list sent by FTP: %s\n"
-msgstr "rhestr ffeil yrrwyd gan FTP: %s\n"
+msgstr "rhestr ffeil a yrrwyd gan FTP: %s\n"
 
-#: standalone/drakbackup:1147
+#: standalone/drakbackup:1146
 #, c-format
 msgid ""
 "\n"
@@ -18097,7 +18840,7 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy CD:\n"
 "\n"
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1151
 #, c-format
 msgid ""
 "\n"
@@ -18108,31 +18851,31 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy dâp:\n"
 "\n"
 
-#: standalone/drakbackup:1161
+#: standalone/drakbackup:1160
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
-msgstr "Gwall wrth anfon e-bost.l. Chafodd eich adroddiad e-bost mo'i anfon."
+msgstr "Gwall wrth anfon e-bost. Cafodd eich adroddiad e-bost mo'i anfon."
 
-#: standalone/drakbackup:1162
+#: standalone/drakbackup:1161
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Gwall wrth anfon e-bost. \n"
 
-#: standalone/drakbackup:1192
+#: standalone/drakbackup:1191
 #, c-format
-msgid "Can't create catalog!"
+msgid "Can not create catalog!"
 msgstr "Methu creu catalog!"
 
-#: standalone/drakbackup:1414
+#: standalone/drakbackup:1420
 #, c-format
 msgid ""
 "\n"
 "Please check all options that you need.\n"
 msgstr ""
 "\n"
-"Gwiriwch pob dewis sydd angen arnoch.\n"
+"Gwiriwch bob dewis sydd angen arnoch.\n"
 
-#: standalone/drakbackup:1415
+#: standalone/drakbackup:1421
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -18140,216 +18883,216 @@ msgstr ""
 "Mae'r dewisiadau hyn yn gallu cadw wrth gefn ac adfer pob ffeil yn eich "
 "cyfeiriadur /etc.\n"
 
-#: standalone/drakbackup:1416
+#: standalone/drakbackup:1422
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Cadw wrth gefn ffeiliau System. ( cyfeiriadur /etc )"
 
-#: standalone/drakbackup:1417 standalone/drakbackup:1481
-#: standalone/drakbackup:1547
+#: standalone/drakbackup:1423 standalone/drakbackup:1487
+#: standalone/drakbackup:1553
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr ""
 "Defnyddio Cadw wrth Gefn Cynyddol/Differol (peidio disodli hen gadw wrth "
 "gefn)"
 
-#: standalone/drakbackup:1419 standalone/drakbackup:1483
-#: standalone/drakbackup:1549
+#: standalone/drakbackup:1425 standalone/drakbackup:1489
+#: standalone/drakbackup:1555
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "Defnyddio Cadw wrth Gefn Cynyddol"
 
-#: standalone/drakbackup:1419 standalone/drakbackup:1483
-#: standalone/drakbackup:1549
+#: standalone/drakbackup:1425 standalone/drakbackup:1489
+#: standalone/drakbackup:1555
 #, c-format
 msgid "Use Differential Backups"
 msgstr "Defnyddio Cadw wrth Gefn differu"
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1427
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Peidio cynnwys ffeiliau hanfodol (passwd, group, fstab)"
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1428
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr ""
-"Gyda'e dewis hwn gallwch adfer unrhyw fersiwn\n"
+"Gyda’r dewis hwn gallwch adfer unrhyw fersiwn\n"
 "o'ch cyfeiriadur /etc."
 
-#: standalone/drakbackup:1453
+#: standalone/drakbackup:1459
 #, c-format
 msgid "Please check all users that you want to include in your backup."
-msgstr "Gwiriwch pob ddefnyddiwr rydych am eu cynnwys yn eich cadw wrth gefn."
+msgstr "Gwiriwch bob defnyddiwr rydych am eu cynnwys yn eich cadw wrth gefn."
 
-#: standalone/drakbackup:1480
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Peidio cynnwys storfa'r porwr"
 
-#: standalone/drakbackup:1534
+#: standalone/drakbackup:1540
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Dewiswch y ffeiliau neu gyfeiriaduron a chliciwch 'Iawn'"
 
-#: standalone/drakbackup:1535 standalone/drakfont:660
+#: standalone/drakbackup:1541 standalone/drakfont:661
 #, c-format
 msgid "Remove Selected"
 msgstr "Tynnu'r Dewis"
 
-#: standalone/drakbackup:1598
+#: standalone/drakbackup:1604
 #, c-format
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: standalone/drakbackup:1618
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Defnyddiwch gysylltiad rhwydwaith i gadw wrth gefn"
 
-#: standalone/drakbackup:1620
+#: standalone/drakbackup:1626
 #, c-format
 msgid "Net Method:"
 msgstr "Dull Rhwyd:"
 
-#: standalone/drakbackup:1624
+#: standalone/drakbackup:1630
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Defnyddiwch Expect ar gyfer SSH"
 
-#: standalone/drakbackup:1625
+#: standalone/drakbackup:1631
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Creu/Trosglwyddo allweddi wrth gefn ar gyfer SSH"
 
-#: standalone/drakbackup:1627
+#: standalone/drakbackup:1633
 #, c-format
 msgid "Transfer Now"
 msgstr "Trosglwyddo Nawr"
 
-#: standalone/drakbackup:1629
+#: standalone/drakbackup:1635
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Allweddi eraill (nid drakbackup) yn eu lle yn barod"
 
-#: standalone/drakbackup:1632
+#: standalone/drakbackup:1638
 #, c-format
 msgid "Host name or IP."
 msgstr "Enw gwesteiwr neu IP."
 
-#: standalone/drakbackup:1637
+#: standalone/drakbackup:1643
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "Cyfeiriadur (neu fodiwl) i osod y cadw wrth gefn ar y gwesteiwr."
 
-#: standalone/drakbackup:1649
+#: standalone/drakbackup:1655
 #, c-format
 msgid "Remember this password"
 msgstr "Cofiwch y cyfrinair"
 
-#: standalone/drakbackup:1665
+#: standalone/drakbackup:1671
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Angen enw gwesteiwr, enw defnyddiwr a chyfrinair"
 
-#: standalone/drakbackup:1756
+#: standalone/drakbackup:1762
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Defnyddiwch y CD/DVDROM i gadw wrth gefn"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1765
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Dewiswch eich dyfais CD/DVD"
 
-#: standalone/drakbackup:1764
+#: standalone/drakbackup:1770
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Dewiswch faint eich cyfrwng CD/DVD"
 
-#: standalone/drakbackup:1771
+#: standalone/drakbackup:1777
 #, c-format
 msgid "Multisession CD"
 msgstr "CD aml-sesiwn"
 
-#: standalone/drakbackup:1773
+#: standalone/drakbackup:1779
 #, c-format
 msgid "CDRW media"
 msgstr "Cyfrwng CDRW"
 
-#: standalone/drakbackup:1779
+#: standalone/drakbackup:1785
 #, c-format
 msgid "Erase your RW media (1st Session)"
-msgstr "Dileu eich cyfrwng RW(Sesiwn 1af)"
+msgstr "Dileu eich cyfrwng RW (Sesiwn 1af)"
 
-#: standalone/drakbackup:1780
+#: standalone/drakbackup:1786
 #, c-format
 msgid " Erase Now "
 msgstr "Dileu Nawr"
 
-#: standalone/drakbackup:1786
+#: standalone/drakbackup:1792
 #, c-format
 msgid "DVD+RW media"
 msgstr "Cyfrwng DVD+RW"
 
-#: standalone/drakbackup:1788
+#: standalone/drakbackup:1794
 #, c-format
 msgid "DVD-R media"
 msgstr "Cyfrwng DVD-R"
 
-#: standalone/drakbackup:1790
+#: standalone/drakbackup:1796
 #, c-format
 msgid "DVDRAM device"
 msgstr "dyfais DVDRAM"
 
-#: standalone/drakbackup:1821
+#: standalone/drakbackup:1827
 #, c-format
 msgid "No CD device defined!"
 msgstr "Heb ddiffinio dyfais CD!"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1869
 #, c-format
 msgid "Use tape to backup"
 msgstr "Defnyddiwch dâp i gadw wrth gefn"
 
-#: standalone/drakbackup:1866
+#: standalone/drakbackup:1872
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Enw dyfais i'w ddefnyddio ar gyfer cadw wrth gefn"
 
-#: standalone/drakbackup:1872
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Backup directly to tape"
-msgstr ""
+msgstr "Cadw wrth gefn i Dâp"
 
-#: standalone/drakbackup:1878
+#: standalone/drakbackup:1884
 #, c-format
-msgid "Don't rewind tape after backup"
+msgid "Do not rewind tape after backup"
 msgstr "Peidio ailddirwyn y tâp wedi ei gadw wrth gefn"
 
-#: standalone/drakbackup:1884
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Dileu'r tâp cyn cadw wrth gefn"
 
-#: standalone/drakbackup:1890
+#: standalone/drakbackup:1896
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Tynnwch y tâp wedi cadw wrth gefn"
 
-#: standalone/drakbackup:1962
+#: standalone/drakbackup:1968
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Rhowch y cyfeiriadur i gadw iddo:"
 
-#: standalone/drakbackup:1966
+#: standalone/drakbackup:1972
 #, c-format
 msgid "Directory to save to"
 msgstr "Y cyfeiriadur i gadw iddo:"
 
-#: standalone/drakbackup:1971
+#: standalone/drakbackup:1977
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -18358,317 +19101,324 @@ msgstr ""
 "Rhowch y maint mwyaf\n"
 " i'w ganiatáu ar gyfer Drakbackup (MB)"
 
-#: standalone/drakbackup:2035
+#: standalone/drakbackup:2041
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM / DVDROM"
 
-#: standalone/drakbackup:2040
+#: standalone/drakbackup:2046
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Disg Caled / NFS"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2056
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2061 standalone/drakbackup:2062
+#: standalone/drakbackup:2067
 #, c-format
 msgid "hourly"
 msgstr "bob awr"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2057
-#: standalone/drakbackup:2062
+#: standalone/drakbackup:2061 standalone/drakbackup:2063
+#: standalone/drakbackup:2068
 #, c-format
 msgid "daily"
 msgstr "dyddiol"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2058
-#: standalone/drakbackup:2063
+#: standalone/drakbackup:2061 standalone/drakbackup:2064
+#: standalone/drakbackup:2069
 #, c-format
 msgid "weekly"
 msgstr "bob wythnos"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2059
-#: standalone/drakbackup:2064
+#: standalone/drakbackup:2061 standalone/drakbackup:2065
+#: standalone/drakbackup:2070
 #, c-format
 msgid "monthly"
 msgstr "bob mis"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2060
-#: standalone/drakbackup:2065
+#: standalone/drakbackup:2061 standalone/drakbackup:2066
+#: standalone/drakbackup:2071
 #, c-format
 msgid "custom"
 msgstr "arddull"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "January"
 msgstr "Ionawr"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "February"
 msgstr "Chwefror"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "March"
 msgstr "Mawrth"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "April"
 msgstr "Ebrill"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "May"
 msgstr "Mai"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "June"
 msgstr "Mehefin"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "July"
 msgstr "Gorffennaf"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "August"
 msgstr "Awst"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "September"
 msgstr "Medi"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "October"
 msgstr "Hydref"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "November"
 msgstr "Tachwedd"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "December"
 msgstr "Rhagfyr"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Sunday"
 msgstr "Sul"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Monday"
 msgstr "Llun"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Tuesday"
 msgstr "Mawrth"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Wednesday"
 msgstr "Mercher"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Thursday"
 msgstr "Iau"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Friday"
 msgstr "Gwener"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Saturday"
 msgstr "Sadwrn"
 
-#: standalone/drakbackup:2107
+#: standalone/drakbackup:2113
 #, c-format
 msgid "Use daemon"
 msgstr "Defnyddiwch ddaemon"
 
-#: standalone/drakbackup:2112
+#: standalone/drakbackup:2117
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Dewiswch faint o amser fydd rhwng pob cadw wrth gefn"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Gosodiad addasu/cofnod crontab:"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:2128
 #, c-format
 msgid "Minute"
 msgstr "Munud"
 
-#: standalone/drakbackup:2127
+#: standalone/drakbackup:2132
 #, c-format
 msgid "Hour"
 msgstr "Awr"
 
-#: standalone/drakbackup:2131
+#: standalone/drakbackup:2136
 #, c-format
 msgid "Day"
 msgstr "Diwrnod"
 
-#: standalone/drakbackup:2135
+#: standalone/drakbackup:2140
 #, c-format
 msgid "Month"
 msgstr "Mis"
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2144
 #, c-format
 msgid "Weekday"
 msgstr "Diwrnod yr wythnos"
 
-#: standalone/drakbackup:2145
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn."
 
-#: standalone/drakbackup:2152
+#: standalone/drakbackup:2156
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr ""
 "Gwnewch yn siwr bod daemon cron yn cael ei gynnwys yn eich gwasanaethau."
 
-#: standalone/drakbackup:2153
+#: standalone/drakbackup:2157
+#, c-format
+msgid ""
+"If your machine is not on all the time, you might want to install anacron."
+msgstr ""
+"Os nad yw eich cyfrifiadur ymlaen drwy'r amser, byddai'n werth gosod anacron."
+
+#: standalone/drakbackup:2158
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
-msgstr "Sylwer bod yr holl gyfrwng 'gwe' yn defnyddio'r ddisg caled."
+msgstr "Sylwer bod yr holl gyfrwng 'gwe' yn defnyddio'r ddisg galed."
 
-#: standalone/drakbackup:2201
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Please choose the compression type"
-msgstr "Dewiswch y y math o gywasgiad"
+msgstr "Dewiswch y math o gywasgiad"
 
-#: standalone/drakbackup:2205
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Defnyddiwch ffeiliau .backupignore"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2211
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Anfonwch adroddiad e-bost wedi pob cadw wrth gefn i :"
 
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2217
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Gweinydd SMTP ar gyfer e-bost:"
 
-#: standalone/drakbackup:2218
+#: standalone/drakbackup:2222
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr "Dileu ffeiliau tar y Disg Caled wedi cadw cyfrwng arall wrth gefn."
 
-#: standalone/drakbackup:2258
+#: standalone/drakbackup:2262
 #, c-format
 msgid "What"
 msgstr "Beth"
 
-#: standalone/drakbackup:2263
+#: standalone/drakbackup:2267
 #, c-format
 msgid "Where"
 msgstr "Lle"
 
-#: standalone/drakbackup:2268
+#: standalone/drakbackup:2272
 #, c-format
 msgid "When"
 msgstr "Pryd"
 
-#: standalone/drakbackup:2273
+#: standalone/drakbackup:2277
 #, c-format
 msgid "More Options"
 msgstr "Dewisiadau Eraill"
 
-#: standalone/drakbackup:2286
+#: standalone/drakbackup:2290
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "Nid yw cyrchfan cadw wrth gefn wedi ei ffurfweddu..."
 
-#: standalone/drakbackup:2306 standalone/drakbackup:4229
+#: standalone/drakbackup:2310 standalone/drakbackup:4234
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Ffurfweddiad Drakbackup"
 
-#: standalone/drakbackup:2322
+#: standalone/drakbackup:2326
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Dewiswch i le rydych am gadw ffeiliau wrth gefn"
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr "Dileu ffeiliau tar y Disg Caled wedi cadw cyfrwng arall wrth gefn."
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "Across Network"
 msgstr "ar draws Rhwydwaith"
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "On CD-R"
 msgstr "ar CDROM"
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "On Tape Device"
 msgstr "ar Ddyfais Tâp"
 
-#: standalone/drakbackup:2371
+#: standalone/drakbackup:2375
 #, c-format
 msgid "Backup Users"
 msgstr "Defnyddwyr Cadw wrth Gefn"
 
-#: standalone/drakbackup:2372
+#: standalone/drakbackup:2376
 #, c-format
 msgid " (Default is all users)"
 msgstr "(Rhagosodedig yw pob defnyddiwr)"
 
-#: standalone/drakbackup:2384
+#: standalone/drakbackup:2389
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Dewiswch beth rydych am ei gadw wrth gefn"
 
-#: standalone/drakbackup:2385
+#: standalone/drakbackup:2390
 #, c-format
 msgid "Backup System"
 msgstr "System cadw wrth gefn"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2392
 #, c-format
 msgid "Select user manually"
 msgstr "Dewis defnyddwyr gyda llaw"
 
-#: standalone/drakbackup:2416
+#: standalone/drakbackup:2421
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Dewiswch y data i'w gadw wrth gefn..."
 
-#: standalone/drakbackup:2488
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
 "\n"
-"Ffynhonell Cadw wrth Gefn:\n"
+"Ffynhonnell Cadw wrth Gefn:\n"
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2494
 #, c-format
 msgid ""
 "\n"
@@ -18677,7 +19427,7 @@ msgstr ""
 "\n"
 "- Ffeiliau System: \n"
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2496
 #, c-format
 msgid ""
 "\n"
@@ -18686,7 +19436,7 @@ msgstr ""
 "\n"
 "- Ffeiliau Defnyddiwr:\n"
 
-#: standalone/drakbackup:2493
+#: standalone/drakbackup:2498
 #, c-format
 msgid ""
 "\n"
@@ -18695,7 +19445,7 @@ msgstr ""
 "\n"
 "- Ffeiliau Eraill: \n"
 
-#: standalone/drakbackup:2495
+#: standalone/drakbackup:2500
 #, c-format
 msgid ""
 "\n"
@@ -18704,12 +19454,12 @@ msgstr ""
 "\n"
 "Cadw ar Ddisg caled ar lwybr: %s\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2501
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tCyfyngu defnydd disg i %s Mb\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -18718,7 +19468,7 @@ msgstr ""
 "\n"
 "- Dileu ffeiliau tar y disg caled wedi'r cadw wrth gefn.\n"
 
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2509
 #, c-format
 msgid ""
 "\n"
@@ -18727,22 +19477,22 @@ msgstr ""
 "\n"
 "- Llosgi i CD"
 
-#: standalone/drakbackup:2505
+#: standalone/drakbackup:2510
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2511
 #, c-format
 msgid " on device: %s"
 msgstr "ar ddyfais: %s"
 
-#: standalone/drakbackup:2507
+#: standalone/drakbackup:2512
 #, c-format
 msgid " (multi-session)"
 msgstr "(aml-sesiwn)"
 
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -18751,17 +19501,17 @@ msgstr ""
 "\n"
 "- Cadw i dâp ar ddyfais: %s"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2514
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tDileu=%s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tBackup directly to Tape\n"
-msgstr ""
+msgstr "\tCadw wrth gefn yn syth i Dâp\n"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2518
 #, c-format
 msgid ""
 "\n"
@@ -18770,7 +19520,7 @@ msgstr ""
 "\n"
 "- Cadw drwy %s ar westeiwr: %s\n"
 
-#: standalone/drakbackup:2514
+#: standalone/drakbackup:2519
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -18779,7 +19529,7 @@ msgstr ""
 "\t\t enw defnyddiwr:%s\n"
 "\t\t ar lwybr: %s \n"
 
-#: standalone/drakbackup:2515
+#: standalone/drakbackup:2520
 #, c-format
 msgid ""
 "\n"
@@ -18788,42 +19538,42 @@ msgstr ""
 "\n"
 "-Dewisiadau:\n"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2521
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tPeidiwch cynnwys Ffeiliau System\n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\t Bydd Cadw wrth gefn yn defnyddio tar a bzip2\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tBydd Cadw wrth Gefn yn defnyddio tar a gzip\n"
 
-#: standalone/drakbackup:2520
+#: standalone/drakbackup:2525
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tBydd Cadw wrth Gefn yn defnyddio tar yn unig\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tDefnyddiwch ffeiliau .backupignorey\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tAnfon e-bost at %s\n"
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tDefnyddio gweinydd SMTP %s\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2531
 #, c-format
 msgid ""
 "\n"
@@ -18832,47 +19582,47 @@ msgstr ""
 "\n"
 "- Daemon %s trwy:\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Disg Caled.\n"
 
-#: standalone/drakbackup:2528
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R.\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2534
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Tâp \n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2535
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Rhwydwaith drwy FTP.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2536
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Rhwydwaith drwy SSH.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2537
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Rhwydwaith drwy rsync.\n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2538
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Rhwydwaith drwy webday.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2540
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr "Dim ffurfweddiad, cliciwch Dewin neu Uwch.\n"
+msgstr "Dim ffurfweddiad, cliciwch Ddewin neu Uwch.\n"
 
-#: standalone/drakbackup:2540
+#: standalone/drakbackup:2545
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18881,27 +19631,27 @@ msgstr ""
 "Rhestr o ddata i'w adfer:\n"
 "\n"
 
-#: standalone/drakbackup:2542
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "Adfer Ffeiliau'r System.\n"
 
-#: standalone/drakbackup:2544 standalone/drakbackup:2554
+#: standalone/drakbackup:2549 standalone/drakbackup:2559
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "       - o ddyddiad: %s %s\n"
 
-#: standalone/drakbackup:2547
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Adfer Ffeiliau'r System: \n"
 
-#: standalone/drakbackup:2552
+#: standalone/drakbackup:2557
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Adfer Ffeiliau Eraill: \n"
 
-#: standalone/drakbackup:2731
+#: standalone/drakbackup:2736
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18910,149 +19660,149 @@ msgstr ""
 "Rhestr o ddata llwgr:\n"
 "\n"
 
-#: standalone/drakbackup:2733
+#: standalone/drakbackup:2738
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Dad-diciwch hwn neu ei dynnu'r tro nesaf."
 
-#: standalone/drakbackup:2743
+#: standalone/drakbackup:2748
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Mae'r ffeiliau wrth gefn wedi eu llygru"
 
-#: standalone/drakbackup:2764
+#: standalone/drakbackup:2769
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "         Mae eich dewis data wedi ei          "
 
-#: standalone/drakbackup:2765
+#: standalone/drakbackup:2770
 #, c-format
 msgid "          Successfully Restored on %s       "
 msgstr "          Ei adfer yn Llwyddiannus ar %s     "
 
-#: standalone/drakbackup:2885
+#: standalone/drakbackup:2890
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "           Adfer y Ffurfweddiad"
 
-#: standalone/drakbackup:2913
+#: standalone/drakbackup:2918
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Iawn i adfer ffeiliau eraill"
 
-#: standalone/drakbackup:2929
+#: standalone/drakbackup:2934
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 "Rhestr defnyddwyr i'w adfer ( dim ond y diweddaraf yn ôl y defnyddwyr, sy'n "
 "bwysig )"
 
-#: standalone/drakbackup:2994
+#: standalone/drakbackup:2999
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Dewiswch y dyddiad i'w adfer:"
 
-#: standalone/drakbackup:3031
+#: standalone/drakbackup:3036
 #, c-format
 msgid "Restore from Hard Disk."
-msgstr "Adfer o'r Ddisg Caled."
+msgstr "Adfer o'r Ddisg Galed."
 
-#: standalone/drakbackup:3033
+#: standalone/drakbackup:3038
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Rhowch y cyfeiriadur lle mae'r ffeiliau wrth gefn yn cael eu cadw"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3042
 #, c-format
 msgid "Directory with backups"
 msgstr "Cyfeiriadur gyda chadw wrth gefn"
 
-#: standalone/drakbackup:3091
+#: standalone/drakbackup:3096
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Dewis cyfrwng arall i adfer ohono"
 
-#: standalone/drakbackup:3093
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Other Media"
 msgstr "Cyfrwng Arall"
 
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3103
 #, c-format
 msgid "Restore system"
 msgstr "Adfer y system"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3104
 #, c-format
 msgid "Restore Users"
 msgstr "Adfer Defnyddwyr"
 
-#: standalone/drakbackup:3100
+#: standalone/drakbackup:3105
 #, c-format
 msgid "Restore Other"
 msgstr "Adfer Arall"
 
-#: standalone/drakbackup:3102
+#: standalone/drakbackup:3107
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "dewis llwybr arall i adfer ( yn lle / )"
 
-#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#: standalone/drakbackup:3111 standalone/drakbackup:3393
 #, c-format
 msgid "Path To Restore To"
 msgstr "Llwybr i Adfer Iddo"
 
-#: standalone/drakbackup:3109
+#: standalone/drakbackup:3114
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr ""
-"Gwnewch cadw wrth gefn newydd cyn adfer ( ar gyfer cadw wrth gefn cynyddol "
+"Gwnewch gadw wrth gefn newydd cyn adfer ( ar gyfer cadw wrth gefn cynyddol "
 "yn unig )"
 
-#: standalone/drakbackup:3111
+#: standalone/drakbackup:3116
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Tynnu cyfeiriaduron defnyddiwr cyn adfer."
 
-#: standalone/drakbackup:3196
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "Testun enw ffeil i chwilio amdano (llinyn gwag yn cydweddu popeth):"
 
-#: standalone/drakbackup:3199
+#: standalone/drakbackup:3204
 #, c-format
 msgid "Search Backups"
 msgstr "Chwilio Copïau wrth Gefn"
 
-#: standalone/drakbackup:3217
+#: standalone/drakbackup:3222
 #, c-format
 msgid "No matches found..."
 msgstr "Heb ganfod cydweddiad..."
 
-#: standalone/drakbackup:3221
+#: standalone/drakbackup:3226
 #, c-format
 msgid "Restore Selected"
 msgstr "Adfer y Dewis"
 
-#: standalone/drakbackup:3356
+#: standalone/drakbackup:3361
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
-"Cliciwch dyddiad/amser i weld ffeiliau wrth gefn.\n"
+"Cliciwch ddyddiad/amser i weld ffeiliau wrth gefn.\n"
 "Clicio+Ctr; ffeiliau i ddewis ffeiliau niferus."
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3367
 #, c-format
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
 "Adfer Cofnod\n"
-"Catalog Ddewiswyd"
+"Catalog a Ddewiswyd"
 
-#: standalone/drakbackup:3371
+#: standalone/drakbackup:3376
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19061,265 +19811,259 @@ msgstr ""
 "Adfer y Dewis\n"
 "Ffeiliau"
 
-#: standalone/drakbackup:3448
+#: standalone/drakbackup:3453
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Heb ganfod y  ffeiliau wrth gefn yn %s."
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3466
 #, c-format
 msgid "Restore From CD"
 msgstr "Adfer o'r CD"
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3466
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
 " in the CD drive under mount point /mnt/cdrom"
 msgstr ""
 "Rhowch yr CD gyda label cynnwys%s\n"
-"yn yr gyrrwr CD o dan bwynt gosod /mnt/cdrom"
+"yn y gyrrwr CD o dan bwynt gosod /mnt/cdrom"
 
-#: standalone/drakbackup:3463
+#: standalone/drakbackup:3468
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "Nid y label CD cywir. Disg wedi ei labelu %s."
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3478
 #, c-format
 msgid "Restore From Tape"
 msgstr "Adfer o Dâp"
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3478
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
 " in the tape drive device %s"
 msgstr ""
 "Rhowch y tâp gyda label cynnwys%s\n"
-"yn yr gyrrwr tâp %s"
+"yn y gyrrwr tâp %s"
 
-#: standalone/drakbackup:3475
+#: standalone/drakbackup:3480
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Nid y label tâp cywir. Tâp wedi ei labelu %s."
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3491
 #, c-format
 msgid "Restore Via Network"
 msgstr "Adfer drwy'r Rhwydwaith"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3491
 #, c-format
 msgid "Restore Via Network Protocol: %s"
-msgstr "Adfer drwy Protocol Rhwydwaith: %s"
+msgstr "Adfer drwy Brotocol Rhwydwaith: %s"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3492
 #, c-format
 msgid "Host Name"
 msgstr "Enw Gwesteiwr"
 
-#: standalone/drakbackup:3488
+#: standalone/drakbackup:3493
 #, c-format
 msgid "Host Path or Module"
 msgstr "Llwybr Gwesteiwr neu Fodiwl "
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3500
 #, c-format
 msgid "Password required"
 msgstr "Mae angen cyfrinair"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3506
 #, c-format
 msgid "Username required"
 msgstr "Mae angen enw defnyddiwr"
 
-#: standalone/drakbackup:3504
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Hostname required"
 msgstr "Mae angen enw gwesteiwr"
 
-#: standalone/drakbackup:3509
+#: standalone/drakbackup:3514
 #, c-format
 msgid "Path or Module required"
 msgstr "Llwybr neu Fodiwl angenrheidiol"
 
-#: standalone/drakbackup:3522
+#: standalone/drakbackup:3527
 #, c-format
 msgid "Files Restored..."
 msgstr "Adferwyd ffeiliau..."
 
-#: standalone/drakbackup:3525
+#: standalone/drakbackup:3530
 #, c-format
 msgid "Restore Failed..."
 msgstr "Methodd Adfer..."
 
-#: standalone/drakbackup:3543
+#: standalone/drakbackup:3548
 #, c-format
 msgid "%s not retrieved..."
 msgstr "Heb ail estyn %s..."
 
-#: standalone/drakbackup:3765 standalone/drakbackup:3834
+#: standalone/drakbackup:3770 standalone/drakbackup:3839
 #, c-format
 msgid "Search for files to restore"
 msgstr "Chwilio am ffeiliau i'w hadfer"
 
-#: standalone/drakbackup:3769
+#: standalone/drakbackup:3774
 #, c-format
 msgid "Restore all backups"
 msgstr "Adfer pob cadw wrth gefn"
 
-#: standalone/drakbackup:3777
+#: standalone/drakbackup:3782
 #, c-format
 msgid "Custom Restore"
 msgstr "Adfer Dewisol"
 
-#: standalone/drakbackup:3781 standalone/drakbackup:3830
+#: standalone/drakbackup:3786 standalone/drakbackup:3835
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Adfer o'r Catalog"
 
-#: standalone/drakbackup:3802
+#: standalone/drakbackup:3807
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Methu canfod cadw wrth gefn i'w hadfer...\n"
 
-#: standalone/drakbackup:3803
+#: standalone/drakbackup:3808
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Gwirio mai %s yw'r llwybr cywir"
 
-#: standalone/drakbackup:3804
+#: standalone/drakbackup:3809
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " ac mae'r CD yn y gyrrwr"
 
-#: standalone/drakbackup:3806
+#: standalone/drakbackup:3811
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr "Cadw wrth gefn ar gyfrwng anosodadwy - Defnyddiwch Gatalog i'w adfer"
 
-#: standalone/drakbackup:3822
+#: standalone/drakbackup:3827
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD yn ei le - ewch ymlaen"
 
-#: standalone/drakbackup:3827
+#: standalone/drakbackup:3832
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Pori i'r ystorfa newydd adferwyd"
 
-#: standalone/drakbackup:3828
+#: standalone/drakbackup:3833
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Cyfeiriadur i Adfer Ohono"
 
-#: standalone/drakbackup:3864
+#: standalone/drakbackup:3869
 #, c-format
 msgid "Restore Progress"
 msgstr "Adfer Cynnydd"
 
-#: standalone/drakbackup:3919 standalone/drakbackup:3992
-#: standalone/logdrake:173
-#, c-format
-msgid "Save"
-msgstr "Gorffen"
-
-#: standalone/drakbackup:3975
+#: standalone/drakbackup:3980
 #, c-format
 msgid "Build Backup"
 msgstr "Adeiladu Cadw wrth Gefn"
 
-#: standalone/drakbackup:4008 standalone/drakbackup:4328
+#: standalone/drakbackup:4013 standalone/drakbackup:4333
 #, c-format
 msgid "Restore"
 msgstr "Adfer"
 
-#: standalone/drakbackup:4096
+#: standalone/drakbackup:4101
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Mae'r pecynnau canlynol angen eu gosod:\n"
 
-#: standalone/drakbackup:4123
+#: standalone/drakbackup:4128
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Dewiswch y data i'w adfer..."
 
-#: standalone/drakbackup:4163
+#: standalone/drakbackup:4168
 #, c-format
 msgid "Backup system files"
 msgstr "Ffeiliau System Cadw wrth Gefn"
 
-#: standalone/drakbackup:4166
+#: standalone/drakbackup:4171
 #, c-format
 msgid "Backup user files"
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:4174
 #, c-format
 msgid "Backup other files"
 msgstr "Cadw'r ffeiliau eraill wrth gefn"
 
-#: standalone/drakbackup:4172 standalone/drakbackup:4206
+#: standalone/drakbackup:4177 standalone/drakbackup:4211
 #, c-format
 msgid "Total Progress"
-msgstr "Cyfanswm Cynydd"
+msgstr "Cyfanswm Cynnydd"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:4203
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Anfon ffeiliau drwy FTP"
 
-#: standalone/drakbackup:4201
+#: standalone/drakbackup:4206
 #, c-format
 msgid "Sending files..."
 msgstr "Anfon ffeiliau..."
 
-#: standalone/drakbackup:4271
+#: standalone/drakbackup:4276
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Cadwch wrth Gefn eich ffeiliau ffurfweddu"
 
-#: standalone/drakbackup:4276
+#: standalone/drakbackup:4281
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Edrych ar Ffurfweddiad Cadw wrth Gefn"
 
-#: standalone/drakbackup:4302
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Ffurfweddiad y Dewin"
 
-#: standalone/drakbackup:4307
+#: standalone/drakbackup:4312
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Ffurfweddiad Uwch"
 
-#: standalone/drakbackup:4312
+#: standalone/drakbackup:4317
 #, c-format
 msgid "View Configuration"
 msgstr "Edrych ar Ffurfweddiad"
 
-#: standalone/drakbackup:4316
+#: standalone/drakbackup:4321
 #, c-format
 msgid "View Last Log"
 msgstr "Darllen y Cofnod Olaf"
 
-#: standalone/drakbackup:4321
+#: standalone/drakbackup:4326
 #, c-format
 msgid "Backup Now"
 msgstr "Cadw wrth Gefn Nawr"
 
-#: standalone/drakbackup:4325
+#: standalone/drakbackup:4330
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
-"Ni chanfyddwyd y ffeil ffurfweddu \n"
+"Ni chanfuwyd y ffeil ffurfweddu \n"
 "cliciwch Dewin neu Uwch."
 
-#: standalone/drakbackup:4345 standalone/drakbackup:4348
+#: standalone/drakbackup:4350 standalone/drakbackup:4353
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
@@ -19334,10 +20078,10 @@ msgstr "Dewis themâu cychwyn graffigol"
 msgid "System mode"
 msgstr "Modd system"
 
-#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
-#: standalone/harddrake2:172 standalone/logdrake:70
-#: standalone/printerdrake:156 standalone/printerdrake:157
-#: standalone/printerdrake:158
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:187
+#: standalone/harddrake2:188 standalone/logdrake:70
+#: standalone/printerdrake:138 standalone/printerdrake:139
+#: standalone/printerdrake:140
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
@@ -19347,8 +20091,8 @@ msgstr "/_Ffeil"
 msgid "/File/_Quit"
 msgstr "/Ffeil/_Gadael"
 
-#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
-#: standalone/logdrake:76 standalone/printerdrake:158
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:188
+#: standalone/logdrake:76 standalone/printerdrake:140
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -19374,13 +20118,13 @@ msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
-"Nid yw eich cychwynnwr ym modd byffer ffrâm.I weithredu cychwyn graffigol, "
+"Nid yw eich cychwynnwr ym modd byffer ffrâm. I weithredu cychwyn graffigol, "
 "dewiswch y modd fideo graffig i'r offeryn ffurfweddu'r cychwynnwr."
 
 #: standalone/drakboot:167
-#, fuzzy, c-format
+#, c-format
 msgid "Do you want to configure it now?"
-msgstr "Ydych chi eisiau profi'r ffurfweddiad?"
+msgstr "Hoffech chi ei ffurfweddu?"
 
 #: standalone/drakboot:177
 #, c-format
@@ -19403,13 +20147,13 @@ msgstr "Cychwyn yr amgylchedd graffigol wrth gychwyn eich system"
 
 #: standalone/drakboot:197
 #, c-format
-msgid "No, I don't want autologin"
+msgid "No, I do not want autologin"
 msgstr "Na, dydw i ddim eisiau awtomewngofnodi"
 
 #: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Iawn, rwyf eisiau awtomewngofnodi gyda (defnyddiwr, bwrdd gwaith)"
+msgstr "Iawn, rwyf eisiau awto mewngofnodi gyda (defnyddiwr, bwrdd gwaith)"
 
 #: standalone/drakboot:201
 #, c-format
@@ -19428,11 +20172,14 @@ msgid ""
 "selected below.\n"
 "Be sure your video card supports the mode you choose."
 msgstr ""
+"Dewiswch fodd fideo, fydd yn cael ei osod ar gyfer pob cofnod cychwyn "
+"dewiswyd isod.\n"
+"Gwnewch yn siŵr fod eich cerdyn fideo yn cynnal y modd rydych yn ei ddewis."
 
 #: standalone/drakbug:41
-#, fuzzy, c-format
+#, c-format
 msgid "Mandrakelinux Bug Report Tool"
-msgstr "Offeryn Adrodd Gwall Mandrake"
+msgstr "Offeryn Cofnodi Gwall Mandrakelinux"
 
 #: standalone/drakbug:46
 #, c-format
@@ -19444,8 +20191,8 @@ msgstr "Canolfan Rheoli Mandrakelinux"
 msgid "Synchronization tool"
 msgstr "Offeryn Cydamseru"
 
-#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
-#: standalone/drakbug:178 standalone/drakbug:182
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:148
+#: standalone/drakbug:150 standalone/drakbug:154
 #, c-format
 msgid "Standalone Tools"
 msgstr "Offer Unigol"
@@ -19500,160 +20247,106 @@ msgstr "Userdrake"
 msgid "Configuration Wizards"
 msgstr "Dewin Ffurfweddu"
 
-#: standalone/drakbug:83
+#: standalone/drakbug:81
 #, c-format
-msgid "Application:"
-msgstr "Rhaglen"
+msgid "Select Mandrakesoft Tool:"
+msgstr "Dewis Offeryn Mandrakesoft:"
 
-#: standalone/drakbug:84 standalone/drakbug:96
-#, c-format
-msgid "Package: "
-msgstr "Pecynnau"
-
-#: standalone/drakbug:85
-#, c-format
-msgid "Kernel:"
-msgstr "Kernel:"
-
-#: standalone/drakbug:86 standalone/drakbug:97
-#, c-format
-msgid "Release: "
-msgstr "Ryddhad"
-
-#: standalone/drakbug:91
+#: standalone/drakbug:82
 #, c-format
 msgid ""
-"Application Name\n"
-"or Full Path:"
+"or Application Name\n"
+"(or Full Path):"
 msgstr ""
-"Enw Rhaglen\n"
-"neu Lwybr Llawn:"
+"neu Enw Rhaglen\n"
+"(neu Lwybr Llawn):"
 
-#: standalone/drakbug:94
+#: standalone/drakbug:85
 #, c-format
 msgid "Find Package"
 msgstr "Canfod Pecyn"
 
-#: standalone/drakbug:98
+#: standalone/drakbug:87
 #, c-format
-msgid "Summary: "
-msgstr "Crynodeb:"
-
-#: standalone/drakbug:104
-#, c-format
-msgid "Bug Description/System Information"
-msgstr "Disgrifiad Gwall/Gwybodaeth am y System"
-
-#: standalone/drakbug:105
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "EICH TESTUN YMA"
-
-#: standalone/drakbug:108
-#, c-format
-msgid "Submit kernel version"
-msgstr "Cyflwyno fersiwn y cnewyllyn"
-
-#: standalone/drakbug:109
-#, c-format
-msgid "Submit cpuinfo"
-msgstr "Cyflwyno cpuinfo"
+msgid "Package: "
+msgstr "Pecynnau"
 
-#: standalone/drakbug:110
+#: standalone/drakbug:88
 #, c-format
-msgid "Submit lspci"
-msgstr "Cyflwyno Ispci"
+msgid "Kernel:"
+msgstr "Kernel:"
 
-#: standalone/drakbug:124
+#: standalone/drakbug:100
 #, c-format
 msgid ""
-"To submit a bug report, click on the report button.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"To submit a bug report, click on the report button.  \n"
+"This will open a web browser window on %s where you'll find a form to fill "
+"in.  The information displayed above will be transferred to that server.  \n"
+"Things useful to include in your report are the output of lspci, kernel "
+"version, and /proc/cpuinfo."
 msgstr ""
 "I gyflwyno adroddiad gwall, cliciwch ar y botwm adroddiad.\n"
-"Bydd hyn yn agor ffenestr porwr gwe yn %s\n"
-" lle welwch ffurflen i'w llenwi. Bydd yr wybodaeth rhowch arno'n cael ei\n"
-"drosglwyddo i'r gweinydd."
+"Bydd hyn yn agor ffenestr porwr gwe yn %s lle welwch ffurflen i'w llenwi. "
+"Bydd yr wybodaeth rhowch arno'n cael ei drosglwyddo i'r gweinydd.\n"
+"Pethau defnyddiol i'w cynnwys yn yr adroddiad fyddai allbwn lspci, fersiwn y "
+"cnewyllyn a /proc/cpuinfo."
 
-#: standalone/drakbug:130
+#: standalone/drakbug:106
 #, c-format
 msgid "Report"
 msgstr "Adroddiad"
 
-#: standalone/drakbug:191
+#: standalone/drakbug:163
 #, c-format
 msgid "Not installed"
 msgstr "Heb ei osod"
 
-#: standalone/drakbug:203
+#: standalone/drakbug:175
 #, c-format
 msgid "Package not installed"
 msgstr "Pecyn heb ei osod"
 
-#: standalone/drakbug:220
-#, c-format
-msgid "NOT FOUND"
-msgstr "HEB GANFOD"
-
-#: standalone/drakbug:227
-#, c-format
-msgid "connecting to %s..."
-msgstr "cysylltu â %s..."
-
-#: standalone/drakbug:235
+#: standalone/drakbug:191
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Dim porwr ar gael! Gosodwch un"
 
-#: standalone/drakbug:254
-#, c-format
-msgid "Please enter a package name."
-msgstr "Rhowch enw'r pecyn."
-
-#: standalone/drakbug:260
-#, c-format
-msgid "Please enter summary text."
-msgstr "Rhowch destun crynodeb yma."
-
-#: standalone/drakclock:30
+#: standalone/drakclock:29
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:40
+#: standalone/drakclock:39
 #, c-format
 msgid "not defined"
 msgstr "heb ddiffinio"
 
-#: standalone/drakclock:42
+#: standalone/drakclock:41
 #, c-format
 msgid "Change Time Zone"
 msgstr "Newid Cylchedd Amser"
 
-#: standalone/drakclock:46
+#: standalone/drakclock:45
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Cylchfa Amser - DrakClock"
 
-#: standalone/drakclock:48
+#: standalone/drakclock:47
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - DrakClock"
 
-#: standalone/drakclock:48
+#: standalone/drakclock:47
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "A yw eich cloc caledwedd wedi ei osod i GMT?"
 
-#: standalone/drakclock:76
+#: standalone/drakclock:75
 #, c-format
 msgid "Network Time Protocol"
 msgstr "Protocol Amser Rhwydwaith"
 
-#: standalone/drakclock:78
+#: standalone/drakclock:77
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -19662,27 +20355,27 @@ msgstr ""
 "Mae eich cyfrifiadur yn gallu cydweddu ei gloc\n"
 " gyda gweinydd pell drwy NTP"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:78
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Galluogi Protocol Amser Rhwydwaith"
 
-#: standalone/drakclock:87
+#: standalone/drakclock:86
 #, c-format
 msgid "Server:"
 msgstr "Gweinydd:"
 
-#: standalone/drakclock:125
+#: standalone/drakclock:124
 #, c-format
 msgid "Could not synchronize with %s."
-msgstr ""
+msgstr "Methu cydweddu gyda %s."
 
-#: standalone/drakclock:147 standalone/drakclock:157
+#: standalone/drakclock:146 standalone/drakclock:156
 #, c-format
 msgid "Reset"
 msgstr "Ailosod"
 
-#: standalone/drakclock:225
+#: standalone/drakclock:224
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -19690,7 +20383,7 @@ msgid ""
 "\n"
 "Do you want to install ntp?"
 msgstr ""
-"Mae angen gosdod pecyn ntp\n"
+"Mae angen gosod pecyn ntp\n"
 " i alluogi Protocol Amser Rhwydwaith\n"
 "\n"
 "Hoffech chi osod ntp?"
@@ -19700,12 +20393,12 @@ msgstr ""
 msgid "Network configuration (%d adapters)"
 msgstr "Ffurfweddiad y rhwydwaith (%d addasydd)"
 
-#: standalone/drakconnect:96 standalone/drakconnect:787
+#: standalone/drakconnect:96 standalone/drakconnect:786
 #, c-format
 msgid "Gateway:"
 msgstr "Mynedfa:"
 
-#: standalone/drakconnect:96 standalone/drakconnect:787
+#: standalone/drakconnect:96 standalone/drakconnect:786
 #, c-format
 msgid "Interface:"
 msgstr "Rhyngwyneb:"
@@ -19720,8 +20413,8 @@ msgstr "Arhoswch"
 msgid "Interface"
 msgstr "Rhyngwyneb"
 
-#: standalone/drakconnect:116 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: standalone/drakconnect:116 standalone/printerdrake:211
+#: standalone/printerdrake:218
 #, c-format
 msgid "State"
 msgstr "Stad"
@@ -19736,7 +20429,7 @@ msgstr "Enw gwesteiwr:"
 msgid "Configure hostname..."
 msgstr "Ffurfweddu enw gwestai"
 
-#: standalone/drakconnect:149 standalone/drakconnect:843
+#: standalone/drakconnect:149 standalone/drakconnect:842
 #, c-format
 msgid "LAN configuration"
 msgstr "Ffurfweddiad y Rhwydwaith Lleol"
@@ -19767,103 +20460,103 @@ msgstr "Dewiswyd y ddyfais"
 msgid "IP configuration"
 msgstr "Ffurfweddiad IP"
 
-#: standalone/drakconnect:342
+#: standalone/drakconnect:344
 #, c-format
 msgid "DNS servers"
 msgstr "Gweinydd DNS"
 
-#: standalone/drakconnect:350
+#: standalone/drakconnect:352
 #, c-format
 msgid "Search Domain"
 msgstr "Chwilio Parth"
 
-#: standalone/drakconnect:358
+#: standalone/drakconnect:360
 #, c-format
 msgid "static"
 msgstr "statig"
 
-#: standalone/drakconnect:358
+#: standalone/drakconnect:360
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:436
-#, fuzzy, c-format
+#: standalone/drakconnect:438
+#, c-format
 msgid "Metric"
-msgstr "cyfyngu"
+msgstr "Metrig"
 
-#: standalone/drakconnect:491
+#: standalone/drakconnect:493
 #, c-format
 msgid "Flow control"
 msgstr "Rheolwr llif"
 
-#: standalone/drakconnect:492
+#: standalone/drakconnect:494
 #, c-format
 msgid "Line termination"
 msgstr "Terfyn llinell"
 
-#: standalone/drakconnect:503
+#: standalone/drakconnect:505
 #, c-format
 msgid "Modem timeout"
 msgstr "Goramser modem"
 
-#: standalone/drakconnect:507
+#: standalone/drakconnect:509
 #, c-format
 msgid "Use lock file"
 msgstr "Dewiswch ffeil clo"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:511
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Arhoswch am y tôn deialu cyn deialu"
 
-#: standalone/drakconnect:512
+#: standalone/drakconnect:514
 #, c-format
 msgid "Busy wait"
 msgstr "Prysur arhoswch"
 
-#: standalone/drakconnect:517
+#: standalone/drakconnect:519
 #, c-format
 msgid "Modem sound"
 msgstr "Sain modem"
 
-#: standalone/drakconnect:518
+#: standalone/drakconnect:520
 #, c-format
 msgid "Enable"
 msgstr "Galluogi"
 
-#: standalone/drakconnect:518
+#: standalone/drakconnect:520
 #, c-format
 msgid "Disable"
 msgstr "Analluogi"
 
-#: standalone/drakconnect:569 standalone/harddrake2:45
+#: standalone/drakconnect:571 standalone/harddrake2:48
 #, c-format
 msgid "Media class"
 msgstr "Dosbarth y cyfrwng"
 
-#: standalone/drakconnect:570 standalone/drakfloppy:136
+#: standalone/drakconnect:572 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Enw'r modiwl"
 
-#: standalone/drakconnect:571
+#: standalone/drakconnect:573
 #, c-format
 msgid "Mac Address"
 msgstr "Cyfeiriad Mac"
 
-#: standalone/drakconnect:572 standalone/harddrake2:23
-#: standalone/harddrake2:104
+#: standalone/drakconnect:574 standalone/harddrake2:26
+#: standalone/harddrake2:118
 #, c-format
 msgid "Bus"
 msgstr "Bws"
 
-#: standalone/drakconnect:573 standalone/harddrake2:29
+#: standalone/drakconnect:575 standalone/harddrake2:32
 #, c-format
 msgid "Location on the bus"
 msgstr "Lleoliad ar y bws"
 
-#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
+#: standalone/drakconnect:671 standalone/drakgw:247 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -19872,17 +20565,17 @@ msgstr ""
 "Nid oes addasydd rhwydwaith ethernet wedi ei ganfod ar eich system. Rhedwch "
 "yr offeryn ffurfweddu caledwedd."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:679
 #, c-format
 msgid "Remove a network interface"
 msgstr "Tynnu rhyngwyneb rhwydwaith"
 
-#: standalone/drakconnect:682
+#: standalone/drakconnect:683
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Dewis y rhyngwyneb rhwydwaith i'w dynnu:"
 
-#: standalone/drakconnect:713
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
 "An error occurred while deleting the \"%s\" network interface:\n"
@@ -19893,7 +20586,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:715
+#: standalone/drakconnect:716
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been successfully deleted"
@@ -19909,37 +20602,37 @@ msgstr "Dim IP"
 msgid "No Mask"
 msgstr "Dim Mask"
 
-#: standalone/drakconnect:734 standalone/drakconnect:914
+#: standalone/drakconnect:734 standalone/drakconnect:913
 #, c-format
 msgid "up"
 msgstr "fyny"
 
-#: standalone/drakconnect:734 standalone/drakconnect:914
+#: standalone/drakconnect:734 standalone/drakconnect:913
 #, c-format
 msgid "down"
 msgstr "lawr"
 
-#: standalone/drakconnect:777 standalone/net_monitor:468
+#: standalone/drakconnect:776 standalone/net_monitor:470
 #, c-format
 msgid "Connected"
 msgstr "Wedi cysylltu"
 
-#: standalone/drakconnect:777 standalone/net_monitor:468
+#: standalone/drakconnect:776 standalone/net_monitor:470
 #, c-format
 msgid "Not connected"
 msgstr "Heb gysylltu"
 
-#: standalone/drakconnect:779
+#: standalone/drakconnect:778
 #, c-format
 msgid "Disconnect..."
 msgstr "Datgysylltu..."
 
-#: standalone/drakconnect:779
+#: standalone/drakconnect:778
 #, c-format
 msgid "Connect..."
 msgstr "Cysylltu..."
 
-#: standalone/drakconnect:808
+#: standalone/drakconnect:807
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19948,93 +20641,97 @@ msgstr ""
 "Rhybudd, mae cysylltiad arall gyda'r rhyngrwyd wedi ei ganfod, efallai'n "
 "defnyddio eich rhwydwaith."
 
-#: standalone/drakconnect:839
+#: standalone/drakconnect:838
 #, c-format
 msgid "Deactivate now"
 msgstr "Dad weithredu nawr"
 
-#: standalone/drakconnect:839
+#: standalone/drakconnect:838
 #, c-format
 msgid "Activate now"
 msgstr "Cychwyn nawr"
 
-#: standalone/drakconnect:847
+#: standalone/drakconnect:846
 #, c-format
 msgid ""
-"You don't have any configured interface.\n"
+"You do not have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 "Nid oes gennych unrhyw rhagwynebau wedi\n"
 "eu ffurfweddio. Ffurfweddwch nhw'n gyntaf\n"
 "drwy glicio ar 'Ffurfweddu'"
 
-#: standalone/drakconnect:861
+#: standalone/drakconnect:860
 #, c-format
 msgid "LAN Configuration"
 msgstr "Ffurfweddiad Rhwydwaith Lleol (LAN)"
 
-#: standalone/drakconnect:873
+#: standalone/drakconnect:872
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Addasydd %s: %s"
 
-#: standalone/drakconnect:882
+#: standalone/drakconnect:881
 #, c-format
 msgid "Boot Protocol"
 msgstr "Protocol Cychwyn"
 
-#: standalone/drakconnect:883
+#: standalone/drakconnect:882
 #, c-format
 msgid "Started on boot"
 msgstr "Cychwyn y peiriant"
 
-#: standalone/drakconnect:919
+#: standalone/drakconnect:918
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
 "Run the \"Add an interface\" assistant from the Mandrakelinux Control Center"
 msgstr ""
 "Nid yw'r rhag wyneb hwn wedi ei ffurfweddu eto.\n"
-"Cychwynnwch y cynorthwy-ydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
+"Cychwynnwch y cynorthwyydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
 "Mandrake"
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:974 standalone/net_applet:46
-#, fuzzy, c-format
+#: standalone/drakconnect:973 standalone/net_applet:50
+#, c-format
 msgid ""
-"You don't have any configured Internet connection.\n"
-"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mandrakelinux Control Center"
 msgstr ""
-"Nid yw'r rhag wyneb hwn wedi ei ffurfweddu eto.\n"
-"Cychwynnwch y cynorthwy-ydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
-"Mandrake"
+"Nid oes gennych gyswllt wedi ei ffurfweddu â'r Rhyngrwyd.\n"
+"Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mandrake"
+
+#: standalone/drakconnect:974 standalone/net_applet:51
+#, c-format
+msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
+msgstr "Gosod rhygnwyneb rhwydwaith newydd (LAN, ISDN, ADSL, ...)"
 
-#: standalone/drakconnect:982
+#: standalone/drakconnect:981
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Ffurfweddiad cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakconnect:1000
+#: standalone/drakconnect:999
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Trydydd gweinydd DNS (dewisol)"
 
-#: standalone/drakconnect:1022
+#: standalone/drakconnect:1021
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Ffurfweddu Cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakconnect:1023
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet access"
 msgstr "Mynediad i'r Rhyngrwyd"
 
-#: standalone/drakconnect:1025 standalone/net_monitor:101
+#: standalone/drakconnect:1024 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Math o gyswllt:"
 
-#: standalone/drakconnect:1028
+#: standalone/drakconnect:1027
 #, c-format
 msgid "Status:"
 msgstr "Statws"
@@ -20086,6 +20783,8 @@ msgid ""
 "You are going to close all running programs and lose your current session. "
 "Are you really sure that you want to restart the dm service?"
 msgstr ""
+"Rydych yn mynd i gau pob rhaglen sy'n rhedeg a cholli eich sesiwn presennol. "
+"Ydych chi'n siŵr eich bod am ailgychwyn y gwasanaeth dm?"
 
 #: standalone/drakfloppy:41
 #, c-format
@@ -20102,7 +20801,7 @@ msgstr "Creu disg cychwyn"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: standalone/drakfloppy:82 standalone/harddrake2:131
+#: standalone/drakfloppy:82 standalone/harddrake2:145
 #, c-format
 msgid "Device"
 msgstr "Dyfais"
@@ -20165,7 +20864,7 @@ msgstr "Tynnu modiwl"
 #: standalone/drakfloppy:291
 #, c-format
 msgid "Be sure a media is present for the device %s"
-msgstr "Gwnewch yn siwr fod y deunydd ar gael ar gyfer y ddyfais %s"
+msgstr "Gwnewch yn siŵr fod y deunydd ar gael ar gyfer y ddyfais %s"
 
 #: standalone/drakfloppy:297
 #, c-format
@@ -20173,26 +20872,26 @@ msgid ""
 "There is no medium or it is write-protected for device %s.\n"
 "Please insert one."
 msgstr ""
-"Does dim cyfrwng neu mae wedi ei amddiffyn rhag ysgrifennu i'r dyfais %s.\n"
+"Does dim cyfrwng neu mae wedi ei amddiffyn rhag ysgrifennu i'r ddyfais %s.\n"
 "Rhowch un i mewn.."
 
-#: standalone/drakfloppy:301
+#: standalone/drakfloppy:300
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Methu fforchio: %s"
 
-#: standalone/drakfloppy:304
+#: standalone/drakfloppy:303
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Creu disg meddal wedi ei gwblhau"
 
-#: standalone/drakfloppy:304
+#: standalone/drakfloppy:303
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "Mae creu'r disg meddal cychwyn wedi bod yn llwyddiant\n"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:308
 #, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -20203,109 +20902,109 @@ msgstr ""
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:182
 #, c-format
 msgid "Search installed fonts"
 msgstr "Chwilio am ffontiau wedi eu gosod"
 
-#: standalone/drakfont:185
+#: standalone/drakfont:184
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "Tynnu ffontiau wedi eu gosod"
 
-#: standalone/drakfont:208
+#: standalone/drakfont:207
 #, c-format
 msgid "parse all fonts"
 msgstr "pob ffont"
 
-#: standalone/drakfont:210
+#: standalone/drakfont:209
 #, c-format
 msgid "No fonts found"
 msgstr "Heb ganfod ffontiau"
 
-#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
-#: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
-#: standalone/drakfont:410 standalone/drakfont:424
+#: standalone/drakfont:217 standalone/drakfont:257 standalone/drakfont:324
+#: standalone/drakfont:357 standalone/drakfont:365 standalone/drakfont:391
+#: standalone/drakfont:409 standalone/drakfont:423
 #, c-format
 msgid "done"
 msgstr "gorffen"
 
-#: standalone/drakfont:223
+#: standalone/drakfont:222
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "Methu canfod unrhyw ffont yn eich rhaniad gosodedig"
 
-#: standalone/drakfont:256
+#: standalone/drakfont:255
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "Ailddewis y ffontiau cywir"
 
-#: standalone/drakfont:259
+#: standalone/drakfont:258
 #, c-format
 msgid "Could not find any font.\n"
 msgstr "Methu canfod unrhyw ffontiau.\n"
 
-#: standalone/drakfont:269
+#: standalone/drakfont:268
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr "Chwilio am ffontiau yn y rhestr gosod"
 
-#: standalone/drakfont:294
+#: standalone/drakfont:293
 #, c-format
 msgid "%s fonts conversion"
 msgstr "trosi ffontiau %s"
 
-#: standalone/drakfont:323
+#: standalone/drakfont:322
 #, c-format
 msgid "Fonts copy"
 msgstr "Copïo ffontiau"
 
-#: standalone/drakfont:326
+#: standalone/drakfont:325
 #, c-format
 msgid "True Type fonts installation"
 msgstr "Gosod ffontiau True Type"
 
-#: standalone/drakfont:333
+#: standalone/drakfont:332
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "arhoswch yn ystod ttmkfdir..."
 
-#: standalone/drakfont:334
+#: standalone/drakfont:333
 #, c-format
 msgid "True Type install done"
 msgstr "Wedi gosod True Type"
 
-#: standalone/drakfont:340 standalone/drakfont:355
+#: standalone/drakfont:339 standalone/drakfont:354
 #, c-format
 msgid "type1inst building"
 msgstr "adeiladu math 1inst"
 
-#: standalone/drakfont:349
+#: standalone/drakfont:348
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "cyfeirio Ghostscript"
 
-#: standalone/drakfont:359
+#: standalone/drakfont:358
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "Llethu Ffeiliau Dros dro"
 
-#: standalone/drakfont:362
+#: standalone/drakfont:361
 #, c-format
 msgid "Restart XFS"
 msgstr "Ail gychwyn XFS"
 
-#: standalone/drakfont:408 standalone/drakfont:418
+#: standalone/drakfont:407 standalone/drakfont:417
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "Llethu ffeiliau Ffontiau"
 
-#: standalone/drakfont:420
+#: standalone/drakfont:419
 #, c-format
 msgid "xfs restart"
 msgstr "ail gychwyn xfs"
 
-#: standalone/drakfont:428
+#: standalone/drakfont:427
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -20314,39 +21013,39 @@ msgid ""
 "-You can install the fonts the normal way. In rare cases, bogus fonts may "
 "hang up your X Server."
 msgstr ""
-"Cyn gosod unrhyw ffontiau, gwnewch yn siwr bod gennych yr hawl i'w defnyddio "
+"Cyn gosod unrhyw ffontiau, gwnewch yn siŵr bod gennych yr hawl i'w defnyddio "
 "a'u gosod ar eich system.\n"
 "\n"
 "- Gallwch osod y ffontiau yn y dull arferol. Mewn achosion prin, gall "
 "ffontiau ffug rewi eich Gweinydd X."
 
-#: standalone/drakfont:477 standalone/drakfont:486
+#: standalone/drakfont:476 standalone/drakfont:485
 #, c-format
 msgid "DrakFont"
 msgstr "DrakFont"
 
-#: standalone/drakfont:487
+#: standalone/drakfont:486
 #, c-format
 msgid "Font List"
 msgstr "Rhestr Ffontiau"
 
-#: standalone/drakfont:493
+#: standalone/drakfont:492
 #, c-format
 msgid "About"
 msgstr "Ynghylch"
 
-#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
+#: standalone/drakfont:494 standalone/drakfont:692 standalone/drakfont:730
 #, c-format
 msgid "Uninstall"
 msgstr "Dad osod"
 
-#: standalone/drakfont:496
+#: standalone/drakfont:495
 #, c-format
 msgid "Import"
 msgstr "Mewnforio"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakfont:514
+#: standalone/drakfont:513
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by Mandrakesoft \n"
@@ -20361,13 +21060,13 @@ msgstr ""
 "Hawlfraint (C) 2001-2002  Mandrakesoft \n"
 "\n"
 "\n"
-"        DUPONT Sebastien sdupont(fersiwn wreiddiol)\n"
+"        DUPONT Sebastien sdupont (fersiwn wreiddiol)\n"
 "\n"
 "        CHAUMETTE Damien<dchaumette@mandrakesoft.com\n"
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:523
+#: standalone/drakfont:522
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -20404,7 +21103,7 @@ msgstr ""
 " Free Software  Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA"
 
-#: standalone/drakfont:539
+#: standalone/drakfont:538
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -20427,19 +21126,19 @@ msgstr ""
 "\t    Trosi ffeil .pfm Windows i .afm (Adobe Font Metrics)\n"
 "\n"
 "    -  type1inst:\n"
-"\t bganJames Macnicol: \n"
+"\t gan James Macnicol: \n"
 "\t    type1inst cynhyrchu files fonts.dir fonts.scale a Fontmap.\n"
 "\n"
 "    -  ttf2pt1:   \n"
 "\t  gan Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Trosi ffeiliau ffont i ffontiau afm pfb\n"
 
-#: standalone/drakfont:558
+#: standalone/drakfont:557
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Dewiswch y rhaglenni fydd yn cynnal ffontiau:"
 
-#: standalone/drakfont:559
+#: standalone/drakfont:558
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -20448,38 +21147,38 @@ msgid ""
 "You can install the fonts the normal way. In rare cases, bogus fonts may "
 "hang up your X Server."
 msgstr ""
-"Cyn gosod unrhyw ffontiau, gwnewch yn siwr fod gennych yr hawl i'w defnyddio "
+"Cyn gosod unrhyw ffontiau, gwnewch yn siŵr fod gennych yr hawl i'w defnyddio "
 "a'u gosod ar eich system.\n"
 "\n"
 "- Gallwch osod y ffontiau yn y dull arferol. Mewn achosion prin, gall "
 "ffontiau ffug rewi Gwasanaethwr X."
 
-#: standalone/drakfont:569
+#: standalone/drakfont:568
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:569
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:571
+#: standalone/drakfont:570
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:572
+#: standalone/drakfont:571
 #, c-format
 msgid "Generic Printers"
 msgstr "Argraffyddion Generig"
 
-#: standalone/drakfont:588
+#: standalone/drakfont:587
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Dewiswch ffeil neu gyfeiriadur y ffont a chlicio 'Ychwanegu'"
 
-#: standalone/drakfont:589
+#: standalone/drakfont:588
 #, c-format
 msgid "File Selection"
 msgstr "Dewis ffeiliau"
@@ -20489,92 +21188,92 @@ msgstr "Dewis ffeiliau"
 msgid "You've not selected any font"
 msgstr "Heb ddewis ffontiau"
 
-#: standalone/drakfont:656
+#: standalone/drakfont:657
 #, c-format
 msgid "Import fonts"
 msgstr "Mewnforio ffontiau"
 
-#: standalone/drakfont:661
+#: standalone/drakfont:662
 #, c-format
 msgid "Install fonts"
 msgstr "Ychwanegu ffontiau"
 
-#: standalone/drakfont:696
+#: standalone/drakfont:697
 #, c-format
 msgid "click here if you are sure."
-msgstr "cliciwch yma os ydych yn siwr."
+msgstr "cliciwch yma os ydych yn siŵr."
 
-#: standalone/drakfont:698
+#: standalone/drakfont:699
 #, c-format
 msgid "here if no."
 msgstr "yma os nad."
 
-#: standalone/drakfont:737
+#: standalone/drakfont:738
 #, c-format
 msgid "Unselected All"
 msgstr "Dad ddewis Popeth"
 
-#: standalone/drakfont:740
+#: standalone/drakfont:741
 #, c-format
 msgid "Selected All"
 msgstr "Dewis Popeth"
 
-#: standalone/drakfont:743
+#: standalone/drakfont:744
 #, c-format
 msgid "Remove List"
 msgstr "Rhestr Tynnu"
 
-#: standalone/drakfont:754 standalone/drakfont:773
+#: standalone/drakfont:755 standalone/drakfont:774
 #, c-format
 msgid "Importing fonts"
 msgstr "Mewnforio ffontiau"
 
-#: standalone/drakfont:758 standalone/drakfont:778
+#: standalone/drakfont:759 standalone/drakfont:779
 #, c-format
 msgid "Initial tests"
 msgstr "Prawf Init"
 
-#: standalone/drakfont:759
+#: standalone/drakfont:760
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Copïo'r ffontiau ar eich system!"
 
-#: standalone/drakfont:760
+#: standalone/drakfont:761
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Gosod a throsi ffontiau"
 
-#: standalone/drakfont:761
+#: standalone/drakfont:762
 #, c-format
 msgid "Post Install"
 msgstr "Wedi'r Gosod"
 
-#: standalone/drakfont:779
+#: standalone/drakfont:780
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Tynnu ffontiau oddi ar eich system!"
 
-#: standalone/drakfont:780
+#: standalone/drakfont:781
 #, c-format
 msgid "Post Uninstall"
 msgstr "Wedi'r dad osod"
 
-#: standalone/drakgw:58 standalone/drakgw:194
+#: standalone/drakgw:58 standalone/drakgw:191
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Rhannu Cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakgw:114 standalone/drakvpn:51
+#: standalone/drakgw:111 standalone/drakvpn:51
 #, c-format
 msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Mae'n ddrwg gennym dim ond cnewyllyn 2.4 sy'n cael ei gynnal."
+msgstr "Mae'n ddrwg gennym, dim ond cnewyllyn 2.4 sy'n cael ei gynnal."
 
-#: standalone/drakgw:125
+#: standalone/drakgw:122
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
-msgstr "Mae Rhannu Cysylltiad a'r Rhyngrwyd wedi ei analluogi"
+msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei analluogi"
 
-#: standalone/drakgw:126
+#: standalone/drakgw:123
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -20582,44 +21281,44 @@ msgid ""
 "\n"
 "What would you like to do?"
 msgstr ""
-"Mae gosodiad rhannu cysylltiad a'r Rhyngrwyd wedi ei gyflawni. \n"
+"Mae gosodiad rhannu cysylltiad â'r Rhyngrwyd wedi ei gyflawni. \n"
 "Mae wedi ei analluogi. \n"
 "\n"
 "Beth hoffech ei wneud?"
 
-#: standalone/drakgw:130 standalone/drakvpn:127
+#: standalone/drakgw:127 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "galluogi"
 
-#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
-msgstr "ailffurfweddu"
+msgstr "ail-ffurfweddu"
 
-#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "gwrthod"
 
-#: standalone/drakgw:137
+#: standalone/drakgw:134
 #, c-format
 msgid "Enabling servers..."
 msgstr "Galluogi gweinyddion..."
 
-#: standalone/drakgw:149
+#: standalone/drakgw:146
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi."
 
-#: standalone/drakgw:152
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi"
 
-#: standalone/drakgw:153
+#: standalone/drakgw:150
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -20627,27 +21326,27 @@ msgid ""
 "\n"
 "What would you like to do?"
 msgstr ""
-"Mae gosodiad Rhannu Cysylltiad a'r Rhyngrwyd wedi ei gyflawni. \n"
+"Mae gosodiad Rhannu Cysylltiad â'r Rhyngrwyd wedi ei gyflawni. \n"
 "Mae wedi ei alluogi. \n"
 "\n"
 "Beth hoffech ei wneud?"
 
-#: standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:154 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "dymunol"
 
-#: standalone/drakgw:160
+#: standalone/drakgw:157
 #, c-format
 msgid "Disabling servers..."
 msgstr "Analluogi gweinyddion..."
 
-#: standalone/drakgw:175
+#: standalone/drakgw:172
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei analluogi."
 
-#: standalone/drakgw:195
+#: standalone/drakgw:192
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -20661,36 +21360,36 @@ msgid ""
 "(LAN)."
 msgstr ""
 "Rydych ar fin ffurfweddu eich cyfrifiadur i rannu ei gysylltiad Rhyngrwyd\n"
-"Gyda'r nodwedd hwn bydd cyfrifiaduron eraill ar eich rhwydwaith lleol yn "
+"Gyda'r nodwedd hon bydd cyfrifiaduron eraill ar eich rhwydwaith lleol yn "
 "gallu rhannu cyswllt rhyngrwyd y cyfrifiadur hwn.\n"
 "\n"
-"Gwnewch yn siwr eich bod wedi ffurfweddu eich mynediad Rhwydwaith/Rhyngrwyd "
+"Gwnewch yn siŵr eich bod wedi ffurfweddu eich mynediad Rhwydwaith/Rhyngrwyd "
 "gyda drakconnect cyn mynd ymhellach.\n"
 "\n"
 "Sylwer: bydd angen Addasydd Rhwydwaith un-pwrpas i greu Rhwydwaith Lleol "
 "(LAN)."
 
-#: standalone/drakgw:239
+#: standalone/drakgw:236
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
 
-#: standalone/drakgw:240
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s"
-msgstr "Rhagwyneb %s"
+msgstr "Rhyngwyneb %s"
 
-#: standalone/drakgw:249 standalone/drakpxe:137
+#: standalone/drakgw:246 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Nid oes addasydd rhwydwaith ar eich system!"
 
-#: standalone/drakgw:256
+#: standalone/drakgw:253
 #, c-format
 msgid "Network interface"
 msgstr "Rhyngwyneb rhwydwaith"
 
-#: standalone/drakgw:257
+#: standalone/drakgw:254
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -20705,12 +21404,12 @@ msgstr ""
 "\n"
 "Rwyf ar fin gosod eich Rhwydwaith Lleol gyda'r addasydd hwnnw.."
 
-#: standalone/drakgw:263 standalone/drakpxe:142
+#: standalone/drakgw:260 standalone/drakpxe:142
 #, c-format
 msgid "Choose the network interface"
 msgstr "Dewiswch rhag wyneb  y rhwydwaith"
 
-#: standalone/drakgw:264
+#: standalone/drakgw:261
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -20719,12 +21418,12 @@ msgstr ""
 "Dewiswch ba addasyddion rhwydwaith fydd yn cael eu cysylltu â'ch Rhwydwaith "
 "Lleol."
 
-#: standalone/drakgw:293
+#: standalone/drakgw:290
 #, c-format
 msgid "Network interface already configured"
 msgstr "Mae rhag wyneb y rhwydwaith wedi ei ffurfweddu eisoes"
 
-#: standalone/drakgw:294
+#: standalone/drakgw:291
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -20740,27 +21439,27 @@ msgstr ""
 "Gallwch ei wneud gyda llaw ond mae'n rhaid i chi wybod beth ydych yn ei "
 "wneud."
 
-#: standalone/drakgw:299
+#: standalone/drakgw:296
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Ail ffurfweddiad awtomatig"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:296
 #, c-format
 msgid "No (experts only)"
 msgstr "Na (arbenigwyr yn unig)"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:297
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Dangoswch y ffurfweddiad rhag wyneb cyfredol"
 
-#: standalone/drakgw:301
+#: standalone/drakgw:298
 #, c-format
 msgid "Current interface configuration"
 msgstr "Ffurfweddiad rhyngwyneb cyfredol"
 
-#: standalone/drakgw:302
+#: standalone/drakgw:299
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -20777,7 +21476,7 @@ msgstr ""
 "Priodweddau IP: %s\n"
 "Gyrrwr: %s"
 
-#: standalone/drakgw:315
+#: standalone/drakgw:312
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -20803,91 +21502,91 @@ msgstr ""
 "Neu, medraf ail ffurfweddu eich rhag wyneb ac (ail)ffurfweddi gweinydd DHCP "
 "ar eich cyfer.\n"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:319
 #, c-format
 msgid "Local Network adress"
 msgstr "Cyfeiriad y Rhwydwaith Lleol "
 
-#: standalone/drakgw:326
+#: standalone/drakgw:323
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
 "Here you can select different options for the DHCP server configuration.\n"
-"If you don't know the meaning of an option, simply leave it as it is."
+"If you do not know the meaning of an option, simply leave it as it is."
 msgstr ""
 "Ffurfweddiad Gweinydd DHCP\n"
 "\n"
 "Mae modd dewis dewisiadau gwahanol ar gyfer ffurfweddiad DHCP.\n"
 "Os nad ydych yn gwybod ystyr y dewis, gadewch lonydd iddo."
 
-#: standalone/drakgw:330
+#: standalone/drakgw:327
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "Gweinydd DHCP IP (Hwn)"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:328
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Y Gweinydd DHCP IP"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:329
 #, c-format
 msgid "The internal domain name"
 msgstr "Enw'r parth mewnol"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:330
 #, c-format
 msgid "The DHCP start range"
 msgstr "Amrediad cychwyn DHCP"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP end range"
 msgstr "Amrediad terfyn DHCP"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:332
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Les rhagosodedig (mewn eiliadau)"
 
-#: standalone/drakgw:336
+#: standalone/drakgw:333
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Les fwyaf (mewn eiliadau)"
 
-#: standalone/drakgw:337
+#: standalone/drakgw:334
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Ail ffurfweddi rhag wyneb a gweinydd DHCP"
 
-#: standalone/drakgw:344
+#: standalone/drakgw:341
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "Nid yw'r Rhwydwaith Lleol yn terfynu gyda '.0', tynnu allan."
 
-#: standalone/drakgw:354
+#: standalone/drakgw:351
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "Canfuwyd gwrthdaro posib yng nghyfeiriad LAN ffurfweddiad presennol %s!\n"
 
-#: standalone/drakgw:364
+#: standalone/drakgw:361
 #, c-format
 msgid "Configuring..."
 msgstr "Ffurfweddu..."
 
-#: standalone/drakgw:365
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Ffurfweddi sgriptiau, gosod meddalwedd, cychwyn gweinyddion..."
 
-#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:402 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Anhawster wrth osod pecyn %s"
 
-#: standalone/drakgw:601
+#: standalone/drakgw:598
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20897,7 +21596,7 @@ msgid ""
 msgstr ""
 "Mae popeth wedi ei ffurfweddu\n"
 "Gallwch rannu cysylltiad â'r Rhyngrwyd gyda chyfrifiaduron eraill ar eich "
-"Rhwydwaith Lleol gan ddefnyddio ffurfweddiad rhwydwaith awtomatig (DHCP)a "
+"Rhwydwaith Lleol gan ddefnyddio ffurfweddiad rhwydwaith awtomatig (DHCP) a "
 "gweinydd Transparent Proxy Cache (SQUID)"
 
 #: standalone/drakhelp:17
@@ -20940,9 +21639,9 @@ msgstr ""
 "WM)\n"
 
 #: standalone/drakhelp:36
-#, fuzzy, c-format
+#, c-format
 msgid "Mandrakelinux Help Center"
-msgstr "Cychwynnydd cymorth Mandrake"
+msgstr "Canolfan Gymorth Mandrakelinux"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -20995,12 +21694,12 @@ msgstr "Defnyddiwr"
 #: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
-msgstr "Grwp"
+msgstr "Grŵp"
 
 #: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
-msgstr "Caniatadau"
+msgstr "Caniatâd"
 
 #: standalone/drakperm:107
 #, c-format
@@ -21056,12 +21755,12 @@ msgstr "Ychwanegu rheol newydd ar y diwedd"
 #: standalone/drakperm:124
 #, c-format
 msgid "Delete selected rule"
-msgstr "Dileu'r rheol hwn"
+msgstr "Dileu'r rheol hon"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
 #: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:239
+#: standalone/printerdrake:232
 #, c-format
 msgid "Edit"
 msgstr "Golygu"
@@ -21084,7 +21783,7 @@ msgstr "defnyddiwr"
 #: standalone/drakperm:247
 #, c-format
 msgid "group"
-msgstr "grwp"
+msgstr "grŵp"
 
 #: standalone/drakperm:247
 #, c-format
@@ -21157,7 +21856,7 @@ msgstr "Set-GID"
 #: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
-msgstr "Defnyddio enw grwp i weithredu"
+msgstr "Defnyddio enw grŵp i weithredu"
 
 #: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
@@ -21167,7 +21866,7 @@ msgstr "Defnyddiwr :"
 #: standalone/drakperm:292
 #, c-format
 msgid "Group:"
-msgstr "Grwp :"
+msgstr "Grŵp :"
 
 #: standalone/drakperm:296
 #, c-format
@@ -21176,7 +21875,7 @@ msgstr "Derbyn presennol"
 
 #: standalone/drakperm:297
 #, c-format
-msgid "When checked, owner and group won't be changed"
+msgid "When checked, owner and group will not be changed"
 msgstr "Wedi ei dicio, nid fydd y perchennog a'r grwp yn cael ei newid"
 
 #: standalone/drakperm:307
@@ -21214,13 +21913,13 @@ msgid ""
 "Note: you need a dedicated Network Adapter to set up a Local Area Network "
 "(LAN)."
 msgstr ""
-"Rydych ar fin ffurfweddu eich cyfrifiadur i gweinydd PXE fel gweinydd DHCP a "
+"Rydych ar fin ffurfweddu eich cyfrifiadur i weinydd PXE fel gweinydd DHCP a "
 "gweinydd\n"
 "TFTP i adeiladu gweinydd gosod.\n"
-"Gyda'r nodwedd hwn bydd cyfrifiaduron eraill ar eich rhwydwaith lleol yn "
+"Gyda'r nodwedd hon bydd cyfrifiaduron eraill ar eich rhwydwaith lleol yn "
 "gallu rhannu cyswllt rhyngrwyd y cyfrifiadur hwn.\n"
 "\n"
-"Gwnewch yn siwr eich bod wedi ffurfweddu eich mynediad Rhwydwaith/Rhyngrwyd "
+"Gwnewch yn siŵr eich bod wedi ffurfweddu eich mynediad Rhwydwaith/Rhyngrwyd "
 "gyda drakconnect cyn mynd ymhellach.\n"
 "\n"
 "Sylwer: bydd angen Addasydd Rhwydwaith un-pwrpas i greu Rhwydwaith Lleol "
@@ -21271,9 +21970,9 @@ msgid ""
 "contents.\n"
 "\n"
 msgstr ""
-"Dangoswch lle bydd y delwedd gosod ar gael.\n"
+"Dangoswch lle bydd y ddelwedd gosod ar gael.\n"
 "\n"
-"Os nad oes gennych gyfeiriadur yn barod, copiwch gynnwys y CD neu'r DVD.\n"
+"Os nad oes gennych gyfeiriadur yn barod, copïwch gynnwys y CD neu'r DVD.\n"
 "\n"
 
 #: standalone/drakpxe:192
@@ -21389,21 +22088,21 @@ msgstr ""
 "defnyddiwr neu e-bost.\n"
 "\n"
 "\n"
-"Mae'r dewislen Lefel Diogelwch yn caniatáu i chi ddewis un o'r lefelau\n"
+"Mae'r ddewislen Lefel Diogelwch yn caniatáu i chi ddewis un o'r lefelau\n"
 "diogelwch ragosodedig ddarparwyd gan msec. Mae'r lefelau yn amrywio o\n"
-"ddiogelwch '<span weight=\"bold\">gwan</span>' ac hawdd ei ddefnyddio, i\n"
+"ddiogelwch '<span weight=\"bold\">gwan</span>' a hawdd ei ddefnyddio, i\n"
 "safon '<span weight=\"bold\">paranoia</span>', sy'n addas ar gyfer\n"
-"rhaglenni gwasnaethwr sensitif:\n"
+"rhaglenni gwasanaethwr sensitif:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Gwan</span>: Mae'n hollol anniogel ond yn "
 "hawdd iawn i'w\n"
-"ddefnyddio. Dim ond ar gyfer peiriannau had ydynt wei eu cysylltu ag unrhyw "
+"ddefnyddio. Dim ond ar gyfer peiriannau had ydynt wedi eu cysylltu ag unrhyw "
 "rwydwaith ac nad\n"
 "ydynt ar agor i bawb\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Safonnol</span>:Dyma'r diogelwch safonnol ar "
+"<span foreground=\"royalblue3\">Safonol</span>:Dyma'r diogelwch safonol ar "
 "gyfer\n"
 "cyfrifiadur sy'n gysylltiedig â'r rhyngrwyd fel cleient.\n"
 "\n"
@@ -21414,7 +22113,7 @@ msgstr ""
 "\n"
 "<span foreground=\"royalblue3\">Uwch</span>: Mae'r diogelwch yn ddigon "
 "uchel\n"
-"i ddefnyddio'r system fel gweinydd sy'n gallu derbyn cysylltiadau gna llawer "
+"i ddefnyddio'r system fel gweinydd sy'n gallu derbyn cysylltiadau gan lawer "
 "o\n"
 "gleientiaid. Os mai eich peiriant chi yw'r unig gleient ar i Fewnrwyd, "
 "dylech ddefnyddio lefel is.\n"
@@ -21422,9 +22121,9 @@ msgstr ""
 "\n"
 "<span foreground=\"royalblue3\">Paranoia</span>. Mae'n debyg i'r lefel "
 "blaenorol ond mae'r\n"
-"system yn hollol gaeëdig ac mae'r nodfwediddion diogelwch ar eu heithaf."
+"system yn hollol gaeedig ac mae'r nodweddion diogelwch ar eu heithaf."
 
-#: standalone/draksec:154 standalone/harddrake2:184
+#: standalone/draksec:154 standalone/harddrake2:202
 #, c-format
 msgid ""
 "Description of the fields:\n"
@@ -21468,12 +22167,12 @@ msgstr "Dewisiadau System"
 msgid "Periodic Checks"
 msgstr "Gwirydd Cyfnodol"
 
-#: standalone/draksec:299
+#: standalone/draksec:298
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Arhoswch, gosod lefel diogelwch..."
 
-#: standalone/draksec:305
+#: standalone/draksec:304
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Arhoswch, gosod dewisiadau diogelwch..."
@@ -21695,6 +22394,9 @@ msgid ""
 "\n"
 "<span foreground=\"Red\">%s</span>"
 msgstr ""
+"Methu llwytho delwedd \"%s\" oherwydd y mater canlynol:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
 
 #: standalone/drakups:74
 #, c-format
@@ -21734,7 +22436,7 @@ msgstr ""
 msgid "Autodetection"
 msgstr "Awtoganfod"
 
-#: standalone/drakups:101 standalone/harddrake2:211
+#: standalone/drakups:101 standalone/harddrake2:231
 #, c-format
 msgid "Detection in progress"
 msgstr "Canfod ar waith"
@@ -21753,7 +22455,7 @@ msgstr "Mae'r dewin wedi ychwanegu'r dyfeiriau UPS yn llwyddiannus:"
 #: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
-msgstr "Wedi ganfod dyfais UPS newydd"
+msgstr "Wedi canfod dyfais UPS newydd"
 
 #: standalone/drakups:128 standalone/drakups:140
 #, c-format
@@ -21815,7 +22517,8 @@ msgid "UPS devices"
 msgstr "Dyfeisiau UPS"
 
 #: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
-#: standalone/harddrake2:80 standalone/harddrake2:102
+#: standalone/harddrake2:83 standalone/harddrake2:109
+#: standalone/harddrake2:116
 #, c-format
 msgid "Name"
 msgstr "Enw"
@@ -21845,7 +22548,7 @@ msgstr "Rheolau"
 msgid "Action"
 msgstr "Gweithred"
 
-#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:80
 #, c-format
 msgid "Level"
 msgstr "Lefel"
@@ -21884,7 +22587,7 @@ msgid ""
 "\n"
 "What would you like to do?"
 msgstr ""
-"Mae gosodiad VPN wedi ei gyflawni.\n"
+"Mae gosod VPN wedi ei gyflawni.\n"
 "\n"
 "Mae wedi ei alluogi. \n"
 "\n"
@@ -21914,7 +22617,7 @@ msgid ""
 "\n"
 "What would you like to do?"
 msgstr ""
-"Mae gosodiad cyswllt VPN wedi ei gyflawni.\n"
+"Mae gosod cyswllt VPN wedi ei gyflawni.\n"
 "\n"
 "Mae wedi ei analluogi. \n"
 "\n"
@@ -21953,13 +22656,13 @@ msgstr ""
 "Rydych ar fin ffurfweddu eich cyfrifiadur i ddefnyddio cysylltiad VPN.\n"
 "\n"
 "Gyda'r nodwedd yma, mae cyfrifiaduron ar eich rhwydwaith breifat leol\n"
-"a chyfrifiaduron ar rhwydweithiau preifat pell yn gallu rhannu adnoddau,\n"
+"a chyfrifiaduron ar rwydweithiau preifat pell yn gallu rhannu adnoddau,\n"
 "drwy eu muriau cadarn, dros y rhyngrwyd, mew dull diogel.\n"
 "\n"
 "Mae'r cyfathrebu ar draws y we wedi ei amgryptio. Mae'r cyfrifiaduron\n"
 "lleol a phell yn edrych fel petaent ar yr un rhwydwaith.\n"
 "\n"
-"Gwnewch yn siwr eich bod wedi ffurfweddu eich mynediad\n"
+"Gwnewch yn siŵr eich bod wedi ffurfweddu eich mynediad\n"
 "Rhwydwaith/Rhyngrwyd gan ddefnyddio drakaccess cyn mynd ymhellach."
 
 #: standalone/drakvpn:184
@@ -21986,7 +22689,7 @@ msgstr ""
 " - ipsec-howto: \t\thttp://www.ipsec-howto.org\n"
 " - the docs and man pages coming with the %s package\n"
 "\n"
-"Darllennwch O LEIAF dogfennau ipsec-howto\n"
+"Darllenwch O LEIAF dogfennau ipsec-howto\n"
 "cyn mynd ymhellach."
 
 #: standalone/drakvpn:196
@@ -22051,7 +22754,7 @@ msgid ""
 "\n"
 "Simply click on Next.\n"
 msgstr ""
-"Newaf byddwn yn ffurfweddu ffeil %s.\n"
+"Nesaf byddwn yn ffurfweddu ffeil %s.\n"
 "\n"
 "\n"
 "Cliciwch Nesaf.\n"
@@ -22167,7 +22870,7 @@ msgstr "normal conn"
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
 msgid "Exists!"
-msgstr "Yn Bodoli!"
+msgstr "Mae'n Bodoli!"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
 #, c-format
@@ -22178,7 +22881,7 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change its name.\n"
 msgstr ""
-"Mae adran gyda'r ewn hwn yn bodoli eisoes.\n"
+"Mae adran gyda'r enw hwn yn bodoli eisoes.\n"
 "Rhaid i enw'r adrannau fod yn unigryw.\n"
 "\n"
 "Rhaid i chi fynd yn ôl ac ychwanegu adran arall\n"
@@ -22198,10 +22901,10 @@ msgstr ""
 "Rhaid i'r adran hon fod ar frig eich ffeil %s.\n"
 "\n"
 "\n"
-"Gwnewch yn siwr fod yr adrannau eraill yn dilyn\n"
+"Gwnewch yn siŵr fod yr adrannau eraill yn dilyn\n"
 "yr adran ffurfweddu.\n"
 "\n"
-"Dewiswch parhau neu nôl ar ôl gorffen.\n"
+"Dewiswch barhau neu nôl ar ôl gorffen.\n"
 
 #: standalone/drakvpn:405
 #, c-format
@@ -22241,7 +22944,7 @@ msgid ""
 "\n"
 "Here you define the default settings. \n"
 "All the other sections will follow this one.\n"
-"The left settings are optional. If don't define\n"
+"The left settings are optional. If do not define\n"
 "them here, globally, you can define them in each\n"
 "section.\n"
 msgstr ""
@@ -22310,7 +23013,7 @@ msgstr ""
 "Mae i'r ffeil %s nifer o adrannau, neu gysylltiadau.\n"
 "\n"
 "Cewch ychwanegu adran newydd yn awr.\n"
-"Dewiswch parhau wedi I chi orffen i ysgrifennu at y data.\n"
+"Dewiswch barhau wedi i chi orffen ysgrifennu at y data.\n"
 
 #: standalone/drakvpn:491
 #, c-format
@@ -22380,7 +23083,7 @@ msgstr ""
 "\n"
 "Cewch ychwanegu Polisi Diogelwch.\n"
 "\n"
-"Dewiswch parhau pan fyddwch wedi ysgrifenu'r data.\n"
+"Dewiswch barhau pan fyddwch wedi ysgrifennu’r data.\n"
 
 #: standalone/drakvpn:576 standalone/drakvpn:826
 #, c-format
@@ -22397,7 +23100,7 @@ msgid ""
 msgstr ""
 "Mae gan eich ffeil %s nifer o adrannau neu gysylltiadau.\n"
 "\n"
-"Gallwch ddewis yr un i'w olygu ac yna cchilicio nesaf\n"
+"Gallwch ddewis yr un i'w olygu ac yna chlicio nesaf\n"
 "\n"
 
 #: standalone/drakvpn:580 standalone/drakvpn:660 standalone/drakvpn:831
@@ -22408,7 +23111,7 @@ msgstr "Enw'r adran"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit!"
+msgid "Can not edit!"
 msgstr "Methu golygu!"
 
 #: standalone/drakvpn:591
@@ -22425,7 +23128,7 @@ msgstr ""
 "\n"
 "Mae'r adran yn orfodol ar gyfer Freeswan 2X.\n"
 "Rhaid pennu fersiwn 2.0 ar ben ffeil %s ac yn\n"
-"y diwedd, anablu neu alluogu amgryptiad cyfle.\n"
+"y diwedd, anablu neu alluogi amgryptiad cyfle.\n"
 "\n"
 
 #: standalone/drakvpn:600
@@ -22438,7 +23141,7 @@ msgid ""
 msgstr ""
 "Mae gan eich ffeil %s nifer o adrannau.\n"
 "\n"
-"Mae modd golygu gosodiad adranconfig.\n"
+"Mae modd golygu gosodiad adran config.\n"
 "Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
 
 #: standalone/drakvpn:611
@@ -22449,10 +23152,10 @@ msgid ""
 "You can now edit the default section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"Mae gan eich ffeil %s nifer o adranau neu gysylltiadau.\n"
+"Mae gan eich ffeil %s nifer o adrannau neu gysylltiadau.\n"
 "\n"
 "Mae modd i chi nawr olygu cofnodion adran rhagosodedig\n"
-"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
+"Dewiswch barhau wedi i chi orffen ysgrifennu'r data.\n"
 
 #: standalone/drakvpn:624
 #, c-format
@@ -22463,10 +23166,10 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"Mae gan eich ffeil %s nifer o adranau neu gysylltiadau.\n"
+"Mae gan eich ffeil %s nifer o adrannau neu gysylltiadau.\n"
 "\n"
 "Mae modd i chi nawr olygu cofnodion adran rhagosodedig\n"
-"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
+"Dewiswch barhau wedi i chi orffen ysgrifennu'r data.\n"
 
 #: standalone/drakvpn:645
 #, c-format
@@ -22481,7 +23184,7 @@ msgstr ""
 "\n"
 "Mae modd ychwanegu Polisi Diogelwch.\n"
 "\n"
-"Dewiswch parhau wedi i chi orffen ysgrifennu'r data\n"
+"Dewiswch barhau wedi i chi orffen ysgrifennu'r data\n"
 
 #: standalone/drakvpn:656 standalone/drakvpn:873
 #, c-format
@@ -22499,7 +23202,7 @@ msgstr ""
 "Mae gan eich ffeil %s nifer o adrannau neu gysylltiadau.\n"
 "\n"
 "Mae modd golygu gosodiad adranconfig.\n"
-"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
+"Dewiswch barhau wedi i chi orffen ysgrifennu'r data.\n"
 
 #: standalone/drakvpn:686
 #, c-format
@@ -22516,12 +23219,12 @@ msgid ""
 msgstr ""
 "Ffurfweddiad ffeil racoon.conf.\n"
 "\n"
-"Mae cynnwys yr adran wedi ei rannu'n adranau.\n"
+"Mae cynnwys yr adran wedi ei rannu'n adrannau.\n"
 "Gallwch :\n"
 "  - dangos \t\t (dangos cynnwys y ffeil)\n"
 "  - ychwanegu\t\t\t (ychwanegu adran)\n"
-"  - golygu \t\t\t (newid paramedrau adran presennol)\n"
-"  - tynnu \t\t (tynnu adran presennol)\n"
+"  - golygu \t\t\t (newid paramedrau'r adran bresennol)\n"
+"  - tynnu \t\t (tynnu'r adran bresennol)\n"
 "  - cyflwyno \t\t (ysgrifennu'r newidiadau i'r ffeil go iawn)"
 
 #: standalone/drakvpn:714
@@ -22537,7 +23240,7 @@ msgstr ""
 "\n"
 "Rhaid mai ffurfweddiad newydd yw hwn.\n"
 "\n"
-"Rhaid myn yn ôl a dewis ffurfweddu.\n"
+"Rhaid mynd yn ôl a dewis ffurfweddu.\n"
 
 #: standalone/drakvpn:728
 #, c-format
@@ -22593,7 +23296,7 @@ msgstr ""
 "\n"
 "Rhaid i'r adran llwybr fod ar frig eich ffeil racoon.conf.\n"
 "\n"
-"Rhowch eich llygoden dros y cofnod tystysgrif I gael cymorth ar-lein."
+"Rhowch eich llygoden dros y cofnod tystysgrif i gael cymorth ar-lein."
 
 #: standalone/drakvpn:746
 #, c-format
@@ -22625,24 +23328,24 @@ msgid ""
 msgstr ""
 "llwybr i gynnwys llwybr : pennu llwybr i gynnwys\n"
 "ffeil. Gw. Cynnwys Ffeil.\n"
-"\tE.e.: llwybr yn cynnwys '/etc/racoon'\n"
+"\te.e.: llwybr yn cynnwys '/etc/racoon'\n"
 "\n"
 "llwybr ffeil pre_shared_key : pennu ffeil yn cynnwys\n"
-"allwedd(i) rhag rannwyd ar gyfer enwau amrywiol. Gw. Ffeil Allwedd Rhag "
-"rannu.\n"
-"\tE.e: llwybr pre_shared_key '/etc/racoon/psk.txt' ;\n"
+"allwedd(i) rhag rhannwyd ar gyfer enwau amrywiol. Gw. Ffeil Allwedd Rhag "
+"rhannu.\n"
+"\te.e: llwybr pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
 "llwybr tystysgrif llwybr : bydd racoon(8) yn chwilio'r cyfeiriadur\n"
 "os oes cais am dystysgrif neu dystysgrif wedi ei dderbyn.\n"
-"\tE.e. : llwybr tystysgrif '/etc/cert' ;\n"
+"\te.e. : llwybr tystysgrif '/etc/cert' ;\n"
 "\n"
 "Cynnwys Ffeil : cynnwys ffeil \n"
 "cynnwys ffeiliau ffurfweddiad eraill.\n"
-"\tE.e.: cynnwys \"remote.conf\" ;\n"
+"\te.e.: cynnwys \"remote.conf\" ;\n"
 "\n"
-"Ffeil Allwedd Rhag rannu : Mae ffeil rhag rannu'n diffinio pâr \n"
+"Ffeil Allwedd Rhag rhannu : Mae ffeil rhag rhannu'n diffinio pâr \n"
 "o ddynodwyr a'r allwedd gudd sy'n cael ei ddefnyddio yn\n"
-"Null dilysu allwedd rhag rannu yn rhan1."
+"Null dilysu allwedd rhag rhannu yn rhan1."
 
 #: standalone/drakvpn:770 standalone/drakvpn:863
 #, c-format
@@ -22658,11 +23361,11 @@ msgid ""
 "You can now choose the remote settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
-"Gwnewch yn siwr fod gennych adranau llwybr\n"
+"Gwnewch yn siŵr fod gennych adrannau llwybr\n"
 "ar frig ffeil racoon.conf.\n"
 "\n"
 "Gallwch ddewis y gosodiadau pell yn awr.\n"
-"Dewiswch parhau neu nôl wedi I chi orffen.\n"
+"Dewiswch barhau neu nôl wedi i chi orffen.\n"
 
 #: standalone/drakvpn:810
 #, c-format
@@ -22673,11 +23376,11 @@ msgid ""
 "You can now choose the sainfo settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
-"Gwnewch yn siwr fod yr adrannau llwybr\n"
+"Gwnewch yn siŵr fod yr adrannau llwybr\n"
 "eisoes ar frig eich ffeil %s.\n"
 "\n"
 "Gallwch nawr ddewis eich gosodiadau sainfo.\n"
-"Dewiswch Parhau neu Blaenorol wedi i chi orffen.\n"
+"Dewiswch Barhau neu Blaenorol wedi i chi orffen.\n"
 
 #: standalone/drakvpn:827
 #, c-format
@@ -22687,7 +23390,7 @@ msgid ""
 "You can choose here in the list below the one you want\n"
 "to edit and then click on next.\n"
 msgstr ""
-"Mae gan eich ffeil %s nifer o adranau neu gysylltiadau.\n"
+"Mae gan eich ffeil %s nifer o adrannau neu gysylltiadau.\n"
 "\n"
 "Mae modd i chi ddewis o'r rhestr yr un i'w\n"
 "olygu a chlicio nesaf.\n"
@@ -22707,7 +23410,7 @@ msgstr ""
 "\n"
 "Mae modd golygu cofnodion yr adrannau pell.\n"
 "\n"
-"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
+"Dewiswch barhau wedi i chi orffen ysgrifennu'r data.\n"
 
 #: standalone/drakvpn:847
 #, c-format
@@ -22723,7 +23426,7 @@ msgstr ""
 "\n"
 "Mae modd golygu cofnodion yr adrannau pell.\n"
 "\n"
-"Dewiswch parhau wedi i chi orffen ysgrifennu'r data."
+"Dewiswch barhau wedi i chi orffen ysgrifennu'r data."
 
 #: standalone/drakvpn:855
 #, c-format
@@ -22746,7 +23449,7 @@ msgstr ""
 "\n"
 "Gallwch olygu'r cofnodion llwybr.\n"
 "\n"
-"Dewiswch parhau neu nôl wedi i chi orffen.\n"
+"Dewiswch barhau neu nôl wedi i chi orffen.\n"
 
 #: standalone/drakvpn:862
 #, c-format
@@ -22814,7 +23517,6 @@ msgstr ""
 "\n"
 "cyfeiriad sainfo 203.178.141.209 unrhyw gyfeiriad 203.178.141.218\n"
 "\t203.178.141.209 yw cyfeiriad y ffynhonnell\n"
-"\n"
 "cyfeiriad address 172.16.1.0/24 unrhyw gyfeiriad 172.16.2.0/24 \n"
 "\t172.16.1.0/24 yw cyfeiriad y ffynhonnell"
 
@@ -22947,7 +23649,7 @@ msgstr ""
 #: standalone/drakvpn:989
 #, c-format
 msgid "PFS group"
-msgstr "Grwp PFS"
+msgstr "Grŵp PFS"
 
 #: standalone/drakvpn:991
 #, c-format
@@ -22958,11 +23660,11 @@ msgid ""
 "group is one of the following: modp768, modp1024, modp1536.\n"
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
-"diffinio grwp o exponentiations Diffie-Hellman.\n"
+"diffinio grŵp o exponentiations Diffie-Hellman.\n"
 "Os nad ydych angen PFS yna cewch ymatal rhag y gyfarwyddeb.\n"
-"Bydd unrhyw gynnig yn cael ei dderbyn on na newch chi enwi un.\n"
-"y grwp yn un o'r canlynol: modp768, modp1024, modp1536.\n"
-"Neu mae modd diffinio 1, 2, neu 5 fel rhif grwp DH."
+"Bydd unrhyw gynnig yn cael ei dderbyn on na wnewch chi enwi un.\n"
+"y grŵp yn un o'r canlynol: modp768, modp1024, modp1536.\n"
+"Neu mae modd diffinio 1, 2, neu 5 fel rhif grŵp DH."
 
 #: standalone/drakvpn:996
 #, c-format
@@ -23052,12 +23754,12 @@ msgstr ""
 #: standalone/drakvpn:1031 standalone/drakvpn:1116
 #, c-format
 msgid "Encryption algorithm"
-msgstr "Algorithym amgryptio"
+msgstr "Algorithm amgryptio"
 
 #: standalone/drakvpn:1033
 #, c-format
 msgid "Authentication algorithm"
-msgstr "Algoritym dilysu"
+msgstr "Algorithm dilysu"
 
 #: standalone/drakvpn:1035
 #, c-format
@@ -23092,7 +23794,7 @@ msgstr ""
 "pennu paramedrau rhan1 IKE ar gyfer  pob nod pell.\n"
 "Y porth rhagosodedig yw 500.  Os yw anhysbys yn cael eu bennu\n"
 "mae'r gosodiad yn wir i'r holl gyfoed nad ydynt yn cydweddu â\n"
-"chyfarwyddeb pell arall\n"
+"chyfarwyddeb bell arall\n"
 "\n"
 "Enghreifftiau : \n"
 "\n"
@@ -23117,7 +23819,7 @@ msgstr ""
 "diffinio'r modd cyfnewid ar gyfer rhan 1 lle mae racoon sy'n\n"
 "cychwyn. Mae hefyd yn golygu'r modd cyfnewid derbyniol lle\n"
 "mai racoon yw'r ymatebwr. Mae modd pennu mwy nag un\n"
-"modd drwy eu ymwahanu gan gollnod. Mae'r holl foddau'n\n"
+"modd drwy eu hymwahanu gan gollnod. Mae'r holl foddau'n\n"
 "dderbyniol. Y modd cyfnewid cyntaf yw'r hyn mae racoon yn\n"
 "ei ddefnyddio pan yw'n gychwynnydd.\n"
 
@@ -23193,7 +23895,7 @@ msgstr "Math o dystysgrif"
 #: standalone/drakvpn:1083
 #, c-format
 msgid "My certfile"
-msgstr "Ffeil Tystysgif"
+msgstr "Ffeil Tystysgrif"
 
 #: standalone/drakvpn:1084
 #, c-format
@@ -23231,8 +23933,8 @@ msgid ""
 "If you do not want to verify the peer's certificate for\n"
 "some reason, set this to off.  The default is on."
 msgstr ""
-"Os nad ydych am wirio tystysgrif y cyfoed am rhyw reswm,\n"
-"rhowch hwn ar diffodd. Y rhagosodedig yw ymlaen."
+"Os nad ydych am wirio tystysgrif y cyfoed am ryw reswm,\n"
+"rhowch hwn ar ddiffodd. Y rhagosodedig yw ymlaen."
 
 #: standalone/drakvpn:1093
 #, c-format
@@ -23309,7 +24011,7 @@ msgid ""
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
-"pennu yr algorithm amgryptio i'w ddefnyddio ar gyfer\n"
+"pennu'r algorithm amgryptio i'w ddefnyddio ar gyfer\n"
 "negydu rhan 1. Rhaid i'r gyfarwyddeb gael ei diffinio.\n"
 "algorithm yw un o'r canlynol:\n"
 "\n"
@@ -23322,15 +24024,10 @@ msgstr ""
 msgid "Hash algorithm"
 msgstr "Algorithm hash "
 
-#: standalone/drakvpn:1125
-#, c-format
-msgid "Authentication method"
-msgstr "Dull dilysu"
-
 #: standalone/drakvpn:1126
 #, c-format
 msgid "DH group"
-msgstr "Grwp DH"
+msgstr "Grŵp DH"
 
 #: standalone/drakvpn:1133
 #, c-format
@@ -23430,17 +24127,17 @@ msgstr "UDA (darlledu)"
 #: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
-msgstr "UDA (cabl)"
+msgstr "UDA (cebl)"
 
 #: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
-msgstr "UDA (cable-hrc)"
+msgstr "UDA (ceble-hrc)"
 
 #: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
-msgstr "Canada (cabl)"
+msgstr "Canada (cebl)"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -23450,7 +24147,7 @@ msgstr "Siapan (darlledu)"
 #: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
-msgstr "Siapan (cable)"
+msgstr "Siapan (cebl)"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -23524,13 +24221,13 @@ msgstr "Diwrnod da i chi!"
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Nawr mae modd i chi redeg Xawtv (o dan XWindows)!\n"
 
-#: standalone/drakxtv:134
+#: standalone/drakxtv:149
 #, c-format
 msgid "No TV Card detected!"
 msgstr "Heb ganfod Cerdyn Teledu!"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakxtv:136
+#: standalone/drakxtv:151
 #, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -23551,29 +24248,29 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:20
+#: standalone/harddrake2:23
 #, c-format
 msgid "Alternative drivers"
 msgstr "Gyrwyr eraill"
 
-#: standalone/harddrake2:21
+#: standalone/harddrake2:24
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "rhestr o yrrwr eraill ar gyfer eich cerdyn sain"
 
-#: standalone/harddrake2:24
+#: standalone/harddrake2:27
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr ""
-"dyma'r bws corfforol i'r ddyfais gael ei gysylltu iddo(e.e. PCI, USB,...)"
+"dyma'r bws corfforol i'r ddyfais gael ei gysylltu iddo (e.e. PCI, USB,...)"
 
-#: standalone/harddrake2:26 standalone/harddrake2:130
+#: standalone/harddrake2:29 standalone/harddrake2:144
 #, c-format
 msgid "Bus identification"
 msgstr "Dynodiad bws"
 
-#: standalone/harddrake2:27
+#: standalone/harddrake2:30
 #, c-format
 msgid ""
 "- PCI and USB devices: this lists the vendor, device, subvendor and "
@@ -23582,7 +24279,7 @@ msgstr ""
 "- dyfeisiau PCI ac USB : dyma restr gwerthwyr, dyfais, is werthwyr ac is "
 "ddyfais PCI/USB"
 
-#: standalone/harddrake2:30
+#: standalone/harddrake2:33
 #, c-format
 msgid ""
 "- pci devices: this gives the PCI slot, device and function of this card\n"
@@ -23593,205 +24290,204 @@ msgstr ""
 "- dyfeisiau ide: mae'r ddyfais un ai yn was neu feistr\n"
 "- dyfeisiau scsi: dynodiad dyfeisiau scsi a'r bws scsi"
 
-#: standalone/harddrake2:33
+#: standalone/harddrake2:36
 #, c-format
 msgid "Drive capacity"
 msgstr "Maint y gyrrwr"
 
-#: standalone/harddrake2:33
+#: standalone/harddrake2:36
 #, c-format
 msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr "nodweddion arbennig y gyrrwr (llosgi neu gynnal DVD)"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:37
 #, c-format
 msgid "this field describes the device"
 msgstr "mae'r maes yn disgrifio'r ddyfais"
 
-#: standalone/harddrake2:35
+#: standalone/harddrake2:38
 #, c-format
 msgid "Old device file"
 msgstr "Hen ffeil dyfais"
 
-#: standalone/harddrake2:36
+#: standalone/harddrake2:39
 #, c-format
 msgid "old static device name used in dev package"
 msgstr "hen enw dyfais sefydlog yn cael ei ddefnyddio mewn pecyn dev"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:40
 #, c-format
 msgid "New devfs device"
 msgstr "Dyfais devfs newydd"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:41
 #, c-format
 msgid "new dynamic device name generated by core kernel devfs"
-msgstr "enw dyfais deinamig yn cael ei gynhyrchu gan incore kernel devfs"
+msgstr "enw dyfais ddeinamig yn cael ei gynhyrchu gan incore kernel devfs"
 
 #. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
 #, c-format
 msgid "Module"
 msgstr "Modiwl"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
 #, c-format
 msgid "the module of the GNU/Linux kernel that handles the device"
 msgstr "y modiwl o'r cnewyllyn GNU/Linux sy'n trin y ddyfais honno"
 
-#: standalone/harddrake2:42
-#, fuzzy, c-format
+#: standalone/harddrake2:45
+#, c-format
 msgid "Extended partitions"
-msgstr "Creu rhaniad newydd"
+msgstr "Rhaniadau estynedig"
 
-#: standalone/harddrake2:42
-#, fuzzy, c-format
+#: standalone/harddrake2:45
+#, c-format
 msgid "the number of extended partitions"
-msgstr "rhif y prosesydd"
+msgstr "y nifer o raniadau estynedig"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:46
 #, c-format
 msgid "Geometry"
 msgstr "Geometreg"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:46
 #, c-format
 msgid "Cylinder/head/sectors geometry of the disk"
-msgstr ""
+msgstr "Geometreg silindr/pen/adrannau disg"
 
-#: standalone/harddrake2:44
-#, fuzzy, c-format
+#: standalone/harddrake2:47
+#, c-format
 msgid "Disk controller"
-msgstr "Rheolyddion SMBus"
+msgstr "Rheolwr disg"
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:47
 #, c-format
 msgid "the disk controller on the host side"
-msgstr ""
+msgstr "y rheolwr disg ar ochr y gwesteiwr"
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:48
 #, c-format
 msgid "class of hardware device"
 msgstr "dosbarth y ddyfais caledwedd"
 
-#: standalone/harddrake2:46 standalone/harddrake2:78
-#: standalone/printerdrake:218
+#: standalone/harddrake2:49 standalone/harddrake2:81
+#: standalone/printerdrake:211
 #, c-format
 msgid "Model"
 msgstr "Model"
 
-#: standalone/harddrake2:46
+#: standalone/harddrake2:49
 #, c-format
 msgid "hard disk model"
 msgstr "Model disg caled"
 
-#: standalone/harddrake2:47
+#: standalone/harddrake2:50
 #, c-format
 msgid "network printer port"
 msgstr "porth argraffydd rhwydwaith"
 
-#: standalone/harddrake2:48
-#, fuzzy, c-format
+#: standalone/harddrake2:51
+#, c-format
 msgid "Primary partitions"
-msgstr "Fformatio rhaniadau"
+msgstr "Prif raniadau"
 
-#: standalone/harddrake2:48
-#, fuzzy, c-format
+#: standalone/harddrake2:51
+#, c-format
 msgid "the number of the primary partitions"
-msgstr "rhif y prosesydd"
+msgstr "y nifer o brif raniadau"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:52
 #, c-format
 msgid "the vendor name of the device"
 msgstr "enw gwerthwr y ddyfais"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
 #, c-format
 msgid "Bus PCI #"
-msgstr ""
+msgstr "Bus PCI #"
 
-#: standalone/harddrake2:50
-#, fuzzy, c-format
+#: standalone/harddrake2:53
+#, c-format
 msgid "the PCI bus on which the device is plugged"
-msgstr ""
-"dyma'r bws corfforol i'r ddyfais gael ei gysylltu iddo(e.e. PCI, USB,...)"
+msgstr "y bws PCI y mae'r ddyfais wedi ei blygio iddo"
 
-#: standalone/harddrake2:51
-#, fuzzy, c-format
+#: standalone/harddrake2:54
+#, c-format
 msgid "PCI device #"
-msgstr "Dyfeisiau UPS"
+msgstr "dyfais PCI #"
 
-#: standalone/harddrake2:51
-#, fuzzy, c-format
+#: standalone/harddrake2:54
+#, c-format
 msgid "PCI device number"
-msgstr "rhif hyd oes"
+msgstr "rhif dyfais PCI"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
 #, c-format
 msgid "PCI function #"
-msgstr ""
+msgstr "swyddogaeth PCI #"
 
-#: standalone/harddrake2:52
-#, fuzzy, c-format
+#: standalone/harddrake2:55
+#, c-format
 msgid "PCI function number"
-msgstr "Enw'r cysylltiad"
+msgstr "rhif swyddogaeth PCI"
 
-#: standalone/harddrake2:53
-#, fuzzy, c-format
+#: standalone/harddrake2:56
+#, c-format
 msgid "Vendor ID"
-msgstr "Gwerthwr"
+msgstr "Enw'r gwerthwr"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:56
 #, c-format
 msgid "this is the standard numerical identifier of the vendor"
-msgstr ""
+msgstr "dyma enw rhifol safonol y gwerthwr"
 
-#: standalone/harddrake2:54
-#, fuzzy, c-format
+#: standalone/harddrake2:57
+#, c-format
 msgid "Device ID"
-msgstr "Dyfais: "
+msgstr "Enw'r ddyfais"
 
-#: standalone/harddrake2:54
-#, fuzzy, c-format
+#: standalone/harddrake2:57
+#, c-format
 msgid "this is the numerical identifier of the device"
-msgstr "enw gwerthwr y ddyfais"
+msgstr "dyma ddynodydd rhifol y ddyfais"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:58
 #, c-format
 msgid "Sub vendor ID"
-msgstr ""
+msgstr "Enw'r is werthwr"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:58
 #, c-format
 msgid "this is the minor numerical identifier of the vendor"
-msgstr ""
+msgstr "dyma enw rhifol llai'r gwerthwr"
 
-#: standalone/harddrake2:56
-#, fuzzy, c-format
+#: standalone/harddrake2:59
+#, c-format
 msgid "Sub device ID"
-msgstr "Dyfeisiau UPS"
+msgstr "Enw'r is ddyfais"
 
-#: standalone/harddrake2:56
-#, fuzzy, c-format
+#: standalone/harddrake2:59
+#, c-format
 msgid "this is the minor numerical identifier of the device"
-msgstr "enw gwerthwr y ddyfais"
+msgstr "dyma ddynodwr rhifol llai'r ddyfais"
 
-#: standalone/harddrake2:57
-#, fuzzy, c-format
+#: standalone/harddrake2:60
+#, c-format
 msgid "Device USB ID"
-msgstr "Dyfais: "
+msgstr "Enw'r ddyfais USB"
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:60
 #, c-format
 msgid ".."
-msgstr ""
+msgstr ".."
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:64
 #, c-format
 msgid "Bogomips"
 msgstr "Bogomips"
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:64
 #, c-format
 msgid ""
 "the GNU/Linux kernel needs to run a calculation loop at boot time to "
@@ -23802,78 +24498,78 @@ msgstr ""
 "gychwyn y cyfrif amser. Mae'r canlyniad yn cael ei gadw fel bogomips fel "
 "ffordd o \"feincnod\" y cpu."
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:65
 #, c-format
 msgid "Cache size"
 msgstr "Maint storfa"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:65
 #, c-format
 msgid "size of the (second level) cpu cache"
 msgstr "maint storfa cpu (ail lefel)"
 
 #. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:65
+#: standalone/harddrake2:68
 #, c-format
 msgid "Coma bug"
 msgstr "Coma bug"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:68
 #, c-format
 msgid "whether this cpu has the Cyrix 6x86 Coma bug"
 msgstr "a oes gan y cpu y Cyrix 6x86 Coma bug"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:69
 #, c-format
 msgid "Cpuid family"
 msgstr "Teulu cpuid"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:69
 #, c-format
 msgid "family of the cpu (eg: 6 for i686 class)"
 msgstr "teulu'r cpu (ee 6 am ddosbarth i686)"
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:70
 #, c-format
 msgid "Cpuid level"
 msgstr "Lefel cpuid"
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:70
 #, c-format
 msgid "information level that can be obtained through the cpuid instruction"
 msgstr "lefel gwybodaeth i'w gael drwy gyfarwyddid cpuid"
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:71
 #, c-format
 msgid "Frequency (MHz)"
 msgstr "Amledd (MHz)"
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "the CPU frequency in MHz (Megahertz which in first approximation may be "
 "coarsely assimilated to number of instructions the cpu is able to execute "
 "per second)"
 msgstr ""
-"amledd y cpu mewn MHz (y nifer o gyfarwyddiadau'r eiliad mae'r cypu yn gallu "
+"amledd y cpu mewn MHz (y nifer o gyfarwyddiadau'r eiliad mae'r cpu'n gallu "
 "eu trin)"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:72
 #, c-format
 msgid "Flags"
 msgstr "Baneri"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:72
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "Baneri cpu'n cael eu dangos gan y cnewyllyn"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:73
 #, c-format
 msgid "Fdiv bug"
 msgstr "Gwall Fdiv"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:74
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -23884,44 +24580,44 @@ msgstr ""
 "yw'n ymgyrraedd â'r cywirdeb angenrheidiol wrth berfformio Floating point "
 "DIVision (FDIV)"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:75
 #, c-format
 msgid "Is FPU present"
 msgstr "Yw'r FPU yn bresennol"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:75
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
-msgstr "mae iawn yn golygu fod gan y cydbrosesydd rhifyddegol"
+msgstr "mae iawn yn golygu fod gan y cyd-brosesydd rhifyddegol"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:76
 #, c-format
 msgid "Whether the FPU has an irq vector"
-msgstr "P'un ai oes gan yr FPU fector irq"
+msgstr "P'un ai oes gan y FPU fector irq"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:76
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr ""
-"mae iawn yn golygu fod gan y cydbrosesydd fector eithriad yn gysylltiedig"
+"mae iawn yn golygu fod gan y cyd-brosesydd fector eithriad yn gysylltiedig"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:77
 #, c-format
 msgid "F00f bug"
 msgstr "Gwall F00f"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:77
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "roedd rhai Pentium cynnar yn wallus ac yn rhewi wrth ddadgodio F00F bytecode"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:78
 #, c-format
 msgid "Halt bug"
 msgstr "Gwall halt"
 
-#: standalone/harddrake2:76
+#: standalone/harddrake2:79
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -23930,62 +24626,62 @@ msgstr ""
 "Nid yw rhai prosesyddion i486DX-100 cynnar yn gallu dychwelyd i'w cyflwr "
 "gweithredu a'r ôl defnyddio \"halt\""
 
-#: standalone/harddrake2:77
+#: standalone/harddrake2:80
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "Is gynnyrch y cpu"
 
-#: standalone/harddrake2:78
+#: standalone/harddrake2:81
 #, c-format
 msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
 msgstr "cynnyrch y cpu (ee 8 am Pentiumlll,...]"
 
-#: standalone/harddrake2:79
+#: standalone/harddrake2:82
 #, c-format
 msgid "Model name"
 msgstr "Enw'r model"
 
-#: standalone/harddrake2:79
+#: standalone/harddrake2:82
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "enw swyddogol gwerthwr y cpu"
 
-#: standalone/harddrake2:80
+#: standalone/harddrake2:83
 #, c-format
 msgid "the name of the CPU"
 msgstr "enw'r prosesydd"
 
-#: standalone/harddrake2:81
+#: standalone/harddrake2:84
 #, c-format
 msgid "Processor ID"
 msgstr "Dynodiad Prosesydd"
 
-#: standalone/harddrake2:81
+#: standalone/harddrake2:84
 #, c-format
 msgid "the number of the processor"
 msgstr "rhif y prosesydd"
 
-#: standalone/harddrake2:82
+#: standalone/harddrake2:85
 #, c-format
 msgid "Model stepping"
 msgstr "Stepio model"
 
-#: standalone/harddrake2:82
+#: standalone/harddrake2:85
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "graddiad y cpu (cynhyrchu rhif is-fodel)"
 
-#: standalone/harddrake2:83
+#: standalone/harddrake2:86
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "enw gwerthwr y prosesydd"
 
-#: standalone/harddrake2:84
+#: standalone/harddrake2:87
 #, c-format
 msgid "Write protection"
 msgstr "Diogelwch ysgrifennu"
 
-#: standalone/harddrake2:84
+#: standalone/harddrake2:87
 #, c-format
 msgid ""
 "the WP flag in the CR0 register of the cpu enforce write protection at the "
@@ -23996,187 +24692,239 @@ msgstr ""
 "ar lefel cof tudalen, felly'n caniatáu'r prosesydd i atal mynediad i wirio "
 "cnewyllyn i gof y defnyddiwr (hy diogelwch rhag gwall)"
 
-#: standalone/harddrake2:88
+#: standalone/harddrake2:91
 #, c-format
 msgid "Floppy format"
 msgstr "Fformatio disg meddal"
 
-#: standalone/harddrake2:88
+#: standalone/harddrake2:91
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr "fformatio disgiau meddal derbyniol i'r gyrrwr"
 
-#: standalone/harddrake2:92
+#: standalone/harddrake2:95
 #, c-format
 msgid "Channel"
 msgstr "Sianel"
 
-#: standalone/harddrake2:92
+#: standalone/harddrake2:95
 #, c-format
 msgid "EIDE/SCSI channel"
 msgstr "Sianel EIDE/SCSI"
 
-#: standalone/harddrake2:93
-#, fuzzy, c-format
+#: standalone/harddrake2:96
+#, c-format
 msgid "Disk identifier"
-msgstr "Fy enw"
+msgstr "Enw'r disg"
 
-#: standalone/harddrake2:93
+#: standalone/harddrake2:96
 #, c-format
 msgid "usually the disk serial number"
-msgstr ""
+msgstr "fel rheol rhif cyfresol y ddisg"
 
-#: standalone/harddrake2:94
-#, fuzzy, c-format
+#: standalone/harddrake2:97
+#, c-format
 msgid "Logical unit number"
-msgstr "Enw cyfrol resymegol"
+msgstr "Rhif yr uned resymegol"
 
-#: standalone/harddrake2:94
+#: standalone/harddrake2:97
 #, c-format
 msgid ""
 "the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
 "identified by a\n"
 "channel number, a target id and a logical unit number"
 msgstr ""
+"y rhif targed SCSI (LUN). Mae dyfeisiau SCSI sydd wedi eu cysylltu i "
+"westeiwr yn cael eu\n"
+"hadnabod yn unigryw drwy rif sianel, enw targed a rhif uned resymegol"
+
+#. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...)
+#: standalone/harddrake2:104
+#, c-format
+msgid "Installed size"
+msgstr "Maint gosod"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "Installed size of the memory bank"
+msgstr "Maint gosod y banc cof"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Enabled Size"
+msgstr "Maint Galluogwyd"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Enabled size of the memory bank"
+msgstr "Maint galluogi'r banc cof"
+
+#: standalone/harddrake2:106
+#, c-format
+msgid "type of the memory device"
+msgstr "Math o ddyfais cof"
 
-#: standalone/harddrake2:99
+#: standalone/harddrake2:107
+#, c-format
+msgid "Speed"
+msgstr "Cyflymder"
+
+#: standalone/harddrake2:107
+#, c-format
+msgid "Speed of the memory bank"
+msgstr "Cyflymder y banc cof"
+
+#: standalone/harddrake2:108
+#, c-format
+msgid "Bank connections"
+msgstr "Cysylltiadau banc"
+
+#: standalone/harddrake2:109
+#, c-format
+msgid "Socket designation of the memory bank"
+msgstr "Dynodiad soced y banc cof"
+
+#: standalone/harddrake2:113
 #, c-format
 msgid "Device file"
 msgstr "Ffeil dyfais"
 
-#: standalone/harddrake2:99
+#: standalone/harddrake2:113
 #, c-format
 msgid ""
 "the device file used to communicate with the kernel driver for the mouse"
 msgstr ""
+"y ffeil dyfais sy'n cael ei ddefnyddio i gyfathrebu â gyrrwr y cnewyllyn ar "
+"gyfer y llygoden"
 
-#: standalone/harddrake2:100
-#, fuzzy, c-format
+#: standalone/harddrake2:114
+#, c-format
 msgid "Emulated wheel"
-msgstr "Efelychiad olwyn"
+msgstr "Olwyn efelychwyd"
 
-#: standalone/harddrake2:100
-#, fuzzy, c-format
+#: standalone/harddrake2:114
+#, c-format
 msgid "whether the wheel is emulated or not"
-msgstr "gydag efelychiad Olwyn"
+msgstr "p'un ai yw'r olwyn wedi ei efelychu ai peidio"
 
-#: standalone/harddrake2:101
+#: standalone/harddrake2:115
 #, c-format
 msgid "the type of the mouse"
 msgstr "y math o lygoden"
 
-#: standalone/harddrake2:102
+#: standalone/harddrake2:116
 #, c-format
 msgid "the name of the mouse"
 msgstr "enw llygoden"
 
-#: standalone/harddrake2:103
+#: standalone/harddrake2:117
 #, c-format
 msgid "Number of buttons"
 msgstr "Nifer o fotymau"
 
-#: standalone/harddrake2:103
+#: standalone/harddrake2:117
 #, c-format
 msgid "the number of buttons the mouse has"
 msgstr "nifer y botymau sydd gan y llygoden"
 
-#: standalone/harddrake2:104
+#: standalone/harddrake2:118
 #, c-format
 msgid "the type of bus on which the mouse is connected"
 msgstr "y math o fws mae eich llygoden wedi cysylltu iddi"
 
-#: standalone/harddrake2:105
+#: standalone/harddrake2:119
 #, c-format
 msgid "Mouse protocol used by X11"
-msgstr ""
+msgstr "Protocol llygoden defnyddir gan y X11"
 
-#: standalone/harddrake2:105
+#: standalone/harddrake2:119
 #, c-format
 msgid "the protocol that the graphical desktop use with the mouse"
 msgstr ""
+"y protocol mae'r bwrdd gwaith graffigol yn ei ddefnyddio gyda'r llygoden"
 
-#: standalone/harddrake2:112 standalone/harddrake2:121
-#: standalone/harddrake2:128 standalone/harddrake2:136
-#: standalone/harddrake2:309
+#: standalone/harddrake2:126 standalone/harddrake2:135
+#: standalone/harddrake2:142 standalone/harddrake2:150
+#: standalone/harddrake2:316
 #, c-format
 msgid "Identification"
 msgstr "Dynodiad"
 
-#: standalone/harddrake2:113 standalone/harddrake2:129
+#: standalone/harddrake2:127 standalone/harddrake2:143
 #, c-format
 msgid "Connection"
 msgstr "Cysylltiad"
 
-#: standalone/harddrake2:122
-#, fuzzy, c-format
+#: standalone/harddrake2:136
+#, c-format
 msgid "Performances"
-msgstr "Dewisiadau"
+msgstr "Perfformiadau"
 
-#: standalone/harddrake2:123
-#, fuzzy, c-format
+#: standalone/harddrake2:137
+#, c-format
 msgid "Bugs"
-msgstr "Bws"
+msgstr "Gwallau"
 
-#: standalone/harddrake2:124
+#: standalone/harddrake2:138
 #, c-format
 msgid "FPU"
-msgstr "FPU (Cydbrosesydd Rhifol)"
+msgstr "FPU (Cyd-brosesydd Rhifol)"
 
-#: standalone/harddrake2:132
+#: standalone/harddrake2:146
 #, c-format
 msgid "Partitions"
 msgstr "Rhaniadau"
 
-#: standalone/harddrake2:137
+#: standalone/harddrake2:151
 #, c-format
 msgid "Features"
 msgstr "Nodweddion"
 
 #. -PO: please keep all "/" characters !!!
-#: standalone/harddrake2:158 standalone/logdrake:77
-#: standalone/printerdrake:152 standalone/printerdrake:165
+#: standalone/harddrake2:174 standalone/logdrake:77
+#: standalone/printerdrake:134 standalone/printerdrake:147
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
-#: standalone/printerdrake:177 standalone/printerdrake:178
-#: standalone/printerdrake:179 standalone/printerdrake:180
+#: standalone/harddrake2:175 standalone/harddrake2:197 standalone/logdrake:79
+#: standalone/printerdrake:159 standalone/printerdrake:161
+#: standalone/printerdrake:164 standalone/printerdrake:166
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:179
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Awtoganfod_argraffydd"
 
-#: standalone/harddrake2:164
+#: standalone/harddrake2:180
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Awtoganfod_modem"
 
-#: standalone/harddrake2:165
+#: standalone/harddrake2:181
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/Awtoganfod_gyrrwr jaz"
 
-#: standalone/harddrake2:172 standalone/printerdrake:158
+#: standalone/harddrake2:188 standalone/printerdrake:140
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: standalone/harddrake2:181
+#: standalone/harddrake2:199
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Disgrifiad meysydd"
 
-#: standalone/harddrake2:183
+#: standalone/harddrake2:201
 #, c-format
 msgid "Harddrake help"
 msgstr "Cymorth Harddrake"
 
-#: standalone/harddrake2:192
+#: standalone/harddrake2:210
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
@@ -24185,106 +24933,106 @@ msgstr ""
 "Unwaith i chi ddewis dyfais, gallwch weld esboniad mewn meysydd yn y ffrâm "
 "dde [\"Gwybodaeth\"]"
 
-#: standalone/harddrake2:197 standalone/printerdrake:179
+#: standalone/harddrake2:216 standalone/printerdrake:164
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Adrodd ar Wallau"
 
-#: standalone/harddrake2:198 standalone/printerdrake:180
+#: standalone/harddrake2:218 standalone/printerdrake:166
 #, c-format
 msgid "/_About..."
 msgstr "/_Ynghylch..."
 
-#: standalone/harddrake2:199
+#: standalone/harddrake2:219
 #, c-format
 msgid "About Harddrake"
 msgstr "Ynghylch Harddrake"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:201
+#: standalone/harddrake2:221
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+"This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"Dyma HardDrake, offeryn ffurfweddu caledwedd Mandrakelinux.\n"
+"Dyma HardDrake, offeryn ffurfweddu caledwedd %s.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
-"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
-"tvignaud@mandrakesoft.com&gt;\n"
+"<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;tvignaud"
+"\\@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:218
+#: standalone/harddrake2:238
 #, c-format
 msgid "Harddrake2"
 msgstr "Harddrake2"
 
-#: standalone/harddrake2:234
+#: standalone/harddrake2:253
 #, c-format
 msgid "Detected hardware"
-msgstr "Caledwedd canfyddwyd"
+msgstr "Caledwedd canfuwyd"
 
-#: standalone/harddrake2:239
+#: standalone/harddrake2:258
 #, c-format
 msgid "Configure module"
 msgstr "Modd ffurfweddu"
 
-#: standalone/harddrake2:246
+#: standalone/harddrake2:265
 #, c-format
 msgid "Run config tool"
 msgstr "Rhedeg offeryn ffurfweddu"
 
-#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/harddrake2:303 standalone/net_monitor:108
 #: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "anhysbys"
 
-#: standalone/harddrake2:297 standalone/printerdrake:308
-#: standalone/printerdrake:346
+#: standalone/harddrake2:304 standalone/printerdrake:298
+#: standalone/printerdrake:336
 #, c-format
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: standalone/harddrake2:317
-#, fuzzy, c-format
+#: standalone/harddrake2:324
+#, c-format
 msgid "Misc"
-msgstr "Msec"
+msgstr "Amryw."
 
-#: standalone/harddrake2:332
+#: standalone/harddrake2:339
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr "Cliciwch ar ddyfais yn y goeden chwith i gael at ei wybodaeth"
 
-#: standalone/harddrake2:384
+#: standalone/harddrake2:391
 #, c-format
 msgid "secondary"
 msgstr "eilradd"
 
-#: standalone/harddrake2:384
+#: standalone/harddrake2:391
 #, c-format
 msgid "primary"
 msgstr "cynradd"
 
-#: standalone/harddrake2:388
+#: standalone/harddrake2:395
 #, c-format
 msgid "burner"
 msgstr "llosgwr"
 
-#: standalone/harddrake2:388
+#: standalone/harddrake2:395
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/keyboarddrake:25
+#: standalone/keyboarddrake:29
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "Dewiswch gynllun allweddell"
 
-#: standalone/keyboarddrake:34
+#: standalone/keyboarddrake:45
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Ydych chi eisiau i'r Backspace ddychwelyd Dileu yn y consol?"
@@ -24302,9 +25050,9 @@ msgstr ""
 "allgofnodi"
 
 #: standalone/logdrake:50
-#, fuzzy, c-format
+#, c-format
 msgid "Mandrakelinux Tools Logs"
-msgstr "Cofnodion Offer Mandrake"
+msgstr "Cofnodion Offer Mandrakelinux"
 
 #: standalone/logdrake:51
 #, c-format
@@ -24339,7 +25087,7 @@ msgstr "<control>O"
 #: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
-msgstr "/Ffeil/_Cawd"
+msgstr "/Ffeil/_Cadw"
 
 #: standalone/logdrake:73
 #, c-format
@@ -24349,7 +25097,7 @@ msgstr "<control>S"
 #: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
-msgstr "/Ffeil/Cawd _fel"
+msgstr "/Ffeil/Cadw _fel"
 
 #: standalone/logdrake:75
 #, c-format
@@ -24448,9 +25196,9 @@ msgid "Mail alert"
 msgstr "Rhybudd e-bost"
 
 #: standalone/logdrake:169
-#, fuzzy, c-format
+#, c-format
 msgid "The alert wizard has failed unexpectedly:"
-msgstr "Methodd y dewin rhybudd yn annisgwyl:"
+msgstr "Mae'r dewin byw wedi methu'n annisgwyl:"
 
 #: standalone/logdrake:221
 #, c-format
@@ -24604,53 +25352,140 @@ msgstr "Prawf llygoden"
 msgid "Please test your mouse:"
 msgstr "Profwch y llygoden"
 
-#: standalone/net_applet:30
-#, fuzzy, c-format
+#: standalone/net_applet:34
+#, c-format
 msgid "Network is up on interface %s"
-msgstr "Rhyngwyneb rhwydwaith"
+msgstr "Mae'r rhwydwaith ar gael ar ryngwyneb %s"
 
 #. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
-#: standalone/net_applet:38
-#, fuzzy, c-format
+#: standalone/net_applet:42
+#, c-format
 msgid "Network is down on interface %s. Click on \"Configure Network\""
-msgstr "Nid yw swyddogaethau'r rhwydwaith wedi ei ffurfweddu"
+msgstr ""
+"Nid yw'r rhwydwaith ar gael ar ryngwyneb %s. Cliciwch ar \"Ffurfweddu "
+"Rhwydwaith\""
 
-#: standalone/net_applet:53 standalone/net_monitor:471
+#: standalone/net_applet:57 standalone/net_monitor:473
 #, c-format
 msgid "Connect %s"
 msgstr "Cysylltu %s"
 
-#: standalone/net_applet:54 standalone/net_monitor:471
+#: standalone/net_applet:58 standalone/net_monitor:473
 #, c-format
 msgid "Disconnect %s"
 msgstr "Datgysylltu %s"
 
-#: standalone/net_applet:55
-#, fuzzy, c-format
+#: standalone/net_applet:59
+#, c-format
 msgid "Monitor Network"
-msgstr "Adfer drwy'r Rhwydwaith"
+msgstr "Monitro'r Rhwydwaith"
 
-#: standalone/net_applet:56
+#: standalone/net_applet:60
 #, c-format
 msgid "Configure Network"
 msgstr "Ffurfweddu rhwydwaith"
 
 #. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/net_applet:57 standalone/printerdrake:245
+#: standalone/net_applet:61 standalone/printerdrake:238
 #, c-format
 msgid "Refresh"
 msgstr "Adnewyddu"
 
-#: standalone/net_applet:58
+#: standalone/net_applet:62
 #, c-format
 msgid "Get Online Help"
-msgstr ""
+msgstr "Cymorth Ar-lein"
+
+#: standalone/net_applet:177
+#, c-format
+msgid "Interactive intrusion detection"
+msgstr "Canfod mewnwthiad rhyngweithiol"
 
-#: standalone/net_applet:158
+#: standalone/net_applet:181
 #, c-format
 msgid "Always launch on startup"
 msgstr "Cychwyn wrth gychwyn"
 
+#: standalone/net_applet:230
+#, c-format
+msgid "A port scanning attack has been attempted by %s."
+msgstr "Gwnaed ymgais i ymosod ar borth gan %s."
+
+#: standalone/net_applet:231
+#, c-format
+msgid "The %s service has been attacked by %s."
+msgstr "Mae gwasanaeth %s wedi derbyn ymosodiad gan %s."
+
+#: standalone/net_applet:232
+#, c-format
+msgid "A password cracking attack has been attempted by %s."
+msgstr "Gwnaed ymgais i agor cyfrinair gan %s"
+
+#: standalone/net_applet:240
+#, c-format
+msgid "Active Firewall: intrusion detected"
+msgstr "Mur Cadarn Rhyngweithiol: canfod ymwthiad"
+
+#: standalone/net_applet:251
+#, c-format
+msgid "Do you want to blacklist the attacker?"
+msgstr "Hoffech chi wahardd yr ymosodwr?"
+
+#: standalone/net_applet:265
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Rhestr gwahardd (peidiwch gofyn eto)"
+
+#: standalone/net_applet:268
+#, c-format
+msgid "Attack details"
+msgstr "Manylion yr ymosodiad"
+
+#: standalone/net_applet:272
+#, c-format
+msgid "Attack time: %s"
+msgstr "Amser yr ymosodiad: %s"
+
+#: standalone/net_applet:273
+#, c-format
+msgid "Network interface: %s"
+msgstr "Rhyngwynebau rhwydwaith: %s"
+
+#: standalone/net_applet:274
+#, c-format
+msgid "Attack type: %s"
+msgstr "Math o ymosodiad:  %s"
+
+#: standalone/net_applet:275
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protocol: %s"
+
+#: standalone/net_applet:276
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Cyfeiriad IP yr ymosodwr: %s"
+
+#: standalone/net_applet:277
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Enw gwesteiwr yr ymosodwr: %s"
+
+#: standalone/net_applet:278
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Ymosodwyd ar wasanaeth: %s"
+
+#: standalone/net_applet:279
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Ymosodwyd ar borth: %s"
+
+#: standalone/net_applet:280
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Math o ymosodiad ICMP: %s"
+
 #: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
@@ -24701,7 +25536,7 @@ msgstr ""
 #: standalone/net_monitor:120
 #, c-format
 msgid "Use same scale for received and transmitted"
-msgstr ""
+msgstr "Defnyddio'r un raddfa ar gyfer derbyniwyd a throsglwyddo"
 
 #: standalone/net_monitor:139
 #, c-format
@@ -24742,32 +25577,32 @@ msgstr ""
 "Methodd y cysylltiad.\n"
 "Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrakelinux."
 
-#: standalone/net_monitor:341
+#: standalone/net_monitor:340
 #, c-format
 msgid "Color configuration"
 msgstr "Ffurfweddiad lliw"
 
-#: standalone/net_monitor:389 standalone/net_monitor:409
+#: standalone/net_monitor:388 standalone/net_monitor:408
 #, c-format
 msgid "sent: "
 msgstr "anfonwyd: "
 
-#: standalone/net_monitor:396 standalone/net_monitor:413
+#: standalone/net_monitor:395 standalone/net_monitor:412
 #, c-format
 msgid "received: "
 msgstr "derbyniwyd:"
 
-#: standalone/net_monitor:403
+#: standalone/net_monitor:402
 #, c-format
 msgid "average"
 msgstr "cyfartaledd"
 
-#: standalone/net_monitor:406
+#: standalone/net_monitor:405
 #, c-format
 msgid "Local measure"
 msgstr "Mesur lleol"
 
-#: standalone/net_monitor:464
+#: standalone/net_monitor:466
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -24776,166 +25611,162 @@ msgstr ""
 "Rhybudd, mae cysylltiad arall gyda'r rhyngrwyd wedi ei ganfod, efallai'n "
 "defnyddio eich rhwydwaith."
 
-#: standalone/net_monitor:475
+#: standalone/net_monitor:477
 #, c-format
 msgid "No internet connection configured"
 msgstr "Dim cysylltiad â'r rhyngrwyd wedi ei ffurfweddu"
 
-#: standalone/printerdrake:69
-#, c-format
-msgid "Loading printer configuration... Please wait"
-msgstr "Llwytho Defnyddwyr a Grwpiau...Arhoswch"
-
-#: standalone/printerdrake:85
+#: standalone/printerdrake:68
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Darllen data am argraffyddion gosodedig..."
 
-#: standalone/printerdrake:134
+#: standalone/printerdrake:116
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "Offeryn Rheoli Argraffydd %s"
 
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:159 standalone/printerdrake:160
-#: standalone/printerdrake:164
+#: standalone/printerdrake:130 standalone/printerdrake:131
+#: standalone/printerdrake:132 standalone/printerdrake:133
+#: standalone/printerdrake:141 standalone/printerdrake:142
+#: standalone/printerdrake:146
 #, c-format
 msgid "/_Actions"
 msgstr "/_Gweithredoedd"
 
-#: standalone/printerdrake:148 standalone/printerdrake:160
+#: standalone/printerdrake:130 standalone/printerdrake:142
 #, c-format
 msgid "/_Add Printer"
 msgstr "/_Ychwanegu Argraffydd"
 
-#: standalone/printerdrake:149
+#: standalone/printerdrake:131
 #, c-format
 msgid "/Set as _Default"
 msgstr "Gosod fel _Rhagosodiad"
 
-#: standalone/printerdrake:150
+#: standalone/printerdrake:132
 #, c-format
 msgid "/_Edit"
 msgstr "/_Golygu"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:133
 #, c-format
 msgid "/_Delete"
 msgstr "/_Dileu"
 
-#: standalone/printerdrake:152
+#: standalone/printerdrake:134
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_Modd Uwch"
 
-#: standalone/printerdrake:157
+#: standalone/printerdrake:139
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Adnewyddu"
 
-#: standalone/printerdrake:164
+#: standalone/printerdrake:146
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_Ffurfweddu CUPS"
 
-#: standalone/printerdrake:197
+#: standalone/printerdrake:181
 #, c-format
 msgid "Search:"
 msgstr "Chwilio:"
 
-#: standalone/printerdrake:200
+#: standalone/printerdrake:184
 #, c-format
 msgid "Apply filter"
 msgstr "Gosod Hidl"
 
-#: standalone/printerdrake:218 standalone/printerdrake:225
+#: standalone/printerdrake:211 standalone/printerdrake:218
 #, c-format
 msgid "Def."
 msgstr "Def."
 
-#: standalone/printerdrake:218 standalone/printerdrake:225
+#: standalone/printerdrake:211 standalone/printerdrake:218
 #, c-format
 msgid "Printer Name"
 msgstr "Enw argraffydd"
 
-#: standalone/printerdrake:218
+#: standalone/printerdrake:211
 #, c-format
 msgid "Connection Type"
 msgstr "Math o Gyswllt"
 
-#: standalone/printerdrake:225
+#: standalone/printerdrake:218
 #, c-format
 msgid "Server Name"
 msgstr "Enw Gweinydd"
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:233
+#: standalone/printerdrake:226
 #, c-format
 msgid "Add Printer"
 msgstr "Ychwanegu Argraffydd"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:226
 #, c-format
 msgid "Add a new printer to the system"
-msgstr "Ychwanegu argraffydd newydd i'e system"
+msgstr "Ychwanegu argraffydd newydd i’r system"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:236
+#: standalone/printerdrake:229
 #, c-format
 msgid "Set as default"
 msgstr "Gosod fel rhagosodedig"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:229
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Gosod yr argraffydd fel y rhagosodedig"
 
-#: standalone/printerdrake:239
+#: standalone/printerdrake:232
 #, c-format
 msgid "Edit selected printer"
 msgstr "Golygu'r argraffwyr hyn"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:235
 #, c-format
 msgid "Delete selected printer"
 msgstr "Dileu'r argraffydd hwn"
 
-#: standalone/printerdrake:245
+#: standalone/printerdrake:238
 #, c-format
 msgid "Refresh the list"
 msgstr "Adnewyddu'r rhestr"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:248
+#: standalone/printerdrake:241
 #, c-format
 msgid "Configure CUPS"
 msgstr "Ffurfweddu CUPS"
 
-#: standalone/printerdrake:248
+#: standalone/printerdrake:241
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Ffurfweddu'r system argraffu CUPS"
 
-#: standalone/printerdrake:309 standalone/printerdrake:347
-#, fuzzy, c-format
+#: standalone/printerdrake:299 standalone/printerdrake:337
+#, c-format
 msgid "Enabled"
-msgstr "Galluogi"
+msgstr "Galluogwyd"
 
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:300 standalone/printerdrake:338
 #, c-format
 msgid "Disabled"
 msgstr "Anablwyd"
 
-#: standalone/printerdrake:572
+#: standalone/printerdrake:560
 #, c-format
 msgid "Authors: "
 msgstr "Awduron:"
 
-#: standalone/printerdrake:578
+#. -PO: here %s is the version number
+#: standalone/printerdrake:570
 #, c-format
-msgid "Printer Management \n"
-msgstr "Rheoli Argraffydd \n"
+msgid "Printer Management %s"
+msgstr "Rheoli Argraffydd %s"
 
 #: standalone/scannerdrake:51
 #, c-format
@@ -24944,7 +25775,7 @@ msgid ""
 "\n"
 "Do you want to install the SANE packages?"
 msgstr ""
-"Mane angen gosod pecynnau SANE i ddefndyyio sganwyr.\n"
+"Mae angen gosod pecynnau SANE i ddefnydio sganwyr.\n"
 "\n"
 "Hoffech chi osod y pecynnau SANE?"
 
@@ -24965,22 +25796,22 @@ msgstr ""
 msgid "Scannerdrake will not be started now."
 msgstr "Ni fydd Scannerdrake yn cael ei gychwyn."
 
-#: standalone/scannerdrake:67 standalone/scannerdrake:460
+#: standalone/scannerdrake:67 standalone/scannerdrake:491
 #, c-format
 msgid "Searching for configured scanners..."
 msgstr "Chwilio am sganiwr wedi ei ffurfweddu..."
 
-#: standalone/scannerdrake:71 standalone/scannerdrake:464
+#: standalone/scannerdrake:71 standalone/scannerdrake:495
 #, c-format
 msgid "Searching for new scanners..."
 msgstr "Chwilio am sganiwr newydd..."
 
-#: standalone/scannerdrake:79 standalone/scannerdrake:486
+#: standalone/scannerdrake:79 standalone/scannerdrake:517
 #, c-format
 msgid "Re-generating list of configured scanners..."
 msgstr "Ail gynhyrchu rhestr o sganwyr wedi eu ffurfweddu..."
 
-#: standalone/scannerdrake:101 standalone/scannerdrake:142
+#: standalone/scannerdrake:101
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "Nid yw %s yn cael ei gynnal gan y fersiwn yma o %s."
@@ -25009,19 +25840,29 @@ msgstr " ("
 #: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
-msgstr "Canfyddwyd model: %s"
+msgstr "Canfuwyd model: %s"
 
 #: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Porth: %s"
 
-#: standalone/scannerdrake:165 standalone/scannerdrake:179
+#: standalone/scannerdrake:138 standalone/scannerdrake:141
+#, c-format
+msgid " (UNSUPPORTED)"
+msgstr "(HEB EI GYNNAL)"
+
+#: standalone/scannerdrake:144
+#, c-format
+msgid "The %s is not supported under Linux."
+msgstr "Nid yw %s yn cael ei gynnal gan Linux."
+
+#: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Peidio gosod ffeil cadarnwedd"
 
-#: standalone/scannerdrake:169 standalone/scannerdrake:221
+#: standalone/scannerdrake:175 standalone/scannerdrake:227
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
@@ -25030,12 +25871,12 @@ msgstr ""
 "Mae'n bosib fod %s angen i'w gadarnwedd gael ei lwytho i fyny bob tro fydd "
 "yn cael ei gychwyn."
 
-#: standalone/scannerdrake:170 standalone/scannerdrake:222
+#: standalone/scannerdrake:176 standalone/scannerdrake:228
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr "Os yw hyn yn wir, gallwch beri i hyn gael ei wneud yn awtomatig i chi."
 
-#: standalone/scannerdrake:171 standalone/scannerdrake:225
+#: standalone/scannerdrake:177 standalone/scannerdrake:231
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
@@ -25044,7 +25885,7 @@ msgstr ""
 "I wneud felly, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel "
 "bod modd ei osod."
 
-#: standalone/scannerdrake:172 standalone/scannerdrake:226
+#: standalone/scannerdrake:178 standalone/scannerdrake:232
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
@@ -25053,22 +25894,22 @@ msgstr ""
 "Cewch hyd i'r ffeil ar y CD neu ddisg meddal sy'n dod gyda'r sganiwr, ar "
 "dudalen gwe'r gwneuthurwr, neu ar eich rhaniad Windows."
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:233
+#: standalone/scannerdrake:180 standalone/scannerdrake:239
 #, c-format
 msgid "Install firmware file from"
 msgstr "Gosod ffeil cadarnwedd o"
 
-#: standalone/scannerdrake:194
+#: standalone/scannerdrake:200
 #, c-format
 msgid "Select firmware file"
 msgstr "Dewiswch ffeil cadarnwedd"
 
-#: standalone/scannerdrake:197 standalone/scannerdrake:256
+#: standalone/scannerdrake:203 standalone/scannerdrake:262
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr "Nid yw ffeil cadarnwedd %s yn bodoli neu nid yw'n ddarllenadwy!"
 
-#: standalone/scannerdrake:220
+#: standalone/scannerdrake:226
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -25077,7 +25918,7 @@ msgstr ""
 "Mae'n bosib fod angen i'ch sganiwr gael ei gadarnwedd ei ddiweddaru bob tro "
 "fydd yn cael ei gychwyn."
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:230
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
@@ -25086,7 +25927,7 @@ msgstr ""
 "I wneud hynny, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel "
 "bod modd ei osod."
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -25095,32 +25936,32 @@ msgstr ""
 "Os ydych eisoes wedi gosod cadarnwedd eich sganiwr mae modd ei ddiweddaru "
 "drwy ddarparu'r ffeil newydd"
 
-#: standalone/scannerdrake:229
+#: standalone/scannerdrake:235
 #, c-format
 msgid "Install firmware for the"
 msgstr "Gosod ffeil cadarnwedd ar gyfer"
 
-#: standalone/scannerdrake:252
+#: standalone/scannerdrake:258
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Dewis ffeil cadarnwedd ar gyfer %s"
 
-#: standalone/scannerdrake:270
+#: standalone/scannerdrake:276
 #, c-format
 msgid "Could not install the firmware file for the %s!"
-msgstr "Methuo gosod ffeil cadarnwedd ar gyfer %s!"
+msgstr "Methu gosod ffeil cadarnwedd ar gyfer %s!"
 
-#: standalone/scannerdrake:283
+#: standalone/scannerdrake:289
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Mae'r ffeil cadarnwedd ar gyfer %s wedi ei osod yn llwyddiannus!"
 
-#: standalone/scannerdrake:293
+#: standalone/scannerdrake:299
 #, c-format
 msgid "The %s is unsupported"
 msgstr "Nid yw %s yn cael ei gynnal"
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -25129,33 +25970,98 @@ msgstr ""
 "Rhaid i %s gael ei ffurfweddu gan printerdrake.\n"
 "Gallwch gychwyn printerdrake o adran Galedwedd Canolfan Rheoli %s"
 
-#: standalone/scannerdrake:302 standalone/scannerdrake:309
-#: standalone/scannerdrake:339
+#: standalone/scannerdrake:308 standalone/scannerdrake:315
+#: standalone/scannerdrake:345
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "Awtoganfod pyrth ar gael"
 
-#: standalone/scannerdrake:304 standalone/scannerdrake:350
+#: standalone/scannerdrake:310 standalone/scannerdrake:356
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Dewiswch y ddyfais lle mae %s wedi ei gysylltu"
 
-#: standalone/scannerdrake:305
+#: standalone/scannerdrake:311
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Sylwer: Nid oes modd awtoganfod pyrth paralel)"
 
-#: standalone/scannerdrake:307 standalone/scannerdrake:352
+#: standalone/scannerdrake:313 standalone/scannerdrake:358
 #, c-format
 msgid "choose device"
 msgstr "dewis dyfais"
 
-#: standalone/scannerdrake:341
+#: standalone/scannerdrake:347
 #, c-format
 msgid "Searching for scanners..."
 msgstr "Chwilio am sganwyr..."
 
-#: standalone/scannerdrake:376
+#: standalone/scannerdrake:383
+#, c-format
+msgid "Setting up kernel modules..."
+msgstr "Gosod modiwlau'r cnewyllyn..."
+
+#: standalone/scannerdrake:390 standalone/scannerdrake:397
+#, c-format
+msgid "Attention!"
+msgstr "Sylwch!"
+
+#: standalone/scannerdrake:391
+#, c-format
+msgid ""
+"Your %s cannot be configured fully automatically.\n"
+"\n"
+"Manual adjustments are required. Please edit the configuration file /etc/"
+"sane.d/%s.conf. "
+msgstr ""
+"Nid oes modd ffurfweddu %s yn awtomatig.\n"
+"\n"
+"\n"
+"Mae angen newidiadau gyda llaw. Golygwch y ffeil ffurfweddiad /etc/sane.d/%s."
+"conf. "
+
+#: standalone/scannerdrake:392 standalone/scannerdrake:401
+#, c-format
+msgid ""
+"More info in the driver's manual page. Run the command \"man sane-%s\" to "
+"read it."
+msgstr ""
+"Mae rhagor o wybodaeth ar dudalen llawlyfr y gyrrwr. Rhedwch y gorchymyn "
+"\"man sane-%s\" i'w ddarllen."
+
+#: standalone/scannerdrake:394 standalone/scannerdrake:403
+#, c-format
+msgid ""
+"After that you may scan documents using \"XSane\" or \"Kooka\" from "
+"Multimedia/Graphics in the applications menu."
+msgstr ""
+"Wedi hynny gallwch sganio dogfennau gan ddefnyddio \"XSane\" neu \"Kooka\" "
+"o'r ddewislen Aml-gyfrwng/Graffigau."
+
+#: standalone/scannerdrake:398
+#, c-format
+msgid ""
+"Your %s has been configured, but it is possible that additional manual "
+"adjustments are needed to get it to work. "
+msgstr ""
+"Mae eich %s wedi ei ffurfweddu, ond mae'n bosibl bod angen newidiadau llaw "
+"ychwanegol i'w gael i weithio."
+
+#: standalone/scannerdrake:399
+#, c-format
+msgid ""
+"If it does not appear in the list of configured scanners in the main window "
+"of Scannerdrake or if it does not work correctly, "
+msgstr ""
+"Nid yw'n ymddangos ar restr sganwyr wedi eu ffurfweddu ym mhrif ffenestr "
+"Scannerdrake neu nid yw'n gweithio'n iawn."
+
+#: standalone/scannerdrake:400
+#, c-format
+msgid "edit the configuration file /etc/sane.d/%s.conf. "
+msgstr "golygu'r ffeil ffurfweddu /etc/sane.d/%s.conf. "
+
+#: standalone/scannerdrake:406
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -25166,7 +26072,7 @@ msgstr ""
 "Gallwch ddefnyddio \"XSane\" i sganio dogfennau o'r ddewislen rhaglenni Aml-"
 "gyfrwng/Graffigau."
 
-#: standalone/scannerdrake:400
+#: standalone/scannerdrake:431
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -25174,12 +26080,12 @@ msgid ""
 "%s\n"
 "are available on your system.\n"
 msgstr ""
-"Mae argraffyddion canlynol\n"
+"Mae'r argraffyddion canlynol\n"
 "\n"
 "%s\n"
 "ar gael ar eich system.\n"
 
-#: standalone/scannerdrake:401
+#: standalone/scannerdrake:432
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -25192,42 +26098,42 @@ msgstr ""
 "%s\n"
 "ar gael ar eich system.\n"
 
-#: standalone/scannerdrake:404 standalone/scannerdrake:407
+#: standalone/scannerdrake:435 standalone/scannerdrake:438
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr "Does unrhyw sganiwr wedi ei ganfod ar gael ar eich cyfrifiadur.\n"
 
-#: standalone/scannerdrake:421
+#: standalone/scannerdrake:452
 #, c-format
 msgid "Search for new scanners"
 msgstr "Chwilio am sganwyr newydd"
 
-#: standalone/scannerdrake:427
+#: standalone/scannerdrake:458
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Ychwanegu sganiwr gyda llaw"
 
-#: standalone/scannerdrake:434
+#: standalone/scannerdrake:465
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Gosod/Diweddaru ffeiliau cadarnwedd"
 
-#: standalone/scannerdrake:440
+#: standalone/scannerdrake:471
 #, c-format
 msgid "Scanner sharing"
 msgstr "Rhannu sganiwr"
 
-#: standalone/scannerdrake:499 standalone/scannerdrake:664
+#: standalone/scannerdrake:530 standalone/scannerdrake:695
 #, c-format
 msgid "All remote machines"
 msgstr "Pob cyfrifiadur pell"
 
-#: standalone/scannerdrake:511 standalone/scannerdrake:814
+#: standalone/scannerdrake:542 standalone/scannerdrake:845
 #, c-format
 msgid "This machine"
 msgstr "Y peiriant hwn"
 
-#: standalone/scannerdrake:551
+#: standalone/scannerdrake:582
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -25236,7 +26142,7 @@ msgstr ""
 "Yma gallwch benderfynu a ddylai'r sganwyr sy'n gysylltiedig â'r cyfrifiadur "
 "hwn fod ar gael i gyfrifiaduron pell a pha rai."
 
-#: standalone/scannerdrake:552
+#: standalone/scannerdrake:583
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -25245,33 +26151,33 @@ msgstr ""
 "Gallwch benderfynu a ddylai sganwyr ar gyfrifiadur pell fod ar gael ar gyfer "
 "y cyfrifiadur hwn."
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:586
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Mae' sganwyr y cyfrifiadur hwn ar gael ar gyfer rhai eraill"
 
-#: standalone/scannerdrake:557
+#: standalone/scannerdrake:588
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Rhannu sganwyr i westeiwyr:"
 
-#: standalone/scannerdrake:571
+#: standalone/scannerdrake:602
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Defnyddio sganiwr ar gyfrifiaduron pell"
 
-#: standalone/scannerdrake:574
+#: standalone/scannerdrake:605
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Defnyddio sganwyr ar westeiwyr:"
 
-#: standalone/scannerdrake:601 standalone/scannerdrake:673
-#: standalone/scannerdrake:823
+#: standalone/scannerdrake:632 standalone/scannerdrake:704
+#: standalone/scannerdrake:854
 #, c-format
 msgid "Sharing of local scanners"
 msgstr "Rhannu sganwyr lleol"
 
-#: standalone/scannerdrake:602
+#: standalone/scannerdrake:633
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -25279,66 +26185,66 @@ msgid ""
 msgstr ""
 "Dyma'r cyfrifiaduron a rhwydweithiau ddylai'r sganiwr lleol fod ar gael:"
 
-#: standalone/scannerdrake:613 standalone/scannerdrake:763
+#: standalone/scannerdrake:644 standalone/scannerdrake:794
 #, c-format
 msgid "Add host"
 msgstr "Ychwanegu gwesteiwr"
 
-#: standalone/scannerdrake:619 standalone/scannerdrake:769
+#: standalone/scannerdrake:650 standalone/scannerdrake:800
 #, c-format
 msgid "Edit selected host"
 msgstr "Golygu'r gwesteiwr"
 
-#: standalone/scannerdrake:628 standalone/scannerdrake:778
+#: standalone/scannerdrake:659 standalone/scannerdrake:809
 #, c-format
 msgid "Remove selected host"
 msgstr "Tynnu'r gwesteiwr"
 
-#: standalone/scannerdrake:652 standalone/scannerdrake:660
-#: standalone/scannerdrake:665 standalone/scannerdrake:711
-#: standalone/scannerdrake:802 standalone/scannerdrake:810
-#: standalone/scannerdrake:815 standalone/scannerdrake:861
+#: standalone/scannerdrake:683 standalone/scannerdrake:691
+#: standalone/scannerdrake:696 standalone/scannerdrake:742
+#: standalone/scannerdrake:833 standalone/scannerdrake:841
+#: standalone/scannerdrake:846 standalone/scannerdrake:892
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "Enw/cyfeiriad IP gwesteiwr"
 
-#: standalone/scannerdrake:674 standalone/scannerdrake:824
+#: standalone/scannerdrake:705 standalone/scannerdrake:855
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr "Dewis y gwesteiwr ddylai'r sganiwr lleol fod ar gael iddynt:"
 
-#: standalone/scannerdrake:685 standalone/scannerdrake:835
+#: standalone/scannerdrake:716 standalone/scannerdrake:866
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "Rhowch enw'r gwesteiwr neu'r cyfeiriad IP.\n"
 
-#: standalone/scannerdrake:696 standalone/scannerdrake:846
+#: standalone/scannerdrake:727 standalone/scannerdrake:877
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr "Mae'r gwesteiwr ar y rhestr yn barod, does dim modd ei ychwanegu.\n"
 
-#: standalone/scannerdrake:751
+#: standalone/scannerdrake:782
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Defnyddiwch o sganwyr pell"
 
-#: standalone/scannerdrake:752
+#: standalone/scannerdrake:783
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Dyma'r cyfrifiaduron ddylai'r sganwyr fod ar gael:"
 
-#: standalone/scannerdrake:909
+#: standalone/scannerdrake:940
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
 "\n"
 "Do you want to install the saned package?"
 msgstr ""
-"Mae angen gosdod saned i rannu sganiwr(wyr) lleol.\n"
+"Mae angen gosod saned i rannu sganiwr(wyr) lleol.\n"
 "\n"
 "Hoffech chi osod pecyn saned?"
 
-#: standalone/scannerdrake:913 standalone/scannerdrake:917
+#: standalone/scannerdrake:944 standalone/scannerdrake:948
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Ni fydd eich sganiwr(sganwyr) ar gael ar y rhwydwaith"
@@ -25363,7 +26269,7 @@ msgstr "Ychwanegwyd rhai dyfeisiau: %s\n"
 msgid "- %s was added\n"
 msgstr "- %s wedi ei ychwanegu\n"
 
-#: standalone/service_harddrake:199
+#: standalone/service_harddrake:204
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Canfod caledwedd ar waith"
@@ -25430,8 +26336,8 @@ msgstr "Gosod y system"
 
 #: steps.pm:25
 #, c-format
-msgid "Root password"
-msgstr "Cyfrinair gwraidd"
+msgid "Administrator password"
+msgstr "Cyfrinair y gweinyddwr"
 
 #: steps.pm:26
 #, c-format
@@ -25468,25 +26374,50 @@ msgstr "Diweddaru"
 msgid "Exit install"
 msgstr "Gorffen"
 
-#: ugtk2.pm:1122
+#: ugtk2.pm:900
 #, c-format
 msgid "Is this correct?"
 msgstr "Ydi hyn yn gywir?"
 
-#: ugtk2.pm:1250
+#: ugtk2.pm:960
+#, c-format
+msgid "No file chosen"
+msgstr "Heb ddewis ffeil"
+
+#: ugtk2.pm:962
+#, c-format
+msgid "You have chosen a file, not a directory"
+msgstr "Rydych wedi dewis ffeil, nid cyfeiriadur"
+
+#: ugtk2.pm:964
+#, c-format
+msgid "You have chosen a directory, not a file"
+msgstr "Rydych wedi dewis cyfeiriadur, nid ffeil"
+
+#: ugtk2.pm:966
+#, c-format
+msgid "No such directory"
+msgstr "Dim cyfeiriadur o'r fath ar gael"
+
+#: ugtk2.pm:966
+#, c-format
+msgid "No such file"
+msgstr "Dim ffeil o'r fath ar gael"
+
+#: ugtk2.pm:1045
 #, c-format
 msgid "Expand Tree"
 msgstr "Estyn y goeden"
 
-#: ugtk2.pm:1251
+#: ugtk2.pm:1046
 #, c-format
 msgid "Collapse Tree"
 msgstr "Cau'r goeden"
 
-#: ugtk2.pm:1252
+#: ugtk2.pm:1047
 #, c-format
 msgid "Toggle between flat and group sorted"
-msgstr "Newid rhwng gwastad a'r grwp wedi ei ddidoli"
+msgstr "Newid rhwng gwastad a'r grŵp wedi ei ddidoli"
 
 #: wizards.pm:95
 #, c-format
@@ -25503,348 +26434,112 @@ msgid "Installation failed"
 msgstr "Methodd y gosod"
 
 #, fuzzy
-#~ msgid "The "
-#~ msgstr "Thema"
-
-#, fuzzy
-#~ msgid "Morrocco"
-#~ msgstr "Morocco"
-
-#, fuzzy
-#~ msgid "Server Information:"
-#~ msgstr "Gwybodaeth"
-
-#, fuzzy
-#~ msgid "Use SSL connection"
-#~ msgstr "Cysylltiad ADSL"
-
-#, fuzzy
-#~ msgid "User Base:"
-#~ msgstr "Enw defnyddiwr"
-
-#, fuzzy
-#~ msgid "Base:"
-#~ msgstr "Enw:"
-
-#, fuzzy
-#~ msgid "Scope:"
-#~ msgstr "Aros"
-
-#, fuzzy
-#~ msgid "Bind Server:"
-#~ msgstr "Gweinydd:"
-
-#~ msgid "Use Anonymous Bind"
-#~ msgstr "Defnydd BIND anhysbys"
-
-#, fuzzy
-#~ msgid "Users database"
-#~ msgstr "Cronfa ddata defnyddwyr LDAP"
+#~ msgid "Active Firewall : intrusion detected"
+#~ msgstr "Wedi canfod ffurfweddiad mur gwarchod!"
 
 #, fuzzy
-#~ msgid "User allowed to browse the Active Directory"
-#~ msgstr "Defnyddiwr LDAP â chaniatâd i bori'r Cyfeiriadur Gweithredol"
-
-#~ msgid "OK"
-#~ msgstr "Iawn"
-
-#~ msgid "NO"
-#~ msgstr "NA"
-
-#~ msgid "YES"
-#~ msgstr "IAWN"
+#~ msgid "Do you want to blacklist the attacker ?"
+#~ msgstr "Ydych chi eisiau troi Bysellau Gludiog ymlaen?"
 
 #~ msgid ""
-#~ "The following options can be set to customize your\n"
-#~ "system security. If you need an explanation, look at the help tooltip.\n"
+#~ "Insert a floppy in drive\n"
+#~ "All data on this floppy will be lost"
 #~ msgstr ""
-#~ "Mae modd gosod y dewisiadau canlynol i addasu\n"
-#~ "diogelwch eich system. Os oes arnoch esboniadau, cliciwch ar cymorth.\n"
-
-#~ msgid "The %s is not known by this version of Scannerdrake."
-#~ msgstr "Nid yw %s yn hysbys gan y fersiwn hwn o Scannerdrake."
-
-#~ msgid "Czech (QWERTZ)"
-#~ msgstr "Tsiec (QWERTY)"
-
-#~ msgid "German"
-#~ msgstr "Almaenaidd"
-
-#~ msgid "Dvorak"
-#~ msgstr "Dvorak"
-
-#~ msgid "Spanish"
-#~ msgstr "Sbaenaidd"
-
-#~ msgid "Finnish"
-#~ msgstr "Ffinaidd"
-
-#~ msgid "French"
-#~ msgstr "Ffrengig"
+#~ "Rhowch ddisg meddal yn y gyrrwr\n"
+#~ "Mi fydd yr holl wybodaeth ar y disg meddal yma yn cael ei golli"
 
-#~ msgid "Norwegian"
-#~ msgstr "Norwyaidd"
+#~ msgid "Insert a FAT formatted floppy in drive %s"
+#~ msgstr "Rhowch ddisg meddal wedi ei fformatio i FAT yng ngyrrwr %s"
 
-#~ msgid "Polish"
-#~ msgstr "Pwylaidd"
+#~ msgid "This floppy is not FAT formatted"
+#~ msgstr "Nid yw 'r disg meddal hwn wedi ei fformatio i FAT"
 
-#~ msgid "Russian"
-#~ msgstr "Rwsiaidd"
-
-#~ msgid "Swedish"
-#~ msgstr "Swedaidd"
-
-#~ msgid "Albanian"
-#~ msgstr "Albaniaidd"
-
-#~ msgid "Armenian (old)"
-#~ msgstr "Armenaidd (hen)"
-
-#~ msgid "Armenian (typewriter)"
-#~ msgstr "Armenaidd (teipiadur)"
-
-#~ msgid "Armenian (phonetic)"
-#~ msgstr "Armenaidd (ffonetig)"
-
-#~ msgid "Arabic"
-#~ msgstr "Arabaidd"
-
-#~ msgid "Azerbaidjani (latin)"
-#~ msgstr "Azerbaidjan (lladin)"
-
-#~ msgid "Belgian"
-#~ msgstr "Belgaidd"
-
-#~ msgid "Bengali"
-#~ msgstr "Bengalaidd"
-
-#~ msgid "Bulgarian (phonetic)"
-#~ msgstr "Bwlgaraidd (ffonetig)"
-
-#~ msgid "Bulgarian (BDS)"
-#~ msgstr "Bwlgaraidd (BDS)"
-
-#~ msgid "Brazilian (ABNT-2)"
-#~ msgstr "Brasilaidd (ABNT-2)"
-
-#~ msgid "Bosnian"
-#~ msgstr "Bosniaidd"
-
-#~ msgid "Belarusian"
-#~ msgstr "Belarusaidd"
-
-#~ msgid "Swiss (German layout)"
-#~ msgstr "Swisaidd (gosodiad Almaeneg)"
-
-#~ msgid "Swiss (French layout)"
-#~ msgstr "Swisaidd (gosodiad Ffrengig)"
-
-#~ msgid "Czech (QWERTY)"
-#~ msgstr "Tsiec (QWERTY)"
-
-#~ msgid "German (no dead keys)"
-#~ msgstr "Almaenaidd (dim bysellau marw)"
-
-#~ msgid "Devanagari"
-#~ msgstr "Devanagari"
-
-#~ msgid "Danish"
-#~ msgstr "Danaidd"
-
-#~ msgid "Dvorak (US)"
-#~ msgstr "Dvorak (UDA)"
-
-#~ msgid "Dvorak (Esperanto)"
-#~ msgstr "Dvorak (Esperanto)"
-
-#~ msgid "Dvorak (Norwegian)"
-#~ msgstr "Dvorak (Norwyaidd)"
-
-#~ msgid "Dvorak (Swedish)"
-#~ msgstr "Dvorak (Swedaidd)"
-
-#~ msgid "Estonian"
-#~ msgstr "Estonaidd"
-
-#~ msgid "Georgian (\"Russian\" layout)"
-#~ msgstr "Georgaidd (gosodiad \"Rwsiaidd\")"
-
-#~ msgid "Georgian (\"Latin\" layout)"
-#~ msgstr "Georgaidd (gosodiad \"Lladinaidd\")"
-
-#~ msgid "Greek"
-#~ msgstr "Groegaidd"
-
-#~ msgid "Greek (polytonic)"
-#~ msgstr "Groegaidd (polytonic)"
-
-#~ msgid "Gujarati"
-#~ msgstr "Gujarati"
-
-#~ msgid "Gurmukhi"
-#~ msgstr "Gurmukhi"
-
-#~ msgid "Hungarian"
-#~ msgstr "Hwngaraidd"
-
-#~ msgid "Croatian"
-#~ msgstr "Croataidd"
-
-#~ msgid "Irish"
-#~ msgstr "Gwyddelig"
-
-#~ msgid "Israeli"
-#~ msgstr "Israelaidd"
-
-#~ msgid "Israeli (Phonetic)"
-#~ msgstr "Israelaidd (Ffonetig)"
-
-#~ msgid "Iranian"
-#~ msgstr "Iranaidd"
-
-#~ msgid "Icelandic"
-#~ msgstr "Eislandaidd"
-
-#~ msgid "Italian"
-#~ msgstr "Eidalaidd"
-
-#~ msgid "Inuktitut"
-#~ msgstr "Inuktitut"
-
-#~ msgid "Japanese 106 keys"
-#~ msgstr "Siapaëaidd 106 bysell"
-
-#~ msgid "Kannada"
-#~ msgstr "Kannada"
-
-#~ msgid "Korean keyboard"
-#~ msgstr "Bysellfwrdd Corëaidd"
-
-#~ msgid "Kyrgyz keyboard"
-#~ msgstr "Bysellfwrdd Kyrgyz"
-
-#~ msgid "Latin American"
-#~ msgstr "Lladin America"
-
-#~ msgid "Laotian"
-#~ msgstr "Laotiaidd"
-
-#~ msgid "Lithuanian AZERTY (old)"
-#~ msgstr "Lithuenaidd AZERTY (hen)"
-
-#~ msgid "Lithuanian AZERTY (new)"
-#~ msgstr "Lithuenaidd AZERTY (newydd)"
-
-#~ msgid "Lithuanian \"number row\" QWERTY"
-#~ msgstr "Lithuenaidd \"rhes rhif\" QWERTY"
-
-#~ msgid "Lithuanian \"phonetic\" QWERTY"
-#~ msgstr "Lithuenaidd \"ffonetig\" QWERTY"
-
-#~ msgid "Latvian"
-#~ msgstr "Latfiaidd"
-
-#~ msgid "Malayalam"
-#~ msgstr "Malayalamaidd"
-
-#~ msgid "Macedonian"
-#~ msgstr "Macedonaidd"
-
-#~ msgid "Myanmar (Burmese)"
-#~ msgstr "Myanmar (Burma)"
-
-#~ msgid "Mongolian (cyrillic)"
-#~ msgstr "Mongolaidd (cyrillic)"
-
-#~ msgid "Maltese (UK)"
-#~ msgstr "Maltaidd (DU)"
-
-#~ msgid "Maltese (US)"
-#~ msgstr "Maltaidd (UDA)"
-
-#~ msgid "Dutch"
-#~ msgstr "Isalmaenaidd"
-
-#~ msgid "Oriya"
-#~ msgstr "Oriya"
-
-#~ msgid "Polish (qwerty layout)"
-#~ msgstr "Pwylaidd (gosodiad qwerty)"
+#~ msgid ""
+#~ "To use this saved packages selection, boot installation with ``linux "
+#~ "defcfg=floppy''"
+#~ msgstr ""
+#~ "I ddefnyddio'r dewis o becynnau wedi eu cadw, cychwynnwch y gosodiad gyda "
+#~ "``linux defcfg=floppy''"
 
-#~ msgid "Polish (qwertz layout)"
-#~ msgstr "Pwylaidd (gosodiad qwerty)"
+#~ msgid "Load/Save on floppy"
+#~ msgstr "Llwytho/Cadw ar ddisg  meddal"
 
-#~ msgid "Portuguese"
-#~ msgstr "Portiwgalaidd"
+#~ msgid ""
+#~ "Please choose load or save package selection on floppy.\n"
+#~ "The format is the same as auto_install generated floppies."
+#~ msgstr ""
+#~ "Dewiswch lwytho neu ddewis cadw pecyn ar ddisg meddal.\n"
+#~ "Mae'r fformat yr un ar ddisgiau meddal wedi eu cynhyrchu drwy "
+#~ "auto_install."
 
-#~ msgid "Canadian (Quebec)"
-#~ msgstr "Canada (Quebec)"
+#~ msgid "Load from floppy"
+#~ msgstr "Llwytho o ddisg meddal"
 
-#~ msgid "Romanian (qwertz)"
-#~ msgstr "Romanaidd (qwertz)"
+#~ msgid "Save on floppy"
+#~ msgstr "Cadw ar ddisg meddal"
 
-#~ msgid "Romanian (qwerty)"
-#~ msgstr "Romanaidd (qwerty)"
+#~ msgid "Package selection"
+#~ msgstr "Dewis pecynnau"
 
-#~ msgid "Russian (Phonetic)"
-#~ msgstr "Rwsiaidd (Ffonetig)"
+#~ msgid "Loading from floppy"
+#~ msgstr "Llwytho o ddisg meddal"
 
-#~ msgid "Saami (norwegian)"
-#~ msgstr "Saami (norwyaidd)"
+#~ msgid "Insert a floppy containing package selection"
+#~ msgstr "Rhowch ddisg meddal yn cynnwys dewis pecynnau yn y peiriant"
 
-#~ msgid "Saami (swedish/finnish)"
-#~ msgstr "Saami (Swedaidd/Ffinaidd)"
+#~ msgid "multi-function device on parallel port #%s"
+#~ msgstr "dyfais amlbwrpas ar borth paralel #\"%s"
 
-#~ msgid "Slovenian"
-#~ msgstr "Slfenaidd"
+#~ msgid "multi-function device on a parallel port"
+#~ msgstr "dyfais amlbwrpas ar borth paralel"
 
-#~ msgid "Slovakian (QWERTZ)"
-#~ msgstr "Slofacaidd (QWERTZ)"
+#~ msgid "multi-function device on USB"
+#~ msgstr "dyfais amlbwrpas ar USB"
 
-#~ msgid "Slovakian (QWERTY)"
-#~ msgstr "Slofacaidd (QWERTY)"
+#~ msgid "multi-function device on HP JetDirect"
+#~ msgstr "dyfais amlbwrpas ar HP JetDirect"
 
-#~ msgid "Serbian (cyrillic)"
-#~ msgstr "Serbaidd (cyrilig)"
+#~ msgid "multi-function device"
+#~ msgstr "dyfais amlbwrpas"
 
-#~ msgid "Syriac"
-#~ msgstr "Syriaidd"
+#~ msgid "printing to %s"
+#~ msgstr "argraffu i %s"
 
-#~ msgid "Syriac (phonetic)"
-#~ msgstr "Syriaidd (ffonetig)"
+#~ msgid "using command %s"
+#~ msgstr "defnyddio gorchymyn %s"
 
-#~ msgid "Telugu"
-#~ msgstr "Telugu"
+#~ msgid "Application:"
+#~ msgstr "Rhaglen"
 
-#~ msgid "Tamil (ISCII-layout)"
-#~ msgstr "Tamil (cynllun TSCII)"
+#~ msgid "Release: "
+#~ msgstr "Ryddhad"
 
-#~ msgid "Tamil (Typewriter-layout)"
-#~ msgstr "Tamil (cynllun teipiadur)"
+#~ msgid "Summary: "
+#~ msgstr "Crynodeb:"
 
-#~ msgid "Thai keyboard"
-#~ msgstr "Bysellfwrdd Thai"
+#~ msgid "Bug Description/System Information"
+#~ msgstr "Disgrifiad Gwall/Gwybodaeth am y System"
 
-#~ msgid "Tajik keyboard"
-#~ msgstr "Bysellfwrdd Tajig"
+#~ msgid "YOUR TEXT HERE"
+#~ msgstr "EICH TESTUN YMA"
 
-#~ msgid "Turkish (traditional \"F\" model)"
-#~ msgstr "Twrcaidd (model traddodiadol \"F\")"
+#~ msgid "Submit kernel version"
+#~ msgstr "Cyflwyno fersiwn y cnewyllyn"
 
-#~ msgid "Turkish (modern \"Q\" model)"
-#~ msgstr "Twrcaidd (model modern \"Q\")"
+#~ msgid "Submit cpuinfo"
+#~ msgstr "Cyflwyno cpuinfo"
 
-#~ msgid "Ukrainian"
-#~ msgstr "Wcranaidd"
+#~ msgid "Submit lspci"
+#~ msgstr "Cyflwyno Ispci"
 
-#~ msgid "Uzbek (cyrillic)"
-#~ msgstr "Uzbekaidd (cyrillig)"
+#~ msgid "NOT FOUND"
+#~ msgstr "HEB GANFOD"
 
-#~ msgid "Vietnamese \"numeric row\" QWERTY"
-#~ msgstr "Fietnamëaidd \"rhes rhifol\" QWERTY"
+#~ msgid "connecting to %s..."
+#~ msgstr "cysylltu â %s..."
 
-#~ msgid "Yugoslavian (latin)"
-#~ msgstr "Iwgoslafaidd (lladin)"
+#~ msgid "Please enter a package name."
+#~ msgstr "Rhowch enw'r pecyn."
 
-#~ msgid "No devices found"
-#~ msgstr "Heb ganfod dyfais"
+#~ msgid "Please enter summary text."
+#~ msgstr "Rhowch destun crynodeb yma."