updated pot file

1 files changed, 6432 insertions, 5286 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index bb8f32130..8d147552d 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -6,15 +6,81 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-cy\n"
-"POT-Creation-Date: 2004-06-14 15:48+0200\n"
-"PO-Revision-Date: 2004-06-11 21:04-0000\n"
-"Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
+"POT-Creation-Date: 2004-10-07 21:57+0200\n"
+"PO-Revision-Date: 2004-09-15 19:06+0200\n"
+"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg <rhoslyn.prys@meddal.org.uk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../move/move.pm:402
+#: ../move/move.pm:292
+#, c-format
+msgid "Which USB key do you want to format?"
+msgstr "Pa allwedd USB hoffech ei fformatio?"
+
+#: ../move/move.pm:296
+#, c-format
+msgid ""
+"You are about to format a USB device \"%s\". This will delete all data on "
+"it.\n"
+"Make sure that the selected device is the USB key you want to format. \n"
+"We advise you to unplug all other USB storage devices while doing this "
+"operation."
+msgstr ""
+"Rydych ar fin fformatio dyfais USB \"%s\". Bydd hyn yn dileu'r holl ddata "
+"sydd \n"
+"arno. Gwnewch yn siŵr fod mai hwn yw'r allwedd USB rydych am ei fformatio.\n"
+"Rydym yn eich cynghori i dynnu'r holl ddyfeisiadau storio USB eraill wrth "
+"wneud hyn. "
+
+#: ../move/move.pm:448 ../move/move.pm:460
+#, c-format
+msgid "Key isn't writable"
+msgstr "Nid yw'r allwedd yn ysgrifennadwy"
+
+#: ../move/move.pm:450
+#, c-format
+msgid ""
+"The USB key seems to have write protection enabled. Please\n"
+"unplug it, remove write protection, and then plug it again."
+msgstr ""
+"Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen.\n"
+"Tynnwch yr allwedd, diffodd y diogelu, ai ailosod."
+
+#: ../move/move.pm:452
+#, c-format
+msgid "Retry"
+msgstr "Ceisio eto"
+
+#: ../move/move.pm:453 ../move/move.pm:497
+#, c-format
+msgid "Continue without USB key"
+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"
+"unplug it now.\n"
+"\n"
+"\n"
+"Click the button to reboot the machine, unplug it, remove write protection,\n"
+"plug the key again, and launch Mandrake Move again."
+msgstr ""
+"Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen, ond nid oes.\n"
+"modd ei dynnu'n ddiogel.\n"
+"\n"
+"\n"
+"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
+#, c-format
+msgid "Reboot"
+msgstr "Ailgychwyn"
+
+#: ../move/move.pm:473
 #, c-format
 msgid ""
 "Your USB key doesn't have any valid Windows (FAT) partitions.\n"
@@ -29,7 +95,7 @@ msgid ""
 "Operating System."
 msgstr ""
 "Does gan eich allwedd USB raniadau Windows (FAT) dilys\n"
-"Rhaid cael un i barhau (mae'n fwy safonnol i'ch caniatáu i\n"
+"Rhaid cael un i barhau (mae'n fwy safonol i'ch caniatáu i\n"
 "chi symud a chael mynediad i ffeiliau o beiriannau sy'n rhedeg\n"
 "Windows). Rhowch allwedd USB yn cynnwys rhaniad Windows\n"
 "yn ei le nawr.\n"
@@ -39,7 +105,7 @@ msgstr ""
 "modd i chi ddefnyddio Mandrake Move fel System Weithredu\n"
 "Mandrake hyfyw."
 
-#: ../move/move.pm:412
+#: ../move/move.pm:483
 #, c-format
 msgid ""
 "We didn't detect any USB key on your system. If you\n"
@@ -58,7 +124,7 @@ msgstr ""
 "rhoi'r allwedd USB yn ei le, mae gan Mandrake Move y gallu i\n"
 "gadw eich data yn eich cyfeiriadur cartref a ffurfweddiad system\n"
 "gyfan, ar gyfer ail gychwyn y cyfrifiadur hwn neu un arall\n"
-"Sylwch: os wnewch chi rhoi'r allwedd yn ei le nawr, arhoswch\n"
+"Sylwch: os wnewch chi roi'r allwedd yn ei le nawr, arhoswch\n"
 "eiliadau cyn canfod eto.\n"
 "\n"
 "\n"
@@ -66,147 +132,101 @@ msgstr ""
 "modd i chi ddefnyddio Mandrake Move fel system weithredu\n"
 "Mandrake hyfyw."
 
-#: ../move/move.pm:423
+#: ../move/move.pm:494
 #, c-format
 msgid "Need a key to save your data"
 msgstr "Mae angen allwedd i gadw eich data"
 
-#: ../move/move.pm:425
+#: ../move/move.pm:496
 #, c-format
 msgid "Detect USB key again"
 msgstr "Canfod allwedd USB eto"
 
-#: ../move/move.pm:426 ../move/move.pm:456
-#, c-format
-msgid "Continue without USB key"
-msgstr "Parhau heb allwedd USB"
-
-#: ../move/move.pm:437 ../move/move.pm:451
-#, c-format
-msgid "Key isn't writable"
-msgstr "Nid yw'r allwedd yn ysgrifenadwy"
-
-#: ../move/move.pm:439
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
-"unplug it now.\n"
-"\n"
-"\n"
-"Click the button to reboot the machine, unplug it, remove write protection,\n"
-"plug the key again, and launch Mandrake Move again."
-msgstr ""
-"Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen, ond nid oes.\n"
-"modd ei dynnu'n ddiogel.\n"
-"\n"
-"\n"
-"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:445 help.pm:418 install_steps_interactive.pm:1306
-#, c-format
-msgid "Reboot"
-msgstr "Ailgychwyn"
-
-#: ../move/move.pm:453
-#, c-format
-msgid ""
-"The USB key seems to have write protection enabled. Please\n"
-"unplug it, remove write protection, and then plug it again."
-msgstr ""
-"Mae'r allwedd USB i weld a'i ddiogelu rhag ysgrifennu ymlaen.\n"
-"Tynnwch yr allwedd, diffodd y diogelu, ai ailosod."
-
-#: ../move/move.pm:455
-#, c-format
-msgid "Retry"
-msgstr "Ceisio eto"
-
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Setting up USB key"
 msgstr "Gosod allwedd USB"
 
-#: ../move/move.pm:466
+#: ../move/move.pm:517
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
 msgstr "Arhoswch, gosod ffeiliau caniatáu'r system ar allwedd USB..."
 
-#: ../move/move.pm:488
+#: ../move/move.pm:546
 #, c-format
 msgid "Enter your user information, password will be used for screensaver"
 msgstr ""
 "Rhowch eich gwybodaeth bersonol, bydd y cyfrinair yn cael ei ddefnyddio ar "
 "gyfer yr arbedwr sgrin"
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Auto configuration"
 msgstr "Awto ffurfweddiad "
 
-#: ../move/move.pm:498
+#: ../move/move.pm:556
 #, c-format
 msgid "Please wait, detecting and configuring devices..."
 msgstr "Arhoswch, canfod a ffurfweddu dyfeisiau..."
 
-#: ../move/move.pm:545 ../move/move.pm:601 ../move/move.pm:605
-#: ../move/tree/mdk_totem:86 diskdrake/dav.pm:77 diskdrake/hd_gtk.pm:117
-#: diskdrake/interactive.pm:220 diskdrake/interactive.pm:233
-#: diskdrake/interactive.pm:374 diskdrake/interactive.pm:389
-#: diskdrake/interactive.pm:510 diskdrake/interactive.pm:515
-#: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:262 install_steps.pm:82
-#: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:936 network/netconnect.pm:939
-#: network/netconnect.pm:984 network/netconnect.pm:988
-#: network/netconnect.pm:1055 network/netconnect.pm:1105
-#: network/netconnect.pm:1110 network/netconnect.pm:1125
-#: network/netconnect.pm:1333 printer/printerdrake.pm:213
-#: printer/printerdrake.pm:220 printer/printerdrake.pm:245
-#: printer/printerdrake.pm:393 printer/printerdrake.pm:398
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:1067 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1195
-#: printer/printerdrake.pm:1199 printer/printerdrake.pm:1213
-#: printer/printerdrake.pm:1303 printer/printerdrake.pm:1383
-#: printer/printerdrake.pm:1387 printer/printerdrake.pm:1391
-#: printer/printerdrake.pm:1440 printer/printerdrake.pm:1497
-#: printer/printerdrake.pm:1501 printer/printerdrake.pm:1515
-#: printer/printerdrake.pm:1625 printer/printerdrake.pm:1629
-#: printer/printerdrake.pm:1666 printer/printerdrake.pm:1731
-#: printer/printerdrake.pm:1749 printer/printerdrake.pm:1758
-#: printer/printerdrake.pm:1767 printer/printerdrake.pm:1778
-#: printer/printerdrake.pm:1840 printer/printerdrake.pm:2285
-#: printer/printerdrake.pm:2551 printer/printerdrake.pm:2557
-#: printer/printerdrake.pm:3010 printer/printerdrake.pm:3014
-#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
-#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
-#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
-#: standalone/drakTermServ:404 standalone/drakTermServ:758
-#: standalone/drakTermServ:765 standalone/drakTermServ:960
-#: standalone/drakTermServ:1430 standalone/drakTermServ:1435
-#: standalone/drakTermServ:1442 standalone/drakTermServ:1453
-#: standalone/drakTermServ:1475 standalone/drakauth:36
-#: standalone/drakbackup:511 standalone/drakbackup:625
-#: standalone/drakbackup:1118 standalone/drakbackup:1151
-#: standalone/drakbackup:1644 standalone/drakbackup:1807
-#: standalone/drakbackup:2419 standalone/drakbackup:4084
-#: standalone/drakbackup:4304 standalone/drakboot:255 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:621
-#: standalone/drakconnect:624 standalone/drakconnect:645
-#: standalone/drakfloppy:302 standalone/drakfloppy:306
-#: standalone/drakfloppy:312 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
-#: standalone/drakxtv:105 standalone/logdrake:170 standalone/logdrake:467
-#: standalone/logdrake:472 standalone/scannerdrake:58
-#: standalone/scannerdrake:200 standalone/scannerdrake:259
-#: standalone/scannerdrake:688 standalone/scannerdrake:699
-#: standalone/scannerdrake:838 standalone/scannerdrake:849
-#: standalone/scannerdrake:919 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: ../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
+#: 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
+#: 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
 #, c-format
 msgid "Error"
 msgstr "Gwall"
 
-#: ../move/move.pm:546 install_steps.pm:83
+#: ../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"
@@ -215,12 +235,12 @@ msgstr ""
 "Digwyddodd gwall ond wn i ddim sut i ddelio ag ef yn dwt.\n"
 "Mae'n beryglus i barhau."
 
-#: ../move/move.pm:601 install_steps_interactive.pm:40
+#: ../move/move.pm:660 install_steps_interactive.pm:38
 #, c-format
 msgid "An error occurred"
 msgstr "Digwyddodd gwall"
 
-#: ../move/move.pm:607
+#: ../move/move.pm:666
 #, c-format
 msgid ""
 "An error occurred:\n"
@@ -255,32 +275,39 @@ msgstr ""
 "golwg ar ffeiliau cofnod yng nghonsol #3 a #4 i geisio\n"
 "dyfalu beth sy'n digwydd."
 
-#: ../move/move.pm:622
+#: ../move/move.pm:681
 #, c-format
 msgid "Remove system config files"
 msgstr "Tynnu ffeiliau ffurfweddu'r system"
 
-#: ../move/move.pm:623
+#: ../move/move.pm:682
 #, c-format
 msgid "Simply reboot"
 msgstr "Ailgychwyn"
 
-#: ../move/tree/mdk_totem:60
+#: ../move/tree/mdk_totem:50 ../move/tree/mdk_totem:96
 #, c-format
 msgid "You can only run with no CDROM support"
 msgstr "Dim ond heb gefnogaeth CD-ROM mae modd rhedeg"
 
-#: ../move/tree/mdk_totem:81
+#: ../move/tree/mdk_totem:71
 #, c-format
 msgid "Kill those programs"
 msgstr "Lladd y rhaglenni hyn"
 
-#: ../move/tree/mdk_totem:82
+#: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
 msgstr "Dim cefnogaeth CD-ROM"
 
-#: ../move/tree/mdk_totem:87
+#: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
+#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
+#: diskdrake/interactive.pm:1068
+#, c-format
+msgid "Read carefully!"
+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"
@@ -339,22 +366,22 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "16 MB neu fwy"
 
-#: Xconfig/card.pm:151
+#: Xconfig/card.pm:155
 #, c-format
 msgid "X server"
 msgstr "Gweinydd X"
 
-#: Xconfig/card.pm:152
+#: Xconfig/card.pm:156
 #, c-format
 msgid "Choose an X server"
 msgstr "Dewiswch weinydd X"
 
-#: Xconfig/card.pm:184
+#: Xconfig/card.pm:188
 #, c-format
 msgid "Multi-head configuration"
 msgstr " ffurfweddiad amlben"
 
-#: Xconfig/card.pm:185
+#: Xconfig/card.pm:189
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -363,81 +390,80 @@ msgstr ""
 "Mae eich system yn cynnal ffurfweddiad amlben.\n"
 "Beth hoffech ei wneud?"
 
-#: Xconfig/card.pm:251
+#: Xconfig/card.pm:255
 #, c-format
-msgid "Can't install XFree package: %s"
-msgstr "Methu gosod pecyn XFree: %s"
+msgid "Can't install Xorg package: %s"
+msgstr "Methu gosod pecyn Xorg: %s"
 
-#: Xconfig/card.pm:261
+#: Xconfig/card.pm:265
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Dewiswch faint cof eich cerdyn graffeg"
 
-#: Xconfig/card.pm:332
+#: Xconfig/card.pm:352
 #, c-format
-msgid "XFree configuration"
-msgstr "Ffurfweddiad XFree"
+msgid "Xorg configuration"
+msgstr "Ffurfweddiad Xorg"
 
-#: Xconfig/card.pm:334
+#: Xconfig/card.pm:354
 #, c-format
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Pa ffurfweddiad XFree hoffech ei gael?"
+msgid "Which configuration of Xorg do you want to have?"
+msgstr "Pa ffurfweddiad Xorg hoffech ei gael?"
 
-#: Xconfig/card.pm:367
+#: Xconfig/card.pm:387
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Ffurfweddu pob pen yn annibynnol"
 
-#: Xconfig/card.pm:368
+#: Xconfig/card.pm:388
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Defnyddiwch estyniad Xinerama"
 
-#: Xconfig/card.pm:373
+#: Xconfig/card.pm:393
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Ffurfweddu cerdyn \"%s\" %s yn unig"
 
-#: Xconfig/card.pm:385 Xconfig/various.pm:23
+#: Xconfig/card.pm:405 Xconfig/various.pm:23
 #, c-format
-msgid "XFree %s"
-msgstr "XFree: %s"
+msgid "Xorg %s"
+msgstr "Xorg: %s"
 
-#: Xconfig/card.pm:392 Xconfig/various.pm:22
+#: Xconfig/card.pm:412 Xconfig/various.pm:22
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s gyda chyflymu caledwedd 3D"
+msgid "Xorg %s with 3D hardware acceleration"
+msgstr "Xorg %s gyda chyflymu caledwedd 3D"
 
-#: Xconfig/card.pm:394
+#: Xconfig/card.pm:414
 #, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr ""
-"Mae modd i'ch cerdyn gael cefnogaeth cyflymu caledwedd 3D gyda XFree %s"
+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:400
+#: Xconfig/card.pm:420
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s gyda chyflymu caledwedd 3D ARBROFOL"
+msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "Xorg %s gyda chyflymu caledwedd 3D ARBROFOL"
 
-#: Xconfig/card.pm:402
+#: Xconfig/card.pm:422
 #, c-format
 msgid ""
-"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"Your card can have 3D hardware acceleration support with Xorg %s,\n"
 "NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
 msgstr ""
-"Mae modd i'ch cerdyn gael cefnogaeth cyflymu caledwedd 3D gyda XFree %s \n"
-"SYLWER CEFNOGAETH ARBROFOL YW HWN AC FE ALL RHEWI EICH CYFRIFIADUR."
+"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:112 any.pm:833
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
 #, c-format
 msgid "Custom"
 msgstr "Arddull"
 
-#: Xconfig/main.pm:115 diskdrake/dav.pm:28 help.pm:14
-#: install_steps_interactive.pm:83 printer/printerdrake.pm:608
-#: printer/printerdrake.pm:4076 standalone/draksplash:120
-#: standalone/harddrake2:194 standalone/logdrake:175
-#: standalone/scannerdrake:450
+#: 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
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -447,12 +473,12 @@ msgstr "Gadael"
 msgid "Graphic Card"
 msgstr "Cerdyn Graffeg"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:106
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
 #, c-format
 msgid "Monitor"
 msgstr "Monitor"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:217
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
 #, c-format
 msgid "Resolution"
 msgstr "Cydraniad"
@@ -462,14 +488,19 @@ msgstr "Cydraniad"
 msgid "Test"
 msgstr "Prawf"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:67 diskdrake/interactive.pm:415
-#: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:554 standalone/harddrake2:191
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
+#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
 #, c-format
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: Xconfig/main.pm:177
+#: Xconfig/main.pm:167
+#, c-format
+msgid "Your Xorg configuration file is broken, we will ignore it."
+msgstr ""
+
+#: Xconfig/main.pm:184
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -478,42 +509,42 @@ msgid ""
 "%s"
 msgstr ""
 "Cadw'r newid?\n"
-"Y ffurfweddiad presenol yw:\n"
+"Y ffurfweddiad presennol yw:\n"
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Dewiswch fonitor ar gyfer #%d"
 
-#: Xconfig/monitor.pm:107
+#: Xconfig/monitor.pm:111
 #, c-format
 msgid "Choose a monitor"
 msgstr "Dewiswch fonitor"
 
-#: Xconfig/monitor.pm:113
+#: Xconfig/monitor.pm:117
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: Xconfig/monitor.pm:114 mouse.pm:49
+#: Xconfig/monitor.pm:118 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Generig"
 
-#: Xconfig/monitor.pm:115 standalone/drakconnect:569 standalone/harddrake2:73
-#: standalone/harddrake2:74
+#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
+#: standalone/harddrake2:83
 #, c-format
 msgid "Vendor"
 msgstr "Gwerthwr"
 
-#: Xconfig/monitor.pm:125
+#: Xconfig/monitor.pm:129
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
-msgstr "Methodd ymholiad Plug'nPlay. Dewiswch y dangosydd cywir"
+msgstr "Methodd ymholiad Plug'n Play. Dewiswch y dangosydd cywir"
 
-#: Xconfig/monitor.pm:130
+#: Xconfig/monitor.pm:134
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -528,7 +559,7 @@ msgid ""
 " If in doubt, choose a conservative setting."
 msgstr ""
 "Y ddau baramedr pwysig yw'r raddfa adnewyddu fertigol, sef y raddfa mae'r\n"
-"holl sgrîn yn cael ei adnewyddu, ac yn fwyaf pwysig y raddfa cydamseru\n"
+"holl sgrin yn cael ei adnewyddu, ac yn fwyaf pwysig y raddfa cydamseru\n"
 "llorweddol, sef y raddfa mae'r llinellau sganio'n cael eu dangos.\n"
 "\n"
 "Mae'n BWYSIG IAWN nad ydych yn enwi monitor gyda graddfa cydamseru\n"
@@ -536,12 +567,12 @@ msgstr ""
 "hynny.\n"
 "Os oes gennych amheuaeth, dewiswch raddfa is."
 
-#: Xconfig/monitor.pm:137
+#: Xconfig/monitor.pm:141
 #, c-format
 msgid "Horizontal refresh rate"
-msgstr "Graddfa adfywio llorweddol"
+msgstr "Graddfa adfywio lorweddol"
 
-#: Xconfig/monitor.pm:138
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Graddfa adfywio fertigol"
@@ -566,58 +597,60 @@ 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:130
+#: Xconfig/resolution_and_depth.pm:135
 #, c-format
 msgid "Resolutions"
 msgstr "Cyfraniadau"
 
-#: Xconfig/resolution_and_depth.pm:264
+#: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
 msgstr "Dewiswch y cydraniad a'r dyfnder lliw"
 
-#: Xconfig/resolution_and_depth.pm:265
+#: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Cerdyn graffeg: %s"
 
-#: Xconfig/resolution_and_depth.pm:278 interactive.pm:403
-#: interactive/gtk.pm:760 interactive/http.pm:103 interactive/http.pm:157
-#: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
+#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
+#: interactive/gtk.pm:766 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/drakbackup:3941 standalone/drakbackup:4001
-#: standalone/drakbackup:4045 standalone/drakconnect:165
-#: standalone/drakconnect:799 standalone/drakconnect:886
-#: standalone/drakconnect:985 standalone/drakups:194
-#: standalone/net_monitor:307 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1084
-#: ugtk2.pm:1107
+#: 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
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: Xconfig/resolution_and_depth.pm:278 any.pm:883 diskdrake/smbnfs_gtk.pm:81
-#: help.pm:197 help.pm:457 install_steps_gtk.pm:490
-#: install_steps_interactive.pm:775 interactive.pm:404 interactive/gtk.pm:764
-#: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
-#: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
-#: standalone/drakautoinst:217 standalone/drakbackup:3871
-#: standalone/drakbackup:3929 standalone/drakconnect:164
-#: standalone/drakconnect:884 standalone/drakconnect:984
-#: standalone/drakfont:663 standalone/drakfont:740 standalone/drakups:201
-#: standalone/logdrake:175 standalone/net_monitor:303 ugtk2.pm:407
-#: ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1084
+#: 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
+#: 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
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
-#: Xconfig/resolution_and_depth.pm:278 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:269 install_steps_gtk.pm:670 interactive.pm:498
-#: interactive/gtk.pm:624 interactive/gtk.pm:626 standalone/drakTermServ:304
-#: standalone/drakbackup:3867 standalone/drakbug:157
-#: standalone/drakconnect:160 standalone/drakconnect:239
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
-#: standalone/harddrake2:190 ugtk2.pm:1197 ugtk2.pm:1198
+#: 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
+#: 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
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
@@ -646,7 +679,7 @@ msgid ""
 msgstr ""
 "Digwyddodd gwall:\n"
 "%s\n"
-"Ceisiwch newid parammedrau"
+"Ceisiwch newid paramedrau"
 
 #: Xconfig/test.pm:133
 #, c-format
@@ -710,8 +743,8 @@ msgstr "Cydraniad: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "Gyrrwr XFree86: %s\n"
+msgid "Xorg driver: %s\n"
+msgstr "Gyrrwr Xorg: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -722,11 +755,11 @@ msgstr "Rhyngwyneb graffigol wrth gychwyn"
 #, c-format
 msgid ""
 "I can setup your computer to automatically start the graphical interface "
-"(XFree) upon booting.\n"
-"Would you like XFree to start when you reboot?"
+"(Xorg) upon booting.\n"
+"Would you like Xorg to start when you reboot?"
 msgstr ""
 "Hoffwn osod eich cyfrifiadur i gychwyn X yn awtomatig ar ôl cychwyn\n"
-"Hoffech chi i XFree ddechrau wedi i chi ail-gychwyn?"
+"Hoffech chi i Xorg ddechrau wedi i chi ail-gychwyn?"
 
 #: Xconfig/various.pm:87
 #, c-format
@@ -740,12 +773,12 @@ msgid ""
 "\n"
 "Do you have this feature?"
 msgstr ""
-"Mae'n edrych fel bod gan eich cerdyn graffig gyswlltTV-OUT.\n"
-"Mae modd ei ffurfweddu i weithio drwy byffer ffrâm.\n"
+"Mae'n edrych fel bod gan eich cerdyn graffig gyswllt TV-OUT.\n"
+"Mae modd ei ffurfweddu i weithio drwy fyffer ffrâm.\n"
 "\n"
 "Rhaid cysylltu eich cerdyn graffig â'ch teledu cyn cychwyn eich "
 "cyfrifiadur.\n"
-"Dewiswch  \"TVout\" yn y cychwynnwr\n"
+"Dewiswch  \"TV-OUT\" yn y cychwynnwr\n"
 "\n"
 "Ydy'r nodwedd hon gennych?"
 
@@ -754,20 +787,53 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Pa norm mae eich teledu'n ei ddefnyddio?"
 
-#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
-#: standalone/drakxtv:90 standalone/harddrake2:140
-#: standalone/service_harddrake:126
+#: 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
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: any.pm:103
+#: any.pm:116
 #, c-format
 msgid "Bootloader installation in progress"
-msgstr "Wrthi'n gosod bootloader"
+msgstr "Wrthi'n gosod cychwynnwr"
+
+#: any.pm:127
+#, c-format
+msgid ""
+"LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
+"the Volume ID of a Windows NT, 2000, or XP boot disk is a fatal Windows "
+"error.\n"
+"This caution does not apply to Windows 95 or 98, or to NT data disks.\n"
+"\n"
+"Assign a new Volume ID?"
+msgstr ""
+
+#: any.pm:138
+#, c-format
+msgid "Installation of bootloader failed. The following error occurred:"
+msgstr "Methodd gosod cychwynnwr. Digwyddodd y gwall canlynol:"
+
+#: any.pm:144
+#, 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"
+" reboot, hold down Command-Option-O-F at reboot and enter:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Then type: shut-down\n"
+"At your next boot you should see the bootloader prompt."
+msgstr ""
+"Efallai bydd angen i chi newid eich dyfais cychwyn Open Firmware\n"
+" i alluogi'r cychwynnwr. Os nad ydych yn gweld anogwr y\n"
+" cychwynnwr wrth ail gychwyn, gwasgwch Command-Option-O-F wrth ail\n"
+" gychwyn a theipiwch: setenv boot-device %s,\\\\:tbxi\n"
+" Yna teipiwch: shut-down\n"
+"Wrth gychwyn eto dylech weld anogwr y cychwynnwr."
 
-#: any.pm:142
+#: any.pm:181
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -777,280 +843,265 @@ msgid ""
 "On which drive are you booting?"
 msgstr ""
 "Rydych wedi penderfynu gosod y cychwynnwr ar raniad.\n"
-"Mae hyn yn awgrymu bod gennych gychwynnydd ar ddisg caled eisoes: (ee System "
+"Mae hyn yn awgrymu bod gennych gychwynnwr ar ddisg caled eisoes: (ee System "
 "Commander).\n"
 "\n"
 "Gyda pha ddisg ydych chi'n cychwyn?"
 
-#: any.pm:165 any.pm:197 help.pm:800
+#: any.pm:204 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Adran gyntaf o'r disg (MBR)"
 
-#: any.pm:166
+#: any.pm:205
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Adran gyntaf o'r rhaniad gwraidd"
 
-#: any.pm:168
+#: any.pm:207
 #, c-format
 msgid "On Floppy"
 msgstr "Ar Ddisg Meddal"
 
-#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
+#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
 #, c-format
 msgid "Skip"
 msgstr "Hepgor"
 
-#: any.pm:175
-#, c-format
-msgid "SILO Installation"
-msgstr "Gosodiad SILO"
-
-#: any.pm:175
+#: any.pm:213
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Gosodiad LILO/grub"
 
-#: any.pm:176
+#: any.pm:214
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Lle rydych chi eisiau gosod y cychwynnwr?"
 
-#: any.pm:197
-#, c-format
-msgid "First sector of boot partition"
-msgstr "Adran gyntaf o'r rhaniad cychwyn"
-
-#: any.pm:209
+#: any.pm:239 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Ffurfweddu'r Math o Gychwyn"
 
-#: any.pm:211 any.pm:248
+#: any.pm:241 any.pm:275
 #, c-format
 msgid "Bootloader main options"
 msgstr "Prif ddewisiadau Bootloader"
 
-#: any.pm:215
+#: any.pm:245
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Rhowch faint RAM mewn MB"
 
-#: any.pm:217
+#: any.pm:247
 #, 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:218 any.pm:531 install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
 #, c-format
 msgid "The passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
-#: any.pm:218 any.pm:531 diskdrake/interactive.pm:1262
-#: install_steps_interactive.pm:1150
+#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
+#: install_steps_interactive.pm:1215
 #, c-format
 msgid "Please try again"
 msgstr "Ceisiwch eto"
 
-#: any.pm:223 any.pm:251 help.pm:768
+#: any.pm:253 any.pm:278
 #, c-format
 msgid "Bootloader to use"
 msgstr "Bootloader ar waith"
 
-#: any.pm:225
-#, c-format
-msgid "Bootloader installation"
-msgstr "Gosodiad Bootloader"
-
-#: any.pm:227 any.pm:253 help.pm:768
+#: any.pm:255 any.pm:280
 #, c-format
 msgid "Boot device"
 msgstr "Dyfais cychwyn"
 
-#: any.pm:229
+#: any.pm:257
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Oedi cyn cychwyn y ddelwedd rhagosodedig"
 
-#: any.pm:230 help.pm:768
+#: any.pm:258
 #, c-format
 msgid "Enable ACPI"
 msgstr "Galluogi ACPI"
 
-#: any.pm:232 help.pm:768
+#: any.pm:260
 #, c-format
 msgid "Force no APIC"
 msgstr "Gorfodi dim APIC"
 
-#: any.pm:234
+#: any.pm:262
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Peidio Gorfodi APIC Lleol"
 
-#: any.pm:236 any.pm:558 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1155 network/netconnect.pm:574
-#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
-#: standalone/drakbackup:1626 standalone/drakbackup:3496
-#: standalone/drakups:278
+#: 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
 #, c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: any.pm:237 any.pm:559 install_steps_interactive.pm:1156
+#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
 #, c-format
 msgid "Password (again)"
 msgstr "Cyfrinair (eto)"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "Restrict command line options"
 msgstr "Cyfyngu dewisiadau llinell orchymyn"
 
-#: any.pm:238
+#: any.pm:266
 #, c-format
 msgid "restrict"
 msgstr "cyfyngu"
 
-#: any.pm:240
+#: any.pm:268
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Glanhau /tmp bob tro fyddwch yn cychwyn"
 
-#: any.pm:241
+#: any.pm:269
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Union faint o RAM os oes angen (canfod %dMB)"
 
-#: any.pm:243
-#, c-format
-msgid "Enable multiple profiles"
-msgstr "Galluogi aml-broffil"
-
-#: any.pm:252
+#: any.pm:279
 #, c-format
 msgid "Init Message"
 msgstr "Neges Init"
 
-#: any.pm:254
+#: any.pm:281
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Agor Oedi Cadarnwedd"
 
-#: any.pm:255
+#: any.pm:282
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Goramser cychwyn y cnewyllyn"
 
-#: any.pm:256
+#: any.pm:283
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Galluogi cychwyn o CD?"
 
-#: any.pm:257
+#: any.pm:284
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Galluogi Cychwyn OF?"
 
-#: any.pm:258
+#: any.pm:285
 #, c-format
 msgid "Default OS?"
 msgstr "System Weithredu Rhagosodedig?"
 
-#: any.pm:302
+#: any.pm:338
 #, c-format
 msgid "Image"
 msgstr "Delwedd"
 
-#: any.pm:303 any.pm:312
+#: any.pm:339 any.pm:349
 #, c-format
 msgid "Root"
 msgstr "Gwraidd"
 
-#: any.pm:304 any.pm:325
+#: any.pm:340 any.pm:362
 #, c-format
 msgid "Append"
 msgstr "Atodi"
 
-#: any.pm:306
+#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
 msgstr "Modd fideo"
 
-#: any.pm:308
+#: any.pm:344
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:317 any.pm:322 any.pm:324
+#: any.pm:345
+#, c-format
+msgid "Network profile"
+msgstr "Proffil rhwydwaith"
+
+#: any.pm:354 any.pm:359 any.pm:361
 #, c-format
 msgid "Label"
 msgstr "Label"
 
-#: any.pm:319 any.pm:329 harddrake/v4l.pm:275 standalone/drakfloppy:89
-#: standalone/drakfloppy:95
+#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: any.pm:326
+#: any.pm:363
 #, c-format
 msgid "Initrd-size"
 msgstr "Maint intrd"
 
-#: any.pm:328
+#: any.pm:365
 #, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: any.pm:339
+#: any.pm:376
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Nid yw label wag yn cael ei chaniatáu"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Rhaid enwi delwedd cnewyllyn"
 
-#: any.pm:340
+#: any.pm:377
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Rhaid pennu rhaniad gwraidd"
 
-#: any.pm:341
+#: any.pm:378
 #, c-format
 msgid "This label is already used"
 msgstr "Mae'r label hwn yn cael ei ddefnyddio eisoes"
 
-#: any.pm:354
+#: any.pm:392
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Pa fath o gofnod ydych chi eisiau ei ychwanegu?"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:355
+#: any.pm:393
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Systemau Gweithredu eraill (SunOS..)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Systemau Gweithredu Eraill (MacOS...)"
 
-#: any.pm:356
+#: any.pm:394
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Systemau Gweithredu Eraill (Windows...)"
 
-#: any.pm:384
+#: any.pm:422
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1059,74 +1110,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:516
+#: any.pm:572
 #, c-format
 msgid "access to X programs"
 msgstr "mynediad i raglenni  X"
 
-#: any.pm:517
+#: any.pm:573
 #, c-format
 msgid "access to rpm tools"
 msgstr "mynediad i offer rpm"
 
-#: any.pm:518
+#: any.pm:574
 #, c-format
 msgid "allow \"su\""
 msgstr "caniatáu \"su\""
 
-#: any.pm:519
+#: any.pm:575
 #, c-format
 msgid "access to administrative files"
 msgstr "mynediad i ffeiliau gweinyddol"
 
-#: any.pm:520
+#: any.pm:576
 #, c-format
 msgid "access to network tools"
 msgstr "mynediad i offer rhwydwaith"
 
-#: any.pm:521
+#: any.pm:577
 #, c-format
 msgid "access to compilation tools"
 msgstr "mynediad i offer crynhoad"
 
-#: any.pm:527
+#: any.pm:582
 #, c-format
 msgid "(already added %s)"
 msgstr "(wedi ychwanegu %s yn barod)"
 
-#: any.pm:532
+#: any.pm:587
 #, c-format
 msgid "This password is too simple"
 msgstr "Mae'r cyfrinair yn rhy syml"
 
-#: any.pm:533
+#: any.pm:588
 #, c-format
 msgid "Please give a user name"
 msgstr "Rhowch enw defnyddiwr"
 
-#: any.pm:534
+#: any.pm:589
 #, 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:535
+#: any.pm:590
 #, c-format
 msgid "The user name is too long"
 msgstr "Mae'r enw defnyddiwr yn rhy hir"
 
-#: any.pm:536
+#: any.pm:591
 #, c-format
 msgid "This user name has already been added"
 msgstr "Mae'r enw defnyddiwr wedi ei ychwanegu yn barod"
 
-#: any.pm:540
+#: any.pm:595
 #, c-format
 msgid "Add user"
 msgstr "Ychwanegu defnyddiwr"
 
-#: any.pm:541
+#: any.pm:596
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1135,73 +1186,77 @@ msgstr ""
 "Rhowch enw defnyddiwr\n"
 "%s"
 
-#: any.pm:544 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
-#: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544
-#: interactive/http.pm:152 printer/printerdrake.pm:165
-#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
-#: standalone/drakbackup:2708 standalone/scannerdrake:641
-#: standalone/scannerdrake:791
+#: any.pm:599 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
 #, c-format
 msgid "Done"
 msgstr "Gorffen"
 
-#: any.pm:545 help.pm:52
+#: any.pm:600 help.pm:51
 #, c-format
 msgid "Accept user"
 msgstr "Derbyn defnyddiwr"
 
-#: any.pm:556
+#: any.pm:611
 #, c-format
 msgid "Real name"
 msgstr "Enw cywir"
 
-#: any.pm:557 help.pm:52 printer/printerdrake.pm:1373
-#: printer/printerdrake.pm:1493
+#: any.pm:612 standalone/drakbackup:1642
 #, c-format
-msgid "User name"
-msgstr "Enw defnyddiwr"
+msgid "Login name"
+msgstr "Enw mewngofnodi"
 
-#: any.pm:560
+#: any.pm:615
 #, c-format
 msgid "Shell"
 msgstr "Cragen"
 
-#: any.pm:562
+#: any.pm:617
 #, c-format
 msgid "Icon"
 msgstr "Eicon"
 
-#: any.pm:603 security/l10n.pm:14
+#: any.pm:664 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Awtomewngofnodi"
 
-#: any.pm:604
+#: any.pm:665
 #, 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:605 help.pm:52
+#: any.pm:666 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Ydych chi eisiau defnyddio'r nodwedd?"
 
-#: any.pm:606
+#: any.pm:667
 #, c-format
 msgid "Choose the default user:"
 msgstr "Dewis y defnyddiwr rhagosodedig:"
 
-#: any.pm:607
+#: any.pm:668
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Dewiswch y rheolwr ffenestr i redeg:"
 
-#: any.pm:619
+#: any.pm:680
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Dewiswch iaith i'w defnyddio."
 
-#: any.pm:640
+#: any.pm:681
+#, fuzzy, c-format
+msgid "Language choice"
+msgstr "Dewis gyda llaw"
+
+#: any.pm:707
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1212,48 +1267,57 @@ 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:658 help.pm:660
+#: any.pm:725 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Defnyddio Unicode drwy ragosodiad"
 
-#: any.pm:659 help.pm:660
+#: any.pm:726 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Pob iaith"
 
-#: any.pm:698 help.pm:581 help.pm:991 install_steps_interactive.pm:895
+#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
 #, c-format
 msgid "Country / Region"
-msgstr "Gwlad"
+msgstr "Gwlad / Ardal"
 
-#: any.pm:699
+#: any.pm:766
 #, c-format
 msgid "Please choose your country."
 msgstr "Dewiswch eich gwlad."
 
-#: any.pm:701
+#: any.pm:768
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Dyma restr lawn o'r gwledydd sydd ar gael"
 
-#: any.pm:702 diskdrake/interactive.pm:297 help.pm:544 help.pm:581 help.pm:621
-#: help.pm:991 install_steps_interactive.pm:114
+#: any.pm:769
 #, c-format
-msgid "More"
-msgstr "Rhagor"
+msgid "Other Countries"
+msgstr "Gwledydd eraill"
+
+#: any.pm:777
+#, c-format
+msgid "Input method:"
+msgstr "Dull mewnbwn:"
+
+#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#, c-format
+msgid "None"
+msgstr "Dim"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "No sharing"
 msgstr "Peidio rhannu"
 
-#: any.pm:833
+#: any.pm:912
 #, c-format
 msgid "Allow all users"
 msgstr "Caniatáu pob defnyddiwr"
 
-#: any.pm:837
+#: any.pm:916
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1268,7 +1332,7 @@ msgstr ""
 "\n"
 "\"Addasu\" caniatáu cyfran i'r defnyddwyr.\n"
 
-#: any.pm:849
+#: any.pm:928
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -1277,7 +1341,7 @@ msgstr ""
 "NFS: system rhannu ffeiliau traddodiadol Unix, sydd â llai o gefnogaeth ar "
 "Mac a Windows."
 
-#: any.pm:852
+#: any.pm:931
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -1286,113 +1350,230 @@ msgstr ""
 "SMB: system rhannu ffeiliau sy'n cael ei ddefnyddio yn Windows, Mac OSX a "
 "nifer o systemau Linux diweddar."
 
-#: any.pm:860
+#: any.pm:939
 #, 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:883
+#: any.pm:964
 #, c-format
 msgid "Launch userdrake"
 msgstr "Cychwyn userdrake"
 
-#: any.pm:885
+#: 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
+#, c-format
+msgid "Close"
+msgstr "Cau"
+
+#: any.pm:966
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
 "You can use userdrake to add a user to this group."
 msgstr ""
-"Mae'r rhannu yn ôl defnyddiwr yn defnyddio grwp \"rhannu ffeiliau\" .\n"
-"Mae modd defnyddio userdrake i ychwanegu defnyddiwr i'r grwp. "
+"Mae'r rhannu yn ôl defnyddiwr yn defnyddio grŵp \"rhannu ffeiliau\" .\n"
+"Mae modd defnyddio userdrake i ychwanegu defnyddiwr i'r grŵp. "
 
-#: authentication.pm:12
+#: authentication.pm:16
 #, c-format
-msgid "Local files"
-msgstr "Ffeiliau lleol"
+msgid "Local file"
+msgstr "Ffeil leol"
 
-#: authentication.pm:12
+#: authentication.pm:17
 #, c-format
 msgid "LDAP"
 msgstr "LDAP"
 
-#: authentication.pm:12
+#: authentication.pm:18
 #, c-format
 msgid "NIS"
 msgstr "NIS"
 
-#: authentication.pm:12 authentication.pm:72
+#: authentication.pm:19 authentication.pm:127
 #, c-format
 msgid "Windows Domain"
 msgstr "Parth Windows"
 
-#: authentication.pm:12
+#: authentication.pm:20
 #, c-format
-msgid "Active Directory"
+msgid "Active Directory with SFU"
+msgstr "Cyfeiriadur byw gyda SFU"
+
+#: authentication.pm:21
+#, c-format
+msgid "Active Directory with Winbind"
+msgstr "Cyfeiriadur Byw gyda Winbind"
+
+#: authentication.pm:30
+#, c-format
+msgid "Local file:"
+msgstr "Ffeil leol:"
+
+#: authentication.pm:30
+#, 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
+#, c-format
+msgid "LDAP:"
+msgstr "LDAP:"
+
+#: authentication.pm:31
+#, 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."
+
+#: authentication.pm:32
+#, c-format
+msgid "NIS:"
+msgstr "NIS:"
+
+#: authentication.pm:32
+#, c-format
+msgid ""
+"Allows you to run a group of computers in the same Network Information "
+"Service domain with a common password and group file."
+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
+#, c-format
+msgid "Windows Domain:"
+msgstr "Parth Windows:"
+
+#: authentication.pm:33
+#, c-format
+msgid ""
+"Winbind allows the system to retrieve information and authenticate users in "
+"a Windows domain."
 msgstr ""
+"Mae Winbind yn caniatáu i'r system estyn gwybodaeth a dilysu defnyddwyr mewn "
+"parth Windows."
+
+#: authentication.pm:34
+#, c-format
+msgid "Active Directory with SFU:"
+msgstr "Cyfeiriadur Byw gyda SFU:"
+
+#: authentication.pm:34 authentication.pm:35
+#, c-format
+msgid ""
+"Kerberos is a secure system for providing network authentication services."
+msgstr ""
+"Mae Kerberos yn system ddiogel ar gyfer darparu gwasanaethau dilysu "
+"rhwydwaith."
+
+#: authentication.pm:35
+#, c-format
+msgid "Active Directory with Winbind:"
+msgstr "Cyfeiriadur Byw gyda Winbind:"
 
-#: authentication.pm:38
+#: authentication.pm:60
 #, c-format
 msgid "Authentication LDAP"
 msgstr "Dilysu LDAP"
 
-#: authentication.pm:39
+#: authentication.pm:61
 #, c-format
 msgid "LDAP Base dn"
 msgstr "Sail dn LDAP"
 
-#: authentication.pm:40
+#: authentication.pm:62 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "Gweinydd LDAP"
 
-#: authentication.pm:50
-#, fuzzy, c-format
+#: authentication.pm:75 fsedit.pm:21
+#, c-format
+msgid "simple"
+msgstr "syml"
+
+#: authentication.pm:76
+#, c-format
+msgid "TLS"
+msgstr "TLS"
+
+#: authentication.pm:77
+#, c-format
+msgid "SSL"
+msgstr "SSL"
+
+#: authentication.pm:78
+#, c-format
+msgid "security layout (SASL/Kerberos)"
+msgstr "trefn diogelwch (SASL/Kerberos)"
+
+#: authentication.pm:85 authentication.pm:123
+#, c-format
 msgid "Authentication Active Directory"
-msgstr "Dull dilysu"
+msgstr "Cyfeiriadur Byw Dilysu"
 
-#: authentication.pm:51 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Parth"
 
-#: authentication.pm:52 diskdrake/dav.pm:65 help.pm:137
+#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: printer/printerdrake.pm:135 share/compssUsers.pl:81
 #, c-format
 msgid "Server"
 msgstr "Gweinydd"
 
-#: authentication.pm:53
+#: authentication.pm:89
 #, c-format
 msgid "LDAP users database"
-msgstr ""
+msgstr "Cronfa ddata defnyddwyr LDAP"
+
+#: authentication.pm:90
+#, c-format
+msgid "Use Anonymous BIND "
+msgstr "Defnydd BIND anhysbys"
 
-#: authentication.pm:54
+#: authentication.pm:91
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
-msgstr ""
+msgstr "Defnyddiwr LDAP â chaniatâd i bori'r Cyfeiriadur Gweithredol"
 
-#: authentication.pm:55
-#, fuzzy, c-format
+#: authentication.pm:92
+#, c-format
 msgid "Password for user"
-msgstr "Mae angen cyfrinair"
+msgstr "Cyfrinair ar gyfer defnyddwyr"
 
-#: authentication.pm:62
+#: authentication.pm:93
+#, c-format
+msgid "Encryption"
+msgstr "Amgryptiad"
+
+#: authentication.pm:104
 #, c-format
 msgid "Authentication NIS"
 msgstr "Dilysu LDAP"
 
-#: authentication.pm:63
+#: authentication.pm:105
 #, c-format
 msgid "NIS Domain"
 msgstr "Parth NIS"
 
-#: authentication.pm:64
+#: authentication.pm:106
 #, c-format
 msgid "NIS Server"
 msgstr "Gweinydd NIS"
 
-#: authentication.pm:69
+#: authentication.pm:111
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1413,35 +1594,45 @@ msgstr ""
 "ailgychwyn y gweinydd.Bydd angen hefyd yr enw defnyddiwr/cyfrinair "
 "Gweinyddiaeth Parth i uno'r peiriant â'r parth Windows(NM).\n"
 "Os nad yw'r rhwydwaith wedi ei alluogi eto, bydd DrakX yn ceisio ymuno â'r "
-"parth ar ol y cam o gychwyn y rhwydwaith.\n"
+"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, "
 "rhedwch 'smbpasswd -j DOMAIN -U USER%%PASSWORD' gan ddefnyddio eich Parth "
 "Windows(NM), a'ch Enw Defnyddiwr Gweinyddol/Cyfrinair ar ôl cychwyn eich "
 "system.\n"
 "Bydd y gorchymyn 'wbinfo -t' yn gwirio a yw eich cyfrinachau dilysu'n addas."
 
-#: authentication.pm:71
+#: authentication.pm:123
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Dilysu Parth Windows"
 
-#: authentication.pm:73
+#: authentication.pm:128
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Enw Defnyddiwr Gweinyddiaeth Parth"
 
-#: authentication.pm:74
+#: authentication.pm:129
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Cyfrinair Gweinyddol y Parth"
 
-#: authentication.pm:149
+#: authentication.pm:130
+#, c-format
+msgid "Use Idmap for store UID/SID "
+msgstr "Defnyddio Idmap i storio UID/SID "
+
+#: authentication.pm:131
+#, c-format
+msgid "Default Idmap "
+msgstr "Idmap rhagosodedig"
+
+#: authentication.pm:231
 #, c-format
 msgid "Can't 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:532
+#: bootloader.pm:673
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1456,51 +1647,46 @@ msgstr ""
 "aros am y cychwyn rhagosodedig\n"
 "\n"
 
-#: bootloader.pm:663
-#, c-format
-msgid "SILO"
-msgstr "SILO"
-
-#: bootloader.pm:665 help.pm:768
+#: bootloader.pm:787
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "Lilo gyda dewislen graffigol"
 
-#: bootloader.pm:666 help.pm:768
+#: bootloader.pm:788
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO gyda dewislen testun"
 
-#: bootloader.pm:668
+#: bootloader.pm:789
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:670
+#: bootloader.pm:790
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1142
+#: bootloader.pm:852
 #, c-format
 msgid "not enough room in /boot"
 msgstr "dim digon o le yn /boot"
 
-#: bootloader.pm:1170
+#: bootloader.pm:1266
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Nid oes modd gosod y cychwynnwr ar raniad %s\n"
 
-#: bootloader.pm:1214
+#: bootloader.pm:1311
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr ""
 "Rhaid i ffurfweddiad eich cychwynnwr gael ei ddiweddaru am i'r rhaniadau "
-"gael eu ail rifo."
+"gael eu hail rifo."
 
-#: bootloader.pm:1221
+#: bootloader.pm:1326
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
@@ -1509,7 +1695,7 @@ msgstr ""
 "Methu gosod eich cychwynnwr yn iawn, Rhaid defnyddio achub cychwyn a dewis "
 "\"%s\""
 
-#: bootloader.pm:1222
+#: bootloader.pm:1327
 #, c-format
 msgid "Re-install Boot Loader"
 msgstr "Ail osod Cychwynnwr"
@@ -1569,76 +1755,79 @@ msgstr "kdesu ar goll"
 msgid "consolehelper missing"
 msgstr "consolehelper ar goll"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:240 network/adsl_consts.pm:44
-#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
-#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
-#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
-#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
-#: network/netconnect.pm:46
+#: 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:216
+#: crypto.pm:15 lang.pm:229
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:188 network/adsl_consts.pm:26
-#: network/adsl_consts.pm:36 network/netconnect.pm:49
+#: 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
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:221
+#: crypto.pm:17 crypto.pm:30 lang.pm:235
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:222 network/adsl_consts.pm:134
-#: network/adsl_consts.pm:142
+#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
+#: network/adsl_consts.pm:418
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:253
+#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:326
+#: crypto.pm:20 crypto.pm:33 lang.pm:340
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:355 network/adsl_consts.pm:240
+#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:325 network/adsl_consts.pm:178
-#: network/netconnect.pm:47
+#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
+#: network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:273 network/adsl_consts.pm:158
-#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:45
+#: 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
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:181 network/adsl_consts.pm:20
+#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
+#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:389 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
 
-#: diskdrake/dav.pm:19
+#: diskdrake/dav.pm:17
 #, c-format
 msgid ""
 "WebDAV is a protocol that allows you to mount a web server's directory\n"
@@ -1647,70 +1836,64 @@ msgid ""
 "points, select \"New\"."
 msgstr ""
 "Protocol yw WebDAV sy'n eich caniatáu i chi osod gweinydd gwe'n lleol\n"
-"a'i drin fel system ffeilio lleol ( ar yr amod bod y gweinydd lleol wedi ei\n"
+"a'i drin fel system ffeilio leol ( ar yr amod bod y gweinydd lleol wedi ei\n"
 "ffurfweddi fel gweinydd WebDAV). Os hoffech ychwanegu pwyntiau\n"
 "gosod WebDAV, dewiswch \"Newydd\""
 
-#: diskdrake/dav.pm:27
+#: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Newydd"
 
-#: diskdrake/dav.pm:63 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Dadosod"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:419 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Gosod"
 
-#: diskdrake/dav.pm:66 diskdrake/interactive.pm:413
-#: diskdrake/interactive.pm:621 diskdrake/interactive.pm:640
-#: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:79
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
+#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
 msgstr "Pwynt gosod"
 
-#: diskdrake/dav.pm:85
+#: diskdrake/dav.pm:83
 #, c-format
 msgid "Please enter the WebDAV server URL"
 msgstr "Rhowch URL gweinydd WebDAV"
 
-#: diskdrake/dav.pm:89
+#: diskdrake/dav.pm:87
 #, c-format
 msgid "The URL must begin with http:// or https://"
 msgstr "Rhaid i'r URL gychwyn gyda http:// neu https://"
 
-#: diskdrake/dav.pm:111
+#: diskdrake/dav.pm:109
 #, c-format
 msgid "Server: "
 msgstr "Gweinydd:"
 
-#: diskdrake/dav.pm:112 diskdrake/interactive.pm:474
-#: diskdrake/interactive.pm:1154 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
+#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
 #, c-format
 msgid "Mount point: "
 msgstr "Pwynt gosod:"
 
-#: diskdrake/dav.pm:113 diskdrake/interactive.pm:1240
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
 #, c-format
 msgid "Options: %s"
 msgstr "Dewisiadau: %s"
 
-#: diskdrake/hd_gtk.pm:96 diskdrake/interactive.pm:1000
-#: diskdrake/interactive.pm:1010 diskdrake/interactive.pm:1070
-#, c-format
-msgid "Read carefully!"
-msgstr "Darllenwch yn ofalus!"
-
-#: diskdrake/hd_gtk.pm:96
+#: diskdrake/hd_gtk.pm:95
 #, c-format
 msgid "Please make a backup of your data first"
 msgstr "Gwnewch gopi wrth gefn o'ch data yn gyntaf"
 
-#: diskdrake/hd_gtk.pm:99
+#: diskdrake/hd_gtk.pm:98
 #, c-format
 msgid ""
 "If you plan to use aboot, be careful to leave a free space (2048 sectors is "
@@ -1721,17 +1904,17 @@ msgstr ""
 "ddigon)\n"
 "ar ddechrau'r ddisg."
 
-#: diskdrake/hd_gtk.pm:156 help.pm:544
+#: diskdrake/hd_gtk.pm:155 help.pm:530
 #, c-format
 msgid "Wizard"
 msgstr "Dewin"
 
-#: diskdrake/hd_gtk.pm:189
+#: diskdrake/hd_gtk.pm:188
 #, c-format
 msgid "Choose action"
 msgstr "Dewiswch weithred"
 
-#: diskdrake/hd_gtk.pm:193
+#: diskdrake/hd_gtk.pm:192
 #, c-format
 msgid ""
 "You have one big Microsoft Windows partition.\n"
@@ -1742,217 +1925,223 @@ msgstr ""
 "Awgrymir eich bod yn newid maint y rhaniad\n"
 "(cliciwch arno, ac yna clicio \"Newid maint\"]"
 
-#: diskdrake/hd_gtk.pm:195
+#: diskdrake/hd_gtk.pm:194
 #, c-format
 msgid "Please click on a partition"
 msgstr "Cliciwch ar raniad"
 
-#: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:477
-#: standalone/drakbackup:2942 standalone/drakbackup:3004
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
+#: standalone/drakbackup:2938 standalone/drakbackup:2998
 #, c-format
 msgid "Details"
 msgstr "Manylion"
 
-#: diskdrake/hd_gtk.pm:255
+#: diskdrake/hd_gtk.pm:254
 #, c-format
 msgid "No hard drives found"
 msgstr "Heb ganfod gyrwyr caled"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Ext2"
 msgstr "Ext2"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Journalised FS"
 msgstr "Jwrnaleiddiwyd FS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Swap"
 msgstr "Swap"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:326
+#: diskdrake/hd_gtk.pm:325
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:329 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1582 standalone/drakperm:254
+#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
+#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "Arall"
 
-#: diskdrake/hd_gtk.pm:327 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
 #, c-format
 msgid "Empty"
 msgstr "Gwag"
 
-#: diskdrake/hd_gtk.pm:331
+#: diskdrake/hd_gtk.pm:330
 #, c-format
 msgid "Filesystem types:"
 msgstr "Mathau o system ffeiliau:"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:350 diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Defnyddiwch \"%s\" yn lle hynny"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/hd_gtk.pm:353
-#: diskdrake/interactive.pm:414 diskdrake/interactive.pm:574
-#: diskdrake/removable.pm:26 diskdrake/removable.pm:49
-#: standalone/harddrake2:72
+#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
+#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/removable.pm:25 diskdrake/removable.pm:48
+#: standalone/harddrake2:101
 #, c-format
 msgid "Type"
 msgstr "Math"
 
-#: diskdrake/hd_gtk.pm:348 diskdrake/interactive.pm:436
+#: 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:350 diskdrake/interactive.pm:423
-#: standalone/drakperm:124 standalone/printerdrake:236
+#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
+#: standalone/drakperm:124 standalone/printerdrake:242
 #, c-format
 msgid "Delete"
 msgstr "Dileu"
 
-#: diskdrake/hd_gtk.pm:353
+#: diskdrake/hd_gtk.pm:352
 #, c-format
 msgid "Use ``Unmount'' first"
-msgstr "Defnyddiwch \"Dad-osod\" yn gyntaf"
+msgstr "Defnyddiwch \"Dadosod\" yn gyntaf"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose another partition"
 msgstr "Dewiswch raniad arall"
 
-#: diskdrake/interactive.pm:184
+#: diskdrake/interactive.pm:187
 #, c-format
 msgid "Choose a partition"
 msgstr "Dewiswch raniad"
 
-#: diskdrake/interactive.pm:213
+#: diskdrake/interactive.pm:216
 #, c-format
 msgid "Exit"
 msgstr "Gadael"
 
-#: diskdrake/interactive.pm:246 help.pm:544
+#: diskdrake/interactive.pm:249 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Dadwneud"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to normal mode"
 msgstr "Arbenigwr > Cyffredinol"
 
-#: diskdrake/interactive.pm:246
+#: diskdrake/interactive.pm:249
 #, c-format
 msgid "Toggle to expert mode"
 msgstr "Cyffredinol > Arbenigwr"
 
-#: diskdrake/interactive.pm:265
+#: diskdrake/interactive.pm:268
 #, c-format
 msgid "Continue anyway?"
 msgstr "Parhau beth bynnag?"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without saving"
 msgstr "Gorffen heb gadw"
 
-#: diskdrake/interactive.pm:270
+#: diskdrake/interactive.pm:273
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Gorffen heb ysgrifennu'r tabl rhaniadau?"
 
-#: diskdrake/interactive.pm:275
+#: diskdrake/interactive.pm:278
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Ydych eisiau cadw newidiadau /etc/fstab"
 
-#: diskdrake/interactive.pm:282 install_steps_interactive.pm:301
+#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
 #, 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:295 help.pm:544
+#: diskdrake/interactive.pm:298 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Clirio i gyd"
 
-#: diskdrake/interactive.pm:296 help.pm:544
+#: diskdrake/interactive.pm:299 help.pm:530
 #, c-format
 msgid "Auto allocate"
 msgstr "Awto ddynodi"
 
-#: diskdrake/interactive.pm:302
+#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:124
+#, c-format
+msgid "More"
+msgstr "Rhagor"
+
+#: diskdrake/interactive.pm:305
 #, c-format
 msgid "Hard drive information"
-msgstr "Gwybodaeth am y ddisg caled"
+msgstr "Gwybodaeth am y ddisg galed"
 
-#: diskdrake/interactive.pm:334
+#: diskdrake/interactive.pm:337
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Mae pob rhaniad cynradd wedi ei ddefnyddio"
 
-#: diskdrake/interactive.pm:335
+#: diskdrake/interactive.pm:338
 #, c-format
 msgid "I can't add any more partitions"
-msgstr "Does dim modd ychwanegu raniadau ychwanegol"
+msgstr "Does dim modd ychwanegu rhaniadau ychwanegol"
 
-#: diskdrake/interactive.pm:336
+#: diskdrake/interactive.pm:339
 #, 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:347 help.pm:544
+#: diskdrake/interactive.pm:350 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Cadw'r tabl rhaniad"
 
-#: diskdrake/interactive.pm:348 help.pm:544
+#: diskdrake/interactive.pm:351 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Adfer y tabl rhaniad"
 
-#: diskdrake/interactive.pm:349 help.pm:544
+#: diskdrake/interactive.pm:352 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Achub y tabl rhaniadau"
 
-#: diskdrake/interactive.pm:351 help.pm:544
+#: diskdrake/interactive.pm:354 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Ail-lwytho'r tabl rhaniad"
 
-#: diskdrake/interactive.pm:353
+#: diskdrake/interactive.pm:356
 #, c-format
 msgid "Removable media automounting"
 msgstr "Cyfrwng symudadwy'n awto-osod"
 
-#: diskdrake/interactive.pm:362 diskdrake/interactive.pm:382
+#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
 #, c-format
 msgid "Select file"
 msgstr "Dewiswch ffeil"
 
-#: diskdrake/interactive.pm:369
+#: diskdrake/interactive.pm:372
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -1961,23 +2150,23 @@ msgstr ""
 "Nid yw'r tabl rhaniad wrth gefn yr un maint\n"
 "Parhau?"
 
-#: diskdrake/interactive.pm:383 harddrake/sound.pm:226 keyboard.pm:340
-#: network/netconnect.pm:450 network/netconnect.pm:469
-#: printer/printerdrake.pm:936 printer/printerdrake.pm:1891
-#: printer/printerdrake.pm:1953 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3149
-#: printer/printerdrake.pm:3426 printer/printerdrake.pm:3545
-#: printer/printerdrake.pm:4543 standalone/drakTermServ:340
-#: standalone/drakTermServ:1072 standalone/drakTermServ:1128
-#: standalone/drakTermServ:1801 standalone/drakbackup:510
-#: standalone/drakbackup:609 standalone/drakboot:156 standalone/drakclock:214
-#: standalone/drakconnect:921 standalone/drakfloppy:296 standalone/drakups:27
-#: standalone/scannerdrake:50 standalone/scannerdrake:913
+#: 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:384
+#: diskdrake/interactive.pm:387
 #, c-format
 msgid ""
 "Insert a floppy in drive\n"
@@ -1986,92 +2175,92 @@ 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:395
+#: diskdrake/interactive.pm:398
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "Yn ceisio achub y tabl rhaniadau"
 
-#: diskdrake/interactive.pm:401
+#: diskdrake/interactive.pm:404
 #, c-format
 msgid "Detailed information"
 msgstr "Gwybodaeth fanwl"
 
-#: diskdrake/interactive.pm:416 diskdrake/interactive.pm:711
+#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
 #, c-format
 msgid "Resize"
 msgstr "Newid maint"
 
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:779
+#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
 #, c-format
 msgid "Move"
 msgstr "Symud"
 
-#: diskdrake/interactive.pm:418
+#: diskdrake/interactive.pm:421
 #, c-format
 msgid "Format"
 msgstr "Fformatio"
 
-#: diskdrake/interactive.pm:420
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Add to RAID"
 msgstr "Ychwanegu i RAID"
 
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:424
 #, c-format
 msgid "Add to LVM"
 msgstr "Ychwanegu i LVM"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:427
 #, c-format
 msgid "Remove from RAID"
 msgstr "Tynnu o RAID"
 
-#: diskdrake/interactive.pm:425
+#: diskdrake/interactive.pm:428
 #, c-format
 msgid "Remove from LVM"
 msgstr "Tynnu o LVM"
 
-#: diskdrake/interactive.pm:426
+#: diskdrake/interactive.pm:429
 #, c-format
 msgid "Modify RAID"
 msgstr "Newid RAID"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:430
 #, c-format
 msgid "Use for loopback"
 msgstr "Defnyddiwch ar gyfer cylchol"
 
-#: diskdrake/interactive.pm:467
+#: diskdrake/interactive.pm:472
 #, c-format
 msgid "Create a new partition"
 msgstr "Creu rhaniad newydd"
 
-#: diskdrake/interactive.pm:470
+#: diskdrake/interactive.pm:475
 #, c-format
 msgid "Start sector: "
 msgstr "Sector dechreuol: "
 
-#: diskdrake/interactive.pm:472 diskdrake/interactive.pm:881
+#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
 #, c-format
 msgid "Size in MB: "
 msgstr "Maint mewn MB: "
 
-#: diskdrake/interactive.pm:473 diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
 #, c-format
 msgid "Filesystem type: "
 msgstr "Math o system ffeilio"
 
-#: diskdrake/interactive.pm:478
+#: diskdrake/interactive.pm:483
 #, c-format
 msgid "Preference: "
 msgstr "Dewis"
 
-#: diskdrake/interactive.pm:481
+#: diskdrake/interactive.pm:486
 #, c-format
 msgid "Logical volume name "
 msgstr "Enw cyfrol resymegol"
 
-#: diskdrake/interactive.pm:510
+#: diskdrake/interactive.pm:515
 #, c-format
 msgid ""
 "You can't create a new partition\n"
@@ -2082,44 +2271,44 @@ msgstr ""
 "(gan eich bod wedi cyrraedd y nifer uchaf o raniadau cynradd).\n"
 "Diddymwch raniad cynradd a chreu rhaniad estynedig."
 
-#: diskdrake/interactive.pm:540
+#: diskdrake/interactive.pm:545
 #, c-format
 msgid "Remove the loopback file?"
 msgstr "Tynnu'r ffeil gylchol?"
 
-#: diskdrake/interactive.pm:559
+#: diskdrake/interactive.pm:564
 #, 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:570
+#: diskdrake/interactive.pm:576
 #, c-format
 msgid "Change partition type"
 msgstr "Newid math y rhaniad"
 
-#: diskdrake/interactive.pm:571 diskdrake/removable.pm:48
+#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Pa fath o system ffeil  ydych chi eisiau?"
 
-#: diskdrake/interactive.pm:579
+#: diskdrake/interactive.pm:585
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Newid o ext2 i ext3"
 
-#: diskdrake/interactive.pm:608
+#: diskdrake/interactive.pm:614
 #, 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:609
+#: diskdrake/interactive.pm:615
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Lle'r ydych am osod dyfais %s?"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:620
 #, c-format
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
@@ -2129,202 +2318,197 @@ msgstr ""
 "gyfer cylch-ôl\n"
 "Tynnu'r cylch-ôl yn gyntaf"
 
-#: diskdrake/interactive.pm:639
+#: diskdrake/interactive.pm:645
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Lle'r ydych am osod %s?"
 
-#: diskdrake/interactive.pm:663 diskdrake/interactive.pm:743
-#: install_interactive.pm:156 install_interactive.pm:186
+#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "Newid maint"
 
-#: diskdrake/interactive.pm:663
+#: diskdrake/interactive.pm:669
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "Cyfrifo ffiniau system ffeiliau FAT"
 
-#: diskdrake/interactive.pm:699
+#: diskdrake/interactive.pm:705
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "Nid oes modd newid maint y rhaniad"
 
-#: diskdrake/interactive.pm:704
+#: diskdrake/interactive.pm:710
 #, 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:706
+#: diskdrake/interactive.pm:712
 #, 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:711
+#: diskdrake/interactive.pm:717
 #, c-format
 msgid "Choose the new size"
 msgstr "Dewiswch y maint newydd"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:718
 #, c-format
 msgid "New size in MB: "
 msgstr "Maint mewn MB: "
 
-#: diskdrake/interactive.pm:756 install_interactive.pm:194
+#: diskdrake/interactive.pm:761 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 siugrhau cywirdeb data'r rhaniad ar ôl ailfeintiol'r rhaniad(au),bydd \n"
+"I sicrhau cywirdeb data'r rhaniad ar ôl ailfeintiol'r rhaniad(au),bydd \n"
 "gwiriadau'r system ffeiliau'n cael eu gwneud wrth i chi ail gychwyn Windows "
 "(TM)"
 
-#: diskdrake/interactive.pm:780
+#: 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:781
+#: diskdrake/interactive.pm:785
 #, c-format
 msgid "Sector"
 msgstr "Sector"
 
-#: diskdrake/interactive.pm:782
+#: 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:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving"
 msgstr "Symud"
 
-#: diskdrake/interactive.pm:785
+#: diskdrake/interactive.pm:789
 #, c-format
 msgid "Moving partition..."
 msgstr "Yn symud rhaniad.."
 
-#: diskdrake/interactive.pm:807
+#: diskdrake/interactive.pm:810
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Dewis RAID presennol i ychwanegu ato"
 
-#: diskdrake/interactive.pm:808 diskdrake/interactive.pm:825
+#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
 #, c-format
 msgid "new"
 msgstr "newydd"
 
-#: diskdrake/interactive.pm:823
+#: diskdrake/interactive.pm:826
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Dewis LVM presennol i ychwanegu ato"
 
-#: diskdrake/interactive.pm:829
+#: diskdrake/interactive.pm:832
 #, c-format
 msgid "LVM name?"
 msgstr "Enw LVM"
 
-#: diskdrake/interactive.pm:866
+#: diskdrake/interactive.pm:869
 #, c-format
 msgid "This partition can't be used for loopback"
 msgstr "Nid oes modd defnyddio'r rhaniad ar gyfer cylchol"
 
-#: diskdrake/interactive.pm:879
+#: diskdrake/interactive.pm:882
 #, c-format
 msgid "Loopback"
-msgstr "Cylchol"
+msgstr "Cylch-ôl"
 
-#: diskdrake/interactive.pm:880
+#: diskdrake/interactive.pm:883
 #, c-format
 msgid "Loopback file name: "
 msgstr "Enw ffeil gylchol"
 
-#: diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:888
 #, c-format
 msgid "Give a file name"
 msgstr "Rhowch enw ffeil"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:891
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr ""
-"Mae'r ffeil yn cael ei ddefnyddio eisoes gam gylchol arall, dewiswch un arall"
+"Mae'r ffeil yn cael ei ddefnyddio eisoes gam cylchol arall, dewiswch un arall"
 
-#: diskdrake/interactive.pm:889
+#: diskdrake/interactive.pm:892
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Mae'r ffeil yn bodoli eisoes. Defnyddiwch hwn?"
 
-#: diskdrake/interactive.pm:912
+#: diskdrake/interactive.pm:915
 #, c-format
 msgid "Mount options"
 msgstr "Dewisiadau gosod"
 
-#: diskdrake/interactive.pm:919
+#: diskdrake/interactive.pm:922
 #, c-format
 msgid "Various"
 msgstr "Amrywiol"
 
-#: diskdrake/interactive.pm:983
+#: diskdrake/interactive.pm:987
 #, c-format
 msgid "device"
 msgstr "dyfais"
 
-#: diskdrake/interactive.pm:984
+#: diskdrake/interactive.pm:988
 #, c-format
 msgid "level"
 msgstr "lefel"
 
-#: diskdrake/interactive.pm:985
+#: diskdrake/interactive.pm:989
 #, c-format
-msgid "chunk size"
-msgstr "maint darn"
+msgid "chunk size in KiB"
+msgstr "Maint darn yn KiB"
 
-#: diskdrake/interactive.pm:1001
+#: diskdrake/interactive.pm:1006
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Byddwch ofalus: mae'r weithred hon yn beryglus."
 
-#: diskdrake/interactive.pm:1016
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Pa fath o raniad ?"
 
-#: diskdrake/interactive.pm:1032
-#, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Rhaid cael pecyn %s. Ydych chi am ei osod?"
-
-#: diskdrake/interactive.pm:1061
+#: diskdrake/interactive.pm:1059
 #, 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:1070
+#: diskdrake/interactive.pm:1068
 #, 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:1083
+#: diskdrake/interactive.pm:1081
 #, 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:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Symud ffeiliau i'r rhaniad newydd"
 
-#: diskdrake/interactive.pm:1100
+#: diskdrake/interactive.pm:1101
 #, c-format
 msgid "Hide files"
 msgstr "Cuddio ffeiliau"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1102
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2333,53 +2517,53 @@ msgstr ""
 "Mae cyfarwyddiadur %s eisoes yn cynnwys peth data\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1112
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Symud ffeiliau i'r rhaniad newydd"
 
-#: diskdrake/interactive.pm:1116
+#: diskdrake/interactive.pm:1117
 #, c-format
 msgid "Copying %s"
 msgstr "Copïo %s"
 
-#: diskdrake/interactive.pm:1120
+#: diskdrake/interactive.pm:1121
 #, c-format
 msgid "Removing %s"
 msgstr "Tynnu %s"
 
-#: diskdrake/interactive.pm:1134
+#: diskdrake/interactive.pm:1135
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "Mae rhaniad %s yn cael ei alw'n %s"
 
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
 #, c-format
 msgid "Device: "
 msgstr "Dyfais: "
 
-#: diskdrake/interactive.pm:1156
+#: diskdrake/interactive.pm:1157
 #, c-format
 msgid "Devfs name: "
 msgstr "Enw devfs:"
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1158
 #, c-format
 msgid "Volume label: "
-msgstr "Label y cyfrol:"
+msgstr "Label y gyfrol:"
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1159
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Llythyren disg DOS: %s (dim ond dyfalu)\n"
 
-#: diskdrake/interactive.pm:1162 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1236
+#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
+#: diskdrake/interactive.pm:1235
 #, c-format
 msgid "Type: "
 msgstr "Math: "
 
-#: diskdrake/interactive.pm:1166 install_steps_gtk.pm:341
+#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
 #, c-format
 msgid "Name: "
 msgstr "Enw : "
@@ -2426,8 +2610,8 @@ msgstr "Gosodwyd\n"
 
 #: diskdrake/interactive.pm:1184
 #, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+msgid "RAID %s\n"
+msgstr "RAID %s\n"
 
 #: diskdrake/interactive.pm:1186
 #, c-format
@@ -2454,8 +2638,8 @@ msgstr "Lefel %s\n"
 
 #: diskdrake/interactive.pm:1190
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Maint darn %s\n"
+msgid "Chunk size %d KiB\n"
+msgstr "Maint darn %d KiB\n"
 
 #: diskdrake/interactive.pm:1191
 #, c-format
@@ -2528,39 +2712,39 @@ msgstr "Tabl rhaniad math: %s\n"
 msgid "on channel %d id %d\n"
 msgstr "ar sianel %d id %d\n"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1256
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Allwedd amgryptio system ffeil : "
 
-#: diskdrake/interactive.pm:1258
+#: diskdrake/interactive.pm:1257
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Dewiswch eich allwedd amgryptio system ffeiliau"
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1260
 #, 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:1262
+#: diskdrake/interactive.pm:1261
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Nid yw'r allweddi amgryptio'n cyd-fynd"
 
-#: diskdrake/interactive.pm:1265 network/netconnect.pm:979
-#: standalone/drakconnect:404
+#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
+#: standalone/drakconnect:395
 #, c-format
 msgid "Encryption key"
 msgstr "Allwedd amgryptio"
 
-#: diskdrake/interactive.pm:1266
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Allwedd amgryptio (eto)"
 
-#: diskdrake/removable.pm:47
+#: diskdrake/removable.pm:46
 #, c-format
 msgid "Change type"
 msgstr "Newid y math"
@@ -2594,7 +2778,7 @@ msgstr ""
 "Rhowch eich enw defnyddiwr, cyfrinair ac enw parth i gael mynediad i'r "
 "gwesteiwr."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3495
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
 #, c-format
 msgid "Username"
 msgstr "Enw defnyddiwr"
@@ -2609,27 +2793,72 @@ msgstr "Chwiliwch am weinyddion"
 msgid "Search new servers"
 msgstr "Chwiliwch weinyddion newydd"
 
-#: do_pkgs.pm:21
+#: do_pkgs.pm:16 do_pkgs.pm:31
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Rhaid i becyn %s gael ei osod. Ydych chi am ei osod?"
 
-#: do_pkgs.pm:26
+#: do_pkgs.pm:21 do_pkgs.pm:36
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: do_pkgs.pm:143
+#: do_pkgs.pm:172
 #, c-format
 msgid "Installing packages..."
 msgstr "Gosod pecynnau..."
 
-#: do_pkgs.pm:217
+#: do_pkgs.pm:216
 #, c-format
 msgid "Removing packages..."
 msgstr "Tynnu pecyn..."
 
-#: fs.pm:416
+#: fs.pm:445 fs.pm:494
+#, c-format
+msgid "Mounting partition %s"
+msgstr "Yn fformatio rhaniad %s"
+
+#: fs.pm:446 fs.pm:495
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "methodd gosod rhaniad %s yng nghyfeiriadur %s"
+
+#: fs.pm:466 fs.pm:473
+#, c-format
+msgid "Checking %s"
+msgstr "Gwirio %s"
+
+#: fs.pm:511 partition_table.pm:387
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "gwall dadosod %s: %s"
+
+#: fs.pm:543
+#, c-format
+msgid "Enabling swap partition %s"
+msgstr "Galluogi rhaniad cyfnewid %s"
+
+#: fs/format.pm:39 fs/format.pm:46
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Yn fformatio rhaniad %s"
+
+#: fs/format.pm:43
+#, c-format
+msgid "Creating and formatting file %s"
+msgstr "Creu a fformatio ffeil %s"
+
+#: fs/format.pm:78
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Nid wyf yn gwybod sut i fformatio %s ym math %s"
+
+#: fs/format.pm:80
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "methodd  fformatio %s o %s"
+
+#: fs/mount_options.pm:112
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2639,7 +2868,7 @@ msgstr ""
 "(e.e. ar gyfer mynediad cynt ar y cylch newyddion i gyflymu gweinyddion "
 "newyddion)."
 
-#: fs.pm:419
+#: fs/mount_options.pm:115
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2648,13 +2877,13 @@ msgstr ""
 "Dim ond ei osod yn benodol (h.y.,\n"
 "bydd y dewis -a yn achosi i'r systrm gael ei osod)."
 
-#: fs.pm:422
+#: fs/mount_options.pm:118
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr ""
 "Peidio dehongli nod neu rwystro dyfeisiadau arbennig ar y system ffeil."
 
-#: fs.pm:424
+#: fs/mount_options.pm:120
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2666,7 +2895,7 @@ msgstr ""
 "systemau ffeiliau yn cynnwys deueiddiau fel pensaerniaeth gwahanol i'w un ei "
 "hun."
 
-#: fs.pm:428
+#: fs/mount_options.pm:124
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2677,17 +2906,17 @@ msgstr ""
 "i gymryd effaith. (Mae i weld yn ddiogel on mae braidd yn anniogel os\n"
 "yw uidperl(1) wedi ei osod.)"
 
-#: fs.pm:432
+#: fs/mount_options.pm:128
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Gosodwch y system ffeiliau fel darllen yn unig."
 
-#: fs.pm:434
+#: fs/mount_options.pm:130
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "Dylai pob I/O i'r system ffeil gael ei wneud yn gydamserol"
 
-#: fs.pm:438
+#: fs/mount_options.pm:134
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2706,65 +2935,25 @@ msgstr ""
 "dewis\n"
 "user,exec,dev,suid )."
 
-#: fs.pm:446
+#: fs/mount_options.pm:142
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Rhoi mynediad ysgrifennu i ddefnyddwyr cyffredin"
 
-#: fs.pm:448
+#: fs/mount_options.pm:144
 #, c-format
 msgid "Give read-only access to ordinary users"
 msgstr "Rhoi mynediad darllen yn unig i ddefnyddwyr cyffredin"
 
-#: fs.pm:588 fs.pm:598 fs.pm:602 fs.pm:606 fs.pm:610 fs.pm:614 swap.pm:12
-#, c-format
-msgid "%s formatting of %s failed"
-msgstr "methodd  fformatio %s o %s"
-
-#: fs.pm:655
-#, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "Nid wyf yn gwybod sut i fformatio %s ym math %s"
-
-#: fs.pm:662 fs.pm:669
-#, c-format
-msgid "Formatting partition %s"
-msgstr "Yn fformatio rhaniad %s"
-
-#: fs.pm:666
-#, c-format
-msgid "Creating and formatting file %s"
-msgstr "Creu a fformatio ffeil %s"
-
-#: fs.pm:726 fs.pm:775
-#, c-format
-msgid "Mounting partition %s"
-msgstr "Yn fformatio rhaniad %s"
-
-#: fs.pm:727 fs.pm:776
-#, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "methodd gosod rhaniad %s yng nghyfeiriadur %s"
-
-#: fs.pm:747 fs.pm:754
-#, c-format
-msgid "Checking %s"
-msgstr "Gwirio %s"
-
-#: fs.pm:792 partition_table.pm:639
+#: fs/type.pm:364
 #, c-format
-msgid "error unmounting %s: %s"
-msgstr "gwall dadosod %s: %s"
-
-#: fs.pm:824
-#, c-format
-msgid "Enabling swap partition %s"
-msgstr "Galluogi rhaniad cyfnewid %s"
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "Does dim modd defnyddio JFS ar raniadau llai na 16MB"
 
-#: fsedit.pm:21
+#: fs/type.pm:365
 #, c-format
-msgid "simple"
-msgstr "syml"
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "Does dim modd defnyddio ReiserFS ar gyfer rhaniadau llai na 32MB"
 
 #: fsedit.pm:25
 #, c-format
@@ -2776,7 +2965,7 @@ msgstr "gyda /usr"
 msgid "server"
 msgstr "Gweinydd"
 
-#: fsedit.pm:263
+#: fsedit.pm:168
 #, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2793,32 +2982,22 @@ msgstr ""
 "\n"
 "Ydych chi'n cytuno i golli'r holl raniadau?\n"
 
-#: fsedit.pm:524
-#, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "Does dim modd defnyddio JFS ar raniadau llai na 16MB"
-
-#: fsedit.pm:525
-#, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "Does dim modd defnyddio ReiserFS ar gyfer rhaniadau llai na 32MB"
-
-#: fsedit.pm:544
+#: fsedit.pm:385
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Rhaid i bwyntiau gosod gynnwys / arweiniol"
 
-#: fsedit.pm:545
+#: fsedit.pm:386
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Dylai enw'r pwyntiau gosod gynnwys llythrennau a  rhifau'n unig"
 
-#: fsedit.pm:546
+#: fsedit.pm:387
 #, 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:548
+#: fsedit.pm:389
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2829,12 +3008,12 @@ msgstr ""
 "Nid oes cychwynnwr yn gallu trin hwn heb rhaniad /boot\n"
 "Cofiwch ychwanegu rhaniad /boot"
 
-#: fsedit.pm:551
+#: fsedit.pm:392
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Does dim modd defnyddio Cyfrol Resymegol LVM ar gyfer pwynt gosod %s"
 
-#: fsedit.pm:553
+#: fsedit.pm:394
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -2845,7 +3024,7 @@ msgstr ""
 "Nid oes cychwynnwr yn gallu trin hwn heb rhaniad /boot\n"
 "Cofiwch ychwanegu rhaniad /boot"
 
-#: fsedit.pm:556
+#: fsedit.pm:397
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
@@ -2854,12 +3033,12 @@ msgstr ""
 "Efallai na fydd modd i chi osod lilo (gan nad yw lilo'n trin LV ar PV "
 "lluosog)"
 
-#: fsedit.pm:559 fsedit.pm:561
+#: fsedit.pm:400 fsedit.pm:402
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Dylai'r cyfeiriadur aros o fewn y system ffeilio gwraidd"
 
-#: fsedit.pm:563 fsedit.pm:565
+#: fsedit.pm:404 fsedit.pm:406
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2868,133 +3047,127 @@ msgstr ""
 "Mae angen gwir system ffeilio (ext2, reiserfs,  xfs, neu jfs)) ar gyfer y "
 "pwynt gosod\n"
 
-#: fsedit.pm:567
+#: fsedit.pm:408
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "Nid oes modd defnyddio Cyfrol Resymegol LVM ar gyfer pwynt gosod %s"
 
-#: fsedit.pm:628
+#: fsedit.pm:469
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Nid oes digon o le ar gyfer awto ddynodi"
 
-#: fsedit.pm:630
+#: fsedit.pm:471
 #, c-format
 msgid "Nothing to do"
 msgstr "Dim i'w wneud"
 
-#: fsedit.pm:726
+#: fsedit.pm:569
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Gwall wrth agos %s ar gyfer ysgrifennu %s"
 
-#: harddrake/data.pm:55
+#: harddrake/data.pm:61
 #, c-format
 msgid "Floppy"
 msgstr "Disg Meddal"
 
-#: harddrake/data.pm:65
+#: harddrake/data.pm:71
 #, c-format
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:75
+#: harddrake/data.pm:81
 #, c-format
 msgid "Disk"
 msgstr "Disg"
 
-#: harddrake/data.pm:84
+#: harddrake/data.pm:90
 #, c-format
 msgid "CDROM"
 msgstr "CDROM"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
 msgstr "Llosgwyr CD/DVD"
 
-#: harddrake/data.pm:104
+#: harddrake/data.pm:110
 #, c-format
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:114 standalone/drakbackup:2025
+#: harddrake/data.pm:120 standalone/drakbackup:2045
 #, c-format
 msgid "Tape"
 msgstr "Tâp"
 
-#: harddrake/data.pm:123
+#: harddrake/data.pm:129
 #, c-format
 msgid "Videocard"
 msgstr "Cerdyn fideo"
 
-#: harddrake/data.pm:133
+#: harddrake/data.pm:139
 #, c-format
 msgid "Tvcard"
 msgstr "Cerdyn Teledu"
 
-#: harddrake/data.pm:142
+#: harddrake/data.pm:148
 #, c-format
 msgid "Other MultiMedia devices"
 msgstr "Dyfeisiau aml-gyfrwng eraill"
 
-#: harddrake/data.pm:151
+#: harddrake/data.pm:157
 #, c-format
 msgid "Soundcard"
 msgstr "Cerdyn sain"
 
-#: harddrake/data.pm:160
+#: harddrake/data.pm:166
 #, c-format
 msgid "Webcam"
 msgstr "Camera Gwe"
 
-#: harddrake/data.pm:174
+#: harddrake/data.pm:181
 #, c-format
 msgid "Processors"
 msgstr "Prosesyddion"
 
-#: harddrake/data.pm:183
+#: harddrake/data.pm:191
 #, c-format
 msgid "ISDN adapters"
 msgstr "Addaswyr ISDN"
 
-#: harddrake/data.pm:192
+#: harddrake/data.pm:201
 #, c-format
 msgid "Ethernetcard"
 msgstr "Cerdyn Ethernet"
 
-#: harddrake/data.pm:208 network/netconnect.pm:464
+#: harddrake/data.pm:219 network/netconnect.pm:484
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:217
+#: harddrake/data.pm:229
 #, c-format
 msgid "ADSL adapters"
 msgstr "Addaswyr ADSL"
 
-#: harddrake/data.pm:230
+#: harddrake/data.pm:243
 #, c-format
 msgid "AGP controllers"
 msgstr "Rheolyddion AGP"
 
-#: harddrake/data.pm:239
+#: harddrake/data.pm:252
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Rheolyddion pontydd a system"
 
-#: harddrake/data.pm:248 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:927 printer/printerdrake.pm:687
-#: printer/printerdrake.pm:4175
+#: harddrake/data.pm:261 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
 #, c-format
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: harddrake/data.pm:257 help.pm:991 install_steps_interactive.pm:920
-#, c-format
-msgid "Mouse"
-msgstr "Llygoden"
-
 #: harddrake/data.pm:271
 #, c-format
 msgid "Joystick"
@@ -3017,50 +3190,72 @@ msgstr "Rheolyddion firewire"
 
 #: harddrake/data.pm:308
 #, c-format
+msgid "PCMCIA controllers"
+msgstr "Rheolyddion PCMCIA"
+
+#: harddrake/data.pm:321
+#, c-format
 msgid "SCSI controllers"
 msgstr "Rheolyddion SCSI"
 
-#: harddrake/data.pm:317
+#: harddrake/data.pm:330
 #, c-format
 msgid "USB controllers"
 msgstr "Rheolyddion USB"
 
-#: harddrake/data.pm:326
+#: harddrake/data.pm:339
 #, c-format
 msgid "USB ports"
 msgstr "Pyrth USB"
 
-#: harddrake/data.pm:335
+#: harddrake/data.pm:348
 #, c-format
 msgid "SMBus controllers"
 msgstr "Rheolyddion SMBus"
 
-#: harddrake/data.pm:344
+#: harddrake/data.pm:357
+#, 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
+#, c-format
+msgid "Keyboard"
+msgstr "Bysellfwrdd"
+
+#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#, c-format
+msgid "Mouse"
+msgstr "Llygoden"
+
+#: harddrake/data.pm:393
 #, c-format
 msgid "Scanner"
 msgstr "Sganiwr"
 
-#: harddrake/data.pm:354 standalone/harddrake2:336
+#: harddrake/data.pm:403 standalone/harddrake2:431
 #, c-format
 msgid "Unknown/Others"
 msgstr "Anhysbys/Eraill"
 
-#: harddrake/data.pm:374
+#: harddrake/data.pm:431
 #, c-format
 msgid "cpu # "
 msgstr "cpu # "
 
-#: harddrake/sound.pm:150 standalone/drakconnect:169
+#: harddrake/sound.pm:170 standalone/drakconnect:169
+#: standalone/drakconnect:613
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Arhoswch...Gosod y ffurfweddiad"
 
-#: harddrake/sound.pm:186
+#: harddrake/sound.pm:206
 #, c-format
 msgid "No alternative driver"
 msgstr "Dim gyrwyr eraill"
 
-#: harddrake/sound.pm:187
+#: harddrake/sound.pm:207
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3069,12 +3264,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:193
+#: harddrake/sound.pm:213
 #, c-format
 msgid "Sound configuration"
 msgstr "Ffurfweddiad sain"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:215
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3083,7 +3278,7 @@ msgstr ""
 "Yma gallwch ddewis gyrrwr arall (un ai OSS neu ALSA) ar gyfer eich cerdyn "
 "sain (%s)"
 
-#: harddrake/sound.pm:197
+#: harddrake/sound.pm:217
 #, c-format
 msgid ""
 "\n"
@@ -3096,7 +3291,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:199
+#: harddrake/sound.pm:219
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3131,24 +3326,24 @@ msgstr ""
 "- api ALSA newydd sy'n darparu llawer o nodweddion gell ond sydd angen "
 "defnyddio llyfrgell ALSA.\n"
 
-#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
+#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "Gyrrwr:"
 
-#: harddrake/sound.pm:218
+#: harddrake/sound.pm:238
 #, c-format
 msgid "Trouble shooting"
 msgstr "Datrys problemau"
 
-#: harddrake/sound.pm:226
+#: harddrake/sound.pm:246
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
 "\n"
 "It has been reported to oops the kernel on unloading.\n"
 "\n"
-"The new \"%s\" driver'll only be used on next bootstrap."
+"The new \"%s\" driver will only be used on next bootstrap."
 msgstr ""
 "Mae'r hen yrrwr \"%s\" wedi ei wahardd.\n"
 "\n"
@@ -3156,12 +3351,12 @@ msgstr ""
 "\n"
 "Bydd y gyrrwr \"%s|\"'n cael ei ddefnyddio ar y cychwyn"
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:254
 #, c-format
 msgid "No open source driver"
 msgstr "Dim gyrrwr cod agored"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:255
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3170,32 +3365,33 @@ msgstr ""
 "Nid oes gyrrwr rhydd ar gyfer eich cerdyn sain (%s) ond mae gyrrwr "
 "perchnogol yn \"%s\" ."
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:258
 #, c-format
 msgid "No known driver"
 msgstr "Dim gyrrwr hysbys"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:259
 #, 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:243
+#: harddrake/sound.pm:263
 #, c-format
 msgid "Unknown driver"
 msgstr "Gyrrwr anhysbys"
 
-#: harddrake/sound.pm:244
+#: harddrake/sound.pm:264
 #, 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:257
+#: harddrake/sound.pm:278
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Datrys problemau sain"
 
-#: harddrake/sound.pm:258
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:281
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3238,17 +3434,18 @@ msgstr ""
 "\n"
 "- \"/sbin/fuser -v /dev/dsp\" pa rhaglen sy'n defnyddio'r cerdyn sain.\n"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:307
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Dewis gyrrwr fy hun"
 
-#: harddrake/sound.pm:287
+#: harddrake/sound.pm:310
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Dewis gyrrwr ar hap"
 
-#: harddrake/sound.pm:288
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: harddrake/sound.pm:313
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3334,17 +3531,17 @@ msgstr "galluogi cynnal radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
-"terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
-"will reboot your computer."
+"covers the entire Mandrakelinux distribution. If you agree with all the\n"
+"terms it contains, check the \"%s\" box. If not, clicking on the \"%s\"\n"
+"button will reboot your computer."
 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"
 "ail gychwyn eich cyfrifiadur."
 
-#: help.pm:14 install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "Derbyn"
@@ -3352,42 +3549,41 @@ msgstr "Derbyn"
 #: help.pm:17
 #, c-format
 msgid ""
-"GNU/Linux is a multi-user system, meaning each user may have their own\n"
-"preferences, their own files and so on. You can read the ``Starter Guide''\n"
-"to learn more about multi-user systems. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point will not be\n"
-"authorized to change anything except their own files and their own\n"
-"configurations, protecting the system from unintentional or malicious\n"
-"changes that impact on the system as a whole. You will have to create at\n"
-"least one regular user for yourself -- this is the account which you should\n"
-"use for routine, day-to-day use. Although it is very easy to log in as\n"
-"\"root\" to do anything and everything, it may also be very dangerous! A\n"
-"very simple mistake could mean that your system will not work any more. If\n"
-"you make a serious mistake as a regular user, the worst that will happen is\n"
-"that you will lose some information, but not affect the entire system.\n"
+"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"
+"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"
+"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"
 "\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"
-"you typed in this field and copy it to the \"%s\" field, which is the name\n"
+"you type in this field and copy it to the \"%s\" one, which is the name\n"
 "this user will enter to log onto the system. If you like, you may override\n"
 "the default and change the user name. The next step is to enter a password.\n"
 "From a security point of view, a non-privileged (regular) user password is\n"
-"not as crucial as the \"root\" password, but that is no reason to neglect\n"
-"it by making it blank or too simple: after all, your files could be the\n"
-"ones at risk.\n"
+"not as crucial as the \"root\" password, but that's no reason to neglect it\n"
+"by making it blank or too simple: after all, your files could be the ones\n"
+"at risk.\n"
 "\n"
 "Once you click on \"%s\", you can add other users. Add a user for each one\n"
-"of your friends: your father or your sister, for example. Click \"%s\" when\n"
-"you have finished adding users.\n"
+"of your friends, your father, your sister, etc. Click \"%s\" when you're\n"
+"finished adding users.\n"
 "\n"
 "Clicking the \"%s\" button allows you to change the default \"shell\" for\n"
 "that user (bash by default).\n"
 "\n"
-"When you have finished adding users, you will be asked to choose a user who\n"
-"can automatically log into the system when the computer boots up. If you\n"
-"are interested in that feature (and do not care much about local security),\n"
-"choose the desired user and window manager, then click \"%s\". If you are\n"
-"not interested in this feature, uncheck the \"%s\" box."
+"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"
+"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 ""
 "Mae GNU/Linux yn system aml-ddefnyddiwr, ac mae hyn yn golygu bod pob\n"
 "defnyddiwr yn gallu cael ei ddewisiadau ei hun, ei ffeiliau ei hun ac yn y "
@@ -3435,23 +3631,28 @@ msgstr ""
 "a dim gwahaniaeth am ddiogelwch, dewiswch y defnyddiwr a rheolwr ffenestr\n"
 "a chlicio \"%s\". Os nad dad-diciwch blwch \"%s\" ."
 
-#: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
-#: install_steps_gtk.pm:277 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:271 network/tools.pm:166 printer/printerdrake.pm:3090
-#: standalone/drakTermServ:397 standalone/drakbackup:3920
-#: standalone/drakbackup:4014 standalone/drakbackup:4031
-#: standalone/drakbackup:4049 ugtk2.pm:510
+#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#, 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
 #, c-format
 msgid "Next"
 msgstr "Nesaf"
 
-#: help.pm:52 help.pm:418 help.pm:444 help.pm:660 help.pm:733 help.pm:768
+#: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
 #: interactive.pm:371
 #, c-format
 msgid "Advanced"
 msgstr "Uwch"
 
-#: help.pm:55
+#: help.pm:54
 #, c-format
 msgid ""
 "Listed here are the existing Linux partitions detected on your hard drive.\n"
@@ -3518,36 +3719,44 @@ msgstr ""
 "golygu\n"
 "\"ID SCSI ail isaf\", ag ati."
 
-#: help.pm:86
-#, c-format
+#: help.pm:85
+#, fuzzy, 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"
-"CD and ask you to insert the correct CD as required."
+"CD and ask you to insert the required one. If you do not have the requested\n"
+"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"
 "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."
 
-#: help.pm:91
-#, c-format
+#: help.pm:92
+#, fuzzy, c-format
 msgid ""
-"It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrakelinux, and\n"
-"to make it simpler to manage the packages have been placed into groups of\n"
-"similar applications.\n"
+"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"
+"simpler to manage, they have been placed into groups of similar\n"
+"applications.\n"
 "\n"
-"Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
-"mix and match applications from the various categories, so a\n"
-"``Workstation'' installation can still have applications from the\n"
-"``Development'' category installed.\n"
+"Mandrakelinux sorts package groups in four categories. You can mix and\n"
+"match applications from the various categories, so a ``Workstation''\n"
+"installation can still have applications from the ``Server'' category\n"
+"installed.\n"
 "\n"
 " * \"%s\": if you plan to use your machine as a workstation, select one or\n"
-"more of the groups that are in the workstation category.\n"
+"more of the groups in the workstation category.\n"
 "\n"
 " * \"%s\": if you plan on using your machine for programming, select the\n"
-"appropriate groups from that category.\n"
+"appropriate groups from that category. The special \"LSB\" group will\n"
+"configure your system so that it complies as much as possible with the\n"
+"Linux Standard Base specifications.\n"
+"\n"
+"   Selecting the \"LSB\" group will also install the \"2.4\" kernel series,\n"
+"instead of the default \"2.6\" one. This is to ensure 100%%-LSB compliance\n"
+"of the system. However, if you do not select the \"LSB\" group you will\n"
+"still have a system which is nearly 100%% LSB-compliant.\n"
 "\n"
 " * \"%s\": if your machine is intended to be a server, select which of the\n"
 "more common services you wish to install on your machine.\n"
@@ -3557,9 +3766,19 @@ msgid ""
 "interface available.\n"
 "\n"
 "Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you unselect all groups when performing a regular\n"
-"installation (as opposed to an upgrade), a dialog will pop up proposing\n"
-"different options for a minimal installation:\n"
+"text about that group.\n"
+"\n"
+"You can check the \"%s\" box, which is useful if you're familiar with the\n"
+"packages being offered or if you want to have total control over what will\n"
+"be installed.\n"
+"\n"
+"If you start the installation in \"%s\" mode, you can deselect all groups\n"
+"and prevent the installation of any new packages. This is useful for\n"
+"repairing or updating an existing system.\n"
+"\n"
+"If you deselect all groups when performing a regular installation (as\n"
+"opposed to an upgrade), a dialog will pop up suggesting different options\n"
+"for a minimal installation:\n"
 "\n"
 " * \"%s\": install the minimum number of packages possible to have a\n"
 "working graphical desktop.\n"
@@ -3569,16 +3788,8 @@ msgid ""
 "\n"
 " * \"%s\": will install the absolute minimum number of packages necessary\n"
 "to get a working Linux system. With this installation you will only have a\n"
-"command line interface. The total size of this installation is about 65\n"
-"megabytes.\n"
-"\n"
-"You can check the \"%s\" box, which is useful if you are familiar with the\n"
-"packages being offered or if you want to have total control over what will\n"
-"be installed.\n"
-"\n"
-"If you started the installation in \"%s\" mode, you can unselect all groups\n"
-"to avoid installing any new package. This is useful for repairing or\n"
-"updating an existing system."
+"command-line interface. The total size of this installation is about 65\n"
+"megabytes."
 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"
@@ -3631,82 +3842,82 @@ msgstr ""
 "\n"
 " "
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:23
 #, c-format
 msgid "Workstation"
 msgstr "Man Gwaith"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:64 share/compssUsers.pl:162
+#: share/compssUsers.pl:164
 #, c-format
 msgid "Development"
 msgstr "Datblygiad"
 
-#: help.pm:137
+#: help.pm:146 share/compssUsers.pl:144
 #, c-format
 msgid "Graphical Environment"
 msgstr "Amgylchedd Graffig"
 
-#: help.pm:137 install_steps_interactive.pm:552
+#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#, c-format
+msgid "Individual package selection"
+msgstr "Dewis pecynnau unigol."
+
+#: help.pm:146 help.pm:588
+#, c-format
+msgid "Upgrade"
+msgstr "Uwchraddio"
+
+#: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
 msgstr "Gyda X"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "With basic documentation"
 msgstr "Gyda dogfennaeth elfennol"
 
-#: help.pm:137
+#: help.pm:146
 #, c-format
 msgid "Truly minimal install"
 msgstr "Gosodiad lleiaf posibl"
 
-#: help.pm:137 install_steps_gtk.pm:272 install_steps_interactive.pm:598
-#, c-format
-msgid "Individual package selection"
-msgstr "Dewis pecynnau unigol."
-
-#: help.pm:137 help.pm:602
-#, c-format
-msgid "Upgrade"
-msgstr "Uwchraddio"
-
-#: help.pm:140
-#, c-format
+#: help.pm:149
+#, fuzzy, c-format
 msgid ""
-"If you told the installer that you wanted to individually select packages,\n"
-"it will present a tree containing all packages classified by groups and\n"
-"subgroups. While browsing the tree, you can select entire groups,\n"
-"subgroups, or individual packages.\n"
+"If you choose to install packages individually, the installer will present\n"
+"a tree containing all packages classified by groups and subgroups. While\n"
+"browsing the tree, you can select entire groups, subgroups, or individual\n"
+"packages.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right to let you know the purpose of the package.\n"
+"Whenever you select a package on the tree, a description will appear on the\n"
+"right to let you know the purpose of that package.\n"
 "\n"
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
-"you will be asked to confirm that you really want those servers to be\n"
+"you'll be asked to confirm that you really want those servers to be\n"
 "installed. By default Mandrakelinux will automatically start any installed\n"
 "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 that\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 do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default during boot. !!\n"
+"finalized. If you don't 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"
 "The \"%s\" option is used to disable the warning dialog which appears\n"
 "whenever the installer automatically selects a package to resolve a\n"
-"dependency issue. Some packages have relationships between each them such\n"
-"that installation of one package requires that some other program is also\n"
-"required to be installed. The installer can determine which packages are\n"
-"required to satisfy a dependency to successfully complete the installation.\n"
+"dependency issue. Some packages depend on others and the installation of\n"
+"one particular package may require the installation of another package. The\n"
+"installer can determine which packages are required to satisfy a dependency\n"
+"to successfully complete the installation.\n"
 "\n"
 "The tiny floppy disk icon at the bottom of the list allows you to load a\n"
 "package list created during a previous installation. This is useful if you\n"
 "have a number of machines that you wish to configure identically. Clicking\n"
-"on this icon will ask you to insert a floppy disk previously created at the\n"
-"end of another installation. See the second tip of last step on how to\n"
-"create such a floppy."
+"on this icon will ask you to insert the floppy disk created at the end of\n"
+"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"
@@ -3737,115 +3948,66 @@ msgstr ""
 "ddiwedd gosodiad arall. Gwelwch yr ail neges o'r cam diwethaf ar sut i\n"
 "greu disg meddal o'r fath."
 
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:411
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:225
-#: ugtk2.pm:1083 wizards.pm:156
+#: 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
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:411 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288
-#: standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307
-#: standalone/harddrake2:224 ugtk2.pm:1083 wizards.pm:156
+#: 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
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: help.pm:172
+#: help.pm:180
 #, c-format
 msgid "Automatic dependencies"
 msgstr "Dibyniaethau awtomatig"
 
-#: help.pm:175
-#, c-format
-msgid ""
-"You will now set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
-"this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
-"configure the network, or to do it later, in which case clicking the \"%s\"\n"
-"button will take you to the next step.\n"
-"\n"
-"When configuring your network, the available connections options are:\n"
-"Normal modem connection, Winmodem connection, ISDN modem, ADSL connection,\n"
-"cable modem, and finally a simple LAN connection (Ethernet).\n"
-"\n"
-"We will not detail each configuration option - just make sure that you have\n"
-"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
-"from your Internet Service Provider or system administrator.\n"
-"\n"
-"About Winmodem Connection. Winmodems are special integrated low-end modems\n"
-"that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrakelinux, some others do not. You\n"
-"can consult the list of supported modems at LinModems.\n"
-"\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection."
-msgstr ""
-"Dyma eich cyfle i gysylltu gyda'r rhyngrwyd/rhwydwaith.Os hoffech chi\n"
-"gysylltu eich cyfrifiadur i'r Rhyngrwyd neu i rwydwaith lleol, cliciwch\n"
-"\"%s\" . Bydd Mandrakelinux yn awtoganfod dyfeisiau rhwydwaith\n"
-"a modem. Os yw'r canfod yn methu, dad-diciwch y blwch \"%s\"\n"
-"y tro nesaf. Mae gennych y dewis i beidio ffurfweddi eich rhwydwaith,\n"
-" neu i'w wneud rhywbryd eto. Os fell, cliciwch y botwm  \"%s\".\n"
-"\n"
-"Cysylltiadau posib: modem traddodiadol,modem IDSN, cyswllt ADSL,\n"
-"modem cable ac yn olaf cyswllt LAN syml (Ethernet).\n"
-"\n"
-"Byddwn ni ddim yn mynd i fanylion y ffurfweddiad yma. Gwnewch yn siwr\n"
-"fod gennych yr holl fanylion gan eich darparwr gwasanaeth rhyngrwyd (ISP)\n"
-"neu weinyddwr system\n"
-"\n"
-"Mae modd i chi edrych ar bennawd yn y \"Starter Guide\" ar gyswllt a'r\n"
-"Rhyngrwyd am fanylion ffurfweddiad, neu aros nes i'ch system gael ei\n"
-"osod a defnyddio'r rhaglen sydd yno i ffurfweddu eich cyswllt."
-
-#: help.pm:197
-#, c-format
-msgid "Use auto detection"
-msgstr "Defnyddio awto ganfod"
-
-#: help.pm:200
-#, c-format
+#: help.pm:183
+#, fuzzy, 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"
-"information on how to setup a new printer. The interface presented there is\n"
-"similar to the one used during installation."
+"information on how to set up a new printer. The interface presented in our\n"
+"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"
 "yn debyg i'r un welwyd wrth osod y system."
 
-#: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:648
-#: standalone/drakbackup:2313 standalone/drakbackup:2321
-#: standalone/drakbackup:2329 standalone/drakbackup:2337
+#: 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
 #, c-format
 msgid "Configure"
 msgstr "Ffurfweddu"
 
-#: help.pm:206
-#, c-format
+#: help.pm:189
+#, fuzzy, c-format
 msgid ""
-"This dialog is used to choose which services you wish to start at boot\n"
+"This dialog is used to select which services you wish to start at boot\n"
 "time.\n"
 "\n"
-"DrakX will list all the services available on the current installation.\n"
-"Review each one carefully and uncheck those which are not needed at boot\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"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
-"selected. However, if you are not sure whether a service is useful or not,\n"
+"selected. However, if you're not sure whether a service is useful or not,\n"
 "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 will probably not want to start any services that you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
+"server: you probably don't want to start any services which you don't 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 ""
 "Dewiswch pa wasanaethau rydych am eu cael wrth gychwyn eich cyfrifiadur.\n"
 "\n"
@@ -3867,21 +4029,21 @@ msgstr ""
 "cael.\n"
 "!!"
 
-#: help.pm:224
-#, c-format
+#: help.pm:206
+#, fuzzy, 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"
 "motherboard is set to local time, you may deactivate this by unselecting\n"
 "\"%s\", which will let GNU/Linux know that the system clock and the\n"
 "hardware clock are in the same time zone. This is useful when the machine\n"
-"also hosts another operating system like Windows.\n"
+"also hosts another operating system.\n"
 "\n"
-"The \"%s\" option will automatically regulate the clock by connecting to a\n"
-"remote time server on the Internet. For this feature to work, you must have\n"
-"a working Internet connection. It is best to choose a time server located\n"
-"near you. This option actually installs a time server that can be used by\n"
-"other machines on your local network as well."
+"The \"%s\" option will automatically regulate the system clock by\n"
+"connecting to a remote time server on the Internet. For this feature to\n"
+"work, you must have a working Internet connection. We recommend that you\n"
+"choose a time server located near you. This option actually installs a time\n"
+"server which can be used by other machines on your local network as well."
 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"
@@ -3897,27 +4059,27 @@ msgstr ""
 "o ddewis yn medru cael ei ddefnyddio gan beiriannau eraill ar eich "
 "rhwydwaith."
 
-#: help.pm:235 install_steps_interactive.pm:822
+#: help.pm:217 install_steps_interactive.pm:887
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "Cloc caledwedd wedi ei osod i GMT"
 
-#: help.pm:235
+#: help.pm:217
 #, c-format
 msgid "Automatic time synchronization"
 msgstr "Cydweddi amser awtomatig"
 
-#: help.pm:238
+#: help.pm:220
 #, c-format
 msgid ""
 "Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs."
 msgstr ""
 "Cerdyn Greaffig\n"
@@ -3930,39 +4092,41 @@ msgstr ""
 "neu heb gyflymydd 3D, mae cynnig i chi ddewis y gweinydd gorau\n"
 "ar eich cyfer."
 
-#: help.pm:249
-#, c-format
+#: help.pm:231
+#, fuzzy, 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"
 "WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
-"You will be presented with a list of different parameters to change to get\n"
-"an optimal graphical display: Graphic Card\n"
+"You'll see a list of different parameters to change to get an optimal\n"
+"graphical display.\n"
+"\n"
+"Graphic Card\n"
 "\n"
 "   The installer will normally automatically detect and configure the\n"
-"graphic card installed on your machine. If it is not the case, you can\n"
+"graphic card installed on your machine. If this is not correct, you can\n"
 "choose from this list the card you actually have installed.\n"
 "\n"
 "   In the situation where different servers are available for your card,\n"
-"with or without 3D acceleration, you are asked to choose the server that\n"
+"with or without 3D acceleration, you're asked to choose the server which\n"
 "best suits your needs.\n"
 "\n"
 "\n"
 "\n"
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer.\n"
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer.\n"
 "\n"
 "\n"
 "\n"
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture.\n"
 "\n"
 "\n"
@@ -3971,21 +4135,21 @@ msgid ""
 "\n"
 "   Depending on your hardware, this entry might not appear.\n"
 "\n"
-"   the system will try to open a graphical screen at the desired\n"
-"resolution. If you can see the message during the test and answer \"%s\",\n"
-"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"   The system will try to open a graphical screen at the desired\n"
+"resolution. If you see the test message during the test and answer \"%s\",\n"
+"then DrakX will proceed to the next step. If you do not see it, then it\n"
 "means that some part of the auto-detected configuration was incorrect and\n"
-"the test will automatically end after 12 seconds, bringing you back to the\n"
+"the test will automatically end after 12 seconds and return you to the\n"
 "menu. Change settings until you get a correct graphical display.\n"
 "\n"
 "\n"
 "\n"
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "X (sef X Window System) yw calon rhyngwyneb graffigol GNU/Linux a'r\n"
 "hyn mae'r holl amgylcheddau graffigol (KDE, Gnome, AterStep,\n"
@@ -4039,14 +4203,14 @@ msgstr ""
 "os yw eich peiriant i weithredu fel gweinydd, neu os na fuoch yn\n"
 "llwyddiannus yn ffurfweddu'r dangosydd."
 
-#: help.pm:304
+#: help.pm:288
 #, c-format
 msgid ""
 "Monitor\n"
 "\n"
-"   The installer will normally automatically detect and configure the\n"
-"monitor connected to your machine. If it is incorrect, you can choose from\n"
-"this list the monitor you actually have connected to your computer."
+"   Normally the installer will automatically detect and configure the\n"
+"monitor connected to your machine. If it is not correct, you can choose\n"
+"from this list the monitor which is connected to your computer."
 msgstr ""
 "Dangosydd\n"
 "\n"
@@ -4054,14 +4218,14 @@ msgstr ""
 "y dangosydd sy'n gysylltiedig â'ch cyfrifiadur. Os nad yw hyn yn wir,\n"
 "dewiswch eich dangosydd o'r rhestr."
 
-#: help.pm:311
+#: help.pm:295
 #, c-format
 msgid ""
 "Resolution\n"
 "\n"
 "   Here you can choose the resolutions and color depths available for your\n"
-"hardware. Choose the one that best suits your needs (you will be able to\n"
-"change that after installation though). A sample of the chosen\n"
+"graphics hardware. Choose the one which best suits your needs (you will be\n"
+"able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture."
 msgstr ""
 "Cydraniad\n"
@@ -4071,26 +4235,26 @@ msgstr ""
 "modd newid hynny wedi'r gosod) Mae enghraifft o ffurfweddiad i'w weld\n"
 "ar y dangosydd."
 
-#: help.pm:319
-#, c-format
+#: help.pm:303
+#, fuzzy, c-format
 msgid ""
 "In the situation where different servers are available for your card, with\n"
-"or without 3D acceleration, you are asked to choose the server that best\n"
+"or without 3D acceleration, you're asked to choose the server which best\n"
 "suits your needs."
 msgstr ""
 "Mewn achos lle mae gweinyddion eraill i'w cael i'ch cerdyn, gyda\n"
 "neu heb gyflymydd 3D, mae cynnig i chi ddewis y gweinydd gorau\n"
 "ar eich cyfer."
 
-#: help.pm:324
-#, c-format
+#: help.pm:308
+#, fuzzy, c-format
 msgid ""
 "Options\n"
 "\n"
-"   Here you can choose whether you want to have your machine automatically\n"
-"switch to a graphical interface at boot. Obviously, you want to check\n"
-"\"%s\" if your machine is to act as a server, or if you were not successful\n"
-"in getting the display configured."
+"   This steps allows you to choose whether you want your machine to\n"
+"automatically switch to a graphical interface at boot. Obviously, you may\n"
+"want to check \"%s\" if your machine is to act as a server, or if you were\n"
+"not successful in getting the display configured."
 msgstr ""
 "Dewisiadau\n"
 "\n"
@@ -4099,62 +4263,63 @@ msgstr ""
 "eich peiriant i weithredu fel gweinydd, neu os nad oeddech yn\n"
 "llwyddiannus yn cael eich dangosydd i ffurfweddu'n gywir."
 
-#: help.pm:332
-#, c-format
+#: help.pm:316
+#, fuzzy, c-format
 msgid ""
-"At this point, you need to decide where you want to install the Mandrake\n"
-"Linux operating system on your hard drive. If your hard drive is empty or\n"
-"if an existing operating system is using all the available space you will\n"
-"have to partition the drive. Basically, partitioning a hard drive consists\n"
-"of logically dividing it to create the space needed to install your new\n"
+"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"
+"existing operating system is using all the available space you will have to\n"
+"partition the drive. Basically, partitioning a hard drive means to\n"
+"logically divide it to create the space needed to install your new\n"
 "Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
-"and can lead to lost data if there is an existing operating system already\n"
-"installed on the drive, partitioning can be intimidating and stressful if\n"
-"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"and can lead to data losses, partitioning can be intimidating and stressful\n"
+"for the inexperienced user. Fortunately, DrakX includes a wizard which\n"
 "simplifies this process. Before continuing with this step, read through the\n"
 "rest of this section and above all, take your time.\n"
 "\n"
-"Depending on your hard drive configuration, several options are available:\n"
+"Depending on the configuration of your hard drive, several options are\n"
+"available:\n"
 "\n"
-" * \"%s\": this option will perform an automatic partitioning of your blank\n"
+" * \"%s\". This option will perform an automatic partitioning of your blank\n"
 "drive(s). If you use this option there will be no further prompts.\n"
 "\n"
-" * \"%s\": the wizard has detected one or more existing Linux partitions on\n"
+" * \"%s\". The wizard has detected one or more existing Linux partitions on\n"
 "your hard drive. If you want to use them, choose this option. You will then\n"
 "be asked to choose the mount points associated with each of the partitions.\n"
 "The legacy mount points are selected by default, and for the most part it's\n"
 "a good idea to keep them.\n"
 "\n"
-" * \"%s\": if Microsoft Windows is installed on your hard drive and takes\n"
+" * \"%s\". If Microsoft Windows is installed on your hard drive and takes\n"
 "all the space available on it, you will have to create free space for\n"
 "GNU/Linux. To do so, you can delete your Microsoft Windows partition and\n"
 "data (see ``Erase entire disk'' solution) or resize your Microsoft Windows\n"
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
-"data, provided you have previously defragmented the Windows partition.\n"
-"Backing up your data is strongly recommended.. Using this option is\n"
+"data, provided you've previously defragmented the Windows partition.\n"
+"Backing up your data is strongly recommended. Using this option is\n"
 "recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
 "procedure, the size of your Microsoft Windows partition will be smaller\n"
-"then when you started. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software.\n"
+"than when you started. You'll have less free space under Microsoft Windows\n"
+"to store your data or to install new software.\n"
 "\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,\n"
-"choose this option. Be careful, because you will not be able to undo your\n"
-"choice after you confirm.\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"
+"after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"%s\": this will simply erase everything on the drive and begin fresh,\n"
-"partitioning everything from scratch. All data on your disk will be lost.\n"
+" * \"%s\". This option appears when the hard drive is entirely taken by\n"
+"Microsoft Windows. Choosing this option will simply erase everything on the\n"
+"drive and begin fresh, partitioning everything from scratch.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-" * \"%s\": choose this option if you want to manually partition your hard\n"
+" * \"%s\". Choose this option if you want to manually partition your hard\n"
 "drive. Be careful -- it is a powerful but dangerous choice and you can very\n"
 "easily lose all your data. That's why this option is really only\n"
 "recommended if you have done something like this before and have some\n"
@@ -4223,52 +4388,53 @@ msgstr ""
 "ydych yn ei wneud.. Am rhagor o wybodaeth ar sut i ddefnyddio DiskDrake, \n"
 "darllennwch adran \"Managing your Partitions\" yn y \"Starter Guide\"."
 
-#: help.pm:389 install_interactive.pm:95
+#: help.pm:374 install_interactive.pm:95
 #, c-format
 msgid "Use free space"
 msgstr "Defnyddiwch le gwag"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Use existing partition"
 msgstr "Defnyddiwch y rhaniadau presennol"
 
-#: help.pm:389 install_interactive.pm:137
+#: help.pm:374 install_interactive.pm:137
 #, c-format
 msgid "Use the free space on the Windows partition"
 msgstr "Defnyddiwch y lle gwag ar raniad Windows"
 
-#: help.pm:389 install_interactive.pm:211
+#: help.pm:374 install_interactive.pm:213
 #, c-format
 msgid "Erase entire disk"
 msgstr "Dileu'r ddisg gyfan"
 
-#: help.pm:389
+#: help.pm:374
 #, c-format
 msgid "Remove Windows"
 msgstr "Tynnu Windows"
 
-#: help.pm:389 install_interactive.pm:226
+#: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
 msgstr "Rhannu disg unigol"
 
-#: help.pm:392
-#, c-format
+#: help.pm:377
+#, fuzzy, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to use. Just click \"%s\" to reboot the system. Don't forget to\n"
-"remove the installation media (CD-ROM or floppy). The first thing you\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Don't 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"
-"bootloader menu, giving you the choice of which operating system to start.\n"
+"boot-loader menu, giving you the choice of which operating system to start.\n"
 "\n"
 "The \"%s\" button shows two more buttons to:\n"
 "\n"
-" * \"%s\": to create an installation floppy disk that will automatically\n"
-"perform a whole installation without the help of an operator, similar to\n"
-"the installation you just configured.\n"
+" * \"%s\": enables you to create an installation floppy disk which will\n"
+"automatically perform a whole installation without the help of an operator,\n"
+"similar to the installation you've just configured.\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"   Note that two different options are available after clicking on that\n"
+"button:\n"
 "\n"
 "    * \"%s\". This is a partially automated installation. The partitioning\n"
 "step is the only interactive procedure.\n"
@@ -4276,13 +4442,18 @@ msgid ""
 "    * \"%s\". Fully automated installation: the hard disk is completely\n"
 "rewritten, all data is lost.\n"
 "\n"
-"   This feature is very handy when installing a number of similar machines.\n"
-"See the Auto install section on our web site for more information.\n"
+"   This feature is very handy when installing on a number of similar\n"
+"machines. See the Auto install section on our web site for more\n"
+"information.\n"
+"\n"
+" * \"%s\"(*): saves a list of the packages selected in this installation.\n"
+"To use this selection with another installation, insert the floppy and\n"
+"start the installation. At the prompt, press the [F1] key, type >>linux\n"
+"defcfg=\"floppy\"<< and press the [Enter] key.\n"
 "\n"
-" * \"%s\": saves a list of the packages selected in this installation. To\n"
-"use this selection with another installation, insert the floppy and start\n"
-"the installation. At the prompt, press the [F1] key and type >>linux\n"
-"defcfg=\"floppy\" <<."
+"(*) You need a FAT-formatted floppy. To create one under GNU/Linux, type\n"
+"\"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"
@@ -4315,52 +4486,48 @@ msgstr ""
 "(*) Bydd angen disg meddal wedi ei fformatio fel FAT (i greu un yn\n"
 "GNU/Linux, teipiwch \"mformat a:\")"
 
-#: help.pm:418
+#: help.pm:409
 #, c-format
 msgid "Generate auto-install floppy"
 msgstr "Creu disg meddal awto gosod"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Replay"
 msgstr "Ail chwarae"
 
-#: help.pm:418 install_steps_interactive.pm:1316
+#: help.pm:409 install_steps_interactive.pm:1363
 #, c-format
 msgid "Automated"
 msgstr "Awtomeiddwyd"
 
-#: help.pm:418 install_steps_interactive.pm:1319
+#: help.pm:409 install_steps_interactive.pm:1366
 #, c-format
 msgid "Save packages selection"
 msgstr "Cadw'r dewis becynnau"
 
-#: help.pm:421
-#, c-format
+#: help.pm:412
+#, fuzzy, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a file system).\n"
+"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"
+"select those partitions as well.\n"
 "\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
-"\n"
-"Please note that it is not necessary to reformat all pre-existing\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 do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\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"
 "\n"
-"Click on \"%s\" when you are ready to format the partitions.\n"
+"Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
 "Mandrakelinux operating system installation.\n"
 "\n"
-"Click on \"%s\" if you wish to select partitions that will be checked for\n"
+"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"
@@ -4388,29 +4555,29 @@ msgstr ""
 "Cliciwch \"%s\" os ydych am ddewis rhaniadau i'w gwirio am flociau\n"
 "gwallus ar y ddisg."
 
-#: help.pm:444 help.pm:1005 install_steps_gtk.pm:433 interactive.pm:404
-#: interactive/newt.pm:307 printer/printerdrake.pm:3088
-#: standalone/drakTermServ:376 standalone/drakbackup:3880
-#: standalone/drakbackup:3919 standalone/drakbackup:4030
-#: standalone/drakbackup:4045 ugtk2.pm:508
+#: 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
 #, c-format
 msgid "Previous"
 msgstr "Blaenorol"
 
-#: help.pm:447
-#, c-format
+#: help.pm:434
+#, fuzzy, c-format
 msgid ""
-"At the time you are installing Mandrakelinux, it is likely that some\n"
-"packages will have been updated since the initial release. Bugs may have\n"
-"been fixed, security issues resolved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Check \"%s\"\n"
-"if you have a working Internet connection, or \"%s\" if you prefer to\n"
-"install updated packages later.\n"
+"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"
+"security issues resolved. To allow you to benefit from these updates,\n"
+"you're now able to download them from the Internet. Check \"%s\" if you\n"
+"have a working Internet connection, or \"%s\" if you prefer to install\n"
+"updated packages later.\n"
 "\n"
-"Choosing \"%s\" will display a list of places from which updates can be\n"
-"retrieved. You should choose one near to you. A package-selection tree will\n"
-"appear: review the selection, and press \"%s\" to retrieve and install the\n"
-"selected package(s), or \"%s\" to abort."
+"Choosing \"%s\" will display a list of web locations from which updates can\n"
+"be retrieved. You should choose one near to you. A package-selection tree\n"
+"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"
@@ -4424,28 +4591,27 @@ 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:457 help.pm:602 install_steps_gtk.pm:432
-#: install_steps_interactive.pm:148 standalone/drakbackup:4077
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
+#: install_steps_interactive.pm:158 standalone/drakbackup:4098
 #, c-format
 msgid "Install"
 msgstr "Gosodiad"
 
-#: help.pm:460
-#, c-format
+#: help.pm:447
+#, fuzzy, c-format
 msgid ""
-"At this point, DrakX will allow you to choose the security level desired\n"
-"for the machine. As a rule of thumb, the security level should be set\n"
-"higher if the machine will contain crucial data, or if it will be a machine\n"
-"directly exposed to the Internet. The trade-off of a higher security level\n"
-"is generally obtained at the expense of ease of use.\n"
+"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"
+"higher if the machine is to contain crucial data, or if it's to be directly\n"
+"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 do not know what to choose, stay with the default option. You will\n"
-"be able to change that security level later with tool draksec from the\n"
-"Mandrake Control Center.\n"
+"If you don't 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"
-"The \"%s\" field can inform the system of the user on this computer who\n"
-"will be responsible for security. Security messages will be sent to that\n"
-"address."
+"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"
@@ -4461,12 +4627,12 @@ msgstr ""
 "chyfrifoldeb am ddiogelwch.Bydd negeseuon diogelwch yn cael eu hanfon\n"
 "at y cyfeiriad hwnnw. "
 
-#: help.pm:472
+#: help.pm:458
 #, c-format
 msgid "Security Administrator"
 msgstr "Cyfrinair Gweinyddwr"
 
-#: help.pm:475
+#: help.pm:461
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
@@ -4611,17 +4777,17 @@ msgstr ""
 "gyfer\n"
 " sefyllfaoedd cychwyn argyfyngus!"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Removable media auto-mounting"
 msgstr "Awto gosod cyfrwng symudol"
 
-#: help.pm:544
+#: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
 msgstr "Amnewid rhwng modd arferol/arbenigol"
 
-#: help.pm:547
+#: help.pm:533
 #, c-format
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
@@ -4684,40 +4850,40 @@ msgstr ""
 "Mae \"Enw Windows\" yn cyfeirio at y llythyren y disg caled o dan\n"
 " Windows (\"C:\" yw'r ddisg  neu raniad cyntaf)."
 
-#: help.pm:578
-#, c-format
+#: help.pm:564
+#, fuzzy, c-format
 msgid ""
-"\"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\n"
-"country list."
+"\"%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"
+"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."
 
-#: help.pm:584
-#, c-format
+#: help.pm:569
+#, fuzzy, c-format
 msgid ""
 "This step is activated only if an existing GNU/Linux partition has been\n"
 "found on your machine.\n"
 "\n"
-"DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrakelinux system:\n"
+"DrakX now needs to know if you want to perform a new installation or an\n"
+"upgrade of an existing Mandrakelinux system:\n"
 "\n"
-" * \"%s\": For the most part, this completely wipes out the old system. If\n"
-"you wish to change how your hard drives are partitioned, or change the file\n"
-"system, you should use this option. However, depending on your partitioning\n"
-"scheme, you can prevent some of your existing data from being over-written.\n"
+" * \"%s\". For the most part, this completely wipes out the old system.\n"
+"However, depending on your partitioning scheme, you can prevent some of\n"
+"your existing data (notably \"home\" directories) from being over-written.\n"
+"If you wish to change how your hard drives are partitioned, or to change\n"
+"the file system, you should use this option.\n"
 "\n"
-" * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrakelinux system. Your current\n"
-"partitioning scheme and user data is not altered. Most of other\n"
-"configuration steps remain available, similar to a standard installation.\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"
+"steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
-"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"running version \"8.1\" or later. Performing an upgrade on versions prior\n"
 "to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Mae'r cam hwn yn cael ei weithredu os oes hen raniad GNU/Linux wedi\n"
@@ -4740,25 +4906,24 @@ msgstr ""
 "sy'n rhedeg systemau \"8.1\" neu'n ddiweddarach. Nid yw uwchraddio\n"
 "fersiynau cyn Mandrakelinux \"8.1\" yn cael ei gymeradwyo."
 
-#: help.pm:605
-#, c-format
+#: help.pm:591
+#, fuzzy, c-format
 msgid ""
-"Depending on the language you chose in section , DrakX will automatically\n"
-"select a particular type of keyboard configuration. Check that the\n"
-"selection suits you or choose another keyboard layout.\n"
+"Depending on the language you chose (), DrakX will automatically select a\n"
+"particular type of keyboard configuration. Check that the selection suits\n"
+"you or choose another keyboard layout.\n"
 "\n"
-"Also, you may not have a keyboard that corresponds exactly to your\n"
+"Also, you may not have a keyboard which corresponds exactly to your\n"
 "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 do not match. In either case, this installation step\n"
+"country-set keyboard don't 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 presented with the complete list of\n"
-"supported keyboards.\n"
+"Click on the \"%s\" button to be shown a list of supported keyboards.\n"
 "\n"
 "If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
-"dialog will allow you to choose the key binding that will switch the\n"
+"dialog will allow you to choose the key binding which will switch the\n"
 "keyboard between the Latin and non-Latin layouts."
 msgstr ""
 "Fel arfer mae DrakX yn dewis y bysellfwrdd cywir ar eich cyfer ( gan "
@@ -4783,25 +4948,27 @@ msgstr ""
 "y\n"
 "bysellfwrdd rhwng cynlluniau Lladin ac an-Lladin."
 
-#: help.pm:624
-#, c-format
+#: help.pm:609
+#, fuzzy, c-format
 msgid ""
-"Your choice of preferred language will affect the language of the\n"
-"documentation, the installer and the system in general. Select first the\n"
-"region you are located in, and then the language you speak.\n"
+"The first step is to choose your preferred language.\n"
+"\n"
+"Your choice of preferred language will affect the installer, the\n"
+"documentation, and the system in general. First select the region you're\n"
+"located in, then the language you speak.\n"
 "\n"
 "Clicking on the \"%s\" button will allow you to select other languages to\n"
 "be installed on your workstation, thereby installing the language-specific\n"
-"files for system documentation and applications. For example, if you will\n"
-"host users from Spain on your machine, select English as the default\n"
-"language in the tree view and \"%s\" in the Advanced section.\n"
+"files for system documentation and applications. For example, if Spanish\n"
+"users are to use your machine, select English as the default language in\n"
+"the tree view and \"%s\" in the Advanced section.\n"
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
-"cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrakelinux will be using it\n"
-"or not depending on the user choices:\n"
+"cover all existing languages. However full support for it in GNU/Linux is\n"
+"still under development. For that reason, Mandrakelinux's use of UTF-8 will\n"
+"depend on the user's choices:\n"
 "\n"
-" * If you choose a languages with a strong legacy encoding (latin1\n"
+" * If you choose a language with a strong legacy encoding (latin1\n"
 "languages, Russian, Japanese, Chinese, Korean, Thai, Greek, Turkish, most\n"
 "iso-8859-2 languages), the legacy encoding will be used by default;\n"
 "\n"
@@ -4810,19 +4977,19 @@ msgid ""
 " * If two or more languages are required, and those languages are not using\n"
 "the same encoding, then unicode will be used for the whole system;\n"
 "\n"
-" * Finally, unicode can also be forced for the system at user request by\n"
-"selecting option \"%s\" independently of which language(s) have been\n"
-"chosen.\n"
+" * Finally, unicode can also be forced for use throughout the system at a\n"
+"user's request by selecting the \"%s\" option independently of which\n"
+"languages were been chosen.\n"
 "\n"
 "Note that you're not limited to choosing a single additional language. You\n"
-"may choose several ones, or even install them all by selecting the \"%s\"\n"
-"box. Selecting support for a language means translations, fonts, spell\n"
-"checkers, etc. for that language will also be installed.\n"
+"may choose several, or even install them all by selecting the \"%s\" box.\n"
+"Selecting support for a language means translations, fonts, spell checkers,\n"
+"etc. will also be installed for that language.\n"
 "\n"
-"To switch between the various languages installed on the system, you can\n"
-"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
-"language used by the entire system. Running the command as a regular user\n"
-"will only change the language settings for that particular user."
+"To switch between the various languages installed on your system, you can\n"
+"launch the \"localedrake\" command as \"root\" to change the language used\n"
+"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"
@@ -4849,43 +5016,46 @@ msgstr ""
 "sy'n cael ei ddefnyddio gan y system gyfan. Bydd rhedeg y gorchymyn fel\n"
 "defnyddiwr cyffredin yn gweithio dim ond ar gyfer yr unigolyn hwnnw."
 
-#: help.pm:660
+#: help.pm:647
 #, c-format
 msgid "Espanol"
 msgstr "Sbaeneg"
 
-#: help.pm:663
-#, c-format
+#: help.pm:650
+#, fuzzy, 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"
 "configure it for third-button emulation. The third-button mouse button of a\n"
-"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"two-button mouse can be obtained by simultaneously clicking the left and\n"
 "right mouse buttons. DrakX will automatically know whether your mouse uses\n"
 "a PS/2, serial or USB interface.\n"
 "\n"
-"In case you have a 3 buttons mouse without wheel, you can choose the mouse\n"
-"that says \"%s\". DrakX will then configure your mouse so that you can\n"
-"simulate the wheel with it: to do so, press the middle button and move your\n"
-"mouse up and down.\n"
+"If you have a 3-button mouse without a wheel, you can choose a \"%s\"\n"
+"mouse. DrakX will then configure your mouse so that you can simulate the\n"
+"wheel with it: to do so, press the middle button and move your mouse\n"
+"pointer up and down.\n"
 "\n"
 "If for some reason you wish to specify a different type of mouse, select it\n"
 "from the list provided.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
+"You can select the \"%s\" entry to chose a ``generic'' mouse type which\n"
+"will work with nearly all mice.\n"
+"\n"
+"If you choose a mouse other than the default one, 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"
+"working well, press the space bar or [Return] key to cancel the test and\n"
+"you will be returned to the mouse list.\n"
 "\n"
-"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"Occasionally wheel mice are 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."
+"pressing the \"%s\" button, a mouse image will be displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activating correctly. As you\n"
+"scroll your mouse wheel, you will see the on-screen scroll wheel moving.\n"
+"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"
 "llygoden. Os yw, bydd yn cymryd for gennych lygoden dau fotwm a bydd yn\n"
@@ -4918,12 +5088,17 @@ msgstr ""
 "buttons and check that the mouse pointer moves on-screen as you move your\n"
 "mouse."
 
-#: help.pm:691
+#: help.pm:681
 #, c-format
 msgid "with Wheel emulation"
 msgstr "gydag efelychiad Olwyn"
 
-#: help.pm:694
+#: help.pm:681
+#, fuzzy, c-format
+msgid "Universal | Any PS/2 & USB mice"
+msgstr "Unrhyw lygoden PS/2 ac USB"
+
+#: help.pm:684
 #, c-format
 msgid ""
 "Please select the correct port. For example, the \"COM1\" port under\n"
@@ -4933,16 +5108,16 @@ msgstr ""
 "yn\n"
 "\"ttyS0\" yn GNU/Linux, e.e."
 
-#: help.pm:698
-#, c-format
+#: help.pm:688
+#, fuzzy, c-format
 msgid ""
 "This is the most crucial decision point for the security of your GNU/Linux\n"
-"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"system: you must enter the \"root\" password. \"Root\" is the system\n"
 "administrator and is the only user authorized to make updates, add users,\n"
 "change the overall system configuration, and so on. In short, \"root\" can\n"
-"do everything! That is why you must choose a password that is difficult to\n"
-"guess - DrakX will tell you if the password you chose is too easy. As you\n"
-"can see, you are not forced to enter a password, but we strongly advise you\n"
+"do everything! That's why you must choose a password which is difficult to\n"
+"guess: DrakX will tell you if the password you chose is too simple. As you\n"
+"can see, you're not forced to enter a password, but we strongly advise\n"
 "against this. GNU/Linux is just as prone to operator error as any other\n"
 "operating system. Since \"root\" can overcome all limitations and\n"
 "unintentionally erase all data on partitions by carelessly accessing the\n"
@@ -4951,27 +5126,26 @@ msgid ""
 "\n"
 "The password should be a mixture of alphanumeric characters and at least 8\n"
 "characters long. Never write down the \"root\" password -- it makes it far\n"
-"too easy to compromise a system.\n"
+"too easy to compromise your system.\n"
 "\n"
-"One caveat -- do not make the password too long or complicated because you\n"
+"One caveat: don't make the password too long or too complicated because you\n"
 "must be able to remember it!\n"
 "\n"
-"The password will not be displayed on screen as you type it in. To reduce\n"
-"the chance of a blind typing error you will need to enter the password\n"
-"twice. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will be the one you will have use the first time you\n"
-"connect.\n"
+"The password won't 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"
 "\n"
-"If you wish access to this computer to be controlled by an authentication\n"
-"server, click the \"%s\" button.\n"
+"If you want an authentication server to control access to your computer,\n"
+"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 do not know which\n"
+"services, select the appropriate one for \"%s\". If you don't know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
-"If you happen to have problems with remembering passwords, if your computer\n"
-"will never be connected to the Internet and you absolutely trust everybody\n"
-"who uses your computer, you can choose to have \"%s\"."
+"If you happen to have problems with remembering passwords, or if your\n"
+"computer will never be connected to the Internet and you absolutely trust\n"
+"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 "
@@ -5017,190 +5191,35 @@ msgstr ""
 "\"%s\", os na fydd eich cyfrifiadur yn cael cyswllt â'r we ac rydych\n"
 "yn ymddiried yn y defnyddiwr."
 
-#: help.pm:733
+#: help.pm:722
 #, c-format
 msgid "authentication"
 msgstr "dilysu"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1146
+#: help.pm:722 install_steps_interactive.pm:1211
 #, c-format
 msgid "No password"
 msgstr "Dim cyfrinair"
 
-#: help.pm:736
-#, c-format
-msgid ""
-"This dialog allows you to fine tune your bootloader:\n"
-"\n"
-" * \"%s\": there are three choices for your bootloader:\n"
-"\n"
-"    * \"%s\": if you prefer GRUB (text menu).\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its text menu interface.\n"
-"\n"
-"    * \"%s\": if you prefer LILO with its graphical interface.\n"
-"\n"
-" * \"%s\": in most cases, you will not change the default (\"%s\"), but if\n"
-"you prefer, the bootloader can be installed on the second hard drive\n"
-"(\"%s\"), or even on a floppy disk (\"%s\");\n"
-"\n"
-" * \"%s\": after a boot or a reboot of the computer, this is the delay\n"
-"given to the user at the console to select a boot entry other than the\n"
-"default.\n"
-"\n"
-" * \"%s\": ACPI is a new standard (appeared during year 2002) for power\n"
-"management, notably for laptops. If you know your hardware supports it and\n"
-"you need it, check this box.\n"
-"\n"
-" * \"%s\": If you noticed hardware problems on your machine (IRQ conflicts,\n"
-"instabilities, machine freeze, ...) you should try disabling APIC by\n"
-"checking this box.\n"
-"\n"
-"!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
-"system! Be sure you know what you are doing before changing any of the\n"
-"options. !!\n"
-"\n"
-"Clicking the \"%s\" button in this dialog will offer advanced options which\n"
-"are normally reserved for the expert user."
-msgstr ""
-"Mae'r deialog yn caniatau i chi wenud mân newidiadau i'ch cychwynnwr:\n"
-"\n"
-" * \"\"%s\": mae gennych dri dewis:\n"
-"\n"
-"    * \"\"%s\":os mae'n well gennych GRUB (dewislen testun)\n"
-"\n"
-"    * \"\"%s\"os mae'n well gennych LILO gyda'i rhyngwyneb dewislen testun.\n"
-"\n"
-"    * \"\"%s\" os mae'n well gennych LILO gyda'i rhyngwyneb graffigol.\n"
-"\n"
-" * \"%s\": yn y rhan fwyaf o achosion ni fyddwch yn newid\n"
-"y rhagosodedig (\"%s\"), ond os mae'n well gennych, gall y\n"
-"cychwynnwr gael ei osod ar yr ail ddisg caled (\"%s\"), neu hyd\n"
-"yn oed ar ddisg meddal (\"%s\")\n"
-"\n"
-" * \"%s\": wrth ail gychwyn y cyfrifiadur\n"
-"dyma'r oedi sy'n caniatáu i'r defnyddiwr ddewis o fewn y ddewislen "
-"cychwynnwr,\n"
-"cychwynnwr arall yn lle'r un rhagosodedig.\n"
-"\n"
-" *\"%s\" Mae ACPI yn safon newydd (blwyddyn 2002) ar gyfer rheol pwer yn\n"
-"bennaf gliniaduron. Os ydych yn gwybod fod eich caledwedd yn eei gynnal a'i\n"
-"angen, ticiwch y blwch.\n"
-" *\"%s\". Os ydych wedi sylwi ar anhawsterau caledwedd ar eich peiriant "
-"(gwrthdaro\n"
-"IRQ, ansadrwydd, peiriant yn rhewi,...) dylech geisio anablu APIC drwy "
-"dicio'r blwch\n"
-"\n"
-"!!Gofalwch, os nad ydych yn gosod llwythwr cychwyn, (drwy ddewis \"%s\" "
-"yma),\n"
-"rhaid i chi wneud yn siwr fod gennych fodd i gychwyn eich system Linux "
-"Mandrake.\n"
-"Hefyd, gwnewch yn siwr eich bod yn gwybod beth rydych yn ei wneud cyn newid "
-"y\n"
-"dewisiadau hyn!!\n"
-"\n"
-"Bydd clicio'r botwm \"%s\" yn y ddeialog yn cynnig nifer o ddewisiadau "
-"uwch,\n"
-"sydd yn cael eu cadw ar gyfer y defnyddiwr arbenigol."
-
-#: help.pm:768
-#, c-format
-msgid "GRUB"
-msgstr "GRUB"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hda"
-msgstr "/dev/hda"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/hdb"
-msgstr "/dev/hdb"
-
-#: help.pm:768
-#, c-format
-msgid "/dev/fd0"
-msgstr "/dev/fd0"
-
-#: help.pm:768
-#, c-format
-msgid "Delay before booting the default image"
-msgstr "Oedi cyn cychwyn y ddelwedd rhagosodedig"
-
-#: help.pm:771
-#, c-format
-msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options that will be available at boot time will be displayed.\n"
-"\n"
-"If there are other operating systems installed on your machine they will\n"
-"automatically be added to the boot menu. You can fine-tune the existing\n"
-"options by clicking \"%s\" to create a new entry; selecting an entry and\n"
-"clicking \"%s\" or \"%s\" to modify or remove it. \"%s\" validates your\n"
-"changes.\n"
-"\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone who goes to the console and reboots the machine. You can delete the\n"
-"corresponding entries for the operating systems to remove them from the\n"
-"bootloader menu, but you will need a boot disk in order to boot those other\n"
-"operating systems!"
-msgstr ""
-"Ar ôl ffurfweddu  paramedrau cyffredinol y cychwynnwr, bydd y  rhestr o\n"
-"ddewisiadau cychwyn ar gael wrth gyvchwyn yn cael eu harddangos.\n"
-"\n"
-"Os oes yna systemau gweithredu eraill ar eich cyfrifiadur byddant yn cael\n"
-"eu hychwanegu i'r ddewislen cychwyn. Mae modd addasu'r dewisiadau\n"
-"eraill dwy glicio \"%s\" i greu cofnod newydd; dewis cofnod\n"
-"a chlicio \"%s\" neu \"%s\" i'w nweid neu ei dynnu. Mae \"%s\"\n"
-"yn gwirio'r newidiadau\n"
-"\n"
-"Efallai na fyddwch eisiau rhoi mynediad i'r systemau gweithredu hyn i neb\n"
-"arall fydd yn mynd i'r consol ac yn ailgychwyn y cyfrifiadur. Gallwch "
-"ddileu'r\n"
-"cofnodion perthnasol o'r system weithredu i'w tynnu o ddewislen y\n"
-"cychwynnwr,ond bydd rhaid i chi greu disg  cychwyn ar gyfer y systemau\n"
-"gweithredu eraill rheini!"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1513 standalone/drakfont:589 standalone/drakfont:655
-#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Add"
-msgstr "Ychwanegu"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#, c-format
-msgid "Modify"
-msgstr "Newid"
-
-#: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
-#: standalone/drakvpn:333 standalone/drakvpn:694
-#, c-format
-msgid "Remove"
-msgstr "Tynnu"
-
-#: help.pm:787
-#, c-format
+#: help.pm:725
+#, fuzzy, c-format
 msgid ""
-"LILO and GRUB are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. DrakX will analyze the disk boot sector and act according to\n"
-"what it finds there:\n"
+"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"
+"loader installation is totally automated. DrakX will analyze the disk boot\n"
+"sector and act according to what it finds there:\n"
 "\n"
 " * if a Windows boot sector is found, it will replace it with a GRUB/LILO\n"
-"boot sector. This way you will be able to load either GNU/Linux or any\n"
-"other OS installed on your machine.\n"
+"boot sector. This way you'll be able to load either GNU/Linux or any other\n"
+"OS installed on your machine.\n"
 "\n"
-" * if a GRUB or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
+" * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If it cannot make a determination, DrakX will ask you where to place the\n"
-"bootloader. Generally, the \"%s\" is the safest place. Choosing \"%s\"\n"
-"won't install any bootloader. Use it only if you know what you are doing."
+"If DrakX can't 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"
+"know what you're doing."
 msgstr ""
 "Cychwynnydd GNU/Linux yw LILO a GRUB. Fel rheol mae'r rhan yma'n\n"
 "digwydd yn awtomatig. Bydd DrakX yn dadansoddi'r adran cychwyn\n"
@@ -5217,33 +5236,33 @@ msgstr ""
 "y cychwynnydd. Yn gyffredinol, \"%s\" yw'r man mwyaf diogel. Ni fydd\n"
 " dewis \"%s\" yn gosod cychwynnydd. Dim ond ar gyfer y gwybodus."
 
-#: help.pm:803
-#, c-format
+#: help.pm:742
+#, fuzzy, c-format
 msgid ""
-"Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
-"is best suited to particular types of configuration.\n"
+"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"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
-"with networks.) It's recommended that you use \"pdq\" if this is your first\n"
-"experience with GNU/Linux.\n"
-"\n"
-" * \"%s\" - `` Common Unix Printing System'', is an excellent choice for\n"
-"printing to your local printer or to one halfway around the planet. It is\n"
-"simple to configure and can act as a server or a client for the ancient\n"
-"\"lpd \" printing system, so it is compatible with older operating systems\n"
-"which may still need print services. While quite powerful, the basic setup\n"
-"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
-"sure you turn on the \"cups-lpd \" daemon. \"%s\" includes graphical\n"
-"front-ends for printing or choosing printer options and for managing the\n"
-"printer.\n"
+"within networks.) It's recommended that you use \"pdq\" if this is your\n"
+"first experience with GNU/Linux.\n"
+"\n"
+" * \"%s\" stands for `` Common Unix Printing System'' and is an excellent\n"
+"choice for printing to your local printer or to one halfway around the\n"
+"planet. It's simple to configure and can act as a server or a client for\n"
+"the ancient \"lpd\" printing system, so it's compatible with older\n"
+"operating systems which may still need print services. While quite\n"
+"powerful, the basic setup is almost as easy as \"pdq\". If you need to\n"
+"emulate a \"lpd\" server, make sure you turn on the \"cups-lpd\" daemon.\n"
+"\"%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"
-"system you may change it by running PrinterDrake from the Mandrake Control\n"
-"Center and clicking the expert button."
+"system you may change it by running PrinterDrake from the Mandrakelinux\n"
+"Control Center and clicking on the \"%s\" button."
 msgstr ""
 "Yma byddwn yn dewis system argraffu i'ch cyfrifiadur ei ddefnyddio. Efallai\n"
 "bod systemau eraill yn cynnig un i chi, ond mae Mandrake yn cynnig dwy.\n"
@@ -5273,17 +5292,22 @@ msgstr ""
 "am newid eich system argraffu gallwch ei newid drwy gyfrwng PrinterDrake\n"
 "yng Nghanolfan Rheoli Mandrake a chlicio'r botwm arbenigwr."
 
-#: help.pm:826
+#: help.pm:765
 #, c-format
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
 
-#: help.pm:829
+#: help.pm:765
+#, fuzzy, c-format
+msgid "Expert"
+msgstr "Modd Uwch"
+
+#: help.pm:768
 #, c-format
 msgid ""
 "DrakX will first detect any IDE devices present in your computer. It will\n"
@@ -5320,240 +5344,75 @@ msgstr ""
 "Os nad yw DrakX yn gallu holi am y dewisiadau sydd eu hangen, bydd rhaid i\n"
 " chi ffurfweddu'r gyrrwr gyda llaw. "
 
-#: help.pm:847
-#, c-format
-msgid ""
-"You can add additional entries in yaboot for other operating systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"For other OSs, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
-"\n"
-"For Linux, there are a few possible options:\n"
-"\n"
-" * Label: this is the name you will have to type at the yaboot prompt to\n"
-"select this boot option.\n"
-"\n"
-" * Image: this is the name of the kernel to boot. Typically, vmlinux or a\n"
-"variation of vmlinux with an extension.\n"
-"\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
-"\n"
-" * Append: on Apple hardware, the kernel append option is often used to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button\n"
-"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
-"The following are some examples:\n"
-"\n"
-"   \t      video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"   \t      video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: this option can be used either to load initial modules before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation.\n"
-"\n"
-" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
-"need to allocate a large ramdisk, this option can be used to specify a\n"
-"ramdisk larger than the default.\n"
-"\n"
-" * Read-write: normally the \"root\" partition is initially mounted as\n"
-"read-only, to allow a file system check before the system becomes ``live''.\n"
-"You can override the default with this option.\n"
-"\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support.\n"
-"\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
-"highlighted with a ``*'' if you press [Tab] to see the boot selections."
-msgstr ""
-"Mae modd i chi gynnig cofnodion eraill ar gyfer yaboot, un ai systemau\n"
-"gweithredol eraill, cnewyll eraill, neu ddelwedd cychwyn argyfwng.\n"
-"\n"
-"Ar gyfer systemau gweithredu eraill, mae'r cofnod yn cynnwys label a'r\n"
-"rhaniad \"root \"yn unig\n"
-"\n"
-"Ar gyfer LInux, mae yna rhai dewisiadau:\n"
-"\n"
-" *Label:sef yr enw fyddwch yn ei deipio yn anogwr yaboot i ddewis ydewis "
-"cychwyn.\n"
-"\n"
-" *Image: hwn fydd enw'r cnewyllyn i'w gychwyn. Fel rheol, vimlinux neu\n"
-"amrywiad ohono gydag estyniad\n"
-"\n"
-" *Root: y ddyfais \"root\" neu \"/\" ar gyfer eich gosodiad Linux.\n"
-"\n"
-" *Append: ar galedwedd Apple, mae dewis atodi cnewyllyn yn cael ei\n"
-"ddefnyddio'n eithaf aml i gynorthwyo cychwyn caledwedd fideo neu i\n"
-"alluogi  efelychiad o'r llygoden bysellfwrdd sydd ar goll ar yr ail a'r "
-"trydydd\n"
-"botwm llygoden llygod arferol Apple. Dyma rhai enghreifftiau:\n"
-"\n"
-"       video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
-"\n"
-"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
-"\n"
-" * Initrd: mae modd defnyddio'r dewis hwn i un ai lwytho'r modiwlau "
-"cychwynnol,\n"
-" cydnabod y ddyfais cychwyn ar gael, neu i lwytho delwedd ramdisg ar gyfer\n"
-" cychwyn argyfwng.\n"
-"\n"
-" * Initrd-size: maint y ddelwedd ramdisg arferol yw 4,096bid. Os ydych "
-"angen\n"
-"dyrannu ramdisg mawr, mae modd defnyddio'r dewis hwn.\n"
-"\n"
-" * Read-write:fel rheol mae'r rhaniad \"root\" yn cael ei agor fel darllen "
-"yn unig, i\n"
-" ganiatáu gwiriad system ffeiliau cyn i'r system ddod yn \"fyw\". Yma mae "
-"fodd\n"
-" diystyru'r dewis hwn.\n"
-"\n"
-" * NoVideo: petai caledwedd Apple yn profi i fod yn peri anawsterau "
-"sylweddol,\n"
-" mae modd i chi ddewis cychwyn mewn modd \"novideo\", gyda chynhaliaeth\n"
-" ffrâm byffer cynhenid\n"
-"\n"
-" * Default: dyma'r cyflwr rhagosodedig, dewiswch hwn drwy bwyso ENTER at\n"
-" anogwr yaboot. Bydd y cofnod hefyd wedi ei amlygu gyda \"*\", os wnewch "
-"chi\n"
-" bwyso ar [Tab] i weld dewisiadau'r cychwyn."
-
-#: help.pm:894
-#, c-format
-msgid ""
-"Yaboot is a bootloader for NewWorld Macintosh hardware and can be used to\n"
-"boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are correctly\n"
-"detected and installed in the bootloader menu. If this is not the case, you\n"
-"can add an entry by hand in this screen. Take care to choose the correct\n"
-"parameters.\n"
-"\n"
-"Yaboot's main options are:\n"
-"\n"
-" * Init Message: a simple text message displayed before the boot prompt.\n"
-"\n"
-" * Boot Device: indicates where you want to place the information required\n"
-"to boot to GNU/Linux. Generally, you set up a bootstrap partition earlier\n"
-"to hold this information.\n"
-"\n"
-" * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-"yaboot. The first delay is measured in seconds and at this point, you can\n"
-"choose between CD, OF boot, MacOS or Linux;\n"
-"\n"
-" * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-"After selecting Linux, you will have this delay in 0.1 second increments\n"
-"before your default kernel description is selected;\n"
-"\n"
-" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
-"at the first boot prompt.\n"
-"\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open Firmware at the first boot prompt.\n"
-"\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
-msgstr ""
-"Yaboot yw'r cychwynnwr ar gyfer caledwedd NewWorld MacIntosh. Mae'n\n"
-"gallu cychwyn GNU/Linux, MacOS neu MacOSX os ydynt ar eich peiriant.\n"
-"Fel rheol, mae'r systemau gweithredu hyn yn cael eu canfod yn gywir a'u\n"
-"gosod. Os nad yw hyn yn digwydd, mae modd i chi ychwanegu eu cofnod\n"
-"gyda llaw ar y sgrîn hwn. Byddwch ofalus i ddewis y paramedrau cywir.\n"
-"\n"
-"Prif ddewisiadau Yaboot yw:\n"
-"\n"
-" * Cychwyn Neges: neges testun syml sy'n cael ei ddangos cyn yr anogwr\n"
-" cychwyn\n"
-"\n"
-" * Cychwyn y Ddyfais: yn dangos lle rydych am osod yr wybodaeth\n"
-"angenrheidiol i gychwyn GNU/Linux. Yn gyffredinol, byddwch wedi creu\n"
-"rhaniad ymlwythwr yn gynt, i ddal yr wybodaeth.\n"
-"\n"
-" * Oediad Open Firmware: yn wahanol i LILO, mae yna ddau oediad ar gael\n"
-"gyda yaboot. Mae'r cyntaf yn cael ei fesur mewn eiliadau a dyma pryd hyn\n"
-"mae modd dewis rhwng CD, cychwyn OF, MacOS neu Linux\n"
-"\n"
-" * Oediad Cychwyn y Cnewyllyn: mae'r oediad yn debyg i oediad cychwynLILO. "
-"Wedi dewis Linux, bydd oediad o 0.1 eiliad cyn bod eich cnewyllyn\n"
-"rhagosodedig yn cael ei ddewis.\n"
-"\n"
-" * Galluogi Cychwyn o'r CD?: mae dewis hwn yn caniatáu i chi ddewis \"C\"\n"
-"am CD ar anogwr y cychwyn cyntaf.\n"
-"\n"
-" * Galluogi Cychwyn OF?: mae dewis hwn yn caniatáu i chi ddewis |\"N\"\n"
-"am Open Firmware ar anogwr y cychwyn cyntaf.\n"
-"\n"
-" * System Weithredu Rhagosodedig: mae modd dewis pa system weithredu\n"
-"fydd yn cychwyn drwy ragosodiad pan ddaw'r Open Firmware i ben."
-
-#: help.pm:926
-#, c-format
+#: help.pm:786
+#, fuzzy, c-format
 msgid ""
-"\"%s\": if a sound card is detected on your system, it is displayed here.\n"
-"If you notice the sound card displayed is not the one that is actually\n"
-"present on your system, you can click on the button and choose another\n"
-"driver."
+"\"%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"
+"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"
 "yn cael ei ddangos yma. Os ydych yn sylwi nad y cerdyn sain sydd ar eich\n"
 "cyfrifiadur sy'n cael ei ddangos, yna cliciwch ar y botwm a dewis\n"
 "gyrrwr arall."
 
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:954
-#: install_steps_interactive.pm:971
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1036
 #, c-format
 msgid "Sound card"
 msgstr "Cerdyn sain"
 
-#: help.pm:932
-#, c-format
+#: help.pm:791
+#, fuzzy, c-format
 msgid ""
-"As a review, DrakX will present a summary of information it has about your\n"
-"system. Depending on your installed hardware, you may have some or all of\n"
-"the following entries. Each entry is made up of the configuration item to\n"
-"be configured, followed by a quick summary of the current configuration.\n"
-"Click on the corresponding \"%s\" button to change that.\n"
+"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"
+"may have some or all of the following entries. Each entry is made up of the\n"
+"hardware item to be configured, followed by a quick summary of the current\n"
+"configuration. Click on the corresponding \"%s\" button to make the change.\n"
 "\n"
 " * \"%s\": check the current keyboard map configuration and change it if\n"
 "necessary.\n"
 "\n"
-" * \"%s\": check the current country selection. If you are not in this\n"
-"country, click on the \"%s\" button and choose another one. If your country\n"
-"is not in the first list shown, click the \"%s\" button to get the complete\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"
 "country list.\n"
 "\n"
-" * \"%s\": By default, DrakX deduces your time zone based on the country\n"
+" * \"%s\": by default, DrakX deduces your time zone based on the country\n"
 "you have chosen. You can click on the \"%s\" button here if this is not\n"
 "correct.\n"
 "\n"
-" * \"%s\": check the current mouse configuration and click on the button to\n"
-"change it if necessary.\n"
+" * \"%s\": verify the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
 " * \"%s\": clicking on the \"%s\" button will open the printer\n"
 "configuration wizard. Consult the corresponding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used during installation.\n"
+"Guide'' for more information on how to set up a new printer. The interface\n"
+"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"
+"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"
+"detected, click on \"%s\" to try to configure it manually.\n"
 "\n"
-" * \"%s\": if a sound card is detected on your system, it is displayed\n"
-"here. If you notice the sound card displayed is not the one that is\n"
-"actually present on your system, you can click on the button and choose\n"
-"another driver.\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 does not suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
-" * \"%s\": if a TV card is detected on your system, it is displayed here.\n"
-"If you have a TV card and it is not detected, click on \"%s\" to try to\n"
-"configure it manually.\n"
+" * \"%s\": if you wish to configure your Internet or local network access,\n"
+"you can do so now. Refer to the printed documentation or use the\n"
+"Mandrakelinux Control Center after the installation has finished to benefit\n"
+"from full in-line help.\n"
 "\n"
-" * \"%s\": if an ISDN card is detected on your system, it will be displayed\n"
-"here. You can click on \"%s\" to change the parameters associated with the\n"
-"card.\n"
-"\n"
-" * \"%s\": If you wish to configure your Internet or local network access\n"
-"now.\n"
+" * \"%s\": allows to configure HTTP and FTP proxy addresses if the machine\n"
+"you're installing on is to be located behind a proxy server.\n"
 "\n"
 " * \"%s\": this entry allows you to redefine the security level as set in a\n"
 "previous step ().\n"
@@ -5563,10 +5422,12 @@ msgid ""
 "the corresponding section of the ``Starter Guide'' for details about\n"
 "firewall settings.\n"
 "\n"
-" * \"%s\": if you wish to change your bootloader configuration, click that\n"
-"button. This should be reserved to advanced users.\n"
+" * \"%s\": if you wish to change your bootloader configuration, click this\n"
+"button. This should be reserved to advanced users. Refer to the printed\n"
+"documentation or the in-line help about bootloader configuration in the\n"
+"Mandrakelinux Control Center.\n"
 "\n"
-" * \"%s\": here you'll be able to fine control which services will be run\n"
+" * \"%s\": through this entry you can fine tune which services will be run\n"
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
@@ -5632,58 +5493,57 @@ msgstr ""
 " bwriadu defnyddio'r cyfrifiadur fel gwasanaethwr mae'n syniad da\n"
 "darllen y gosodiadau'n fanwl."
 
-#: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:887 standalone/keyboarddrake:23
-#, c-format
-msgid "Keyboard"
-msgstr "Bysellfwrdd"
-
-#: help.pm:991 install_steps_interactive.pm:913 standalone/drakclock:75
+#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
 #, c-format
 msgid "Timezone"
 msgstr "Cylchfa amser"
 
-#: help.pm:991
-#, c-format
-msgid "Graphical Interface"
-msgstr "Rhyngwyneb Graffigol"
-
-#: help.pm:991 install_steps_interactive.pm:987
+#: help.pm:855 install_steps_interactive.pm:1052
 #, c-format
 msgid "TV card"
 msgstr "Cerdyn Teledu"
 
-#: help.pm:991
+#: help.pm:855
 #, c-format
 msgid "ISDN card"
 msgstr "Cerdyn ISDN"
 
-#: help.pm:991 install_steps_interactive.pm:1005 standalone/drakbackup:2010
+#: help.pm:855
+#, c-format
+msgid "Graphical Interface"
+msgstr "Rhyngwyneb Graffigol"
+
+#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
 #, c-format
 msgid "Network"
 msgstr "Rhwydwaith"
 
-#: help.pm:991 install_steps_interactive.pm:1031
+#: help.pm:855 install_steps_interactive.pm:1085
+#, c-format
+msgid "Proxies"
+msgstr "Dirprwyon"
+
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Security Level"
 msgstr "Lefel Diogelwch"
 
-#: help.pm:991 install_steps_interactive.pm:1045
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Firewall"
 msgstr "Mur Cadarn"
 
-#: help.pm:991 install_steps_interactive.pm:1059
+#: help.pm:855 install_steps_interactive.pm:1124
 #, c-format
 msgid "Bootloader"
 msgstr "Cychwynnwr ar waith"
 
-#: help.pm:991 install_steps_interactive.pm:1069 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
 #, c-format
 msgid "Services"
 msgstr "Gwasanaethau"
 
-#: help.pm:994
+#: help.pm:858
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
@@ -5694,7 +5554,7 @@ msgstr ""
 "Mandrakelinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
 "cael ei ddileu ac ni fydd modd ei adfer!"
 
-#: help.pm:999
+#: help.pm:863
 #, c-format
 msgid ""
 "Click on \"%s\" if you want to delete all data and partitions present on\n"
@@ -5713,7 +5573,17 @@ msgstr ""
 "Cliciwch \"%s\" i atal y weithred hon heb golli unrhyw ddata\n"
 "a rhaniadau sy'n bresennol ar y ddisg galed."
 
-#: install2.pm:119
+#: help.pm:869
+#, c-format
+msgid "Next ->"
+msgstr "Nesaf ->"
+
+#: help.pm:869
+#, c-format
+msgid "<- Previous"
+msgstr "<- Blaenorol"
+
+#: install2.pm:117
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -5724,12 +5594,78 @@ msgstr ""
 "(mae ffeil %s ar goll), mae hyn yn golygu, fel arfer, nad yw eich disg "
 "cychwyn yn cydweddu gyda'r cyfrwng Gosod (crëwch ddisg cychwyn meddal newydd)"
 
-#: install2.pm:169
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Rhaid fformatio %s hefyd"
 
-#: install_any.pm:402
+#: install_any.pm:390
+#, 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?"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:414
+#, fuzzy, 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?"
+
+#: install_any.pm:420 printer/printerdrake.pm:2652
+#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
+#: standalone/scannerdrake:184 standalone/scannerdrake:235
+#: standalone/scannerdrake:242
+#, c-format
+msgid "CD-ROM"
+msgstr "CD-ROM"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (http)"
+msgstr "Rhwydwaith (http)"
+
+#: install_any.pm:420
+#, c-format
+msgid "Network (ftp)"
+msgstr "Rhwydwaith (ftp)"
+
+#: install_any.pm:464 standalone/drakbackup:112
+#, c-format
+msgid "No device found"
+msgstr "Heb ganfod dyfais"
+
+#: install_any.pm:468
+#, c-format
+msgid "Insert the CD"
+msgstr "Rhowch yr CD-ROM"
+
+#: install_any.pm:492
+#, c-format
+msgid "Insert the CD 1 again"
+msgstr "Rhowch yr CD-ROM (eto)"
+
+#: install_any.pm:502 install_any.pm:506
+#, 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"
+
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:713
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5751,7 +5687,8 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gosod y gweinyddion hyn?\n"
 
-#: install_any.pm:423
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_any.pm:736
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5765,17 +5702,17 @@ msgstr ""
 "\n"
 "Ydych chi am dynnu'r pecynnau hyn?\n"
 
-#: install_any.pm:818
+#: 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:822
+#: install_any.pm:1120
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Nid yw 'r disg meddal hwn wedi ei fformatio i FAT"
 
-#: install_any.pm:834
+#: install_any.pm:1132
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5784,12 +5721,17 @@ msgstr ""
 "I ddefnyddio'r dewis o becynnau wedi eu cadw, cychwynnwch y gosodiad gyda "
 "``linux defcfg=floppy''"
 
-#: install_any.pm:862 partition_table.pm:848
+#: install_any.pm:1160 partition_table.pm:595
 #, c-format
 msgid "Error reading file %s"
 msgstr "Gwall wrth ddarllen ffeil %s"
 
-#: install_any.pm:987
+#: install_any.pm:1361
+#, fuzzy, c-format
+msgid "%s (was %s)"
+msgstr "%s(Porth %s)"
+
+#: install_any.pm:1396
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5798,12 +5740,12 @@ msgstr ""
 "Digwyddodd gwall - ni chafwyd dyfeisiau dilys i greu systemau ffeil arnynt. "
 "Gwiriwch eich caledwedd am ffynhonnell yr anhawster."
 
-#: install_gtk.pm:161
+#: install_gtk.pm:160
 #, c-format
 msgid "System installation"
 msgstr "Gosod y system"
 
-#: install_gtk.pm:164
+#: install_gtk.pm:163
 #, c-format
 msgid "System configuration"
 msgstr "Ffurfweddu'r system"
@@ -5839,7 +5781,7 @@ msgstr ""
 "\n"
 "Parhau beth bynnag?"
 
-#: install_interactive.pm:70 install_steps.pm:207
+#: install_interactive.pm:70 install_steps.pm:211
 #, c-format
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Rhaid bod gennych raniad FAT wedi ei osod yn /boot/efi"
@@ -5900,7 +5842,7 @@ msgstr "Pa raniad ydych chi am newid ei faint?"
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
-"the following error occured: %s"
+"the following error occurred: %s"
 msgstr ""
 "Nid yw'r newidiwr maint FAT yn gallu trin eich rhaniad.\n"
 "digwyddodd y gwall canlynol: %s"
@@ -5920,7 +5862,8 @@ msgstr ""
 "Mae eich rhaniad Windows yn rhy ysgyriog, rhedwch \"defrag\" yn gyntaf o dan "
 "Windows ac yna ailgychwyn gosodi Mandrakelinux."
 
-#: install_interactive.pm:164
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_interactive.pm:166
 #, c-format
 msgid ""
 "WARNING!\n"
@@ -5945,52 +5888,52 @@ msgstr ""
 "gychwyn gosod. Dylech hefyd wneud copi wrth gefn\n"
 "o'ch data. Pan rydych yn siwr, cliciwch Iawn."
 
-#: install_interactive.pm:176
+#: install_interactive.pm:178
 #, c-format
 msgid "Which size do you want to keep for Windows on"
 msgstr "Pa faint o le ydych am ei gadw ar gyfer Windows ar"
 
-#: install_interactive.pm:177
+#: install_interactive.pm:179
 #, c-format
 msgid "partition %s"
 msgstr "rhaniad %s"
 
-#: install_interactive.pm:186
+#: install_interactive.pm:188
 #, c-format
 msgid "Resizing Windows partition"
 msgstr "Mesur ffiniau system ffeilio Windows"
 
-#: install_interactive.pm:191
+#: install_interactive.pm:193
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Methodd newid maint FAT: %s"
 
-#: install_interactive.pm:206
+#: install_interactive.pm:208
 #, c-format
 msgid "There is no FAT partition to resize (or not enough space left)"
 msgstr "Nid oes rhaniadau FAT i newid eu maint (neu nad oes digon o le ar ôl)"
 
-#: install_interactive.pm:211
+#: install_interactive.pm:213
 #, c-format
 msgid "Remove Windows(TM)"
 msgstr "Tynnu Windows(TM)"
 
-#: install_interactive.pm:213
+#: install_interactive.pm:215
 #, c-format
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Mae gennych fwy nag un disg caled, ar ba un ydych am osod linux?"
 
-#: install_interactive.pm:217
+#: install_interactive.pm:219
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "Bydd pob rhaniad a'u data yn cael ei ddileu ar ddisg %s"
 
-#: install_interactive.pm:230
+#: install_interactive.pm:232
 #, c-format
 msgid "Use fdisk"
 msgstr "Defnyddiwch fdisk"
 
-#: install_interactive.pm:233
+#: install_interactive.pm:235
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -5999,32 +5942,33 @@ msgstr ""
 "Gallwch rannu %s\n"
 "Wedi gorffen, peidiwch anghofio cadw gyda 'w'"
 
-#: install_interactive.pm:269
+#: install_interactive.pm:271
 #, c-format
 msgid "I can't find any room for installing"
 msgstr "Methu canfod lle ar gyfer gosod"
 
-#: install_interactive.pm:273
+#: install_interactive.pm:275
 #, c-format
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "Daeth dewin Rhannu DrakX o hyd i'r atebion canlynol:"
 
-#: install_interactive.pm:279
+#: install_interactive.pm:281
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Methodd rhannu: %s"
 
-#: install_interactive.pm:286
+#: install_interactive.pm:288
 #, c-format
 msgid "Bringing up the network"
 msgstr "Cychwyn y rhwydwaith"
 
-#: install_interactive.pm:291
+#: install_interactive.pm:293
 #, c-format
 msgid "Bringing down the network"
 msgstr "Cau'r rhwydwaith"
 
-#: install_messages.pm:9
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:10
 #, c-format
 msgid ""
 "Introduction\n"
@@ -6042,7 +5986,7 @@ msgid ""
 "\n"
 "Please read this document carefully. This document is a license agreement "
 "between you and  \n"
-"MandrakeSoft S.A. which applies to the Software Products.\n"
+"Mandrakesoft S.A. which applies to the Software Products.\n"
 "By installing, duplicating or using the Software Products in any manner, you "
 "explicitly \n"
 "accept and fully agree to conform to the terms and conditions of this "
@@ -6064,7 +6008,7 @@ msgid ""
 "The Software Products and attached documentation are provided \"as is\", "
 "with no warranty, to the \n"
 "extent permitted by law.\n"
-"MandrakeSoft S.A. will, in no circumstances and to the extent permitted by "
+"Mandrakesoft S.A. will, in no circumstances and to the extent permitted by "
 "law, be liable for any special,\n"
 "incidental, direct or indirect damages whatsoever (including without "
 "limitation damages for loss of \n"
@@ -6072,14 +6016,14 @@ msgid ""
 "resulting from a court \n"
 "judgment, or any other consequential loss) arising out of  the use or "
 "inability to use the Software \n"
-"Products, even if MandrakeSoft S.A. has been advised of the possibility or "
-"occurence of such \n"
+"Products, even if Mandrakesoft S.A. has been advised of the possibility or "
+"occurrence of such \n"
 "damages.\n"
 "\n"
 "LIMITED LIABILITY LINKED TO POSSESSING OR USING PROHIBITED SOFTWARE IN SOME "
 "COUNTRIES\n"
 "\n"
-"To the extent permitted by law, MandrakeSoft S.A. or its distributors will, "
+"To the extent permitted by law, Mandrakesoft S.A. or its distributors will, "
 "in no circumstances, be \n"
 "liable for any special, incidental, direct or indirect damages whatsoever "
 "(including without \n"
@@ -6109,10 +6053,10 @@ msgid ""
 "and conditions of the license agreement for each component before using any "
 "component. Any question \n"
 "on a component license should be addressed to the component author and not "
-"to MandrakeSoft.\n"
-"The programs developed by MandrakeSoft S.A. are governed by the GPL License. "
+"to Mandrakesoft.\n"
+"The programs developed by Mandrakesoft S.A. are governed by the GPL License. "
 "Documentation written \n"
-"by MandrakeSoft S.A. is governed by a specific license. Please refer to the "
+"by Mandrakesoft S.A. is governed by a specific license. Please refer to the "
 "documentation for \n"
 "further details.\n"
 "\n"
@@ -6123,11 +6067,11 @@ msgid ""
 "respective authors and are \n"
 "protected by intellectual property and copyright laws applicable to software "
 "programs.\n"
-"MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
+"Mandrakesoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
 "\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
-"MandrakeSoft S.A.  \n"
+"Mandrakesoft S.A.  \n"
 "\n"
 "\n"
 "5. Governing Laws \n"
@@ -6143,7 +6087,7 @@ msgid ""
 "court. As a last \n"
 "resort, the dispute will be referred to the appropriate Courts of Law of "
 "Paris - France.\n"
-"For any question on this document, please contact MandrakeSoft S.A.  \n"
+"For any question on this document, please contact Mandrakesoft S.A.  \n"
 msgstr ""
 "Cyflwyniad\n"
 "\n"
@@ -6161,7 +6105,7 @@ msgstr ""
 "\n"
 "Darllenwch y ddogfen hon yn ofalus. Mae'r ddogfen hon yn gytundeb trwyddedu "
 "rhyngoch\n"
-"chi â MandrakeSoft S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"
+"chi â Mandrakesoft S.A,. sy'n berthnasol i'r Cynnyrch Meddalwedd.\n"
 "\n"
 "Wrth osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn unrhyw fodd, "
 "rydych yn\n"
@@ -6186,7 +6130,7 @@ msgstr ""
 "\"fel ag y maent\",\n"
 "heb ddim gwarant,\n"
 "hyd y mae'r gyfraith yn caniatáu.\n"
-"Ni fydd MandrakeSoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd ag "
+"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 "
@@ -6195,14 +6139,14 @@ msgstr ""
 "chosb o ganlyniad i achos llys,\n"
 "neu unrhyw golled o ganlyniad) yn codi o'r defnydd neu'r anallu i "
 "ddefnyddio'r Cynnyrch Meddalwedd,\n"
-"hyd yn oed os yw MandrakeSoft wedi eu cynghori o'r posibilrwydd o'r fath "
+"hyd yn oed os yw Mandrakesoft wedi eu cynghori o'r posibilrwydd o'r fath "
 "iawn.\n"
 "\n"
 "CYFRIFOLDEB CYFYNGEDIG YN GYSYLLTIEDIG GYDA'R MEDDIANT NEU'R DEFNYDD O "
 "FEDDALWEDD\n"
 " GWAHARDDEDIG MEWN RHAI GWLEDYDD\n"
 "\n"
-"Ni fydd MandrakeSoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y "
+"Ni fydd Mandrakesoft S.A. yn gyfrifol, o dan unrhyw amgylchiad, a chyhyd y "
 "bydd y gyfraith yn caniatáu,\n"
 "i fod yn atebol am unrhyw iawn o gwbl, arbennig, damweiniol, uniongyrchol "
 "neu anuniongyrchol (gan gynnwys\n"
@@ -6230,10 +6174,10 @@ msgstr ""
 " 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 "
+"gydran ac nid i Mandrakesoft.\n"
+"Mae'r rhaglenni 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 "
+" ysgrifennwyd gan Mandrakesoft S.A. yn cael eu llywodraethu gan drwydded "
 "benodol. Darllenwch y dogfennau\n"
 "am fwy o fanylion.\n"
 "\n"
@@ -6243,12 +6187,12 @@ msgstr ""
 "Mae pob hawl cydrannau'r Cynnyrch Meddalwedd yn perthyn i'w hawduron "
 "perthnasol ac wedi eu hamddiffyn\n"
 "gan gyfreithiau eiddo deallusol a hawlfraint sy'n berthnasol i raglenni "
-"meddalwedd. Mae MandrakeSoft yn cadw\n"
+"meddalwedd. Mae Mandrakesoft yn cadw\n"
 "ei hawl i newid neu addasu ei Gynnyrch Meddalwedd, yn rhannol neu yn gyfan, "
 "drwy unrhyw ddull ac ar gyfer\n"
 "unrhyw bwrpas.\n"
 "Mae \"Mandrake\", \"Mandrakelinux\"  a'r logos cysylltiedig yn nodau "
-"masnachol sy'n perthyn i MandrakeSoft S.A.\n"
+"masnachol sy'n perthyn i Mandrakesoft S.A.\n"
 "\n"
 "\n"
 "5. Cyfreithiau Llywodraethol\n"
@@ -6263,9 +6207,9 @@ msgstr ""
 "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"
+"Mandrakesoft S.A.  \n"
 
-#: install_messages.pm:89
+#: install_messages.pm:90
 #, c-format
 msgid ""
 "Warning: Free Software may not necessarily be patent free, and some Free\n"
@@ -6282,7 +6226,8 @@ msgstr ""
 "(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."
 
-#: install_messages.pm:96
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:98
 #, c-format
 msgid ""
 "\n"
@@ -6345,7 +6290,7 @@ msgstr ""
 "sy'n\n"
 " berthynol i raglenni meddalwedd.\n"
 
-#: install_messages.pm:128
+#: install_messages.pm:131
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -6378,30 +6323,31 @@ msgstr ""
 "Mae gwybodaeth ar ffurfweddu eich system ar gael ym mhenawdau ôl osod\n"
 "yr Official Mandrakelinux User's Guide."
 
-#: install_messages.pm:141
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: install_messages.pm:144
 #, c-format
-msgid "http://www.mandrakelinux.com/en/100errata.php3"
-msgstr "http://www.mandrakelinux.com/en/100errata.php3"
+msgid "http://www.mandrakelinux.com/en/101errata.php3"
+msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 
-#: install_steps.pm:242
+#: install_steps.pm:246
 #, c-format
 msgid "Duplicate mount point %s"
 msgstr "Pwynt gosod dyblyg %s"
 
-#: install_steps.pm:407
+#: install_steps.pm:477
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
 "Methodd rhai pecynnau pwysig a chael eu gosod yn gywir.\n"
 "Un ai mae eich disg CD-ROM neu eich CD-ROM yn wallus.\n"
 "Gwiriwch y CD-ROM ar gyfrifiadur wedi ei osod gan ddefnyddio \"rpm -qpl "
-"Mandrake/RPMS/*.rpm\"\n"
+"media/main/*.rpm\"\n"
 
-#: install_steps.pm:533
+#: install_steps.pm:603
 #, c-format
 msgid "No floppy drive available"
 msgstr "Does dim disg meddal ar gael"
@@ -6411,7 +6357,7 @@ msgstr "Does dim disg meddal ar gael"
 msgid "Entering step `%s'\n"
 msgstr "Cychwyn cam '%s\"\n"
 
-#: install_steps_gtk.pm:178
+#: install_steps_gtk.pm:184
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -6424,93 +6370,93 @@ msgstr ""
 "testunol. I wneud hynny, gwasgwch F1 wrth gychwyn ar y CD-ROM ac yna rhoi "
 "'text'."
 
-#: install_steps_gtk.pm:232 install_steps_interactive.pm:580
+#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
 #, c-format
 msgid "Package Group Selection"
 msgstr "Dewis  y Grwp Pecyn"
 
-#: install_steps_gtk.pm:294 install_steps_interactive.pm:519
+#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Cyfanswm maint: %d/%d MB"
 
-#: install_steps_gtk.pm:340
+#: install_steps_gtk.pm:309
 #, c-format
 msgid "Bad package"
 msgstr "Pecyn gwallus"
 
-#: install_steps_gtk.pm:342
+#: install_steps_gtk.pm:311
 #, c-format
 msgid "Version: "
 msgstr "Fersiwn:"
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "Size: "
 msgstr "Maint:"
 
-#: install_steps_gtk.pm:343
+#: install_steps_gtk.pm:312
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:344
+#: install_steps_gtk.pm:313
 #, c-format
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
-#: install_steps_gtk.pm:377
+#: install_steps_gtk.pm:346
 #, c-format
 msgid "You can't select/unselect this package"
 msgstr "Does dim modd i chi ddewis/dad-ddewis y pecyn"
 
-#: install_steps_gtk.pm:381
+#: install_steps_gtk.pm:350
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: install_steps_gtk.pm:382
+#: install_steps_gtk.pm:351
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "oherwydd %s annigonol"
 
-#: install_steps_gtk.pm:383
+#: install_steps_gtk.pm:352
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hyrwyddo %s"
 
-#: install_steps_gtk.pm:384
+#: install_steps_gtk.pm:353
 #, c-format
 msgid "in order to keep %s"
 msgstr "er mwyn cadw %s"
 
-#: install_steps_gtk.pm:389
+#: install_steps_gtk.pm:358
 #, c-format
 msgid ""
 "You can't 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:392
+#: install_steps_gtk.pm:361
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Mae'r pecynnau canlynol i'w gosod"
 
-#: install_steps_gtk.pm:393
+#: install_steps_gtk.pm:362
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Bydd y pecynnau canlynol yn cael eu tynnu"
 
-#: install_steps_gtk.pm:417
+#: install_steps_gtk.pm:386
 #, c-format
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Mae hwn yn becyn hanfodol, does dim modd ei ddad-ddewis"
 
-#: install_steps_gtk.pm:419
+#: install_steps_gtk.pm:388
 #, c-format
 msgid "You can't 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:422
+#: install_steps_gtk.pm:391
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6519,82 +6465,81 @@ msgstr ""
 "Rhaid i'r pecyn gael ei uwchraddio\n"
 "Ydych chi'n siwr eich bod am ei ddad-ddewis?"
 
-#: install_steps_gtk.pm:425
+#: install_steps_gtk.pm:394
 #, c-format
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Does dim mod dad-ddewis y pecyn hwn. Rhaid ei ddiweddaru"
 
-#: install_steps_gtk.pm:430
+#: install_steps_gtk.pm:399
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Dangoswch y pecynnau dewis awtomatig"
 
-#: install_steps_gtk.pm:435
+#: install_steps_gtk.pm:404
 #, c-format
 msgid "Load/Save on floppy"
 msgstr "Llwytho/Cadw ar ddisg meddal"
 
-#: install_steps_gtk.pm:436
+#: install_steps_gtk.pm:405
 #, c-format
 msgid "Updating package selection"
 msgstr "Diweddaru'r dewis pecynnau"
 
-#: install_steps_gtk.pm:441
+#: install_steps_gtk.pm:410
 #, c-format
 msgid "Minimal install"
 msgstr "Gosodiad lleiaf"
 
-#: install_steps_gtk.pm:455 install_steps_interactive.pm:427
+#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Dewiswch y pecynnau hoffech chi eu gosod"
 
-#: install_steps_gtk.pm:471 install_steps_interactive.pm:666
+#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
 #, c-format
 msgid "Installing"
 msgstr "Gosod"
 
-#: install_steps_gtk.pm:477
-#, c-format
-msgid "No details"
-msgstr "Dim manylion"
-
-#: install_steps_gtk.pm:478
+#: install_steps_gtk.pm:447
 #, c-format
 msgid "Estimating"
 msgstr "Amcangyfrif"
 
-#: install_steps_gtk.pm:484
+#: install_steps_gtk.pm:453
 #, c-format
 msgid "Time remaining "
 msgstr "Amser yn weddill"
 
-#: install_steps_gtk.pm:496
+#: install_steps_gtk.pm:464
 #, c-format
 msgid "Please wait, preparing installation..."
 msgstr "Arhoswch, paratoi i osod"
 
-#: install_steps_gtk.pm:557
+#: install_steps_gtk.pm:474
+#, c-format
+msgid "No details"
+msgstr "Dim manylion"
+
+#: install_steps_gtk.pm:527
 #, c-format
 msgid "%d packages"
 msgstr "%d pecyn"
 
-#: install_steps_gtk.pm:562
+#: install_steps_gtk.pm:532
 #, c-format
 msgid "Installing package %s"
 msgstr "Gosod pecynnau %s"
 
-#: install_steps_gtk.pm:598 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:690
+#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
+#: install_steps_interactive.pm:745
 #, c-format
 msgid "Refuse"
 msgstr "Gwrthod"
 
-#: install_steps_gtk.pm:599 install_steps_interactive.pm:691
-#, c-format
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
+#, fuzzy, c-format
 msgid ""
 "Change your Cd-Rom!\n"
-"\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."
@@ -6604,134 +6549,139 @@ msgstr ""
 "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."
 
-#: install_steps_gtk.pm:614 install_steps_interactive.pm:703
+#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Roedd gwall wrth drefnu pecynnau"
 
-#: install_steps_gtk.pm:614 install_steps_gtk.pm:618
-#: install_steps_interactive.pm:703 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
+#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
 #, c-format
 msgid "Go on anyway?"
 msgstr "Mynd yn ein blaen beth bynnag?"
 
-#: install_steps_gtk.pm:618 install_steps_interactive.pm:707
+#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "Digwyddodd gwall wrth osod pecyn"
 
-#: install_steps_gtk.pm:658 install_steps_interactive.pm:869
-#: install_steps_interactive.pm:1021
+#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "not configured"
 msgstr "heb ffurfweddu"
 
-#: install_steps_interactive.pm:81
+#: install_steps_interactive.pm:86
 #, c-format
 msgid "Do you want to recover your system?"
 msgstr "Ydych chi eisiau adfer eich system?"
 
-#: install_steps_interactive.pm:82
+#: install_steps_interactive.pm:87
 #, c-format
 msgid "License agreement"
 msgstr "Cytundeb trwyddedu"
 
-#: install_steps_interactive.pm:111
+#: install_steps_interactive.pm:91
+#, fuzzy, c-format
+msgid "Release Notes"
+msgstr "Ryddhad"
+
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Dewiswch gynllun eich bysellfwrdd"
 
-#: install_steps_interactive.pm:113
+#: install_steps_interactive.pm:123
 #, 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:143
+#: install_steps_interactive.pm:153
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Gosod/Diweddaru"
 
-#: install_steps_interactive.pm:144
+#: install_steps_interactive.pm:154
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Gosod neu ddiweddaru?"
 
-#: install_steps_interactive.pm:150
+#: install_steps_interactive.pm:160
 #, c-format
 msgid "Upgrade %s"
 msgstr "Diweddaru %s"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Allwedd amgryptio ar gyfer %s"
 
-#: install_steps_interactive.pm:177
+#: install_steps_interactive.pm:187
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Dewiswch fath eich llygoden"
 
-#: install_steps_interactive.pm:186 standalone/mousedrake:46
+#: install_steps_interactive.pm:196 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Porth Llygoden"
 
-#: install_steps_interactive.pm:187 standalone/mousedrake:47
+#: install_steps_interactive.pm:197 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:197
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Buttons emulation"
 msgstr "Efelychiad botymau"
 
-#: install_steps_interactive.pm:199
+#: install_steps_interactive.pm:209
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Efelychiad Botwm 2"
 
-#: install_steps_interactive.pm:200
+#: install_steps_interactive.pm:210
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Efelychiad Botwm 3"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:221
+#: install_steps_interactive.pm:231
 #, c-format
 msgid "Configuring PCMCIA cards..."
 msgstr "Ffurfweddu cardiau PCMCIA..."
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:228
+#: install_steps_interactive.pm:238
 #, c-format
 msgid "Configuring IDE"
 msgstr "Ffurfweddu IDE"
 
-#: install_steps_interactive.pm:248 network/tools.pm:155
+#: install_steps_interactive.pm:258 network/tools.pm:187
 #, c-format
 msgid "No partition available"
 msgstr "dim rhaniadau ar gael"
 
-#: install_steps_interactive.pm:251
+#: install_steps_interactive.pm:261
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Sganio rhaniadau i ganfod pwyntiau gosod"
 
-#: install_steps_interactive.pm:258
+#: install_steps_interactive.pm:268
 #, c-format
 msgid "Choose the mount points"
 msgstr "Dewiswch y pwyntiau gosod"
 
-#: install_steps_interactive.pm:288
+#: install_steps_interactive.pm:300
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -6740,17 +6690,17 @@ 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:325
+#: install_steps_interactive.pm:337
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Dewiswch y rhaniadau rydych am eu fformatio"
 
-#: install_steps_interactive.pm:327
+#: install_steps_interactive.pm:339
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Gwirio blociau gwallus?"
 
-#: install_steps_interactive.pm:359
+#: install_steps_interactive.pm:371
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -6759,33 +6709,44 @@ msgstr ""
 "Wedi methu gwirio system ffeiliau %s. Hoffech chi drwsio'r gwallau? (gofal, "
 "mae modd colli data)"
 
-#: install_steps_interactive.pm:362
+#: install_steps_interactive.pm:374
 #, 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:369
+#: install_steps_interactive.pm:381
 #, 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:370 install_steps_interactive.pm:389
+#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Casglu'r pecynnau sydd ar gael"
 
-#: install_steps_interactive.pm:373
+#: install_steps_interactive.pm:385
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Edrych ar becynnau wedi eu gosod yn barod"
 
-#: install_steps_interactive.pm:377
+#: install_steps_interactive.pm:389
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Canfod pecynnau i'w uwchraddio"
 
-#: install_steps_interactive.pm:398
+#: 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
+#, 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
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -6794,7 +6755,7 @@ msgstr ""
 "Nid oes gan eich system ddigon o le ar ôl ar gyfer gosodiad neu uwchraddiad "
 "(%d> %d)"
 
-#: install_steps_interactive.pm:439
+#: install_steps_interactive.pm:493
 #, c-format
 msgid ""
 "Please choose load or save package selection on floppy.\n"
@@ -6803,42 +6764,42 @@ 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:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Load from floppy"
 msgstr "Llwytho o ddisg meddal"
 
-#: install_steps_interactive.pm:441
+#: install_steps_interactive.pm:495
 #, c-format
 msgid "Save on floppy"
 msgstr "Cadw ar ddisg meddal"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Package selection"
 msgstr "Dewis pecynnau"
 
-#: install_steps_interactive.pm:445
+#: install_steps_interactive.pm:499
 #, c-format
 msgid "Loading from floppy"
 msgstr "Llwytho o ddisg meddal"
 
-#: install_steps_interactive.pm:450
+#: install_steps_interactive.pm:504
 #, c-format
 msgid "Insert a floppy containing package selection"
 msgstr "Rhowch ddisg meddal yn cynnwys dewis pecynnau yn y peiriant"
 
-#: install_steps_interactive.pm:533
+#: 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"
 
-#: install_steps_interactive.pm:548
+#: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
 msgstr "Math o osodiad"
 
-#: install_steps_interactive.pm:549
+#: install_steps_interactive.pm:597
 #, c-format
 msgid ""
 "You haven't selected any group of packages.\n"
@@ -6847,22 +6808,22 @@ msgstr ""
 "Nid ydych wedi dewis unrhyw grwpiau o becynnau.\n"
 "Dewiswch y gosodiad lleiaf rydych ei eisiau"
 
-#: install_steps_interactive.pm:553
+#: install_steps_interactive.pm:601
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Gyda dogfennaeth elfennol (argymhellir!)"
 
-#: install_steps_interactive.pm:554
+#: install_steps_interactive.pm:602
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Gosodiad bychan iawn (yn arbennig dim urpmi)"
 
-#: install_steps_interactive.pm:597 standalone/drakxtv:50
+#: install_steps_interactive.pm:645 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Popeth"
 
-#: install_steps_interactive.pm:641
+#: install_steps_interactive.pm:694
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -6873,17 +6834,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:646
+#: install_steps_interactive.pm:699
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom wedi ei labelu \"%s\""
 
-#: install_steps_interactive.pm:666
+#: install_steps_interactive.pm:720
 #, c-format
 msgid "Preparing installation"
 msgstr "Paratoi'r gosodiad"
 
-#: install_steps_interactive.pm:675
+#: install_steps_interactive.pm:729
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6892,17 +6853,17 @@ msgstr ""
 "Gosod pecyn %s\n"
 "%d%%"
 
-#: install_steps_interactive.pm:721
+#: install_steps_interactive.pm:778
 #, c-format
 msgid "Post-install configuration"
 msgstr "Ffurfweddiad ôl osod"
 
-#: install_steps_interactive.pm:727
+#: install_steps_interactive.pm:784
 #, 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:748
+#: install_steps_interactive.pm:813
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -6912,7 +6873,7 @@ msgid ""
 "To download these packages, you will need to have a working Internet \n"
 "connection.\n"
 "\n"
-"Do you want to install the updates ?"
+"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 "
@@ -6923,83 +6884,72 @@ msgstr ""
 "\n"
 "Ydych chi am osod y diweddariadau?"
 
-#: install_steps_interactive.pm:769
-#, 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:774
-#, 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:788
+#: install_steps_interactive.pm:853
 #, 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:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Methu canfod drych: %s."
 
-#: install_steps_interactive.pm:792
+#: install_steps_interactive.pm:857
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Hoffech chi geisio eto?"
 
-#: install_steps_interactive.pm:818 standalone/drakclock:45
+#: install_steps_interactive.pm:883 standalone/drakclock:46
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Pa un yw eich parth amser?"
 
-#: install_steps_interactive.pm:823
+#: install_steps_interactive.pm:888
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Cydweddi amser awtomatig (defnyddio NTP)"
 
-#: install_steps_interactive.pm:831
+#: install_steps_interactive.pm:896
 #, c-format
 msgid "NTP Server"
 msgstr "Gweinydd NTP"
 
-#: install_steps_interactive.pm:873 steps.pm:30
+#: install_steps_interactive.pm:938 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: install_steps_interactive.pm:886 install_steps_interactive.pm:894
-#: install_steps_interactive.pm:912 install_steps_interactive.pm:919
-#: install_steps_interactive.pm:1068 services.pm:135
-#: standalone/drakbackup:1572
+#: 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
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: install_steps_interactive.pm:926 install_steps_interactive.pm:953
-#: install_steps_interactive.pm:970 install_steps_interactive.pm:986
-#: install_steps_interactive.pm:997
+#: 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
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: install_steps_interactive.pm:932 install_steps_interactive.pm:941
+#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Gweinydd CUPS pell"
 
-#: install_steps_interactive.pm:932
+#: install_steps_interactive.pm:997
 #, c-format
 msgid "No printer"
 msgstr "Nid oes argraffydd"
 
-#: install_steps_interactive.pm:974
+#: install_steps_interactive.pm:1039
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "A oes gennych gerdyn sain ISA?"
 
-#: install_steps_interactive.pm:976
+#: install_steps_interactive.pm:1041
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -7008,95 +6958,90 @@ msgstr ""
 "Rhedwch \"alsaconfig\" neu \"sndconfig\" wedi'r gosodiad i ffurfweddu'ch "
 "cerdyn sain"
 
-#: install_steps_interactive.pm:978
+#: install_steps_interactive.pm:1043
 #, 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:998
+#: install_steps_interactive.pm:1063
 #, c-format
 msgid "Graphical interface"
 msgstr "Rhyngwyneb graffigol"
 
-#: install_steps_interactive.pm:1004 install_steps_interactive.pm:1019
+#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
 #, c-format
 msgid "Network & Internet"
 msgstr "Rhwydwaith a'r Rhyngrwyd"
 
-#: install_steps_interactive.pm:1020
-#, c-format
-msgid "Proxies"
-msgstr "Dirprwyon"
-
-#: install_steps_interactive.pm:1021
+#: install_steps_interactive.pm:1086
 #, c-format
 msgid "configured"
 msgstr "ffurfweddu"
 
-#: install_steps_interactive.pm:1030 install_steps_interactive.pm:1044
+#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Diogelwch"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "activated"
 msgstr "gweithredu"
 
-#: install_steps_interactive.pm:1049
+#: install_steps_interactive.pm:1114
 #, c-format
 msgid "disabled"
 msgstr "anablwyd"
 
-#: install_steps_interactive.pm:1058
+#: install_steps_interactive.pm:1123
 #, c-format
 msgid "Boot"
 msgstr "Cychwyn"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:1127
 #, c-format
 msgid "%s on %s"
 msgstr "%s ar %s"
 
-#: install_steps_interactive.pm:1073 services.pm:177
+#: install_steps_interactive.pm:1141 services.pm:177
 #, 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:1083
+#: install_steps_interactive.pm:1151
 #, 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:1141
+#: 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:1142
+#: install_steps_interactive.pm:1206
 #, c-format
 msgid "Set root password"
 msgstr "Gosod cyfrinair gwraidd"
 
-#: install_steps_interactive.pm:1152
+#: 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:1157 network/netconnect.pm:575
-#: standalone/drakauth:26 standalone/drakconnect:461
+#: 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:1188
+#: install_steps_interactive.pm:1254
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Paratoi cychwynnwr"
 
-#: install_steps_interactive.pm:1198
+#: install_steps_interactive.pm:1264
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7111,12 +7056,12 @@ msgstr ""
 "rhaid defnyddio BootX i gychwyn\n"
 "eich peiriant."
 
-#: install_steps_interactive.pm:1204
+#: install_steps_interactive.pm:1270
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Ydych chi eisiau defnyddio aboot?"
 
-#: install_steps_interactive.pm:1207
+#: install_steps_interactive.pm:1273
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7125,34 +7070,7 @@ msgstr ""
 "Gwall gosod aboot, \n"
 "ceisiwch orfodi gosodiad hyd yn oed os yw hynny'n dinistrio'r rhaniad cyntaf?"
 
-#: install_steps_interactive.pm:1218
-#, c-format
-msgid "Installing bootloader"
-msgstr "Gosod cychwynnwr"
-
-#: install_steps_interactive.pm:1225
-#, c-format
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "Methodd gosod cychwynnwr. Digwyddodd y gwall canlynol:"
-
-#: install_steps_interactive.pm:1230
-#, 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"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-"Efallai bydd angen i chi newid eich dyfais cychwyn Open Firmware\n"
-" i alluogi'r cychwynnwr. Os nad ydych yn gweld anogwr y\n"
-" cychwynnwr wrth ail gychwyn, gwasgwch Command-Option-O-F wrth ail\n"
-" gychwyn a theipiwch: setenv boot-device %s,\\\\:tbxi\n"
-" Yna teipiwch: shut-down\n"
-"Wrth gychwyn eto dylech weld anogwr y cychwynnwr."
-
-#: install_steps_interactive.pm:1243
+#: install_steps_interactive.pm:1294
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -7161,22 +7079,22 @@ msgstr ""
 "Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu "
 "cyfyngu i'r Gweinyddwr."
 
-#: install_steps_interactive.pm:1275 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Rhowch ddisg meddal  yng ngyrrwr %s"
 
-#: install_steps_interactive.pm:1280
+#: install_steps_interactive.pm:1327
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Mewnosodwch ddisg meddal arall ar gyfer gyrwyr disg"
 
-#: install_steps_interactive.pm:1282
+#: install_steps_interactive.pm:1329
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creu disg meddal awto gosod"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1341
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7187,12 +7105,12 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gorffen?"
 
-#: install_steps_interactive.pm:1309
+#: install_steps_interactive.pm:1356
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Creu disg meddal awto gosod"
 
-#: install_steps_interactive.pm:1311
+#: install_steps_interactive.pm:1358
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7213,7 +7131,8 @@ msgstr ""
 msgid "Mandrakelinux Installation %s"
 msgstr "Gosodiad %s Mandrakelinux"
 
-#: install_steps_newt.pm:33
+#. -PO: This string must fit in a 80-char wide text screen
+#: install_steps_newt.pm:34
 #, c-format
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
@@ -7225,17 +7144,37 @@ msgstr ""
 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
+#: 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
+#, c-format
+msgid "Modify"
+msgstr "Newid"
+
+#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
+#: standalone/drakvpn:694
+#, c-format
+msgid "Remove"
+msgstr "Tynnu"
+
 #: interactive.pm:372
 #, c-format
 msgid "Basic"
 msgstr "Elfennol"
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
+#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
 #, c-format
 msgid "Finish"
 msgstr "Gorffen"
 
-#: interactive/newt.pm:83
+#: interactive/newt.pm:92
 #, c-format
 msgid "Do"
 msgstr "Gwneud"
@@ -7314,572 +7253,765 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Ail-gyflwyno"
 
-#: keyboard.pm:161 keyboard.pm:193
+#: keyboard.pm:163 keyboard.pm:194
 #, c-format
-msgid "Czech (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTZ)"
 msgstr "Tsiec (QWERTY)"
 
-#: keyboard.pm:162 keyboard.pm:195
+#: keyboard.pm:164 keyboard.pm:196
 #, c-format
-msgid "German"
+msgid ""
+"_: keyboard\n"
+"German"
 msgstr "Almaenaidd"
 
-#: keyboard.pm:163
+#: keyboard.pm:165
 #, c-format
-msgid "Dvorak"
+msgid ""
+"_: keyboard\n"
+"Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:164 keyboard.pm:204
+#: keyboard.pm:166 keyboard.pm:206
 #, c-format
-msgid "Spanish"
+msgid ""
+"_: keyboard\n"
+"Spanish"
 msgstr "Sbaenaidd"
 
-#: keyboard.pm:165 keyboard.pm:205
+#: keyboard.pm:167 keyboard.pm:207
 #, c-format
-msgid "Finnish"
+msgid ""
+"_: keyboard\n"
+"Finnish"
 msgstr "Ffinaidd"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:168 keyboard.pm:208
 #, c-format
-msgid "French"
+msgid ""
+"_: keyboard\n"
+"French"
 msgstr "Ffrengig"
 
-#: keyboard.pm:167 keyboard.pm:246
+#: keyboard.pm:169 keyboard.pm:254
 #, c-format
-msgid "Norwegian"
+msgid ""
+"_: keyboard\n"
+"Norwegian"
 msgstr "Norwyaidd"
 
-#: keyboard.pm:168
+#: keyboard.pm:170
 #, c-format
-msgid "Polish"
+msgid ""
+"_: keyboard\n"
+"Polish"
 msgstr "Pwylaidd"
 
-#: keyboard.pm:169 keyboard.pm:255
+#: keyboard.pm:171 keyboard.pm:264
 #, c-format
-msgid "Russian"
+msgid ""
+"_: keyboard\n"
+"Russian"
 msgstr "Rwsiaidd"
 
-#: keyboard.pm:171 keyboard.pm:259
+#: keyboard.pm:173 keyboard.pm:268
 #, c-format
-msgid "Swedish"
+msgid ""
+"_: keyboard\n"
+"Swedish"
 msgstr "Swedaidd"
 
-#: keyboard.pm:172 keyboard.pm:278
+#: keyboard.pm:174 keyboard.pm:287
 #, c-format
 msgid "UK keyboard"
 msgstr "Bysellfwrdd DG"
 
-#: keyboard.pm:173 keyboard.pm:279
+#: keyboard.pm:175 keyboard.pm:288
 #, c-format
 msgid "US keyboard"
 msgstr "Bysellfwrdd UDA"
 
-#: keyboard.pm:175
+#: keyboard.pm:177
 #, c-format
-msgid "Albanian"
+msgid ""
+"_: keyboard\n"
+"Albanian"
 msgstr "Albaniaidd"
 
-#: keyboard.pm:176
+#: keyboard.pm:178
 #, c-format
-msgid "Armenian (old)"
+msgid ""
+"_: keyboard\n"
+"Armenian (old)"
 msgstr "Armenaidd (hen)"
 
-#: keyboard.pm:177
+#: keyboard.pm:179
 #, c-format
-msgid "Armenian (typewriter)"
+msgid ""
+"_: keyboard\n"
+"Armenian (typewriter)"
 msgstr "Armenaidd (teipiadur)"
 
-#: keyboard.pm:178
+#: keyboard.pm:180
 #, c-format
-msgid "Armenian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Armenian (phonetic)"
 msgstr "Armenaidd (ffonetig)"
 
-#: keyboard.pm:179
+#: keyboard.pm:181
 #, c-format
-msgid "Arabic"
+msgid ""
+"_: keyboard\n"
+"Arabic"
 msgstr "Arabaidd"
 
-#: keyboard.pm:180
+#: keyboard.pm:182
 #, c-format
-msgid "Azerbaidjani (latin)"
+msgid ""
+"_: keyboard\n"
+"Azerbaidjani (latin)"
 msgstr "Azerbaidjan (lladin)"
 
-#: keyboard.pm:182
+#: keyboard.pm:183
 #, c-format
-msgid "Belgian"
+msgid ""
+"_: keyboard\n"
+"Belgian"
 msgstr "Belgaidd"
 
-#: keyboard.pm:183
+#: keyboard.pm:184
 #, c-format
-msgid "Bengali"
+msgid ""
+"_: keyboard\n"
+"Bengali"
 msgstr "Bengalaidd"
 
-#: keyboard.pm:184
+#: keyboard.pm:185
 #, c-format
-msgid "Bulgarian (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (phonetic)"
 msgstr "Bwlgaraidd (ffonetig)"
 
-#: keyboard.pm:185
+#: keyboard.pm:186
 #, c-format
-msgid "Bulgarian (BDS)"
+msgid ""
+"_: keyboard\n"
+"Bulgarian (BDS)"
 msgstr "Bwlgaraidd (BDS)"
 
-#: keyboard.pm:186
+#: keyboard.pm:187
 #, c-format
-msgid "Brazilian (ABNT-2)"
+msgid ""
+"_: keyboard\n"
+"Brazilian (ABNT-2)"
 msgstr "Brasilaidd (ABNT-2)"
 
-#: keyboard.pm:189
+#: keyboard.pm:188
 #, c-format
-msgid "Bosnian"
+msgid ""
+"_: keyboard\n"
+"Bosnian"
 msgstr "Bosniaidd"
 
-#: keyboard.pm:190
+#: keyboard.pm:189
 #, c-format
-msgid "Belarusian"
+msgid ""
+"_: keyboard\n"
+"Belarusian"
 msgstr "Belarusaidd"
 
 #: keyboard.pm:191
 #, c-format
-msgid "Swiss (German layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (German layout)"
 msgstr "Swisaidd (gosodiad Almaeneg)"
 
-#: keyboard.pm:192
+#: keyboard.pm:193
 #, c-format
-msgid "Swiss (French layout)"
+msgid ""
+"_: keyboard\n"
+"Swiss (French layout)"
 msgstr "Swisaidd (gosodiad Ffrengig)"
 
-#: keyboard.pm:194
+#: keyboard.pm:195
 #, c-format
-msgid "Czech (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Czech (QWERTY)"
 msgstr "Tsiec (QWERTY)"
 
-#: keyboard.pm:196
+#: keyboard.pm:197
 #, c-format
-msgid "German (no dead keys)"
+msgid ""
+"_: keyboard\n"
+"German (no dead keys)"
 msgstr "Almaenaidd (dim bysellau marw)"
 
-#: keyboard.pm:197
+#: keyboard.pm:198
 #, c-format
-msgid "Devanagari"
+msgid ""
+"_: keyboard\n"
+"Devanagari"
 msgstr "Devanagari"
 
-#: keyboard.pm:198
+#: keyboard.pm:199
 #, c-format
-msgid "Danish"
+msgid ""
+"_: keyboard\n"
+"Danish"
 msgstr "Danaidd"
 
-#: keyboard.pm:199
+#: keyboard.pm:200
 #, c-format
-msgid "Dvorak (US)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (US)"
 msgstr "Dvorak (UDA)"
 
-#: keyboard.pm:200
+#: keyboard.pm:201
 #, c-format
-msgid "Dvorak (Esperanto)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: keyboard.pm:201
+#: keyboard.pm:202
 #, c-format
-msgid "Dvorak (Norwegian)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Norwegian)"
 msgstr "Dvorak (Norwyaidd)"
 
-#: keyboard.pm:202
+#: keyboard.pm:203
 #, c-format
-msgid "Dvorak (Swedish)"
+msgid ""
+"_: keyboard\n"
+"Dvorak (Swedish)"
 msgstr "Dvorak (Swedaidd)"
 
-#: keyboard.pm:203
+#: keyboard.pm:205
 #, c-format
-msgid "Estonian"
+msgid ""
+"_: keyboard\n"
+"Estonian"
 msgstr "Estonaidd"
 
-#: keyboard.pm:207
+#: keyboard.pm:209
 #, c-format
-msgid "Georgian (\"Russian\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Russian\" layout)"
 msgstr "Georgaidd (gosodiad \"Rwsiaidd\")"
 
-#: keyboard.pm:208
+#: keyboard.pm:210
 #, c-format
-msgid "Georgian (\"Latin\" layout)"
+msgid ""
+"_: keyboard\n"
+"Georgian (\"Latin\" layout)"
 msgstr "Georgaidd (gosodiad \"Lladinaidd\")"
 
-#: keyboard.pm:209
+#: keyboard.pm:211
 #, c-format
-msgid "Greek"
+msgid ""
+"_: keyboard\n"
+"Greek"
 msgstr "Groegaidd"
 
-#: keyboard.pm:210
+#: keyboard.pm:212
 #, c-format
-msgid "Greek (polytonic)"
+msgid ""
+"_: keyboard\n"
+"Greek (polytonic)"
 msgstr "Groegaidd (polytonic)"
 
-#: keyboard.pm:211
+#: keyboard.pm:213
 #, c-format
-msgid "Gujarati"
+msgid ""
+"_: keyboard\n"
+"Gujarati"
 msgstr "Gujarati"
 
-#: keyboard.pm:212
+#: keyboard.pm:214
 #, c-format
-msgid "Gurmukhi"
+msgid ""
+"_: keyboard\n"
+"Gurmukhi"
 msgstr "Gurmukhi"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
-msgid "Hungarian"
+msgid ""
+"_: keyboard\n"
+"Hungarian"
 msgstr "Hwngaraidd"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
-msgid "Croatian"
+msgid ""
+"_: keyboard\n"
+"Croatian"
 msgstr "Croataidd"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
-msgid "Irish"
+msgid ""
+"_: keyboard\n"
+"Irish"
 msgstr "Gwyddelig"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
-msgid "Israeli"
+msgid ""
+"_: keyboard\n"
+"Israeli"
 msgstr "Israelaidd"
 
-#: keyboard.pm:217
+#: keyboard.pm:220
 #, c-format
-msgid "Israeli (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Israeli (phonetic)"
 msgstr "Israelaidd (Ffonetig)"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
-msgid "Iranian"
+msgid ""
+"_: keyboard\n"
+"Iranian"
 msgstr "Iranaidd"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
-msgid "Icelandic"
+msgid ""
+"_: keyboard\n"
+"Icelandic"
 msgstr "Eislandaidd"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
-msgid "Italian"
+msgid ""
+"_: keyboard\n"
+"Italian"
 msgstr "Eidalaidd"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
-msgid "Inuktitut"
+msgid ""
+"_: keyboard\n"
+"Inuktitut"
 msgstr "Inuktitut"
 
-#: keyboard.pm:225
+#: keyboard.pm:229
 #, c-format
-msgid "Japanese 106 keys"
+msgid ""
+"_: keyboard\n"
+"Japanese 106 keys"
 msgstr "Siapaëaidd 106 bysell"
 
-#: keyboard.pm:226
+#: keyboard.pm:230
 #, c-format
-msgid "Kannada"
+msgid ""
+"_: keyboard\n"
+"Kannada"
 msgstr "Kannada"
 
-#: keyboard.pm:229
+#: keyboard.pm:233
 #, c-format
-msgid "Korean keyboard"
+msgid ""
+"_: keyboard\n"
+"Korean"
 msgstr "Bysellfwrdd Corëaidd"
 
-#: keyboard.pm:230
+#: keyboard.pm:234
 #, c-format
-msgid "Kyrgyz keyboard"
+msgid ""
+"_: keyboard\n"
+"Kyrgyz"
 msgstr "Bysellfwrdd Kyrgyz"
 
-#: keyboard.pm:231
+#: keyboard.pm:235
 #, c-format
-msgid "Latin American"
+msgid ""
+"_: keyboard\n"
+"Latin American"
 msgstr "Lladin America"
 
-#: keyboard.pm:232
+#: keyboard.pm:236
 #, c-format
-msgid "Laotian"
+msgid ""
+"_: keyboard\n"
+"Laotian"
 msgstr "Laotiaidd"
 
-#: keyboard.pm:233
+#: keyboard.pm:238
 #, c-format
-msgid "Lithuanian AZERTY (old)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (old)"
 msgstr "Lithuenaidd AZERTY (hen)"
 
-#: keyboard.pm:235
+#: keyboard.pm:241
 #, c-format
-msgid "Lithuanian AZERTY (new)"
+msgid ""
+"_: keyboard\n"
+"Lithuanian AZERTY (new)"
 msgstr "Lithuenaidd AZERTY (newydd)"
 
-#: keyboard.pm:236
+#: keyboard.pm:243
 #, c-format
-msgid "Lithuanian \"number row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"number row\" QWERTY"
 msgstr "Lithuenaidd \"rhes rhif\" QWERTY"
 
-#: keyboard.pm:237
+#: keyboard.pm:245
 #, c-format
-msgid "Lithuanian \"phonetic\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Lithuanian \"phonetic\" QWERTY"
 msgstr "Lithuenaidd \"ffonetig\" QWERTY"
 
-#: keyboard.pm:238
+#: keyboard.pm:246
 #, c-format
-msgid "Latvian"
+msgid ""
+"_: keyboard\n"
+"Latvian"
 msgstr "Latfiaidd"
 
-#: keyboard.pm:239
+#: keyboard.pm:247
 #, c-format
-msgid "Malayalam"
+msgid ""
+"_: keyboard\n"
+"Malayalam"
 msgstr "Malayalamaidd"
 
-#: keyboard.pm:240
+#: keyboard.pm:248
 #, c-format
-msgid "Macedonian"
+msgid ""
+"_: keyboard\n"
+"Macedonian"
 msgstr "Macedonaidd"
 
-#: keyboard.pm:241
+#: keyboard.pm:249
 #, c-format
-msgid "Myanmar (Burmese)"
+msgid ""
+"_: keyboard\n"
+"Myanmar (Burmese)"
 msgstr "Myanmar (Burma)"
 
-#: keyboard.pm:242
+#: keyboard.pm:250
 #, c-format
-msgid "Mongolian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Mongolian (cyrillic)"
 msgstr "Mongolaidd (cyrillic)"
 
-#: keyboard.pm:243
+#: keyboard.pm:251
 #, c-format
-msgid "Maltese (UK)"
+msgid ""
+"_: keyboard\n"
+"Maltese (UK)"
 msgstr "Maltaidd (DU)"
 
-#: keyboard.pm:244
+#: keyboard.pm:252
 #, c-format
-msgid "Maltese (US)"
+msgid ""
+"_: keyboard\n"
+"Maltese (US)"
 msgstr "Maltaidd (UDA)"
 
-#: keyboard.pm:245
+#: keyboard.pm:253
 #, c-format
-msgid "Dutch"
+msgid ""
+"_: keyboard\n"
+"Dutch"
 msgstr "Isalmaenaidd"
 
-#: keyboard.pm:247
+#: keyboard.pm:255
 #, c-format
-msgid "Oriya"
+msgid ""
+"_: keyboard\n"
+"Oriya"
 msgstr "Oriya"
 
-#: keyboard.pm:248
+#: keyboard.pm:256
 #, c-format
-msgid "Polish (qwerty layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwerty layout)"
 msgstr "Pwylaidd (gosodiad qwerty)"
 
-#: keyboard.pm:249
+#: keyboard.pm:257
 #, c-format
-msgid "Polish (qwertz layout)"
+msgid ""
+"_: keyboard\n"
+"Polish (qwertz layout)"
 msgstr "Pwylaidd (gosodiad qwerty)"
 
-#: keyboard.pm:250
+#: keyboard.pm:258
 #, c-format
-msgid "Portuguese"
+msgid ""
+"_: keyboard\n"
+"Portuguese"
 msgstr "Portiwgalaidd"
 
-#: keyboard.pm:251
+#: keyboard.pm:260
 #, c-format
-msgid "Canadian (Quebec)"
+msgid ""
+"_: keyboard\n"
+"Canadian (Quebec)"
 msgstr "Canada (Quebec)"
 
-#: keyboard.pm:253
+#: keyboard.pm:262
 #, c-format
-msgid "Romanian (qwertz)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwertz)"
 msgstr "Romanaidd (qwertz)"
 
-#: keyboard.pm:254
+#: keyboard.pm:263
 #, c-format
-msgid "Romanian (qwerty)"
+msgid ""
+"_: keyboard\n"
+"Romanian (qwerty)"
 msgstr "Romanaidd (qwerty)"
 
-#: keyboard.pm:256
+#: keyboard.pm:265
 #, c-format
-msgid "Russian (Phonetic)"
+msgid ""
+"_: keyboard\n"
+"Russian (phonetic)"
 msgstr "Rwsiaidd (Ffonetig)"
 
-#: keyboard.pm:257
+#: keyboard.pm:266
 #, c-format
-msgid "Saami (norwegian)"
+msgid ""
+"_: keyboard\n"
+"Saami (norwegian)"
 msgstr "Saami (norwyaidd)"
 
-#: keyboard.pm:258
+#: keyboard.pm:267
 #, c-format
-msgid "Saami (swedish/finnish)"
+msgid ""
+"_: keyboard\n"
+"Saami (swedish/finnish)"
 msgstr "Saami (Swedaidd/Ffinaidd)"
 
-#: keyboard.pm:260
+#: keyboard.pm:269
 #, c-format
-msgid "Slovenian"
+msgid ""
+"_: keyboard\n"
+"Slovenian"
 msgstr "Slfenaidd"
 
-#: keyboard.pm:261
+#: keyboard.pm:270
 #, c-format
-msgid "Slovakian (QWERTZ)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTZ)"
 msgstr "Slofacaidd (QWERTZ)"
 
-#: keyboard.pm:262
+#: keyboard.pm:271
 #, c-format
-msgid "Slovakian (QWERTY)"
+msgid ""
+"_: keyboard\n"
+"Slovakian (QWERTY)"
 msgstr "Slofacaidd (QWERTY)"
 
-#: keyboard.pm:264
+#: keyboard.pm:273
 #, c-format
-msgid "Serbian (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Serbian (cyrillic)"
 msgstr "Serbaidd (cyrilig)"
 
-#: keyboard.pm:265
+#: keyboard.pm:274
 #, c-format
-msgid "Syriac"
+msgid ""
+"_: keyboard\n"
+"Syriac"
 msgstr "Syriaidd"
 
-#: keyboard.pm:266
+#: keyboard.pm:275
 #, c-format
-msgid "Syriac (phonetic)"
+msgid ""
+"_: keyboard\n"
+"Syriac (phonetic)"
 msgstr "Syriaidd (ffonetig)"
 
-#: keyboard.pm:267
+#: keyboard.pm:276
 #, c-format
-msgid "Telugu"
+msgid ""
+"_: keyboard\n"
+"Telugu"
 msgstr "Telugu"
 
-#: keyboard.pm:269
+#: keyboard.pm:278
 #, c-format
-msgid "Tamil (ISCII-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (ISCII-layout)"
 msgstr "Tamil (cynllun TSCII)"
 
-#: keyboard.pm:270
+#: keyboard.pm:279
 #, c-format
-msgid "Tamil (Typewriter-layout)"
+msgid ""
+"_: keyboard\n"
+"Tamil (Typewriter-layout)"
 msgstr "Tamil (cynllun teipiadur)"
 
-#: keyboard.pm:271
+#: keyboard.pm:280
 #, c-format
-msgid "Thai keyboard"
+msgid ""
+"_: keyboard\n"
+"Thai"
 msgstr "Bysellfwrdd Thai"
 
-#: keyboard.pm:273
+#: keyboard.pm:282
 #, c-format
-msgid "Tajik keyboard"
+msgid ""
+"_: keyboard\n"
+"Tajik"
 msgstr "Bysellfwrdd Tajig"
 
-#: keyboard.pm:274
+#: keyboard.pm:283
 #, c-format
-msgid "Turkish (traditional \"F\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (traditional \"F\" model)"
 msgstr "Twrcaidd (model traddodiadol \"F\")"
 
-#: keyboard.pm:275
+#: keyboard.pm:284
 #, c-format
-msgid "Turkish (modern \"Q\" model)"
+msgid ""
+"_: keyboard\n"
+"Turkish (modern \"Q\" model)"
 msgstr "Twrcaidd (model modern \"Q\")"
 
-#: keyboard.pm:277
+#: keyboard.pm:286
 #, c-format
-msgid "Ukrainian"
+msgid ""
+"_: keyboard\n"
+"Ukrainian"
 msgstr "Wcranaidd"
 
-#: keyboard.pm:280
+#: keyboard.pm:289
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Bysellfwrdd UDA (rhyngwladol)"
 
-#: keyboard.pm:281
+#: keyboard.pm:290
 #, c-format
-msgid "Uzbek (cyrillic)"
+msgid ""
+"_: keyboard\n"
+"Uzbek (cyrillic)"
 msgstr "Uzbekaidd (cyrillig)"
 
-#: keyboard.pm:282
+#: keyboard.pm:292
 #, c-format
-msgid "Vietnamese \"numeric row\" QWERTY"
+msgid ""
+"_: keyboard\n"
+"Vietnamese \"numeric row\" QWERTY"
 msgstr "Fietnamëaidd \"rhes rhifol\" QWERTY"
 
-#: keyboard.pm:283
+#: keyboard.pm:293
 #, c-format
-msgid "Yugoslavian (latin)"
+msgid ""
+"_: keyboard\n"
+"Yugoslavian (latin)"
 msgstr "Iwgoslafaidd (lladin)"
 
-#: keyboard.pm:290
+#: keyboard.pm:300
 #, c-format
 msgid "Right Alt key"
 msgstr "Bysell Alt dde"
 
-#: keyboard.pm:291
+#: keyboard.pm:301
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Y ddwy fysell Shift gyda'i gilydd"
 
-#: keyboard.pm:292
+#: keyboard.pm:302
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Bysellau Control a Shift gyda'i gilydd"
 
-#: keyboard.pm:293
+#: keyboard.pm:303
 #, c-format
 msgid "CapsLock key"
 msgstr "Bysell CapsLock"
 
-#: keyboard.pm:294
+#: keyboard.pm:304
+#, c-format
+msgid "Shift and CapsLock keys simultaneously"
+msgstr "Bysellau Shift ac CapsLock gyda'i gilydd"
+
+#: keyboard.pm:305
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Bysellau Ctrl ac Alt gyda'i gilydd"
 
-#: keyboard.pm:295
+#: keyboard.pm:306
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Bysellau Alt a Shift  gyda'i gilydd"
 
-#: keyboard.pm:296
+#: keyboard.pm:307
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Bysell \"Dewislen\""
 
-#: keyboard.pm:297
+#: keyboard.pm:308
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Bysell \"Windows\" chwith"
 
-#: keyboard.pm:298
+#: keyboard.pm:309
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Bysell \"Windows\" de"
 
-#: keyboard.pm:299
+#: keyboard.pm:310
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Y ddwy fysell Control gyda'i gilydd"
 
-#: keyboard.pm:300
+#: keyboard.pm:311
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Y ddwy fysell Alt gyda'i gilydd"
 
-#: keyboard.pm:301
+#: keyboard.pm:312
 #, c-format
 msgid "Left Shift key"
 msgstr "Bysell Shift chwith"
 
-#: keyboard.pm:302
+#: keyboard.pm:313
 #, c-format
 msgid "Right Shift key"
 msgstr "Bysell Alt dde"
 
-#: keyboard.pm:303
+#: keyboard.pm:314
 #, c-format
 msgid "Left Alt key"
 msgstr "Bysell Alt chwith"
 
-#: keyboard.pm:304
+#: keyboard.pm:315
 #, c-format
 msgid "Left Control key"
 msgstr "Bysell Control chwith"
 
-#: keyboard.pm:305
+#: keyboard.pm:316
 #, c-format
 msgid "Right Control key"
 msgstr "Bysell Control dde"
 
-#: keyboard.pm:336
+#: keyboard.pm:347
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7890,7 +8022,7 @@ msgstr ""
 "caniatáu newid rhwng bysellfyrddau gwahanol (e.e.: lladin neu\n"
 "arall)"
 
-#: keyboard.pm:341
+#: keyboard.pm:352
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7901,1164 +8033,1188 @@ msgstr ""
 "Yn ystod y gosod, bydd angen i chi ddefnyddio'r fysell\n"
 "Crtl de i newid rhwng bysellfyrddau cynllun gwahanol."
 
-#: lang.pm:153
+#. -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
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:169
-#, c-format
-msgid "Afghanistan"
-msgstr "Afghanistan"
-
-#: lang.pm:170
+#: lang.pm:182
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:171
+#: lang.pm:183
 #, c-format
 msgid "United Arab Emirates"
 msgstr "United Arab Emirates"
 
-#: lang.pm:172
+#: lang.pm:184
+#, c-format
+msgid "Afghanistan"
+msgstr "Afghanistan"
+
+#: lang.pm:185
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua a Barbuda"
 
-#: lang.pm:173
+#: lang.pm:186
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:174
+#: lang.pm:187
 #, c-format
 msgid "Albania"
 msgstr "Albania"
 
-#: lang.pm:175
+#: lang.pm:188
 #, c-format
 msgid "Armenia"
 msgstr "Armenia"
 
-#: lang.pm:176
+#: lang.pm:189
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: lang.pm:177
+#: lang.pm:190
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:178
+#: lang.pm:191
 #, c-format
 msgid "Antarctica"
 msgstr "Antarctica"
 
-#: lang.pm:179 standalone/drakxtv:48
+#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Yr Ariannin"
 
-#: lang.pm:180
+#: lang.pm:193
 #, c-format
 msgid "American Samoa"
 msgstr "American Samoa"
 
-#: lang.pm:182 standalone/drakxtv:46
+#: lang.pm:195 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: lang.pm:183
+#: lang.pm:196
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:184
+#: lang.pm:197
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: lang.pm:185
+#: lang.pm:198
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia ac Herzegovina"
 
-#: lang.pm:186
+#: lang.pm:199
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:187
+#: lang.pm:200
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:189
+#: lang.pm:202
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:190
+#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
 #, c-format
 msgid "Bulgaria"
 msgstr "Bwlgaria"
 
-#: lang.pm:191
+#: lang.pm:204
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: lang.pm:192
+#: lang.pm:205
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:193
+#: lang.pm:206
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:194
+#: lang.pm:207
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:195
+#: lang.pm:208
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: lang.pm:196
+#: lang.pm:209
 #, c-format
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: lang.pm:197
+#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
+#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: lang.pm:198
+#: lang.pm:211
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: lang.pm:199
+#: lang.pm:212
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:200
+#: lang.pm:213
 #, c-format
 msgid "Bouvet Island"
 msgstr "Ynys Bouvet"
 
-#: lang.pm:201
+#: lang.pm:214
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:202
+#: lang.pm:215
 #, c-format
 msgid "Belarus"
 msgstr "Belarus"
 
-#: lang.pm:203
+#: lang.pm:216
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:204
+#: lang.pm:217
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: lang.pm:205
+#: lang.pm:218
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Ynysoedd Cocos (Keeling)"
 
-#: lang.pm:206
+#: lang.pm:219
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Congo (Kinshasa)"
 
-#: lang.pm:207
+#: lang.pm:220
 #, c-format
 msgid "Central African Republic"
 msgstr "Gweriniaeth Canol Affrica"
 
-#: lang.pm:208
+#: lang.pm:221
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Congo (Brazzaville)"
 
-#: lang.pm:209
+#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
 #, c-format
 msgid "Switzerland"
 msgstr "Y Swisdir"
 
-#: lang.pm:210
+#: lang.pm:223
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: lang.pm:211
+#: lang.pm:224
 #, c-format
 msgid "Cook Islands"
 msgstr "Ynysoedd Cook"
 
-#: lang.pm:212
+#: lang.pm:225
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:213
+#: lang.pm:226
 #, c-format
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: lang.pm:214
+#: 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
 #, c-format
 msgid "China"
 msgstr "Tsieina"
 
-#: lang.pm:215
+#: lang.pm:228
 #, c-format
 msgid "Colombia"
 msgstr "Colombia"
 
-#: lang.pm:217
+#: lang.pm:230
+#, c-format
+msgid "Serbia & Montenegro"
+msgstr "Serbia a Montenegro"
+
+#: lang.pm:231
 #, c-format
 msgid "Cuba"
 msgstr "Ciwba"
 
-#: lang.pm:218
+#: lang.pm:232
 #, c-format
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: lang.pm:219
+#: lang.pm:233
 #, c-format
 msgid "Christmas Island"
 msgstr "Ynys Christmas"
 
-#: lang.pm:220
+#: lang.pm:234
 #, c-format
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: lang.pm:223
+#: lang.pm:237
 #, c-format
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:224
+#: lang.pm:238 network/adsl_consts.pm:302
 #, c-format
 msgid "Denmark"
 msgstr "Denmarc"
 
-#: lang.pm:225
+#: lang.pm:239
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:226
+#: lang.pm:240
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominican Republic"
 
-#: lang.pm:227
+#: lang.pm:241
 #, c-format
 msgid "Algeria"
 msgstr "Algeria"
 
-#: lang.pm:228
+#: lang.pm:242
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:229
+#: lang.pm:243
 #, c-format
 msgid "Estonia"
 msgstr "Estonia"
 
-#: lang.pm:230
+#: lang.pm:244
 #, c-format
 msgid "Egypt"
 msgstr "Yr Aifft"
 
-#: lang.pm:231
+#: lang.pm:245
 #, c-format
 msgid "Western Sahara"
 msgstr "Western Sahara"
 
-#: lang.pm:232
+#: lang.pm:246
 #, c-format
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: lang.pm:233 network/adsl_consts.pm:202 network/adsl_consts.pm:210
-#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
+#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
+#: network/adsl_consts.pm:551
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: lang.pm:234
+#: lang.pm:248
 #, c-format
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: lang.pm:235 network/adsl_consts.pm:127
+#: lang.pm:249 network/adsl_consts.pm:402
 #, c-format
 msgid "Finland"
 msgstr "Y Ffindir"
 
-#: lang.pm:236
+#: lang.pm:250
 #, c-format
 msgid "Fiji"
 msgstr "Ffiji"
 
-#: lang.pm:237
+#: lang.pm:251
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Ynysoedd y Falkland (Malvinas)"
 
-#: lang.pm:238
+#: lang.pm:252
 #, c-format
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: lang.pm:239
+#: lang.pm:253
 #, c-format
 msgid "Faroe Islands"
 msgstr "Ynysoedd Faroe"
 
-#: lang.pm:241
+#: lang.pm:255
 #, c-format
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:242 network/adsl_consts.pm:247 network/adsl_consts.pm:255
-#: network/netconnect.pm:51
+#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: lang.pm:243
+#: lang.pm:257
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:244
+#: lang.pm:258
 #, c-format
 msgid "Georgia"
 msgstr "Georgia"
 
-#: lang.pm:245
+#: lang.pm:259
 #, c-format
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: lang.pm:246
+#: lang.pm:260
 #, c-format
 msgid "Ghana"
 msgstr "Ghana"
 
-#: lang.pm:247
+#: lang.pm:261
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:248
+#: lang.pm:262
 #, c-format
 msgid "Greenland"
 msgstr "Greenland"
 
-#: lang.pm:249
+#: lang.pm:263
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:250
+#: lang.pm:264
 #, c-format
 msgid "Guinea"
 msgstr "Guinea"
 
-#: lang.pm:251
+#: lang.pm:265
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:252
+#: lang.pm:266
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
-#: lang.pm:254
+#: lang.pm:268
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "De Georgia ac Ynysoedd De Sandwich"
 
-#: lang.pm:255
+#: lang.pm:269
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: lang.pm:256
+#: lang.pm:270
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:257
+#: lang.pm:271
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: lang.pm:258
+#: lang.pm:272
 #, c-format
 msgid "Guyana"
 msgstr "Guyana"
 
-#: lang.pm:259
+#: lang.pm:273
 #, c-format
-msgid "China (Hong Kong)"
+msgid "Hong Kong SAR (China)"
 msgstr "Tseina (Hong Kong)"
 
-#: lang.pm:260
+#: lang.pm:274
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard a McDonald Islands"
 
-#: lang.pm:261
+#: lang.pm:275
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:262
+#: lang.pm:276
 #, c-format
 msgid "Croatia"
 msgstr "Croatia"
 
-#: lang.pm:263
+#: lang.pm:277
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:264 network/adsl_consts.pm:152
+#: lang.pm:278 network/adsl_consts.pm:436
 #, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: lang.pm:265
+#: lang.pm:279
 #, c-format
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: lang.pm:266 standalone/drakxtv:45
+#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Iwerddon"
 
-#: lang.pm:267
+#: lang.pm:281
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: lang.pm:268
+#: lang.pm:282
 #, c-format
 msgid "India"
 msgstr "India"
 
-#: lang.pm:269
+#: lang.pm:283
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: lang.pm:270
+#: lang.pm:284
 #, c-format
 msgid "Iraq"
 msgstr "Irac"
 
-#: lang.pm:271
+#: lang.pm:285
 #, c-format
 msgid "Iran"
 msgstr "Iran"
 
-#: lang.pm:272
+#: lang.pm:286
 #, c-format
 msgid "Iceland"
 msgstr "Ynys yr Iâ"
 
-#: lang.pm:274
+#: lang.pm:288
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:275
+#: lang.pm:289
 #, c-format
 msgid "Jordan"
 msgstr "Yr Iorddonen"
 
-#: lang.pm:276
+#: lang.pm:290
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: lang.pm:277
+#: lang.pm:291
 #, c-format
 msgid "Kenya"
 msgstr "Kenya"
 
-#: lang.pm:278
+#: lang.pm:292
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: lang.pm:279
+#: lang.pm:293
 #, c-format
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: lang.pm:280
+#: lang.pm:294
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:281
+#: lang.pm:295
 #, c-format
 msgid "Comoros"
 msgstr "Comoros"
 
-#: lang.pm:282
+#: lang.pm:296
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts a Nevis"
 
-#: lang.pm:283
+#: lang.pm:297
 #, c-format
 msgid "Korea (North)"
 msgstr "Corea (Gogledd)"
 
-#: lang.pm:284
+#: lang.pm:298
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: lang.pm:285
+#: lang.pm:299
 #, c-format
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: lang.pm:286
+#: lang.pm:300
 #, c-format
 msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
-#: lang.pm:287
+#: lang.pm:301
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: lang.pm:288
+#: lang.pm:302
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:289
+#: lang.pm:303
 #, c-format
 msgid "Lebanon"
 msgstr "Libanus"
 
-#: lang.pm:290
+#: lang.pm:304
 #, c-format
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: lang.pm:291
+#: lang.pm:305
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:292
+#: lang.pm:306
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:293
+#: lang.pm:307
 #, c-format
 msgid "Liberia"
 msgstr "Liberia"
 
-#: lang.pm:294
+#: lang.pm:308
 #, c-format
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:295
+#: lang.pm:309 network/adsl_consts.pm:479
 #, c-format
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: lang.pm:296
+#: lang.pm:310
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: lang.pm:297
+#: lang.pm:311
 #, c-format
 msgid "Latvia"
 msgstr "Latfia"
 
-#: lang.pm:298
+#: lang.pm:312
 #, c-format
 msgid "Libya"
 msgstr "Libya"
 
-#: lang.pm:299
+#: lang.pm:313 network/adsl_consts.pm:487
 #, c-format
 msgid "Morocco"
 msgstr "Morocco"
 
-#: lang.pm:300
+#: lang.pm:314
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:301
+#: lang.pm:315
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:302
+#: lang.pm:316
 #, c-format
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: lang.pm:303
+#: lang.pm:317
 #, c-format
 msgid "Marshall Islands"
 msgstr "Ynysoedd Marshall"
 
-#: lang.pm:304
+#: lang.pm:318
 #, c-format
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: lang.pm:305
+#: lang.pm:319
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:306
+#: lang.pm:320
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:307
+#: lang.pm:321
 #, c-format
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: lang.pm:308
+#: lang.pm:322
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Ynysoedd Gogledd Mariana"
 
-#: lang.pm:309
+#: lang.pm:323
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:310
+#: lang.pm:324
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: lang.pm:311
+#: lang.pm:325
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:312
+#: lang.pm:326
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:313
+#: lang.pm:327
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:314
+#: lang.pm:328
 #, c-format
 msgid "Maldives"
 msgstr "Maldives"
 
-#: lang.pm:315
+#: lang.pm:329
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:316
+#: lang.pm:330
 #, c-format
 msgid "Mexico"
 msgstr "Mecsico"
 
-#: lang.pm:317
+#: lang.pm:331
 #, c-format
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: lang.pm:318
+#: lang.pm:332
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: lang.pm:319
+#: lang.pm:333
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:320
+#: lang.pm:334
 #, c-format
 msgid "New Caledonia"
 msgstr "Caledonia Newydd"
 
-#: lang.pm:321
+#: lang.pm:335
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:322
+#: lang.pm:336
 #, c-format
 msgid "Norfolk Island"
 msgstr "Ynys Norfolk"
 
-#: lang.pm:323
+#: lang.pm:337
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: lang.pm:324
+#: lang.pm:338
 #, c-format
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:327
+#: lang.pm:341
 #, c-format
 msgid "Nepal"
 msgstr "Nepal"
 
-#: lang.pm:328
+#: lang.pm:342
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:329
+#: lang.pm:343
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:330
+#: lang.pm:344
 #, c-format
 msgid "New Zealand"
 msgstr "Seland Newydd"
 
-#: lang.pm:331
+#: lang.pm:345
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:332
+#: lang.pm:346
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:333
+#: lang.pm:347
 #, c-format
 msgid "Peru"
 msgstr "Periw"
 
-#: lang.pm:334
+#: lang.pm:348
 #, c-format
 msgid "French Polynesia"
 msgstr "Polynesia Ffrengig"
 
-#: lang.pm:335
+#: lang.pm:349
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: lang.pm:336
+#: lang.pm:350
 #, c-format
 msgid "Philippines"
 msgstr "Philippines"
 
-#: lang.pm:337
+#: lang.pm:351
 #, c-format
 msgid "Pakistan"
 msgstr "Pacistan"
 
-#: lang.pm:338 network/adsl_consts.pm:186
+#: lang.pm:352 network/adsl_consts.pm:503
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: lang.pm:339
+#: lang.pm:353
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre a Miquelon"
 
-#: lang.pm:340
+#: lang.pm:354
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:341
+#: lang.pm:355
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:342
+#: lang.pm:356
 #, c-format
 msgid "Palestine"
 msgstr "Palestina"
 
-#: lang.pm:343 network/adsl_consts.pm:196
+#: lang.pm:357 network/adsl_consts.pm:513
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: lang.pm:344
+#: lang.pm:358
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:345
+#: lang.pm:359
 #, c-format
 msgid "Palau"
 msgstr "Palau"
 
-#: lang.pm:346
+#: lang.pm:360
 #, c-format
 msgid "Qatar"
 msgstr "Qatar"
 
-#: lang.pm:347
+#: lang.pm:361
 #, c-format
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:348
+#: lang.pm:362
 #, c-format
 msgid "Romania"
 msgstr "Rwmania"
 
-#: lang.pm:349
+#: lang.pm:363
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: lang.pm:350
+#: lang.pm:364
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:351
+#: lang.pm:365
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: lang.pm:352
+#: lang.pm:366
 #, c-format
 msgid "Solomon Islands"
 msgstr "Ynysoedd Solomon"
 
-#: lang.pm:353
+#: lang.pm:367
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: lang.pm:354
+#: lang.pm:368
 #, c-format
 msgid "Sudan"
 msgstr "Swdan"
 
-#: lang.pm:356
+#: lang.pm:370
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: lang.pm:357
+#: lang.pm:371
 #, c-format
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: lang.pm:358
+#: lang.pm:372 network/adsl_consts.pm:520
 #, c-format
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: lang.pm:359
+#: lang.pm:373
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Ynysoedd Svalbard a Jan Mayen"
 
-#: lang.pm:360
+#: lang.pm:374
 #, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: lang.pm:361
+#: lang.pm:375
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: lang.pm:362
+#: lang.pm:376
 #, c-format
 msgid "San Marino"
 msgstr "San Marino"
 
-#: lang.pm:363
+#: lang.pm:377
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:364
+#: lang.pm:378
 #, c-format
 msgid "Somalia"
 msgstr "Somalia"
 
-#: lang.pm:365
+#: lang.pm:379
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:366
+#: lang.pm:380
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome a Principe"
 
-#: lang.pm:367
+#: lang.pm:381
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:368
+#: lang.pm:382
 #, c-format
 msgid "Syria"
 msgstr "Syria"
 
-#: lang.pm:369
+#: lang.pm:383
 #, c-format
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: lang.pm:370
+#: lang.pm:384
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Ynysoedd Turks a Caicos"
 
-#: lang.pm:371
+#: lang.pm:385
 #, c-format
 msgid "Chad"
 msgstr "Chad"
 
-#: lang.pm:372
+#: lang.pm:386
 #, c-format
 msgid "French Southern Territories"
 msgstr "French Southern Territories"
 
-#: lang.pm:373
+#: lang.pm:387
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:374
+#: lang.pm:388 network/adsl_consts.pm:585
 #, c-format
 msgid "Thailand"
 msgstr "Gwlad Thail"
 
-#: lang.pm:375
+#: lang.pm:389
 #, c-format
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: lang.pm:376
+#: lang.pm:390
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:377
+#: lang.pm:391
 #, c-format
 msgid "East Timor"
 msgstr "Dwyrain Timor"
 
-#: lang.pm:378
+#: lang.pm:392
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: lang.pm:379
+#: lang.pm:393
 #, c-format
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: lang.pm:380
+#: lang.pm:394
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:381
+#: lang.pm:395
 #, c-format
 msgid "Turkey"
 msgstr "Twrci"
 
-#: lang.pm:382
+#: lang.pm:396
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad a Tobago"
 
-#: lang.pm:383
+#: lang.pm:397
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:384
+#: lang.pm:398
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: lang.pm:385
+#: lang.pm:399
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: lang.pm:386
+#: lang.pm:400
 #, c-format
 msgid "Ukraine"
 msgstr "Wcrain"
 
-#: lang.pm:387
+#: lang.pm:401
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:388
+#: lang.pm:402
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: lang.pm:390
+#: lang.pm:404
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:391
+#: lang.pm:405
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: lang.pm:392
+#: lang.pm:406
 #, c-format
 msgid "Vatican"
 msgstr "Fatican"
 
-#: lang.pm:393
+#: lang.pm:407
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent a'r Grenadines"
 
-#: lang.pm:394
+#: lang.pm:408
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:395
+#: lang.pm:409
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Virgin Islands (British)"
 
-#: lang.pm:396
+#: lang.pm:410
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Virgin Islands (U.S.)"
 
-#: lang.pm:397
+#: lang.pm:411
 #, c-format
 msgid "Vietnam"
 msgstr "Fietnam"
 
-#: lang.pm:398
+#: lang.pm:412
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:399
+#: lang.pm:413
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis a Futuna"
 
-#: lang.pm:400
+#: lang.pm:414
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:401
+#: lang.pm:415
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:402
+#: lang.pm:416
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:403
-#, c-format
-msgid "Serbia & Montenegro"
-msgstr "Serbia a Montenegro"
-
-#: lang.pm:404 standalone/drakxtv:47
+#: lang.pm:417 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "De Affrica"
 
-#: lang.pm:405
+#: lang.pm:418
 #, c-format
 msgid "Zambia"
 msgstr "Zambia"
 
-#: lang.pm:406
+#: lang.pm:419
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:1004
+#: lang.pm:1047
+#, fuzzy, c-format
+msgid "You should install the following packages: %s"
+msgstr "Mae'r pecynnau canlynol angen eu gosod: %s!"
+
+#. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
+#: lang.pm:1050 standalone/scannerdrake:135
+#, c-format
+msgid ", "
+msgstr ", "
+
+#: lang.pm:1101
 #, c-format
 msgid "Welcome to %s"
 msgstr "Croeso i %s"
 
-#: loopback.pm:32
+#: loopback.pm:31
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Gosodiadau cylch %s\n"
 
-#: lvm.pm:115
+#: lvm.pm:116
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Tynnu'r cyfrolau rhesymegol yn gyntaf\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:982
+#: modules/interactive.pm:21 standalone/drakconnect:1033
 #, c-format
 msgid "Parameters"
 msgstr "Paramedrau"
 
-#: modules/interactive.pm:21 standalone/draksec:44
+#: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
 msgstr "NONE"
@@ -9075,8 +9231,8 @@ msgstr "Mae modd i chi ffurfweddu pob paramedr o'r modiwl yma"
 
 #: modules/interactive.pm:63
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "Wedi canfod rhyngwynebau %s %s"
+msgid "Found %s interfaces"
+msgstr "Wedi canfod rhyngwynebau %s"
 
 #: modules/interactive.pm:64
 #, c-format
@@ -9132,12 +9288,12 @@ msgid "Module options:"
 msgstr "Dewisiadau modiwl:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:118
+#: modules/interactive.pm:119
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Pa yrrwr %s ddylwn drio?"
 
-#: modules/interactive.pm:127
+#: modules/interactive.pm:128
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -9157,17 +9313,17 @@ msgstr ""
 "unrhyw\n"
 "ddifrod."
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Autoprobe"
 msgstr "Awtoholi"
 
-#: modules/interactive.pm:131
+#: modules/interactive.pm:132
 #, c-format
 msgid "Specify options"
 msgstr "Enwi dewisiadau"
 
-#: modules/interactive.pm:143
+#: modules/interactive.pm:144
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9226,11 +9382,11 @@ msgstr "Llygoden Olwyn PS Generig"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
-#: network/modem.pm:108 network/netconnect.pm:586 network/netconnect.pm:591
-#: network/netconnect.pm:603 network/netconnect.pm:608
-#: network/netconnect.pm:624 network/netconnect.pm:626
+#: 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
 #, c-format
 msgid "Automatic"
 msgstr "Awtomatig"
@@ -9375,50 +9531,55 @@ msgstr "Cyffredinol"
 msgid "Any PS/2 & USB mice"
 msgstr "Unrhyw lygoden PS/2 ac USB"
 
-#: mouse.pm:92 standalone/drakvpn:1140
+#: mouse.pm:89 mouse.pm:359 mouse.pm:368 mouse.pm:420
+#, c-format
+msgid "Synaptics Touchpad"
+msgstr ""
+
+#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "dim"
 
-#: mouse.pm:94
+#: mouse.pm:95
 #, c-format
 msgid "No mouse"
 msgstr "Dim llygoden"
 
-#: mouse.pm:514
+#: mouse.pm:546
 #, c-format
 msgid "Please test the mouse"
 msgstr "Profwch y llygoden"
 
-#: mouse.pm:516
+#: mouse.pm:548
 #, c-format
 msgid "To activate the mouse,"
 msgstr "I ysgogi'r llygoden,"
 
-#: mouse.pm:517
+#: mouse.pm:549
 #, c-format
 msgid "MOVE YOUR WHEEL!"
 msgstr "SYMUDWCH YR OLWYN!"
 
 #: network/adsl.pm:19
 #, c-format
-msgid "use pppoe"
-msgstr "defnyddiwch pppoe"
+msgid "use PPPoE"
+msgstr "defnyddiwch PPPoE"
 
 #: network/adsl.pm:20
 #, c-format
-msgid "use pptp"
-msgstr "defnyddiwch pptp"
+msgid "use PPTP"
+msgstr "defnyddiwch PPTP"
 
 #: network/adsl.pm:21
 #, c-format
-msgid "use dhcp"
+msgid "use DHCP"
 msgstr "defnyddiwch dhccp"
 
 #: network/adsl.pm:22
-#, c-format
-msgid "Alcatel speedtouch usb"
-msgstr "usb Alcatel Speedtouch"
+#, fuzzy, c-format
+msgid "Alcatel Speedtouch USB"
+msgstr "Modem USB Alcatel Speedtouch"
 
 #: network/adsl.pm:22 network/adsl.pm:23 network/adsl.pm:24
 #, c-format
@@ -9427,36 +9588,36 @@ msgstr " - canfuwyd"
 
 #: network/adsl.pm:23
 #, c-format
-msgid "Sagem (using pppoa) usb"
-msgstr "USB Sagem (defnyddio pppoa)"
+msgid "Sagem (using PPPoA) USB"
+msgstr "USB Sagem (defnyddio PPOA)"
 
 #: network/adsl.pm:24
 #, c-format
-msgid "Sagem (using dhcp) usb"
-msgstr "USB Sagem (defnyddio dhcp)"
+msgid "Sagem (using DHCP) USB"
+msgstr "USB Sagem (defnyddio DHCP)"
 
-#: network/adsl.pm:35 network/netconnect.pm:761
+#: network/adsl.pm:35 network/netconnect.pm:799
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Cysylltu â'r We"
 
-#: network/adsl.pm:36 network/netconnect.pm:762
+#: network/adsl.pm:36 network/netconnect.pm:800
 #, 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'"
+"Some connections use PPTP, a few use DHCP.\n"
+"If you don't 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"
+"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:766
+#: network/adsl.pm:41 network/netconnect.pm:804
 #, c-format
-msgid "ADSL connection type :"
+msgid "ADSL connection type:"
 msgstr "Math o gysylltiad ADSL :"
 
-#: network/drakfirewall.pm:12
+#: network/drakfirewall.pm:12 share/compssUsers.pl:84
 #, c-format
 msgid "Web Server"
 msgstr "Gweinydd Gwe"
@@ -9585,106 +9746,107 @@ msgstr "Popeth (dim mur cadarn)"
 msgid "Other ports"
 msgstr "Pyrth eraill"
 
-#: network/isdn.pm:109 network/netconnect.pm:436
+#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
+#: network/netconnect.pm:567
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "Heb ei restru - golygu gyda llaw"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:151 network/netconnect.pm:385
+#: network/isdn.pm:168 network/netconnect.pm:388
 #, c-format
 msgid "I don't know"
 msgstr "Dim syniad"
 
-#: network/isdn.pm:152 network/netconnect.pm:385
+#: network/isdn.pm:169 network/netconnect.pm:388
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:153 network/netconnect.pm:385
+#: network/isdn.pm:170 network/netconnect.pm:388
 #, c-format
 msgid "USB"
 msgstr "USB"
 
-#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
-#: network/netconnect.pm:591 network/netconnect.pm:608
-#: network/netconnect.pm:624
+#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
+#: network/netconnect.pm:612 network/netconnect.pm:629
+#: network/netconnect.pm:645
 #, c-format
 msgid "Manual"
 msgstr "Llaw"
 
-#: network/netconnect.pm:88 network/netconnect.pm:465
-#: network/netconnect.pm:475
+#: network/netconnect.pm:89 network/netconnect.pm:485
+#: network/netconnect.pm:489
 #, c-format
 msgid "Manual choice"
 msgstr "Dewis gyda llaw"
 
-#: network/netconnect.pm:88
+#: network/netconnect.pm:89
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Cerdyn ISDN mewnol"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:98
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:99
 #, c-format
 msgid "Managed"
 msgstr "Rheolwyd"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:100
 #, c-format
 msgid "Master"
 msgstr "Meistr"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:101
 #, c-format
 msgid "Repeater"
 msgstr "Eilydd"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:102
 #, c-format
 msgid "Secondary"
 msgstr "Eilradd"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:103
 #, c-format
 msgid "Auto"
 msgstr "Awtomatig"
 
-#: network/netconnect.pm:105 printer/printerdrake.pm:1133
-#: standalone/drakups:64
+#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "Ffurfweddiad gyda llaw"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:107
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP awtomatig (BOOTP/DHCP)"
 
-#: network/netconnect.pm:108
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "IP awtomatig (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:111
+#: network/netconnect.pm:112
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protocol ar gyfer gweddill y byd"
 
-#: network/netconnect.pm:113 standalone/drakconnect:541
+#: network/netconnect.pm:114 standalone/drakconnect:539
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Protocol Ewropeaidd (EDSSI)"
 
-#: network/netconnect.pm:114 standalone/drakconnect:542
+#: network/netconnect.pm:115 standalone/drakconnect:540
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -9693,163 +9855,168 @@ msgstr ""
 "Protocol ar gyfer gweddill y byd\n"
 " dim D-Channel (llinell les)"
 
-#: network/netconnect.pm:147
+#: network/netconnect.pm:151
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Modem USB Alcatel Speedtouch"
 
-#: network/netconnect.pm:148
+#: network/netconnect.pm:152
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Modem USB Sagem"
 
-#: network/netconnect.pm:149
+#: network/netconnect.pm:153
 #, c-format
 msgid "Bewan modem"
 msgstr "Modem Bewan"
 
-#: network/netconnect.pm:150
+#: network/netconnect.pm:154
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "Modem ECI Hi-Focus"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:158
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:155
+#: network/netconnect.pm:159
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Ffurfweddu TCP/IP  gyda llaw"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:160
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Point to Point Tunneling Protocol (PPTP)"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:161
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP over Ethernet (PPPoE)"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:162
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:163
+#, c-format
+msgid "DSL over CAPI"
+msgstr ""
+
+#: network/netconnect.pm:167
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Pont Ethernet LLC"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:168
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Pont Ethernet VC"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:169
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Trywydd IP LLC"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:170
 #, c-format
 msgid "Routed IP VC"
 msgstr "Trywydd IP VC"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:171
 #, c-format
-msgid "PPPOA LLC"
-msgstr "PPPOA LLC"
+msgid "PPPoA LLC"
+msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:172
 #, c-format
-msgid "PPPOA VC"
-msgstr "PPPOA VC"
+msgid "PPPoA VC"
+msgstr "PPPoA VC"
 
-#: network/netconnect.pm:171 standalone/drakconnect:477
+#: network/netconnect.pm:176 standalone/drakconnect:474
 #, c-format
 msgid "Script-based"
 msgstr "Seiliedig ar sgript"
 
-#: network/netconnect.pm:172 standalone/drakconnect:477
+#: network/netconnect.pm:177 standalone/drakconnect:474
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:173 standalone/drakconnect:477
+#: network/netconnect.pm:178 standalone/drakconnect:474
 #, c-format
 msgid "Terminal-based"
 msgstr "Seiliedig ar derfynell"
 
-#: network/netconnect.pm:174 standalone/drakconnect:477
+#: network/netconnect.pm:179 standalone/drakconnect:474
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:175 standalone/drakconnect:477
+#: network/netconnect.pm:180 standalone/drakconnect:474
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:228 standalone/drakconnect:55
+#: network/netconnect.pm:236 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Ffurfweddiad y Rhwydwaith a'r Rhyngrwyd"
 
-#: network/netconnect.pm:234
+#: network/netconnect.pm:242
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(canfyddwyd ar borth %s)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected %s)"
 msgstr "(canfyddwyd %s)"
 
-#: network/netconnect.pm:236
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected)"
 msgstr "(canfuwyd)"
 
-#: network/netconnect.pm:238
+#: network/netconnect.pm:246
 #, c-format
 msgid "Modem connection"
 msgstr "Cysylltiad modem"
 
-#: network/netconnect.pm:239
+#: network/netconnect.pm:247
 #, c-format
 msgid "ISDN connection"
 msgstr "Cysylltiad ISDN"
 
-#: network/netconnect.pm:240
+#: network/netconnect.pm:248
 #, c-format
 msgid "ADSL connection"
 msgstr "Cysylltiad ADSL"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:249
 #, c-format
 msgid "Cable connection"
 msgstr "Cysylltiad cebl"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:250
 #, c-format
 msgid "LAN connection"
 msgstr "cysylltiad LAN"
 
-#: network/netconnect.pm:243 network/netconnect.pm:257
+#: network/netconnect.pm:251 network/netconnect.pm:265
 #, c-format
 msgid "Wireless connection"
 msgstr "Cysylltiad diwyfr"
 
-#: network/netconnect.pm:253
+#: network/netconnect.pm:261
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Dewiswch y math o gysylltiad rydych am ei ffurfweddu"
 
-#: network/netconnect.pm:270
+#: network/netconnect.pm:279
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9862,131 +10029,130 @@ msgstr ""
 "\n"
 "Pwyswch \"%s\" i barhau."
 
-#: network/netconnect.pm:278 network/netconnect.pm:788
+#: network/netconnect.pm:287 network/netconnect.pm:839
 #, c-format
 msgid "Connection Configuration"
 msgstr "Ffurfweddiad y Cysylltiad"
 
-#: network/netconnect.pm:279 network/netconnect.pm:789
+#: network/netconnect.pm:288 network/netconnect.pm:840
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Llanwch neu ticiwch y maes islaw"
 
-#: network/netconnect.pm:286 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:530
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ y cerdyn"
 
-#: network/netconnect.pm:287 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:531
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Cof Cerdyn (DMA)"
 
-#: network/netconnect.pm:288 standalone/drakconnect:534
+#: network/netconnect.pm:297 standalone/drakconnect:532
 #, c-format
 msgid "Card IO"
 msgstr "IO'r Cerdyn"
 
-#: network/netconnect.pm:289 standalone/drakconnect:535
+#: network/netconnect.pm:298 standalone/drakconnect:533
 #, c-format
 msgid "Card IO_0"
 msgstr "IO_O y cerdyn"
 
-#: network/netconnect.pm:290
+#: network/netconnect.pm:299
 #, c-format
 msgid "Card IO_1"
 msgstr "IO_1 y cerdyn"
 
-#: network/netconnect.pm:291
+#: network/netconnect.pm:300
 #, c-format
 msgid "Your personal phone number"
 msgstr "Eich rhif ffôn personol"
 
-#: network/netconnect.pm:292 network/netconnect.pm:792
+#: network/netconnect.pm:301 network/netconnect.pm:843
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Enw darparwr (eng. darparwr.net)"
 
-#: network/netconnect.pm:293 standalone/drakconnect:473
+#: network/netconnect.pm:302 standalone/drakconnect:469
 #, c-format
 msgid "Provider phone number"
 msgstr "Rhif ffôn y darparwr"
 
-#: network/netconnect.pm:294
+#: network/netconnect.pm:303
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Darparwr DNS 1 (dewisol)"
 
-#: network/netconnect.pm:295
+#: network/netconnect.pm:304
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Darparwr DNS 2 (dewisol)"
 
-#: network/netconnect.pm:296 standalone/drakconnect:429
+#: network/netconnect.pm:305 standalone/drakconnect:420
 #, c-format
 msgid "Dialing mode"
 msgstr "Modd deialu"
 
-#: network/netconnect.pm:297 standalone/drakconnect:434
-#: standalone/drakconnect:495
+#: network/netconnect.pm:306 standalone/drakconnect:425
+#: standalone/drakconnect:493
 #, c-format
 msgid "Connection speed"
 msgstr "Cyflymder y cysylltiad"
 
-#: network/netconnect.pm:298 standalone/drakconnect:439
+#: network/netconnect.pm:307 standalone/drakconnect:430
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Oediad yn y cysylltiad (mewn eiliadau)"
 
-#: network/netconnect.pm:301 network/netconnect.pm:795
-#: standalone/drakconnect:471
+#: network/netconnect.pm:310 network/netconnect.pm:846
+#: standalone/drakconnect:467
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Mewngofnod Cyfrif (enw defnyddiwr)"
 
-#: network/netconnect.pm:302 network/netconnect.pm:796
-#: standalone/drakconnect:472
+#: network/netconnect.pm:311 network/netconnect.pm:847
+#: standalone/drakconnect:468
 #, c-format
 msgid "Account Password"
 msgstr "Cyfrinair y Cyfrif"
 
-#: network/netconnect.pm:332 network/netconnect.pm:649
-#: network/netconnect.pm:827
+#: network/netconnect.pm:328 network/netconnect.pm:677
+#: network/netconnect.pm:880
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "Dewis y rhyngwyneb rhwydwaith i'w ffurfweddu:"
 
-#: network/netconnect.pm:334 network/netconnect.pm:375
-#: network/netconnect.pm:650 network/netconnect.pm:829 network/shorewall.pm:84
-#: standalone/drakconnect:656 standalone/drakgw:225 standalone/drakvpn:221
+#: 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
 #, c-format
 msgid "Net Device"
 msgstr "Dyfais Rhyngrwyd"
 
-#: network/netconnect.pm:335 network/netconnect.pm:343
+#: network/netconnect.pm:331 network/netconnect.pm:339
 #, c-format
 msgid "External ISDN modem"
 msgstr "Modem IDSN Allanol"
 
-#. -PO: Do not alter the <span ..> and </span> tags
-#: network/netconnect.pm:374 standalone/harddrake2:121
+#: network/netconnect.pm:377 standalone/harddrake2:192
 #, c-format
-msgid "Select a device !"
+msgid "Select a device!"
 msgstr "Dewis dyfais!"
 
-#: network/netconnect.pm:383 network/netconnect.pm:393
-#: network/netconnect.pm:403 network/netconnect.pm:419
-#: network/netconnect.pm:433
+#: network/netconnect.pm:386 network/netconnect.pm:396
+#: network/netconnect.pm:406 network/netconnect.pm:439
+#: network/netconnect.pm:453
 #, c-format
 msgid "ISDN Configuration"
 msgstr "Ffurfweddiad ISDN"
 
-#: network/netconnect.pm:384
+#: network/netconnect.pm:387
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Pa fath o gerdyn sydd gennych?"
 
-#: network/netconnect.pm:394
+#: network/netconnect.pm:397
 #, c-format
 msgid ""
 "\n"
@@ -10000,34 +10166,48 @@ msgstr ""
 "\n"
 "Os oes gennych gerdyn PCMCIA, rhaid i chi wybod irq ac io eich cerdyn.\n"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Continue"
 msgstr "Parhau"
 
-#: network/netconnect.pm:398
+#: network/netconnect.pm:401
 #, c-format
 msgid "Abort"
 msgstr "Peidio"
 
-#: network/netconnect.pm:404
+#: network/netconnect.pm:407
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Pa un o'r canlynol yw eich cerdyn IDSN?"
 
-#: network/netconnect.pm:419
+#: network/netconnect.pm:425
+#, 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 ""
+
+#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:117
+#, c-format
+msgid "Driver"
+msgstr "Gyrrwr"
+
+#: network/netconnect.pm:439
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Pa brotocol ydych chi eisiau ei ddefnyddio?"
 
-#: network/netconnect.pm:421 standalone/drakconnect:116
-#: standalone/drakconnect:318 standalone/drakconnect:540
+#: network/netconnect.pm:441 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:538
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
 
-#: network/netconnect.pm:433
+#: network/netconnect.pm:453
 #, c-format
 msgid ""
 "Select your provider.\n"
@@ -10036,13 +10216,13 @@ msgstr ""
 "Dewiswch eich darparwr.\n"
 "Os nad yw ar eich rhestr, dewiswch Heb ei Restri"
 
-#: network/netconnect.pm:435 network/netconnect.pm:541
-#: network/netconnect.pm:683
+#: network/netconnect.pm:455 network/netconnect.pm:563
+#: network/netconnect.pm:719
 #, c-format
 msgid "Provider:"
 msgstr "Darparwr:"
 
-#: network/netconnect.pm:450
+#: network/netconnect.pm:470
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -10051,122 +10231,117 @@ msgstr ""
 "Nid yw'r system yn cynnal eich modem.\n"
 "Ewch i http://www.linmodems.org"
 
-#: network/netconnect.pm:462
+#: network/netconnect.pm:482
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Dewis y modem i'w ffurfweddu:"
 
-#: network/netconnect.pm:469 standalone/drakgw:113 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."
-
-#: network/netconnect.pm:510
+#: network/netconnect.pm:530
 #, 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:539
+#: network/netconnect.pm:561
 #, c-format
 msgid "Select your provider:"
 msgstr "Dewis eich darparwr:"
 
-#: network/netconnect.pm:568
+#: network/netconnect.pm:589
 #, c-format
 msgid "Dialup: account options"
 msgstr "Deialu: dewisiadau cyfrif"
 
-#: network/netconnect.pm:571
+#: network/netconnect.pm:592
 #, c-format
 msgid "Connection name"
 msgstr "Enw'r cysylltiad"
 
-#: network/netconnect.pm:572
+#: network/netconnect.pm:593
 #, c-format
 msgid "Phone number"
 msgstr "Rhif ffôn"
 
-#: network/netconnect.pm:573
+#: network/netconnect.pm:594
 #, c-format
 msgid "Login ID"
 msgstr "Dynodiad Mewngofnodi"
 
-#: network/netconnect.pm:588 network/netconnect.pm:621
+#: network/netconnect.pm:609 network/netconnect.pm:642
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Deialu: paramedrau'r IP"
 
-#: network/netconnect.pm:591
+#: network/netconnect.pm:612
 #, c-format
 msgid "IP parameters"
 msgstr "Paramedrau IP"
 
-#: network/netconnect.pm:592 network/netconnect.pm:919
-#: printer/printerdrake.pm:431 standalone/drakconnect:116
-#: standalone/drakconnect:332 standalone/drakconnect:829
-#: standalone/drakups:266
+#: network/netconnect.pm:613 network/netconnect.pm:976
+#: printer/printerdrake.pm:454 standalone/drakconnect:116
+#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakups:282
 #, c-format
 msgid "IP address"
 msgstr "Cyfeiriad IP"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:614
 #, c-format
 msgid "Subnet mask"
 msgstr "Masg Isnet"
 
-#: network/netconnect.pm:605
+#: network/netconnect.pm:626
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Deialu: paramedrau DNS"
 
-#: network/netconnect.pm:608
+#: network/netconnect.pm:629
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:609
+#: network/netconnect.pm:630
 #, c-format
 msgid "Domain name"
 msgstr "Enw parth"
 
-#: network/netconnect.pm:610 network/netconnect.pm:793
-#: standalone/drakconnect:947
+#: network/netconnect.pm:631 network/netconnect.pm:844
+#: standalone/drakconnect:998
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Gweinydd DNS Cyntaf (dewisol)"
 
-#: network/netconnect.pm:611 network/netconnect.pm:794
-#: standalone/drakconnect:948
+#: network/netconnect.pm:632 network/netconnect.pm:845
+#: standalone/drakconnect:999
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Ail Wasanaethwr DNS (dewisol)"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:633
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Gosod enw'r gwesteiwr o'r IP"
 
-#: network/netconnect.pm:624 standalone/drakconnect:343
+#: network/netconnect.pm:645 standalone/drakconnect:334
 #, c-format
 msgid "Gateway"
 msgstr "Mynedfa"
 
-#: network/netconnect.pm:625
+#: network/netconnect.pm:646
 #, c-format
 msgid "Gateway IP address"
 msgstr "Cyfeiriad porth IP"
 
-#: network/netconnect.pm:649
+#: network/netconnect.pm:677
 #, c-format
 msgid "ADSL configuration"
 msgstr "Ffurfweddiad ADSL"
 
-#: network/netconnect.pm:681
+#: network/netconnect.pm:717
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Dewiswch eich darparwr ADSL"
 
-#: network/netconnect.pm:699
+#: network/netconnect.pm:735
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10177,32 +10352,32 @@ msgstr ""
 "Mae modd ei ddarparu ar ddisg meddal neu o'ch rhaniad windows,\n"
 "neu ei adael tan rhywbryd eto."
 
-#: network/netconnect.pm:703 network/netconnect.pm:708
+#: network/netconnect.pm:739 network/netconnect.pm:744
 #, c-format
 msgid "Use a floppy"
 msgstr "Defnyddiwch ddisg meddal"
 
-#: network/netconnect.pm:703 network/netconnect.pm:712
+#: network/netconnect.pm:739 network/netconnect.pm:748
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Defnyddio fy rhaniad Windows"
 
-#: network/netconnect.pm:703 network/netconnect.pm:715
+#: network/netconnect.pm:739 network/netconnect.pm:751
 #, c-format
 msgid "Do it later"
 msgstr "Gwneud yn hwyrach"
 
-#: network/netconnect.pm:722
+#: network/netconnect.pm:758
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Methodd copïo'r gadarnwedd, heb ganfod ffeil %s"
 
-#: network/netconnect.pm:729
+#: network/netconnect.pm:765
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Copïo'r gadarnwedd yn llwyddiant"
 
-#: network/netconnect.pm:744
+#: network/netconnect.pm:780
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10215,22 +10390,22 @@ msgstr ""
 "%s\n"
 "achopio'r mgmt.o i /usr/share/speedtouch"
 
-#: network/netconnect.pm:797
+#: network/netconnect.pm:849
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:798
+#: network/netconnect.pm:850
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:800
+#: network/netconnect.pm:853
 #, c-format
-msgid "Encapsulation :"
+msgid "Encapsulation:"
 msgstr "Mewngapsiwleiddio :"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:870
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10242,25 +10417,25 @@ msgstr ""
 "\n"
 "Mae modd canfod gyrrwr ar http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:829
+#: network/netconnect.pm:882
 #, c-format
 msgid "Manually load a driver"
 msgstr ""
 
-#: network/netconnect.pm:844
-#, c-format
+#: network/netconnect.pm:898
+#, fuzzy, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"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 "
 "Rhyngrwyd.\n"
 "Derbyniwch y cynnig i gadw'r ddyfais wedi ei ffurfweddi.\n"
 "Bydd newid y meysydd islaw'n newid y ffurfweddiad."
 
-#: network/netconnect.pm:857 network/netconnect.pm:1228
+#: network/netconnect.pm:912 network/netconnect.pm:1340
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -10269,17 +10444,17 @@ msgstr ""
 "Llongyfarchiadau, mae ffurfweddiad y rhwydwaith a'r Rhyngrwyd wedi ei "
 "gwblhau\n"
 
-#: network/netconnect.pm:871
+#: network/netconnect.pm:929
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Cydraniad enw gwesteiwr Zeroconf"
 
-#: network/netconnect.pm:872 network/netconnect.pm:906
+#: network/netconnect.pm:930 network/netconnect.pm:963
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Ffurfweddu dyfais rhwydwaith %s (gyrrwr %s)"
 
-#: network/netconnect.pm:873
+#: network/netconnect.pm:931
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10288,7 +10463,7 @@ msgstr ""
 "Mae modd defnyddio'r protocolau canlynol i ffurfweddu cysylltiad ethernet. "
 "Dewiswch yr un i'w ddefnyddio."
 
-#: network/netconnect.pm:907
+#: network/netconnect.pm:964
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10299,89 +10474,95 @@ msgstr ""
 "Dylai pob eitem ei roi fel cyfeiriad IP nodiant collnod degymol\n"
 "(e.e.1.2.3.4)."
 
-#: network/netconnect.pm:914
+#: network/netconnect.pm:971
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Rhowch enw'r gwesteiwr o'r cyfeiriad DHCP"
 
-#: network/netconnect.pm:915
+#: network/netconnect.pm:972
 #, c-format
 msgid "DHCP host name"
 msgstr "Enw gwesteiwr DHCP"
 
-#: network/netconnect.pm:920 standalone/drakconnect:337
-#: standalone/drakconnect:830 standalone/drakgw:321
+#: network/netconnect.pm:977 standalone/drakconnect:328
+#: standalone/drakconnect:881 standalone/drakgw:323
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
 
-#: network/netconnect.pm:922 standalone/drakconnect:422
+#: network/netconnect.pm:979 standalone/drakconnect:413
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "Dilynwch gyfernod cerdyn rhwydwaith (defnyddiol ar gyfer gliniadur)"
 
-#: network/netconnect.pm:923 standalone/drakconnect:423
+#: network/netconnect.pm:980 standalone/drakconnect:414
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Plygio byw'r Rhwydwaith"
 
-#: network/netconnect.pm:924 standalone/drakconnect:417
+#: network/netconnect.pm:982 standalone/drakconnect:408
 #, c-format
 msgid "Start at boot"
 msgstr "Cychwyn y peiriant"
 
-#: network/netconnect.pm:926 standalone/drakconnect:833
+#: network/netconnect.pm:985 standalone/drakconnect:884
 #, c-format
 msgid "DHCP client"
 msgstr "Cleient DHCP"
 
-#: network/netconnect.pm:936 printer/printerdrake.pm:1383
-#: standalone/drakconnect:621
+#: network/netconnect.pm:995 printer/printerdrake.pm:1498
+#: standalone/drakconnect:648
 #, 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:939
+#: network/netconnect.pm:999
 #, c-format
-msgid "Warning : IP address %s is usually reserved !"
+msgid "Warning: IP address %s is usually reserved!"
 msgstr "Rhybudd : cyfeiriad IP %s wedi ei gadw fel rheol !"
 
-#: network/netconnect.pm:969 network/netconnect.pm:998
+#: network/netconnect.pm:1004 standalone/drakTermServ:1690
+#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#, c-format
+msgid "%s already in use\n"
+msgstr "%s yn cael ei ddefnyddio eisoes\n"
+
+#: network/netconnect.pm:1030 network/netconnect.pm:1059
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Rhowch baramedrau diwyfr y cerdyn:"
 
-#: network/netconnect.pm:972 standalone/drakconnect:389
+#: network/netconnect.pm:1033 standalone/drakconnect:380
 #, c-format
 msgid "Operating Mode"
 msgstr "Modd Gweithredu"
 
-#: network/netconnect.pm:974 standalone/drakconnect:390
+#: network/netconnect.pm:1035 standalone/drakconnect:381
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Enw'r rhwydwaith (ESSID)"
 
-#: network/netconnect.pm:975 standalone/drakconnect:391
+#: network/netconnect.pm:1036 standalone/drakconnect:382
 #, c-format
 msgid "Network ID"
 msgstr "Enw Rhwydwaith"
 
-#: network/netconnect.pm:976 standalone/drakconnect:392
+#: network/netconnect.pm:1037 standalone/drakconnect:383
 #, c-format
 msgid "Operating frequency"
 msgstr "Amledd gweithredu"
 
-#: network/netconnect.pm:977 standalone/drakconnect:393
+#: network/netconnect.pm:1038 standalone/drakconnect:384
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Trothwy sensitifrwydd"
 
-#: network/netconnect.pm:978 standalone/drakconnect:394
+#: network/netconnect.pm:1039 standalone/drakconnect:385
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Didradd (mewn b/s)"
 
-#: network/netconnect.pm:984
+#: network/netconnect.pm:1045
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10390,7 +10571,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:988
+#: network/netconnect.pm:1049
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10399,12 +10580,12 @@ msgstr ""
 "Dylai'r raddfa gael rhagosodiad K, M neu G (e.e.\"11M\" am 11M),  neu "
 "ychwanegi '0' (sero)."
 
-#: network/netconnect.pm:1001 standalone/drakconnect:405
+#: network/netconnect.pm:1062 standalone/drakconnect:396
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1063
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10427,24 +10608,24 @@ msgstr ""
 "i awto,\n"
 "gosodedig  neu ddiffodd"
 
-#: network/netconnect.pm:1009 standalone/drakconnect:406
+#: network/netconnect.pm:1070 standalone/drakconnect:397
 #, c-format
 msgid "Fragmentation"
 msgstr "Darniad"
 
-#: network/netconnect.pm:1010 standalone/drakconnect:407
+#: network/netconnect.pm:1071 standalone/drakconnect:398
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn Iwconfig"
 
-#: network/netconnect.pm:1011
+#: network/netconnect.pm:1072
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (nick is already set "
 "as the hostname).\n"
 "\n"
-"See iwpconfig(8) man page for further information."
+"See iwconfig(8) man page for further information."
 msgstr ""
 "Yma cewch ffurfweddu paramedrau diwyfr eraill megis,:\n"
 "ap, channel, commit, enc, power, retry, sens, txpower (nick wedi ei osod fel "
@@ -10453,12 +10634,12 @@ msgstr ""
 "Gw. tudalen iwpriv(8) man am rhagor 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:1018 standalone/drakconnect:408
+#: network/netconnect.pm:1079 standalone/drakconnect:399
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn lwspy"
 
-#: network/netconnect.pm:1019
+#: network/netconnect.pm:1080
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10477,12 +10658,12 @@ msgstr ""
 "\n"
 "Gw. tudalennau man iwpspy(8) am ragor o wybodaeth. "
 
-#: network/netconnect.pm:1027 standalone/drakconnect:409
+#: network/netconnect.pm:1088 standalone/drakconnect:400
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn Iwpriv"
 
-#: network/netconnect.pm:1028
+#: network/netconnect.pm:1089
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10510,28 +10691,7 @@ msgstr ""
 "\n"
 "Gw. tudalen iwpriv(8) man am rhagor o wybodaeth."
 
-#: network/netconnect.pm:1055
-#, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
-msgstr ""
-"Nid oes addasydd rhwydwaith ethernet wedi ei ganfod ar eich system.\n"
-"Nid wyf yn gallu gosod y math yma o gysylltiad."
-
-#: network/netconnect.pm:1059 standalone/drakgw:261 standalone/drakpxe:142
-#, c-format
-msgid "Choose the network interface"
-msgstr "Dewiswch rhag wyneb  y rhwydwaith"
-
-#: network/netconnect.pm:1060
-#, c-format
-msgid ""
-"Please choose which network adapter you want to use to connect to Internet."
-msgstr ""
-"Dewiswch ba addaswr rhwydwaith hoffech ei ddefnyddio i gysylltu â'r Rhyngrwyd"
-
-#: network/netconnect.pm:1081
+#: network/netconnect.pm:1163
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10544,87 +10704,87 @@ msgstr ""
 "megis \"fymlwch.fynesg.fyngho.com\".\n"
 "Gallwch hefyd gynnig eich cyfeiriad IP os oes gennych un"
 
-#: network/netconnect.pm:1085
+#: network/netconnect.pm:1167
 #, 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:1087 standalone/drakconnect:946
+#: network/netconnect.pm:1169 standalone/drakconnect:997
 #, c-format
 msgid "Host name (optional)"
 msgstr "Enw gwesteiwr (dewisol)"
 
-#: network/netconnect.pm:1087
+#: network/netconnect.pm:1169
 #, c-format
 msgid "Host name"
 msgstr "Enw gwesteiwr"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1171
 #, c-format
 msgid "DNS server 1"
 msgstr "Gweinydd DNS 1"
 
-#: network/netconnect.pm:1090
+#: network/netconnect.pm:1172
 #, c-format
 msgid "DNS server 2"
 msgstr "Gweinydd DNS 2"
 
-#: network/netconnect.pm:1091
+#: network/netconnect.pm:1173
 #, c-format
 msgid "DNS server 3"
 msgstr "Gweinydd DNS 3"
 
-#: network/netconnect.pm:1092
+#: network/netconnect.pm:1174
 #, c-format
 msgid "Search domain"
 msgstr "Chwilio parth"
 
-#: network/netconnect.pm:1093
+#: network/netconnect.pm:1175
 #, 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:1094
+#: network/netconnect.pm:1176
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Mynedfa (e.e. %s)"
 
-#: network/netconnect.pm:1096
+#: network/netconnect.pm:1178
 #, c-format
 msgid "Gateway device"
 msgstr "Dyfais mynedfa"
 
-#: network/netconnect.pm:1105
+#: network/netconnect.pm:1187
 #, 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:1110 standalone/drakconnect:624
+#: network/netconnect.pm:1192 standalone/drakconnect:651
 #, 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:1121
+#: network/netconnect.pm:1203
 #, c-format
 msgid ""
-"Enter a Zeroconf host name which will be the one that your machine will get "
-"back to other machines on the network:"
+"If desired, enter a Zeroconf hostname.\n"
+"This is the name your machine will use to advertise any of\n"
+"its shared resources that are not managed by the network.\n"
+"It is not necessary on most networks."
 msgstr ""
-"Rhowch enw gwesteiwr Zeroconf sef yr un fydd eich peiriant yn cael yn ôl at "
-"beiriannau etraill ar y rhwydwaith:"
 
-#: network/netconnect.pm:1122
+#: network/netconnect.pm:1207
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Enw Gwesteiwr Zeroconf"
 
-#: network/netconnect.pm:1125
+#: network/netconnect.pm:1210
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Rhaid i enw gwesteiwr Zeroconf beidio cynnwys ."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1220
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10635,35 +10795,55 @@ msgstr ""
 "Dewiswch ba un rydych am ei ddefnyddio.\n"
 "\n"
 
-#: network/netconnect.pm:1137
+#: network/netconnect.pm:1222
 #, c-format
 msgid "Internet connection"
 msgstr "Cysylltiad â'r Rhyngrwyd"
 
-#: network/netconnect.pm:1145
+#: network/netconnect.pm:1230
 #, c-format
-msgid "Configuration is complete, do you want to apply settings ?"
+msgid "Configuration is complete, do you want to apply settings?"
 msgstr "Mae'r ffurfweddu wedi ei gwblhau, hoffech eu gosod?"
 
-#: network/netconnect.pm:1155
+#: network/netconnect.pm:1240
 #, 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:1172
+#: network/netconnect.pm:1258
+#, fuzzy, c-format
+msgid "Automatically at boot"
+msgstr "Cychwyn y peiriant"
+
+#: network/netconnect.pm:1260
 #, c-format
-msgid "The network needs to be restarted. Do you want to restart it ?"
+msgid "By using Net Applet in the system tray"
+msgstr ""
+
+#: network/netconnect.pm:1262
+#, c-format
+msgid "Manually (the interface would still be activated at boot)"
+msgstr ""
+
+#: network/netconnect.pm:1271
+#, fuzzy, c-format
+msgid "How do you want to dial this connection?"
+msgstr "Ydych chi eisiau agor y cysylltiad wrth gychwyn y cyfrifiadur?"
+
+#: network/netconnect.pm:1284
+#, 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:1179 network/netconnect.pm:1244
+#: network/netconnect.pm:1291 network/netconnect.pm:1356
 #, c-format
 msgid "Network Configuration"
 msgstr "Ffurfweddiad y Rhwydwaith"
 
-#: network/netconnect.pm:1180
+#: network/netconnect.pm:1292
 #, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
+"A problem occurred while restarting the network: \n"
 "\n"
 "%s"
 msgstr ""
@@ -10671,27 +10851,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1188
+#: network/netconnect.pm:1300
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Hoffech chi gysylltu â'r Rhyngrwyd nawr?"
 
-#: network/netconnect.pm:1196 standalone/drakconnect:978
+#: network/netconnect.pm:1308 standalone/drakconnect:1029
 #, c-format
 msgid "Testing your connection..."
 msgstr "Profi eich cysylltiad..."
 
-#: network/netconnect.pm:1212
+#: network/netconnect.pm:1324
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Mae'r system wedi cysylltu â'r Rhyngrwyd."
 
-#: network/netconnect.pm:1213
+#: network/netconnect.pm:1325
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Am resymau diogelwch, bydd yn cael ei ddatgysylltu."
 
-#: network/netconnect.pm:1214
+#: network/netconnect.pm:1326
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10700,7 +10880,7 @@ msgstr ""
 "Nid yw'n ymddangos i'ch system gysylltu â'r Rhyngrwyd.\n"
 "Ailffurfweddwch eich cysylltiad."
 
-#: network/netconnect.pm:1231
+#: network/netconnect.pm:1343
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10710,10 +10890,10 @@ msgstr ""
 "amgylchedd X i osgoi unrhyw anawsterau'n perthyn i enwau gwesteiwr.\n"
 "."
 
-#: network/netconnect.pm:1232
+#: network/netconnect.pm:1344
 #, c-format
 msgid ""
-"Problems occured during configuration.\n"
+"Problems occurred during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't "
 "work, you might want to relaunch the configuration."
 msgstr ""
@@ -10721,7 +10901,7 @@ msgstr ""
 "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:1245
+#: network/netconnect.pm:1357
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10734,7 +10914,7 @@ msgstr ""
 "Cliciwch Iawn i gadw eich ffurfweddiad, neu ddileu i ail ffurfweddi eich "
 "cysylltiad Rhyngrwyd a Rhwydwaith.\n"
 
-#: network/netconnect.pm:1333
+#: network/netconnect.pm:1393
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10743,27 +10923,27 @@ msgstr ""
 "Digwyddodd gwall annisgwyl:\n"
 "%s"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "Proxies configuration"
 msgstr "Ffurfweddiad dirprwyon"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "HTTP proxy"
 msgstr "Dirprwy HTTP"
 
-#: network/network.pm:317
+#: network/network.pm:318
 #, c-format
 msgid "FTP proxy"
 msgstr "Dirprwy FTP"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Dylai dirprwyon fod yn gyfanrif!"
 
-#: network/network.pm:321
+#: network/network.pm:322
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "Dylai'r URL ddechrau gyda 'ftp' neu 'http:'"
@@ -10782,7 +10962,7 @@ msgstr ""
 "Rhybudd! Mae ffurfweddiad mur gwarchod wedi ei ganfod. Efallai bydd angen "
 "atgyweirio gyda llaw ar ôl y gosodiad."
 
-#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:214
+#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -10799,12 +10979,12 @@ msgstr ""
 "\t\teth0, neu eth1 fam gysylltiad cebl, \n"
 "\t\tippp+ am gysylltiad idsn.\n"
 
-#: network/tools.pm:165
+#: network/tools.pm:197
 #, c-format
 msgid "Insert floppy"
 msgstr "Rhowch ddisg meddal"
 
-#: network/tools.pm:166
+#: network/tools.pm:198
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -10813,22 +10993,22 @@ msgstr ""
 "Rhowch ddisg meddal wedi ei fformatio i FAT yng ngyrrwr %s gyda %s yng "
 "nghyfeiriadur gwraidd a phwyso %s"
 
-#: network/tools.pm:167
+#: network/tools.pm:199
 #, 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:645
+#: partition_table.pm:393
 #, c-format
 msgid "mount failed: "
 msgstr "maethodd y gosodiad"
 
-#: partition_table.pm:750
+#: partition_table.pm:498
 #, 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:768
+#: partition_table.pm:516
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -10839,22 +11019,22 @@ msgstr ""
 "Yr unig ateb yw i symud eich rhaniadau cynradd fel bo'r twll nesaf at y "
 "rhaniadau estynedig "
 
-#: partition_table.pm:855
+#: partition_table.pm:602
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Methodd adfer o ffeil %s: %s"
 
-#: partition_table.pm:857
+#: partition_table.pm:604
 #, c-format
 msgid "Bad backup file"
 msgstr "Ffeil wrth gefn gwallus"
 
-#: partition_table.pm:877
+#: partition_table.pm:624
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Gwall wrth ysgrifennu i ffeil %s"
 
-#: partition_table/raw.pm:187
+#: partition_table/raw.pm:238
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10866,27 +11046,27 @@ msgstr ""
 "Mae prawf i fesur ei gyfanrwydd wedi methu. \n"
 "Nid oes gwerth ysgrifennu i'r ddisg"
 
-#: pkgs.pm:24
+#: pkgs.pm:23
 #, c-format
 msgid "must have"
 msgstr "rhaid cael"
 
-#: pkgs.pm:25
+#: pkgs.pm:24
 #, c-format
 msgid "important"
 msgstr "pwysig"
 
-#: pkgs.pm:26
+#: pkgs.pm:25
 #, c-format
 msgid "very nice"
 msgstr "hyfryd iawn"
 
-#: pkgs.pm:27
+#: pkgs.pm:26
 #, c-format
 msgid "nice"
 msgstr "hyfryd"
 
-#: pkgs.pm:28
+#: pkgs.pm:27
 #, c-format
 msgid "maybe"
 msgstr "efallai"
@@ -10901,7 +11081,7 @@ msgstr "(ar %s)"
 msgid "(on this machine)"
 msgstr "(ar y peiriant hwn)"
 
-#: printer/cups.pm:115 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:203
 #, c-format
 msgid "Configured on other machines"
 msgstr "Ffurfweddu ar beiriannau eraill"
@@ -10911,296 +11091,306 @@ msgstr "Ffurfweddu ar beiriannau eraill"
 msgid "On CUPS server \"%s\""
 msgstr "Ar weinydd CUPS \"%s\""
 
-#: printer/cups.pm:117 printer/printerdrake.pm:3989
-#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
-#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
+#: printer/cups.pm:117 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
+#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
 #, c-format
 msgid " (Default)"
 msgstr "(Rhagosodedig)"
 
-#: printer/data.pm:22
+#: printer/data.pm:40
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue"
 
-#: printer/data.pm:23
+#: printer/data.pm:41
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:34
+#: printer/data.pm:53
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - Line Printer Daemon"
 
-#: printer/data.pm:35
+#: printer/data.pm:54
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:56
+#: printer/data.pm:76
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR New Generation"
 
-#: printer/data.pm:57
+#: printer/data.pm:77
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:82
+#: printer/data.pm:103
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Common Unix Printing System"
 
+#: printer/data.pm:132
+#, c-format
+msgid "CUPS - Common Unix Printing System (remote server)"
+msgstr "CUPS - Common Unix Printing System (gweinydd pell)"
+
+#: printer/data.pm:133
+#, 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/printerdrake.pm:686
+#: printer/detect.pm:466
 #, c-format
 msgid "Unknown Model"
 msgstr "Model anhysbys"
 
-#: printer/main.pm:29
+#: printer/main.pm:27
 #, c-format
 msgid "Local printer"
 msgstr "Argraffydd lleol"
 
-#: printer/main.pm:30
+#: printer/main.pm:28
 #, c-format
 msgid "Remote printer"
 msgstr "Argraffydd pell"
 
-#: printer/main.pm:31
+#: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
 msgstr "Argraffydd ar weinydd CUPS pell"
 
-#: printer/main.pm:32 printer/printerdrake.pm:1406
+#: printer/main.pm:30 printer/printerdrake.pm:1521
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "Argraffydd ar weinydd lpd pell"
 
-#: printer/main.pm:33
+#: printer/main.pm:31
 #, c-format
 msgid "Network printer (TCP/Socket)"
 msgstr "Argraffydd rhwydwaith (TCP/Soced)"
 
-#: printer/main.pm:34
+#: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Argraffydd ar weinydd SMB/Windows 95/98/NT"
 
-#: printer/main.pm:35
+#: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "Argraffydd ar weinydd NetWare"
 
-#: printer/main.pm:36 printer/printerdrake.pm:1410
+#: printer/main.pm:34 printer/printerdrake.pm:1525
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "Rhowch URI dyfais argraffydd"
 
-#: printer/main.pm:37
+#: printer/main.pm:35
 #, c-format
 msgid "Pipe job into a command"
 msgstr "Peipio'r gwaith i orchymyn"
 
-#: printer/main.pm:307 printer/main.pm:575 printer/main.pm:1545
-#: printer/main.pm:2229 printer/main.pm:2240 printer/printerdrake.pm:1866
-#: printer/printerdrake.pm:4396
+#: 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
 #, c-format
 msgid "Unknown model"
 msgstr "Model anhysbys"
 
-#: printer/main.pm:332 standalone/printerdrake:196
+#: printer/main.pm:346 standalone/printerdrake:202
 #, c-format
 msgid "Configured on this machine"
 msgstr "Ffurfweddwyd ar y peiriant hwn"
 
-#: printer/main.pm:338 printer/printerdrake.pm:963
+#: printer/main.pm:352 printer/printerdrake.pm:1069
 #, c-format
 msgid " on parallel port #%s"
 msgstr " ar borth paralel #\"%s"
 
-#: printer/main.pm:341 printer/printerdrake.pm:965
+#: printer/main.pm:355 printer/printerdrake.pm:1072
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", argraffydd USB #\"%s"
 
-#: printer/main.pm:343
+#: printer/main.pm:357
 #, c-format
 msgid ", USB printer"
 msgstr "argraffydd USB"
 
-#: printer/main.pm:348
+#: printer/main.pm:362
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", dyfais amlbwrpas ar borth paralel #\"%s"
 
-#: printer/main.pm:351
+#: printer/main.pm:365
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", dyfais amlbwrpas ar borth paralel"
 
-#: printer/main.pm:353
+#: printer/main.pm:367
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", dyfais amlbwrpas ar USB"
 
-#: printer/main.pm:355
+#: printer/main.pm:369
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", dyfais amlbwrpas ar HP JetDirect"
 
-#: printer/main.pm:357
+#: printer/main.pm:371
 #, c-format
 msgid ", multi-function device"
 msgstr ",dyfais amlbwrpas"
 
-#: printer/main.pm:360
+#: printer/main.pm:375
 #, c-format
 msgid ", printing to %s"
 msgstr ", argraffu i %s"
 
-#: printer/main.pm:362
+#: printer/main.pm:378
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr "ar weinydd LPD  \"%s\", argraffydd \"%s\""
 
-#: printer/main.pm:364
+#: printer/main.pm:381
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", gwesteiwr TCP/IP  \"%s\", porth %s"
 
-#: printer/main.pm:368
+#: printer/main.pm:386
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr "ar weinydd SMB/Windows  \"%s\", rhannu \"%s\""
 
-#: printer/main.pm:372
+#: printer/main.pm:391
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr "ar weinydd Novell \"%s\", argraffydd \"%s\""
 
-#: printer/main.pm:374
+#: printer/main.pm:394
 #, c-format
 msgid ", using command %s"
 msgstr ", defnyddio gorchymyn %s"
 
-#: printer/main.pm:389
+#: printer/main.pm:409
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Porth paralel #\"%s"
 
-#: printer/main.pm:392 printer/printerdrake.pm:979
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
+#: printer/main.pm:412 printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
 #, c-format
 msgid "USB printer #%s"
 msgstr "Argraffydd USB #\"%s"
 
-#: printer/main.pm:394
+#: printer/main.pm:414
 #, c-format
 msgid "USB printer"
 msgstr "argraffydd USB"
 
-#: printer/main.pm:399
+#: printer/main.pm:419
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Dyfais amlbwrpas ar borth paralel #\"%s"
 
-#: printer/main.pm:402
+#: printer/main.pm:422
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Dyfais amlbwrpas ar borth paralel"
 
-#: printer/main.pm:404
+#: printer/main.pm:424
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Dyfais amlbwrpas ar USB"
 
-#: printer/main.pm:406
+#: printer/main.pm:426
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Dyfais amlbwrpas ar HP JetDirect"
 
-#: printer/main.pm:408
+#: printer/main.pm:428
 #, c-format
 msgid "Multi-function device"
 msgstr "Dyfais amlbwrpas"
 
-#: printer/main.pm:411
+#: printer/main.pm:432
 #, c-format
 msgid "Prints into %s"
 msgstr "Argraffu i %s"
 
-#: printer/main.pm:413
+#: printer/main.pm:435
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
 msgstr "Gweinydd LPD  \"%s\", argraffydd \"%s\""
 
-#: printer/main.pm:415
+#: printer/main.pm:438
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
 msgstr "Gwesteiwr TCP/IP  \"%s\", porth %s"
 
-#: printer/main.pm:419
+#: printer/main.pm:443
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
 msgstr "Gweinydd SMB/Windows  \"%s\", rhannu \"%s\""
 
-#: printer/main.pm:423
+#: printer/main.pm:448
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
 msgstr "Gweinydd Novell \"%s\", argraffydd \"%s\""
 
-#: printer/main.pm:425
+#: printer/main.pm:451
 #, c-format
 msgid "Uses command %s"
 msgstr "Defnyddio gorchymyn %s"
 
-#: printer/main.pm:427
+#: printer/main.pm:453
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:572 printer/printerdrake.pm:732
-#: printer/printerdrake.pm:2463
+#: printer/main.pm:601 printer/printerdrake.pm:820
+#: printer/printerdrake.pm:2584
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "Argraffydd crai (dim gyrrwr)"
 
-#: printer/main.pm:1086 printer/printerdrake.pm:179
-#: printer/printerdrake.pm:191
+#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr "Rhwydwaith(iau) lleol "
 
-#: printer/main.pm:1088 printer/printerdrake.pm:195
+#: printer/main.pm:1149 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Rhyngwyneb \"%s\""
 
-#: printer/main.pm:1090
+#: printer/main.pm:1151
 #, c-format
 msgid "Network %s"
 msgstr "Rhwydwaith %s"
 
-#: printer/main.pm:1092
+#: printer/main.pm:1153
 #, c-format
 msgid "Host %s"
 msgstr "Gwesteiwr %s"
 
-#: printer/main.pm:1121
+#: printer/main.pm:1182
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s(Porth %s)"
 
-#: printer/printerdrake.pm:22
+#: printer/printerdrake.pm:19
 #, c-format
 msgid ""
 "The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
 "on. Download the Windows driver package from the HP web site (the firmware "
 "on the printer's CD does not work) and extract the firmware file from it by "
-"uncompresing the self-extracting '.exe' file with the 'unzip' utility and "
+"decompressing the self-extracting '.exe' file with the 'unzip' utility and "
 "searching for the 'sihp1000.img' file. Copy this file into the '/etc/"
 "printer' directory. There it will be found by the automatic uploader script "
 "and uploaded whenever the printer is connected and turned on.\n"
@@ -11213,12 +11403,12 @@ msgstr ""
 "yn cael ei ganfod gan y sgript llwytho awtomatig a'i lwytho pryd bynnag fydd "
 "yr argraffydd wedi ei gysylltu â'i gychwyn.\n"
 
-#: printer/printerdrake.pm:62
+#: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
 msgstr "Ffurfweddiad argraffydd CUPS "
 
-#: printer/printerdrake.pm:63
+#: printer/printerdrake.pm:62
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
@@ -11227,7 +11417,7 @@ msgstr ""
 "Yma gallwch benderfynu a ddylai'r argraffyddion sy'n gysylltiedig â'r "
 "cyfrifiadur hwn fod ar gael i gyfrifiaduron pell a pha rai."
 
-#: printer/printerdrake.pm:64
+#: printer/printerdrake.pm:63
 #, c-format
 msgid ""
 "You can also decide here whether printers on remote machines should be "
@@ -11236,43 +11426,38 @@ msgstr ""
 "Gallwch benderfynu a ddylai argraffydd ar gyfrifiadur pell fod ar gael ar "
 "gyfer y cyfrifiadur hwn."
 
-#: printer/printerdrake.pm:67
+#: printer/printerdrake.pm:66
 #, c-format
 msgid "The printers on this machine are available to other computers"
 msgstr "Mae' argraffyddion y cyfrifiadur hwn ar gael ar gyfer rhai eraill"
 
-#: printer/printerdrake.pm:69
+#: printer/printerdrake.pm:71
 #, c-format
 msgid "Automatically find available printers on remote machines"
 msgstr "Canfod argraffyddion ar gyfrifiaduron pell, yn awtomatig."
 
-#: printer/printerdrake.pm:71
+#: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
 msgstr "Rhannu argraffydd ar westeiwr/rhwydwaith:"
 
-#: printer/printerdrake.pm:73
+#: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Ffurfweddiad addasu"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:566
-#: standalone/scannerdrake:583
+#: printer/printerdrake.pm:83 standalone/scannerdrake:562
+#: standalone/scannerdrake:579
 #, c-format
 msgid "No remote machines"
 msgstr "Dim cyfrifiaduron pell"
 
-#: printer/printerdrake.pm:88
+#: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
 msgstr "Gweinyddion CUPS ychwanegol:"
 
-#: printer/printerdrake.pm:93
-#, c-format
-msgid "None"
-msgstr "Dim"
-
-#: printer/printerdrake.pm:95
+#: printer/printerdrake.pm:101
 #, c-format
 msgid ""
 "To get access to printers on remote CUPS servers in your local network you "
@@ -11293,20 +11478,20 @@ msgstr ""
 "rhwydwaith lleol rhaid rhoi cyfeiriad(au) IP ac yn ddewisol rhif(au) porth "
 "yma i gael gwybodaeth am yr argraffydd gan y gweinydd(wyr)."
 
-#: printer/printerdrake.pm:100
+#: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
 msgstr "Modd argraffu testun Siapanaeëg"
 
-#: printer/printerdrake.pm:101
+#: printer/printerdrake.pm:110
 #, c-format
 msgid ""
-"Turning on this allows to print plain text files in japanese language. Only "
-"use this function if you really want to print text in japanese, if it is "
+"Turning on this allows to print plain text files in Japanese language. Only "
+"use this function if you really want to print text in Japanese, if it is "
 "activated you cannot print accentuated characters in latin fonts any more "
 "and you will not be able to adjust the margins, the character size, etc. "
 "This setting only affects printers defined on this machine. If you want to "
-"print japanese text on a printer set up on a remote machine, you have to "
+"print Japanese text on a printer set up on a remote machine, you have to "
 "activate this function on that remote machine."
 msgstr ""
 "Drwy gychwyn hwn bydd yn caniatáu argraffu testun plaen yn yr iaith "
@@ -11318,12 +11503,12 @@ msgstr ""
 "argraffydd sy'n gysylltiedig â chyfrifiadur pell, bydd angen cychwyn y "
 "nodwedd ar y cyfrifiadur hwnnw."
 
-#: printer/printerdrake.pm:105
+#: printer/printerdrake.pm:117
 #, c-format
 msgid "Automatic correction of CUPS configuration"
 msgstr "Cywiro cyswllt CUPS yn awtomatig"
 
-#: printer/printerdrake.pm:107
+#: printer/printerdrake.pm:119
 #, c-format
 msgid ""
 "When this option is turned on, on every startup of CUPS it is automatically "
@@ -11352,12 +11537,38 @@ msgstr ""
 "Os yw rhai o'r rhain yn achosi anhawster, diffoddwch y dewis hwn, ond bydd "
 "rhaid i chi ofalu amdanynt."
 
-#: printer/printerdrake.pm:129 printer/printerdrake.pm:205
+#: printer/printerdrake.pm:132 printer/printerdrake.pm:500
+#: printer/printerdrake.pm:3933
+#, c-format
+msgid "Remote CUPS server and no local CUPS daemon"
+msgstr ""
+
+#: printer/printerdrake.pm:135
+#, fuzzy, c-format
+msgid "On"
+msgstr "Oman"
+
+#: printer/printerdrake.pm:137 printer/printerdrake.pm:492
+#: printer/printerdrake.pm:519
+#, fuzzy, c-format
+msgid "Off"
+msgstr "diffodd "
+
+#: printer/printerdrake.pm:138 printer/printerdrake.pm:501
+#, c-format
+msgid ""
+"In this mode the local CUPS daemon will be stopped and all printing requests "
+"go directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:155 printer/printerdrake.pm:230
 #, c-format
 msgid "Sharing of local printers"
 msgstr "Rhannu argraffyddion lleol"
 
-#: printer/printerdrake.pm:130
+#: printer/printerdrake.pm:156
 #, c-format
 msgid ""
 "These are the machines and networks on which the locally connected printer"
@@ -11366,29 +11577,29 @@ msgstr ""
 "Dyma'r cyfrifiaduron a rhwydweithiau ddylai'r argraffydd(ion) lleol fod ar "
 "gael:"
 
-#: printer/printerdrake.pm:141
+#: printer/printerdrake.pm:167
 #, c-format
 msgid "Add host/network"
 msgstr "Ychwanegu gwesteiwr/rhwydwaith"
 
-#: printer/printerdrake.pm:147
+#: printer/printerdrake.pm:173
 #, c-format
 msgid "Edit selected host/network"
 msgstr "Golygu'r gwesteiwr/rhwydwaith"
 
-#: printer/printerdrake.pm:156
+#: printer/printerdrake.pm:182
 #, c-format
 msgid "Remove selected host/network"
 msgstr "Tynnu'r gwesteiwr/rhwydwaith"
 
-#: printer/printerdrake.pm:187 printer/printerdrake.pm:197
-#: printer/printerdrake.pm:210 printer/printerdrake.pm:217
-#: printer/printerdrake.pm:248 printer/printerdrake.pm:266
+#: printer/printerdrake.pm:213 printer/printerdrake.pm:223
+#: printer/printerdrake.pm:235 printer/printerdrake.pm:242
+#: printer/printerdrake.pm:273 printer/printerdrake.pm:291
 #, c-format
 msgid "IP address of host/network:"
 msgstr "Cyfeiriad IP gwesteiwr/rhwydwaith"
 
-#: printer/printerdrake.pm:206
+#: printer/printerdrake.pm:231
 #, c-format
 msgid ""
 "Choose the network or host on which the local printers should be made "
@@ -11397,34 +11608,34 @@ msgstr ""
 "Dewis y rhwydwaith neu westeiwr ddylai'r argraffyddion lleol fod ar gael "
 "iddynt:"
 
-#: printer/printerdrake.pm:213
+#: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
 msgstr "Cyfeiriad y gwesteiwr/rhwydwaith ar goll."
 
-#: printer/printerdrake.pm:221
+#: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
 msgstr "Nid yw IP y gwesteiwr/rhwydwaith yn gywir.\n"
 
-#: printer/printerdrake.pm:222 printer/printerdrake.pm:400
+#: printer/printerdrake.pm:247 printer/printerdrake.pm:423
 #, c-format
 msgid "Examples for correct IPs:\n"
 msgstr "Esiamplau cywir ar gyfer IP:\n"
 
-#: printer/printerdrake.pm:246
+#: printer/printerdrake.pm:271
 #, c-format
 msgid "This host/network is already in the list, it cannot be added again.\n"
 msgstr ""
 "Mae'r gwesteiwr/rhwydwaith ar y rhestr yn barod, does dim modd ei "
 "ychwanegu.\n"
 
-#: printer/printerdrake.pm:316 printer/printerdrake.pm:387
+#: printer/printerdrake.pm:340 printer/printerdrake.pm:410
 #, c-format
 msgid "Accessing printers on remote CUPS servers"
 msgstr "Mynediad at argraffydd ar weinydd CUPS pell"
 
-#: printer/printerdrake.pm:317
+#: printer/printerdrake.pm:341
 #, c-format
 msgid ""
 "Add here the CUPS servers whose printers you want to use. You only need to "
@@ -11435,106 +11646,122 @@ msgstr ""
 "angen gwneud hyn dim ond os nad yw'r gweinyddion yn darlledu eu gwybodaeth "
 "argraffu i'r rhwydwaith lleol."
 
-#: printer/printerdrake.pm:328
+#: printer/printerdrake.pm:352
 #, c-format
 msgid "Add server"
 msgstr "Ychwanegu gweinydd"
 
-#: printer/printerdrake.pm:334
+#: printer/printerdrake.pm:358
 #, c-format
 msgid "Edit selected server"
 msgstr "Golygu'r gwesteiwr"
 
-#: printer/printerdrake.pm:343
+#: printer/printerdrake.pm:367
 #, c-format
 msgid "Remove selected server"
 msgstr "Tynnu'r gwesteiwr"
 
-#: printer/printerdrake.pm:388
+#: printer/printerdrake.pm:411
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
 msgstr ""
 "Rhowch gyfeiriad IP a phorth gwesteiwr yr argraffydd rydych am ei ddefnyddio."
 
-#: printer/printerdrake.pm:389
+#: printer/printerdrake.pm:412
 #, c-format
 msgid "If no port is given, 631 will be taken as default."
 msgstr ""
 "Os nad oes porth yn cael ei gynnig, bydd 631 yn cael ei gymryd fel y "
 "rhagosodedig."
 
-#: printer/printerdrake.pm:393
+#: printer/printerdrake.pm:416
 #, c-format
 msgid "Server IP missing!"
 msgstr "IP'r gweinydd ar goll!"
 
-#: printer/printerdrake.pm:399
+#: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
 msgstr "Nid yw'r IP'n gywir.\n"
 
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "Dylai rhif porth fod yn gyfanrif!"
 
-#: printer/printerdrake.pm:422
+#: printer/printerdrake.pm:445
 #, c-format
 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:433 printer/printerdrake.pm:1650
-#: standalone/drakups:233 standalone/harddrake2:68
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
+#: standalone/drakups:247 standalone/harddrake2:47
 #, c-format
 msgid "Port"
 msgstr "Porth"
 
-#: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:610 printer/printerdrake.pm:628
-#: printer/printerdrake.pm:711 printer/printerdrake.pm:768
-#: printer/printerdrake.pm:794 printer/printerdrake.pm:1703
-#: printer/printerdrake.pm:1886 printer/printerdrake.pm:1902
-#: printer/printerdrake.pm:1945 printer/printerdrake.pm:1982
-#: printer/printerdrake.pm:2024 printer/printerdrake.pm:2061
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2458
-#: printer/printerdrake.pm:2568 printer/printerdrake.pm:3069
-#: printer/printerdrake.pm:3134 printer/printerdrake.pm:3177
-#: printer/printerdrake.pm:3180 printer/printerdrake.pm:3299
-#: printer/printerdrake.pm:3364 printer/printerdrake.pm:3436
-#: printer/printerdrake.pm:3457 printer/printerdrake.pm:3466
-#: printer/printerdrake.pm:3557 printer/printerdrake.pm:3655
-#: printer/printerdrake.pm:3661 printer/printerdrake.pm:3674
-#: printer/printerdrake.pm:3726 printer/printerdrake.pm:3766
-#: printer/printerdrake.pm:3778 printer/printerdrake.pm:3789
-#: printer/printerdrake.pm:3798 printer/printerdrake.pm:3811
-#: printer/printerdrake.pm:3888 printer/printerdrake.pm:3945
-#: printer/printerdrake.pm:4010 printer/printerdrake.pm:4270
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4459
-#: printer/printerdrake.pm:4517 printer/printerdrake.pm:4546
-#: standalone/printerdrake:65 standalone/printerdrake:85
-#: standalone/printerdrake:522
+#: printer/printerdrake.pm:489 printer/printerdrake.pm:505
+#: printer/printerdrake.pm:520 printer/printerdrake.pm:524
+#: printer/printerdrake.pm:530
+#, fuzzy, c-format
+msgid "On, Name or IP of remote server:"
+msgstr "Argraffydd ar weinydd lpd pell"
+
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
+#: printer/printerdrake.pm:4007
+#, fuzzy, c-format
+msgid "CUPS server name or IP address missing."
+msgstr "Cyfeiriad y gwesteiwr/rhwydwaith 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
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
-#: printer/printerdrake.pm:479
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
+#: printer/printerdrake.pm:4077
+#, c-format
+msgid "Reading printer data..."
+msgstr "Darllen data argraffydd..."
+
+#: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
 msgstr "Ail gychwynCUPS"
 
-#: printer/printerdrake.pm:502
+#: printer/printerdrake.pm:606
 #, c-format
 msgid "Select Printer Connection"
 msgstr "Dewiswch Gysylltiad Argraffydd"
 
-#: printer/printerdrake.pm:503
+#: printer/printerdrake.pm:607
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Sut mae'r argraffydd wedi ei gysylltu?"
 
-#: printer/printerdrake.pm:505
+#: printer/printerdrake.pm:609
 #, c-format
 msgid ""
 "\n"
@@ -11545,7 +11772,7 @@ msgstr ""
 "Nid oes angen ffurfweddu argraffyddion ar weinyddion CUPS pell: byddant yn "
 "cael eu canfod yn awtomatig."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
+#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
 #, c-format
 msgid ""
 "\n"
@@ -11556,29 +11783,29 @@ msgstr ""
 "RHYBUDD: Nid oes cyswllt rhwydwaith lleol yn weithredol, nid oes modd canfod "
 "na phrofi argraffyddion pell!"
 
-#: printer/printerdrake.pm:515
+#: printer/printerdrake.pm:619
 #, 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)"
 
-#: printer/printerdrake.pm:545
+#: printer/printerdrake.pm:649
 #, c-format
 msgid "Checking your system..."
 msgstr "Gwirio eich system..."
 
-#: printer/printerdrake.pm:561
+#: printer/printerdrake.pm:665
 #, c-format
 msgid "and one unknown printer"
 msgstr "ac un argraffydd anhysbys"
 
-#: printer/printerdrake.pm:563
+#: printer/printerdrake.pm:667
 #, c-format
 msgid "and %d unknown printers"
 msgstr "a %d argraffydd anhysbys"
 
-#: printer/printerdrake.pm:567
+#: printer/printerdrake.pm:671
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11591,7 +11818,7 @@ msgstr ""
 "%s%s\n"
 "wedi eu cysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:673
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11604,7 +11831,7 @@ msgstr ""
 "%s%s\n"
 "wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:570
+#: printer/printerdrake.pm:674
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11617,7 +11844,7 @@ msgstr ""
 "%s%s\n"
 "wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:678
 #, c-format
 msgid ""
 "\n"
@@ -11626,7 +11853,7 @@ msgstr ""
 "\n"
 "Mae un argraffydd anhysbys wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:575
+#: printer/printerdrake.pm:679
 #, c-format
 msgid ""
 "\n"
@@ -11635,7 +11862,7 @@ msgstr ""
 "\n"
 "Mae yna %d argraffydd anhysbys wedi eu cysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:578
+#: printer/printerdrake.pm:682
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
@@ -11643,13 +11870,13 @@ msgstr ""
 "Nid oes unrhyw argraffydd wedi ei ganfod wedi ei gysylltu'n uniongyrchol "
 "â'ch cyfrifiadur"
 
-#: printer/printerdrake.pm:581
+#: printer/printerdrake.pm:685
 #, 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"
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -11658,22 +11885,22 @@ msgstr ""
 "Ydych chi am caniatáu argraffu ar yr argraffyddion enwir uchod neu ar yr "
 "argraffyddion ar y rhwydwaith lleol?\n"
 
-#: printer/printerdrake.pm:595
+#: printer/printerdrake.pm:699
 #, 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:597
+#: printer/printerdrake.pm:701
 #, 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:598
+#: printer/printerdrake.pm:702
 #, 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"
 
-#: printer/printerdrake.pm:599
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11682,48 +11909,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:629
+#: printer/printerdrake.pm:742
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Chwilio am argraffyddion newydd..."
 
-#: printer/printerdrake.pm:713
+#: printer/printerdrake.pm:797
 #, c-format
-msgid "Configuring printer ..."
-msgstr "Ffurfweddu argraffydd  ..."
+msgid "Found printer on %s..."
+msgstr "Wedi canfod argraffydd ar %s..."
 
-#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
-#: printer/printerdrake.pm:3790
-#, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Ffurfweddu argraffydd \"%s\" ..."
-
-#: printer/printerdrake.pm:734
+#: printer/printerdrake.pm:822
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:735
+#: printer/printerdrake.pm:823
 #, c-format
 msgid " on "
 msgstr "ar "
 
-#: printer/printerdrake.pm:736 standalone/scannerdrake:136
+#: printer/printerdrake.pm:824 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
+#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
 #, c-format
 msgid "Printer model selection"
 msgstr "Dewis model yr argraffydd"
 
-#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
+#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "Pa fath o argraffydd sydd gennych?"
 
-#: printer/printerdrake.pm:743
+#: printer/printerdrake.pm:831
 #, c-format
 msgid ""
 "\n"
@@ -11736,7 +11957,7 @@ msgstr ""
 "Nid oedd Printerdrake yn gallu adnabod eich argraffydd %s. Dewiswch yr un "
 "cywir o'r rhestr."
 
-#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
+#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -11745,21 +11966,24 @@ msgstr ""
 "Nid yw eich argraffydd wedi ei rhestri, dewiswch un cyfatebol (gw. llawlyfr "
 "eich argraffydd) neu un tebyg."
 
-#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
-#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
-#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
+#: printer/printerdrake.pm:839
 #, c-format
-msgid "Configuring applications..."
-msgstr "Ffurfweddi'u rhaglenni"
+msgid "Configuring printer on %s..."
+msgstr "Ffurfweddu argraffydd ar %s ..."
+
+#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "Ffurfweddu argraffydd \"%s\" ..."
 
-#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
-#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
-#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
+#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
 #, c-format
 msgid "Add a new printer"
 msgstr "Ychwanegu argraffydd newydd"
 
-#: printer/printerdrake.pm:832
+#: printer/printerdrake.pm:933
 #, c-format
 msgid ""
 "\n"
@@ -11783,7 +12007,7 @@ msgstr ""
 "yn rhoi mynediad i'r holl yrwyr argraffyddion sydd ar gael, dewisiadau "
 "gyrwyr a mathau o gysylltiadau argraffyddion."
 
-#: printer/printerdrake.pm:845
+#: printer/printerdrake.pm:946
 #, c-format
 msgid ""
 "\n"
@@ -11823,7 +12047,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:854
+#: printer/printerdrake.pm:955
 #, c-format
 msgid ""
 "\n"
@@ -11850,7 +12074,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:862
+#: printer/printerdrake.pm:963
 #, c-format
 msgid ""
 "\n"
@@ -11888,7 +12112,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:871
+#: printer/printerdrake.pm:972
 #, c-format
 msgid ""
 "\n"
@@ -11915,26 +12139,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:880
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Awto ganfod argraffyddion sy'n gysylltiedig a'r peiriant hwn"
 
-#: printer/printerdrake.pm:883
+#: printer/printerdrake.pm:984
 #, 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:886
+#: printer/printerdrake.pm:987
 #, 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:902
+#: printer/printerdrake.pm:1003
 #, c-format
 msgid ""
 "\n"
@@ -11957,70 +12181,70 @@ msgstr ""
 "gosodiadau dewis rhagosodedig (mewnflwch papur, ansawdd y printiad,...), "
 "dewiswch \"Argraffydd\" yn adran \"Caledwedd\" Canolfan Rheoli %s."
 
-#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
-#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
-#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
-#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
-#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
-#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
+#: 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
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "Methu gosod pecynnau: %s!"
 
-#: printer/printerdrake.pm:939
+#: printer/printerdrake.pm:1040
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Osgoi awto ganfod gweinydd Windows/SMB"
 
-#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Awto ganfod argraffydd"
 
-#: printer/printerdrake.pm:945
+#: printer/printerdrake.pm:1046
 #, c-format
 msgid "Detecting devices..."
 msgstr "Canfod dyfeisiau..."
 
-#: printer/printerdrake.pm:967
+#: printer/printerdrake.pm:1075
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", rhwydwaith argraffu \"%s\", porth %s"
 
-#: printer/printerdrake.pm:969
+#: printer/printerdrake.pm:1078
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", argraffydd \"%s\" ar weinydd  SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:973
+#: printer/printerdrake.pm:1082
 #, c-format
 msgid "Detected %s"
 msgstr "Canfyddwyd %s"
 
-#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
-#: printer/printerdrake.pm:1017
+#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1132
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "Argraffydd ar borth paralel #\"%s"
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1093
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Argraffydd rhwydwaith \"%s\", porth %s"
 
-#: printer/printerdrake.pm:983
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Argraffydd  \"%s\" ar weinydd SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1062
+#: printer/printerdrake.pm:1177
 #, c-format
 msgid "Local Printer"
 msgstr "Argraffydd Lleol"
 
-#: printer/printerdrake.pm:1063
+#: printer/printerdrake.pm:1178
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12033,32 +12257,32 @@ msgstr ""
 "dev/,...., cyfatebol i LPT1:, LPT2,..., argraffydd USB 1af: /dev/usb/lp0,  "
 "ail argraffydd USB: /dev/usb/lp1,...)."
 
-#: printer/printerdrake.pm:1067
+#: printer/printerdrake.pm:1182
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Rhaid cynnig enw dyfais neu ffeil!"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "No printer found!"
 msgstr "Heb ganfod argraffydd!"
 
-#: printer/printerdrake.pm:1084
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Local Printers"
 msgstr "Argraffyddion Lleol"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1200
 #, c-format
 msgid "Available printers"
 msgstr "Argraffyddion ar gael"
 
-#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
+#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "Mae'r argraffydd canlynol wedi ei awtoganfod"
 
-#: printer/printerdrake.pm:1091
+#: printer/printerdrake.pm:1206
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -12067,18 +12291,18 @@ msgstr ""
 "Os nad hwn yw'r un rydych am ei ffurfweddu, rhowch enw dyfais/enw ffeil ar y "
 "llinell mewnbwn."
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1207
 #, 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:1093 printer/printerdrake.pm:1102
+#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "Dyma restr o argraffyddion wedi eu awtoganfod."
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1210
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -12087,7 +12311,7 @@ msgstr ""
 "Dewiswch yr argraffydd i'w osod neu rhowch enw dyfais/ffeil ar y llinell "
 "mewnbwn"
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1211
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -12096,7 +12320,7 @@ msgstr ""
 "Dewiswch yr argraffydd i drin y gwaith argraffu neu rhowch enw dyfais/ffeil "
 "ar y llinell mewnbwn"
 
-#: printer/printerdrake.pm:1100
+#: printer/printerdrake.pm:1215
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12107,12 +12331,12 @@ msgstr ""
 "argraffydd ei ganfod yn gywir neu byddai'n well gennych ffurfweddiad unigryw "
 "i'ch argraffydd, cychwynnwch \"Ffurfweddiad gyda Llaw\"."
 
-#: printer/printerdrake.pm:1101
+#: printer/printerdrake.pm:1216
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Does dim dewis arall ar gael ar hyn o bryd"
 
-#: printer/printerdrake.pm:1104
+#: printer/printerdrake.pm:1219
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12125,12 +12349,12 @@ msgstr ""
 "byddai'n well gennych ffurfweddiad unigryw i'ch argraffydd, cychwynnwch "
 "\"Ffurfweddiad gyda Llaw\"."
 
-#: printer/printerdrake.pm:1105
+#: printer/printerdrake.pm:1220
 #, 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:1107
+#: printer/printerdrake.pm:1222
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -12139,12 +12363,12 @@ msgstr ""
 "Dewiswch y porth y mae eich argraffydd wedi cysylltu iddo neu rhowch enw "
 "dyfais/ffeil ar y llinell mewnbwn"
 
-#: printer/printerdrake.pm:1108
+#: printer/printerdrake.pm:1223
 #, 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:1110
+#: printer/printerdrake.pm:1225
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12153,26 +12377,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:1114
+#: printer/printerdrake.pm:1229
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Rhaid dewis/rhoi argraffydd/dyfais!"
 
-#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
-#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
-#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
-#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
-#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#: 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
 #, c-format
 msgid "Aborting"
 msgstr "Atal"
 
-#: printer/printerdrake.pm:1189
+#: printer/printerdrake.pm:1304
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Dewisiadau Argraffydd lpd Pell"
 
-#: printer/printerdrake.pm:1190
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -12181,63 +12405,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:1191
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Remote host name"
 msgstr "Enw gwesteiwr pell"
 
-#: printer/printerdrake.pm:1192
+#: printer/printerdrake.pm:1307
 #, c-format
 msgid "Remote printer name"
 msgstr "Enw'r argraffydd pell"
 
-#: printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1310
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Mae enw'r gwesteiwr pell ar goll!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1314
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Mae enw'r argraffydd pell ar goll!"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769 standalone/drakTermServ:1432
-#: standalone/drakTermServ:1440 standalone/drakTermServ:1451
-#: standalone/drakbackup:512 standalone/drakbackup:618
-#: standalone/drakbackup:653 standalone/drakbackup:771
-#: standalone/harddrake2:166
+#: 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
 #, c-format
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Canfyddwyd model %s %s"
 
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
+#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
 #, c-format
 msgid "Scanning network..."
 msgstr "Chwilio'r rhwydwaith..."
 
-#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
+#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", argraffydd \"%s\" ar weinydd \"%s\""
 
-#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
+#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Argraffydd \"%s\" ar weinydd \"%s\""
 
-#: printer/printerdrake.pm:1366
+#: printer/printerdrake.pm:1481
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Dewisiadau Argraffydd SMB (Windows 9x/NT)"
 
-#: printer/printerdrake.pm:1367
+#: printer/printerdrake.pm:1482
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12251,7 +12475,7 @@ msgstr ""
 "am gael mynediad iddo ac unrhyw enw defnyddiwr, cyfrinair a gwybodaeth am "
 "grwp gwaith perthynol."
 
-#: printer/printerdrake.pm:1368
+#: printer/printerdrake.pm:1483
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12260,47 +12484,47 @@ 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."
 
-#: printer/printerdrake.pm:1370
+#: printer/printerdrake.pm:1485
 #, c-format
 msgid "SMB server host"
 msgstr "Gweinydd gwesteiwr SMB"
 
-#: printer/printerdrake.pm:1371
+#: printer/printerdrake.pm:1486
 #, c-format
 msgid "SMB server IP"
 msgstr "IP Gweinydd SMB"
 
-#: printer/printerdrake.pm:1372
+#: printer/printerdrake.pm:1487
 #, c-format
 msgid "Share name"
 msgstr "Rhannu enw"
 
-#: printer/printerdrake.pm:1375
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid "Workgroup"
 msgstr "Grwp gwaith"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Auto-detected"
 msgstr "Awto ganfod"
 
-#: printer/printerdrake.pm:1387
+#: printer/printerdrake.pm:1502
 #, 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:1391
+#: printer/printerdrake.pm:1506
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Mae enw rhannu Samba ar goll!"
 
-#: printer/printerdrake.pm:1397
+#: printer/printerdrake.pm:1512
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "RHYBUDD DIOGELWCH!"
 
-#: printer/printerdrake.pm:1398
+#: printer/printerdrake.pm:1513
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -12344,7 +12568,7 @@ msgstr ""
 "Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1408
+#: printer/printerdrake.pm:1523
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12356,7 +12580,7 @@ msgstr ""
 "a gosod argraffu o'r peiriant hwn gyda'r \"%s\" yn Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1411
+#: printer/printerdrake.pm:1526
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12369,12 +12593,12 @@ msgstr ""
 "\n"
 "Ydych chi am barhau i osod yr argraffydd hwn?"
 
-#: printer/printerdrake.pm:1489
+#: printer/printerdrake.pm:1604
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Dewisiadau Argraffydd NetWare"
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1605
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12387,42 +12611,42 @@ msgstr ""
 "â'r rhes waith argraffu am yr argraffydd rydych am gael mynediad iddo ac "
 "unrhyw enw defnyddiwr a chyfrinair perthnasol."
 
-#: printer/printerdrake.pm:1491
+#: printer/printerdrake.pm:1606
 #, c-format
 msgid "Printer Server"
 msgstr "Gweinydd Argraffydd"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1607
 #, c-format
 msgid "Print Queue Name"
 msgstr "Enw Rhes Argraffu"
 
-#: printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1612
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Mae enw gweinydd NCP ar goll!"
 
-#: printer/printerdrake.pm:1501
+#: printer/printerdrake.pm:1616
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Mae enw rhes NCP ar goll"
 
-#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
+#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", gwesteiwr \"%s\", porth %s"
 
-#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
+#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ",Gwesteiwr  \"%s\", porth %s"
 
-#: printer/printerdrake.pm:1618
+#: printer/printerdrake.pm:1733
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Dewisiadau Argraffydd TCP/Soced"
 
-#: printer/printerdrake.pm:1620
+#: printer/printerdrake.pm:1735
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -12432,7 +12656,7 @@ msgstr ""
 "yr enw gwesteiwr neu IP a'r rhif porth dewisol (9100 yw'r rhagosodedig) i'r "
 "meysydd mewnbwn."
 
-#: printer/printerdrake.pm:1621
+#: printer/printerdrake.pm:1736
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12445,27 +12669,27 @@ msgstr ""
 "weinyddion HP JetDirect rhif y porth, fel rheol, yw 9100, gall amrywio ar "
 "weinyddion eraill. Gweler llawlyfr eich caledwedd"
 
-#: printer/printerdrake.pm:1625
+#: printer/printerdrake.pm:1740
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Mae enw'r gwesteiwr argraffu neu IP ar goll!"
 
-#: printer/printerdrake.pm:1648
+#: printer/printerdrake.pm:1763
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Enw'r gwesteiwr neu IP yr argraffydd"
 
-#: printer/printerdrake.pm:1704
+#: printer/printerdrake.pm:1819
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "Adnewyddu rhestr Dyfais URI..."
 
-#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
 #, c-format
 msgid "Printer Device URI"
 msgstr "URI Dyfais Argraffu"
 
-#: printer/printerdrake.pm:1708
+#: printer/printerdrake.pm:1823
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12476,17 +12700,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:1731
+#: printer/printerdrake.pm:1846
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Rhaid cynnig URI dilys!"
 
-#: printer/printerdrake.pm:1834
+#: printer/printerdrake.pm:1949
 #, c-format
 msgid "Pipe into command"
 msgstr "Peipio i orchymyn"
 
-#: printer/printerdrake.pm:1835
+#: printer/printerdrake.pm:1950
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -12495,17 +12719,17 @@ msgstr ""
 "Yma gallwch bennu unrhyw fan lle dylid cyfeirio'r gwaith yn lle ei anfon at "
 "yr argraffydd."
 
-#: printer/printerdrake.pm:1836
+#: printer/printerdrake.pm:1951
 #, c-format
 msgid "Command line"
 msgstr "Llinell orchymyn"
 
-#: printer/printerdrake.pm:1840
+#: printer/printerdrake.pm:1955
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Rhaid rhoi llinell gorchymyn!"
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1988
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12516,74 +12740,74 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300 gyda sganiwr, DeskJet 450, Sony IJP-V100), "
 "HP PhotoSmart neu HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1887
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Gosod pecyn HPOJ..."
 
-#: printer/printerdrake.pm:1894
+#: printer/printerdrake.pm:2012
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "Dim ond argraffu fydd yn bosibl ar %s."
 
-#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
+#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "Gwirio'r ddyfais a ffurfweddu HPOJ..."
 
-#: printer/printerdrake.pm:1946
+#: printer/printerdrake.pm:2065
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Gosod pecynnau SANE..."
 
-#: printer/printerdrake.pm:1956
+#: printer/printerdrake.pm:2078
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "Ni fydd sganio'n bosibl ar %s"
 
-#: printer/printerdrake.pm:1983
+#: printer/printerdrake.pm:2105
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Gosod pecynnau mtools..."
 
-#: printer/printerdrake.pm:1990
+#: printer/printerdrake.pm:2113
 #, 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:2005
+#: printer/printerdrake.pm:2128
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Sganio eich dyfais amlbwrpas HP"
 
-#: printer/printerdrake.pm:2013
+#: printer/printerdrake.pm:2136
 #, 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:2062
+#: printer/printerdrake.pm:2185
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Gwneud porth argraffu ar gael ar gyfer CUPS..."
 
-#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
-#: printer/printerdrake.pm:2459
+#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2580
 #, c-format
 msgid "Reading printer database..."
 msgstr "Darllen cronfa ddata argraffydd..."
 
-#: printer/printerdrake.pm:2281
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Rhowch Enw'r Argraffydd a Sylw"
 
-#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
 #, 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:2291 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -12592,7 +12816,7 @@ msgstr ""
 "Mae argraffydd \"%s\" yn bodoli eisoes,\n"
 "ydych chi wir eisiau ailysgrifennu ei ffurfweddiad?"
 
-#: printer/printerdrake.pm:2300
+#: printer/printerdrake.pm:2423
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12601,35 +12825,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:2301
+#: printer/printerdrake.pm:2424
 #, c-format
 msgid "Name of printer"
 msgstr "Enw'r argraffydd"
 
-#: printer/printerdrake.pm:2302 standalone/drakconnect:570
-#: standalone/harddrake2:41 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2425 standalone/drakconnect:568
+#: standalone/harddrake2:34 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: printer/printerdrake.pm:2303 standalone/printerdrake:212
-#: standalone/printerdrake:219
+#: printer/printerdrake.pm:2426 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "Location"
 msgstr "Lleoliad"
 
-#: printer/printerdrake.pm:2320
+#: printer/printerdrake.pm:2443
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Paratoi cronfa ddata argraffydd..."
 
-#: printer/printerdrake.pm:2438
+#: printer/printerdrake.pm:2559
 #, c-format
 msgid "Your printer model"
 msgstr "Model eich argraffydd"
 
-#: printer/printerdrake.pm:2439
+#: printer/printerdrake.pm:2560
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12655,18 +12879,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
+#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
 #, c-format
 msgid "The model is correct"
 msgstr "Mae'r model yn gywir"
 
-#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
-#: printer/printerdrake.pm:2449
+#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
+#: printer/printerdrake.pm:2570
 #, c-format
 msgid "Select model manually"
 msgstr "Dewiswch y model gyda llaw"
 
-#: printer/printerdrake.pm:2472
+#: printer/printerdrake.pm:2593
 #, c-format
 msgid ""
 "\n"
@@ -12681,12 +12905,12 @@ msgstr ""
 "Chwiliwch am y model cywir pan fo'r cyrchwr yn sefyll ar y model anghywir "
 "neu ar \"Argraffydd bras\"."
 
-#: printer/printerdrake.pm:2491
+#: printer/printerdrake.pm:2612
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Gosod ffeil PPD gan y cynhyrchwyr"
 
-#: printer/printerdrake.pm:2522
+#: printer/printerdrake.pm:2643
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12695,7 +12919,7 @@ msgstr ""
 "Mae pob argraffydd PostSgript yn cael ei ddarparu gyda ffeil PPD sy'n "
 "disgrifio dewisiadau a nodweddion yr argraffydd."
 
-#: printer/printerdrake.pm:2523
+#: printer/printerdrake.pm:2644
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
@@ -12704,12 +12928,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:2524
+#: printer/printerdrake.pm:2645
 #, 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:2525
+#: printer/printerdrake.pm:2646
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
@@ -12718,7 +12942,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:2526
+#: printer/printerdrake.pm:2647
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -12728,7 +12952,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:2527
+#: printer/printerdrake.pm:2648
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
@@ -12737,58 +12961,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:2529
+#: printer/printerdrake.pm:2650
 #, c-format
 msgid "Install PPD file from"
 msgstr "Gosod ffeil PPD o"
 
-#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
-#: standalone/scannerdrake:180 standalone/scannerdrake:188
-#: standalone/scannerdrake:239 standalone/scannerdrake:246
-#, c-format
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
-#: standalone/scannerdrake:181 standalone/scannerdrake:190
-#: standalone/scannerdrake:240 standalone/scannerdrake:248
+#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
+#: standalone/scannerdrake:177 standalone/scannerdrake:186
+#: standalone/scannerdrake:236 standalone/scannerdrake:244
 #, c-format
 msgid "Floppy Disk"
 msgstr "Disg Meddal"
 
-#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
-#: standalone/scannerdrake:182 standalone/scannerdrake:192
-#: standalone/scannerdrake:241 standalone/scannerdrake:250
+#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
+#: standalone/scannerdrake:178 standalone/scannerdrake:188
+#: standalone/scannerdrake:237 standalone/scannerdrake:246
 #, c-format
 msgid "Other place"
 msgstr "Man arall"
 
-#: printer/printerdrake.pm:2548
+#: printer/printerdrake.pm:2669
 #, c-format
 msgid "Select PPD file"
 msgstr "Dewis ffeil PPD"
 
-#: printer/printerdrake.pm:2552
+#: printer/printerdrake.pm:2673
 #, 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:2558
+#: printer/printerdrake.pm:2679
 #, 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:2569
+#: printer/printerdrake.pm:2690
 #, c-format
 msgid "Installing PPD file..."
 msgstr "Gosod ffeil PPD..."
 
-#: printer/printerdrake.pm:2682
+#: printer/printerdrake.pm:2807
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "Ffurfweddiad OKI winprinter "
 
-#: printer/printerdrake.pm:2683
+#: printer/printerdrake.pm:2808
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12806,12 +13023,12 @@ msgstr ""
 "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."
 
-#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
+#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Ffurfweddiad inkjet Lexmark"
 
-#: printer/printerdrake.pm:2708
+#: printer/printerdrake.pm:2834
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12823,7 +13040,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:2737
+#: printer/printerdrake.pm:2864
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12845,12 +13062,12 @@ msgstr ""
 "dudalennau'r alinio'r pen argraffu gyda \"lexmarkmaintain\" a newid "
 "gosodiadau aliniad y pen gyda'r rhaglen."
 
-#: printer/printerdrake.pm:2746
+#: printer/printerdrake.pm:2874
 #, c-format
 msgid "Lexmark X125 configuration"
 msgstr "Ffurfweddiad Lexmark 125"
 
-#: printer/printerdrake.pm:2747
+#: printer/printerdrake.pm:2875
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -12863,12 +13080,35 @@ msgstr ""
 "beiriannau pell na blychau gweinydd argraffu.. Cysylltwch eich argraffydd i "
 "borth USB lleol neu ei ffurfweddu i'r peiriant mae wedi ei  gysylltiedu iddo."
 
-#: printer/printerdrake.pm:2765
+#: printer/printerdrake.pm:2897
+#, fuzzy, c-format
+msgid "Samsung ML/QL-85G configuration"
+msgstr "Ffurfweddiad sain"
+
+#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#, fuzzy, 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."
+
+#: printer/printerdrake.pm:2924
+#, fuzzy, c-format
+msgid "Canon LBP-460/660 configuration"
+msgstr "Ffurfweddu TCP/IP  gyda llaw"
+
+#: printer/printerdrake.pm:2943
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Llwytho Cadarnwedd i Fyny ar gyfer HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2878
+#: printer/printerdrake.pm:3056
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12886,27 +13126,27 @@ msgstr ""
 "argraffiad ansawdd/cydraniad uchel iawn yn gallu arafu'r argraffu'n "
 "sylweddol.."
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3181
 #, c-format
 msgid "Printer default settings"
 msgstr "Gosod yr Argraffydd Rhagosodedig"
 
-#: printer/printerdrake.pm:3010
+#: printer/printerdrake.pm:3188
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Rhaid i ddewis %s fod yn gyfanrif"
 
-#: printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3192
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Rhaid i ddewis %s fod yn rhif!"
 
-#: printer/printerdrake.pm:3018
+#: printer/printerdrake.pm:3196
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Dewis %s allan o amrediad!"
 
-#: printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3247
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12915,12 +13155,12 @@ msgstr ""
 "Ydych chi am osod argraffydd  (\"%s\")\n"
 "fel yr argraffydd rhagosodedig?"
 
-#: printer/printerdrake.pm:3084
+#: printer/printerdrake.pm:3262
 #, c-format
 msgid "Test pages"
 msgstr "Tudalennau prawf"
 
-#: printer/printerdrake.pm:3085
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12933,57 +13173,57 @@ 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:3089
+#: printer/printerdrake.pm:3267
 #, c-format
 msgid "No test pages"
 msgstr "Dim tudalennau prawf"
 
-#: printer/printerdrake.pm:3090
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid "Print"
 msgstr "Argraffu"
 
-#: printer/printerdrake.pm:3115
+#: printer/printerdrake.pm:3293
 #, c-format
 msgid "Standard test page"
 msgstr "Tudalen prawf safonol"
 
-#: printer/printerdrake.pm:3118
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Prawf tudalen arall (Llythyr)"
 
-#: printer/printerdrake.pm:3121
+#: printer/printerdrake.pm:3299
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Prawf tudalen arall (A4)"
 
-#: printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3301
 #, c-format
 msgid "Photo test page"
 msgstr "Tudalen prawf llun"
 
-#: printer/printerdrake.pm:3127
+#: printer/printerdrake.pm:3305
 #, c-format
 msgid "Do not print any test page"
 msgstr "Peidiwch argraffu tudalennau prawf"
 
-#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
+#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Argraffu tudalen(nau) prawf..."
 
-#: printer/printerdrake.pm:3150
+#: printer/printerdrake.pm:3331
 #, c-format
 msgid "Could not install the %s package!"
 msgstr "Methu gosod pecyn %s!"
 
-#: printer/printerdrake.pm:3152
+#: printer/printerdrake.pm:3333
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Osgoi prawf llun ffoto"
 
-#: printer/printerdrake.pm:3169
+#: printer/printerdrake.pm:3350
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12998,7 +13238,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3173
+#: printer/printerdrake.pm:3354
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13007,17 +13247,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:3180
+#: printer/printerdrake.pm:3364
 #, c-format
 msgid "Did it work properly?"
 msgstr "A weithiodd hwnnw'n iawn?"
 
-#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
+#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
 #, c-format
 msgid "Raw printer"
 msgstr "Argraffydd bras"
 
-#: printer/printerdrake.pm:3231
+#: printer/printerdrake.pm:3416
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -13030,7 +13270,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:3233
+#: printer/printerdrake.pm:3418
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -13041,8 +13281,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:3236 printer/printerdrake.pm:3253
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "\n"
@@ -13055,7 +13295,7 @@ msgstr ""
 "tasg argraffu penodol. Ychwanegwch y gosodiadau angenrheidiol i'r llinell "
 "gorchymyn, e.e \"%s <file>\". "
 
-#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
+#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -13066,7 +13306,7 @@ msgstr ""
 "ai'r rhestr isod neu cliciwch ar y botwm \"Rhestr dewis argraffu\".%s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3243
+#: printer/printerdrake.pm:3428
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -13076,7 +13316,7 @@ msgstr ""
 "presennol:\n"
 "\n"
 
-#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
+#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13085,8 +13325,8 @@ msgstr ""
 "I argraffu ffeil o'r llinell orchymyn (ffenestr terfynell) defnyddiwch "
 "orchymyn \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
-#: printer/printerdrake.pm:3270
+#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
+#: printer/printerdrake.pm:3455
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -13097,7 +13337,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:3255 printer/printerdrake.pm:3265
+#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -13106,7 +13346,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:3268
+#: printer/printerdrake.pm:3453
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13115,7 +13355,7 @@ msgstr ""
 "I argraffu ffeil o'r llinell orchymyn (ffenestr terfynell) defnyddiwch y "
 "gorchymyn \"%s <file>\" neu \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3272
+#: printer/printerdrake.pm:3457
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13133,7 +13373,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:3276
+#: printer/printerdrake.pm:3461
 #, c-format
 msgid ""
 "\n"
@@ -13146,43 +13386,33 @@ msgstr ""
 "ar gyfer tasg argraffu penodol. Ychwanegwch y gosodiadau angenrheidiol i'r "
 "llinell gorchymyn, e.e \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3286
+#: printer/printerdrake.pm:3471
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Argraffu/Sganio/Cardiau Llun ar  \"%s\""
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3472
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Argraffu/Sganio ar  \"%s\""
 
-#: printer/printerdrake.pm:3289
+#: printer/printerdrake.pm:3474
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Argraffu/Mynediad Cardiau Llun ar  \"%s\""
 
-#: printer/printerdrake.pm:3290
+#: printer/printerdrake.pm:3475
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Argraffu ar argraffydd \"%s\""
 
-#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
-#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
-#: printer/printerdrake.pm:4384 standalone/drakTermServ:313
-#: standalone/drakbackup:4063 standalone/drakbug:177 standalone/drakfont:500
-#: standalone/drakfont:591 standalone/net_monitor:107
-#: standalone/printerdrake:515
-#, c-format
-msgid "Close"
-msgstr "Cau"
-
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3481
 #, c-format
 msgid "Print option list"
 msgstr "Rhestr ddewis argraffu"
 
-#: printer/printerdrake.pm:3317
-#, c-format
+#: printer/printerdrake.pm:3502
+#, fuzzy, 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 "
@@ -13192,7 +13422,9 @@ msgid ""
 "\" menu. Call also \"man scanimage\" on the command line to get more "
 "information.\n"
 "\n"
-"Do not use \"scannerdrake\" for this device!"
+"You do not need to run \"scannerdrake\" for setting up scanning on this "
+"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 "
 "sganio. Mae modd i chi sganio gyda \"scanimage\" (\"scanimage -d hp:%s\" i "
@@ -13204,7 +13436,7 @@ msgstr ""
 "\n"
 "Peidiwch defnyddio \"scannerdrake\" ar gyfer y ddyfais hon."
 
-#: printer/printerdrake.pm:3343
+#: printer/printerdrake.pm:3528
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13226,18 +13458,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:3365 printer/printerdrake.pm:3767
-#, c-format
-msgid "Reading printer data..."
-msgstr "Darllen data argraffydd..."
-
-#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
-#: printer/printerdrake.pm:3447
+#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3632
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "Trosglwyddo ffurfweddiad yr argraffydd"
 
-#: printer/printerdrake.pm:3386
+#: printer/printerdrake.pm:3571
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13252,7 +13479,7 @@ msgstr ""
 "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:3389
+#: printer/printerdrake.pm:3574
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13261,7 +13488,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:3391
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13269,12 +13496,12 @@ msgid ""
 msgstr ""
 "Mae PDQ yn cynnal argraffyddion lleol,  LDP pell, a Socket/TCP, yn unig.\n"
 
-#: printer/printerdrake.pm:3393
+#: printer/printerdrake.pm:3578
 #, 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:3395
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13283,7 +13510,7 @@ msgstr ""
 "Yn ogystal, nid oes modd trosglwyddo rhesi grëwyd gan y rhaglen hon na "
 "\"foomatic-configure\"."
 
-#: printer/printerdrake.pm:3396
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid ""
 "\n"
@@ -13294,7 +13521,7 @@ msgstr ""
 "Hefyd nid oes modd trosglwyddo argraffyddion ffurfweddwyd gyda ffeiliau PPD "
 "ddarparwyd gan eu gwneuthurwyr na gyrrwyr CUPS brodorol."
 
-#: printer/printerdrake.pm:3397
+#: printer/printerdrake.pm:3582
 #, c-format
 msgid ""
 "\n"
@@ -13305,17 +13532,17 @@ msgstr ""
 "Nodwch yr argraffydd rydych am ei drosglwddo a chliciwch\n"
 "\"Trosglwyddo\"."
 
-#: printer/printerdrake.pm:3400
+#: printer/printerdrake.pm:3585
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Peidio trosglwyddo argraffydd"
 
-#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
 #, c-format
 msgid "Transfer"
 msgstr "Trosglwyddo"
 
-#: printer/printerdrake.pm:3413
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13326,17 +13553,17 @@ msgstr ""
 "Cliciwch \"Trosglwyddo\" i ysgrifennu drosto.\n"
 "Mae modd i chi osod enw newydd arno neu ei hepgor."
 
-#: printer/printerdrake.pm:3434
+#: printer/printerdrake.pm:3619
 #, c-format
 msgid "New printer name"
 msgstr "Enw'r argraffydd newydd"
 
-#: printer/printerdrake.pm:3437
+#: printer/printerdrake.pm:3622
 #, c-format
 msgid "Transferring %s..."
 msgstr "Trosglwyddo %s..."
 
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13346,28 +13573,28 @@ msgstr ""
 "(\"%s\"). A ddylai fod yn argraffydd rhagosodedig y system argraffu newydd %"
 "s ?"
 
-#: printer/printerdrake.pm:3458
+#: printer/printerdrake.pm:3643
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Adnewyddu data'r argraffydd..."
 
-#: printer/printerdrake.pm:3467
+#: printer/printerdrake.pm:3652
 #, c-format
 msgid "Starting network..."
 msgstr "Cychwyn y rhwydwaith..."
 
-#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
-#: printer/printerdrake.pm:3514
+#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
+#: printer/printerdrake.pm:3701
 #, c-format
 msgid "Configure the network now"
 msgstr "Ffurfweddwch y rhwydwaith"
 
-#: printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3696
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Nid yw swyddogaethau'r rhwydwaith wedi ei ffurfweddu"
 
-#: printer/printerdrake.pm:3510
+#: printer/printerdrake.pm:3697
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13380,12 +13607,12 @@ msgstr ""
 "fynd ymlaen heb ffurfweddiad rhwydwaith, ni bydd modd i chi ddefnyddio'r "
 "argraffydd rydych yn ei ffurfweddu ar hyn o bryd. Beth ydych am ei wneud?"
 
-#: printer/printerdrake.pm:3513
+#: printer/printerdrake.pm:3700
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Parhau heb ffurfweddu'r rhwydwaith"
 
-#: printer/printerdrake.pm:3547
+#: printer/printerdrake.pm:3735
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13400,7 +13627,7 @@ msgstr ""
 "\"Rrhwydwaith a'r Rhyngrwyd\"/\"Cysylltiad\", ac yna gosod yr argraffydd, "
 "eto gan ddefnyddio Canolfan Rheoli %s, adran \"Caledwedd\"/\"Argraffydd\""
 
-#: printer/printerdrake.pm:3548
+#: printer/printerdrake.pm:3736
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13411,27 +13638,27 @@ msgstr ""
 "Gwiriwch eich ffurfweddiad a'ch caledwedd. Yna ceisiwch ail ffurfweddi eich "
 "argraffydd."
 
-#: printer/printerdrake.pm:3558
+#: printer/printerdrake.pm:3746
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Ailgychwyn system argraffu..."
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "high"
 msgstr "uchel"
 
-#: printer/printerdrake.pm:3597
+#: printer/printerdrake.pm:3776
 #, c-format
 msgid "paranoid"
 msgstr "Paranoia"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3778
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Gosod system argraffu yn lefel diogelwch %s"
 
-#: printer/printerdrake.pm:3599
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -13455,12 +13682,12 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau ffurfweddu argraffu ar y peiriant hwn?"
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3814
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Cychwyn y system argraffu wrth gychwyn y cyfrifiadur"
 
-#: printer/printerdrake.pm:3634
+#: printer/printerdrake.pm:3815
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13482,67 +13709,150 @@ msgstr ""
 "\n"
 "Ydych chi am i'r cychwyn awtomatig gael ei droi ymlaen eto?"
 
-#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
+#: printer/printerdrake.pm:3837
 #, c-format
 msgid "Checking installed software..."
 msgstr "Gwirio'r meddalwedd sydd wedi ei osod..."
 
-#: printer/printerdrake.pm:3661
+#: printer/printerdrake.pm:3843
 #, c-format
-msgid "Removing %s ..."
+msgid "Removing %s..."
 msgstr "Tynnu %s..."
 
-#: printer/printerdrake.pm:3665
+#: printer/printerdrake.pm:3847
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "Methu tynnu'r system argraffu %s!"
 
-#: printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3863
 #, c-format
-msgid "Installing %s ..."
+msgid "Installing %s..."
 msgstr "Gosod %s..."
 
-#: printer/printerdrake.pm:3678
+#: printer/printerdrake.pm:3867
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "Methu gosod system argraffu %s!"
 
-#: printer/printerdrake.pm:3727
+#: printer/printerdrake.pm:3934
+#, c-format
+msgid ""
+"In this mode there is no local printing system, all printing requests go "
+"directly to the server specified below. Note that it is not possible to "
+"define local print queues then and if the specified server is down it cannot "
+"be printed at all from this machine."
+msgstr ""
+
+#: printer/printerdrake.pm:3936
+#, 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 ""
+
+#: printer/printerdrake.pm:3950
+#, c-format
+msgid "Name or IP of remote server:"
+msgstr "Gwesteiwr neu IP ar weinydd pell:"
+
+#: printer/printerdrake.pm:3970
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Gosod yr Argraffydd Rhagosodedig"
 
-#: printer/printerdrake.pm:3747
+#: printer/printerdrake.pm:3989
+#, fuzzy, c-format
+msgid "Local CUPS printing system or remote CUPS server?"
+msgstr "Argraffydd ar weinydd CUPS pell"
+
+#: printer/printerdrake.pm:3990
+#, c-format
+msgid "The CUPS printing system can be used in two ways: "
+msgstr ""
+
+#: printer/printerdrake.pm:3992
+#, c-format
+msgid "1. The CUPS printing system can run locally. "
+msgstr ""
+
+#: printer/printerdrake.pm:3993
+#, 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 ""
+
+#: printer/printerdrake.pm:3994
+#, c-format
+msgid ""
+"Disadvantage of this approach is, that more resources on the local machine "
+"are needed: Additional software packages need to be installed, the CUPS "
+"daemon has to run in the background and needs some memory, and the IPP port "
+"(port 631) is opened. "
+msgstr ""
+
+#: printer/printerdrake.pm:3996
+#, c-format
+msgid "2. All printing requests are immediately sent to a remote CUPS server. "
+msgstr ""
+
+#: printer/printerdrake.pm:3997
+#, 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 ""
+
+#: printer/printerdrake.pm:3998
+#, 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 ""
+
+#: printer/printerdrake.pm:4000
+#, c-format
+msgid "How should CUPS be set up on your machine?"
+msgstr ""
+
+#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
+#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#, c-format
+msgid "Remote server, specify Name or IP here:"
+msgstr ""
+
+#: printer/printerdrake.pm:4018
+#, fuzzy, c-format
+msgid "Local CUPS printing system"
+msgstr "Ffurfweddu'r system argraffu CUPS"
+
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Dewiswch Sbwlydd Argraffydd"
 
-#: printer/printerdrake.pm:3748
+#: printer/printerdrake.pm:4057
 #, 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:3799
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Methu ffurfweddu argraffydd \"%s\"!"
 
-#: printer/printerdrake.pm:3812
+#: printer/printerdrake.pm:4118
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Gosod Foomatic..."
 
-#: printer/printerdrake.pm:3818
+#: printer/printerdrake.pm:4124
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "Methu gosod pecynnau %s, methu cychwyn %s!"
 
-#: printer/printerdrake.pm:3910
-#, c-format
-msgid "Could not install necessary packages, %s cannot be started!"
-msgstr "Methu gosod y pecynnau angenrheidiol, methu cychwyn %s!"
-
-#: printer/printerdrake.pm:4011
+#: printer/printerdrake.pm:4314
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13552,192 +13862,160 @@ 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:4039
+#: printer/printerdrake.pm:4344
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Arddangos pob  argraffydd CUPS pell sydd ar gael"
 
-#: printer/printerdrake.pm:4040
+#: printer/printerdrake.pm:4345
 #, 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:4050
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid "CUPS configuration"
 msgstr "Ffurfweddiad CUPS"
 
-#: printer/printerdrake.pm:4062
+#: printer/printerdrake.pm:4368
 #, c-format
 msgid "Change the printing system"
 msgstr "Newidiwch y system argraffu"
 
-#: printer/printerdrake.pm:4071
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Normal Mode"
 msgstr "Modd Arferol"
 
-#: printer/printerdrake.pm:4072
+#: printer/printerdrake.pm:4378
 #, c-format
 msgid "Expert Mode"
 msgstr "Modd Uwch"
 
-#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
-#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
+#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
+#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
 #, c-format
 msgid "Printer options"
 msgstr "Dewisiadau argraffydd"
 
-#: printer/printerdrake.pm:4379
+#: printer/printerdrake.pm:4668
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Newid ffurfweddiad yr argraffydd"
 
-#: printer/printerdrake.pm:4381
+#: printer/printerdrake.pm:4670
 #, c-format
 msgid ""
-"Printer %s\n"
+"Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr ""
-"Argraffydd %s\n"
+"Argraffydd %s%s\n"
 "Beth ydych am ei newid ar yr argraffydd hwn?"
 
-#: printer/printerdrake.pm:4385
+#: printer/printerdrake.pm:4675
+#, fuzzy, c-format
+msgid "This printer is disabled"
+msgstr "Nid oes modd newid maint y rhaniad"
+
+#: printer/printerdrake.pm:4677
 #, c-format
 msgid "Do it!"
 msgstr "Gwna!!"
 
-#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
+#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
 #, c-format
 msgid "Printer connection type"
 msgstr "Math o gyswllt argraffydd"
 
-#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
+#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Enw'r argraffydd, disgrifiad, lleoliad"
 
-#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
+#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Gwneuthurwr yr argraffydd, model, gyrrwr"
 
-#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
+#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Gwneuthurwr yr argraffydd, model"
 
-#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
 #, c-format
 msgid "Set this printer as the default"
 msgstr "Gosod yr argraffydd fel y rhagosodedig"
 
-#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
-#, c-format
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Ychwanegwch yr argraffydd hwn i Star Office/OpenOffice.org/GIMP"
+#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
+#: printer/printerdrake.pm:4780
+#, fuzzy, c-format
+msgid "Enable Printer"
+msgstr "Galluogi'r Gweinydd"
 
-#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
-#, c-format
-msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Tynnwch yr argraffydd hwn o Star Office/OpenOffice.org/GIMP"
+#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
+#: printer/printerdrake.pm:4785
+#, fuzzy, c-format
+msgid "Disable Printer"
+msgstr "Analluogi'r Gweinydd"
 
-#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
+#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
 #, c-format
 msgid "Print test pages"
 msgstr "Argraffu tudalennau prawf"
 
-#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
+#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "Gwybod sut i ddefnyddio'r argraffydd"
 
-#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
+#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
 #, c-format
 msgid "Remove printer"
 msgstr "Tynnu argraffydd"
 
-#: printer/printerdrake.pm:4460
+#: printer/printerdrake.pm:4750
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Tynnu hen argraffydd \"%s\"..."
 
-#: printer/printerdrake.pm:4491
-#, c-format
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Ychwanegu argraffydd i Star Office/OpenOffice.org/GIMP"
-
-#: printer/printerdrake.pm:4493
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Mae argraffydd \"%s\" wedi ei ychwanegu'n llwyddiannus i Star Office/"
-"OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4494
-#, c-format
-msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-msgstr ""
-"Wedi methu ag ychwanegu argraffydd \"%s\" i Star Office/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4496
-#, c-format
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Tynnu'r argraffydd o Star Office/OpenOffice.org/GIMP."
-
-#: printer/printerdrake.pm:4498
-#, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr ""
-"Cafodd argraffydd \"%s\" ei dynnu'n llwyddiannus o Star Office/OpenOffice."
-"org."
+#: printer/printerdrake.pm:4781
+#, fuzzy, c-format
+msgid "Printer \"%s\" is now enabled."
+msgstr "Argraffydd \"%s\" ar weinydd \"%s\""
 
-#: printer/printerdrake.pm:4499
-#, c-format
-msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-msgstr "Methwyd â thynnu argraffydd \"%s\" o Star Office/OpenOffice.org/GIMP."
+#: printer/printerdrake.pm:4786
+#, fuzzy, c-format
+msgid "Printer \"%s\" is now disabled."
+msgstr "Mae cyswllt VPN wedi ei analluogi."
 
-#: printer/printerdrake.pm:4543
+#: printer/printerdrake.pm:4823
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Ydych chi wir eisiau tynnu argraffydd \"%s\""
 
-#: printer/printerdrake.pm:4547
+#: printer/printerdrake.pm:4827
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Tynnu argraffydd \"%s\"..."
 
-#: printer/printerdrake.pm:4571
+#: printer/printerdrake.pm:4851
 #, c-format
 msgid "Default printer"
 msgstr "Argraffydd rhagosodedig"
 
-#: printer/printerdrake.pm:4572
+#: printer/printerdrake.pm:4852
 #, 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:37
-#, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
+#: 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:139
-#, c-format
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "methodd mkraid (efallai bod raidtools ar goll)"
-
-#: raid.pm:139
-#, c-format
-msgid "mkraid failed"
-msgstr "methodd mkraid"
-
-#: raid.pm:155
+#: raid.pm:132
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Dim digon o raniadau ar gyfer RAID lefel %d\n"
@@ -13762,16 +14040,16 @@ msgstr "Methu copïo ffeil cadarnwedd %s i /usr/share/sane/firmware!"
 msgid "Could not set permissions of firmware file %s!"
 msgstr "Methu gosod caniatâd ffeiliau cadarnwedd %s!"
 
-#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
-#: standalone/scannerdrake:77 standalone/scannerdrake:344
-#: standalone/scannerdrake:419 standalone/scannerdrake:463
-#: standalone/scannerdrake:467 standalone/scannerdrake:489
-#: standalone/scannerdrake:554
+#: 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
 #, c-format
 msgid "Scannerdrake"
 msgstr "Scannerdrake"
 
-#: scanner.pm:201 standalone/scannerdrake:920
+#: scanner.pm:201 standalone/scannerdrake:916
 #, 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)."
@@ -13801,8 +14079,9 @@ msgstr "Caniatáu/Gwrthod atsain icmp."
 msgid "Allow/Forbid autologin."
 msgstr "Caniatáu Gwrthod awtomewngofnodi."
 
-#: security/help.pm:19
-#, c-format
+#. -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
 msgid ""
 "If set to \"ALL\", /etc/issue and /etc/issue.net are allowed to exist.\n"
 "\n"
@@ -13814,26 +14093,26 @@ msgstr ""
 "\n"
 "Os yw \"ALL\"yn caniatáu /etc/issue a /etc/issue.net i fodoli.\n"
 "\n"
-"Os yw \\fIarg\\fP = NONE\n"
+"Os yw \"arg\" = NONE\n"
 "\n"
 "Dim materion heblaw caniatáu  /etc/issue."
 
-#: security/help.pm:25
+#: security/help.pm:27
 #, c-format
 msgid "Allow/Forbid reboot by the console user."
 msgstr "Caniatáu/Gwrthod ailgychwyn cyfrifiadur gan ddefnyddiwr y consol."
 
-#: security/help.pm:27
+#: security/help.pm:29
 #, c-format
 msgid "Allow/Forbid remote root login."
 msgstr "Caniatáu/Gwrthod mewngofnodi gwraidd pell"
 
-#: security/help.pm:29
+#: security/help.pm:31
 #, c-format
 msgid "Allow/Forbid direct root login."
 msgstr "Caniatáu/Gwrthod mewngofnodi gwraidd uniongyrchol."
 
-#: security/help.pm:31
+#: security/help.pm:33
 #, c-format
 msgid ""
 "Allow/Forbid the list of users on the system on display managers (kdm and "
@@ -13842,7 +14121,16 @@ msgstr ""
 "Caniatáu/Gwrthod rhestr defnyddwyr ar y system ar reolwyr arddangos (kdm and "
 "gdm)."
 
-#: security/help.pm:33
+#: security/help.pm:35
+#, c-format
+msgid ""
+"Allow/forbid to export display when\n"
+"passing from the root account to the other users.\n"
+"\n"
+"See pam_xauth(8) for more details.'"
+msgstr ""
+
+#: security/help.pm:40
 #, c-format
 msgid ""
 "Allow/Forbid X connections:\n"
@@ -13860,7 +14148,7 @@ msgstr ""
 "- LOCAL (dim ond cysylltiadau lleol)\n"
 "-  NONE (dim cysylltiadau)"
 
-#: security/help.pm:41
+#: security/help.pm:48
 #, c-format
 msgid ""
 "The argument specifies if clients are authorized to connect\n"
@@ -13869,7 +14157,8 @@ msgstr ""
 "Mae'r ymresymiad yn pennu os oes gan y defnyddiwr ganiatád i gysylltu\n"
 "gyda'r  gweinydd X porth  tcp 6000 neu beidio."
 
-#: security/help.pm:44
+#. -PO: here "ALL", "LOCAL" and "NONE" are values in a pull-down menu; translate them the same as they're
+#: security/help.pm:53
 #, c-format
 msgid ""
 "Authorize:\n"
@@ -13895,7 +14184,7 @@ msgstr ""
 "- dim os wedi eu gosodi i NONE. I ganiatáu'r gwasanaethau sydd eu hangen, "
 "defnyddiwch /etc/hosts.allow (gw. hosts.allow(5))."
 
-#: security/help.pm:54
+#: security/help.pm:63
 #, c-format
 msgid ""
 "If SERVER_LEVEL (or SECURE_LEVEL if absent)\n"
@@ -13915,7 +14204,7 @@ msgstr ""
 "at i benderfynnu ychwnaegu gwasanaeth os yw ar gael yn y\n"
 "ffeil wrth osod y pecynnau"
 
-#: security/help.pm:63
+#: security/help.pm:72
 #, c-format
 msgid ""
 "Enable/Disable crontab and at for users.\n"
@@ -13928,41 +14217,46 @@ msgstr ""
 " Rhoi defnyddwyr â chaniatâd yn /etc/cron.allow a  /etc/at.allow\n"
 " (gw. man yn(1) a crontab(1))."
 
-#: security/help.pm:68
+#: security/help.pm:77
 #, c-format
 msgid "Enable/Disable syslog reports to console 12"
 msgstr "Galluogi/Analluogi adroddiadau syslog i gonsol 12"
 
-#: security/help.pm:70
+#: security/help.pm:79
 #, c-format
 msgid ""
 "Enable/Disable name resolution spoofing protection.  If\n"
-"\"alert\" is true, also reports to syslog."
+"\"%s\" is true, also reports to syslog."
 msgstr ""
 "Galluogi/Analluogi amddiffyn spwffio datrys enw. Os yw\n"
-"\\alert\\fP yn wir, adrodd i syslog."
+"\"%s\" yn wir, adrodd i syslog."
 
-#: security/help.pm:73
+#: security/help.pm:80 standalone/draksec:213
+#, c-format
+msgid "Security Alerts:"
+msgstr "Rhybuddion Diogelwch:"
+
+#: security/help.pm:82
 #, c-format
 msgid "Enable/Disable IP spoofing protection."
 msgstr "Galluogi/Analluogi amddiffyn spwlio IP"
 
-#: security/help.pm:75
+#: security/help.pm:84
 #, c-format
 msgid "Enable/Disable libsafe if libsafe is found on the system."
 msgstr "Galluogi/Analluogi libsafe os yw ar y system."
 
-#: security/help.pm:77
+#: security/help.pm:86
 #, c-format
 msgid "Enable/Disable the logging of IPv4 strange packets."
 msgstr "Galluogi?Analluogi mewngofnodi pecynnau anarferol IPv4."
 
-#: security/help.pm:79
+#: security/help.pm:88
 #, c-format
 msgid "Enable/Disable msec hourly security check."
 msgstr "Galluogi/Analluogi gwiriad diogelwch msec bob awr."
 
-#: security/help.pm:81
+#: security/help.pm:90
 #, c-format
 msgid ""
 " Enabling su only from members of the wheel group or allow su from any user."
@@ -13970,44 +14264,43 @@ msgstr ""
 " Galluogi su o aelodau grwp olwyn yn unig neu caniatáu su o unrhyw "
 "ddefnyddiwr."
 
-#: security/help.pm:83
+#: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
 msgstr "Defnyddio cyfrinair i wirio defnyddwyr."
 
-#: security/help.pm:85
+#: security/help.pm:94
 #, c-format
 msgid "Activate/Disable ethernet cards promiscuity check."
 msgstr "Galluogi/Analluogi gwiriad cymysgaredd cardiau ethernet."
 
-#: security/help.pm:87
+#: security/help.pm:96
 #, c-format
 msgid " Activate/Disable daily security check."
 msgstr "Galluogi/Analluogi gwiriad diogelwch dyddiol."
 
-#: security/help.pm:89
+#: security/help.pm:98
 #, c-format
 msgid " Enable/Disable sulogin(8) in single user level."
 msgstr "Galluogi/Analluogi sulogin(8 mewn defnydd defnyddiwr unigol."
 
-#: security/help.pm:91
+#: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
 msgstr "Ychwanegu'r enw fel eithriad i drin cyfrinair yn erbyn msec."
 
-#: security/help.pm:93
+#: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
-"Gosod cyfrinair yn erbyn \\fImax\\fP dyddiau ac oedi i newid i \\fIinactive"
-"\\fP."
+"Gosod cyfrinair yn erbyn \"max\" dyddiau ac oedi i newid i \"inactive\"."
 
-#: security/help.pm:95
+#: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
 msgstr "Gosod hyd hanes cyfrinair i rwystro ail ddefnyddio'r cyfrinair."
 
-#: security/help.pm:97
+#: security/help.pm:106
 #, c-format
 msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
@@ -14016,20 +14309,20 @@ msgstr ""
 "Gosod lleiafswm hyd gyfrinair a lleiafswm digidau a lleiafswm llythrennau "
 "mawr."
 
-#: security/help.pm:99
+#: security/help.pm:108
 #, c-format
 msgid "Set the root umask."
 msgstr "Gosod gwraidd umask."
 
-#: security/help.pm:100
+#: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
 msgstr "os wedi ei osod i iawn, gwirio pyrth agored."
 
-#: security/help.pm:101
+#: security/help.pm:110
 #, c-format
 msgid ""
-"if set to yes, check for :\n"
+"if set to yes, check for:\n"
 "\n"
 "- empty passwords,\n"
 "\n"
@@ -14045,61 +14338,61 @@ msgstr ""
 "\n"
 "- defnyddwyr eraill gyda enw 0 ar wahan i gwraidd."
 
-#: security/help.pm:108
+#: security/help.pm:117
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
 "os wedi ei osod i iawn, gwirio caniatâd ffeiliau yng nghartref y defnyddiwr."
 
-#: security/help.pm:109
+#: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
 msgstr ""
 "os wedi ei osod i iawn, gwirio os yw'r dyfeisiau rhwydwaith mewn modd cymysg"
 
-#: security/help.pm:110
+#: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
 msgstr "os wedi ei osod i iawn, rhedeg y gwiriadau diogelwch dyddiol."
 
-#: security/help.pm:111
+#: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
 msgstr "os wedi ei osod i iawn, gwirio ychwanegiadau/tynnu ffeiliau sgid."
 
-#: security/help.pm:112
+#: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
 msgstr "os wedi ei osod i iawn, gwirio cyfrinair gwag y  /etc/shadow."
 
-#: security/help.pm:113
+#: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
 msgstr "os wedi ei osod i iawn, gwirio checksum y ffeiliau suid/sgid."
 
-#: security/help.pm:114
+#: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
 msgstr ""
 "os wedi ei osod i iawn, , gwirio ychwanegu/tynnu ffeiliau gwraidd suid."
 
-#: security/help.pm:115
+#: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
 msgstr "os wedi ei osod i iawn, adrodd ar ffeiliau heb berchennog."
 
-#: security/help.pm:116
+#: security/help.pm:125
 #, 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."
 
-#: security/help.pm:117
+#: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
 msgstr "os wedi ei osod i iawn,  gwirio gyda chkrootkit."
 
-#: security/help.pm:118
+#: security/help.pm:127
 #, c-format
 msgid ""
 "if set, send the mail report to this email address else send it to root."
@@ -14107,47 +14400,47 @@ msgstr ""
 "os wedi ei osod, anfon yr adroddiad e-bost i'r cyfeiriad e-bost neu ei anfon "
 "i'r gwraidd."
 
-#: security/help.pm:119
+#: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
 msgstr "os wedi ei osod i iawn, adrodd y gwirio drwy e-bost"
 
-#: security/help.pm:120
+#: security/help.pm:129
 #, c-format
 msgid "Do not send mails if there's nothing to warn about"
 msgstr "Peidio anfon e-byst os nad oes dim i rybuddio amdano"
 
-#: security/help.pm:121
+#: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
 msgstr "os wedi ei osod i iawn,  gwirio yn erbyn y gronfa ddata rpm."
 
-#: security/help.pm:122
+#: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
 msgstr "os wedi ei osod i iawn, adrodd y gwirio i syslog."
 
-#: security/help.pm:123
+#: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
 msgstr "os wedi ei osod i iawn, adrodd adroddiadau gwirio i tty."
 
-#: security/help.pm:125
+#: security/help.pm:134
 #, c-format
 msgid "Set shell commands history size. A value of -1 means unlimited."
 msgstr "Gosod maint hanes gorchymyn cragen. Gwerth -1 yn golygu diderfyn."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Set the shell timeout. A value of zero means no timeout."
 msgstr "Gosod amser allan y gragen. Gwerth sero'n golygu dim amser allan."
 
-#: security/help.pm:127
+#: security/help.pm:136
 #, c-format
 msgid "Timeout unit is second"
 msgstr "Enwi enw'r ail uned."
 
-#: security/help.pm:129
+#: security/help.pm:138
 #, c-format
 msgid "Set the user umask."
 msgstr "Gosod umasg y defnyddiwr"
@@ -14196,214 +14489,219 @@ msgstr ""
 
 #: security/l10n.pm:20
 #, c-format
+msgid "Export display when passing from root to the other users"
+msgstr ""
+
+#: security/l10n.pm:21
+#, c-format
 msgid "Allow X Window connections"
 msgstr "Caniatáu cysylltiadai XWindows"
 
-#: security/l10n.pm:21
+#: security/l10n.pm:22
 #, c-format
 msgid "Authorize TCP connections to X Window"
 msgstr "Caniatáu cysylltiad TCP i XWindows"
 
-#: security/l10n.pm:22
+#: security/l10n.pm:23
 #, c-format
 msgid "Authorize all services controlled by tcp_wrappers"
 msgstr "Awdurdodi pob gwasanaeth wedi ei reoli gan tcp_wrappers"
 
-#: security/l10n.pm:23
+#: security/l10n.pm:24
 #, c-format
 msgid "Chkconfig obey msec rules"
 msgstr "Chkconfig yn ufudd i reolau msec"
 
-#: security/l10n.pm:24
+#: security/l10n.pm:25
 #, c-format
 msgid "Enable \"crontab\" and \"at\" for users"
 msgstr "Galluogi \"crontab\" a \"at\" ar gyfer defnyddwyr"
 
-#: security/l10n.pm:25
+#: security/l10n.pm:26
 #, c-format
 msgid "Syslog reports to console 12"
 msgstr "Adroddiad syslog i gonsol 12"
 
-#: security/l10n.pm:26
+#: security/l10n.pm:27
 #, c-format
 msgid "Name resolution spoofing protection"
 msgstr "Amddiffyniad ffugio cydraniad enw"
 
-#: security/l10n.pm:27
+#: security/l10n.pm:28
 #, c-format
 msgid "Enable IP spoofing protection"
 msgstr "Galluogi amddiffyn sbwlio IP"
 
-#: security/l10n.pm:28
+#: security/l10n.pm:29
 #, c-format
 msgid "Enable libsafe if libsafe is found on the system"
 msgstr "Galluogi/Analluogi libsafe os yw ar y system."
 
-#: security/l10n.pm:29
+#: security/l10n.pm:30
 #, c-format
 msgid "Enable the logging of IPv4 strange packets"
 msgstr "Galluogi mewngofnodi pecynnau anarferol IPv4."
 
-#: security/l10n.pm:30
+#: security/l10n.pm:31
 #, c-format
 msgid "Enable msec hourly security check"
 msgstr "Galluogi/Analluogi gwiriad diogelwch msec bob awr."
 
-#: security/l10n.pm:31
+#: security/l10n.pm:32
 #, 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 "
 "ddefnyddiwr."
 
-#: security/l10n.pm:32
+#: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
 msgstr "Defnyddio cyfrinair i wirio defnyddiwr."
 
-#: security/l10n.pm:33
+#: security/l10n.pm:34
 #, c-format
 msgid "Ethernet cards promiscuity check"
 msgstr "Gwiriad cymysgaredd cardiau ethernet."
 
-#: security/l10n.pm:34
+#: security/l10n.pm:35
 #, c-format
 msgid "Daily security check"
 msgstr "Gwiriad diogelwch dyddiol"
 
-#: security/l10n.pm:35
+#: security/l10n.pm:36
 #, c-format
 msgid "Sulogin(8) in single user level"
 msgstr "Sulogin(8 ar lefel defnyddiwr unigol."
 
-#: security/l10n.pm:36
+#: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
 msgstr "Dim cyfrinair eto ar gyfer"
 
-#: security/l10n.pm:37
+#: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
 msgstr "Gosod terfyn cyfrinair ac oediad anactifiad cyfrif"
 
-#: security/l10n.pm:38
+#: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
 msgstr "Hyd gyfrinair hanes"
 
-#: security/l10n.pm:39
+#: 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"
 
-#: security/l10n.pm:40
+#: security/l10n.pm:41
 #, c-format
 msgid "Root umask"
 msgstr "umask gwraidd"
 
-#: security/l10n.pm:41
+#: security/l10n.pm:42
 #, c-format
 msgid "Shell history size"
 msgstr "Maint hanes cragen"
 
-#: security/l10n.pm:42
+#: security/l10n.pm:43
 #, c-format
 msgid "Shell timeout"
 msgstr "Goramser cragen"
 
-#: security/l10n.pm:43
+#: security/l10n.pm:44
 #, c-format
 msgid "User umask"
 msgstr "Masc defnyddwyr"
 
-#: security/l10n.pm:44
+#: security/l10n.pm:45
 #, c-format
 msgid "Check open ports"
 msgstr "Gwirio pyrth agored"
 
-#: security/l10n.pm:45
+#: security/l10n.pm:46
 #, c-format
 msgid "Check for unsecured accounts"
 msgstr "Gwiriwch am gyfrifon anniogel."
 
-#: security/l10n.pm:46
+#: security/l10n.pm:47
 #, c-format
 msgid "Check permissions of files in the users' home"
 msgstr "Gwirio caniatâd ffeiliau yng nghartref y defnyddiwr."
 
-#: security/l10n.pm:47
+#: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
 msgstr "Gwirio os yw'r dyfeisiau rhwydwaith mewn modd cymysgaredd"
 
-#: security/l10n.pm:48
+#: security/l10n.pm:49
 #, c-format
 msgid "Run the daily security checks"
 msgstr "Rhedeg y gwiriadau diogelwch dyddiol."
 
-#: security/l10n.pm:49
+#: security/l10n.pm:50
 #, c-format
 msgid "Check additions/removals of sgid files"
 msgstr "Gwirio ychwanegiadau/tynnu ffeiliau sgid."
 
-#: security/l10n.pm:50
+#: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
 msgstr "Gwiriwch gyfrinair gwag y  /etc/shadow."
 
-#: security/l10n.pm:51
+#: security/l10n.pm:52
 #, c-format
 msgid "Verify checksum of the suid/sgid files"
 msgstr "Gwirio checksum y ffeiliau suid/sgid."
 
-#: security/l10n.pm:52
+#: security/l10n.pm:53
 #, c-format
 msgid "Check additions/removals of suid root files"
 msgstr "Gwirio ychwanegu/tynnu ffeiliau gwraidd suid."
 
-#: security/l10n.pm:53
+#: security/l10n.pm:54
 #, c-format
 msgid "Report unowned files"
 msgstr "Adrodd ar ffeiliau heb berchennog."
 
-#: security/l10n.pm:54
+#: security/l10n.pm:55
 #, c-format
 msgid "Check files/directories writable by everybody"
 msgstr "Gwirio ffeiliau/cyfeiriaduron ysgrifenadwy gan bawb."
 
-#: security/l10n.pm:55
+#: security/l10n.pm:56
 #, c-format
 msgid "Run chkrootkit checks"
 msgstr "Rhedeg gwirio gyda chkrootkit."
 
-#: security/l10n.pm:56
+#: security/l10n.pm:57
 #, c-format
 msgid "Do not send mails when unneeded"
 msgstr "Peidiwch anfon e-byst pan nad oes angen"
 
-#: security/l10n.pm:57
+#: security/l10n.pm:58
 #, c-format
 msgid "If set, send the mail report to this email address else send it to root"
 msgstr ""
 "Os wedi ei osod, anfon yr adroddiad e-bost i'r cyfeiriad e-bost neu ei anfon "
 "i'r gwraidd."
 
-#: security/l10n.pm:58
+#: security/l10n.pm:59
 #, c-format
 msgid "Report check result by mail"
 msgstr "Adrodd y gwirio drwy e-bost"
 
-#: security/l10n.pm:59
+#: security/l10n.pm:60
 #, c-format
 msgid "Run some checks against the rpm database"
 msgstr "Gwirio yn erbyn y gronfa ddata rpm."
 
-#: security/l10n.pm:60
+#: security/l10n.pm:61
 #, c-format
 msgid "Report check result to syslog"
 msgstr "Adrodd y gwirio i syslog."
 
-#: security/l10n.pm:61
+#: security/l10n.pm:62
 #, c-format
 msgid "Reports check result to tty"
 msgstr "Adrodd adroddiadau gwirio i tty."
@@ -14742,10 +15040,10 @@ msgstr ""
 #, c-format
 msgid ""
 "Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
+"and Xorg at boot."
 msgstr ""
 "Cychwyn clo allweddell numlock yn awtomatig yn consol \n"
-"ac XFree wrth gychwyn y peiriant."
+"ac Xorg wrth gychwyn y peiriant."
 
 #: services.pm:66
 #, c-format
@@ -14841,7 +15139,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"logged into a machine running the rwho daemon (similar to finger)."
 msgstr ""
 "Mae'r protocol rwho'n caniatáu i ddefnyddwyr pell gael rhestr o'r \n"
 "holl ddefnyddwyr sydd wedi mewngofnodi ar beiriant sy'n rhedeg \n"
@@ -14869,8 +15167,8 @@ msgstr "Llwytho'r gyrwyr ar gyfer eich dyfeisiau usb."
 
 #: services.pm:91
 #, c-format
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Yn cychwyn Gweinydd Ffont  X (mae hyn yn orfodol i XFree i redeg).."
+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
 #, c-format
@@ -14916,7 +15214,7 @@ msgstr "ataliwyd"
 
 #: services.pm:215
 #, c-format
-msgid "Services and deamons"
+msgid "Services and daemons"
 msgstr "Gwasanaethau a daemonau"
 
 #: services.pm:221
@@ -14926,7 +15224,7 @@ msgid ""
 "about this service, sorry."
 msgstr "Dim gwybodaeth ychwanegol am y gwasanaeth hwn."
 
-#: services.pm:226 ugtk2.pm:1176
+#: services.pm:226 ugtk2.pm:1214
 #, c-format
 msgid "Info"
 msgstr "Gwybodaeth"
@@ -14941,833 +15239,1235 @@ msgstr "Cychwyn yn ôl y gofyn"
 msgid "On boot"
 msgstr "Cychwyn"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Start"
 msgstr "Cychwyn"
 
-#: services.pm:244
+#: services.pm:246
 #, c-format
 msgid "Stop"
 msgstr "Aros"
 
-#: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
-#: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
+#: share/advertising/01.pl:13
 #, c-format
-msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
-msgstr "<b>Llongyfarchiadau ar ddewis Mandrakelinux!</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Beth yw Mandrakelinux?</b>"
 
-#: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
-#: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
+#: share/advertising/01.pl:15
 #, c-format
-msgid "Welcome to the Open Source world!"
-msgstr "Croeso i fyd Cod Agored!"
+msgid "Welcome to <b>Mandrakelinux</b>!"
+msgstr "Croeso i <b>Mandrakelinux</b>!"
 
-#: share/advertising/dis-01.pl:17
+#: share/advertising/01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrakelinux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and "
-"Mandrakelinux contributors throughout the world."
+"Mandrakelinux is a <b>Linux distribution</b> that comprises the core of the "
+"system, called the <b>operating system</b> (based on the Linux kernel) "
+"together with <b>a lot of applications</b> meeting every need you could even "
+"think of."
 msgstr ""
-"Mae eich system weithredu Mandrakelinux a'i raglenni niferus yn ganlyniad "
-"ymdrechion cydweithredol rhwng datblygwyr MandrakeSoft â chyfranwyr "
-"Mandrakelinux drwy'r byd i gyd."
 
-#: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
-#: share/advertising/ppp-01.pl:19
+#: share/advertising/01.pl:19
+#, fuzzy, 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!"
+
+#: share/advertising/02.pl:13
 #, c-format
+msgid "<b>Open Source</b>"
+msgstr "<b>Cod agored</b>"
+
+#: share/advertising/02.pl:15
+#, fuzzy, c-format
+msgid "Welcome to the <b>world of open source</b>!"
+msgstr "Croeso i fyd Cod Agored!"
+
+#: share/advertising/02.pl:17
+#, fuzzy, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of this "
-"latest release."
+"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."
+
+#: share/advertising/02.pl:19
+#, fuzzy, 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 "
 "diweddaraf."
 
-#: share/advertising/dis-02.pl:13
+#: share/advertising/03.pl:13
 #, c-format
-msgid "<b>Discovery</b>"
-msgstr "<b>Discovery</b>"
+msgid "<b>The GPL</b>"
+msgstr "<b>Y trwydded GPL</b>"
 
-#: share/advertising/dis-02.pl:15
+#: share/advertising/03.pl:15
 #, c-format
 msgid ""
-"Discovery is the easiest and most user-friendly Linux distribution. It "
-"includes a hand-picked selection of premium software for Office, Multimedia "
-"and Internet activities."
+"Most of the software included in the distribution and all of the "
+"Mandrakelinux tools are licensed under the <b>General Public License</b>."
 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."
 
-#: share/advertising/dis-02.pl:17
+#: share/advertising/03.pl:17
 #, c-format
-msgid "The menu is task-oriented, with a single selected application per task."
+msgid ""
+"The GPL is at the heart of the open source model; it grants everyone the "
+"<b>freedom</b> to use, study, distribute and improve the software any way "
+"they want, provided they make the results available."
 msgstr ""
-"Mae'r ddewislen wedi ei seilio ar dasgau, un rhaglen benodol ar gyfer pob "
-"tasg."
 
-#: share/advertising/dis-03.pl:13
+#: share/advertising/03.pl:19
 #, c-format
-msgid "<b>The KDE Choice</b>"
-msgstr "<b>Dewis KDE,</b>"
+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 ""
 
-#: share/advertising/dis-03.pl:15
+#: share/advertising/04.pl:13
+#, c-format
+msgid "<b>Join the Community</b>"
+msgstr "<b>Ymunwch â chymuned</b>"
+
+#: share/advertising/04.pl:15
+#, c-format
+msgid ""
+"Mandrakelinux has one of the <b>biggest communities</b> of users and "
+"developers. The role of such a community is very wide, ranging from bug "
+"reporting to the development of new applications. The community plays a "
+"<b>key role</b> in the Mandrakelinux world."
+msgstr ""
+
+#: share/advertising/04.pl:17
 #, c-format
 msgid ""
-"The powerful Open Source graphical desktop environment KDE is the desktop of "
-"choice for the Discovery Pack."
+"To <b>learn more</b> about our dynamic community, please visit <b>www."
+"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 ""
-"Yr amgylchedd bwrdd gwaith Cod Agored pwerus KDE yw'r bwrdd gwaith o ddewis "
-"ar gyfer y Discovery Pack."
 
-#: share/advertising/dis-04.pl:13
+#: share/advertising/05.pl:13
 #, c-format
-msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
-msgstr "Cyfieithiad"
+msgid "<b>Download Version</b>"
+msgstr "<b>Fersiwn Llwytho</b>"
 
-#: share/advertising/dis-04.pl:15
+#: share/advertising/05.pl:15
 #, c-format
 msgid ""
-"<b>WRITER</b> is a powerful word processor for creating all types of text "
-"documents. Documents may include images, diagrams and tables."
+"You are now installing <b>Mandrakelinux Download</b>. This is the free "
+"version that Mandrakesoft wants to keep <b>available to everyone</b>."
 msgstr ""
-"Mae <b>WRITER</b> yn brosesydd geiriau pwerus ar gyfer creu pob math o "
-"ddogfennau testun. Gall y dogfennau gynnwys delweddau, diagramau a thablau."
 
-#: share/advertising/dis-04.pl:16
+#: share/advertising/05.pl:17
 #, c-format
 msgid ""
-"<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
-"analyze and manage all of your data."
+"The Download version <b>cannot include</b> all the software that is not open "
+"source. Therefore, you won't find in the Download version:"
 msgstr ""
-"Mae <b>CALC</b> yn daenlen gynhwysfawr sy'n eich galluogi chi i gyfrifo, "
-"dadansoddi a rheoli eich holl ddata."
 
-#: share/advertising/dis-04.pl:17
+#: share/advertising/05.pl:18
 #, c-format
 msgid ""
-"<b>IMPRESS</b> is the fastest, most powerful way to create effective "
-"multimedia presentations."
+"\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
-"<b>IMPRESS</b> yw'r ffordd gyflymaf, a'r mwyaf pwerus i greu cyflwyniadau "
-"aml-gyfrwng effeithio."
 
-#: share/advertising/dis-04.pl:18
+#: share/advertising/05.pl:19
 #, c-format
 msgid ""
-"<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
-"illustrations."
+"\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
+"Flash™, etc.)."
 msgstr ""
-"Gall <b>DRAW</b> gynhyrchu unrhywbeth o ddiagramau syml i luniau 3D byw."
 
-#: share/advertising/dis-05.pl:13 share/advertising/dis-06.pl:13
+#: share/advertising/05.pl:21
 #, c-format
-msgid "<b>Surf The Internet</b>"
-msgstr "<b>Crwydro'r Rhyngrwyd</b>"
+msgid ""
+"You won't have access to the <b>services included</b> in the other "
+"Mandrakesoft products either."
+msgstr ""
 
-#: share/advertising/dis-05.pl:15
+#: share/advertising/06.pl:13
 #, c-format
-msgid "Discover the new integrated personal information suite KDE Kontact."
-msgstr "Canfod y casgliad manylion personol integredig KDE Kontact"
+msgid "<b>Discovery, Your First Linux Desktop</b>"
+msgstr ""
 
-#: share/advertising/dis-05.pl:17
+#: share/advertising/06.pl:15
 #, c-format
+msgid "You are now installing <b>Mandrakelinux Discovery</b>."
+msgstr ""
+
+#: share/advertising/06.pl:17
+#, fuzzy, c-format
 msgid ""
-"More than just a full-featured email client, <b>Kontact</b> also includes an "
-"address book, a calendar and scheduling program, plus a tool for taking "
-"notes!"
+"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 ""
-"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!"
+"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."
 
-#: share/advertising/dis-06.pl:15
+#: share/advertising/07.pl:13
 #, c-format
-msgid "You can also:"
-msgstr "Mae modd hefyd:"
+msgid "<b>PowerPack, The Ultimate Linux Desktop</b>"
+msgstr ""
 
-#: share/advertising/dis-06.pl:16
+#: share/advertising/07.pl:15
 #, c-format
-msgid "\t- browse the Web"
-msgstr "\t- Crwydro'r We"
+msgid "You are now installing <b>Mandrakelinux PowerPack</b>."
+msgstr ""
 
-#: share/advertising/dis-06.pl:17
-#, c-format
-msgid "\t- chat"
-msgstr "\t- sgwrsio"
+#: share/advertising/07.pl:17
+#, fuzzy, 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."
 
-#: share/advertising/dis-06.pl:18
+#: share/advertising/08.pl:13
 #, c-format
-msgid "\t- organize a video-conference"
-msgstr "\t- trefnu cynhadledd fideo"
+msgid "<b>PowerPack+, The Linux Solution for Desktops and Servers</b>"
+msgstr ""
 
-#: share/advertising/dis-06.pl:19
+#: share/advertising/08.pl:15
 #, c-format
-msgid "\t- create your own Web site"
-msgstr "\t- creu eich safle Gwe eich hun"
+msgid "You are now installing <b>Mandrakelinux PowerPack+</b>."
+msgstr ""
+
+#: share/advertising/08.pl:17
+#, fuzzy, 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."
 
-#: share/advertising/dis-06.pl:20
+#: share/advertising/09.pl:13
+#, fuzzy, c-format
+msgid "<b>Mandrakesoft Products</b>"
+msgstr "<b>Mandrakestore</b>"
+
+#: share/advertising/09.pl:15
 #, c-format
-msgid "\t- ..."
-msgstr "\t- ..."
+msgid ""
+"<b>Mandrakesoft</b> has developed a wide range of <b>Mandrakelinux</b> "
+"products."
+msgstr ""
+
+#: share/advertising/09.pl:17
+#, fuzzy, c-format
+msgid "The Mandrakelinux 10.1 products are:"
+msgstr "Rhaglennig Diweddaru Mandrakelinux"
 
-#: share/advertising/dis-07.pl:13
+#: share/advertising/09.pl:18
 #, c-format
-msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>Aml-gyfrwng</b>: Meddalwedd ar gyfer pob angen!"
+msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
+msgstr ""
 
-#: share/advertising/dis-07.pl:15
+#: share/advertising/09.pl:19
 #, c-format
-msgid "Listen to audio CDs with <b>KsCD</b>."
-msgstr "Gwrando ar CDau cerddoriaeth gyda <b>KsCD</b>."
+msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
+msgstr ""
 
-#: share/advertising/dis-07.pl:17
+#: share/advertising/09.pl:20
 #, c-format
-msgid "Listen to music files and watch videos with <b>Totem</b>."
-msgstr "Gwrando ar ffeiliau cerddoriaeth a gwylio fideos gyda <b>Totem</b>."
+msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
+msgstr ""
 
-#: share/advertising/dis-07.pl:19
+#: share/advertising/09.pl:21
 #, c-format
-msgid "View and edit images and photos with <b>GQview</b> and <b>The Gimp!</b>"
+msgid ""
+"\t* <b>Mandrakelinux 10.1 for x86-64</b>, The Mandrakelinux solution for "
+"making the most of your 64-bit processor."
 msgstr ""
-"Edrych ar a golygu delweddau a ffotos gyda <b>GQview</b> a <b>The Gimp!</b>"
 
-#: share/advertising/dis-08.pl:13 share/advertising/ppp-08.pl:13
-#: share/advertising/pwp-07.pl:13
+#: share/advertising/10.pl:13
 #, c-format
-msgid "<b>Mandrake Control Center</b>"
-msgstr "<b>Canolfan Rheoli Mandrake</b>"
+msgid "<b>Mandrakesoft Products (Nomad Products)</b>"
+msgstr ""
 
-#: share/advertising/dis-08.pl:15 share/advertising/ppp-08.pl:15
-#: share/advertising/pwp-07.pl:15
+#: share/advertising/10.pl:15
 #, c-format
 msgid ""
-"The Mandrake Control Center is an essential collection of Mandrake-specific "
-"utilities for simplifying the configuration of your computer."
+"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'r Ganolfan Rheoli Mandrake yn gasgliad hanfodol o wasanaethau Mandrake "
-"penodol ar gyfer symlhau ffurfweddiad eich cyfrifiadur."
 
-#: share/advertising/dis-08.pl:17 share/advertising/ppp-08.pl:17
-#: share/advertising/pwp-07.pl:17
+#: share/advertising/10.pl:16
 #, c-format
 msgid ""
-"You will immediately appreciate this collection of handy utilities for "
-"easily configuring hardware devices, defining mount points, setting up "
-"Network and Internet, adjusting the security level of your computer, and "
-"just about everything related to the system."
+"\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
+"bootable CD-Rom."
 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."
 
-#: share/advertising/dis-09.pl:13 share/advertising/dwd-06.pl:13
-#: share/advertising/ppp-09.pl:13 share/advertising/pwp-08.pl:13
+#: share/advertising/10.pl:17
 #, c-format
-msgid "<b>MandrakeStore</b>"
-msgstr "<b>MandrakeStore</b>"
+msgid ""
+"\t* <b>GlobeTrotter</b>, a Mandrakelinux distribution pre-installed on the "
+"ultra-compact “LaCie Mobile Hard Drive”."
+msgstr ""
+
+#: share/advertising/11.pl:13
+#, fuzzy, c-format
+msgid "<b>Mandrakesoft Products (Professional Solutions)</b>"
+msgstr "Dewch i wybod am ein <b>Atebion Personol</b>"
 
-#: share/advertising/dis-09.pl:15 share/advertising/ppp-09.pl:15
-#: share/advertising/pwp-08.pl:15
+#: share/advertising/11.pl:15
 #, c-format
 msgid ""
-"Find all MandrakeSoft products and services at <b>MandrakeStore</b> -- our "
-"full service e-commerce platform."
+"Below are the Mandrakesoft products designed to meet the <b>professional "
+"needs</b>:"
 msgstr ""
-"Cewch holl gynnyrch a gwasanaethau MandrakeSoft yn <b>MandrakeStore</b> -- "
-"ein llwyfan gwasanaeth llawn."
 
-#: share/advertising/dis-09.pl:17 share/advertising/dwd-06.pl:19
-#: share/advertising/ppp-09.pl:17 share/advertising/pwp-08.pl:17
+#: share/advertising/11.pl:16
 #, c-format
-msgid "Stop by today at <b>www.mandrakestore.com</b>"
-msgstr "Ewch i<b> www.mandrakestore.com</b> heddiw."
+msgid "\t* <b>Corporate Desktop</b>, The Mandrakelinux Desktop for Businesses."
+msgstr ""
 
-#: share/advertising/dis-10.pl:13 share/advertising/ppp-10.pl:13
-#: share/advertising/pwp-09.pl:13
+#: share/advertising/11.pl:17
 #, c-format
-msgid "Become a <b>MandrakeClub</b> member!"
-msgstr "Ymaelodwch â'r <b>MandrakeClub<b>!"
+msgid "\t* <b>Corporate Server</b>, The Mandrakelinux Server Solution."
+msgstr ""
 
-#: share/advertising/dis-10.pl:15 share/advertising/dwd-07.pl:15
-#: share/advertising/ppp-10.pl:15 share/advertising/pwp-09.pl:15
+#: share/advertising/11.pl:18
 #, c-format
-msgid ""
-"Take advantage of valuable benefits, products and services by joining "
-"MandrakeClub, such as:"
+msgid "\t* <b>Multi-Network Firewall</b>, The Mandrakelinux Security Solution."
 msgstr ""
-"Cewch fanteisio ar freintiau ychwanegol, cynnyrch a gwasanaethau drwy ymuno "
-"â MandrakeClub, e.e:"
 
-#: share/advertising/dis-10.pl:16 share/advertising/dwd-07.pl:16
-#: share/advertising/ppp-10.pl:17 share/advertising/pwp-09.pl:16
+#: share/advertising/12.pl:13
 #, c-format
-msgid "\t- Full access to commercial applications"
-msgstr "\t- Mynediad llawn i raglenni masnachol"
+msgid "<b>The KDE Choice</b>"
+msgstr "<b>Dewis KDE,</b>"
 
-#: share/advertising/dis-10.pl:17 share/advertising/dwd-07.pl:17
-#: share/advertising/ppp-10.pl:18 share/advertising/pwp-09.pl:17
+#: share/advertising/12.pl:15
 #, c-format
-msgid "\t- Special download mirror list exclusively for MandrakeClub Members"
-msgstr "\t- Rhestr drych llwytho i lawr ar gyfer Aelodau MandrakeClub yn unig"
+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 ""
+
+#: 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!"
+msgstr ""
 
-#: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
-#: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
+#: share/advertising/12.pl:19
 #, c-format
-msgid "\t- Voting for software to put in Mandrakelinux"
-msgstr "\t- Pleidleisio am feddalwedd i'w rhoi yn Mandrakelinux"
+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 ""
+
+#: share/advertising/13-a.pl:13 share/advertising/13-b.pl:13
+#, fuzzy, c-format
+msgid "<b>Choose your Favorite Desktop Environment</b>"
+msgstr "<b> Dewiswch amgylchedd Bwrdd Gwaith graffigol!</b>"
 
-#: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
-#: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
+#: share/advertising/13-a.pl:15
 #, c-format
-msgid "\t- Special discounts for products and services at MandrakeStore"
+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 ""
-"\t- Gostyngiadau arbennig ar gyfer cynnyrch a gwasanaethau yn MandrakeStore"
 
-#: share/advertising/dis-10.pl:20 share/advertising/dwd-07.pl:20
-#: share/advertising/ppp-04.pl:21 share/advertising/ppp-06.pl:19
-#: share/advertising/ppp-10.pl:21 share/advertising/pwp-04.pl:21
-#: share/advertising/pwp-09.pl:20
+#: share/advertising/13-a.pl:17 share/advertising/13-b.pl:17
 #, c-format
-msgid "\t- Plus much more"
-msgstr "\t- A llawer mwy"
+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 ""
 
-#: share/advertising/dis-10.pl:22 share/advertising/dwd-07.pl:22
-#: share/advertising/ppp-10.pl:23 share/advertising/pwp-09.pl:22
+#: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
-msgid "For more information, please visit <b>www.mandrakeclub.com</b>"
-msgstr "Am ragor o wybodaeth, ewch i <b>www.mandrakeclub.com</b>"
+msgid ""
+"But we advise you to try all available ones (including <b>GNOME</b>, "
+"<b>IceWM</b>, etc.) and pick your favorite."
+msgstr ""
 
-#: share/advertising/dis-11.pl:13
+#: share/advertising/13-b.pl:15
 #, c-format
-msgid "Do you require assistance?"
-msgstr "Ydych chi angen help?"
+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 ""
 
-#: share/advertising/dis-11.pl:15 share/advertising/dwd-08.pl:16
-#: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
+#: share/advertising/14.pl:13
+#, fuzzy, c-format
+msgid "<b>OpenOffice.org</b>"
+msgstr "OpenOffice.org Math"
+
+#: share/advertising/14.pl:15
 #, c-format
-msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</b> yw'r brif ffynhonnell am gefnogaeth dechnegol.."
+msgid "With Discovery, you will discover <b>OpenOffice.org</b>."
+msgstr ""
 
-#: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
-#: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
+#: share/advertising/14.pl:17
 #, c-format
 msgid ""
-"If you have Linux questions, subscribe to MandrakeExpert at <b>www."
-"mandrakeexpert.com</b>"
+"It is a <b>full-featured office suite</b> that includes word processor, "
+"spreadsheet, presentation and drawing applications."
 msgstr ""
-"Os oes gennych gwestiynau am Linux, ymunwch â MandrakeExpert yn www."
-"mandrakeexpert.com"
 
-#: share/advertising/dwd-01.pl:17
+#: share/advertising/14.pl:19
 #, c-format
 msgid ""
-"Mandrakelinux is committed to the Open Source Model and fully respects the "
-"General Public License. This new release is the result of collaboration "
-"between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrakelinux contributors."
+"OpenOffice.org can read and write most types of <b>Microsoft® Office</b> "
+"documents such as Word, Excel and PowerPoint® files."
 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."
 
-#: share/advertising/dwd-02.pl:13
+#: share/advertising/15.pl:13
 #, c-format
-msgid "<b>Join the Mandrakelinux community!</b>"
-msgstr "<b>Ymunwch â chymuned Mandrakelinux!</b>"
+msgid "<b>Kontact</b>"
+msgstr "<b>Kontact</b>"
 
-#: share/advertising/dwd-02.pl:15
+#: share/advertising/15.pl:15
 #, c-format
 msgid ""
-"If you would like to get involved, please subscribe to the \"Cooker\" "
-"mailing list by visiting <b>mandrake-linux.com/cooker</b>"
+"Discovery includes <b>Kontact</b>, the new KDE <b>groupware solution</b>."
 msgstr ""
-"Os hoffech fod yn rhan o'r ymdrech, tanysgrifiwch i restr e-bost \"Cooker\" "
-"drwy ymweld â mandrake-linux.com/cooker"
 
-#: share/advertising/dwd-02.pl:17
+#: share/advertising/15.pl:17
+#, fuzzy, 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!"
+
+#: share/advertising/15.pl:19
 #, c-format
 msgid ""
-"To learn more about our dynamic community, please visit <b>www.mandrake-"
-"linux.com</b>!"
+"It is the easiest way to communicate with your contacts and to organize your "
+"time."
 msgstr ""
-"I ddysgu mwy am ein cymuned ddeinamig, ewch i <b>www.mandrake-linux.com</b>!"
 
-#: share/advertising/dwd-03.pl:13
+#: share/advertising/16.pl:13
 #, c-format
-msgid "<b>What is Mandrakelinux?</b>"
-msgstr "<b>Beth yw Mandrakelinux?</b>"
+msgid "<b>Surf the Internet</b>"
+msgstr "<b>Crwydro'r Rhyngrwyd</b>"
 
-#: share/advertising/dwd-03.pl:15
+#: share/advertising/16.pl:15
 #, c-format
-msgid ""
-"Mandrakelinux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrakelinux is one of "
-"the most widely used Linux distributions worldwide!"
+msgid "Discovery will give you access to <b>every Internet resource</b>:"
 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!"
 
-#: share/advertising/dwd-03.pl:17
+#: share/advertising/16.pl:16
+#, fuzzy, c-format
+msgid "\t* Browse the <b>Web</b> with Konqueror."
+msgstr "\t* Pori'r We gyda <b>Gwe-lywiwr-Mozilla a Konqueror</b>"
+
+#: share/advertising/16.pl:17
 #, c-format
-msgid ""
-"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
-"latest versions of the most popular Open Source applications."
+msgid "\t* <b>Chat</b> online with your friends using Kopete."
 msgstr ""
-"Mae Mandrakelinux yn cynnwys y byrddau gwaith enwog KDE a GNOME, yn ogystal "
-"â'r fersiynau diweddaraf o'r rhaglenni mwyaf poblogaidd Cod Agored."
 
-#: share/advertising/dwd-04.pl:13
+#: share/advertising/16.pl:18
+#, fuzzy, c-format
+msgid "\t* <b>Transfer</b> files with KBear."
+msgstr "Trosglwyddo ffeil gyda FTP"
+
+#: share/advertising/16.pl:19 share/advertising/17.pl:19
+#: share/advertising/18.pl:22
 #, c-format
-msgid ""
-"Mandrakelinux is widely known as the most user-friendly and the easiest to "
-"install and easy to use Linux distribution."
+msgid "\t* ..."
+msgstr "\t* ..."
+
+#: share/advertising/17.pl:13
+#, c-format
+msgid "<b>Enjoy our Multimedia Features</b>"
 msgstr ""
-"Mae Mandrakelinux yn hysbys fel y dosbarthiad Linux mwyaf cyfeillgar a hawdd "
-"ei osod a'i ddefnyddio."
 
-#: share/advertising/dwd-04.pl:15
+#: share/advertising/17.pl:15
 #, c-format
-msgid "Find out about our <b>Personal Solutions</b>:"
-msgstr "Dewch i wybod am ein <b>Atebion Personol</b>"
+msgid "Discovery will also make <b>multimedia</b> very easy for you:"
+msgstr ""
 
-#: share/advertising/dwd-04.pl:16
+#: share/advertising/17.pl:16
 #, c-format
-msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
-msgstr "\t- Canfod Mandrakelinux ar CD hunan gychwyn <b>MandrakeMove</b>"
+msgid "\t* Watch your favorite <b>videos</b> with Kaffeine."
+msgstr ""
 
-#: share/advertising/dwd-04.pl:17
+#: share/advertising/17.pl:17
 #, c-format
-msgid ""
-"\t- If you use Linux mostly for Office, Internet and Multimedia tasks, "
-"<b>Discovery</b> perfectly meets your needs"
+msgid "\t* Listen to your <b>music files</b> with amaroK."
 msgstr ""
-"\t- Os ydych yn defnyddio Linux fel rheol ar gyfer tasgau Swyddfa, Rhyngrwyd "
-"ac aml-gyfrwng, mae <b>Discovery</b> yn berffaith ar gyfer eich anghenion."
 
-#: share/advertising/dwd-04.pl:18
+#: share/advertising/17.pl:18
+#, fuzzy, c-format
+msgid "\t* Edit and create <b>images</b> with the GIMP."
+msgstr "\t* Golygu delweddau a ffotograffau gyda <b>The Gimp</b>"
+
+#: share/advertising/18.pl:13
 #, c-format
+msgid "<b>Enjoy the Wide Range of Applications</b>"
+msgstr ""
+
+#: share/advertising/18.pl:15
+#, fuzzy, c-format
 msgid ""
-"\t- If you appreciate the largest selection of software including powerful "
-"development tools, <b>PowerPack</b> is for you"
+"In the Mandrakelinux menu you will find <b>easy-to-use</b> applications for "
+"<b>all of your tasks</b>:"
 msgstr ""
-"\t- Os ydych yn gwerthfawrogi'r dewis helaethaf o feddalwedd gan gynnwys "
-"offer pwerus, <b>PowerPack</b> yw'r un i chi."
+"Yn newislen Mandrakelinux cewch raglenni hawdd eu defnyddio ar gyfer pob "
+"tasg:"
 
-#: share/advertising/dwd-04.pl:19
+#: share/advertising/18.pl:16
 #, c-format
+msgid "\t* Create, edit and share office documents with <b>OpenOffice.org</b>."
+msgstr ""
+"\t* Creu, golygu a rhannu dogfennau swyddfa gydag <b>OpenOffice.org</b>"
+
+#: share/advertising/18.pl:17
+#, fuzzy, c-format
 msgid ""
-"\t- If you require a full-featured Linux solution customized for small to "
-"medium-sized networks, choose <b>PowerPack+</b>"
+"\t* Manage your personal data with the integrated personal information "
+"suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
-"\t- Os oes angen ateb Linux llawn wedi ei addasu ar gyfer rhwydweithiau bach "
-"i ganolig, dewiswch <b>PowerPack+</b>"
+"\t* Rheoli eich data personol gyda chasgliad o raglenni gwybodaeth bersonol "
+"integredig: Kontact ac Evolution"
 
-#: share/advertising/dwd-05.pl:13
+#: share/advertising/18.pl:18
 #, c-format
-msgid "Find out also our <b>Business Solutions</b>!"
-msgstr "Dewch i wybod am ein <b>Atebion i Fusnes</b>!"
+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>"
 
-#: share/advertising/dwd-05.pl:15
+#: share/advertising/18.pl:19
 #, c-format
+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
 msgid ""
-"<b>Corporate Server</b>: the ideal solution for entreprises. It is a "
-"complete \"all-in-one\" solution that includes everything needed to rapidly "
-"deploy world-class Linux server applications."
+"\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>"
+
+#: share/advertising/18.pl:21
+#, c-format
+msgid "\t* Edit and create images with the <b>GIMP</b>."
+msgstr "\t* Golygu delweddau a ffotograffau gyda <b>The Gimp</b>"
+
+#: share/advertising/19.pl:13
+#, c-format
+msgid "<b>Development Environments</b>"
+msgstr "<b>Amgylcheddau datblygu</b>"
+
+#: share/advertising/19.pl:15 share/advertising/22.pl:15
+#, c-format
+msgid ""
+"PowerPack gives you the best tools to <b>develop</b> your own applications."
 msgstr ""
-"<b>Gweinydd Corfforaethol</b>: yr ateb delfrydol ar gyfer mentrau. Mae'n "
-"ateb \"cyflawn\" sy'n cynnwys popeth angenrheidiol ar gyfer darpariaeth "
-"gyflym o raglenni gweinydd Linux. "
 
-#: share/advertising/dwd-05.pl:17
+#: share/advertising/19.pl:17
 #, c-format
 msgid ""
-"<b>Multi Network Firewall</b>: based on Linux 2.4 \"kernel secure\" to "
-"provide multi-VPN as well as multi-DMZ functionalities. It is the perfect "
-"high performance security solution."
+"You will enjoy the powerful, integrated development environment from KDE, "
+"<b>KDevelop</b>, which will let you program in a lot of languages."
 msgstr ""
-"<b>Multi Network Firewall</b>: yn seiliedig ar Linux 2.4 \"cnewyllyn diogel"
-"\" i ddarparu swyddogaethau multi-VPN yn ogystal â multi-DMZ. Dyma'r ateb "
-"diogelwch perfformiad uchel perffaith."
 
-#: share/advertising/dwd-05.pl:19
+#: share/advertising/19.pl:19
 #, c-format
 msgid ""
-"<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrakelinux "
-"distribution. A unique blend for incomparable HPC performance."
+"PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
+"b>, the associated debugger."
+msgstr ""
+
+#: share/advertising/20.pl:13
+#, fuzzy, c-format
+msgid "<b>Development Editors</b>"
+msgstr "<b>Offer datblygu</b>"
+
+#: share/advertising/20.pl:15
+#, c-format
+msgid "PowerPack will let you choose between those <b>popular editors</b>:"
 msgstr ""
-"<b>MandrakeClustering</b>: pwer a grym clwstwr Linux wedi ei gyfuno gyda "
-"chadernid a rhwyddineb dosbarthiad Mandrakelinux.Cyfuniad unigryw o "
-"berfformiad digymar HPC."
 
-#: share/advertising/dwd-06.pl:15
+#: share/advertising/20.pl:16
+#, c-format
+msgid "\t* <b>Emacs</b>: a customizable and real time display editor."
+msgstr "\t* <b>Emacs</b>: golygydd arddangos byw hawdd ei addasu"
+
+#: share/advertising/20.pl:17
 #, c-format
 msgid ""
-"Find all MandrakeSoft products at <b>MandrakeStore</b> -- our full service e-"
-"commerce platform."
+"\t* <b>XEmacs</b>: another open source text editor and application "
+"development system."
 msgstr ""
-"Cewch holl gynnyrch a gwasanaethau MandrakeSoft yn MandrakeStore -- ein "
-"llwyfan gwasanaeth llawn."
+"\t* <b>Xemacs</b>: golygydd cod agored arall a system datblygu meddalwedd"
 
-#: share/advertising/dwd-06.pl:17
+#: share/advertising/20.pl:18
 #, c-format
 msgid ""
-"Find out also support incidents if you have any problems, from standard to "
-"professional support, from 1 to 50 incidents, take the one which meets "
-"perfectly your needs!"
+"\t* <b>Vim</b>: an advanced text editor with more features than standard Vi."
+msgstr "Vim: golygydd testun uwch gyda mwy o nodweddion na'r Vi safonol"
+
+#: share/advertising/21.pl:13
+#, fuzzy, c-format
+msgid "<b>Development Languages</b>"
+msgstr "<b>Offer datblygu</b>"
+
+#: share/advertising/21.pl:15
+#, c-format
+msgid ""
+"With all these <b>powerful tools</b>, you will be able to write applications "
+"in <b>dozens of programming languages</b>:"
+msgstr ""
+
+#: share/advertising/21.pl:16
+#, c-format
+msgid "\t* The famous <b>C language</b>."
+msgstr ""
+
+#: share/advertising/21.pl:17
+#, c-format
+msgid "\t* Object oriented languages:"
 msgstr ""
-"Cewch wybod sut i gymryd mantais o gefnogaeth safonol hyd gefnogaeth "
-"broffesiynol, o 1 hyd 50 digwyddiad, cymrwch yr un sy'n ateb eich gofynion "
-"yn llwyr!"
 
-#: share/advertising/dwd-07.pl:13
+#: share/advertising/21.pl:18
 #, c-format
-msgid "<b>Become a MandrakeClub member!</b>"
-msgstr "<b>Ymaelodi â'r MandrakeClub!</b>"
+msgid "\t\t* <b>C++</b>"
+msgstr "\t\t* <b>C++</b>"
 
-#: share/advertising/dwd-08.pl:14 share/advertising/ppp-11.pl:13
-#: share/advertising/pwp-10.pl:13
+#: share/advertising/21.pl:19
 #, c-format
-msgid "<b>Do you require assistance?</b>"
-msgstr "<b>Ydych chi angen help?</b>"
+msgid "\t\t* <b>Java™</b>"
+msgstr "\t\t* <b>Java™</b>"
 
-#: share/advertising/dwd-09.pl:16
+#: share/advertising/21.pl:20
 #, c-format
-msgid "<b>Note</b>"
-msgstr "<b>Nodyn</b>"
+msgid "\t* Scripting languages:"
+msgstr "\t* Ieithoedd sgriptio"
 
-#: share/advertising/dwd-09.pl:18
+#: share/advertising/21.pl:21
 #, c-format
-msgid "This is the Mandrakelinux <b>Download version</b>."
-msgstr " Dyma <b>Fersiwn Llwytho i Lawr</b> Mandrakelinux"
+msgid "\t\t* <b>Perl</b>"
+msgstr "\t\t* <b>Perl</b>"
 
-#: share/advertising/dwd-09.pl:20
+#: share/advertising/21.pl:22
+#, c-format
+msgid "\t\t* <b>Python</b>"
+msgstr "\t\t* <b>Python</b>"
+
+#: share/advertising/21.pl:23 share/advertising/28.pl:22
+#, c-format
+msgid "\t* And many more."
+msgstr "\t* Ac eraill."
+
+#: share/advertising/22.pl:13
+#, c-format
+msgid "<b>Development Tools</b>"
+msgstr "<b>Offer Datblygu</b>"
+
+#: share/advertising/22.pl:17
 #, c-format
 msgid ""
-"The free download version does not include commercial software, and "
-"therefore may not work with certain modems (such as some ADSL and RTC) and "
-"video cards (such as ATI® and NVIDIA®)."
+"With the powerful integrated development environment <b>KDevelop</b> and the "
+"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 ""
-"Nid yw'r fersiwn llwytho i lawr am ddim yn cynnwys meddalwedd fasnachol, ac "
-"felly mae'n bosibl na fydd yn gweithio gyda rhai modemau (megis rhai ADSL ac "
-"RTC) a chardiau fideo (megis ATI® ac NVIDIA®)"
 
-#: share/advertising/ppp-01.pl:17
+#: share/advertising/23.pl:13
+#, fuzzy, c-format
+msgid "<b>Groupware Server</b>"
+msgstr "<b>Gweinyddion</b>"
+
+#: share/advertising/23.pl:15
 #, c-format
 msgid ""
-"Your new Mandrakelinux distribution and its many applications are the result "
-"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
-"contributors throughout the world."
+"PowerPack+ will give you access to <b>Kolab</b>, a full-featured "
+"<b>groupware server</b> which will, thanks to the client <b>Kontact</b>, "
+"allow you to:"
 msgstr ""
-"Mae eich system weithredu Mandrakelinux a'i raglenni niferus yn ganlyniad "
-"ymdrechion cydweithredol rhwng datblygwyr MandrakeSoft â chyfranwyr "
-"Mandrakeinux drwy'r byd i gyd."
 
-#: share/advertising/ppp-02.pl:13
-#, c-format
-msgid "<b>PowerPack+</b>"
-msgstr "<b>PowerPack+</b>"
+#: share/advertising/23.pl:16
+#, fuzzy, c-format
+msgid "\t* Send and receive your <b>e-mails</b>."
+msgstr "\t* Anfon a derbyn e-bost"
 
-#: share/advertising/ppp-02.pl:15
+#: share/advertising/23.pl:17
 #, c-format
-msgid ""
-"PowerPack+ is a full-featured Linux solution for small to medium-sized "
-"networks. PowerPack+ increases the value of the standard PowerPack by adding "
-"a comprehensive selection of world-class server applications."
+msgid "\t* Share your <b>agendas</b> and your <b>address books</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."
 
-#: share/advertising/ppp-02.pl:17
+#: share/advertising/23.pl:18
 #, c-format
-msgid ""
-"It is the only Mandrakelinux product that includes the groupware solution."
+msgid "\t* Manage your <b>memos</b> and <b>task lists</b>."
 msgstr ""
-"Dyma'r unig becyn gan Mandrakelinux sy'n cynnwys darpariaeth meddalwedd grwp."
 
-#: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
+#: share/advertising/24.pl:13
 #, c-format
-msgid "<b>Choose your graphical Desktop environment!</b>"
-msgstr "<b> Dewiswch amgylchedd Bwrdd Gwaith graffigol!</b>"
+msgid "<b>Servers</b>"
+msgstr "<b>Gweinyddion</b>"
 
-#: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
+#: share/advertising/24.pl:15
 #, c-format
 msgid ""
-"When you log into your Mandrakelinux system for the first time, you can "
-"choose between several popular graphical desktops environments, including: "
-"KDE, GNOME, WindowMaker, IceWM, and others."
+"Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
-"Pan fyddwch yn mewngofnodi i Linux Mandrake am y tro cyntaf, mae modd i chi "
-"ddewis rhwng nifer o amgylcheddau graffigol poblogaidd, gan gynnwys: KDE, "
-"GNOME, WindowMaker, IceWM, ac eraill."
+"Cryfhewch eich rhwydwaith fusnes gyda <b>darpariaethau o'r radd flaenaf</b>, "
+"gan gynnwys:"
 
-#: share/advertising/ppp-04.pl:13
+#: share/advertising/24.pl:16
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all "
-"tasks:"
+"\t* <b>Samba</b>: File and print services for Microsoft® Windows® clients."
 msgstr ""
-"Yn newislen Mandrakelinux cewch raglenni hawdd eu defnyddio ar gyfer pob "
-"tasg."
+"\t* <b>Samba</b>: Gwasanaethau ffeil ac argraffu ar gyfer cleientiaid MS-"
+"Windows"
 
-#: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
+#: share/advertising/24.pl:17
 #, c-format
-msgid "\t- Create, edit and share office documents with <b>OpenOffice.org</b>"
-msgstr ""
-"\t- Creu, golygu a rhannu dogfennau swyddfa gydag <b>OpenOffice.org</b>"
+msgid "\t* <b>Apache</b>: The most widely used web server."
+msgstr "\t* <b>Apache</b>: Y gweinydd Gwe mwyaf poblogaidd"
 
-#: share/advertising/ppp-04.pl:16
+#: share/advertising/24.pl:18
+#, fuzzy, 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"
+
+#: share/advertising/24.pl:19
 #, c-format
 msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites: <b>Kontact</b> and <b>Evolution</b>"
+"\t* <b>CVS</b>: Concurrent Versions System, the dominant open source network-"
+"transparent version control system."
 msgstr ""
-"\t- Rheoli eich data personol gyda chasgliad o raglenni gwybodaeth bersonol "
-"integredig: <b>Kontact</b> ac <b>Evolution</b>"
+"\t* <b>CVS</b>: Concurrent Versions System, y system rheoli fersiwn cod "
+"agored amlycaf"
 
-#: share/advertising/ppp-04.pl:17
+#: share/advertising/24.pl:20
 #, c-format
-msgid "\t- Browse the Web with <b>Mozilla and Konqueror</b>"
-msgstr "\t- Pori'r We gyda <b>Gwe-lywiwr-Mozilla a Konqueror</b>"
+msgid ""
+"\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
+msgstr "\t* <b>ProFTPD</b>: meddalwedd ffurfweddadwy gweinydd FTP GPL"
 
-#: share/advertising/ppp-04.pl:18 share/advertising/pwp-04.pl:18
+#: share/advertising/24.pl:21
 #, c-format
-msgid "\t- Participate in online chat with <b>Kopete</b>"
-msgstr "\t- Cymryd rhan mewn sgyrsiau ar-lein gyda <b>Kopete</b>"
+msgid ""
+"\t* <b>Postfix</b> and <b>Sendmail</b>: The popular and powerful mail "
+"servers."
+msgstr ""
 
-#: share/advertising/ppp-04.pl:19
+#: share/advertising/25.pl:13
 #, c-format
+msgid "<b>Mandrakelinux Control Center</b>"
+msgstr "<b>Canolfan Rheoli Mandrakelinux</b>"
+
+#: share/advertising/25.pl:15
+#, fuzzy, c-format
 msgid ""
-"\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
+"The <b>Mandrakelinux Control Center</b> is an essential collection of "
+"Mandrakelinux-specific utilities designed to simplify the configuration of "
+"your computer."
 msgstr ""
-"\t- Gwrando ar CDau a ffeiliau cerddoriaeth gyda <b>KsCD</b> a <b>Totem</b>"
+"Mae'r Ganolfan Rheoli Mandrakelinux yn gasgliad hanfodol o wasanaethau "
+"Mandrake penodol ar gyfer symlhau ffurfweddiad eich cyfrifiadur."
 
-#: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
-#, c-format
-msgid "\t- Edit images and photos with <b>The Gimp</b>"
-msgstr "\t- Golygu delweddau a ffotograffau gyda <b>The Gimp</b>"
+#: share/advertising/25.pl:17
+#, fuzzy, 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."
 
-#: share/advertising/ppp-05.pl:13
+#: share/advertising/26.pl:13
+#, fuzzy, c-format
+msgid "<b>The Open Source Model</b>"
+msgstr "<b>Dewis KDE,</b>"
+
+#: share/advertising/26.pl:15
 #, c-format
 msgid ""
-"PowerPack+ includes everything needed for developing and creating your own "
-"software, including:"
+"Like all computer programming, open source software <b>requires time and "
+"people</b> for development. In order to respect the open source philosophy, "
+"Mandrakesoft sells added value products and services to <b>keep improving "
+"Mandrakelinux</b>. If you want to <b>support the open source philosophy</b> "
+"and the development of Mandrakelinux, <b>please</b> consider buying one of "
+"our products or services!"
 msgstr ""
-"Mae PowerPack yn cynnwys popeth angenrheidiol ar gyfer datblygu a chreu eich "
-"meddalwedd eich hun, gan gynnwys:"
 
-#: share/advertising/ppp-05.pl:15 share/advertising/pwp-05.pl:16
-#, c-format
+#: share/advertising/27.pl:13
+#, fuzzy, c-format
+msgid "<b>Online Store</b>"
+msgstr "<b>MandrakeStore</b>"
+
+#: share/advertising/27.pl:15
+#, fuzzy, c-format
 msgid ""
-"\t- <b>Kdevelop</b>: a full featured, easy to use Integrated Development "
-"Environment for C++ programming"
+"To learn more about Mandrakesoft products and services, you can visit our "
+"<b>e-commerce platform</b>."
 msgstr ""
-"\t- <b>Kdevelop</b>:  Amgylchedd Datblygu Integredig llawn, hawdd ei "
-"defnyddio ar gyfer rhaglennu C++ "
+"Cewch holl gynnyrch a gwasanaethau Mandrakesoft yn <b>Mandrakestore</b> -- "
+"ein llwyfan gwasanaeth llawn."
 
-#: share/advertising/ppp-05.pl:16 share/advertising/pwp-05.pl:17
+#: share/advertising/27.pl:17
 #, c-format
-msgid "\t- <b>GCC</b>: the GNU Compiler Collection"
-msgstr "\t- <b>GCC</b>: Casgliad Crynhoi GNU "
+msgid "There you can find all our products, services and third-party products."
+msgstr ""
 
-#: share/advertising/ppp-05.pl:17 share/advertising/pwp-05.pl:18
+#: share/advertising/27.pl:19
 #, c-format
-msgid "\t- <b>GDB</b>: the GNU Project debugger"
-msgstr "\t- <b>GDB</b>: dadfygiwr Project GNU"
+msgid ""
+"This platform has just been <b>redesigned</b> to improve its efficiency and "
+"usability."
+msgstr ""
+
+#: 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."
 
-#: share/advertising/ppp-05.pl:18 share/advertising/pwp-06.pl:16
+#: share/advertising/28.pl:13
 #, c-format
-msgid "\t- <b>Emacs</b>: a customizable and real time display editor"
-msgstr "\t- <b>Emacs</b>: golygydd arddangos byw hawdd ei addasu"
+msgid "<b>Mandrakeclub</b>"
+msgstr "<b>Mandrakeclub</b>"
 
-#: share/advertising/ppp-05.pl:19
+#: share/advertising/28.pl:15
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: open source text editor and application development system"
+"<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
+"product.."
+msgstr ""
+
+#: share/advertising/28.pl:17
+#, fuzzy, 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:"
+
+#: share/advertising/28.pl:18
+#, fuzzy, c-format
+msgid ""
+"\t* <b>Special discounts</b> on products and services of our online store "
+"<b>store.mandrakesoft.com</b>."
 msgstr ""
-"\t- <b> Xemacs</b>: golygydd cod agored arall a system datblygu meddalwedd"
+"\t* Gostyngiadau arbennig ar gyfer cynnyrch a gwasanaethau yn Mandrakestore"
 
-#: share/advertising/ppp-05.pl:20
+#: share/advertising/28.pl:19
 #, c-format
 msgid ""
-"\t- <b>Vim</b>: advanced text editor with more features than standard Vi"
+"\t* Access to <b>commercial applications</b> (for example to NVIDIA® or ATI™ "
+"drivers)."
 msgstr ""
-"\t- <b>Vim</b>: golygydd testun uwch gyda mwy o nodweddion na'r Vi safonol"
 
-#: share/advertising/ppp-06.pl:13
+#: share/advertising/28.pl:20
+#, fuzzy, c-format
+msgid "\t* Participation in Mandrakelinux <b>user forums</b>."
+msgstr "\t* Cymryd rhan mewn sgyrsiau ar-lein gyda <b>Kopete</b>"
+
+#: share/advertising/28.pl:21
 #, c-format
-msgid "<b>Discover the full-featured groupware solution!</b>"
-msgstr "<b>Dyma'r ateb ar gyfer gwaith grwp llawn!</b>"
+msgid ""
+"\t* <b>Early and privileged access</b>, before public release, to "
+"Mandrakelinux <b>ISO images</b>."
+msgstr ""
 
-#: share/advertising/ppp-06.pl:15
+#: share/advertising/29.pl:13
 #, c-format
-msgid "It includes both server and client features for:"
-msgstr "Mae'n cynnwys gweinydd â nodweddion cleient ar gyfer:"
+msgid "<b>Mandrakeonline</b>"
+msgstr "<b>Mandrakeonline</b>"
 
-#: share/advertising/ppp-06.pl:16
+#: share/advertising/29.pl:15
 #, c-format
-msgid "\t- Sending and receiving emails"
-msgstr "\t- Anfon a derbyn e-bost"
+msgid ""
+"<b>Mandrakeonline</b> is a new premium service that Mandrakesoft is proud to "
+"offer its customers!"
+msgstr ""
 
-#: share/advertising/ppp-06.pl:17
+#: share/advertising/29.pl:17
 #, c-format
 msgid ""
-"\t- Calendar, Task List, Memos, Contacts, Meeting Request (sending and "
-"receiving), Task Requests (sending and receiving)"
+"Mandrakeonline provides a wide range of valuable services for <b>easily "
+"updating</b> your Mandrakelinux systems:"
 msgstr ""
-"\t- Calendr, Rhestr Tasgau, Memos, Cysylltiadau, Trefnu Cyfarfodydd (anfon a "
-"derbyn), Trefnu Tasgau (anfon a derbyn)"
 
-#: share/advertising/ppp-06.pl:18
+#: share/advertising/29.pl:18
 #, c-format
-msgid "\t- Address Book (server and client)"
-msgstr "\t- Llyfr Cyfeiriadau (gweinydd a chleient)"
+msgid "\t* <b>Perfect</b> system security (automated software updates)."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:13
+#: share/advertising/29.pl:19
 #, c-format
 msgid ""
-"Empower your business network with <b>premier server solutions</b> including:"
+"\t* <b>Notification</b> of updates (by e-mail or by an applet on the "
+"desktop)."
 msgstr ""
-"Cryfhewch eich rhwydwaith fusnes gyda <b>darpariaethau o'r radd flaenaf</b>, "
-"gan gynnwys:"
 
-#: share/advertising/ppp-07.pl:15
+#: share/advertising/29.pl:20
 #, c-format
-msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
+msgid "\t* Flexible <b>scheduled</b> updates."
 msgstr ""
-"\t- <b>Samba</b>: Gwasanaethau ffeil ac argraffu ar gyfer cleientiaid MS-"
-"Windows"
 
-#: share/advertising/ppp-07.pl:16
+#: share/advertising/29.pl:21
 #, c-format
-msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- <b>Apache</b>: Y gweinydd Gwe mwyaf poblogaidd"
+msgid ""
+"\t* Management of <b>all your Mandrakelinux systems</b> with one account."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:17
+#: share/advertising/30.pl:13
 #, c-format
-msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- <b>MySQL</b>: Cronfa ddata mwyaf poblogaidd y byd Cod Agored"
+msgid "<b>Mandrakeexpert</b>"
+msgstr "<b>Mandrakeexpert</b>"
 
-#: share/advertising/ppp-07.pl:18
+#: share/advertising/30.pl:15
 #, c-format
 msgid ""
-"\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
-"transparent version control system"
+"Do you require <b>assistance?</b> Meet Mandrakesoft's technical experts on "
+"<b>our technical support platform</b> www.mandrakeexpert.com."
 msgstr ""
-"\t- <b>CVS</b>: Concurrent Versions System, y system rheoli fersiwn cod "
-"agored amlycaf"
 
-#: share/advertising/ppp-07.pl:19
+#: share/advertising/30.pl:17
 #, c-format
 msgid ""
-"\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
-msgstr "\t- <b>ProFTPD</b>: meddalwedd ffurfweddadwy gweinydd FTP GPL"
+"Thanks to the help of <b>qualified Mandrakelinux experts</b>, you will save "
+"a lot of time."
+msgstr ""
 
-#: share/advertising/ppp-07.pl:20
+#: share/advertising/30.pl:19
 #, c-format
-msgid "\t- And others"
-msgstr "\t- Ac eraill"
+msgid ""
+"For any question related to Mandrakelinux, you have the possibility to "
+"purchase support incidents at <b>store.mandrakesoft.com</b>."
+msgstr ""
 
-#: share/advertising/pwp-01.pl:17
+#: share/compssUsers.pl:25
 #, c-format
+msgid "Office Workstation"
+msgstr "Gweithfan Swyddfa"
+
+#: share/compssUsers.pl:27
+#, fuzzy, c-format
 msgid ""
-"Your new Mandrakelinux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrakelinux contributors throughout "
-"the world."
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
-"Mae eich pecyn Mandrakelinux newydd yn ganlyniad cydweithrediad rhwng "
-"datblygwyr Mandrakelinux a chyfranwyr Mandrakelinux drwy'r byd i gyd."
+"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
+"gnumeric), ddarllenydd pdf, ag ati"
 
-#: share/advertising/pwp-01.pl:19
+#: share/compssUsers.pl:28
 #, c-format
 msgid ""
-"We would like to thank everyone who participated in the development of our "
-"latest release."
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
 msgstr ""
-"Hoffwn ddiolch i bawb sydd wedi cymryd rhan yn natblygiad y fersiwn "
-"diweddaraf."
+"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
+"gnumeric), ddarllenydd pdf, ag ati"
 
-#: share/advertising/pwp-02.pl:13
+#: share/compssUsers.pl:33
 #, c-format
-msgid "<b>PowerPack</b>"
-msgstr "<b>PowerPack</b>"
+msgid "Game station"
+msgstr "Man chwarae"
 
-#: share/advertising/pwp-02.pl:15
+#: share/compssUsers.pl:34
 #, c-format
-msgid ""
-"PowerPack is MandrakeSoft's premier Linux desktop product. In addition to "
-"being the easiest and the most user-friendly Linux distribution, PowerPack "
-"includes thousands of applications - everything from the most popular to the "
-"most technical."
-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."
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Rhaglenni difyrrwch: arcêd, gemau bwrdd, strategaeth, ag ati"
+
+#: share/compssUsers.pl:37
+#, c-format
+msgid "Multimedia station"
+msgstr "Man aml-gyfrwng"
 
-#: share/advertising/pwp-04.pl:13
+#: share/compssUsers.pl:38
+#, c-format
+msgid "Sound and video playing/editing programs"
+msgstr "Chwarae sain a fideo/rhaglenni golygu"
+
+#: share/compssUsers.pl:43
+#, c-format
+msgid "Internet station"
+msgstr "Man Rhyngrwyd"
+
+#: share/compssUsers.pl:44
 #, c-format
 msgid ""
-"In the Mandrakelinux menu you will find easy-to-use applications for all of "
-"your tasks:"
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
 msgstr ""
-"Yn newislen Mandrakelinux cewch raglenni hawdd eu defnyddio ar gyfer pob "
-"tasg:"
+"Casgliad o offer i ddarllen ac anfon e-bost a newyddion (mutt, tin..) ac i "
+"bori'r We"
 
-#: share/advertising/pwp-04.pl:16
+#: share/compssUsers.pl:49
 #, c-format
-msgid ""
-"\t- Take charge of your personal data with the integrated personal "
-"information suites <b>Kontact</b> and <b>Evolution</b>"
+msgid "Network Computer (client)"
+msgstr "Cyfrifiadur Rhwydwaith (cleient)"
+
+#: share/compssUsers.pl:50
+#, c-format
+msgid "Clients for different protocols including ssh"
+msgstr "Cleientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
+
+#: share/compssUsers.pl:54
+#, c-format
+msgid "Configuration"
+msgstr "Ffurfweddiad"
+
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
+
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "Offer y Consol"
+
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
+
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
+#, c-format
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
+
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
+#, c-format
+msgid "Documentation"
+msgstr "Dogfennaeth"
+
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
+#, c-format
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
+
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
+#, c-format
+msgid "LSB"
+msgstr "LSB"
+
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
+#, c-format
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
+
+#: share/compssUsers.pl:85
+#, fuzzy, c-format
+msgid "Apache"
+msgstr "llwybr"
+
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "Grwp"
+
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "Gweinydd Samba"
+
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
+#, c-format
+msgid "Firewall/Router"
+msgstr "Mur Gwarchod/Llwybrydd"
+
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
+#, c-format
+msgid "Internet gateway"
+msgstr "Porth i'r rhyngrwyd"
+
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/Ffeil/_Newydd"
+
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "Gweinydd e-bost Postfix"
+
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "Cyfeiriadur i Adfer Ohono"
+
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "Gweinydd NTP"
+
+#: share/compssUsers.pl:105
+#, c-format
+msgid "ProFTPd"
 msgstr ""
-"\t- Rheoli eich data personol gyda chasgliad o raglenni gwybodaeth bersonol "
-"integredig: Kontact ac Evolution"
 
-#: share/advertising/pwp-04.pl:17
+#: share/compssUsers.pl:108
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "DNS"
+
+#: share/compssUsers.pl:109
+#, fuzzy, c-format
+msgid "Domain Name and Network Information Server"
+msgstr "Gweinydd Enw Parth"
+
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "Gweinydd Argraffydd"
+
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "Gweinydd Samba"
+
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
+#, c-format
+msgid "Database"
+msgstr "Cronfa Ddata"
+
+#: share/compssUsers.pl:117
+#, fuzzy, c-format
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
+
+#: share/compssUsers.pl:121
 #, 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>"
+msgid "Web/FTP"
+msgstr "Gwe/FTP"
 
-#: share/advertising/pwp-04.pl:19
+#: share/compssUsers.pl:122
 #, c-format
-msgid "\t- Listen to audio CDs and music files with KsCD and <b>Totem</b>"
-msgstr "\t- Gwrando ar CDau a ffeiliau cerddoriaeth gyda KsCD a <b>Totem</b>"
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
-#: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
+#: share/compssUsers.pl:125
 #, c-format
-msgid "<b>Development tools</b>"
-msgstr "<b>Offer datblygu</b>"
+msgid "Mail"
+msgstr "E-bost"
+
+#: share/compssUsers.pl:126
+#, c-format
+msgid "Postfix mail server"
+msgstr "Gweinydd e-bost Postfix"
+
+#: share/compssUsers.pl:130
+#, c-format
+msgid "PostgreSQL or MySQL database server"
+msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
+
+#: share/compssUsers.pl:137
+#, c-format
+msgid "Network Computer server"
+msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
+
+#: share/compssUsers.pl:138
+#, c-format
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Gweinydd NFS, gweinydd SMB, gweinydd dirprwyol, gweinydd ssh"
 
-#: share/advertising/pwp-05.pl:15
+#: share/compssUsers.pl:146
+#, c-format
+msgid "KDE Workstation"
+msgstr "Man Gwaith KDE"
+
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
-"PowerPack includes everything needed for developing and creating your own "
-"software, including:"
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
 msgstr ""
-"Mae PowerPack yn cynnwys popeth angenrheidiol ar gyfer datblygu a chreu eich "
-"meddalwedd eich hun, gan gynnwys:"
+"KDE - Amgylchedd Bwrdd gwaith K, yr amgylchedd graffig sylfaenol gyda "
+"chasgliad o offer"
 
-#: share/advertising/pwp-06.pl:15
+#: share/compssUsers.pl:151
 #, c-format
-msgid "And of course the editors!"
-msgstr "Ac wrth gwrs y golygyddion!"
+msgid "GNOME Workstation"
+msgstr "Man Gwaith Gnome"
 
-#: share/advertising/pwp-06.pl:17
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
-"\t- <b>Xemacs</b>: another open source text editor and application "
-"development system"
-msgstr "   * Xemacs: golygydd cod agored arall a system datblygu meddalwedd"
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu "
+"defnyddio."
 
-#: share/advertising/pwp-06.pl:18
+#: share/compssUsers.pl:155
 #, c-format
-msgid ""
-"\t- <b>Vim</b>: an advanced text editor with more features than standard Vi"
-msgstr "Vim: golygydd testun uwch gyda mwy o nodweddion na'r Vi safonol"
+msgid "Other Graphical Desktops"
+msgstr "Byrddau Gwaith Graffigol Eraill"
+
+#: share/compssUsers.pl:156
+#, c-format
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
+
+#: share/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "Utilities"
+msgstr "Philippines"
+
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "Gweinydd SSH"
+
+#: share/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "Webmin"
+msgstr "Camera Gwe"
+
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "Enwch Wasanaethwr Ffurfweddiad"
+
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "Monitro'r Rhwydwaith"
+
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+#: share/compssUsers.pl:196
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "<b>Mandrakestore</b>"
+
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "Methu ffurfweddu argraffydd \"%s\"!"
 
 #: standalone.pm:21
 #, c-format
@@ -15845,14 +16545,14 @@ msgstr ""
 "Modd rhag.:cynnig ffurffweddu nodwedd awto fewngofnodi"
 
 #: standalone.pm:57
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "[OPTIONS] [PROGRAM_NAME]\n"
 "\n"
 "OPTIONS:\n"
 "  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
+"  --report          - program should be one of mandrakelinux tools\n"
+"  --incident        - program should be one of mandrakelinux tools"
 msgstr ""
 "[DEWISIADAU] [ENW_RHAGLEN]\n"
 "\n"
@@ -15887,7 +16587,7 @@ msgid ""
 "OPTIONS:\n"
 "--windows_import : import from all available windows partitions.\n"
 "--xls_fonts      : show all fonts that already exist from xls\n"
-"--install        : accept any font file and any directry.\n"
+"--install        : accept any font file and any directory.\n"
 "--uninstall      : uninstall any font or any directory of font.\n"
 "--replace        : replace all font if already exist\n"
 "--application    : 0 none application.\n"
@@ -15910,10 +16610,10 @@ msgstr ""
 "                 : and gs for ghostscript for only this one."
 
 #: standalone.pm:84
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
+"Mandrakelinux Terminal Server Configurator\n"
 "--enable         : enable MTS\n"
 "--disable        : disable MTS\n"
 "--start          : start MTS\n"
@@ -16018,7 +16718,7 @@ msgstr ""
 "       XFdrake [--noauto] monitor\n"
 "       cydraniad  XFdrake"
 
-#: standalone.pm:128
+#: standalone.pm:133
 #, c-format
 msgid ""
 "\n"
@@ -16029,27 +16729,27 @@ msgstr ""
 "Defnydd: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version] "
 
-#: standalone/XFdrake:87
+#: standalone/XFdrake:85
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Allgofnodwch ac yna defnyddiwch Ctrl Alt-BackSpace"
 
-#: standalone/XFdrake:91
+#: standalone/XFdrake:89
 #, 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."
 
-#: standalone/drakTermServ:79
+#: standalone/drakTermServ:76
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Diwerth heb Wasanaethwr Terfynell"
 
-#: standalone/drakTermServ:116 standalone/drakTermServ:123
+#: standalone/drakTermServ:108 standalone/drakTermServ:114
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: mae %s angen enw gwesteiwr...\n"
 
-#: standalone/drakTermServ:136
+#: standalone/drakTermServ:125
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16058,79 +16758,73 @@ 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:143
+#: standalone/drakTermServ:131
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: mae %s angen enw gwesteiwr...\n"
 
-#: standalone/drakTermServ:226 standalone/drakTermServ:500
-#: standalone/drakfont:575
-#, c-format
-msgid "OK"
-msgstr "Iawn"
-
-#: standalone/drakTermServ:237 standalone/drakTermServ:240
+#: standalone/drakTermServ:213 standalone/drakTermServ:216
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Enwch Wasanaethwr Ffurfweddiad"
 
-#: standalone/drakTermServ:255
+#: standalone/drakTermServ:231
 #, c-format
 msgid "Enable Server"
 msgstr "Galluogi'r Gweinydd"
 
-#: standalone/drakTermServ:261
+#: standalone/drakTermServ:237
 #, c-format
 msgid "Disable Server"
 msgstr "Analluogi'r Gweinydd"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:245
 #, c-format
 msgid "Start Server"
 msgstr "Cychwyn y Gweinydd"
 
-#: standalone/drakTermServ:275
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Stop Server"
 msgstr "Atal y Gweinydd"
 
-#: standalone/drakTermServ:283
+#: standalone/drakTermServ:259
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Floppy/ISO"
 
-#: standalone/drakTermServ:287
+#: standalone/drakTermServ:263
 #, c-format
 msgid "Net Boot Images"
 msgstr "Delweddau Cychwyn y Rhwyd"
 
-#: standalone/drakTermServ:293
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Add/Del Users"
 msgstr "Ychwanegu/Diddymu Defnyddwyr"
 
-#: standalone/drakTermServ:297
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Ychwanegu/Dileu Cleientiaid"
 
-#: standalone/drakTermServ:308 standalone/drakbug:54
+#: standalone/drakTermServ:284 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Dewin Tro Cyntaf"
 
-#: standalone/drakTermServ:340 standalone/drakTermServ:341
+#: standalone/drakTermServ:315 standalone/drakTermServ:316
 #, 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:347
+#: standalone/drakTermServ:322
 #, c-format
 msgid ""
 "\n"
 " This wizard routine will:\n"
 " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-"\t2) Setup dhcp.\n"
+"\t2) Setup DHCP.\n"
 "\t\n"
 "After doing these steps, the wizard will:\n"
 "\t\n"
@@ -16149,7 +16843,7 @@ msgstr ""
 "\n"
 " Bydd y Dewin yn:\n"
 " \t1) Gofyn i chi ddwis un ai cleient 'tennau' neu 'tew'.\n"
-"\t2) Gosod dhcp.\n"
+"\t2) Gosod DHCP.\n"
 "\t\n"
 "Wedi gwneud hyn, bydd y Dewin yn:\n"
 "\t\n"
@@ -16165,22 +16859,22 @@ msgstr ""
 "    e) Gofyn i chi wneud disg meddal cychwyn.\n"
 "    f) Os yw'n gleient tennauKDM.\n"
 
-#: standalone/drakTermServ:392
+#: standalone/drakTermServ:367
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Diddymu'r Dewin"
 
-#: standalone/drakTermServ:404
+#: standalone/drakTermServ:379
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Cadwch ffurfweddiad dhcpd!"
 
-#: standalone/drakTermServ:432
+#: standalone/drakTermServ:407
 #, c-format
 msgid "Use thin clients."
 msgstr "Defnyddiwch gleientiaid tenau"
 
-#: standalone/drakTermServ:434
+#: standalone/drakTermServ:409
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -16194,35 +16888,35 @@ msgstr ""
 "    Cleient 'Tew' sy'n defnyddio eu CPU/RAM eu hun ond system ffeiliau'r "
 "gweinydd."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:1061
+#: 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:453
+#: standalone/drakTermServ:428
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Creu delwedd cychwyn rhyngrwyd ar gyfer pob cnewyllyn"
 
-#: standalone/drakTermServ:454 standalone/drakTermServ:753
-#: standalone/drakTermServ:769
+#: standalone/drakTermServ:429 standalone/drakTermServ:726
+#: standalone/drakTermServ:742
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Bydd hyn yn cymryd rhai munudau"
 
-#: standalone/drakTermServ:458 standalone/drakTermServ:478
+#: standalone/drakTermServ:433 standalone/drakTermServ:452
 #, c-format
 msgid "Done!"
 msgstr "Gorffen!"
 
-#: standalone/drakTermServ:464
+#: standalone/drakTermServ:438
 #, 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:484
+#: standalone/drakTermServ:458
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -16231,12 +16925,12 @@ msgstr ""
 "Er mwyn galluogi newidiadau i'r cleient tenau, rhaid i'r rheolwr arddangos "
 "gael ei gychwyn. Cychwyn?"
 
-#: standalone/drakTermServ:519
+#: standalone/drakTermServ:493
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "Trosolwg Gweinydd Terfynnell"
 
-#: standalone/drakTermServ:520
+#: standalone/drakTermServ:494
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16260,7 +16954,7 @@ msgstr ""
 "        \t/etc/dhcpd.conf.etherboot-pcimap.dylech greu'r ddelwedd etherboot "
 "ar gyfer o leiaf un                  \tcnewyllyn llawn."
 
-#: standalone/drakTermServ:526
+#: standalone/drakTermServ:500
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16294,7 +16988,7 @@ msgstr ""
 "        \t\tMae stanzal dhcpd.conf arferol i gynnal cleient diddisg yn "
 "edrych fel:"
 
-#: standalone/drakTermServ:544
+#: standalone/drakTermServ:518
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16305,14 +16999,14 @@ msgid ""
 "\t\t\t\n"
 "        Note: The '#type' entry is only used by drakTermServ.  Clients can "
 "either be 'thin'\n"
-"        or 'fat'.  Thin clients run most software on the server via xdmcp, "
+"        or 'fat'.  Thin clients run most software on the server via XDMCP, "
 "while fat clients run \n"
 "        most software on the client machine. A special inittab, %s is\n"
 "        written for thin clients. System config files xdm-config, kdmrc, and "
 "gdm.conf are \n"
-"        modified if thin clients are used, to enable xdmcp. Since there are "
+"        modified if thin clients are used, to enable XDMCP. Since there are "
 "security issues in \n"
-"        using xdmcp, hosts.deny and hosts.allow are modified to limit access "
+"        using XDMCP, hosts.deny and hosts.allow are modified to limit access "
 "to the local\n"
 "        subnet.\n"
 "\t\t\t\n"
@@ -16341,14 +17035,14 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tSylwer: Mae'r cofnod \"#type\" yn cael ei ddefnyddio gan drakTermServ "
 "yn unig.  Clients can either be 'thin'\n"
-"        or 'fat'.  Thin clients run most software on the server via xdmcp, "
+"        or 'fat'.  Thin clients run most software on the server via XDMCP, "
 "while fat clients run \n"
 "        most software on the client machine. A special inittab, %s is\n"
 "        written for thin clients. System config files xdm-config, kdmrc, and "
 "gdm.conf are \n"
-"        modified if thin clients are used, to enable xdmcp. Since there are "
+"        modified if thin clients are used, to enable XDMCP. Since there are "
 "security issues in \n"
-"        using xdmcp, hosts.deny and hosts.allow are modified to limit access "
+"        using XDMCP, hosts.deny and hosts.allow are modified to limit access "
 "to the local\n"
 "        subnet.\n"
 "\t\t\t\n"
@@ -16368,7 +17062,7 @@ msgstr ""
 "        Note: You must stop/start the server after adding or changing "
 "clients."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:538
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16399,7 +17093,7 @@ msgstr ""
 "\t\t\t\n"
 "        \tWith SUBNET/MASK being defined for your network."
 
-#: standalone/drakTermServ:576
+#: standalone/drakTermServ:550
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16415,7 +17109,7 @@ msgstr ""
 "        \t\t/etc/shadow yn %s. drakTermServ helps\n"
 "        \t\tiyn yr achos hwn drwy ychwanegu neu dynnu defnyddwyr o'r ffeil."
 
-#: standalone/drakTermServ:580
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16432,7 +17126,7 @@ msgstr ""
 "ffurfweddiad caledwedd cleient,\n"
 "        \t\tbydd drakTermServ yn cynorthwyo i greu'r ffeiliau hyn."
 
-#: standalone/drakTermServ:585
+#: standalone/drakTermServ:559
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16467,7 +17161,7 @@ msgstr ""
 "        ffurfweddiad lleol, cadw'r ffeiliau ffurfweddu, un waith mae'r "
 "peiriant cleient wedi ei ffurfweddu"
 
-#: standalone/drakTermServ:594
+#: standalone/drakTermServ:568
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16477,7 +17171,7 @@ msgid ""
 "the boot image to \n"
 "        \teach diskless client.\n"
 "\n"
-"        \tA typical tftp configuration file looks like:\n"
+"        \tA typical TFTP configuration file looks like:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -16503,7 +17197,7 @@ msgstr ""
 "delwedd cychwyn i bob\n"
 "        \t\tcleient di-ddisg.\n"
 "\n"
-"        \t\tMae ffeil ffurfweddu tftp nodweddiadol yn edrych fel hyn:\n"
+"        \t\tMae ffeil ffurfweddu TFTP nodweddiadol yn edrych fel hyn:\n"
 "        \t\t\n"
 "        \tservice tftp\n"
 "\t\t\t{\n"
@@ -16522,13 +17216,13 @@ msgstr ""
 "mkinitrd-net\n"
 "        \t\tyn gosod ei ddelweddau."
 
-#: standalone/drakTermServ:615
+#: standalone/drakTermServ:589
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
 "        \tThe diskless client machines need either ROM images on the NIC, or "
 "a boot floppy\n"
-"        \tor CD to initate the boot sequence.  drakTermServ will help "
+"        \tor CD to initiate the boot sequence.  drakTermServ will help "
 "generate these\n"
 "        \timages, based on the NIC in the client machine.\n"
 "        \t\t\n"
@@ -16553,62 +17247,62 @@ msgstr ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:650
+#: standalone/drakTermServ:624
 #, c-format
 msgid "Boot Floppy"
 msgstr "Disg Meddal Cychwyn"
 
-#: standalone/drakTermServ:652
+#: standalone/drakTermServ:626
 #, c-format
 msgid "Boot ISO"
 msgstr "Cychwyn yr ISO"
 
-#: standalone/drakTermServ:654
+#: standalone/drakTermServ:628
 #, c-format
 msgid "PXE Image"
 msgstr "Delwedd PXE"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:696
 #, c-format
 msgid "Default kernel version"
 msgstr "Fersiwn rhagosodedig y cnewyllyn"
 
-#: standalone/drakTermServ:751
+#: standalone/drakTermServ:724
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Adeiladu'r cnewyllyn cyfan -->"
 
-#: standalone/drakTermServ:758
+#: standalone/drakTermServ:731
 #, c-format
 msgid "No kernel selected!"
 msgstr "Heb ddewis cnewyllyn"
 
-#: standalone/drakTermServ:761
+#: standalone/drakTermServ:734
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Adeiladau NIC unigol -->"
 
-#: standalone/drakTermServ:765
+#: standalone/drakTermServ:738
 #, c-format
 msgid "No NIC selected!"
 msgstr "Heb ddewis NIC!"
 
-#: standalone/drakTermServ:768
+#: standalone/drakTermServ:741
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Adeiladu pob cnewyllyn -->"
 
-#: standalone/drakTermServ:776
+#: standalone/drakTermServ:749
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Dileu"
 
-#: standalone/drakTermServ:783
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Dileu Pob NBI"
 
-#: standalone/drakTermServ:870
+#: standalone/drakTermServ:843
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16619,27 +17313,27 @@ msgstr ""
 "wahanol i'r un yng ngronfa ddata'r Gweinydd Terfynell.\n"
 "I fewngofnodi i'r Gwas.Terfynell dileu/ail ychwnaegu'r defnyddiwr."
 
-#: standalone/drakTermServ:875
+#: standalone/drakTermServ:848
 #, c-format
 msgid "Add User -->"
 msgstr "Pob Defnyddiwr -->"
 
-#: standalone/drakTermServ:881
+#: standalone/drakTermServ:854
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Dileu Defnyddiwr"
 
-#: standalone/drakTermServ:917
+#: standalone/drakTermServ:890
 #, c-format
 msgid "type: %s"
 msgstr "math:  %s"
 
-#: standalone/drakTermServ:921
+#: standalone/drakTermServ:894
 #, c-format
 msgid "local config: %s"
 msgstr "Ffurfweddiad lleol: %s"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:924
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16648,67 +17342,67 @@ msgstr ""
 "Caniatáu ffurfweddiad\n"
 "caledwedd lleol"
 
-#: standalone/drakTermServ:960
+#: standalone/drakTermServ:933
 #, c-format
 msgid "No net boot images created!"
 msgstr "Heb greu delweddau cychwyn y rhwyd!"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:951
 #, c-format
 msgid "Thin Client"
 msgstr "Cleient Tenau"
 
-#: standalone/drakTermServ:982
+#: standalone/drakTermServ:955
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Caniatáu Cleientiaid Tenau"
 
-#: standalone/drakTermServ:983
+#: standalone/drakTermServ:956
 #, c-format
 msgid "Add Client -->"
 msgstr "Ychwanegu Cleient -->"
 
-#: standalone/drakTermServ:997
+#: standalone/drakTermServ:970
 #, c-format
 msgid "type: fat"
 msgstr "math:  fat"
 
-#: standalone/drakTermServ:998
+#: standalone/drakTermServ:971
 #, c-format
 msgid "type: thin"
 msgstr "math:  tenau"
 
-#: standalone/drakTermServ:1005
+#: standalone/drakTermServ:978
 #, c-format
 msgid "local config: false"
 msgstr "ffurfweddiad lleol: false"
 
-#: standalone/drakTermServ:1006
+#: standalone/drakTermServ:979
 #, c-format
 msgid "local config: true"
 msgstr "ffurfweddiad lleol: true"
 
-#: standalone/drakTermServ:1014
+#: standalone/drakTermServ:987
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Golygu Cleient"
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1013
 #, c-format
 msgid "Disable Local Config"
 msgstr "Analluogi Ffurfweddiad Lleol"
 
-#: standalone/drakTermServ:1047
+#: standalone/drakTermServ:1020
 #, c-format
 msgid "Delete Client"
 msgstr "Diddymu Cleient"
 
-#: standalone/drakTermServ:1056
+#: standalone/drakTermServ:1029
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Ffurfweddu dhcpd..."
 
-#: standalone/drakTermServ:1072
+#: standalone/drakTermServ:1045
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16717,79 +17411,79 @@ msgstr ""
 "Mae angen cychwyn y Rheolwr Dangosydd i'r newid ddigwydd.\n"
 "(ailgychwyn gwasanaeth dm - yn y consol)"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1085
 #, c-format
 msgid "Thin clients won't work with autologin. Disable autologin?"
 msgstr ""
 "Nid yw'r cleientiaid tennau'n gweithio gydag awto fewngofnodi. Anablu awto "
 "fewngofnodi?"
 
-#: standalone/drakTermServ:1128
+#: standalone/drakTermServ:1101
 #, c-format
 msgid "All clients will use %s"
 msgstr "Bydd pob cleient yn defnyddio %s"
 
-#: standalone/drakTermServ:1160
+#: standalone/drakTermServ:1133
 #, c-format
 msgid "Subnet:"
 msgstr "Isnet:"
 
-#: standalone/drakTermServ:1167
+#: standalone/drakTermServ:1140
 #, c-format
 msgid "Netmask:"
 msgstr "Netmask:"
 
-#: standalone/drakTermServ:1174
+#: standalone/drakTermServ:1147
 #, c-format
 msgid "Routers:"
 msgstr "Llwybryddion:"
 
-#: standalone/drakTermServ:1181
+#: standalone/drakTermServ:1154
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Masg Isnet"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1161
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Cyfeiriad Darlledu:"
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Domain Name:"
 msgstr "Enw Parth:"
 
-#: standalone/drakTermServ:1203
+#: standalone/drakTermServ:1176
 #, c-format
 msgid "Name Servers:"
 msgstr "Enwi Gweinydd:"
 
-#: standalone/drakTermServ:1214
+#: standalone/drakTermServ:1187
 #, c-format
 msgid "IP Range Start:"
 msgstr "Cychwyn Amrediad IP:"
 
-#: standalone/drakTermServ:1215
+#: standalone/drakTermServ:1188
 #, c-format
 msgid "IP Range End:"
 msgstr "Diwedd Amrediad IP:"
 
-#: standalone/drakTermServ:1257
+#: standalone/drakTermServ:1230
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "Atodi TS yn Gynwysiedig i'r Ffurfwediad Presennol"
 
-#: standalone/drakTermServ:1259
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Write Config"
 msgstr "Ysgrifennu ffurfweddu"
 
-#: standalone/drakTermServ:1275
+#: standalone/drakTermServ:1248
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Ffurfweddiad Gweinydd dhcpd"
 
-#: standalone/drakTermServ:1276
+#: standalone/drakTermServ:1249
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16800,104 +17494,98 @@ msgstr ""
 "hyn o'ch system ar waith.\n"
 "Gallwch eu newid yn ôl y galw."
 
-#: standalone/drakTermServ:1279
+#: standalone/drakTermServ:1252
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Pwll Cyfeiriad IP dynameg"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1399
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Mewnosodwch ddisg meddal:"
 
-#: standalone/drakTermServ:1430
+#: standalone/drakTermServ:1403
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Methu cael mynediad i'r disg meddal!"
 
-#: standalone/drakTermServ:1432
+#: standalone/drakTermServ:1405
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Mae modd tynnu'r disg meddal nawr"
 
-#: standalone/drakTermServ:1435
+#: standalone/drakTermServ:1408
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Does dim gyrrwr disg meddal ar gael!"
 
-#: standalone/drakTermServ:1440
+#: standalone/drakTermServ:1413
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "Delwedd PXE yw %s/%s"
 
-#: standalone/drakTermServ:1442
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Gwall ysgrifennu %s/%s"
 
-#: standalone/drakTermServ:1451
+#: standalone/drakTermServ:1424
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "%s yw'r ddelwedd ISO etherboot"
 
-#: standalone/drakTermServ:1453
+#: standalone/drakTermServ:1426
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Aeth rhywbeth o'i le! - ydy mkisofs wedi ei osod?"
 
-#: standalone/drakTermServ:1475
+#: standalone/drakTermServ:1447
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Mae angen creu /etc/dhcpd.conf yn gyntaf"
 
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1602
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "%s passwd gwael yng Ngweinydd Terfynell - ail ysgrifennu...\n"
 
-#: standalone/drakTermServ:1647
+#: standalone/drakTermServ:1615
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "Nid yw %s yn ddefnyddiwr..\n"
 
-#: standalone/drakTermServ:1648
+#: standalone/drakTermServ:1616
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "Mae %s yn ddefnyddiwr Gweinydd Terfynell eisoes\n"
 
-#: standalone/drakTermServ:1650
+#: standalone/drakTermServ:1618
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "Methodd ychwanegu %s 'r Gweinydd Terfynell\n"
 
-#: standalone/drakTermServ:1652
+#: standalone/drakTermServ:1620
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "Ychwanegu %s i'r Gweinydd Terfynell\n"
 
-#: standalone/drakTermServ:1698
+#: standalone/drakTermServ:1666
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Dilëwyd %s...\n"
 
-#: standalone/drakTermServ:1700 standalone/drakTermServ:1773
+#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
 #, c-format
 msgid "%s not found...\n"
 msgstr "Heb ganfod %s...\n"
 
-#: standalone/drakTermServ:1722 standalone/drakTermServ:1723
-#: standalone/drakTermServ:1724
-#, c-format
-msgid "%s already in use\n"
-msgstr "%s yn cael ei ddefnyddio eisoes\n"
-
-#: standalone/drakTermServ:1801
+#: standalone/drakTermServ:1769
 #, 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:1953
+#: standalone/drakTermServ:1921
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Newidiodd ffurfweddiad - ailgychwyn clusternfs/dhcpd?"
@@ -16998,8 +17686,8 @@ msgstr ""
 "\n"
 "Mae paramedrau'r awto osod i'w cael yn yr adran ar y chwith"
 
-#: standalone/drakautoinst:252 standalone/drakgw:598 standalone/drakvpn:902
-#: standalone/scannerdrake:379
+#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
+#: standalone/scannerdrake:375
 #, c-format
 msgid "Congratulations!"
 msgstr "Llongyfarchiadau!"
@@ -17038,26 +17726,21 @@ msgstr "hd"
 msgid "tape"
 msgstr "tâp"
 
-#: standalone/drakbackup:112
-#, c-format
-msgid "No devices found"
-msgstr "Heb ganfod dyfais"
-
-#: standalone/drakbackup:152
+#: standalone/drakbackup:153
 #, c-format
 msgid ""
-"Expect is an extension to the Tcl scripting language that allows interactive "
+"Expect is an extension to the TCL scripting language that allows interactive "
 "sessions without user intervention."
 msgstr ""
-"Mae Expect yn estyniad o'r iaith sgriptio Tcl sy'n caniatáu sesiynau "
+"Mae Expect yn estyniad o'r iaith sgriptio TCL sy'n caniatáu sesiynau "
 "rhyngweithiol heb ymyrraeth y defnyddiwr."
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:154
 #, 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:154
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -17066,7 +17749,7 @@ 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."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -17075,7 +17758,7 @@ 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."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -17084,7 +17767,7 @@ msgstr ""
 "Dim ond ffeiliau sydd wedi newid neu sy'n newydd fydd cadw wrth gefn "
 "cynyddol yn eu cadw."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -17093,16 +17776,16 @@ 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:158
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
-"This should be a local user or email addresse that you want the backup "
+"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."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17111,7 +17794,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:160
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17122,7 +17805,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:161
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -17133,7 +17816,7 @@ msgstr ""
 "defnyddio llwybr cyfeiriadur, byddwch yn defnyddio enw 'modiwl' ar gyfer y "
 "llwybr gwasanaeth."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17142,51 +17825,51 @@ 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:326
+#: standalone/drakbackup:327
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "Dim cyfrwng wedi ei ddewis ar gyfer gweithredu cron."
 
-#: standalone/drakbackup:330
+#: standalone/drakbackup:331
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "Dim cyfnod wedi ei ddewis ar gyfer gweithredu cron."
 
-#: standalone/drakbackup:377
+#: standalone/drakbackup:378
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Nid yw interval cron ar gael ar gyfer di-wraidd"
 
-#: standalone/drakbackup:462 standalone/logdrake:467
+#: standalone/drakbackup:463 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:466 standalone/logdrake:472
+#: standalone/drakbackup:467 standalone/logdrake:442
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
 "a complete email address!"
 msgstr ""
-"Mae \"%s\" yn ddefnyddiwr lleol, ond nid ydych wedi dewis smtp lleol, felly "
+"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:475
+#: standalone/drakbackup:476
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "Rhestr defnyddwyr dilys wedi newid, ailysgrifennu ffeil ffurfweddu."
 
-#: standalone/drakbackup:477
+#: standalone/drakbackup:478
 #, c-format
 msgid "Old user list:\n"
 msgstr "Rhestr hen ddefnyddiwr:\n"
 
-#: standalone/drakbackup:479
+#: standalone/drakbackup:480
 #, c-format
 msgid "New user list:\n"
 msgstr "Rhestr defnyddiwr newydd:\n"
 
-#: standalone/drakbackup:524
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -17196,7 +17879,7 @@ msgstr ""
 "                      Adroddiad DrakBackup  \n"
 "\n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:526
 #, c-format
 msgid ""
 "\n"
@@ -17207,7 +17890,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:531
+#: standalone/drakbackup:532
 #, c-format
 msgid ""
 "\n"
@@ -17220,13 +17903,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:556 standalone/drakbackup:627
-#: standalone/drakbackup:683
+#: standalone/drakbackup:557 standalone/drakbackup:628
+#: standalone/drakbackup:684
 #, c-format
 msgid "Total progress"
 msgstr "Cyfanswm cynnydd"
 
-#: standalone/drakbackup:609
+#: standalone/drakbackup:610
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17239,42 +17922,42 @@ msgstr ""
 "Rhybudd: Os ydych eisioes wedi dilyn y broses hon, bydd\n"
 " angen tynnu'r cofnod o authorized_keys ar y gweinydd."
 
-#: standalone/drakbackup:618
+#: standalone/drakbackup:619
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Bydd hyn yn cymryd amser i gynhyrchu'r allweddi"
 
-#: standalone/drakbackup:625
+#: standalone/drakbackup:626
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "Methu agor %s"
 
-#: standalone/drakbackup:642
+#: standalone/drakbackup:643
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Dim cais am gyfrinair ar %s ym mhorth %s"
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:644
 #, c-format
 msgid "Bad password on %s"
 msgstr "Cyfrinair gwallus yn %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:645
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Gwrthodwyd caniatâd wrth drosglwyddo %s i %s"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:646
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Methu canfod %s ar %s"
 
-#: standalone/drakbackup:649
+#: standalone/drakbackup:650
 #, c-format
 msgid "%s not responding"
 msgstr "Nid yw %s yn ymateb"
 
-#: standalone/drakbackup:653
+#: standalone/drakbackup:654
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17291,47 +17974,47 @@ msgstr ""
 "ssh -i %s %s@%s\n"
 "heb dderbyn cais am gyfrinair"
 
-#: standalone/drakbackup:697
+#: standalone/drakbackup:698
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "Mae safle pell WebDAV eisoes wedi cydamseru!"
 
-#: standalone/drakbackup:701
+#: standalone/drakbackup:702
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "Methodd trosglwyddiad WebDaAV!"
 
-#: standalone/drakbackup:722
+#: standalone/drakbackup:723
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Dim CDR/DVDR yn y gyrrwr!"
 
-#: standalone/drakbackup:726
+#: standalone/drakbackup:727
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Nid yw'n ymddangos fel cyfrwng cofnodi."
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:732
 #, c-format
 msgid "Not erasable media!"
 msgstr "Nid yw'n gyfrwng dileadwy!"
 
-#: standalone/drakbackup:771
+#: standalone/drakbackup:774
 #, 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:829
+#: standalone/drakbackup:832
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Anawsterau caniatâd wrth gael mynediad i'r CD."
 
-#: standalone/drakbackup:856
+#: standalone/drakbackup:859
 #, c-format
 msgid "No tape in %s!"
 msgstr "Dim tâp yn %s!"
 
-#: standalone/drakbackup:956
+#: standalone/drakbackup:966
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -17340,37 +18023,37 @@ msgstr ""
 "Wedi mynd tu hwnt i'r cwota wrth gefn\n"
 "%d Mb wedi ei ddefnyddio vs %d Mb ar gael."
 
-#: standalone/drakbackup:975 standalone/drakbackup:1008
+#: standalone/drakbackup:985 standalone/drakbackup:1018
 #, c-format
 msgid "Backup system files..."
 msgstr "Ffeiliau system wrth gefn"
 
-#: standalone/drakbackup:1009 standalone/drakbackup:1050
+#: standalone/drakbackup:1019 standalone/drakbackup:1060
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Ffeiliau cadw wrth gefn y Disg Caled"
 
-#: standalone/drakbackup:1049
+#: standalone/drakbackup:1059
 #, c-format
 msgid "Backup User files..."
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: standalone/drakbackup:1084
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Backup Other files..."
 msgstr "Cadw wrth gefn ffeiliau eraill..."
 
-#: standalone/drakbackup:1085
+#: standalone/drakbackup:1095
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Cynnydd Disg Caled wrth Gefn..."
 
-#: standalone/drakbackup:1090
+#: standalone/drakbackup:1100
 #, c-format
 msgid "No changes to backup!"
 msgstr "Dim newid i'r ffeil wrth gefn!"
 
-#: standalone/drakbackup:1108 standalone/drakbackup:1132
+#: standalone/drakbackup:1118 standalone/drakbackup:1142
 #, c-format
 msgid ""
 "\n"
@@ -17381,7 +18064,7 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy %s:\n"
 "\n"
 
-#: standalone/drakbackup:1117
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "\n"
@@ -17392,18 +18075,18 @@ msgstr ""
 " Anhawster cysylltiad FTP: Nid oedd yn bosibl anfon eich ffeiliau wrth gefn "
 "drwy FTP.\n"
 
-#: standalone/drakbackup:1118
+#: standalone/drakbackup:1128
 #, 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:1120
+#: standalone/drakbackup:1130
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "rhestr ffeil yrrwyd gan FTP: %s\n"
 
-#: standalone/drakbackup:1137
+#: standalone/drakbackup:1147
 #, c-format
 msgid ""
 "\n"
@@ -17414,7 +18097,7 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy CD:\n"
 "\n"
 
-#: standalone/drakbackup:1142
+#: standalone/drakbackup:1152
 #, c-format
 msgid ""
 "\n"
@@ -17425,22 +18108,22 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy dâp:\n"
 "\n"
 
-#: standalone/drakbackup:1151
+#: standalone/drakbackup:1161
 #, 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."
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1162
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Gwall wrth anfon e-bost. \n"
 
-#: standalone/drakbackup:1180
+#: standalone/drakbackup:1192
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Methu creu catalog!"
 
-#: standalone/drakbackup:1393
+#: standalone/drakbackup:1414
 #, c-format
 msgid ""
 "\n"
@@ -17449,7 +18132,7 @@ msgstr ""
 "\n"
 "Gwiriwch pob dewis sydd angen arnoch.\n"
 
-#: standalone/drakbackup:1394
+#: standalone/drakbackup:1415
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -17457,37 +18140,37 @@ msgstr ""
 "Mae'r dewisiadau hyn yn gallu cadw wrth gefn ac adfer pob ffeil yn eich "
 "cyfeiriadur /etc.\n"
 
-#: standalone/drakbackup:1395
+#: standalone/drakbackup:1416
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Cadw wrth gefn ffeiliau System. ( cyfeiriadur /etc )"
 
-#: standalone/drakbackup:1396 standalone/drakbackup:1460
-#: standalone/drakbackup:1526
+#: standalone/drakbackup:1417 standalone/drakbackup:1481
+#: standalone/drakbackup:1547
 #, 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:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "Defnyddio Cadw wrth Gefn Cynyddol"
 
-#: standalone/drakbackup:1398 standalone/drakbackup:1462
-#: standalone/drakbackup:1528
+#: standalone/drakbackup:1419 standalone/drakbackup:1483
+#: standalone/drakbackup:1549
 #, c-format
 msgid "Use Differential Backups"
 msgstr "Defnyddio Cadw wrth Gefn differu"
 
-#: standalone/drakbackup:1400
+#: standalone/drakbackup:1421
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Peidio cynnwys ffeiliau hanfodol (passwd, group, fstab)"
 
-#: standalone/drakbackup:1401
+#: standalone/drakbackup:1422
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17496,177 +18179,177 @@ msgstr ""
 "Gyda'e dewis hwn gallwch adfer unrhyw fersiwn\n"
 "o'ch cyfeiriadur /etc."
 
-#: standalone/drakbackup:1432
+#: standalone/drakbackup:1453
 #, 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."
 
-#: standalone/drakbackup:1459
+#: standalone/drakbackup:1480
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Peidio cynnwys storfa'r porwr"
 
-#: standalone/drakbackup:1513
+#: standalone/drakbackup:1534
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Dewiswch y ffeiliau neu gyfeiriaduron a chliciwch 'Iawn'"
 
-#: standalone/drakbackup:1514 standalone/drakfont:656
+#: standalone/drakbackup:1535 standalone/drakfont:660
 #, c-format
 msgid "Remove Selected"
 msgstr "Tynnu'r Dewis"
 
-#: standalone/drakbackup:1577
+#: standalone/drakbackup:1598
 #, c-format
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: standalone/drakbackup:1597
+#: standalone/drakbackup:1618
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Defnyddiwch gysylltiad rhwydwaith i gadw wrth gefn"
 
-#: standalone/drakbackup:1599
+#: standalone/drakbackup:1620
 #, c-format
 msgid "Net Method:"
 msgstr "Dull Rhwyd:"
 
-#: standalone/drakbackup:1603
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Defnyddiwch Expect ar gyfer SSH"
 
-#: standalone/drakbackup:1604
+#: standalone/drakbackup:1625
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Creu/Trosglwyddo allweddi wrth gefn ar gyfer SSH"
 
-#: standalone/drakbackup:1606
+#: standalone/drakbackup:1627
 #, c-format
 msgid "Transfer Now"
 msgstr "Trosglwyddo Nawr"
 
-#: standalone/drakbackup:1608
+#: standalone/drakbackup:1629
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Allweddi eraill (nid drakbackup) yn eu lle yn barod"
 
-#: standalone/drakbackup:1611
+#: standalone/drakbackup:1632
 #, c-format
 msgid "Host name or IP."
-msgstr "Enw gwesteiwr neu IP"
+msgstr "Enw gwesteiwr neu IP."
 
-#: standalone/drakbackup:1616
+#: standalone/drakbackup:1637
 #, 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:1621
-#, c-format
-msgid "Login name"
-msgstr "Enw mewngofnodi"
-
-#: standalone/drakbackup:1628
+#: standalone/drakbackup:1649
 #, c-format
 msgid "Remember this password"
 msgstr "Cofiwch y cyfrinair"
 
-#: standalone/drakbackup:1644
+#: standalone/drakbackup:1665
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Angen enw gwesteiwr, enw defnyddiwr a chyfrinair"
 
-#: standalone/drakbackup:1742
+#: standalone/drakbackup:1756
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Defnyddiwch y CD/DVDROM i gadw wrth gefn"
 
-#: standalone/drakbackup:1745
+#: standalone/drakbackup:1759
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Dewiswch eich dyfais CD/DVD"
 
-#: standalone/drakbackup:1750
+#: standalone/drakbackup:1764
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Dewiswch faint eich cyfrwng CD/DVD"
 
-#: standalone/drakbackup:1757
+#: standalone/drakbackup:1771
 #, c-format
 msgid "Multisession CD"
 msgstr "CD aml-sesiwn"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1773
 #, c-format
 msgid "CDRW media"
 msgstr "Cyfrwng CDRW"
 
-#: standalone/drakbackup:1765
+#: standalone/drakbackup:1779
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Dileu eich cyfrwng RW(Sesiwn 1af)"
 
-#: standalone/drakbackup:1766
+#: standalone/drakbackup:1780
 #, c-format
 msgid " Erase Now "
 msgstr "Dileu Nawr"
 
-#: standalone/drakbackup:1772
+#: standalone/drakbackup:1786
 #, c-format
 msgid "DVD+RW media"
 msgstr "Cyfrwng DVD+RW"
 
-#: standalone/drakbackup:1774
+#: standalone/drakbackup:1788
 #, c-format
 msgid "DVD-R media"
 msgstr "Cyfrwng DVD-R"
 
-#: standalone/drakbackup:1776
+#: standalone/drakbackup:1790
 #, c-format
 msgid "DVDRAM device"
 msgstr "dyfais DVDRAM"
 
-#: standalone/drakbackup:1807
+#: standalone/drakbackup:1821
 #, c-format
 msgid "No CD device defined!"
 msgstr "Heb ddiffinio dyfais CD!"
 
-#: standalone/drakbackup:1854
+#: standalone/drakbackup:1863
 #, c-format
 msgid "Use tape to backup"
 msgstr "Defnyddiwch dâp i gadw wrth gefn"
 
-#: standalone/drakbackup:1857
+#: standalone/drakbackup:1866
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Enw dyfais i'w ddefnyddio ar gyfer cadw wrth gefn"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1872
+#, c-format
+msgid "Backup directly to tape"
+msgstr ""
+
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Peidio ailddirwyn y tâp wedi ei gadw wrth gefn"
 
-#: standalone/drakbackup:1869
+#: standalone/drakbackup:1884
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Dileu'r tâp cyn cadw wrth gefn"
 
-#: standalone/drakbackup:1875
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Tynnwch y tâp wedi cadw wrth gefn"
 
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1962
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Rhowch y cyfeiriadur i gadw iddo:"
 
-#: standalone/drakbackup:1946
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Directory to save to"
 msgstr "Y cyfeiriadur i gadw iddo:"
 
-#: standalone/drakbackup:1951
+#: standalone/drakbackup:1971
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17675,308 +18358,308 @@ msgstr ""
 "Rhowch y maint mwyaf\n"
 " i'w ganiatáu ar gyfer Drakbackup (MB)"
 
-#: standalone/drakbackup:2015
+#: standalone/drakbackup:2035
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM / DVDROM"
 
-#: standalone/drakbackup:2020
+#: standalone/drakbackup:2040
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Disg Caled / NFS"
 
-#: standalone/drakbackup:2036 standalone/drakbackup:2041
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2056
+#: standalone/drakbackup:2061
 #, c-format
 msgid "hourly"
 msgstr "bob awr"
 
-#: standalone/drakbackup:2037 standalone/drakbackup:2042
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2057
+#: standalone/drakbackup:2062
 #, c-format
 msgid "daily"
 msgstr "dyddiol"
 
-#: standalone/drakbackup:2038 standalone/drakbackup:2043
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2058
+#: standalone/drakbackup:2063
 #, c-format
 msgid "weekly"
 msgstr "bob wythnos"
 
-#: standalone/drakbackup:2039 standalone/drakbackup:2044
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2059
+#: standalone/drakbackup:2064
 #, c-format
 msgid "monthly"
 msgstr "bob mis"
 
-#: standalone/drakbackup:2040 standalone/drakbackup:2045
-#: standalone/drakbackup:2046
+#: standalone/drakbackup:2055 standalone/drakbackup:2060
+#: standalone/drakbackup:2065
 #, c-format
 msgid "custom"
 msgstr "arddull"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "January"
 msgstr "Ionawr"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "February"
 msgstr "Chwefror"
 
-#: standalone/drakbackup:2051
+#: standalone/drakbackup:2069
 #, c-format
 msgid "March"
 msgstr "Mawrth"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "April"
 msgstr "Ebrill"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "May"
 msgstr "Mai"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "June"
 msgstr "Mehefin"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "July"
 msgstr "Gorffennaf"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "August"
 msgstr "Awst"
 
-#: standalone/drakbackup:2052
+#: standalone/drakbackup:2070
 #, c-format
 msgid "September"
 msgstr "Medi"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "October"
 msgstr "Hydref"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "November"
 msgstr "Tachwedd"
 
-#: standalone/drakbackup:2053
+#: standalone/drakbackup:2071
 #, c-format
 msgid "December"
 msgstr "Rhagfyr"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Sunday"
 msgstr "Sul"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Monday"
 msgstr "Llun"
 
-#: standalone/drakbackup:2058
+#: standalone/drakbackup:2074
 #, c-format
 msgid "Tuesday"
 msgstr "Mawrth"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Wednesday"
 msgstr "Mercher"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Thursday"
 msgstr "Iau"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Friday"
 msgstr "Gwener"
 
-#: standalone/drakbackup:2059
+#: standalone/drakbackup:2075
 #, c-format
 msgid "Saturday"
 msgstr "Sadwrn"
 
-#: standalone/drakbackup:2094
+#: standalone/drakbackup:2107
 #, c-format
 msgid "Use daemon"
 msgstr "Defnyddiwch ddaemon"
 
-#: standalone/drakbackup:2099
+#: standalone/drakbackup:2112
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Dewiswch faint o amser fydd rhwng pob cadw wrth gefn"
 
-#: standalone/drakbackup:2105
+#: standalone/drakbackup:2118
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Gosodiad addasu/cofnod crontab:"
 
-#: standalone/drakbackup:2110
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Minute"
 msgstr "Munud"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:2127
 #, c-format
 msgid "Hour"
 msgstr "Awr"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2131
 #, c-format
 msgid "Day"
 msgstr "Diwrnod"
 
-#: standalone/drakbackup:2122
+#: standalone/drakbackup:2135
 #, c-format
 msgid "Month"
 msgstr "Mis"
 
-#: standalone/drakbackup:2126
+#: standalone/drakbackup:2139
 #, c-format
 msgid "Weekday"
 msgstr "Diwrnod yr wythnos"
 
-#: standalone/drakbackup:2132
+#: standalone/drakbackup:2145
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn."
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2152
 #, 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:2140
+#: standalone/drakbackup:2153
 #, 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."
 
-#: standalone/drakbackup:2190
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Dewiswch y y math o gywasgiad"
 
-#: standalone/drakbackup:2194
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Defnyddiwch ffeiliau .backupignore"
 
-#: standalone/drakbackup:2196
+#: standalone/drakbackup:2207
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Anfonwch adroddiad e-bost wedi pob cadw wrth gefn i :"
 
-#: standalone/drakbackup:2202
+#: standalone/drakbackup:2213
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "Gweinydd SMTP ar gyfer e-bost:"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2218
 #, 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:2247
+#: standalone/drakbackup:2258
 #, c-format
 msgid "What"
 msgstr "Beth"
 
-#: standalone/drakbackup:2252
+#: standalone/drakbackup:2263
 #, c-format
 msgid "Where"
 msgstr "Lle"
 
-#: standalone/drakbackup:2257
+#: standalone/drakbackup:2268
 #, c-format
 msgid "When"
 msgstr "Pryd"
 
-#: standalone/drakbackup:2262
+#: standalone/drakbackup:2273
 #, c-format
 msgid "More Options"
 msgstr "Dewisiadau Eraill"
 
-#: standalone/drakbackup:2275
+#: standalone/drakbackup:2286
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "Nid yw cyrchfan cadw wrth gefn wedi ei ffurfweddu..."
 
-#: standalone/drakbackup:2293 standalone/drakbackup:4208
+#: standalone/drakbackup:2306 standalone/drakbackup:4229
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Ffurfweddiad Drakbackup"
 
-#: standalone/drakbackup:2309
+#: standalone/drakbackup:2322
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Dewiswch i le rydych am gadw ffeiliau wrth gefn"
 
-#: standalone/drakbackup:2311
+#: standalone/drakbackup:2325
 #, 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:2319
+#: standalone/drakbackup:2325
 #, c-format
 msgid "Across Network"
 msgstr "ar draws Rhwydwaith"
 
-#: standalone/drakbackup:2327
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On CD-R"
 msgstr "ar CDROM"
 
-#: standalone/drakbackup:2335
+#: standalone/drakbackup:2325
 #, c-format
 msgid "On Tape Device"
 msgstr "ar Ddyfais Tâp"
 
-#: standalone/drakbackup:2374
+#: standalone/drakbackup:2371
 #, c-format
 msgid "Backup Users"
 msgstr "Defnyddwyr Cadw wrth Gefn"
 
-#: standalone/drakbackup:2375
+#: standalone/drakbackup:2372
 #, c-format
 msgid " (Default is all users)"
 msgstr "(Rhagosodedig yw pob defnyddiwr)"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2384
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Dewiswch beth rydych am ei gadw wrth gefn"
 
-#: standalone/drakbackup:2388
+#: standalone/drakbackup:2385
 #, c-format
 msgid "Backup System"
 msgstr "System cadw wrth gefn"
 
-#: standalone/drakbackup:2390
+#: standalone/drakbackup:2387
 #, c-format
 msgid "Select user manually"
 msgstr "Dewis defnyddwyr gyda llaw"
 
-#: standalone/drakbackup:2419
+#: standalone/drakbackup:2416
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Dewiswch y data i'w gadw wrth gefn..."
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2488
 #, c-format
 msgid ""
 "\n"
@@ -17985,7 +18668,7 @@ msgstr ""
 "\n"
 "Ffynhonell Cadw wrth Gefn:\n"
 
-#: standalone/drakbackup:2492
+#: standalone/drakbackup:2489
 #, c-format
 msgid ""
 "\n"
@@ -17994,7 +18677,7 @@ msgstr ""
 "\n"
 "- Ffeiliau System: \n"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2491
 #, c-format
 msgid ""
 "\n"
@@ -18003,7 +18686,7 @@ msgstr ""
 "\n"
 "- Ffeiliau Defnyddiwr:\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -18012,7 +18695,7 @@ msgstr ""
 "\n"
 "- Ffeiliau Eraill: \n"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2495
 #, c-format
 msgid ""
 "\n"
@@ -18021,12 +18704,12 @@ msgstr ""
 "\n"
 "Cadw ar Ddisg caled ar lwybr: %s\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2496
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tCyfyngu defnydd disg i %s Mb\n"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2499
 #, c-format
 msgid ""
 "\n"
@@ -18035,17 +18718,7 @@ msgstr ""
 "\n"
 "- Dileu ffeiliau tar y disg caled wedi'r cadw wrth gefn.\n"
 
-#: standalone/drakbackup:2506
-#, c-format
-msgid "NO"
-msgstr "NA"
-
-#: standalone/drakbackup:2507
-#, c-format
-msgid "YES"
-msgstr "IAWN"
-
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -18054,22 +18727,22 @@ msgstr ""
 "\n"
 "- Llosgi i CD"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2505
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2506
 #, c-format
 msgid " on device: %s"
 msgstr "ar ddyfais: %s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2507
 #, c-format
 msgid " (multi-session)"
 msgstr "(aml-sesiwn)"
 
-#: standalone/drakbackup:2512
+#: standalone/drakbackup:2508
 #, c-format
 msgid ""
 "\n"
@@ -18078,12 +18751,17 @@ msgstr ""
 "\n"
 "- Cadw i dâp ar ddyfais: %s"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2509
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tDileu=%s"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2511
+#, c-format
+msgid "\tBackup directly to Tape\n"
+msgstr ""
+
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -18092,7 +18770,7 @@ msgstr ""
 "\n"
 "- Cadw drwy %s ar westeiwr: %s\n"
 
-#: standalone/drakbackup:2517
+#: standalone/drakbackup:2514
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -18101,7 +18779,7 @@ msgstr ""
 "\t\t enw defnyddiwr:%s\n"
 "\t\t ar lwybr: %s \n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2515
 #, c-format
 msgid ""
 "\n"
@@ -18110,42 +18788,42 @@ msgstr ""
 "\n"
 "-Dewisiadau:\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tPeidiwch cynnwys Ffeiliau System\n"
 
-#: standalone/drakbackup:2521
+#: standalone/drakbackup:2518
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\t Bydd Cadw wrth gefn yn defnyddio tar a bzip2\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2519
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tBydd Cadw wrth Gefn yn defnyddio tar a gzip\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2520
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tBydd Cadw wrth Gefn yn defnyddio tar yn unig\n"
 
-#: standalone/drakbackup:2525
+#: standalone/drakbackup:2522
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tDefnyddiwch ffeiliau .backupignorey\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tAnfon e-bost at %s\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tDefnyddio gweinydd SMTP %s\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2526
 #, c-format
 msgid ""
 "\n"
@@ -18154,47 +18832,47 @@ msgstr ""
 "\n"
 "- Daemon %s trwy:\n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Disg Caled.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Tâp \n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2530
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Rhwydwaith drwy FTP.\n"
 
-#: standalone/drakbackup:2534
+#: standalone/drakbackup:2531
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Rhwydwaith drwy SSH.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Rhwydwaith drwy rsync.\n"
 
-#: standalone/drakbackup:2536
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Rhwydwaith drwy webday.\n"
 
-#: standalone/drakbackup:2538
+#: standalone/drakbackup:2535
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Dim ffurfweddiad, cliciwch Dewin neu Uwch.\n"
 
-#: standalone/drakbackup:2543
+#: standalone/drakbackup:2540
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18203,27 +18881,27 @@ msgstr ""
 "Rhestr o ddata i'w adfer:\n"
 "\n"
 
-#: standalone/drakbackup:2545
+#: standalone/drakbackup:2542
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "Adfer Ffeiliau'r System.\n"
 
-#: standalone/drakbackup:2547 standalone/drakbackup:2557
+#: standalone/drakbackup:2544 standalone/drakbackup:2554
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "       - o ddyddiad: %s %s\n"
 
-#: standalone/drakbackup:2550
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Adfer Ffeiliau'r System: \n"
 
-#: standalone/drakbackup:2555
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Adfer Ffeiliau Eraill: \n"
 
-#: standalone/drakbackup:2736
+#: standalone/drakbackup:2731
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18232,131 +18910,131 @@ msgstr ""
 "Rhestr o ddata llwgr:\n"
 "\n"
 
-#: standalone/drakbackup:2738
+#: standalone/drakbackup:2733
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Dad-diciwch hwn neu ei dynnu'r tro nesaf."
 
-#: standalone/drakbackup:2748
+#: standalone/drakbackup:2743
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Mae'r ffeiliau wrth gefn wedi eu llygru"
 
-#: standalone/drakbackup:2769
+#: standalone/drakbackup:2764
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "         Mae eich dewis data wedi ei          "
 
-#: standalone/drakbackup:2770
+#: standalone/drakbackup:2765
 #, c-format
-msgid "          Successfuly Restored on %s       "
+msgid "          Successfully Restored on %s       "
 msgstr "          Ei adfer yn Llwyddiannus ar %s     "
 
-#: standalone/drakbackup:2889
+#: standalone/drakbackup:2885
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "           Adfer y Ffurfweddiad"
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2913
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Iawn i adfer ffeiliau eraill"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2929
 #, 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:3000
+#: standalone/drakbackup:2994
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "Dewiswch y dyddiad i'w adfer:"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3031
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Adfer o'r Ddisg Caled."
 
-#: standalone/drakbackup:3039
+#: standalone/drakbackup:3033
 #, 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:3043
+#: standalone/drakbackup:3037
 #, c-format
 msgid "Directory with backups"
 msgstr "Cyfeiriadur gyda chadw wrth gefn"
 
-#: standalone/drakbackup:3097
+#: standalone/drakbackup:3091
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Dewis cyfrwng arall i adfer ohono"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3093
 #, c-format
 msgid "Other Media"
 msgstr "Cyfrwng Arall"
 
-#: standalone/drakbackup:3104
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Restore system"
 msgstr "Adfer y system"
 
-#: standalone/drakbackup:3105
+#: standalone/drakbackup:3099
 #, c-format
 msgid "Restore Users"
 msgstr "Adfer Defnyddwyr"
 
-#: standalone/drakbackup:3106
+#: standalone/drakbackup:3100
 #, c-format
 msgid "Restore Other"
 msgstr "Adfer Arall"
 
-#: standalone/drakbackup:3108
+#: standalone/drakbackup:3102
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "dewis llwybr arall i adfer ( yn lle / )"
 
-#: standalone/drakbackup:3112 standalone/drakbackup:3394
+#: standalone/drakbackup:3106 standalone/drakbackup:3388
 #, c-format
 msgid "Path To Restore To"
 msgstr "Llwybr i Adfer Iddo"
 
-#: standalone/drakbackup:3115
+#: standalone/drakbackup:3109
 #, 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 "
 "yn unig )"
 
-#: standalone/drakbackup:3117
+#: standalone/drakbackup:3111
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Tynnu cyfeiriaduron defnyddiwr cyn adfer."
 
-#: standalone/drakbackup:3201
+#: standalone/drakbackup:3196
 #, 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:3204
+#: standalone/drakbackup:3199
 #, c-format
 msgid "Search Backups"
 msgstr "Chwilio Copïau wrth Gefn"
 
-#: standalone/drakbackup:3223
+#: standalone/drakbackup:3217
 #, c-format
 msgid "No matches found..."
 msgstr "Heb ganfod cydweddiad..."
 
-#: standalone/drakbackup:3227
+#: standalone/drakbackup:3221
 #, c-format
 msgid "Restore Selected"
 msgstr "Adfer y Dewis"
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3356
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -18365,7 +19043,7 @@ msgstr ""
 "Cliciwch dyddiad/amser i weld ffeiliau wrth gefn.\n"
 "Clicio+Ctr; ffeiliau i ddewis ffeiliau niferus."
 
-#: standalone/drakbackup:3368
+#: standalone/drakbackup:3362
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18374,7 +19052,7 @@ msgstr ""
 "Adfer Cofnod\n"
 "Catalog Ddewiswyd"
 
-#: standalone/drakbackup:3377
+#: standalone/drakbackup:3371
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18383,17 +19061,17 @@ msgstr ""
 "Adfer y Dewis\n"
 "Ffeiliau"
 
-#: standalone/drakbackup:3454
+#: standalone/drakbackup:3448
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Heb ganfod y  ffeiliau wrth gefn yn %s."
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid "Restore From CD"
 msgstr "Adfer o'r CD"
 
-#: standalone/drakbackup:3467
+#: standalone/drakbackup:3461
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18402,17 +19080,17 @@ msgstr ""
 "Rhowch yr CD gyda label cynnwys%s\n"
 "yn yr gyrrwr CD o dan bwynt gosod /mnt/cdrom"
 
-#: standalone/drakbackup:3469
+#: standalone/drakbackup:3463
 #, 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:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid "Restore From Tape"
 msgstr "Adfer o Dâp"
 
-#: standalone/drakbackup:3479
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18421,218 +19099,218 @@ msgstr ""
 "Rhowch y tâp gyda label cynnwys%s\n"
 "yn yr gyrrwr tâp %s"
 
-#: standalone/drakbackup:3481
+#: standalone/drakbackup:3475
 #, 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:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network"
 msgstr "Adfer drwy'r Rhwydwaith"
 
-#: standalone/drakbackup:3492
+#: standalone/drakbackup:3486
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Adfer drwy Protocol Rhwydwaith: %s"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3487
 #, c-format
 msgid "Host Name"
 msgstr "Enw Gwesteiwr"
 
-#: standalone/drakbackup:3494
+#: standalone/drakbackup:3488
 #, c-format
 msgid "Host Path or Module"
 msgstr "Llwybr Gwesteiwr neu Fodiwl "
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3495
 #, c-format
 msgid "Password required"
 msgstr "Mae angen cyfrinair"
 
-#: standalone/drakbackup:3507
+#: standalone/drakbackup:3501
 #, c-format
 msgid "Username required"
 msgstr "Mae angen enw defnyddiwr"
 
-#: standalone/drakbackup:3510
+#: standalone/drakbackup:3504
 #, c-format
 msgid "Hostname required"
 msgstr "Mae angen enw gwesteiwr"
 
-#: standalone/drakbackup:3515
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Path or Module required"
 msgstr "Llwybr neu Fodiwl angenrheidiol"
 
-#: standalone/drakbackup:3528
+#: standalone/drakbackup:3522
 #, c-format
 msgid "Files Restored..."
 msgstr "Adferwyd ffeiliau..."
 
-#: standalone/drakbackup:3531
+#: standalone/drakbackup:3525
 #, c-format
 msgid "Restore Failed..."
 msgstr "Methodd Adfer..."
 
-#: standalone/drakbackup:3549
+#: standalone/drakbackup:3543
 #, c-format
 msgid "%s not retrieved..."
 msgstr "Heb ail estyn %s..."
 
-#: standalone/drakbackup:3748 standalone/drakbackup:3817
+#: standalone/drakbackup:3765 standalone/drakbackup:3834
 #, c-format
 msgid "Search for files to restore"
 msgstr "Chwilio am ffeiliau i'w hadfer"
 
-#: standalone/drakbackup:3752
+#: standalone/drakbackup:3769
 #, c-format
 msgid "Restore all backups"
 msgstr "Adfer pob cadw wrth gefn"
 
-#: standalone/drakbackup:3760
+#: standalone/drakbackup:3777
 #, c-format
 msgid "Custom Restore"
 msgstr "Adfer Dewisol"
 
-#: standalone/drakbackup:3764 standalone/drakbackup:3813
+#: standalone/drakbackup:3781 standalone/drakbackup:3830
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Adfer o'r Catalog"
 
-#: standalone/drakbackup:3785
+#: standalone/drakbackup:3802
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Methu canfod cadw wrth gefn i'w hadfer...\n"
 
-#: standalone/drakbackup:3786
+#: standalone/drakbackup:3803
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Gwirio mai %s yw'r llwybr cywir"
 
-#: standalone/drakbackup:3787
+#: standalone/drakbackup:3804
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " ac mae'r CD yn y gyrrwr"
 
-#: standalone/drakbackup:3789
+#: standalone/drakbackup:3806
 #, 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:3805
+#: standalone/drakbackup:3822
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD yn ei le - ewch ymlaen"
 
-#: standalone/drakbackup:3810
+#: standalone/drakbackup:3827
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Pori i'r ystorfa newydd adferwyd"
 
-#: standalone/drakbackup:3811
+#: standalone/drakbackup:3828
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Cyfeiriadur i Adfer Ohono"
 
-#: standalone/drakbackup:3847
+#: standalone/drakbackup:3864
 #, c-format
 msgid "Restore Progress"
 msgstr "Adfer Cynnydd"
 
-#: standalone/drakbackup:3898 standalone/drakbackup:3971
-#: standalone/logdrake:174
+#: standalone/drakbackup:3919 standalone/drakbackup:3992
+#: standalone/logdrake:173
 #, c-format
 msgid "Save"
 msgstr "Gorffen"
 
-#: standalone/drakbackup:3954
+#: standalone/drakbackup:3975
 #, c-format
 msgid "Build Backup"
 msgstr "Adeiladu Cadw wrth Gefn"
 
-#: standalone/drakbackup:3987 standalone/drakbackup:4307
+#: standalone/drakbackup:4008 standalone/drakbackup:4328
 #, c-format
 msgid "Restore"
 msgstr "Adfer"
 
-#: standalone/drakbackup:4075
+#: standalone/drakbackup:4096
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Mae'r pecynnau canlynol angen eu gosod:\n"
 
-#: standalone/drakbackup:4102
+#: standalone/drakbackup:4123
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Dewiswch y data i'w adfer..."
 
-#: standalone/drakbackup:4142
+#: standalone/drakbackup:4163
 #, c-format
 msgid "Backup system files"
 msgstr "Ffeiliau System Cadw wrth Gefn"
 
-#: standalone/drakbackup:4145
+#: standalone/drakbackup:4166
 #, c-format
 msgid "Backup user files"
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn"
 
-#: standalone/drakbackup:4148
+#: standalone/drakbackup:4169
 #, c-format
 msgid "Backup other files"
 msgstr "Cadw'r ffeiliau eraill wrth gefn"
 
-#: standalone/drakbackup:4151 standalone/drakbackup:4185
+#: standalone/drakbackup:4172 standalone/drakbackup:4206
 #, c-format
 msgid "Total Progress"
 msgstr "Cyfanswm Cynydd"
 
-#: standalone/drakbackup:4177
+#: standalone/drakbackup:4198
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Anfon ffeiliau drwy FTP"
 
-#: standalone/drakbackup:4180
+#: standalone/drakbackup:4201
 #, c-format
 msgid "Sending files..."
 msgstr "Anfon ffeiliau..."
 
-#: standalone/drakbackup:4250
+#: standalone/drakbackup:4271
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Cadwch wrth Gefn eich ffeiliau ffurfweddu"
 
-#: standalone/drakbackup:4255
+#: standalone/drakbackup:4276
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Edrych ar Ffurfweddiad Cadw wrth Gefn"
 
-#: standalone/drakbackup:4281
+#: standalone/drakbackup:4302
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Ffurfweddiad y Dewin"
 
-#: standalone/drakbackup:4286
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Ffurfweddiad Uwch"
 
-#: standalone/drakbackup:4291
+#: standalone/drakbackup:4312
 #, c-format
 msgid "View Configuration"
 msgstr "Edrych ar Ffurfweddiad"
 
-#: standalone/drakbackup:4295
+#: standalone/drakbackup:4316
 #, c-format
 msgid "View Last Log"
 msgstr "Darllen y Cofnod Olaf"
 
-#: standalone/drakbackup:4300
+#: standalone/drakbackup:4321
 #, c-format
 msgid "Backup Now"
 msgstr "Cadw wrth Gefn Nawr"
 
-#: standalone/drakbackup:4304
+#: standalone/drakbackup:4325
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18641,56 +19319,56 @@ msgstr ""
 "Ni chanfyddwyd y ffeil ffurfweddu \n"
 "cliciwch Dewin neu Uwch."
 
-#: standalone/drakbackup:4324 standalone/drakbackup:4327
+#: standalone/drakbackup:4345 standalone/drakbackup:4348
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "Dewis themâu cychwyn graffigol"
 
-#: standalone/drakboot:58
+#: standalone/drakboot:64
 #, c-format
 msgid "System mode"
 msgstr "Modd system"
 
-#: standalone/drakboot:68 standalone/drakfloppy:46 standalone/harddrake2:103
-#: standalone/harddrake2:104 standalone/logdrake:71
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:152
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
+#: standalone/harddrake2:172 standalone/logdrake:70
+#: standalone/printerdrake:156 standalone/printerdrake:157
+#: standalone/printerdrake:158
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/logdrake:77
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/logdrake:76
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Ffeil/_Gadael"
 
-#: standalone/drakboot:69 standalone/drakfloppy:47 standalone/harddrake2:104
-#: standalone/logdrake:77 standalone/printerdrake:152
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
+#: standalone/logdrake:76 standalone/printerdrake:158
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: standalone/drakboot:139
+#: standalone/drakboot:148
 #, c-format
 msgid "Install themes"
 msgstr "Gosod themâu"
 
-#: standalone/drakboot:140
+#: standalone/drakboot:149
 #, c-format
 msgid "Create new theme"
 msgstr "Creu thema newydd"
 
-#: standalone/drakboot:152
+#: standalone/drakboot:161
 #, c-format
 msgid "Use graphical boot"
 msgstr "Defnyddio cychwyn graffigol"
 
-#: standalone/drakboot:157
+#: standalone/drakboot:166
 #, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
@@ -18699,12 +19377,17 @@ msgstr ""
 "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:164
+#: standalone/drakboot:167
+#, fuzzy, c-format
+msgid "Do you want to configure it now?"
+msgstr "Ydych chi eisiau profi'r ffurfweddiad?"
+
+#: standalone/drakboot:177
 #, c-format
 msgid "Theme"
 msgstr "Thema"
 
-#: standalone/drakboot:167
+#: standalone/drakboot:180
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18713,155 +19396,131 @@ msgstr ""
 "Dangos thema\n"
 "yn y consol"
 
-#: standalone/drakboot:176
+#: standalone/drakboot:189
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Cychwyn yr amgylchedd graffigol wrth gychwyn eich system"
 
-#: standalone/drakboot:184
+#: standalone/drakboot:197
 #, c-format
 msgid "No, I don't want autologin"
 msgstr "Na, dydw i ddim eisiau awtomewngofnodi"
 
-#: standalone/drakboot:185
+#: standalone/drakboot:198
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Iawn, rwyf eisiau awtomewngofnodi gyda (defnyddiwr, bwrdd gwaith)"
 
-#: standalone/drakboot:191
+#: standalone/drakboot:201
 #, c-format
 msgid "Default user"
 msgstr "Defnyddiwr rhagosodedig"
 
-#: standalone/drakboot:192
+#: standalone/drakboot:202
 #, c-format
 msgid "Default desktop"
 msgstr "Bwrdd gwaith rhagosodedig"
 
-#: standalone/drakboot:256
-#, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "Mae gosod %s wedi methu. Digwyddodd y gwall canlynol:"
-
-#: standalone/drakbug:40
+#: standalone/drakboot:310
 #, c-format
 msgid ""
-"To submit a bug report, click on the button report.\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."
+"Please choose a video mode, it will be applied to each of the boot entries "
+"selected below.\n"
+"Be sure your video card supports the mode you choose."
 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."
 
-#: standalone/drakbug:48
-#, c-format
-msgid "Mandrake Bug Report Tool"
+#: standalone/drakbug:41
+#, fuzzy, c-format
+msgid "Mandrakelinux Bug Report Tool"
 msgstr "Offeryn Adrodd Gwall Mandrake"
 
-#: standalone/drakbug:53
+#: standalone/drakbug:46
 #, c-format
-msgid "Mandrake Control Center"
-msgstr "Canolfan Rheoli Mandrake"
+msgid "Mandrakelinux Control Center"
+msgstr "Canolfan Rheoli Mandrakelinux"
 
-#: standalone/drakbug:55
+#: standalone/drakbug:48
 #, c-format
 msgid "Synchronization tool"
 msgstr "Offeryn Cydamseru"
 
-#: standalone/drakbug:56 standalone/drakbug:70 standalone/drakbug:204
-#: standalone/drakbug:206 standalone/drakbug:210
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
+#: standalone/drakbug:178 standalone/drakbug:182
 #, c-format
 msgid "Standalone Tools"
 msgstr "Offer Unigol"
 
-#: standalone/drakbug:57
+#: standalone/drakbug:50
 #, c-format
 msgid "HardDrake"
 msgstr "HardDrake"
 
-#: standalone/drakbug:58
+#: standalone/drakbug:51
 #, c-format
-msgid "Mandrake Online"
-msgstr "Mandrake Online"
+msgid "Mandrakeonline"
+msgstr "Mandrakeonline"
 
-#: standalone/drakbug:59
+#: standalone/drakbug:52
 #, c-format
 msgid "Menudrake"
 msgstr "Menudrake"
 
-#: standalone/drakbug:60
+#: standalone/drakbug:53
 #, c-format
 msgid "Msec"
 msgstr "Msec"
 
-#: standalone/drakbug:61
+#: standalone/drakbug:54
 #, c-format
 msgid "Remote Control"
 msgstr "Rheoli o Bell"
 
-#: standalone/drakbug:62
+#: standalone/drakbug:55
 #, c-format
 msgid "Software Manager"
 msgstr "Rheolwr Meddalwedd"
 
-#: standalone/drakbug:63
+#: standalone/drakbug:56
 #, c-format
 msgid "Urpmi"
 msgstr "Urpmi"
 
-#: standalone/drakbug:64
+#: standalone/drakbug:57
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Offeryn Trosglwyddo o Windows"
 
-#: standalone/drakbug:65
+#: standalone/drakbug:58
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: standalone/drakbug:66
+#: standalone/drakbug:59
 #, c-format
 msgid "Configuration Wizards"
 msgstr "Dewin Ffurfweddu"
 
-#: standalone/drakbug:84
-#, c-format
-msgid ""
-"To submit a bug report, click the report button, which will open your "
-"default browser\n"
-"to Anthill where you will be able to upload the above information as a bug "
-"report."
-msgstr ""
-"I gyflwyno adroddiad gwall, cliciwch ar y botwm adroddiad. Bydd hyn yn agor "
-"ffenestr\n"
-"porwr gwe i Anthill lle bydd modd i chi drosglwyddo'r wybodaeth fel neges "
-"gwall."
-
-#: standalone/drakbug:102
+#: standalone/drakbug:83
 #, c-format
 msgid "Application:"
 msgstr "Rhaglen"
 
-#: standalone/drakbug:103 standalone/drakbug:115
+#: standalone/drakbug:84 standalone/drakbug:96
 #, c-format
 msgid "Package: "
 msgstr "Pecynnau"
 
-#: standalone/drakbug:104
+#: standalone/drakbug:85
 #, c-format
 msgid "Kernel:"
 msgstr "Kernel:"
 
-#: standalone/drakbug:105 standalone/drakbug:116
+#: standalone/drakbug:86 standalone/drakbug:97
 #, c-format
 msgid "Release: "
 msgstr "Ryddhad"
 
-#: standalone/drakbug:110
+#: standalone/drakbug:91
 #, c-format
 msgid ""
 "Application Name\n"
@@ -18870,117 +19529,131 @@ msgstr ""
 "Enw Rhaglen\n"
 "neu Lwybr Llawn:"
 
-#: standalone/drakbug:113
+#: standalone/drakbug:94
 #, c-format
 msgid "Find Package"
 msgstr "Canfod Pecyn"
 
-#: standalone/drakbug:117
+#: standalone/drakbug:98
 #, c-format
 msgid "Summary: "
 msgstr "Crynodeb:"
 
-#: standalone/drakbug:129
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "EICH TESTUN YMA"
-
-#: standalone/drakbug:132
+#: standalone/drakbug:104
 #, c-format
 msgid "Bug Description/System Information"
 msgstr "Disgrifiad Gwall/Gwybodaeth am y System"
 
-#: standalone/drakbug:136
+#: 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:137
+#: standalone/drakbug:109
 #, c-format
 msgid "Submit cpuinfo"
 msgstr "Cyflwyno cpuinfo"
 
-#: standalone/drakbug:138
+#: standalone/drakbug:110
 #, c-format
 msgid "Submit lspci"
 msgstr "Cyflwyno Ispci"
 
-#: standalone/drakbug:159
+#: standalone/drakbug:124
+#, 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."
+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."
+
+#: standalone/drakbug:130
 #, c-format
 msgid "Report"
 msgstr "Adroddiad"
 
-#: standalone/drakbug:219
+#: standalone/drakbug:191
 #, c-format
 msgid "Not installed"
 msgstr "Heb ei osod"
 
-#: standalone/drakbug:231
+#: standalone/drakbug:203
 #, c-format
 msgid "Package not installed"
 msgstr "Pecyn heb ei osod"
 
-#: standalone/drakbug:248
+#: standalone/drakbug:220
 #, c-format
 msgid "NOT FOUND"
 msgstr "HEB GANFOD"
 
-#: standalone/drakbug:259
+#: standalone/drakbug:227
 #, c-format
-msgid "connecting to %s ..."
+msgid "connecting to %s..."
 msgstr "cysylltu â %s..."
 
-#: standalone/drakbug:267
+#: standalone/drakbug:235
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Dim porwr ar gael! Gosodwch un"
 
-#: standalone/drakbug:286
+#: standalone/drakbug:254
 #, c-format
 msgid "Please enter a package name."
 msgstr "Rhowch enw'r pecyn."
 
-#: standalone/drakbug:292
+#: standalone/drakbug:260
 #, c-format
 msgid "Please enter summary text."
 msgstr "Rhowch destun crynodeb yma."
 
-#: standalone/drakclock:29
+#: standalone/drakclock:30
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:39
+#: standalone/drakclock:40
 #, c-format
 msgid "not defined"
 msgstr "heb ddiffinio"
 
-#: standalone/drakclock:41
+#: standalone/drakclock:42
 #, c-format
 msgid "Change Time Zone"
 msgstr "Newid Cylchedd Amser"
 
-#: standalone/drakclock:45
+#: standalone/drakclock:46
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Cylchfa Amser - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - DrakClock"
 
-#: standalone/drakclock:47
+#: standalone/drakclock:48
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "A yw eich cloc caledwedd wedi ei osod i GMT?"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:76
 #, c-format
 msgid "Network Time Protocol"
 msgstr "Protocol Amser Rhwydwaith"
 
-#: standalone/drakclock:81
+#: standalone/drakclock:78
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -18989,50 +19662,55 @@ msgstr ""
 "Mae eich cyfrifiadur yn gallu cydweddu ei gloc\n"
 " gyda gweinydd pell drwy NTP"
 
-#: standalone/drakclock:82
+#: standalone/drakclock:79
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Galluogi Protocol Amser Rhwydwaith"
 
-#: standalone/drakclock:90
+#: standalone/drakclock:87
 #, c-format
 msgid "Server:"
 msgstr "Gweinydd:"
 
-#: standalone/drakclock:137 standalone/drakclock:149
+#: standalone/drakclock:125
+#, c-format
+msgid "Could not synchronize with %s."
+msgstr ""
+
+#: standalone/drakclock:147 standalone/drakclock:157
 #, c-format
 msgid "Reset"
 msgstr "Ailosod"
 
-#: standalone/drakclock:214
+#: standalone/drakclock:225
 #, c-format
 msgid ""
 "We need to install ntp package\n"
 " to enable Network Time Protocol\n"
 "\n"
-"Do you want to install ntp ?"
+"Do you want to install ntp?"
 msgstr ""
 "Mae angen gosdod pecyn ntp\n"
 " i alluogi Protocol Amser Rhwydwaith\n"
 "\n"
 "Hoffech chi osod ntp?"
 
-#: standalone/drakconnect:81
+#: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Ffurfweddiad y rhwydwaith (%d addasydd)"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Gateway:"
 msgstr "Mynedfa:"
 
-#: standalone/drakconnect:92 standalone/drakconnect:751
+#: standalone/drakconnect:96 standalone/drakconnect:787
 #, c-format
 msgid "Interface:"
 msgstr "Rhyngwyneb:"
 
-#: standalone/drakconnect:96 standalone/net_monitor:106
+#: standalone/drakconnect:100 standalone/net_monitor:122
 #, c-format
 msgid "Wait please"
 msgstr "Arhoswch"
@@ -19042,12 +19720,8 @@ msgstr "Arhoswch"
 msgid "Interface"
 msgstr "Rhyngwyneb"
 
-#: standalone/drakconnect:116 standalone/drakups:233
-#, c-format
-msgid "Driver"
-msgstr "Gyrrwr"
-
-#: standalone/drakconnect:116
+#: standalone/drakconnect:116 standalone/printerdrake:218
+#: standalone/printerdrake:225
 #, c-format
 msgid "State"
 msgstr "Stad"
@@ -19062,7 +19736,7 @@ msgstr "Enw gwesteiwr:"
 msgid "Configure hostname..."
 msgstr "Ffurfweddu enw gwestai"
 
-#: standalone/drakconnect:149 standalone/drakconnect:792
+#: standalone/drakconnect:149 standalone/drakconnect:843
 #, c-format
 msgid "LAN configuration"
 msgstr "Ffurfweddiad y Rhwydwaith Lleol"
@@ -19072,8 +19746,8 @@ msgstr "Ffurfweddiad y Rhwydwaith Lleol"
 msgid "Configure Local Area Network..."
 msgstr "Ffurfweddu'r Rhwydwaith Lleol..."
 
-#: standalone/drakconnect:162 standalone/drakconnect:240
-#: standalone/drakconnect:244
+#: standalone/drakconnect:162 standalone/drakconnect:246
+#: standalone/drakconnect:250
 #, c-format
 msgid "Apply"
 msgstr "Gosod"
@@ -19083,107 +19757,113 @@ msgstr "Gosod"
 msgid "Manage connections"
 msgstr "Rheoli cysylltiadau"
 
-#: standalone/drakconnect:218
+#: standalone/drakconnect:224
 #, c-format
 msgid "Device selected"
 msgstr "Dewiswyd y ddyfais"
 
-#: standalone/drakconnect:314
+#: standalone/drakconnect:305
 #, c-format
 msgid "IP configuration"
 msgstr "Ffurfweddiad IP"
 
-#: standalone/drakconnect:351
+#: standalone/drakconnect:342
 #, c-format
 msgid "DNS servers"
 msgstr "Gweinydd DNS"
 
-#: standalone/drakconnect:359
+#: standalone/drakconnect:350
 #, c-format
 msgid "Search Domain"
 msgstr "Chwilio Parth"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "static"
 msgstr "statig"
 
-#: standalone/drakconnect:367
+#: standalone/drakconnect:358
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:493
+#: standalone/drakconnect:436
+#, fuzzy, c-format
+msgid "Metric"
+msgstr "cyfyngu"
+
+#: standalone/drakconnect:491
 #, c-format
 msgid "Flow control"
 msgstr "Rheolwr llif"
 
-#: standalone/drakconnect:494
+#: standalone/drakconnect:492
 #, c-format
 msgid "Line termination"
 msgstr "Terfyn llinell"
 
-#: standalone/drakconnect:505
+#: standalone/drakconnect:503
 #, c-format
 msgid "Modem timeout"
 msgstr "Goramser modem"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:507
 #, c-format
 msgid "Use lock file"
 msgstr "Dewiswch ffeil clo"
 
-#: standalone/drakconnect:511
+#: standalone/drakconnect:509
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Arhoswch am y tôn deialu cyn deialu"
 
-#: standalone/drakconnect:514
+#: standalone/drakconnect:512
 #, c-format
 msgid "Busy wait"
 msgstr "Prysur arhoswch"
 
-#: standalone/drakconnect:519
+#: standalone/drakconnect:517
 #, c-format
 msgid "Modem sound"
 msgstr "Sain modem"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Enable"
 msgstr "Galluogi"
 
-#: standalone/drakconnect:520
+#: standalone/drakconnect:518
 #, c-format
 msgid "Disable"
 msgstr "Analluogi"
 
-#: standalone/drakconnect:571 standalone/harddrake2:62
+#: standalone/drakconnect:569 standalone/harddrake2:45
 #, c-format
 msgid "Media class"
 msgstr "Dosbarth y cyfrwng"
 
-#: standalone/drakconnect:572 standalone/drakfloppy:141
+#: standalone/drakconnect:570 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Enw'r modiwl"
 
-#: standalone/drakconnect:573
+#: standalone/drakconnect:571
 #, c-format
 msgid "Mac Address"
 msgstr "Cyfeiriad Mac"
 
-#: standalone/drakconnect:574 standalone/harddrake2:21
+#: standalone/drakconnect:572 standalone/harddrake2:23
+#: standalone/harddrake2:104
 #, c-format
 msgid "Bus"
 msgstr "Bws"
 
-#: standalone/drakconnect:575 standalone/harddrake2:29
+#: standalone/drakconnect:573 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Lleoliad ar y bws"
 
-#: standalone/drakconnect:645 standalone/drakgw:248 standalone/drakpxe:138
+#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -19192,20 +19872,20 @@ msgstr ""
 "Nid oes addasydd rhwydwaith ethernet wedi ei ganfod ar eich system. Rhedwch "
 "yr offeryn ffurfweddu caledwedd."
 
-#: standalone/drakconnect:651
+#: standalone/drakconnect:678
 #, c-format
 msgid "Remove a network interface"
 msgstr "Tynnu rhyngwyneb rhwydwaith"
 
-#: standalone/drakconnect:655
+#: standalone/drakconnect:682
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Dewis y rhyngwyneb rhwydwaith i'w dynnu:"
 
-#: standalone/drakconnect:679
+#: standalone/drakconnect:713
 #, c-format
 msgid ""
-"An error occured while deleting the \"%s\" network interface:\n"
+"An error occurred while deleting the \"%s\" network interface:\n"
 "\n"
 "%s"
 msgstr ""
@@ -19213,53 +19893,53 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:681
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
-"Congratulations, the \"%s\" network interface has been succesfully deleted"
+"Congratulations, the \"%s\" network interface has been successfully deleted"
 msgstr "Llongyfarchiadau, dilëwyd rhyngwyneb \"%s\" yn llwyddiannus"
 
-#: standalone/drakconnect:698
+#: standalone/drakconnect:732
 #, c-format
-msgid "No Ip"
-msgstr "Dim Ip"
+msgid "No IP"
+msgstr "Dim IP"
 
-#: standalone/drakconnect:699
+#: standalone/drakconnect:733
 #, c-format
 msgid "No Mask"
 msgstr "Dim Mask"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "up"
 msgstr "fyny"
 
-#: standalone/drakconnect:700 standalone/drakconnect:863
+#: standalone/drakconnect:734 standalone/drakconnect:914
 #, c-format
 msgid "down"
 msgstr "lawr"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Connected"
 msgstr "Wedi cysylltu"
 
-#: standalone/drakconnect:741 standalone/net_monitor:419
+#: standalone/drakconnect:777 standalone/net_monitor:468
 #, c-format
 msgid "Not connected"
 msgstr "Heb gysylltu"
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Disconnect..."
 msgstr "Datgysylltu..."
 
-#: standalone/drakconnect:743
+#: standalone/drakconnect:779
 #, c-format
 msgid "Connect..."
 msgstr "Cysylltu..."
 
-#: standalone/drakconnect:772
+#: standalone/drakconnect:808
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19268,17 +19948,17 @@ msgstr ""
 "Rhybudd, mae cysylltiad arall gyda'r rhyngrwyd wedi ei ganfod, efallai'n "
 "defnyddio eich rhwydwaith."
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Deactivate now"
 msgstr "Dad weithredu nawr"
 
-#: standalone/drakconnect:788
+#: standalone/drakconnect:839
 #, c-format
 msgid "Activate now"
 msgstr "Cychwyn nawr"
 
-#: standalone/drakconnect:796
+#: standalone/drakconnect:847
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19288,82 +19968,103 @@ msgstr ""
 "eu ffurfweddio. Ffurfweddwch nhw'n gyntaf\n"
 "drwy glicio ar 'Ffurfweddu'"
 
-#: standalone/drakconnect:810
+#: standalone/drakconnect:861
 #, c-format
 msgid "LAN Configuration"
 msgstr "Ffurfweddiad Rhwydwaith Lleol (LAN)"
 
-#: standalone/drakconnect:822
+#: standalone/drakconnect:873
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Addasydd %s: %s"
 
-#: standalone/drakconnect:831
+#: standalone/drakconnect:882
 #, c-format
 msgid "Boot Protocol"
 msgstr "Protocol Cychwyn"
 
-#: standalone/drakconnect:832
+#: standalone/drakconnect:883
 #, c-format
 msgid "Started on boot"
 msgstr "Cychwyn y peiriant"
 
-#: standalone/drakconnect:868
+#: standalone/drakconnect:919
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
-"Run the \"Add an interface\" assistant from the Mandrake Control Center"
+"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 "
 "Mandrake"
 
-#. -PO: here "Internet access" should be translated the same was as in control-center
-#: standalone/drakconnect:923
-#, c-format
+#. -PO: here "Add Connection" should be translated the same was as in control-center
+#: standalone/drakconnect:974 standalone/net_applet:46
+#, fuzzy, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
-"Please run \"Internet access\" in control center."
+"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
 msgstr ""
-"Nid oes gennych cysylltiad ffurfweddedig â'r Rhyngrwyd.\n"
-"Cliciwch \"Mynediad rhyngrwyd\" yn y ganolfan reoli'"
+"Nid yw'r rhag wyneb hwn wedi ei ffurfweddu eto.\n"
+"Cychwynnwch y cynorthwy-ydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
+"Mandrake"
 
-#: standalone/drakconnect:931
+#: standalone/drakconnect:982
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Ffurfweddiad cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakconnect:949
+#: standalone/drakconnect:1000
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Trydydd gweinydd DNS (dewisol)"
 
-#: standalone/drakconnect:971
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Ffurfweddu Cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakconnect:972
+#: standalone/drakconnect:1023
 #, c-format
 msgid "Internet access"
 msgstr "Mynediad i'r Rhyngrwyd"
 
-#: standalone/drakconnect:974 standalone/net_monitor:88
+#: standalone/drakconnect:1025 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Math o gyswllt:"
 
-#: standalone/drakconnect:977
+#: standalone/drakconnect:1028
 #, c-format
 msgid "Status:"
 msgstr "Statws"
 
-#: standalone/drakedm:53
+#: standalone/drakedm:34
+#, c-format
+msgid "GDM (GNOME Display Manager)"
+msgstr "GDM (rheolwr arddangos GNOME)"
+
+#: standalone/drakedm:35
+#, c-format
+msgid "KDM (KDE Display Manager)"
+msgstr "KDM (rheolwr arddangos KDE)"
+
+#: standalone/drakedm:36
+#, c-format
+msgid "MdkKDM (Mandrakelinux Display Manager)"
+msgstr "MdkKDM (rheolwr arddangos Mandrakelinux)"
+
+#: standalone/drakedm:37
+#, c-format
+msgid "XDM (X Display Manager)"
+msgstr "XDM (rheolwr arddangos X)"
+
+#: standalone/drakedm:55
 #, c-format
 msgid "Choosing a display manager"
 msgstr "Dewis rheolwr arddangos"
 
-#: standalone/drakedm:54
+#: standalone/drakedm:56
 #, c-format
 msgid ""
 "X11 Display Manager allows you to graphically log\n"
@@ -19374,92 +20075,99 @@ msgstr ""
 "i'ch system yn graffigol gyda'r X Windows System yn rhedeg. Mae'n cynnal\n"
 "rhedeg amryw o sesiynau X ar eich cyfrifiadur ar yr un pryd."
 
-#: standalone/drakedm:77
+#: standalone/drakedm:79
 #, c-format
-msgid "The change is done, do you want to restart the dm service ?"
+msgid "The change is done, do you want to restart the dm service?"
 msgstr "Mae'r newid wedi ei gyflawni. Ailgychwyn gwasanaeth dm?"
 
-#: standalone/drakfloppy:40
+#: standalone/drakedm:80
+#, c-format
+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 ""
+
+#: standalone/drakfloppy:41
 #, c-format
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: standalone/drakfloppy:83
+#: standalone/drakfloppy:78
 #, c-format
 msgid "Boot disk creation"
 msgstr "Creu disg cychwyn"
 
-#: standalone/drakfloppy:84
+#: standalone/drakfloppy:79
 #, c-format
 msgid "General"
 msgstr "Cyffredinol"
 
-#: standalone/drakfloppy:87
+#: standalone/drakfloppy:82 standalone/harddrake2:131
 #, c-format
 msgid "Device"
 msgstr "Dyfais"
 
-#: standalone/drakfloppy:93
+#: standalone/drakfloppy:88
 #, c-format
 msgid "Kernel version"
 msgstr "Fersiwn cnewyllyn"
 
-#: standalone/drakfloppy:108
+#: standalone/drakfloppy:103
 #, c-format
 msgid "Preferences"
 msgstr "Dewisiadau"
 
-#: standalone/drakfloppy:122
+#: standalone/drakfloppy:117
 #, c-format
 msgid "Advanced preferences"
 msgstr "Dewisiadau Uwch"
 
-#: standalone/drakfloppy:141
+#: standalone/drakfloppy:136
 #, c-format
 msgid "Size"
 msgstr "Maint"
 
-#: standalone/drakfloppy:144
+#: standalone/drakfloppy:139
 #, c-format
 msgid "Mkinitrd optional arguments"
 msgstr "Ymresymiad dewisol mkinitrd"
 
-#: standalone/drakfloppy:146
+#: standalone/drakfloppy:141
 #, c-format
 msgid "force"
 msgstr "grym"
 
-#: standalone/drakfloppy:147
+#: standalone/drakfloppy:142
 #, c-format
 msgid "omit raid modules"
 msgstr "peidio cynnwys modiwlau raid"
 
-#: standalone/drakfloppy:148
+#: standalone/drakfloppy:143
 #, c-format
 msgid "if needed"
 msgstr "os oes angen"
 
-#: standalone/drakfloppy:149
+#: standalone/drakfloppy:144
 #, c-format
 msgid "omit scsi modules"
 msgstr "peidio cynnwys modiwlau scsi"
 
-#: standalone/drakfloppy:152
+#: standalone/drakfloppy:147
 #, c-format
 msgid "Add a module"
 msgstr "Ychwanegu modiwl"
 
-#: standalone/drakfloppy:161
+#: standalone/drakfloppy:156
 #, c-format
 msgid "Remove a module"
 msgstr "Tynnu modiwl"
 
-#: standalone/drakfloppy:296
+#: 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"
 
-#: standalone/drakfloppy:302
+#: standalone/drakfloppy:297
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -19468,22 +20176,23 @@ msgstr ""
 "Does dim cyfrwng neu mae wedi ei amddiffyn rhag ysgrifennu i'r dyfais %s.\n"
 "Rhowch un i mewn.."
 
-#: standalone/drakfloppy:306
+#: standalone/drakfloppy:301
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Methu fforchio: %s"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Creu disg meddal wedi ei gwblhau"
 
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:304
 #, 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"
 
-#: standalone/drakfloppy:312
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/drakfloppy:309
 #, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -19626,7 +20335,7 @@ msgstr "Rhestr Ffontiau"
 msgid "About"
 msgstr "Ynghylch"
 
-#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
+#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
 #, c-format
 msgid "Uninstall"
 msgstr "Dad osod"
@@ -19636,10 +20345,11 @@ msgstr "Dad osod"
 msgid "Import"
 msgstr "Mewnforio"
 
-#: standalone/drakfont:512
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakfont:514
 #, c-format
 msgid ""
-"Copyright (C) 2001-2002 by MandrakeSoft \n"
+"Copyright (C) 2001-2002 by Mandrakesoft \n"
 "\n"
 "\n"
 "       DUPONT Sebastien (original version)\n"
@@ -19648,7 +20358,7 @@ msgid ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 msgstr ""
-"Hawlfraint (C) 2001-2002  MandrakeSoft \n"
+"Hawlfraint (C) 2001-2002  Mandrakesoft \n"
 "\n"
 "\n"
 "        DUPONT Sebastien sdupont(fersiwn wreiddiol)\n"
@@ -19657,7 +20367,7 @@ msgstr ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:521
+#: standalone/drakfont:523
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -19694,7 +20404,7 @@ msgstr ""
 " Free Software  Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA"
 
-#: standalone/drakfont:537
+#: standalone/drakfont:539
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19724,12 +20434,12 @@ msgstr ""
 "\t  gan Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Trosi ffeiliau ffont i ffontiau afm pfb\n"
 
-#: standalone/drakfont:556
+#: standalone/drakfont:558
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Dewiswch y rhaglenni fydd yn cynnal ffontiau:"
 
-#: standalone/drakfont:557
+#: standalone/drakfont:559
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19744,122 +20454,127 @@ msgstr ""
 "- Gallwch osod y ffontiau yn y dull arferol. Mewn achosion prin, gall "
 "ffontiau ffug rewi Gwasanaethwr X."
 
-#: standalone/drakfont:567
+#: standalone/drakfont:569
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:568
+#: standalone/drakfont:570
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:569
+#: standalone/drakfont:571
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:572
 #, c-format
 msgid "Generic Printers"
 msgstr "Argraffyddion Generig"
 
-#: standalone/drakfont:586
+#: standalone/drakfont:588
 #, 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:587
+#: standalone/drakfont:589
 #, c-format
 msgid "File Selection"
 msgstr "Dewis ffeiliau"
 
-#: standalone/drakfont:600
+#: standalone/drakfont:604
 #, c-format
 msgid "You've not selected any font"
 msgstr "Heb ddewis ffontiau"
 
-#: standalone/drakfont:652
+#: standalone/drakfont:656
 #, c-format
 msgid "Import fonts"
 msgstr "Mewnforio ffontiau"
 
-#: standalone/drakfont:657
+#: standalone/drakfont:661
 #, c-format
 msgid "Install fonts"
 msgstr "Ychwanegu ffontiau"
 
-#: standalone/drakfont:692
+#: standalone/drakfont:696
 #, c-format
 msgid "click here if you are sure."
 msgstr "cliciwch yma os ydych yn siwr."
 
-#: standalone/drakfont:694
+#: standalone/drakfont:698
 #, c-format
 msgid "here if no."
 msgstr "yma os nad."
 
-#: standalone/drakfont:733
+#: standalone/drakfont:737
 #, c-format
 msgid "Unselected All"
 msgstr "Dad ddewis Popeth"
 
-#: standalone/drakfont:736
+#: standalone/drakfont:740
 #, c-format
 msgid "Selected All"
 msgstr "Dewis Popeth"
 
-#: standalone/drakfont:739
+#: standalone/drakfont:743
 #, c-format
 msgid "Remove List"
 msgstr "Rhestr Tynnu"
 
-#: standalone/drakfont:750 standalone/drakfont:769
+#: standalone/drakfont:754 standalone/drakfont:773
 #, c-format
 msgid "Importing fonts"
 msgstr "Mewnforio ffontiau"
 
-#: standalone/drakfont:754 standalone/drakfont:774
+#: standalone/drakfont:758 standalone/drakfont:778
 #, c-format
 msgid "Initial tests"
 msgstr "Prawf Init"
 
-#: standalone/drakfont:755
+#: standalone/drakfont:759
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Copïo'r ffontiau ar eich system!"
 
-#: standalone/drakfont:756
+#: standalone/drakfont:760
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Gosod a throsi ffontiau"
 
-#: standalone/drakfont:757
+#: standalone/drakfont:761
 #, c-format
 msgid "Post Install"
 msgstr "Wedi'r Gosod"
 
-#: standalone/drakfont:775
+#: standalone/drakfont:779
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Tynnu ffontiau oddi ar eich system!"
 
-#: standalone/drakfont:776
+#: standalone/drakfont:780
 #, c-format
 msgid "Post Uninstall"
 msgstr "Wedi'r dad osod"
 
-#: standalone/drakgw:58 standalone/drakgw:193
+#: standalone/drakgw:58 standalone/drakgw:194
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Rhannu Cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakgw:124
+#: standalone/drakgw:114 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."
+
+#: standalone/drakgw:125
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Mae Rhannu Cysylltiad a'r Rhyngrwyd wedi ei analluogi"
 
-#: standalone/drakgw:125
+#: standalone/drakgw:126
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -19872,39 +20587,39 @@ msgstr ""
 "\n"
 "Beth hoffech ei wneud?"
 
-#: standalone/drakgw:129 standalone/drakvpn:127
+#: standalone/drakgw:130 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "galluogi"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "ailffurfweddu"
 
-#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "gwrthod"
 
-#: standalone/drakgw:136
+#: standalone/drakgw:137
 #, c-format
 msgid "Enabling servers..."
 msgstr "Galluogi gweinyddion..."
 
-#: standalone/drakgw:148
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi."
 
-#: standalone/drakgw:151
+#: standalone/drakgw:152
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi"
 
-#: standalone/drakgw:152
+#: standalone/drakgw:153
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -19917,22 +20632,22 @@ msgstr ""
 "\n"
 "Beth hoffech ei wneud?"
 
-#: standalone/drakgw:156 standalone/drakvpn:101
+#: standalone/drakgw:157 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "dymunol"
 
-#: standalone/drakgw:159
+#: standalone/drakgw:160
 #, c-format
 msgid "Disabling servers..."
 msgstr "Analluogi gweinyddion..."
 
-#: standalone/drakgw:174
+#: standalone/drakgw:175
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei analluogi."
 
-#: standalone/drakgw:194
+#: standalone/drakgw:195
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19955,27 +20670,27 @@ msgstr ""
 "Sylwer: bydd angen Addasydd Rhwydwaith un-pwrpas i greu Rhwydwaith Lleol "
 "(LAN)."
 
-#: standalone/drakgw:237
+#: standalone/drakgw:239
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
 
-#: standalone/drakgw:238
+#: standalone/drakgw:240
 #, c-format
 msgid "Interface %s"
 msgstr "Rhagwyneb %s"
 
-#: standalone/drakgw:247 standalone/drakpxe:137
+#: standalone/drakgw:249 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Nid oes addasydd rhwydwaith ar eich system!"
 
-#: standalone/drakgw:254
+#: standalone/drakgw:256
 #, c-format
 msgid "Network interface"
 msgstr "Rhyngwyneb rhwydwaith"
 
-#: standalone/drakgw:255
+#: standalone/drakgw:257
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19990,7 +20705,12 @@ msgstr ""
 "\n"
 "Rwyf ar fin gosod eich Rhwydwaith Lleol gyda'r addasydd hwnnw.."
 
-#: standalone/drakgw:262
+#: standalone/drakgw:263 standalone/drakpxe:142
+#, c-format
+msgid "Choose the network interface"
+msgstr "Dewiswch rhag wyneb  y rhwydwaith"
+
+#: standalone/drakgw:264
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -19999,12 +20719,12 @@ msgstr ""
 "Dewiswch ba addasyddion rhwydwaith fydd yn cael eu cysylltu â'ch Rhwydwaith "
 "Lleol."
 
-#: standalone/drakgw:291
+#: standalone/drakgw:293
 #, c-format
 msgid "Network interface already configured"
 msgstr "Mae rhag wyneb y rhwydwaith wedi ei ffurfweddu eisoes"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:294
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -20020,27 +20740,27 @@ msgstr ""
 "Gallwch ei wneud gyda llaw ond mae'n rhaid i chi wybod beth ydych yn ei "
 "wneud."
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Ail ffurfweddiad awtomatig"
 
-#: standalone/drakgw:297
+#: standalone/drakgw:299
 #, c-format
 msgid "No (experts only)"
 msgstr "Na (arbenigwyr yn unig)"
 
-#: standalone/drakgw:298
+#: standalone/drakgw:300
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Dangoswch y ffurfweddiad rhag wyneb cyfredol"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:301
 #, c-format
 msgid "Current interface configuration"
 msgstr "Ffurfweddiad rhyngwyneb cyfredol"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:302
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -20057,7 +20777,7 @@ msgstr ""
 "Priodweddau IP: %s\n"
 "Gyrrwr: %s"
 
-#: standalone/drakgw:313
+#: standalone/drakgw:315
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -20083,12 +20803,12 @@ msgstr ""
 "Neu, medraf ail ffurfweddu eich rhag wyneb ac (ail)ffurfweddi gweinydd DHCP "
 "ar eich cyfer.\n"
 
-#: standalone/drakgw:320
+#: standalone/drakgw:322
 #, c-format
 msgid "Local Network adress"
 msgstr "Cyfeiriad y Rhwydwaith Lleol "
 
-#: standalone/drakgw:324
+#: standalone/drakgw:326
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -20101,73 +20821,73 @@ msgstr ""
 "Mae modd dewis dewisiadau gwahanol ar gyfer ffurfweddiad DHCP.\n"
 "Os nad ydych yn gwybod ystyr y dewis, gadewch lonydd iddo."
 
-#: standalone/drakgw:328
+#: standalone/drakgw:330
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "Gweinydd DHCP IP (Hwn)"
 
-#: standalone/drakgw:329
+#: standalone/drakgw:331
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Y Gweinydd DHCP IP"
 
-#: standalone/drakgw:330
+#: standalone/drakgw:332
 #, c-format
 msgid "The internal domain name"
 msgstr "Enw'r parth mewnol"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:333
 #, c-format
 msgid "The DHCP start range"
 msgstr "Amrediad cychwyn DHCP"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:334
 #, c-format
 msgid "The DHCP end range"
 msgstr "Amrediad terfyn DHCP"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:335
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Les rhagosodedig (mewn eiliadau)"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:336
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Les fwyaf (mewn eiliadau)"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:337
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Ail ffurfweddi rhag wyneb a gweinydd DHCP"
 
-#: standalone/drakgw:342
+#: standalone/drakgw:344
 #, 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:352
+#: standalone/drakgw:354
 #, 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:362
+#: standalone/drakgw:364
 #, c-format
 msgid "Configuring..."
 msgstr "Ffurfweddu..."
 
-#: standalone/drakgw:363
+#: standalone/drakgw:365
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Ffurfweddi sgriptiau, gosod meddalwedd, cychwyn gweinyddion..."
 
-#: standalone/drakgw:403 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Anhawster wrth osod pecyn %s"
 
-#: standalone/drakgw:599
+#: standalone/drakgw:601
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20184,14 +20904,14 @@ msgstr ""
 #, c-format
 msgid ""
 " drakhelp 0.1\n"
-"Copyright (C) 2003-2004 MandrakeSoft.\n"
+"Copyright (C) 2003-2004 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
-"Hawlfraint (C) 2003-2004 MandrakeSoft.\n"
+"Hawlfraint (C) 2003-2004 Mandrakesoft.\n"
 "Mae hwn yn feddalwedd rhydd ac mae modd ei ailddosbarthu o dan amodau GNU "
 "GPL.\n"
 "\n"
@@ -20219,7 +20939,12 @@ msgstr ""
 " --doc <link>          - cyswllt i dudalen we arall ( ar gyfer blaen croeso  "
 "WM)\n"
 
-#: standalone/drakhelp:35
+#: standalone/drakhelp:36
+#, fuzzy, c-format
+msgid "Mandrakelinux Help Center"
+msgstr "Cychwynnydd cymorth Mandrake"
+
+#: standalone/drakhelp:36
 #, c-format
 msgid ""
 "%s cannot be displayed \n"
@@ -20228,7 +20953,7 @@ msgstr ""
 "Methu dangos %s \n"
 ". Dim cofnod Cymorth o'r fath\n"
 
-#: standalone/drakhelp:41
+#: standalone/drakhelp:42
 #, c-format
 msgid ""
 "No browser is installed on your system, Please install one if you want to "
@@ -20237,42 +20962,42 @@ msgstr ""
 "Does dim porwr ar eich cyfrifiadur. Rhaid gosod un os ydych am archwilio'r "
 "system gymorth."
 
-#: standalone/drakperm:21
+#: standalone/drakperm:22
 #, c-format
 msgid "System settings"
 msgstr "Gosodiadau'r system"
 
-#: standalone/drakperm:22
+#: standalone/drakperm:23
 #, c-format
 msgid "Custom settings"
 msgstr "Gosodiadau addasu"
 
-#: standalone/drakperm:23
+#: standalone/drakperm:24
 #, c-format
 msgid "Custom & system settings"
 msgstr "Gosodiadau addasu a system"
 
-#: standalone/drakperm:43
+#: standalone/drakperm:44
 #, c-format
 msgid "Editable"
 msgstr "Golygadwy"
 
-#: standalone/drakperm:48 standalone/drakperm:318
+#: standalone/drakperm:49 standalone/drakperm:321
 #, c-format
 msgid "Path"
 msgstr "Llwybr"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: standalone/drakperm:48 standalone/drakperm:254
+#: standalone/drakperm:49 standalone/drakperm:250
 #, c-format
 msgid "Group"
 msgstr "Grwp"
 
-#: standalone/drakperm:48 standalone/drakperm:330
+#: standalone/drakperm:49 standalone/drakperm:333
 #, c-format
 msgid "Permissions"
 msgstr "Caniatadau"
@@ -20334,9 +21059,9 @@ msgid "Delete selected rule"
 msgstr "Dileu'r rheol hwn"
 
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
-#: standalone/drakups:350 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:233
+#: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
+#: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit"
 msgstr "Golygu"
@@ -20346,47 +21071,65 @@ msgstr "Golygu"
 msgid "Edit current rule"
 msgstr "Golygu'r rheol bresennol"
 
-#: standalone/drakperm:246
+#: standalone/drakperm:242
 #, c-format
 msgid "browse"
 msgstr "pori"
 
-#: standalone/drakperm:256
+#: standalone/drakperm:247
+#, c-format
+msgid "user"
+msgstr "defnyddiwr"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "group"
+msgstr "grwp"
+
+#: standalone/drakperm:247
+#, c-format
+msgid "other"
+msgstr "arall"
+
+#: standalone/drakperm:252
 #, c-format
 msgid "Read"
 msgstr "Darllen"
 
-#: standalone/drakperm:257
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:255
 #, c-format
 msgid "Enable \"%s\" to read the file"
 msgstr "Galluogi \"%s\" i ddarllen y ffeil"
 
-#: standalone/drakperm:260
+#: standalone/drakperm:259
 #, c-format
 msgid "Write"
 msgstr "Ysgrifennu"
 
-#: standalone/drakperm:261
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:262
 #, c-format
 msgid "Enable \"%s\" to write the file"
 msgstr "Galluogi \"%s\" i ysgrifennu i'r ffeil"
 
-#: standalone/drakperm:264
+#: standalone/drakperm:266
 #, c-format
 msgid "Execute"
 msgstr "Gweithredu"
 
-#: standalone/drakperm:265
+#. -PO: here %s will be either "user", "group" or "other"
+#: standalone/drakperm:269
 #, c-format
 msgid "Enable \"%s\" to execute the file"
 msgstr "Galluogi \"%s\" i weithredu'r ffeil"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid "Sticky-bit"
 msgstr "Sticky-bit"
 
-#: standalone/drakperm:267
+#: standalone/drakperm:272
 #, c-format
 msgid ""
 "Used for directory:\n"
@@ -20396,52 +21139,52 @@ msgstr ""
 " dim ond perchennog y cyfeiriadur neu ffeil yn y cyfeiriadur hwn fydd yn "
 "cael ei ddileu."
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Set-UID"
 msgstr "Set-UID"
 
-#: standalone/drakperm:268
+#: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
 msgstr "Defnyddio enw perchennog i weithredu"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Set-GID"
 msgstr "Set-GID"
 
-#: standalone/drakperm:269
+#: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
 msgstr "Defnyddio enw grwp i weithredu"
 
-#: standalone/drakperm:287 standalone/drakxtv:87
+#: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
-msgid "User :"
+msgid "User:"
 msgstr "Defnyddiwr :"
 
-#: standalone/drakperm:289
+#: standalone/drakperm:292
 #, c-format
-msgid "Group :"
+msgid "Group:"
 msgstr "Grwp :"
 
-#: standalone/drakperm:293
+#: standalone/drakperm:296
 #, c-format
 msgid "Current user"
 msgstr "Derbyn presennol"
 
-#: standalone/drakperm:294
+#: standalone/drakperm:297
 #, c-format
 msgid "When checked, owner and group won't be changed"
 msgstr "Wedi ei dicio, nid fydd y perchennog a'r grwp yn cael ei newid"
 
-#: standalone/drakperm:304
+#: standalone/drakperm:307
 #, c-format
 msgid "Path selection"
 msgstr "Dewis llwybr"
 
-#: standalone/drakperm:324
+#: standalone/drakperm:327
 #, c-format
 msgid "Property"
 msgstr "Eiddo"
@@ -20487,7 +21230,7 @@ msgstr ""
 #, c-format
 msgid "Please choose which network interface will be used for the dhcp server."
 msgstr ""
-"Dewiswch ba ryngwyneb rhwydwaith i'w ddefnyddio ar gyfer y gweinydd dhcp."
+"Dewiswch ba ryngwyneb rhwydwaith i'w ddefnyddio ar gyfer y gweinydd DHCP."
 
 #: standalone/drakpxe:144
 #, c-format
@@ -20568,54 +21311,42 @@ msgstr ""
 msgid "Location of auto_install.cfg file"
 msgstr "Lleoliad ffeil auto_install.cfg"
 
-#: standalone/draksec:44
+#: standalone/draksec:49
 #, c-format
 msgid "ALL"
 msgstr "ALL"
 
-#: standalone/draksec:44
+#: standalone/draksec:50
 #, c-format
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: standalone/draksec:44 standalone/drakvpn:1146
+#: standalone/draksec:53
 #, c-format
-msgid "default"
-msgstr "rhagosodedig"
-
-#: standalone/draksec:44
-#, c-format
-msgid "ignore"
-msgstr "anwybyddu"
+msgid "Ignore"
+msgstr "Anwybyddu"
 
-#: standalone/draksec:44
-#, c-format
-msgid "no"
-msgstr "na"
-
-#: standalone/draksec:44
-#, c-format
-msgid "yes"
-msgstr "iawn"
-
-#. -PO: Do not alter the <span ..> and </span> tags
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words
-#: standalone/draksec:81
+#. -PO: Do not alter the <span ..> and </span> tags.
+#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
+#: standalone/draksec:101
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
 "\n"
 "\n"
-"The Security Administrator is the one who will receive security alerts if "
-"the\n"
-"'Security Alerts' option is set. It can be a username or an email.\n"
+"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+"will receive security alerts if the\n"
+"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+"username or an email.\n"
 "\n"
 "\n"
-"The Security Level menu allows you to select one of the six preconfigured "
-"security levels\n"
-"provided with msec. These levels range from poor security and ease of use, "
-"to\n"
-"paranoid config, suitable for very sensitive server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
+"one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</"
+"span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
+"server applications:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
@@ -20652,17 +21383,17 @@ msgstr ""
 "Dyma'r fan i osod lefel diogelwch a gweinyddiad eich system\n"
 "\n"
 "\n"
-"Y Gweinyddwr Diogelwch yw'r un fydd yn derbyn y rhybuddion diogelwch os "
-"yw'r\n"
-"dewis 'Rhybudd Diogelwch' wedi ei osod. Gall fod yn enw defnyddiwr neu e-"
-"bost.\n"
+"Y '<span weight=\"bold\">Gweinyddwr Diogelwch</span>' yw'r un fydd yn\n"
+"derbyn y rhybuddion diogelwch os yw'r dewis '<span\n"
+"weight=\"bold\">Rhybudd Diogelwch</span>' wedi ei osod. Gall fod yn enw\n"
+"defnyddiwr neu e-bost.\n"
 "\n"
 "\n"
-"Mae'r dewislen Lefel Diogelwch yn caniatáu i chi ddewis un o'r lefelau "
-"diogelwch ragosodedig\n"
-"ddarparwyd gan msec. Mae'r lefelau yn amrywio o ddiogelwch gwan ac hawdd ei "
-"ddefnyddio, i\n"
-"safon paranoia, sy'n addas ar gyfer rhaglenni gwasnaethwr sensitif:\n"
+"Mae'r dewislen 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"
+"safon '<span weight=\"bold\">paranoia</span>', sy'n addas ar gyfer\n"
+"rhaglenni gwasnaethwr sensitif:\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Gwan</span>: Mae'n hollol anniogel ond yn "
@@ -20693,61 +21424,56 @@ msgstr ""
 "blaenorol ond mae'r\n"
 "system yn hollol gaeëdig ac mae'r nodfwediddion diogelwch ar eu heithaf."
 
-#: standalone/draksec:129
+#: standalone/draksec:154 standalone/harddrake2:184
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Disgrifiad y meysydd:\n"
+"\n"
+
+#: standalone/draksec:168
 #, c-format
 msgid "(default value: %s)"
 msgstr "(gwerth rhagosodedig: %s)"
 
-#: standalone/draksec:170
+#: standalone/draksec:210
 #, c-format
 msgid "Security Level:"
 msgstr "Lefel diogelwch:"
 
-#: standalone/draksec:173
-#, c-format
-msgid "Security Alerts:"
-msgstr "Rhybuddion Diogelwch:"
-
-#: standalone/draksec:177
+#: standalone/draksec:217
 #, c-format
 msgid "Security Administrator:"
 msgstr "Gweinyddwr Diogelwch:"
 
-#: standalone/draksec:179
+#: standalone/draksec:219
 #, c-format
 msgid "Basic options"
 msgstr "Dewisiadau Sylfaenol"
 
-#: standalone/draksec:192
-#, c-format
-msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need an explanation, look at the help tooltip.\n"
-msgstr ""
-"Mae modd gosod y dewisiadau canlynol i addasu\n"
-"diogelwch eich system. Os oes arnoch esboniadau, cliciwch ar cymorth.\n"
-
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "Network Options"
 msgstr "Dewisiadau Rhwydwaith"
 
-#: standalone/draksec:194
+#: standalone/draksec:233
 #, c-format
 msgid "System Options"
 msgstr "Dewisiadau System"
 
-#: standalone/draksec:240
+#: standalone/draksec:268
 #, c-format
 msgid "Periodic Checks"
 msgstr "Gwirydd Cyfnodol"
 
-#: standalone/draksec:258
+#: standalone/draksec:299
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Arhoswch, gosod lefel diogelwch..."
 
-#: standalone/draksec:264
+#: standalone/draksec:305
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Arhoswch, gosod dewisiadau diogelwch..."
@@ -20757,7 +21483,8 @@ msgstr "Arhoswch, gosod dewisiadau diogelwch..."
 msgid "No Sound Card detected!"
 msgstr "Heb ganfod Cerdyn Sain!"
 
-#: standalone/draksound:48
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/draksound:50
 #, c-format
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
@@ -20778,7 +21505,7 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/draksound:55
+#: standalone/draksound:57
 #, c-format
 msgid ""
 "\n"
@@ -20918,15 +21645,15 @@ msgstr "Arddangos logo yn y Consol"
 msgid "Make kernel message quiet by default"
 msgstr "Gwneud neges y cnewyllyn yn dawel drwy ragosodiad"
 
-#: standalone/draksplash:161 standalone/draksplash:319
-#: standalone/draksplash:464
+#: standalone/draksplash:161 standalone/draksplash:309
+#: standalone/draksplash:454
 #, c-format
 msgid "Notice"
 msgstr "Nodyn"
 
-#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:161 standalone/draksplash:309
 #, c-format
-msgid "This theme does not yet have a bootsplash in %s !"
+msgid "This theme does not yet have a bootsplash in %s!"
 msgstr "Does gan y thema ddim croeso cychwyn yn %s !"
 
 #: standalone/draksplash:167
@@ -20939,101 +21666,111 @@ msgstr "dewis ymyl"
 msgid "saving Bootsplash theme..."
 msgstr "cadw thema Croeso cychwyn..."
 
-#: standalone/draksplash:445
+#: standalone/draksplash:435
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Dewis lliw ProgressBar"
 
-#: standalone/draksplash:464
+#: standalone/draksplash:454
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Rhaid dewis ffeil delwedd yn gyntaf!"
 
-#: standalone/draksplash:469
+#: standalone/draksplash:459
 #, c-format
-msgid "Generating preview ..."
+msgid "Generating preview..."
 msgstr "Cynhyrchu rhagolwg..."
 
 #. -PO:  First %s is theme name, second %s (in parenthesis) is resolution
-#: standalone/draksplash:515
+#: standalone/draksplash:497
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s Rhagolwg Croeso Cychwyn (%s)"
 
-#: standalone/drakups:63
+#. -PO: Do not alter the <span ..> and </span> tags
+#: standalone/draksplash:503
+#, c-format
+msgid ""
+"The image \"%s\" cannot be load due to the following issue:\n"
+"\n"
+"<span foreground=\"Red\">%s</span>"
+msgstr ""
+
+#: standalone/drakups:74
 #, c-format
 msgid "Connected through a serial port or an usb cable"
 msgstr "Cysylltwyd drwy borth cyfresol neu gebl usb"
 
-#: standalone/drakups:69
+#: standalone/drakups:80
 #, c-format
 msgid "Add an UPS device"
 msgstr "Ychwanegu dyfais UPS"
 
-#: standalone/drakups:72
+#: standalone/drakups:83
 #, c-format
 msgid ""
 "Welcome to the UPS configuration utility.\n"
 "\n"
-"Here, you'll be add a new UPS to your system.\n"
+"Here, you'll add a new UPS to your system.\n"
 msgstr ""
 "Croeso i'r offeryn ffurfweddu UPS\n"
 "\n"
 "Yma bydd modd i chi osod UPS newydd i'r system.\n"
 
-#: standalone/drakups:79
+#: standalone/drakups:90
 #, c-format
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you prefer autodetect UPS devices connected to this machine or  ?"
+"Do you want to autodetect UPS devices connected to this machine or to "
+"manually select them?"
 msgstr ""
 "Rydym am ychwanegu dyfais UPS.\n"
 "\n"
 "Ydi hi'n well gennych awtoganfod dyfeisiadau UPS i'r peiriant neu?"
 
-#: standalone/drakups:82
+#: standalone/drakups:93
 #, c-format
 msgid "Autodetection"
 msgstr "Awtoganfod"
 
-#: standalone/drakups:90 standalone/harddrake2:140
+#: standalone/drakups:101 standalone/harddrake2:211
 #, c-format
 msgid "Detection in progress"
 msgstr "Canfod ar waith"
 
-#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
-#: standalone/logdrake:485
+#: standalone/drakups:120 standalone/drakups:156 standalone/logdrake:449
+#: standalone/logdrake:455
 #, c-format
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
 
-#: standalone/drakups:109
+#: standalone/drakups:121
 #, c-format
 msgid "The wizard successfully added the following UPS devices:"
 msgstr "Mae'r dewin wedi ychwanegu'r dyfeiriau UPS yn llwyddiannus:"
 
-#: standalone/drakups:111
+#: standalone/drakups:123
 #, c-format
 msgid "No new UPS devices was found"
 msgstr "Wedi ganfod dyfais UPS newydd"
 
-#: standalone/drakups:116 standalone/drakups:128
+#: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
 msgstr "Ffurfweddiad gyrrwr UPS"
 
-#: standalone/drakups:116
+#: standalone/drakups:128
 #, c-format
 msgid "Please select your UPS model."
 msgstr "Dewiswch eich model UPS"
 
-#: standalone/drakups:117
+#: standalone/drakups:129
 #, c-format
 msgid "Manufacturer / Model:"
 msgstr "Gwneuthurwr / Model"
 
-#: standalone/drakups:128
+#: standalone/drakups:140
 #, c-format
 msgid ""
 "We are configuring the \"%s\" UPS from \"%s\".\n"
@@ -21042,88 +21779,88 @@ msgstr ""
 "Rydym yn ffurfweddu'r UPS \"%s\" o \"%s\".\n"
 "Rhowch ei enw, gyrrwr a phort."
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "Name:"
 msgstr "Enw:"
 
-#: standalone/drakups:133
+#: standalone/drakups:145
 #, c-format
 msgid "The name of your ups"
 msgstr "Enw eich UPS"
 
-#: standalone/drakups:134
+#: standalone/drakups:146
 #, c-format
-msgid "The driver that manage your ups"
+msgid "The driver that manages your ups"
 msgstr "Y gyrrwr sy'n rheoli eich UPS"
 
-#: standalone/drakups:135
+#: standalone/drakups:147
 #, c-format
 msgid "Port:"
 msgstr "Porth :"
 
-#: standalone/drakups:137
+#: standalone/drakups:149
 #, c-format
 msgid "The port on which is connected your ups"
 msgstr "Y porth sydd wedi ei chysylltu â'ch UPS"
 
-#: standalone/drakups:144
+#: standalone/drakups:156
 #, c-format
 msgid "The wizard successfully configured the new \"%s\" UPS device."
 msgstr "Mae'r dewin wedi ffurfweddu eich dyfais UPS \"%s\"  yn llwyddiannus."
 
-#: standalone/drakups:232
+#: standalone/drakups:246
 #, c-format
 msgid "UPS devices"
 msgstr "Dyfeisiau UPS"
 
-#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
-#: standalone/harddrake2:67
+#: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
+#: standalone/harddrake2:80 standalone/harddrake2:102
 #, c-format
 msgid "Name"
 msgstr "Enw"
 
-#: standalone/drakups:250
+#: standalone/drakups:265
 #, c-format
 msgid "UPS users"
 msgstr "Defnyddwyr UPS"
 
-#: standalone/drakups:265
+#: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
 msgstr "Rhestrau Rheoli Mynediad"
 
-#: standalone/drakups:266
+#: standalone/drakups:282
 #, c-format
 msgid "IP mask"
 msgstr "Masg IP"
 
-#: standalone/drakups:277
+#: standalone/drakups:294
 #, c-format
 msgid "Rules"
 msgstr "Rheolau"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "Action"
 msgstr "Gweithred"
 
-#: standalone/drakups:278 standalone/drakvpn:1146 standalone/harddrake2:61
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
 #, c-format
 msgid "Level"
 msgstr "Lefel"
 
-#: standalone/drakups:278
+#: standalone/drakups:295
 #, c-format
 msgid "ACL name"
 msgstr "Enw ACL"
 
-#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#: standalone/drakups:325 standalone/drakups:329 standalone/drakups:338
 #, c-format
 msgid "DrakUPS"
 msgstr "DrakUPS"
 
-#: standalone/drakups:307
+#: standalone/drakups:335
 #, c-format
 msgid "Welcome to the UPS configuration tools"
 msgstr "Croeso i'r offer ffurfweddu UPS"
@@ -21145,7 +21882,7 @@ msgid ""
 "\n"
 "It's currently enabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Mae gosodiad VPN wedi ei gyflawni.\n"
 "\n"
@@ -21175,7 +21912,7 @@ msgid ""
 "\n"
 "It's currently disabled.\n"
 "\n"
-"What would you like to do ?"
+"What would you like to do?"
 msgstr ""
 "Mae gosodiad cyswllt VPN wedi ei gyflawni.\n"
 "\n"
@@ -21260,7 +21997,7 @@ msgstr "Modiwl cnewyllyn."
 #: standalone/drakvpn:197
 #, c-format
 msgid ""
-"The kernel need to have ipsec support.\n"
+"The kernel needs to have ipsec support.\n"
 "\n"
 "You're running a %s kernel version.\n"
 "\n"
@@ -21290,13 +22027,13 @@ msgstr "Ffeil ffurfweddiad"
 #: standalone/drakvpn:296
 #, c-format
 msgid ""
-"Configuration step !\n"
+"Configuration step!\n"
 "\n"
 "You need to define the Security Policies and then to \n"
 "configure the automatic key exchange (IKE) daemon. \n"
 "The KAME IKE daemon we're using is called 'racoon'.\n"
 "\n"
-"What would you like to configure ?\n"
+"What would you like to configure?\n"
 msgstr ""
 "Cam ffurfweddu !\n"
 "\n"
@@ -21330,12 +22067,12 @@ msgid ""
 "The %s file contents\n"
 "is divided into sections.\n"
 "\n"
-"You can now :\n"
+"You can now:\n"
 "\n"
 "  - display, add, edit, or remove sections, then\n"
 "  - commit the changes\n"
 "\n"
-"What would you like to do ?\n"
+"What would you like to do?\n"
 msgstr ""
 "Mae cynnwys ffeil %s\n"
 "wedi ei rannu yn adrannau.\n"
@@ -21392,7 +22129,7 @@ msgstr "cofnodion ipsec.conf"
 msgid ""
 "The %s file contains different sections.\n"
 "\n"
-"Here is its skeleton :\t'config setup' \n"
+"Here is its skeleton:\t'config setup' \n"
 "\t\t\t\t\t'conn default' \n"
 "\t\t\t\t\t'normal1'\n"
 "\t\t\t\t\t'normal2' \n"
@@ -21429,7 +22166,7 @@ msgstr "normal conn"
 
 #: standalone/drakvpn:382 standalone/drakvpn:423 standalone/drakvpn:510
 #, c-format
-msgid "Exists !"
+msgid "Exists!"
 msgstr "Yn Bodoli!"
 
 #: standalone/drakvpn:383 standalone/drakvpn:424
@@ -21671,7 +22408,7 @@ msgstr "Enw'r adran"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit !"
+msgid "Can't edit!"
 msgstr "Methu golygu!"
 
 #: standalone/drakvpn:591
@@ -21679,14 +22416,14 @@ msgstr "Methu golygu!"
 msgid ""
 "You cannot edit this section.\n"
 "\n"
-"This section is mandatory for Freswan 2.X.\n"
+"This section is mandatory for Freeswan 2.X.\n"
 "One has to specify version 2.0 on the top\n"
 "of the %s file, and eventually, disable or\n"
-"enable the oportunistic encryption.\n"
+"enable the opportunistic encryption.\n"
 msgstr ""
 "Nid oes modd golygu'r adran hon.\n"
 "\n"
-"Mae'r adran yn orfodol ar gyfer Freswan 2X.\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"
 "\n"
@@ -21736,7 +22473,7 @@ msgstr ""
 msgid ""
 "Edit a Security Policy.\n"
 "\n"
-"You can now add a Security Policy.\n"
+"You can now edit a Security Policy.\n"
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
@@ -21770,7 +22507,7 @@ msgid ""
 "The racoon.conf file configuration.\n"
 "\n"
 "The contents of this file is divided into sections.\n"
-"You can now :\n"
+"You can now:\n"
 "  - display \t\t (display the file contents)\n"
 "  - add\t\t\t (add one section)\n"
 "  - edit \t\t\t (modify parameters of an existing section)\n"
@@ -21812,7 +22549,7 @@ msgstr "cofnodion racoonf.conf"
 msgid ""
 "The 'add' sections step.\n"
 "\n"
-"Here below is the racoon.conf file skeleton :\n"
+"Here below is the racoon.conf file skeleton:\n"
 "\t'path'\n"
 "\t'remote'\n"
 "\t'sainfo' \n"
@@ -21866,23 +22603,23 @@ msgstr "math o lwybr"
 #: standalone/drakvpn:750
 #, c-format
 msgid ""
-"path include path : specifies a path to include\n"
+"path include path: specifies a path to include\n"
 "a file. See File Inclusion.\n"
 "\tExample: path include '/etc/racoon'\n"
 "\n"
-"path pre_shared_key file : specifies a file containing\n"
+"path pre_shared_key file: specifies a file containing\n"
 "pre-shared key(s) for various ID(s). See Pre-shared key File.\n"
 "\tExample: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"path certificate path : racoon(8) will search this directory\n"
+"path certificate path: racoon(8) will search this directory\n"
 "if a certificate or certificate request is received.\n"
 "\tExample: path certificate '/etc/cert' ;\n"
 "\n"
-"File Inclusion : include file \n"
+"File Inclusion: include file \n"
 "other configuration files can be included.\n"
 "\tExample: include \"remote.conf\" ;\n"
 "\n"
-"Pre-shared key File : Pre-shared key file defines a pair\n"
+"Pre-shared key File: Pre-shared key file defines a pair\n"
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
@@ -22051,7 +22788,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -22097,7 +22834,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -22137,7 +22874,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -22183,7 +22920,7 @@ msgid ""
 "\n"
 "\taddress address [/ prefix] [[port]] ul_proto\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "sainfo anonymous (accepts connections from anywhere)\n"
 "\tleave blank this entry if you want anonymous\n"
@@ -22218,7 +22955,7 @@ msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
 "If you do not require PFS then you can omit this directive.\n"
 "Any proposal will be accepted if you do not specify one.\n"
-"group is one of following: modp768, modp1024, modp1536.\n"
+"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"
@@ -22237,11 +22974,11 @@ msgstr "rhif hyd oes"
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
@@ -22279,18 +23016,18 @@ msgstr "Uned hyd oes"
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
 "posed in the phase 1 negotiations.  Any proposal will be\n"
-"accepted, and the attribute(s) will be not proposed to\n"
+"accepted, and the attribute(s) will not be proposed to\n"
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 30 sec;\n"
 "        lifetime time 60 sec;\n"
-"\tlifetime time 12 hour ;\n"
+"\tlifetime time 12 hour;\n"
 "\n"
 "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
 "'hour'.\n"
@@ -22346,7 +23083,7 @@ msgid ""
 "ments apply to all peers which do not match any other remote\n"
 "directive.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "remote anonymous\n"
 "remote ::1 [8000]"
@@ -22506,7 +23243,7 @@ msgstr "Fy enw"
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
-"type to use in the phase 1 negotiation.  address, fqdn,\n"
+"type to use in the phase 1 negotiation.  address, FQDN,\n"
 "user_fqdn, keyid and asn1dn can be used as an idtype.\n"
 "they are used like:\n"
 "\tmy_identifier address [address];\n"
@@ -22515,7 +23252,7 @@ msgid ""
 "\tmy_identifier user_fqdn string;\n"
 "\t\tthe type is a USER_FQDN (user fully-qualified\n"
 "\t\tdomain name).\n"
-"\tmy_identifier fqdn string;\n"
+"\tmy_identifier FQDN string;\n"
 "\t\tthe type is a FQDN (fully-qualified domain name).\n"
 "\tmy_identifier keyid file;\n"
 "\t\tthe type is a KEY_ID.\n"
@@ -22524,13 +23261,13 @@ msgid ""
 "\t\tstring is omitted, racoon(8) will get DN from\n"
 "\t\tSubject field in the certificate.\n"
 "\n"
-"Examples : \n"
+"Examples: \n"
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
 "pennu'r dynodwr anfonir at y gwesteiwr pell a'r math i'w\n"
 "ddefnyddio wrth negydu rhan 1.Mae modd defnyddio\n"
-"address, fqdn, user_fqdn, keyid a asn1dn fel idtype.\n"
+"address, FQDN, user_fqdn, keyid a asn1dn fel idtype.\n"
 "cant eu defnyddio fel:\n"
 "\tcyfeiriad my_identifier [address];\n"
 "\t\ty math yw'r cyfeiriad IP. Hwn yw'r math rhagosodedig\n"
@@ -22566,9 +23303,9 @@ msgstr "Cynnig"
 msgid ""
 "specify the encryption algorithm used for the\n"
 "phase 1 negotiation. This directive must be defined. \n"
-"algorithm is one of following: \n"
+"algorithm is one of the following: \n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
@@ -22576,7 +23313,7 @@ msgstr ""
 "negydu rhan 1. Rhaid i'r gyfarwyddeb gael ei diffinio.\n"
 "algorithm yw un o'r canlynol:\n"
 "\n"
-"des, 3des, blowfish, cast128 for oakley.\n"
+"DES, 3DES, blowfish, cast128 for oakley.\n"
 "\n"
 "Ni ddylid defnyddio'r gosodiad ar gyfer trawsffurfiau eraill. "
 
@@ -22672,6 +23409,11 @@ msgstr "gofynnol"
 
 #: standalone/drakvpn:1146
 #, c-format
+msgid "default"
+msgstr "rhagosodedig"
+
+#: standalone/drakvpn:1146
+#, c-format
 msgid "use"
 msgstr "defnydd"
 
@@ -22680,114 +23422,115 @@ msgstr "defnydd"
 msgid "unique"
 msgstr "unigryw"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (broadcast)"
 msgstr "UDA (darlledu)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable)"
 msgstr "UDA (cabl)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "USA (cable-hrc)"
 msgstr "UDA (cable-hrc)"
 
-#: standalone/drakxtv:43
+#: standalone/drakxtv:45
 #, c-format
 msgid "Canada (cable)"
 msgstr "Canada (cabl)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (broadcast)"
 msgstr "Siapan (darlledu)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "Japan (cable)"
 msgstr "Siapan (cable)"
 
-#: standalone/drakxtv:44
+#: standalone/drakxtv:46
 #, c-format
 msgid "China (broadcast)"
 msgstr "Tsieina (darlledu)"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "West Europe"
 msgstr "Gorllewin Ewrop"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "East Europe"
 msgstr "Dwyrain Ewrop"
 
-#: standalone/drakxtv:45
+#: standalone/drakxtv:47
 #, c-format
 msgid "France [SECAM]"
 msgstr "Ffrainc(SECAM)"
 
-#: standalone/drakxtv:46
+#: standalone/drakxtv:48
 #, c-format
 msgid "Newzealand"
 msgstr "Seland Newydd"
 
-#: standalone/drakxtv:49
+#: standalone/drakxtv:51
 #, c-format
 msgid "Australian Optus cable TV"
 msgstr "Teledu Cebl Opus Awstralia"
 
-#: standalone/drakxtv:83
+#: standalone/drakxtv:85
 #, c-format
 msgid ""
 "Please,\n"
 "type in your tv norm and country"
 msgstr "Rhowch eich safon teledu a gwlad"
 
-#: standalone/drakxtv:85
+#: standalone/drakxtv:87
 #, c-format
 msgid "TV norm:"
 msgstr "Safon Teledu:"
 
-#: standalone/drakxtv:86
+#: standalone/drakxtv:88
 #, c-format
 msgid "Area:"
 msgstr "Ardal:"
 
-#: standalone/drakxtv:91
+#: standalone/drakxtv:93
 #, c-format
-msgid "Scanning for TV channels in progress ..."
+msgid "Scanning for TV channels in progress..."
 msgstr "Wrthi'n sganio am sianeli Teledu ..."
 
-#: standalone/drakxtv:101
+#: standalone/drakxtv:103
 #, c-format
 msgid "Scanning for TV channels"
 msgstr "Sganio am Sianel Teledu"
 
-#: standalone/drakxtv:105
+#: standalone/drakxtv:107
 #, c-format
 msgid "There was an error while scanning for TV channels"
 msgstr "Digwyddodd gwall wrth sganio am sianelu teledu"
 
-#: standalone/drakxtv:108
+#: standalone/drakxtv:110
 #, c-format
 msgid "Have a nice day!"
 msgstr "Diwrnod da i chi!"
 
-#: standalone/drakxtv:109
+#: standalone/drakxtv:111
 #, c-format
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Nawr mae modd i chi redeg Xawtv (o dan XWindows)!\n"
 
-#: standalone/drakxtv:132
+#: standalone/drakxtv:134
 #, c-format
 msgid "No TV Card detected!"
 msgstr "Heb ganfod Cerdyn Teledu!"
 
-#: standalone/drakxtv:133
+#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
+#: standalone/drakxtv:136
 #, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -22808,50 +23551,24 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:18
+#: standalone/harddrake2:20
 #, c-format
 msgid "Alternative drivers"
 msgstr "Gyrwyr eraill"
 
-#: standalone/harddrake2:19
+#: standalone/harddrake2:21
 #, c-format
 msgid "the list of alternative drivers for this sound card"
 msgstr "rhestr o yrrwr eraill ar gyfer eich cerdyn sain"
 
-#: standalone/harddrake2:22
+#: standalone/harddrake2:24
 #, 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,...)"
 
-#: standalone/harddrake2:23
-#, c-format
-msgid "Channel"
-msgstr "Sianel"
-
-#: standalone/harddrake2:23
-#, c-format
-msgid "EIDE/SCSI channel"
-msgstr "Sianel EIDE/SCSI"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid "Bogomips"
-msgstr "Bogomips"
-
-#: standalone/harddrake2:24
-#, c-format
-msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
-msgstr ""
-"mae angen i'r cnewyllyn GNU/Linux gyflawni cyfrif cylch wrth gychwyn i "
-"gychwyn y cyfrif amser. Mae'r canlyniad yn cael ei gadw fel bogomips fel "
-"ffordd o \"feincnod\" y cpu."
-
-#: standalone/harddrake2:26
+#: standalone/harddrake2:26 standalone/harddrake2:130
 #, c-format
 msgid "Bus identification"
 msgstr "Dynodiad bws"
@@ -22878,61 +23595,260 @@ msgstr ""
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "Cache size"
-msgstr "Maint storfa"
+msgid "Drive capacity"
+msgstr "Maint y gyrrwr"
 
 #: standalone/harddrake2:33
 #, c-format
-msgid "size of the (second level) cpu cache"
-msgstr "maint storfa cpu (ail lefel)"
+msgid "special capacities of the driver (burning ability and or DVD support)"
+msgstr "nodweddion arbennig y gyrrwr (llosgi neu gynnal DVD)"
 
 #: standalone/harddrake2:34
 #, c-format
-msgid "Drive capacity"
-msgstr "Maint y gyrrwr"
+msgid "this field describes the device"
+msgstr "mae'r maes yn disgrifio'r ddyfais"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:35
 #, c-format
-msgid "special capacities of the driver (burning ability and or DVD support)"
-msgstr "nodweddion arbennig y gyrrwr (llosgi neu gynnal DVD)"
+msgid "Old device file"
+msgstr "Hen ffeil dyfais"
+
+#: standalone/harddrake2:36
+#, c-format
+msgid "old static device name used in dev package"
+msgstr "hen enw dyfais sefydlog yn cael ei ddefnyddio mewn pecyn dev"
 
-#. -PO: here "comas" is the medical coma, not the lexical coma!!
 #: standalone/harddrake2:37
 #, c-format
+msgid "New devfs device"
+msgstr "Dyfais devfs newydd"
+
+#: standalone/harddrake2:38
+#, c-format
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "enw dyfais deinamig yn cael ei gynhyrchu gan incore kernel devfs"
+
+#. -PO: here "module" is the "jargon term" for a kernel driver
+#: standalone/harddrake2:41
+#, c-format
+msgid "Module"
+msgstr "Modiwl"
+
+#: standalone/harddrake2:41
+#, 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
+msgid "Extended partitions"
+msgstr "Creu rhaniad newydd"
+
+#: standalone/harddrake2:42
+#, fuzzy, c-format
+msgid "the number of extended partitions"
+msgstr "rhif y prosesydd"
+
+#: standalone/harddrake2:43
+#, c-format
+msgid "Geometry"
+msgstr "Geometreg"
+
+#: standalone/harddrake2:43
+#, c-format
+msgid "Cylinder/head/sectors geometry of the disk"
+msgstr ""
+
+#: standalone/harddrake2:44
+#, fuzzy, c-format
+msgid "Disk controller"
+msgstr "Rheolyddion SMBus"
+
+#: standalone/harddrake2:44
+#, c-format
+msgid "the disk controller on the host side"
+msgstr ""
+
+#: standalone/harddrake2:45
+#, c-format
+msgid "class of hardware device"
+msgstr "dosbarth y ddyfais caledwedd"
+
+#: standalone/harddrake2:46 standalone/harddrake2:78
+#: standalone/printerdrake:218
+#, c-format
+msgid "Model"
+msgstr "Model"
+
+#: standalone/harddrake2:46
+#, c-format
+msgid "hard disk model"
+msgstr "Model disg caled"
+
+#: standalone/harddrake2:47
+#, c-format
+msgid "network printer port"
+msgstr "porth argraffydd rhwydwaith"
+
+#: standalone/harddrake2:48
+#, fuzzy, c-format
+msgid "Primary partitions"
+msgstr "Fformatio rhaniadau"
+
+#: standalone/harddrake2:48
+#, fuzzy, c-format
+msgid "the number of the primary partitions"
+msgstr "rhif y prosesydd"
+
+#: standalone/harddrake2:49
+#, c-format
+msgid "the vendor name of the device"
+msgstr "enw gwerthwr y ddyfais"
+
+#: standalone/harddrake2:50
+#, c-format
+msgid "Bus PCI #"
+msgstr ""
+
+#: standalone/harddrake2:50
+#, fuzzy, 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,...)"
+
+#: standalone/harddrake2:51
+#, fuzzy, c-format
+msgid "PCI device #"
+msgstr "Dyfeisiau UPS"
+
+#: standalone/harddrake2:51
+#, fuzzy, c-format
+msgid "PCI device number"
+msgstr "rhif hyd oes"
+
+#: standalone/harddrake2:52
+#, c-format
+msgid "PCI function #"
+msgstr ""
+
+#: standalone/harddrake2:52
+#, fuzzy, c-format
+msgid "PCI function number"
+msgstr "Enw'r cysylltiad"
+
+#: standalone/harddrake2:53
+#, fuzzy, c-format
+msgid "Vendor ID"
+msgstr "Gwerthwr"
+
+#: standalone/harddrake2:53
+#, c-format
+msgid "this is the standard numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "Device ID"
+msgstr "Dyfais: "
+
+#: standalone/harddrake2:54
+#, fuzzy, c-format
+msgid "this is the numerical identifier of the device"
+msgstr "enw gwerthwr y ddyfais"
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "Sub vendor ID"
+msgstr ""
+
+#: standalone/harddrake2:55
+#, c-format
+msgid "this is the minor numerical identifier of the vendor"
+msgstr ""
+
+#: standalone/harddrake2:56
+#, fuzzy, c-format
+msgid "Sub device ID"
+msgstr "Dyfeisiau UPS"
+
+#: standalone/harddrake2:56
+#, fuzzy, c-format
+msgid "this is the minor numerical identifier of the device"
+msgstr "enw gwerthwr y ddyfais"
+
+#: standalone/harddrake2:57
+#, fuzzy, c-format
+msgid "Device USB ID"
+msgstr "Dyfais: "
+
+#: standalone/harddrake2:57
+#, c-format
+msgid ".."
+msgstr ""
+
+#: standalone/harddrake2:61
+#, c-format
+msgid "Bogomips"
+msgstr "Bogomips"
+
+#: standalone/harddrake2:61
+#, c-format
+msgid ""
+"the GNU/Linux kernel needs to run a calculation loop at boot time to "
+"initialize a timer counter.  Its result is stored as bogomips as a way to "
+"\"benchmark\" the cpu."
+msgstr ""
+"mae angen i'r cnewyllyn GNU/Linux gyflawni cyfrif cylch wrth gychwyn i "
+"gychwyn y cyfrif amser. Mae'r canlyniad yn cael ei gadw fel bogomips fel "
+"ffordd o \"feincnod\" y cpu."
+
+#: standalone/harddrake2:62
+#, c-format
+msgid "Cache size"
+msgstr "Maint storfa"
+
+#: standalone/harddrake2:62
+#, 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
+#, c-format
 msgid "Coma bug"
 msgstr "Coma bug"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:65
 #, 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:38
+#: standalone/harddrake2:66
 #, c-format
 msgid "Cpuid family"
 msgstr "Teulu cpuid"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:66
 #, c-format
 msgid "family of the cpu (eg: 6 for i686 class)"
 msgstr "teulu'r cpu (ee 6 am ddosbarth i686)"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:67
 #, c-format
 msgid "Cpuid level"
 msgstr "Lefel cpuid"
 
-#: standalone/harddrake2:39
+#: standalone/harddrake2:67
 #, c-format
 msgid "information level that can be obtained through the cpuid instruction"
 msgstr "lefel gwybodaeth i'w gael drwy gyfarwyddid cpuid"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:68
 #, c-format
 msgid "Frequency (MHz)"
 msgstr "Amledd (MHz)"
 
-#: standalone/harddrake2:40
+#: standalone/harddrake2:68
 #, c-format
 msgid ""
 "the CPU frequency in MHz (Megahertz which in first approximation may be "
@@ -22942,68 +23858,22 @@ msgstr ""
 "amledd y cpu mewn MHz (y nifer o gyfarwyddiadau'r eiliad mae'r cypu yn gallu "
 "eu trin)"
 
-#: standalone/harddrake2:41
-#, c-format
-msgid "this field describes the device"
-msgstr "mae'r maes yn disgrifio'r ddyfais"
-
-#: standalone/harddrake2:42
-#, c-format
-msgid "Old device file"
-msgstr "Hen ffeil dyfais"
-
-#: standalone/harddrake2:43
-#, 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:44
-#, c-format
-msgid "New devfs device"
-msgstr "Dyfais devfs newydd"
-
-#: standalone/harddrake2:45
-#, c-format
-msgid "new dynamic device name generated by core kernel devfs"
-msgstr "enw dyfais deinamig yn cael ei gynhyrchu gan incore kernel devfs"
-
-#. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:48
-#, c-format
-msgid "Module"
-msgstr "Modiwl"
-
-#: standalone/harddrake2:48
-#, 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:49
-#, fuzzy, c-format
-msgid "Extended partitions"
-msgstr "Creu rhaniad newydd"
-
-#: standalone/harddrake2:49
-#, fuzzy, c-format
-msgid "the number of extended partitions"
-msgstr "rhif y prosesydd"
-
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "Flags"
 msgstr "Baneri"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:69
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "Baneri cpu'n cael eu dangos gan y cnewyllyn"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:70
 #, c-format
 msgid "Fdiv bug"
 msgstr "Gwall Fdiv"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -23014,54 +23884,44 @@ msgstr ""
 "yw'n ymgyrraedd â'r cywirdeb angenrheidiol wrth berfformio Floating point "
 "DIVision (FDIV)"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "Is FPU present"
 msgstr "Yw'r FPU yn bresennol"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:72
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "mae iawn yn golygu fod gan y cydbrosesydd rhifyddegol"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "P'un ai oes gan yr FPU fector irq"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:73
 #, 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"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, c-format
 msgid "F00f bug"
 msgstr "Gwall F00f"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:74
 #, 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:56
-#, fuzzy, c-format
-msgid "Geometry"
-msgstr "Ceisio eto"
-
-#: standalone/harddrake2:56
-#, c-format
-msgid "Cylinder/head/sectors geometry of the disk"
-msgstr ""
-
-#: standalone/harddrake2:57
+#: standalone/harddrake2:75
 #, c-format
 msgid "Halt bug"
 msgstr "Gwall halt"
 
-#: standalone/harddrake2:58
+#: standalone/harddrake2:76
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
@@ -23070,126 +23930,65 @@ msgstr ""
 "Nid yw rhai prosesyddion i486DX-100 cynnar yn gallu dychwelyd i'w cyflwr "
 "gweithredu a'r ôl defnyddio \"halt\""
 
-#: standalone/harddrake2:60
-#, c-format
-msgid "Floppy format"
-msgstr "Fformatio disg meddal"
-
-#: standalone/harddrake2:60
-#, c-format
-msgid "format of floppies supported by the drive"
-msgstr "fformatio disgiau meddal derbyniol i'r gyrrwr"
-
-#: standalone/harddrake2:61
+#: standalone/harddrake2:77
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "Is gynnyrch y cpu"
 
-#: standalone/harddrake2:62
-#, c-format
-msgid "class of hardware device"
-msgstr "dosbarth y ddyfais caledwedd"
-
-#: standalone/harddrake2:63 standalone/harddrake2:64
-#: standalone/printerdrake:212
-#, c-format
-msgid "Model"
-msgstr "Model"
-
-#: standalone/harddrake2:63
-#, c-format
-msgid "hard disk model"
-msgstr "Model disg caled"
-
-#: standalone/harddrake2:64
+#: standalone/harddrake2:78
 #, c-format
-msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
 msgstr "cynnyrch y cpu (ee 8 am Pentiumlll,...]"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "Model name"
 msgstr "Enw'r model"
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:79
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "enw swyddogol gwerthwr y cpu"
 
-#: standalone/harddrake2:66
-#, c-format
-msgid "Number of buttons"
-msgstr "Nifer o fotymau"
-
-#: standalone/harddrake2:66
-#, c-format
-msgid "the number of buttons the mouse has"
-msgstr "nifer y botymau sydd gan y llygoden"
-
-#: standalone/harddrake2:67
+#: standalone/harddrake2:80
 #, c-format
 msgid "the name of the CPU"
 msgstr "enw'r prosesydd"
 
-#: standalone/harddrake2:68
-#, c-format
-msgid "network printer port"
-msgstr "porth argraffydd rhwydwaith"
-
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "Processor ID"
 msgstr "Dynodiad Prosesydd"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:81
 #, c-format
 msgid "the number of the processor"
 msgstr "rhif y prosesydd"
 
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "Primary partitions"
-msgstr "Fformatio rhaniadau"
-
-#: standalone/harddrake2:70
-#, fuzzy, c-format
-msgid "the number of the primary partitions"
-msgstr "rhif y prosesydd"
-
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "Model stepping"
 msgstr "Stepio model"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:82
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "graddiad y cpu (cynhyrchu rhif is-fodel)"
 
-#: standalone/harddrake2:72
-#, 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:73
-#, c-format
-msgid "the vendor name of the device"
-msgstr "enw gwerthwr y ddyfais"
-
-#: standalone/harddrake2:74
+#: standalone/harddrake2:83
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "enw gwerthwr y prosesydd"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:84
 #, c-format
 msgid "Write protection"
 msgstr "Diogelwch ysgrifennu"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:84
 #, c-format
 msgid ""
-"the WP flag in the CR0 register of the cpu enforce write proctection at the "
+"the WP flag in the CR0 register of the cpu enforce write protection at the "
 "memory page level, thus enabling the processor to prevent unchecked kernel "
 "accesses to user memory (aka this is a bug guard)"
 msgstr ""
@@ -23197,60 +23996,187 @@ 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)"
 
-#. -PO: please keep all "/" charaters !!!
-#: standalone/harddrake2:90 standalone/logdrake:78 standalone/printerdrake:146
-#: standalone/printerdrake:159
+#: standalone/harddrake2:88
+#, c-format
+msgid "Floppy format"
+msgstr "Fformatio disg meddal"
+
+#: standalone/harddrake2:88
+#, c-format
+msgid "format of floppies supported by the drive"
+msgstr "fformatio disgiau meddal derbyniol i'r gyrrwr"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "Channel"
+msgstr "Sianel"
+
+#: standalone/harddrake2:92
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr "Sianel EIDE/SCSI"
+
+#: standalone/harddrake2:93
+#, fuzzy, c-format
+msgid "Disk identifier"
+msgstr "Fy enw"
+
+#: standalone/harddrake2:93
+#, c-format
+msgid "usually the disk serial number"
+msgstr ""
+
+#: standalone/harddrake2:94
+#, fuzzy, c-format
+msgid "Logical unit number"
+msgstr "Enw cyfrol resymegol"
+
+#: standalone/harddrake2:94
+#, 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 ""
+
+#: standalone/harddrake2:99
+#, c-format
+msgid "Device file"
+msgstr "Ffeil dyfais"
+
+#: standalone/harddrake2:99
+#, c-format
+msgid ""
+"the device file used to communicate with the kernel driver for the mouse"
+msgstr ""
+
+#: standalone/harddrake2:100
+#, fuzzy, c-format
+msgid "Emulated wheel"
+msgstr "Efelychiad olwyn"
+
+#: standalone/harddrake2:100
+#, fuzzy, c-format
+msgid "whether the wheel is emulated or not"
+msgstr "gydag efelychiad Olwyn"
+
+#: standalone/harddrake2:101
+#, c-format
+msgid "the type of the mouse"
+msgstr "y math o lygoden"
+
+#: standalone/harddrake2:102
+#, c-format
+msgid "the name of the mouse"
+msgstr "enw llygoden"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "Number of buttons"
+msgstr "Nifer o fotymau"
+
+#: standalone/harddrake2:103
+#, c-format
+msgid "the number of buttons the mouse has"
+msgstr "nifer y botymau sydd gan y llygoden"
+
+#: standalone/harddrake2:104
+#, 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
+#, c-format
+msgid "Mouse protocol used by X11"
+msgstr ""
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "the protocol that the graphical desktop use with the mouse"
+msgstr ""
+
+#: standalone/harddrake2:112 standalone/harddrake2:121
+#: standalone/harddrake2:128 standalone/harddrake2:136
+#: standalone/harddrake2:309
+#, c-format
+msgid "Identification"
+msgstr "Dynodiad"
+
+#: standalone/harddrake2:113 standalone/harddrake2:129
+#, c-format
+msgid "Connection"
+msgstr "Cysylltiad"
+
+#: standalone/harddrake2:122
+#, fuzzy, c-format
+msgid "Performances"
+msgstr "Dewisiadau"
+
+#: standalone/harddrake2:123
+#, fuzzy, c-format
+msgid "Bugs"
+msgstr "Bws"
+
+#: standalone/harddrake2:124
+#, c-format
+msgid "FPU"
+msgstr "FPU (Cydbrosesydd Rhifol)"
+
+#: standalone/harddrake2:132
+#, c-format
+msgid "Partitions"
+msgstr "Rhaniadau"
+
+#: standalone/harddrake2:137
+#, c-format
+msgid "Features"
+msgstr "Nodweddion"
+
+#. -PO: please keep all "/" characters !!!
+#: standalone/harddrake2:158 standalone/logdrake:77
+#: standalone/printerdrake:152 standalone/printerdrake:165
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: standalone/harddrake2:91 standalone/harddrake2:112 standalone/logdrake:80
-#: standalone/printerdrake:171 standalone/printerdrake:172
-#: standalone/printerdrake:173 standalone/printerdrake:174
+#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
+#: standalone/printerdrake:177 standalone/printerdrake:178
+#: standalone/printerdrake:179 standalone/printerdrake:180
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
 
-#: standalone/harddrake2:95
+#: standalone/harddrake2:163
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/Awtoganfod_argraffydd"
 
-#: standalone/harddrake2:96
+#: standalone/harddrake2:164
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/Awtoganfod_modem"
 
-#: standalone/harddrake2:97
+#: standalone/harddrake2:165
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/Awtoganfod_gyrrwr jaz"
 
-#: standalone/harddrake2:104 standalone/printerdrake:152
+#: standalone/harddrake2:172 standalone/printerdrake:158
 #, c-format
 msgid "/_Quit"
 msgstr "/_Gadael"
 
-#: standalone/harddrake2:113
+#: standalone/harddrake2:181
 #, c-format
 msgid "/_Fields description"
 msgstr "/_Disgrifiad meysydd"
 
-#: standalone/harddrake2:115
+#: standalone/harddrake2:183
 #, c-format
 msgid "Harddrake help"
 msgstr "Cymorth Harddrake"
 
-#: standalone/harddrake2:116
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Disgrifiad y meysydd:\n"
-"\n"
-
-#: standalone/harddrake2:121
+#: standalone/harddrake2:192
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
@@ -23259,176 +24185,188 @@ msgstr ""
 "Unwaith i chi ddewis dyfais, gallwch weld esboniad mewn meysydd yn y ffrâm "
 "dde [\"Gwybodaeth\"]"
 
-#: standalone/harddrake2:126 standalone/printerdrake:173
+#: standalone/harddrake2:197 standalone/printerdrake:179
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Adrodd ar Wallau"
 
-#: standalone/harddrake2:127 standalone/printerdrake:174
+#: standalone/harddrake2:198 standalone/printerdrake:180
 #, c-format
 msgid "/_About..."
 msgstr "/_Ynghylch..."
 
-#: standalone/harddrake2:128
+#: standalone/harddrake2:199
 #, c-format
 msgid "About Harddrake"
 msgstr "Ynghylch Harddrake"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:130
+#: standalone/harddrake2:201
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"This is HardDrake, a Mandrakelinux 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 Mandrake.\n"
+"Dyma HardDrake, offeryn ffurfweddu caledwedd Mandrakelinux.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:147
+#: standalone/harddrake2:218
 #, c-format
-msgid "Harddrake2 version %s"
-msgstr "Harddrake2 fersiwn %s"
+msgid "Harddrake2"
+msgstr "Harddrake2"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:234
 #, c-format
 msgid "Detected hardware"
 msgstr "Caledwedd canfyddwyd"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:239
 #, c-format
 msgid "Configure module"
 msgstr "Modd ffurfweddu"
 
-#: standalone/harddrake2:175
+#: standalone/harddrake2:246
 #, c-format
 msgid "Run config tool"
 msgstr "Rhedeg offeryn ffurfweddu"
 
-#: standalone/harddrake2:222
+#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "anhysbys"
 
-#: standalone/harddrake2:223
+#: standalone/harddrake2:297 standalone/printerdrake:308
+#: standalone/printerdrake:346
 #, c-format
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: standalone/harddrake2:241
+#: standalone/harddrake2:317
+#, fuzzy, c-format
+msgid "Misc"
+msgstr "Msec"
+
+#: standalone/harddrake2:332
 #, 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:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "secondary"
 msgstr "eilradd"
 
-#: standalone/harddrake2:295
+#: standalone/harddrake2:384
 #, c-format
 msgid "primary"
 msgstr "cynradd"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "burner"
 msgstr "llosgwr"
 
-#: standalone/harddrake2:303
+#: standalone/harddrake2:388
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/keyboarddrake:24
+#: standalone/keyboarddrake:25
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "Dewiswch gynllun allweddell"
 
-#: standalone/keyboarddrake:33
+#: standalone/keyboarddrake:34
 #, 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?"
 
-#: standalone/localedrake:60
+#: standalone/localedrake:38
+#, c-format
+msgid "LocaleDrake"
+msgstr "LocaleDrake"
+
+#: standalone/localedrake:67
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr ""
 "Mae'r newid wedi ei gyflawni, ond i fod yn effeithiol mae'n rhaid i chi "
 "allgofnodi"
 
-#: standalone/logdrake:51
-#, c-format
-msgid "Mandrake Tools Logs"
+#: standalone/logdrake:50
+#, fuzzy, c-format
+msgid "Mandrakelinux Tools Logs"
 msgstr "Cofnodion Offer Mandrake"
 
-#: standalone/logdrake:52
+#: standalone/logdrake:51
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:65
+#: standalone/logdrake:64
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Dangos ar y diwrnod penodol yn unig"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "/File/_New"
 msgstr "/Ffeil/_Newydd"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:71
 #, c-format
 msgid "<control>N"
 msgstr "<control>N"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_Open"
 msgstr "/Ffeil/_Agor"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Save"
 msgstr "/Ffeil/_Cawd"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Ffeil/Cawd _fel"
 
-#: standalone/logdrake:76
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/-"
 msgstr "/Ffeil/-"
 
-#: standalone/logdrake:79
+#: standalone/logdrake:78
 #, c-format
 msgid "/Options/Test"
 msgstr "/Dewisiadau/Test"
 
-#: standalone/logdrake:81
+#: standalone/logdrake:80
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Cymorth/_Ynghylch..."
 
-#: standalone/logdrake:110
+#: standalone/logdrake:109
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
@@ -23437,7 +24375,7 @@ msgstr ""
 "_:dyma'r ffeil cofnod auth.log \n"
 "Dilysu"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
@@ -23446,7 +24384,7 @@ msgstr ""
 "_:dyma ffeil cofnod user.log\n"
 "Defnyddiwr"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
@@ -23455,7 +24393,7 @@ msgstr ""
 "_:dyma'r ffeil cofnod /var/log/messages\n"
 "Negeseuon"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
@@ -23464,54 +24402,54 @@ msgstr ""
 "_:dyma'r cofnod ffeil /var/log/syslog\n"
 "Syslog"
 
-#: standalone/logdrake:117
+#: standalone/logdrake:116
 #, c-format
 msgid "search"
 msgstr "chwilio"
 
-#: standalone/logdrake:129
+#: standalone/logdrake:128
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Offeryn i fonitro eich cofnodion"
 
-#: standalone/logdrake:130 standalone/net_monitor:86
+#: standalone/logdrake:129 standalone/net_monitor:99
 #, c-format
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: standalone/logdrake:135
+#: standalone/logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "Cydweddu"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "ond heb fod yn cydweddu"
 
-#: standalone/logdrake:140
+#: standalone/logdrake:139
 #, c-format
 msgid "Choose file"
 msgstr "Dewis ffeil"
 
-#: standalone/logdrake:149
+#: standalone/logdrake:148
 #, c-format
 msgid "Calendar"
 msgstr "Calendr"
 
-#: standalone/logdrake:159
+#: standalone/logdrake:158
 #, c-format
 msgid "Content of the file"
 msgstr "Cynnwys y ffeil"
 
-#: standalone/logdrake:163 standalone/logdrake:429
+#: standalone/logdrake:162 standalone/logdrake:399
 #, c-format
 msgid "Mail alert"
 msgstr "Rhybudd e-bost"
 
-#: standalone/logdrake:170
-#, c-format
-msgid "The alert wizard had unexpectly failled:"
+#: standalone/logdrake:169
+#, fuzzy, c-format
+msgid "The alert wizard has failed unexpectedly:"
 msgstr "Methodd y dewin rhybudd yn annisgwyl:"
 
 #: standalone/logdrake:221
@@ -23519,62 +24457,57 @@ msgstr "Methodd y dewin rhybudd yn annisgwyl:"
 msgid "please wait, parsing file: %s"
 msgstr "arhoswch, dosbarthu ffeil: %s"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:376
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Gweinydd Gwe Fyd Eang Apache"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:377
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Datrysydd Enw Parth"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:378
 #, c-format
 msgid "Ftp Server"
 msgstr "Gweinydd Ftp"
 
-#: standalone/logdrake:409
+#: standalone/logdrake:379
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Gweinydd E-bost Postfix"
 
-#: standalone/logdrake:410
+#: standalone/logdrake:380
 #, c-format
 msgid "Samba Server"
 msgstr "Gweinydd Samba"
 
-#: standalone/logdrake:411
-#, c-format
-msgid "SSH Server"
-msgstr "Gweinydd SSH"
-
-#: standalone/logdrake:412
+#: standalone/logdrake:382
 #, c-format
 msgid "Webmin Service"
 msgstr "Gwasanaethau Webmin"
 
-#: standalone/logdrake:413
+#: standalone/logdrake:383
 #, c-format
 msgid "Xinetd Service"
 msgstr "Gwasanaeth Xinetd"
 
-#: standalone/logdrake:424
+#: standalone/logdrake:394
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Ffurfweddu'r system argraffu CUPS"
 
-#: standalone/logdrake:425
+#: standalone/logdrake:395
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Atal y system rhybudd e-bost"
 
-#: standalone/logdrake:432
+#: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Ffurfweddiad rhybudd e-bost"
 
-#: standalone/logdrake:433
+#: standalone/logdrake:403
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -23585,34 +24518,34 @@ msgstr ""
 "\n"
 "Yma bydd modd i chi osod y system rhybuddio.\n"
 
-#: standalone/logdrake:436
+#: standalone/logdrake:406
 #, c-format
 msgid "What do you want to do?"
 msgstr "Beth hoffech chi ei wneud?"
 
-#: standalone/logdrake:443
+#: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
 msgstr "Gosodiad gwasanaeth"
 
-#: standalone/logdrake:444
+#: standalone/logdrake:414
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "Byddwch yn derbyn rhybudd os na fydd un o'r gwasanaethu hyn yn rhedeg"
 
-#: standalone/logdrake:451
+#: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
 msgstr "Gosodiad llwyth"
 
-#: standalone/logdrake:452
+#: standalone/logdrake:422
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Byddwch yn derbyn rhybudd os yw'r llwyth yn uwch na'r gwerth hwn"
 
-#: standalone/logdrake:453
+#: standalone/logdrake:423
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
@@ -23621,32 +24554,32 @@ msgstr ""
 "_: mae llwytho'n enw yma, llwyth y system\n"
 "Llwyth"
 
-#: standalone/logdrake:458
+#: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
 msgstr "Ffurfweddiad rhybudd"
 
-#: standalone/logdrake:459
+#: standalone/logdrake:429
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Rhowch eich cyfeiriad e-bost islaw"
 
-#: standalone/logdrake:460
+#: standalone/logdrake:430
 #, c-format
-msgid "and enter the name (or the IP) of the SMTP server you whish to use"
+msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr "rhowch enw (neu'r IP) y gweinydd SMTP rydych am ei ddefnyddio."
 
-#: standalone/logdrake:479
+#: standalone/logdrake:449
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "Mae'r dewin wedi ffurfweddu'r rhybudd e-bost yn llwyddiannus."
 
-#: standalone/logdrake:485
+#: standalone/logdrake:455
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "Mae'r dewin wedi ffurfweddu'r rhybudd e-bost yn llwyddiannus."
 
-#: standalone/logdrake:544
+#: standalone/logdrake:514
 #, c-format
 msgid "Save as.."
 msgstr "Cadw fel..."
@@ -23671,27 +24604,74 @@ msgstr "Prawf llygoden"
 msgid "Please test your mouse:"
 msgstr "Profwch y llygoden"
 
-#: standalone/net_monitor:52 standalone/net_monitor:57
+#: standalone/net_applet:30
+#, fuzzy, c-format
+msgid "Network is up on interface %s"
+msgstr "Rhyngwyneb rhwydwaith"
+
+#. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
+#: standalone/net_applet:38
+#, fuzzy, c-format
+msgid "Network is down on interface %s. Click on \"Configure Network\""
+msgstr "Nid yw swyddogaethau'r rhwydwaith wedi ei ffurfweddu"
+
+#: standalone/net_applet:53 standalone/net_monitor:471
+#, c-format
+msgid "Connect %s"
+msgstr "Cysylltu %s"
+
+#: standalone/net_applet:54 standalone/net_monitor:471
+#, c-format
+msgid "Disconnect %s"
+msgstr "Datgysylltu %s"
+
+#: standalone/net_applet:55
+#, fuzzy, c-format
+msgid "Monitor Network"
+msgstr "Adfer drwy'r Rhwydwaith"
+
+#: standalone/net_applet:56
+#, 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
+#, c-format
+msgid "Refresh"
+msgstr "Adnewyddu"
+
+#: standalone/net_applet:58
+#, c-format
+msgid "Get Online Help"
+msgstr ""
+
+#: standalone/net_applet:158
+#, c-format
+msgid "Always launch on startup"
+msgstr "Cychwyn wrth gychwyn"
+
+#: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
 msgstr "Monitro'r Rhwydwaith"
 
-#: standalone/net_monitor:92
+#: standalone/net_monitor:104
 #, c-format
 msgid "Global statistics"
 msgstr "Ystadegau eang"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Instantaneous"
 msgstr "Ebrwydd"
 
-#: standalone/net_monitor:95
+#: standalone/net_monitor:107
 #, c-format
 msgid "Average"
 msgstr "Cyfartaledd"
 
-#: standalone/net_monitor:96
+#: standalone/net_monitor:108
 #, c-format
 msgid ""
 "Sending\n"
@@ -23700,7 +24680,7 @@ msgstr ""
 "Cyflymder\n"
 "anfon:"
 
-#: standalone/net_monitor:97
+#: standalone/net_monitor:109
 #, c-format
 msgid ""
 "Receiving\n"
@@ -23709,7 +24689,7 @@ msgstr ""
 "Cyflymder\n"
 "derbyn:"
 
-#: standalone/net_monitor:100
+#: standalone/net_monitor:113
 #, c-format
 msgid ""
 "Connection\n"
@@ -23718,81 +24698,76 @@ msgstr ""
 "Amser\n"
 "cysylltiad:"
 
-#: standalone/net_monitor:122
+#: standalone/net_monitor:120
+#, c-format
+msgid "Use same scale for received and transmitted"
+msgstr ""
+
+#: standalone/net_monitor:139
 #, c-format
 msgid "Wait please, testing your connection..."
 msgstr "Arhoswch, profi eich cysylltiad..."
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Disconnecting from Internet "
 msgstr "Datgysylltu o'r Rhyngrwyd"
 
-#: standalone/net_monitor:150 standalone/net_monitor:163
+#: standalone/net_monitor:188 standalone/net_monitor:201
 #, c-format
 msgid "Connecting to Internet "
 msgstr "Cysylltu â'r Rhyngrwyd"
 
-#: standalone/net_monitor:194
+#: standalone/net_monitor:232
 #, c-format
 msgid "Disconnection from Internet failed."
 msgstr "Methodd datgysylltu o'r Rhyngrwyd."
 
-#: standalone/net_monitor:195
+#: standalone/net_monitor:233
 #, c-format
 msgid "Disconnection from Internet complete."
 msgstr "Datgysylltu o'r Rhyngrwyd wedi ei gwblhau"
 
-#: standalone/net_monitor:197
+#: standalone/net_monitor:235
 #, c-format
 msgid "Connection complete."
 msgstr "Cysylltiad wedi ei gwblhau"
 
-#: standalone/net_monitor:198
+#: standalone/net_monitor:236
 #, c-format
 msgid ""
 "Connection failed.\n"
-"Verify your configuration in the Mandrake Control Center."
+"Verify your configuration in the Mandrakelinux Control Center."
 msgstr ""
 "Methodd y cysylltiad.\n"
-"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrake."
+"Gwiriwch eich ffurfweddiad yng Nghanolfan Rheoli Mandrakelinux."
 
-#: standalone/net_monitor:299
+#: standalone/net_monitor:341
 #, c-format
 msgid "Color configuration"
 msgstr "Ffurfweddiad lliw"
 
-#: standalone/net_monitor:347 standalone/net_monitor:367
+#: standalone/net_monitor:389 standalone/net_monitor:409
 #, c-format
 msgid "sent: "
 msgstr "anfonwyd: "
 
-#: standalone/net_monitor:354 standalone/net_monitor:371
+#: standalone/net_monitor:396 standalone/net_monitor:413
 #, c-format
 msgid "received: "
 msgstr "derbyniwyd:"
 
-#: standalone/net_monitor:361
+#: standalone/net_monitor:403
 #, c-format
 msgid "average"
 msgstr "cyfartaledd"
 
-#: standalone/net_monitor:364
+#: standalone/net_monitor:406
 #, c-format
 msgid "Local measure"
 msgstr "Mesur lleol"
 
-#: standalone/net_monitor:396
-#, c-format
-msgid "transmitted"
-msgstr "darlledwyd"
-
-#: standalone/net_monitor:397
-#, c-format
-msgid "received"
-msgstr "derbyniwyd"
-
-#: standalone/net_monitor:415
+#: standalone/net_monitor:464
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
@@ -23801,173 +24776,168 @@ msgstr ""
 "Rhybudd, mae cysylltiad arall gyda'r rhyngrwyd wedi ei ganfod, efallai'n "
 "defnyddio eich rhwydwaith."
 
-#: standalone/net_monitor:421
-#, c-format
-msgid "Disconnect %s"
-msgstr "Datgysylltu %s"
-
-#: standalone/net_monitor:421
-#, c-format
-msgid "Connect %s"
-msgstr "Cysylltu %s"
-
-#: standalone/net_monitor:426
+#: standalone/net_monitor:475
 #, c-format
 msgid "No internet connection configured"
 msgstr "Dim cysylltiad â'r rhyngrwyd wedi ei ffurfweddu"
 
-#: standalone/printerdrake:70
+#: standalone/printerdrake:69
 #, c-format
 msgid "Loading printer configuration... Please wait"
 msgstr "Llwytho Defnyddwyr a Grwpiau...Arhoswch"
 
-#: standalone/printerdrake:86
+#: standalone/printerdrake:85
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Darllen data am argraffyddion gosodedig..."
 
-#: standalone/printerdrake:129
+#: standalone/printerdrake:134
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "Offeryn Rheoli Argraffydd %s"
 
-#: standalone/printerdrake:143 standalone/printerdrake:144
-#: standalone/printerdrake:145 standalone/printerdrake:153
-#: standalone/printerdrake:154 standalone/printerdrake:158
+#: standalone/printerdrake:148 standalone/printerdrake:149
+#: standalone/printerdrake:150 standalone/printerdrake:151
+#: standalone/printerdrake:159 standalone/printerdrake:160
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Actions"
 msgstr "/_Gweithredoedd"
 
-#: standalone/printerdrake:143
+#: standalone/printerdrake:148 standalone/printerdrake:160
+#, c-format
+msgid "/_Add Printer"
+msgstr "/_Ychwanegu Argraffydd"
+
+#: standalone/printerdrake:149
 #, c-format
 msgid "/Set as _Default"
 msgstr "Gosod fel _Rhagosodiad"
 
-#: standalone/printerdrake:144
+#: standalone/printerdrake:150
 #, c-format
 msgid "/_Edit"
 msgstr "/_Golygu"
 
-#: standalone/printerdrake:145
+#: standalone/printerdrake:151
 #, c-format
 msgid "/_Delete"
 msgstr "/_Dileu"
 
-#: standalone/printerdrake:146
+#: standalone/printerdrake:152
 #, c-format
 msgid "/_Expert mode"
 msgstr "/_Modd Uwch"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:157
 #, c-format
 msgid "/_Refresh"
 msgstr "/_Adnewyddu"
 
-#: standalone/printerdrake:154
-#, c-format
-msgid "/_Add Printer"
-msgstr "/_Ychwanegu Argraffydd"
-
-#: standalone/printerdrake:158
+#: standalone/printerdrake:164
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/_Ffurfweddu CUPS"
 
-#: standalone/printerdrake:191
+#: standalone/printerdrake:197
 #, c-format
 msgid "Search:"
 msgstr "Chwilio:"
 
-#: standalone/printerdrake:194
+#: standalone/printerdrake:200
 #, c-format
 msgid "Apply filter"
 msgstr "Gosod Hidl"
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Def."
 msgstr "Def."
 
-#: standalone/printerdrake:212 standalone/printerdrake:219
+#: standalone/printerdrake:218 standalone/printerdrake:225
 #, c-format
 msgid "Printer Name"
 msgstr "Enw argraffydd"
 
-#: standalone/printerdrake:212
+#: standalone/printerdrake:218
 #, c-format
 msgid "Connection Type"
 msgstr "Math o Gyswllt"
 
-#: standalone/printerdrake:219
+#: standalone/printerdrake:225
 #, 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:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add Printer"
 msgstr "Ychwanegu Argraffydd"
 
-#: standalone/printerdrake:227
+#: standalone/printerdrake:233
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Ychwanegu argraffydd newydd i'e system"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set as default"
 msgstr "Gosod fel rhagosodedig"
 
-#: standalone/printerdrake:230
+#: standalone/printerdrake:236
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Gosod yr argraffydd fel y rhagosodedig"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:239
 #, c-format
 msgid "Edit selected printer"
 msgstr "Golygu'r argraffwyr hyn"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:242
 #, c-format
 msgid "Delete selected printer"
 msgstr "Dileu'r argraffydd hwn"
 
-#. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:239
-#, c-format
-msgid "Refresh"
-msgstr "Adnewyddu"
-
-#: standalone/printerdrake:239
+#: standalone/printerdrake:245
 #, 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:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS"
 msgstr "Ffurfweddu CUPS"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:248
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Ffurfweddu'r system argraffu CUPS"
 
-#: standalone/printerdrake:528
+#: standalone/printerdrake:309 standalone/printerdrake:347
+#, fuzzy, c-format
+msgid "Enabled"
+msgstr "Galluogi"
+
+#: standalone/printerdrake:310 standalone/printerdrake:348
+#, c-format
+msgid "Disabled"
+msgstr "Anablwyd"
+
+#: standalone/printerdrake:572
 #, c-format
 msgid "Authors: "
 msgstr "Awduron:"
 
-#: standalone/printerdrake:534
+#: standalone/printerdrake:578
 #, c-format
 msgid "Printer Management \n"
 msgstr "Rheoli Argraffydd \n"
 
-#: standalone/scannerdrake:50
+#: standalone/scannerdrake:51
 #, c-format
 msgid ""
 "SANE packages need to be installed to use scanners.\n"
@@ -23978,91 +24948,80 @@ msgstr ""
 "\n"
 "Hoffech chi osod y pecynnau SANE?"
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:55
 #, c-format
 msgid "Aborting Scannerdrake."
 msgstr "Atal Scannerdrake."
 
-#: standalone/scannerdrake:59
+#: standalone/scannerdrake:60
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
 msgstr ""
 "Methu gosod y pecynnau sydd eu hangen i osod sganiwr gyda Scannerdrake."
 
-#: standalone/scannerdrake:60
+#: standalone/scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Ni fydd Scannerdrake yn cael ei gychwyn."
 
-#: standalone/scannerdrake:66 standalone/scannerdrake:464
+#: standalone/scannerdrake:67 standalone/scannerdrake:460
 #, c-format
-msgid "Searching for configured scanners ..."
+msgid "Searching for configured scanners..."
 msgstr "Chwilio am sganiwr wedi ei ffurfweddu..."
 
-#: standalone/scannerdrake:70 standalone/scannerdrake:468
+#: standalone/scannerdrake:71 standalone/scannerdrake:464
 #, c-format
-msgid "Searching for new scanners ..."
+msgid "Searching for new scanners..."
 msgstr "Chwilio am sganiwr newydd..."
 
-#: standalone/scannerdrake:78 standalone/scannerdrake:490
+#: standalone/scannerdrake:79 standalone/scannerdrake:486
 #, c-format
-msgid "Re-generating list of configured scanners ..."
+msgid "Re-generating list of configured scanners..."
 msgstr "Ail gynhyrchu rhestr o sganwyr wedi eu ffurfweddu..."
 
-#: standalone/scannerdrake:100 standalone/scannerdrake:141
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:101 standalone/scannerdrake:142
 #, 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."
 
-#: standalone/scannerdrake:103
+#: standalone/scannerdrake:104
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "Wedi canfod %s ar %s, ei ffurfweddi'n awtomatig?"
 
-#: standalone/scannerdrake:115
+#: standalone/scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 "Nid yw %s yng nghronfa ddata sganwyr. Hoffech chi ei ffurfweddu â llaw?"
 
-#: standalone/scannerdrake:130
+#: standalone/scannerdrake:131
 #, c-format
 msgid "Select a scanner model"
 msgstr "Dewiswch fodel sganiwr"
 
-#: standalone/scannerdrake:131
+#: standalone/scannerdrake:132
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:132
+#: standalone/scannerdrake:133
 #, c-format
 msgid "Detected model: %s"
 msgstr "Canfyddwyd model: %s"
 
-#: standalone/scannerdrake:134
-#, c-format
-msgid ", "
-msgstr ", "
-
-#: standalone/scannerdrake:135
+#: standalone/scannerdrake:136
 #, c-format
 msgid "Port: %s"
 msgstr "Porth: %s"
 
-#: standalone/scannerdrake:161
-#, c-format
-msgid "The %s is not known by this version of Scannerdrake."
-msgstr "Nid yw %s yn hysbys gan y fersiwn hwn o Scannerdrake."
-
-#: standalone/scannerdrake:169 standalone/scannerdrake:183
+#: standalone/scannerdrake:165 standalone/scannerdrake:179
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Peidio gosod ffeil cadarnwedd"
 
-#: standalone/scannerdrake:173 standalone/scannerdrake:225
+#: standalone/scannerdrake:169 standalone/scannerdrake:221
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
@@ -24071,12 +25030,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:174 standalone/scannerdrake:226
+#: standalone/scannerdrake:170 standalone/scannerdrake:222
 #, 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:175 standalone/scannerdrake:229
+#: standalone/scannerdrake:171 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
@@ -24085,7 +25044,7 @@ msgstr ""
 "I wneud felly, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel "
 "bod modd ei osod."
 
-#: standalone/scannerdrake:176 standalone/scannerdrake:230
+#: standalone/scannerdrake:172 standalone/scannerdrake:226
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
@@ -24094,22 +25053,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:178 standalone/scannerdrake:237
+#: standalone/scannerdrake:174 standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware file from"
 msgstr "Gosod ffeil cadarnwedd o"
 
-#: standalone/scannerdrake:198
+#: standalone/scannerdrake:194
 #, c-format
 msgid "Select firmware file"
 msgstr "Dewiswch ffeil cadarnwedd"
 
-#: standalone/scannerdrake:201 standalone/scannerdrake:260
+#: standalone/scannerdrake:197 standalone/scannerdrake:256
 #, 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:224
+#: standalone/scannerdrake:220
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -24118,7 +25077,7 @@ msgstr ""
 "Mae'n bosib fod angen i'ch sganiwr gael ei gadarnwedd ei ddiweddaru bob tro "
 "fydd yn cael ei gychwyn."
 
-#: standalone/scannerdrake:228
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
@@ -24127,7 +25086,7 @@ msgstr ""
 "I wneud hynny, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel "
 "bod modd ei osod."
 
-#: standalone/scannerdrake:231
+#: standalone/scannerdrake:227
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -24136,32 +25095,32 @@ msgstr ""
 "Os ydych eisoes wedi gosod cadarnwedd eich sganiwr mae modd ei ddiweddaru "
 "drwy ddarparu'r ffeil newydd"
 
-#: standalone/scannerdrake:233
+#: standalone/scannerdrake:229
 #, c-format
 msgid "Install firmware for the"
 msgstr "Gosod ffeil cadarnwedd ar gyfer"
 
-#: standalone/scannerdrake:256
+#: standalone/scannerdrake:252
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Dewis ffeil cadarnwedd ar gyfer %s"
 
-#: standalone/scannerdrake:274
+#: standalone/scannerdrake:270
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "Methuo gosod ffeil cadarnwedd ar gyfer %s!"
 
-#: standalone/scannerdrake:287
+#: standalone/scannerdrake:283
 #, 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:297
+#: standalone/scannerdrake:293
 #, c-format
 msgid "The %s is unsupported"
 msgstr "Nid yw %s yn cael ei gynnal"
 
-#: standalone/scannerdrake:302
+#: standalone/scannerdrake:298
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -24170,33 +25129,33 @@ msgstr ""
 "Rhaid i %s gael ei ffurfweddu gan printerdrake.\n"
 "Gallwch gychwyn printerdrake o adran Galedwedd Canolfan Rheoli %s"
 
-#: standalone/scannerdrake:306 standalone/scannerdrake:313
-#: standalone/scannerdrake:343
+#: standalone/scannerdrake:302 standalone/scannerdrake:309
+#: standalone/scannerdrake:339
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "Awtoganfod pyrth ar gael"
 
-#: standalone/scannerdrake:308 standalone/scannerdrake:354
+#: standalone/scannerdrake:304 standalone/scannerdrake:350
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Dewiswch y ddyfais lle mae %s wedi ei gysylltu"
 
-#: standalone/scannerdrake:309
+#: standalone/scannerdrake:305
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Sylwer: Nid oes modd awtoganfod pyrth paralel)"
 
-#: standalone/scannerdrake:311 standalone/scannerdrake:356
+#: standalone/scannerdrake:307 standalone/scannerdrake:352
 #, c-format
 msgid "choose device"
 msgstr "dewis dyfais"
 
-#: standalone/scannerdrake:345
+#: standalone/scannerdrake:341
 #, c-format
-msgid "Searching for scanners ..."
+msgid "Searching for scanners..."
 msgstr "Chwilio am sganwyr..."
 
-#: standalone/scannerdrake:380
+#: standalone/scannerdrake:376
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -24207,7 +25166,7 @@ msgstr ""
 "Gallwch ddefnyddio \"XSane\" i sganio dogfennau o'r ddewislen rhaglenni Aml-"
 "gyfrwng/Graffigau."
 
-#: standalone/scannerdrake:404
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -24220,7 +25179,7 @@ msgstr ""
 "%s\n"
 "ar gael ar eich system.\n"
 
-#: standalone/scannerdrake:405
+#: standalone/scannerdrake:401
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -24233,42 +25192,42 @@ msgstr ""
 "%s\n"
 "ar gael ar eich system.\n"
 
-#: standalone/scannerdrake:408 standalone/scannerdrake:411
+#: standalone/scannerdrake:404 standalone/scannerdrake:407
 #, 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:425
+#: standalone/scannerdrake:421
 #, c-format
 msgid "Search for new scanners"
 msgstr "Chwilio am sganwyr newydd"
 
-#: standalone/scannerdrake:431
+#: standalone/scannerdrake:427
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Ychwanegu sganiwr gyda llaw"
 
-#: standalone/scannerdrake:438
+#: standalone/scannerdrake:434
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Gosod/Diweddaru ffeiliau cadarnwedd"
 
-#: standalone/scannerdrake:444
+#: standalone/scannerdrake:440
 #, c-format
 msgid "Scanner sharing"
 msgstr "Rhannu sganiwr"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:668
+#: standalone/scannerdrake:499 standalone/scannerdrake:664
 #, c-format
 msgid "All remote machines"
 msgstr "Pob cyfrifiadur pell"
 
-#: standalone/scannerdrake:515 standalone/scannerdrake:818
+#: standalone/scannerdrake:511 standalone/scannerdrake:814
 #, c-format
 msgid "This machine"
 msgstr "Y peiriant hwn"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -24277,7 +25236,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:556
+#: standalone/scannerdrake:552
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -24286,33 +25245,33 @@ msgstr ""
 "Gallwch benderfynu a ddylai sganwyr ar gyfrifiadur pell fod ar gael ar gyfer "
 "y cyfrifiadur hwn."
 
-#: standalone/scannerdrake:559
+#: standalone/scannerdrake:555
 #, 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:561
+#: standalone/scannerdrake:557
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Rhannu sganwyr i westeiwyr:"
 
-#: standalone/scannerdrake:575
+#: standalone/scannerdrake:571
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Defnyddio sganiwr ar gyfrifiaduron pell"
 
-#: standalone/scannerdrake:578
+#: standalone/scannerdrake:574
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Defnyddio sganwyr ar westeiwyr:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:677
-#: standalone/scannerdrake:827
+#: standalone/scannerdrake:601 standalone/scannerdrake:673
+#: standalone/scannerdrake:823
 #, c-format
 msgid "Sharing of local scanners"
 msgstr "Rhannu sganwyr lleol"
 
-#: standalone/scannerdrake:606
+#: standalone/scannerdrake:602
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -24320,55 +25279,55 @@ msgid ""
 msgstr ""
 "Dyma'r cyfrifiaduron a rhwydweithiau ddylai'r sganiwr lleol fod ar gael:"
 
-#: standalone/scannerdrake:617 standalone/scannerdrake:767
+#: standalone/scannerdrake:613 standalone/scannerdrake:763
 #, c-format
 msgid "Add host"
 msgstr "Ychwanegu gwesteiwr"
 
-#: standalone/scannerdrake:623 standalone/scannerdrake:773
+#: standalone/scannerdrake:619 standalone/scannerdrake:769
 #, c-format
 msgid "Edit selected host"
 msgstr "Golygu'r gwesteiwr"
 
-#: standalone/scannerdrake:632 standalone/scannerdrake:782
+#: standalone/scannerdrake:628 standalone/scannerdrake:778
 #, c-format
 msgid "Remove selected host"
 msgstr "Tynnu'r gwesteiwr"
 
-#: standalone/scannerdrake:656 standalone/scannerdrake:664
-#: standalone/scannerdrake:669 standalone/scannerdrake:715
-#: standalone/scannerdrake:806 standalone/scannerdrake:814
-#: standalone/scannerdrake:819 standalone/scannerdrake:865
+#: standalone/scannerdrake:652 standalone/scannerdrake:660
+#: standalone/scannerdrake:665 standalone/scannerdrake:711
+#: standalone/scannerdrake:802 standalone/scannerdrake:810
+#: standalone/scannerdrake:815 standalone/scannerdrake:861
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "Enw/cyfeiriad IP gwesteiwr"
 
-#: standalone/scannerdrake:678 standalone/scannerdrake:828
+#: standalone/scannerdrake:674 standalone/scannerdrake:824
 #, 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:689 standalone/scannerdrake:839
+#: standalone/scannerdrake:685 standalone/scannerdrake:835
 #, 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:700 standalone/scannerdrake:850
+#: standalone/scannerdrake:696 standalone/scannerdrake:846
 #, 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:755
+#: standalone/scannerdrake:751
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Defnyddiwch o sganwyr pell"
 
-#: standalone/scannerdrake:756
+#: standalone/scannerdrake:752
 #, 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:913
+#: standalone/scannerdrake:909
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -24379,32 +25338,32 @@ msgstr ""
 "\n"
 "Hoffech chi osod pecyn saned?"
 
-#: standalone/scannerdrake:917 standalone/scannerdrake:921
+#: standalone/scannerdrake:913 standalone/scannerdrake:917
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Ni fydd eich sganiwr(sganwyr) ar gael ar y rhwydwaith"
 
-#: standalone/service_harddrake:62
+#: standalone/service_harddrake:104
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "Cafodd rhai dyfeisiau yn nosbarth caledwedd\"%s\" eu tynnu:\n"
 
-#: standalone/service_harddrake:63
+#: standalone/service_harddrake:105
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- %s wedi ei dynnu\n"
 
-#: standalone/service_harddrake:66
+#: standalone/service_harddrake:108
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "Ychwanegwyd rhai dyfeisiau: %s\n"
 
-#: standalone/service_harddrake:67
+#: standalone/service_harddrake:109
 #, c-format
 msgid "- %s was added\n"
 msgstr "- %s wedi ei ychwanegu\n"
 
-#: standalone/service_harddrake:126
+#: standalone/service_harddrake:199
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Canfod caledwedd ar waith"
@@ -24416,7 +25375,7 @@ msgstr "Newid caledwedd yn nosbarth \"%s\" (%s eiliad am ateb)"
 
 #: standalone/service_harddrake_confirm:8
 #, c-format
-msgid "Do you want to run the appropriate config tool ?"
+msgid "Do you want to run the appropriate config tool?"
 msgstr "Ydych chi redeg yr offeryn ffurfweddu priodol?"
 
 #: steps.pm:14
@@ -24509,22 +25468,22 @@ msgstr "Diweddaru"
 msgid "Exit install"
 msgstr "Gorffen"
 
-#: ugtk2.pm:1084
+#: ugtk2.pm:1122
 #, c-format
 msgid "Is this correct?"
 msgstr "Ydi hyn yn gywir?"
 
-#: ugtk2.pm:1212
+#: ugtk2.pm:1250
 #, c-format
 msgid "Expand Tree"
 msgstr "Estyn y goeden"
 
-#: ugtk2.pm:1213
+#: ugtk2.pm:1251
 #, c-format
 msgid "Collapse Tree"
 msgstr "Cau'r goeden"
 
-#: ugtk2.pm:1214
+#: ugtk2.pm:1252
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Newid rhwng gwastad a'r grwp wedi ei ddidoli"
@@ -24543,162 +25502,349 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Gweithfan Swyddfa"
+#, fuzzy
+#~ msgid "The "
+#~ msgstr "Thema"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Rhaglenni swyddfa: prosesydd geiriau (Kword, abiword, taenlenni (kspread, "
-"gnumeric), ddarllenydd pdf, ag ati"
+#, fuzzy
+#~ msgid "Morrocco"
+#~ msgstr "Morocco"
 
-#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Man chwarae"
+#, fuzzy
+#~ msgid "Server Information:"
+#~ msgstr "Gwybodaeth"
 
-#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Rhaglenni difyrrwch: arcêd, gemau bwrdd, strategaeth, ag ati"
+#, fuzzy
+#~ msgid "Use SSL connection"
+#~ msgstr "Cysylltiad ADSL"
 
-#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Man aml-gyfrwng"
+#, fuzzy
+#~ msgid "User Base:"
+#~ msgstr "Enw defnyddiwr"
 
-#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Chwarae sain a fideo/rhaglenni golygu"
+#, fuzzy
+#~ msgid "Base:"
+#~ msgstr "Enw:"
 
-#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Man Rhyngrwyd"
+#, fuzzy
+#~ msgid "Scope:"
+#~ msgstr "Aros"
 
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr ""
-"Casgliad o offer i ddarllen ac anfon e-bost a newyddion (mutt, tin..) ac i "
-"bori'r We"
+#, fuzzy
+#~ msgid "Bind Server:"
+#~ msgstr "Gweinydd:"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Cyfrifiadur Rhwydwaith (cleient)"
+#~ msgid "Use Anonymous Bind"
+#~ msgstr "Defnydd BIND anhysbys"
 
-#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Cleientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
+#, fuzzy
+#~ msgid "Users database"
+#~ msgstr "Cronfa ddata defnyddwyr LDAP"
 
-#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Ffurfweddiad"
+#, fuzzy
+#~ msgid "User allowed to browse the Active Directory"
+#~ msgstr "Defnyddiwr LDAP â chaniatâd i bori'r Cyfeiriadur Gweithredol"
 
-#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
+#~ msgid "OK"
+#~ msgstr "Iawn"
 
-#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Offer y Consol"
+#~ msgid "NO"
+#~ msgstr "NA"
 
-#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
+#~ msgid "YES"
+#~ msgstr "IAWN"
 
-#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Man Gwaith KDE"
+#~ msgid ""
+#~ "The following options can be set to customize your\n"
+#~ "system security. If you need an explanation, look at the help tooltip.\n"
+#~ msgstr ""
+#~ "Mae modd gosod y dewisiadau canlynol i addasu\n"
+#~ "diogelwch eich system. Os oes arnoch esboniadau, cliciwch ar cymorth.\n"
 
-#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"KDE - Amgylchedd Bwrdd gwaith K, yr amgylchedd graffig sylfaenol gyda "
-"chasgliad o offer"
+#~ msgid "The %s is not known by this version of Scannerdrake."
+#~ msgstr "Nid yw %s yn hysbys gan y fersiwn hwn o Scannerdrake."
 
-#: ../../share/compssUsers:999
-msgid "GNOME Workstation"
-msgstr "Man Gwaith Gnome"
+#~ msgid "Czech (QWERTZ)"
+#~ msgstr "Tsiec (QWERTY)"
 
-#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Amgylchedd graffig gyda chasgliad o raglenni ac offer bwrdd gwaith hawdd eu "
-"defnyddio."
+#~ msgid "German"
+#~ msgstr "Almaenaidd"
 
-#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Byrddau Gwaith Graffigol Eraill"
+#~ msgid "Dvorak"
+#~ msgstr "Dvorak"
 
-#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
+#~ msgid "Spanish"
+#~ msgstr "Sbaenaidd"
 
-#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
+#~ msgid "Finnish"
+#~ msgstr "Ffinaidd"
 
-#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dogfennaeth"
+#~ msgid "French"
+#~ msgstr "Ffrengig"
 
-#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
+#~ msgid "Norwegian"
+#~ msgstr "Norwyaidd"
 
-#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+#~ msgid "Polish"
+#~ msgstr "Pwylaidd"
 
-#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
+#~ msgid "Russian"
+#~ msgstr "Rwsiaidd"
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Gwe/FTP"
+#~ msgid "Swedish"
+#~ msgstr "Swedaidd"
 
-#: ../../share/compssUsers:999
-msgid "Apache, Pro-ftpd"
-msgstr "Apache, Pro-ftpd"
+#~ msgid "Albanian"
+#~ msgstr "Albaniaidd"
 
-#: ../../share/compssUsers:999
-msgid "Mail"
-msgstr "E-bost"
+#~ msgid "Armenian (old)"
+#~ msgstr "Armenaidd (hen)"
 
-#: ../../share/compssUsers:999
-msgid "Postfix mail server"
-msgstr "Gweinydd e-bost Postfix"
+#~ msgid "Armenian (typewriter)"
+#~ msgstr "Armenaidd (teipiadur)"
 
-#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Cronfa Ddata"
+#~ msgid "Armenian (phonetic)"
+#~ msgstr "Armenaidd (ffonetig)"
 
-#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
+#~ msgid "Arabic"
+#~ msgstr "Arabaidd"
 
-#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Mur Gwarchod/Llwybrydd"
+#~ msgid "Azerbaidjani (latin)"
+#~ msgstr "Azerbaidjan (lladin)"
 
-#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Porth i'r rhyngrwyd"
+#~ msgid "Belgian"
+#~ msgstr "Belgaidd"
 
-#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
+#~ msgid "Bengali"
+#~ msgstr "Bengalaidd"
 
-#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Gweinydd NFS, gweinydd SMB, gweinydd dirprwyol, gweinydd ssh"
+#~ 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 "Polish (qwertz layout)"
+#~ msgstr "Pwylaidd (gosodiad qwerty)"
+
+#~ msgid "Portuguese"
+#~ msgstr "Portiwgalaidd"
+
+#~ msgid "Canadian (Quebec)"
+#~ msgstr "Canada (Quebec)"
+
+#~ msgid "Romanian (qwertz)"
+#~ msgstr "Romanaidd (qwertz)"
+
+#~ msgid "Romanian (qwerty)"
+#~ msgstr "Romanaidd (qwerty)"
+
+#~ msgid "Russian (Phonetic)"
+#~ msgstr "Rwsiaidd (Ffonetig)"
+
+#~ msgid "Saami (norwegian)"
+#~ msgstr "Saami (norwyaidd)"
+
+#~ msgid "Saami (swedish/finnish)"
+#~ msgstr "Saami (Swedaidd/Ffinaidd)"
+
+#~ msgid "Slovenian"
+#~ msgstr "Slfenaidd"
+
+#~ msgid "Slovakian (QWERTZ)"
+#~ msgstr "Slofacaidd (QWERTZ)"
+
+#~ msgid "Slovakian (QWERTY)"
+#~ msgstr "Slofacaidd (QWERTY)"
+
+#~ msgid "Serbian (cyrillic)"
+#~ msgstr "Serbaidd (cyrilig)"
+
+#~ msgid "Syriac"
+#~ msgstr "Syriaidd"
+
+#~ msgid "Syriac (phonetic)"
+#~ msgstr "Syriaidd (ffonetig)"
+
+#~ msgid "Telugu"
+#~ msgstr "Telugu"
+
+#~ msgid "Tamil (ISCII-layout)"
+#~ msgstr "Tamil (cynllun TSCII)"
+
+#~ msgid "Tamil (Typewriter-layout)"
+#~ msgstr "Tamil (cynllun teipiadur)"
+
+#~ msgid "Thai keyboard"
+#~ msgstr "Bysellfwrdd Thai"
+
+#~ msgid "Tajik keyboard"
+#~ msgstr "Bysellfwrdd Tajig"
+
+#~ msgid "Turkish (traditional \"F\" model)"
+#~ msgstr "Twrcaidd (model traddodiadol \"F\")"
+
+#~ msgid "Turkish (modern \"Q\" model)"
+#~ msgstr "Twrcaidd (model modern \"Q\")"
+
+#~ msgid "Ukrainian"
+#~ msgstr "Wcranaidd"
+
+#~ msgid "Uzbek (cyrillic)"
+#~ msgstr "Uzbekaidd (cyrillig)"
+
+#~ msgid "Vietnamese \"numeric row\" QWERTY"
+#~ msgstr "Fietnamëaidd \"rhes rhifol\" QWERTY"
+
+#~ msgid "Yugoslavian (latin)"
+#~ msgstr "Iwgoslafaidd (lladin)"
 
-#: ../../share/compssUsers:999
-msgid "Set of tools to read and send mail and news and to browse the Web"
-msgstr "Casgliad o offer i ddarllen ac anfon e-bost a newyddion ac i bori'r We"
+#~ msgid "No devices found"
+#~ msgstr "Heb ganfod dyfais"