update

1 files changed, 3856 insertions, 3286 deletions

diff --git a/perl-install/share/po/cy.po b/perl-install/share/po/cy.po
index edaaf3dcf..9edc734b6 100644
--- a/perl-install/share/po/cy.po
+++ b/perl-install/share/po/cy.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-cy\n"
-"POT-Creation-Date: 2004-02-19 18:02+0100\n"
-"PO-Revision-Date: 2004-02-12 22:02-0000\n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
+"PO-Revision-Date: 2004-03-23 16:58+0100\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg <rhoslyn.prys@meddal.org.uk>\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgid ""
 "able to use Mandrake Move as a normal live Mandrake\n"
 "Operating System."
 msgstr ""
-"Nid oes gan eich allwedd USB raniadau Windows (FAT) dilys\n"
+"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"
 "chi symud a chael mynediad i ffeiliau o beiriannau sy'n rhedeg\n"
 "Windows). Rhowch allwedd USB yn cynnwys rhaniad Windows\n"
@@ -36,7 +36,7 @@ msgstr ""
 "\n"
 "\n"
 "Mae modd mynd yn eich blaen heb allwedd USB - bydd dal\n"
-"modd i chi ddefnyddio Mandrake Move fel system weithredu\n"
+"modd i chi ddefnyddio Mandrake Move fel System Weithredu\n"
 "Mandrake hyfyw."
 
 #: ../move/move.pm:369
@@ -103,7 +103,7 @@ msgstr ""
 "Cliciwch y botwm i ailgychwyn y peiriant, tynnwch yr allwedd, diffodd y\n"
 "diogelu, ailosod y plwg a chychwyn Mandrake Move eto."
 
-#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1310
+#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1319
 #, c-format
 msgid "Reboot"
 msgstr "Ailgychwyn"
@@ -130,14 +130,14 @@ msgstr "Gosod allwedd USB"
 #: ../move/move.pm:423
 #, c-format
 msgid "Please wait, setting up system configuration files on USB key..."
-msgstr "Arhoswch, gosod ffeiliau caniatá'r system ar allwedd USB..."
+msgstr "Arhoswch, gosod ffeiliau caniatáu'r system ar allwedd USB..."
 
 #: ../move/move.pm:445
 #, 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 sgrîn"
+"gyfer yr arbedwr sgrin"
 
 #: ../move/move.pm:455
 #, c-format
@@ -156,44 +156,51 @@ msgstr "Arhoswch, canfod a ffurfweddu dyfeisiau..."
 #: diskdrake/interactive.pm:505 diskdrake/interactive.pm:510
 #: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:253 install_steps.pm:82
 #: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:753 network/netconnect.pm:846
-#: network/netconnect.pm:849 network/netconnect.pm:894
-#: network/netconnect.pm:898 network/netconnect.pm:965
-#: network/netconnect.pm:1014 network/netconnect.pm:1019
-#: network/netconnect.pm:1034 printer/printerdrake.pm:213
+#: interactive/http.pm:119 network/netconnect.pm:929 network/netconnect.pm:932
+#: network/netconnect.pm:977 network/netconnect.pm:981
+#: network/netconnect.pm:1048 network/netconnect.pm:1098
+#: network/netconnect.pm:1103 network/netconnect.pm:1118
+#: network/netconnect.pm:1327 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:1052 printer/printerdrake.pm:1099
-#: printer/printerdrake.pm:1174 printer/printerdrake.pm:1178
-#: printer/printerdrake.pm:1349 printer/printerdrake.pm:1353
-#: printer/printerdrake.pm:1357 printer/printerdrake.pm:1457
-#: printer/printerdrake.pm:1461 printer/printerdrake.pm:1578
-#: printer/printerdrake.pm:1582 printer/printerdrake.pm:1668
-#: printer/printerdrake.pm:1755 printer/printerdrake.pm:2153
-#: printer/printerdrake.pm:2419 printer/printerdrake.pm:2425
-#: printer/printerdrake.pm:2842 printer/printerdrake.pm:2846
-#: printer/printerdrake.pm:2850 printer/printerdrake.pm:3241
-#: standalone/drakTermServ:399 standalone/drakTermServ:730
-#: standalone/drakTermServ:737 standalone/drakTermServ:931
-#: standalone/drakTermServ:1330 standalone/drakTermServ:1335
-#: standalone/drakTermServ:1342 standalone/drakTermServ:1353
-#: standalone/drakTermServ:1372 standalone/drakauth:36
-#: standalone/drakbackup:766 standalone/drakbackup:881
-#: standalone/drakbackup:1455 standalone/drakbackup:1488
-#: standalone/drakbackup:2004 standalone/drakbackup:2177
-#: standalone/drakbackup:2738 standalone/drakbackup:2805
-#: standalone/drakbackup:4826 standalone/drakboot:235 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:569
-#: standalone/drakconnect:571 standalone/drakconnect:587
+#: 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:415 standalone/drakTermServ:768
+#: standalone/drakTermServ:775 standalone/drakTermServ:970
+#: standalone/drakTermServ:1415 standalone/drakTermServ:1420
+#: standalone/drakTermServ:1427 standalone/drakTermServ:1438
+#: standalone/drakTermServ:1458 standalone/drakauth:36
+#: standalone/drakbackup:581 standalone/drakbackup:694
+#: standalone/drakbackup:1187 standalone/drakbackup:1220
+#: standalone/drakbackup:1735 standalone/drakbackup:1898
+#: standalone/drakbackup:2513 standalone/drakbackup:4286
+#: standalone/drakbackup:4509 standalone/drakboot:237 standalone/drakbug:267
+#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:608
+#: standalone/drakconnect:611 standalone/drakconnect:632
 #: standalone/drakfloppy:301 standalone/drakfloppy:305
-#: standalone/drakfloppy:311 standalone/drakfont:208 standalone/drakfont:221
-#: standalone/drakfont:257 standalone/drakfont:597 standalone/draksplash:21
-#: standalone/logdrake:171 standalone/logdrake:415 standalone/logdrake:420
-#: standalone/scannerdrake:52 standalone/scannerdrake:194
-#: standalone/scannerdrake:253 standalone/scannerdrake:676
-#: standalone/scannerdrake:687 standalone/scannerdrake:826
-#: standalone/scannerdrake:837 standalone/scannerdrake:902 wizards.pm:95
+#: standalone/drakfloppy:311 standalone/drakfont:210 standalone/drakfont:223
+#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
+#: standalone/logdrake:170 standalone/logdrake:467 standalone/logdrake:472
+#: standalone/scannerdrake:58 standalone/scannerdrake:200
+#: standalone/scannerdrake:259 standalone/scannerdrake:683
+#: standalone/scannerdrake:694 standalone/scannerdrake:833
+#: standalone/scannerdrake:844 standalone/scannerdrake:914 wizards.pm:95
 #: wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
@@ -357,9 +364,9 @@ msgstr ""
 "Beth hoffech ei wneud?"
 
 #: Xconfig/card.pm:312
-#, fuzzy, c-format
+#, c-format
 msgid "Can't install XFree package: %s"
-msgstr "Gosod pecynnau %s"
+msgstr "Methu gosod pecyn XFree: %s"
 
 #: Xconfig/card.pm:322
 #, c-format
@@ -369,7 +376,7 @@ msgstr "Dewiswch faint cof eich cerdyn graffeg"
 #: Xconfig/card.pm:398
 #, c-format
 msgid "XFree configuration"
-msgstr "Fffurfweddiad XFree"
+msgstr "Ffurfweddiad XFree"
 
 #: Xconfig/card.pm:400
 #, c-format
@@ -450,15 +457,16 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (gyrrwr gosod dangoswr)"
 
-#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:818
+#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:823
 #, c-format
 msgid "Custom"
 msgstr "Arddull"
 
 #: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14
-#: install_steps_interactive.pm:83 printer/printerdrake.pm:3871
-#: standalone/draksplash:114 standalone/harddrake2:187 standalone/logdrake:176
-#: standalone/scannerdrake:438
+#: install_steps_interactive.pm:83 printer/printerdrake.pm:608
+#: printer/printerdrake.pm:4076 standalone/draksplash:120
+#: standalone/harddrake2:188 standalone/logdrake:175
+#: standalone/scannerdrake:445
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -485,11 +493,11 @@ msgstr "Prawf"
 
 #: Xconfig/main.pm:131 diskdrake/dav.pm:67 diskdrake/interactive.pm:410
 #: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:381 standalone/drakconnect:382
-#: standalone/drakconnect:540 standalone/drakfont:491 standalone/drakfont:551
-#: standalone/harddrake2:184
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:298
+#: standalone/drakconnect:404 standalone/drakconnect:405
+#: standalone/drakconnect:576 standalone/drakfont:494 standalone/drakfont:554
+#: standalone/harddrake2:185
 #, c-format
 msgid "Options"
 msgstr "Dewisiadau"
@@ -522,7 +530,7 @@ msgstr "Plug'n Play"
 msgid "Generic"
 msgstr "Generig"
 
-#: Xconfig/monitor.pm:109 standalone/drakconnect:520 standalone/harddrake2:68
+#: Xconfig/monitor.pm:109 standalone/drakconnect:556 standalone/harddrake2:68
 #: standalone/harddrake2:69
 #, c-format
 msgid "Vendor"
@@ -607,52 +615,51 @@ msgid "Graphics card: %s"
 msgstr "Cerdyn graffeg: %s"
 
 #: Xconfig/resolution_and_depth.pm:289 interactive.pm:403
-#: interactive/gtk.pm:734 interactive/http.pm:103 interactive/http.pm:157
+#: interactive/gtk.pm:759 interactive/http.pm:103 interactive/http.pm:157
 #: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:4320 standalone/drakbackup:4352
-#: standalone/drakbackup:4445 standalone/drakbackup:4462
-#: standalone/drakbackup:4563 standalone/drakconnect:162
-#: standalone/drakconnect:734 standalone/drakconnect:821
-#: standalone/drakconnect:964 standalone/net_monitor:303 ugtk2.pm:412
-#: ugtk2.pm:509 ugtk2.pm:1047 ugtk2.pm:1070
+#: standalone/drakbackup:4045 standalone/drakbackup:4075
+#: standalone/drakbackup:4162 standalone/drakbackup:4175
+#: standalone/drakbackup:4247 standalone/drakconnect:165
+#: standalone/drakconnect:776 standalone/drakconnect:863
+#: standalone/drakconnect:962 standalone/drakups:194
+#: standalone/net_monitor:303 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1075
+#: ugtk2.pm:1098
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: Xconfig/resolution_and_depth.pm:289 any.pm:858 diskdrake/smbnfs_gtk.pm:81
+#: Xconfig/resolution_and_depth.pm:289 any.pm:863 diskdrake/smbnfs_gtk.pm:81
 #: help.pm:197 help.pm:457 install_steps_gtk.pm:488
-#: install_steps_interactive.pm:787 interactive.pm:404 interactive/gtk.pm:738
+#: install_steps_interactive.pm:788 interactive.pm:404 interactive/gtk.pm:763
 #: 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:2920
-#: standalone/drakautoinst:200 standalone/drakbackup:4284
-#: standalone/drakbackup:4311 standalone/drakbackup:4336
-#: standalone/drakbackup:4369 standalone/drakbackup:4395
-#: standalone/drakbackup:4421 standalone/drakbackup:4478
-#: standalone/drakbackup:4504 standalone/drakbackup:4534
-#: standalone/drakbackup:4558 standalone/drakconnect:161
-#: standalone/drakconnect:819 standalone/drakconnect:973
-#: standalone/drakfont:657 standalone/drakfont:734 standalone/logdrake:176
-#: standalone/net_monitor:299 ugtk2.pm:406 ugtk2.pm:507 ugtk2.pm:516
-#: ugtk2.pm:1047
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
+#: standalone/drakautoinst:217 standalone/drakbackup:4009
+#: standalone/drakbackup:4035 standalone/drakbackup:4058
+#: standalone/drakbackup:4089 standalone/drakbackup:4113
+#: standalone/drakbackup:4137 standalone/drakbackup:4189
+#: standalone/drakbackup:4216 standalone/drakbackup:4241
+#: standalone/drakconnect:164 standalone/drakconnect:861
+#: standalone/drakconnect:961 standalone/drakfont:663 standalone/drakfont:740
+#: standalone/drakups:201 standalone/logdrake:175 standalone/net_monitor:299
+#: ugtk2.pm:407 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1075
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
 #: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:267 install_steps_gtk.pm:667 interactive.pm:498
-#: interactive/gtk.pm:620 interactive/gtk.pm:622 standalone/drakTermServ:313
-#: standalone/drakbackup:4281 standalone/drakbackup:4308
-#: standalone/drakbackup:4333 standalone/drakbackup:4366
-#: standalone/drakbackup:4392 standalone/drakbackup:4418
-#: standalone/drakbackup:4459 standalone/drakbackup:4475
-#: standalone/drakbackup:4501 standalone/drakbackup:4530
-#: standalone/drakbackup:4555 standalone/drakbackup:4580
-#: standalone/drakbug:157 standalone/drakconnect:157
-#: standalone/drakconnect:227 standalone/drakfont:509 standalone/drakperm:134
-#: standalone/draksec:285 standalone/harddrake2:183 ugtk2.pm:1160
-#: ugtk2.pm:1161
+#: install_steps_gtk.pm:267 install_steps_gtk.pm:668 interactive.pm:498
+#: interactive/gtk.pm:623 interactive/gtk.pm:625 standalone/drakTermServ:316
+#: standalone/drakbackup:4010 standalone/drakbackup:4039
+#: standalone/drakbackup:4062 standalone/drakbackup:4093
+#: standalone/drakbackup:4117 standalone/drakbackup:4141
+#: standalone/drakbackup:4174 standalone/drakbackup:4193
+#: standalone/drakbackup:4220 standalone/drakbackup:4245
+#: standalone/drakbackup:4264 standalone/drakbug:157
+#: standalone/drakconnect:160 standalone/drakconnect:236
+#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
+#: standalone/harddrake2:184 ugtk2.pm:1188 ugtk2.pm:1189
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
@@ -794,19 +801,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Pa norm mae eich teledu'n ei ddefnyddio?"
 
-#: any.pm:98 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:164 standalone/drakxtv:90 standalone/harddrake2:133
-#: standalone/service_harddrake:94
+#: 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:134
+#: standalone/service_harddrake:98
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: any.pm:98
+#: any.pm:103
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Wrthi'n gosod bootloader"
 
-#: any.pm:137
+#: any.pm:142
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -821,270 +829,270 @@ msgstr ""
 "\n"
 "Gyda pha ddisg ydych chi'n cychwyn?"
 
-#: any.pm:160 any.pm:192 help.pm:800
+#: any.pm:165 any.pm:197 help.pm:800
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Adran gyntaf o'r disg (MBR)"
 
-#: any.pm:161
+#: any.pm:166
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Adran gyntaf o'r rhaniad gwraidd"
 
-#: any.pm:163
+#: any.pm:168
 #, c-format
 msgid "On Floppy"
 msgstr "Ar Ddisg Meddal"
 
-#: any.pm:165 help.pm:768 help.pm:800 printer/printerdrake.pm:3238
+#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
 #, c-format
 msgid "Skip"
 msgstr "Hepgor"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "SILO Installation"
 msgstr "Gosodiad SILO"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "Gosodiad LILO/grub"
 
-#: any.pm:171
+#: any.pm:176
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Lle rydych chi eisiau gosod y cychwynnwr?"
 
-#: any.pm:192
+#: any.pm:197
 #, c-format
 msgid "First sector of boot partition"
 msgstr "Adran gyntaf o'r rhaniad cychwyn"
 
-#: any.pm:204 any.pm:239
-#, c-format
-msgid "Bootloader main options"
-msgstr "Prif ddewisiadau Bootloader"
-
-#: any.pm:205
+#: any.pm:208
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Ffurfweddu'r Math o Gychwyn"
 
-#: any.pm:209
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "Prif ddewisiadau Bootloader"
+
+#: any.pm:214
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Rhowch faint RAM mewn MB"
 
-#: any.pm:211
+#: any.pm:216
 #, 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:212 any.pm:519 install_steps_interactive.pm:1158
+#: any.pm:217 any.pm:524 install_steps_interactive.pm:1163
 #, c-format
 msgid "The passwords do not match"
 msgstr "Nid yw'r cyfrineiriau'n cyd-fynd"
 
-#: any.pm:212 any.pm:519 diskdrake/interactive.pm:1255
-#: install_steps_interactive.pm:1158
+#: any.pm:217 any.pm:524 diskdrake/interactive.pm:1255
+#: install_steps_interactive.pm:1163
 #, c-format
 msgid "Please try again"
 msgstr "Ceisiwch eto"
 
-#: any.pm:217 any.pm:242 help.pm:768
+#: any.pm:222 any.pm:247 help.pm:768
 #, c-format
 msgid "Bootloader to use"
 msgstr "Bootloader ar waith"
 
-#: any.pm:219
+#: any.pm:224
 #, c-format
 msgid "Bootloader installation"
 msgstr "Gosodiad Bootloader"
 
-#: any.pm:221 any.pm:244 help.pm:768
+#: any.pm:226 any.pm:249 help.pm:768
 #, c-format
 msgid "Boot device"
 msgstr "Dyfais cychwyn"
 
-#: any.pm:223
+#: any.pm:228
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Oedi cyn cychwyn y ddelwedd rhagosodedig"
 
-#: any.pm:224 help.pm:768
+#: any.pm:229 help.pm:768
 #, c-format
 msgid "Enable ACPI"
 msgstr "Galluogi ACPI"
 
-#: any.pm:225
+#: any.pm:230
 #, c-format
 msgid "Force No APIC"
 msgstr "Peidio Gorfodi APIC"
 
-#: any.pm:227 any.pm:546 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1163 network/netconnect.pm:491
-#: printer/printerdrake.pm:1340 printer/printerdrake.pm:1454
-#: standalone/drakbackup:1990 standalone/drakbackup:3875
-#: standalone/drakconnect:916 standalone/drakconnect:944
+#: any.pm:232 any.pm:551 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1168 network/netconnect.pm:562
+#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
+#: standalone/drakbackup:1717 standalone/drakbackup:3592
+#: standalone/drakups:278
 #, c-format
 msgid "Password"
 msgstr "Cyfrinair"
 
-#: any.pm:228 any.pm:547 install_steps_interactive.pm:1164
+#: any.pm:233 any.pm:552 install_steps_interactive.pm:1169
 #, c-format
 msgid "Password (again)"
 msgstr "Cyfrinair (eto)"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "Restrict command line options"
 msgstr "Cyfyngu dewisiadau llinell orchymyn"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "restrict"
 msgstr "cyfyngu"
 
-#: any.pm:231
+#: any.pm:236
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Glanhau /tmp bob tro fyddwch yn cychwyn"
 
-#: any.pm:232
+#: any.pm:237
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Union faint o RAM os oes angen (canfod %dMB)"
 
-#: any.pm:234
+#: any.pm:239
 #, c-format
 msgid "Enable multiple profiles"
 msgstr "Galluogi aml-broffil"
 
-#: any.pm:243
+#: any.pm:248
 #, c-format
 msgid "Init Message"
 msgstr "Neges Init"
 
-#: any.pm:245
+#: any.pm:250
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Agor Oedi Cadarnwedd"
 
-#: any.pm:246
+#: any.pm:251
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Goramser cychwyn y cnewyllyn"
 
-#: any.pm:247
+#: any.pm:252
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "Galluogi cychwyn o CD?"
 
-#: any.pm:248
+#: any.pm:253
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "Galluogi Cychwyn OF?"
 
-#: any.pm:249
+#: any.pm:254
 #, c-format
 msgid "Default OS?"
 msgstr "System Weithredu Rhagosodedig?"
 
-#: any.pm:290
+#: any.pm:295
 #, c-format
 msgid "Image"
 msgstr "Delwedd"
 
-#: any.pm:291 any.pm:300
+#: any.pm:296 any.pm:305
 #, c-format
 msgid "Root"
 msgstr "Gwraidd"
 
-#: any.pm:292 any.pm:313
+#: any.pm:297 any.pm:318
 #, c-format
 msgid "Append"
 msgstr "Atodi"
 
-#: any.pm:294
+#: any.pm:299
 #, c-format
 msgid "Video mode"
 msgstr "Modd fideo"
 
-#: any.pm:296
+#: any.pm:301
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:305 any.pm:310 any.pm:312
+#: any.pm:310 any.pm:315 any.pm:317
 #, c-format
 msgid "Label"
 msgstr "Label"
 
-#: any.pm:307 any.pm:317 harddrake/v4l.pm:236 standalone/drakfloppy:88
+#: any.pm:312 any.pm:322 harddrake/v4l.pm:236 standalone/drakfloppy:88
 #: standalone/drakfloppy:94
 #, c-format
 msgid "Default"
 msgstr "Rhagosodedig"
 
-#: any.pm:314
+#: any.pm:319
 #, c-format
 msgid "Initrd-size"
 msgstr "Maint intrd"
 
-#: any.pm:316
+#: any.pm:321
 #, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: any.pm:327
+#: any.pm:332
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Nid yw label wag yn cael ei chaniatáu"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Rhaid enwi delwedd cnewyllyn"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Rhaid pennu rhaniad gwraidd"
 
-#: any.pm:329
+#: any.pm:334
 #, c-format
 msgid "This label is already used"
 msgstr "Mae'r label hwn yn cael ei ddefnyddio eisoes"
 
-#: any.pm:342
+#: any.pm:347
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Pa fath o gofnod ydych chi eisiau ei ychwanegu?"
 
-#: any.pm:343 standalone/drakbackup:1904
+#: any.pm:348
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:343
+#: any.pm:348
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Systemau Gweithredu eraill (SunOS..)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Systemau Gweithredu Eraill (MacOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (windows...)"
 msgstr "Systemau Gweithredu Eraill (windows...)"
 
-#: any.pm:372
+#: any.pm:377
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1093,74 +1101,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:504
+#: any.pm:509
 #, c-format
 msgid "access to X programs"
 msgstr "mynediad i raglenni  X"
 
-#: any.pm:505
+#: any.pm:510
 #, c-format
 msgid "access to rpm tools"
 msgstr "mynediad i offer rpm"
 
-#: any.pm:506
+#: any.pm:511
 #, c-format
 msgid "allow \"su\""
 msgstr "caniatáu \"su\""
 
-#: any.pm:507
+#: any.pm:512
 #, c-format
 msgid "access to administrative files"
 msgstr "mynediad i ffeiliau gweinyddol"
 
-#: any.pm:508
+#: any.pm:513
 #, c-format
 msgid "access to network tools"
 msgstr "mynediad i offer rhwydwaith"
 
-#: any.pm:509
+#: any.pm:514
 #, c-format
 msgid "access to compilation tools"
 msgstr "mynediad i offer crynhoad"
 
-#: any.pm:515
+#: any.pm:520
 #, c-format
 msgid "(already added %s)"
 msgstr "(wedi ychwanegu %s yn barod)"
 
-#: any.pm:520
+#: any.pm:525
 #, c-format
 msgid "This password is too simple"
 msgstr "Mae'r cyfrinair yn rhy syml"
 
-#: any.pm:521
+#: any.pm:526
 #, c-format
 msgid "Please give a user name"
 msgstr "Rhowch enw defnyddiwr"
 
-#: any.pm:522
+#: any.pm:527
 #, 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:523
+#: any.pm:528
 #, c-format
 msgid "The user name is too long"
 msgstr "Mae'r enw defnyddiwr yn rhy hir"
 
-#: any.pm:524
+#: any.pm:529
 #, c-format
 msgid "This user name has already been added"
 msgstr "Mae'r enw defnyddiwr wedi ei ychwanegu yn barod"
 
-#: any.pm:528
+#: any.pm:533
 #, c-format
 msgid "Add user"
 msgstr "Ychwanegu defnyddiwr"
 
-#: any.pm:529
+#: any.pm:534
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1169,76 +1177,76 @@ msgstr ""
 "Rhowch enw defnyddiwr\n"
 "%s"
 
-#: any.pm:532 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
+#: any.pm:537 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:3871
-#: standalone/drakbackup:3094 standalone/scannerdrake:629
-#: standalone/scannerdrake:779
+#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
+#: standalone/drakbackup:2802 standalone/scannerdrake:636
+#: standalone/scannerdrake:786
 #, c-format
 msgid "Done"
 msgstr "Gorffen"
 
-#: any.pm:533 help.pm:52
+#: any.pm:538 help.pm:52
 #, c-format
 msgid "Accept user"
 msgstr "Derbyn defnyddiwr"
 
-#: any.pm:544
+#: any.pm:549
 #, c-format
 msgid "Real name"
 msgstr "Enw cywir"
 
-#: any.pm:545 help.pm:52 printer/printerdrake.pm:1339
-#: printer/printerdrake.pm:1453
+#: any.pm:550 help.pm:52 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1493
 #, c-format
 msgid "User name"
 msgstr "Enw defnyddiwr"
 
-#: any.pm:548
+#: any.pm:553
 #, c-format
 msgid "Shell"
 msgstr "Cragen"
 
-#: any.pm:550
+#: any.pm:555
 #, c-format
 msgid "Icon"
 msgstr "Eicon"
 
-#: any.pm:591 security/l10n.pm:14
+#: any.pm:596 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Awtomewngofnodi"
 
-#: any.pm:592
+#: any.pm:597
 #, 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:593 help.pm:52
+#: any.pm:598 help.pm:52
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Ydych chi eisiau defnyddio'r nodwedd?"
 
-#: any.pm:594
+#: any.pm:599
 #, c-format
 msgid "Choose the default user:"
 msgstr "Dewis y defnyddiwr rhagosodedig:"
 
-#: any.pm:595
+#: any.pm:600
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Dewiswch y rheolwr ffenestr i redeg:"
 
-#: any.pm:607
+#: any.pm:612
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Dewiswch iaith i'w defnyddio."
 
-#: any.pm:628
+#: any.pm:633
 #, c-format
 msgid ""
-"Mandrake Linux can support multiple languages. Select\n"
+"Mandrakelinux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
@@ -1246,48 +1254,48 @@ 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:646 help.pm:660
+#: any.pm:651 help.pm:660
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Defnyddio Unicode drwy ragosodiad"
 
-#: any.pm:647 help.pm:660
+#: any.pm:652 help.pm:660
 #, c-format
 msgid "All languages"
 msgstr "Pob iaith"
 
-#: any.pm:683 help.pm:581 help.pm:991 install_steps_interactive.pm:907
+#: any.pm:688 help.pm:581 help.pm:991 install_steps_interactive.pm:908
 #, c-format
 msgid "Country / Region"
 msgstr "Gwlad"
 
-#: any.pm:684
+#: any.pm:689
 #, c-format
 msgid "Please choose your country."
 msgstr "Dewiswch eich gwlad."
 
-#: any.pm:686
+#: any.pm:691
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "Dyma restr lawn o'r gwledydd sydd ar gael"
 
-#: any.pm:687 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621
+#: any.pm:692 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621
 #: help.pm:991 install_steps_interactive.pm:114
 #, c-format
 msgid "More"
 msgstr "Rhagor"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "No sharing"
 msgstr "Peidio rhannu"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "Allow all users"
 msgstr "Caniatáu pob defnyddiwr"
 
-#: any.pm:822
+#: any.pm:827
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1302,7 +1310,7 @@ msgstr ""
 "\n"
 "\"Addasu\" caniatáu cyfran i'r defnyddwyr.\n"
 
-#: any.pm:838
+#: any.pm:843
 #, c-format
 msgid ""
 "You can export using NFS or Samba. Please select which you'd like to use."
@@ -1310,17 +1318,17 @@ msgstr ""
 "Gallwch allforio gan ddefnyddio NFS neu Samba. Pa un hoffech chi ei "
 "ddefnyddio?"
 
-#: any.pm:846
+#: any.pm:851
 #, c-format
 msgid "The package %s is going to be removed."
 msgstr "Mae pecyn %s yn mynd i gael ei dynnu."
 
-#: any.pm:858
+#: any.pm:863
 #, c-format
 msgid "Launch userdrake"
 msgstr "Cychwyn userdrake"
 
-#: any.pm:860
+#: any.pm:865
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1428,7 +1436,7 @@ 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:542
+#: bootloader.pm:533
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1443,59 +1451,63 @@ msgstr ""
 "aros am y cychwyn rhagosodedig\n"
 "\n"
 
-#: bootloader.pm:674
+#: bootloader.pm:665
 #, c-format
 msgid "SILO"
 msgstr "SILO"
 
-#: bootloader.pm:676 help.pm:768
+#: bootloader.pm:668 help.pm:768
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "Lilo gyda dewislen graffigol"
 
-#: bootloader.pm:677 help.pm:768
+#: bootloader.pm:670 help.pm:768
 #, c-format
 msgid "LILO with text menu"
 msgstr "LILO gyda dewislen testun"
 
-#: bootloader.pm:679
+#: bootloader.pm:672
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:681
+#: bootloader.pm:674
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1150
+#: bootloader.pm:1147
 #, c-format
 msgid "not enough room in /boot"
 msgstr "dim digon o le yn /boot"
 
-#: bootloader.pm:1178
+#: bootloader.pm:1175
 #, 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:1218
+#: bootloader.pm:1219
 #, 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."
 
-#: bootloader.pm:1225
+#: bootloader.pm:1226
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
+"Methu gosod eich cychwynnwr yn iawn, Rhaid defnyddio achub cychwyn a dewis "
+"\"%s\""
 
-#: bootloader.pm:1226
-#, fuzzy, c-format
+#: bootloader.pm:1227
+#, c-format
 msgid "Re-install Boot Loader"
-msgstr "Gosod cychwynnwr"
+msgstr "Ail osod Cychwynnwr"
 
 #: common.pm:125
 #, c-format
@@ -1532,90 +1544,91 @@ msgstr "1 munud"
 msgid "%d seconds"
 msgstr "%d eiliad"
 
-#: common.pm:196
+#: common.pm:197
 #, c-format
 msgid "Can't make screenshots before partitioning"
-msgstr "Meth creu lluniau o'r sgrîn cyn rhannu"
+msgstr "Meth creu lluniau o'r sgrin cyn rhannu"
 
-#: common.pm:203
+#: common.pm:204
 #, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Bydd lluniau o'r sgrîn ar gael ar ôl gosod yn %s"
+msgstr "Bydd lluniau o'r sgrin ar gael ar ôl gosod yn %s"
 
-#: common.pm:268
+#: common.pm:269
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesu ar goll"
 
-#: common.pm:271
+#: common.pm:272
 #, c-format
 msgid "consolehelper missing"
 msgstr "consolehelper ar goll"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:231 network/adsl_consts.pm:37
-#: network/adsl_consts.pm:48 network/adsl_consts.pm:58
-#: network/adsl_consts.pm:68 network/adsl_consts.pm:79
-#: network/adsl_consts.pm:90 network/adsl_consts.pm:100
-#: network/adsl_consts.pm:110 network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:236 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
 #, c-format
 msgid "France"
 msgstr "Ffrainc"
 
-#: crypto.pm:15 lang.pm:207
+#: crypto.pm:15 lang.pm:212
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:179 network/adsl_consts.pm:20
-#: network/adsl_consts.pm:30 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:184 network/adsl_consts.pm:26
+#: network/adsl_consts.pm:36 network/netconnect.pm:49
 #, c-format
 msgid "Belgium"
 msgstr "Gwlad Belg"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:212
+#: crypto.pm:17 crypto.pm:30 lang.pm:217
 #, c-format
 msgid "Czech Republic"
 msgstr "Gweriniaeth Tsiec"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:213 network/adsl_consts.pm:126
-#: network/adsl_consts.pm:134
+#: crypto.pm:18 crypto.pm:31 lang.pm:218 network/adsl_consts.pm:134
+#: network/adsl_consts.pm:142
 #, c-format
 msgid "Germany"
 msgstr "Yr Almaen"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:244
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
 #, c-format
 msgid "Greece"
 msgstr "Groeg"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:317
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
 #, c-format
 msgid "Norway"
 msgstr "Norwy"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:346 network/adsl_consts.pm:230
+#: crypto.pm:21 crypto.pm:34 lang.pm:351 network/adsl_consts.pm:240
 #, c-format
 msgid "Sweden"
 msgstr "Sweden"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:316 network/adsl_consts.pm:170
+#: crypto.pm:22 crypto.pm:36 lang.pm:321 network/adsl_consts.pm:178
 #: network/netconnect.pm:47
 #, c-format
 msgid "Netherlands"
 msgstr "Yr Iseldiroedd"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:264 network/adsl_consts.pm:150
-#: network/adsl_consts.pm:160 network/netconnect.pm:48 standalone/drakxtv:48
+#: crypto.pm:23 crypto.pm:37 lang.pm:269 network/adsl_consts.pm:158
+#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:48
 #, c-format
 msgid "Italy"
 msgstr "Yr Eidal"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:172
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
 #, c-format
 msgid "Austria"
 msgstr "Awstria"
 
-#: crypto.pm:35 crypto.pm:61 lang.pm:380 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:385 network/netconnect.pm:50
 #, c-format
 msgid "United States"
 msgstr "Yr Unol Daleithiau"
@@ -1700,7 +1713,7 @@ msgstr "Gwnewch gopi wrth gefn o'ch data yn gyntaf"
 #: diskdrake/hd_gtk.pm:99
 #, c-format
 msgid ""
-"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"If you plan to use aboot, be careful to leave a free space (2048 sectors is "
 "enough)\n"
 "at the beginning of the disk"
 msgstr ""
@@ -1735,6 +1748,7 @@ msgid "Please click on a partition"
 msgstr "Cliciwch ar raniad"
 
 #: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:475
+#: standalone/drakbackup:3040 standalone/drakbackup:3102
 #, c-format
 msgid "Details"
 msgstr "Manylion"
@@ -1775,7 +1789,7 @@ msgid "Windows"
 msgstr "Windows"
 
 #: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:327 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1947 standalone/drakperm:250
+#: services.pm:164 standalone/drakbackup:1673 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "Arall"
@@ -1897,7 +1911,7 @@ msgstr "Mae pob rhaniad cynradd wedi ei ddefnyddio"
 
 #: diskdrake/interactive.pm:330
 #, c-format
-msgid "I can't add any more partition"
+msgid "I can't add any more partitions"
 msgstr "Does dim modd ychwanegu raniadau ychwanegol"
 
 #: diskdrake/interactive.pm:331
@@ -1946,13 +1960,19 @@ msgstr ""
 "Nid yw'r tabl rhaniad wrth gefn yr un maint\n"
 "Parhau?"
 
-#: diskdrake/interactive.pm:378 harddrake/sound.pm:222 keyboard.pm:311
-#: network/netconnect.pm:353 printer/printerdrake.pm:2159
-#: printer/printerdrake.pm:3246 printer/printerdrake.pm:3365
-#: printer/printerdrake.pm:4338 standalone/drakTermServ:1040
-#: standalone/drakTermServ:1715 standalone/drakbackup:765
-#: standalone/drakbackup:865 standalone/drakboot:137 standalone/drakclock:200
-#: standalone/drakconnect:856 standalone/drakfloppy:295
+#: diskdrake/interactive.pm:378 harddrake/sound.pm:226 keyboard.pm:314
+#: network/netconnect.pm:438 network/netconnect.pm:457
+#: network/netconnect.pm:641 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:351 standalone/drakTermServ:1082
+#: standalone/drakTermServ:1138 standalone/drakTermServ:1801
+#: standalone/drakbackup:580 standalone/drakbackup:678 standalone/drakboot:138
+#: standalone/drakclock:204 standalone/drakconnect:898
+#: standalone/drakfloppy:295 standalone/drakups:27 standalone/scannerdrake:50
+#: standalone/scannerdrake:908
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
@@ -2065,7 +2085,7 @@ msgstr ""
 #: diskdrake/interactive.pm:535
 #, c-format
 msgid "Remove the loopback file?"
-msgstr "Tynnu'r ffeil cylchol?"
+msgstr "Tynnu'r ffeil gylchol?"
 
 #: diskdrake/interactive.pm:554
 #, c-format
@@ -2375,9 +2395,9 @@ msgid "Cylinder %d to %d\n"
 msgstr "Silindr %d i silindr %d\n"
 
 #: diskdrake/interactive.pm:1173
-#, fuzzy, c-format
+#, c-format
 msgid "Number of logical extents: %d"
-msgstr "Enw cyfrol resymegol"
+msgstr "Enw cyfrol resymegol: %d"
 
 #: diskdrake/interactive.pm:1174
 #, c-format
@@ -2519,8 +2539,8 @@ msgstr ""
 msgid "The encryption keys do not match"
 msgstr "Nid yw'r allweddi amgryptio'n cyd-fynd"
 
-#: diskdrake/interactive.pm:1258 network/netconnect.pm:889
-#: standalone/drakconnect:370
+#: diskdrake/interactive.pm:1258 network/netconnect.pm:972
+#: standalone/drakconnect:393
 #, c-format
 msgid "Encryption key"
 msgstr "Allwedd amgryptio"
@@ -2564,7 +2584,7 @@ msgstr ""
 "Rhowch eich enw defnyddiwr, cyfrinair ac enw parth i gael mynediad i'r "
 "gwesteiwr."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3874
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
 #, c-format
 msgid "Username"
 msgstr "Enw defnyddiwr"
@@ -2594,17 +2614,17 @@ msgstr "Rhaid i becyn %s gael ei osod. Ydych chi am ei osod?"
 msgid "Mandatory package %s is missing"
 msgstr "Mae pecyn gorfodol %s ar goll"
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:143
 #, c-format
 msgid "Installing packages..."
 msgstr "Gosod pecynnau..."
 
-#: do_pkgs.pm:210
+#: do_pkgs.pm:217
 #, c-format
 msgid "Removing packages..."
 msgstr "Tynnu pecyn..."
 
-#: fs.pm:399
+#: fs.pm:409
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2614,7 +2634,7 @@ msgstr ""
 "(e.e. ar gyfer mynediad cynt ar y cylch newyddion i gyflymu gweinyddion "
 "newyddion)."
 
-#: fs.pm:402
+#: fs.pm:412
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2623,13 +2643,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:405
+#: fs.pm:415
 #, 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:407
+#: fs.pm:417
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2641,7 +2661,7 @@ msgstr ""
 "systemau ffeiliau yn cynnwys deueiddiau fel pensaerniaeth gwahanol i'w un ei "
 "hun."
 
-#: fs.pm:411
+#: fs.pm:421
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2652,17 +2672,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:415
+#: fs.pm:425
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Gosodwch y system ffeiliau fel darllen yn unig."
 
-#: fs.pm:417
+#: fs.pm:427
 #, 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:421
+#: fs.pm:431
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2681,52 +2701,57 @@ msgstr ""
 "dewis\n"
 "user,exec,dev,suid )."
 
-#: fs.pm:429
+#: fs.pm:439
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Rhoi mynediad ysgrifennu i ddefnyddwyr cyffredin"
 
-#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12
+#: fs.pm:441
+#, c-format
+msgid "Give read-only access to ordinary users"
+msgstr "Rhoi mynediad darllen yn unig i ddefnyddwyr cyffredin"
+
+#: fs.pm:580 fs.pm:590 fs.pm:594 fs.pm:598 fs.pm:602 fs.pm:606 swap.pm:12
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "methodd  fformatio %s o %s"
 
-#: fs.pm:628
+#: fs.pm:647
 #, 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:635 fs.pm:642
+#: fs.pm:654 fs.pm:661
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Yn fformatio rhaniad %s"
 
-#: fs.pm:639
+#: fs.pm:658
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Creu a fformatio ffeil %s"
 
-#: fs.pm:705 fs.pm:758
+#: fs.pm:718 fs.pm:771
 #, c-format
 msgid "Mounting partition %s"
 msgstr "Yn fformatio rhaniad %s"
 
-#: fs.pm:706 fs.pm:759
+#: fs.pm:719 fs.pm:772
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "methodd gosod rhaniad %s yng nghyfeiriadur %s"
 
-#: fs.pm:726 fs.pm:734
+#: fs.pm:739 fs.pm:747
 #, c-format
 msgid "Checking %s"
 msgstr "Gwirio %s"
 
-#: fs.pm:775 partition_table.pm:636
+#: fs.pm:788 partition_table.pm:638
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "gwall dadosod %s: %s"
 
-#: fs.pm:807
+#: fs.pm:820
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "Galluogi rhaniad cyfnewid %s"
@@ -2763,32 +2788,32 @@ msgstr ""
 "\n"
 "Ydych chi'n cytuno i golli'r holl raniadau?\n"
 
-#: fsedit.pm:514
+#: fsedit.pm:513
 #, 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:515
+#: fsedit.pm:514
 #, 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:534
+#: fsedit.pm:533
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Rhaid i bwyntiau gosod gynnwys / arweiniol"
 
-#: fsedit.pm:535
+#: fsedit.pm:534
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Dylai enw'r pwyntiau gosod gynnwys llythrennau a  rhifau'n unig"
 
-#: fsedit.pm:536
+#: fsedit.pm:535
 #, 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:538
+#: fsedit.pm:537
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2799,12 +2824,23 @@ msgstr ""
 "Nid oes cychwynnwr yn gallu trin hwn heb rhaniad /boot\n"
 "Cofiwch ychwanegu rhaniad /boot"
 
-#: fsedit.pm:541
+#: fsedit.pm:540
 #, 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:543
+#: fsedit.pm:542
+#, c-format
+msgid ""
+"You've selected a LVM Logical Volume as root (/).\n"
+"The bootloader is not able to handle this without a /boot partition.\n"
+"Please be sure to add a /boot partition"
+msgstr ""
+"Rydych wedi dewis Cyfrol Resymegol LVM fel gwraidd (/)\n"
+"Nid oes cychwynnwr yn gallu trin hwn heb rhaniad /boot\n"
+"Cofiwch ychwanegu rhaniad /boot"
+
+#: fsedit.pm:545
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
@@ -2813,12 +2849,12 @@ msgstr ""
 "Efallai na fydd modd i chi osod lilo (gan nad yw lilo'n trin LV ar PV "
 "lluosog)"
 
-#: fsedit.pm:546 fsedit.pm:548
+#: fsedit.pm:548 fsedit.pm:550
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "Dylai'r cyfeiriadur aros o fewn y system ffeilio gwraidd"
 
-#: fsedit.pm:550
+#: fsedit.pm:552
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2827,22 +2863,22 @@ msgstr ""
 "Mae angen gwir system ffeilio (ext2, reiserfs,  xfs, neu jfs)) ar gyfer y "
 "pwynt gosod\n"
 
-#: fsedit.pm:552
+#: fsedit.pm:554
 #, 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:613
+#: fsedit.pm:615
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Nid oes digon o le ar gyfer awto ddynodi"
 
-#: fsedit.pm:615
+#: fsedit.pm:617
 #, c-format
 msgid "Nothing to do"
 msgstr "Dim i'w wneud"
 
-#: fsedit.pm:711
+#: fsedit.pm:713
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "Gwall wrth agos %s ar gyfer ysgrifennu %s"
@@ -2877,7 +2913,7 @@ msgstr "Llosgwyr CD/DVD"
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:59 standalone/drakbackup:2409
+#: harddrake/data.pm:59 standalone/drakbackup:2116
 #, c-format
 msgid "Tape"
 msgstr "Tâp"
@@ -2905,7 +2941,7 @@ msgstr "Cerdyn sain"
 #: harddrake/data.pm:64
 #, c-format
 msgid "Webcam"
-msgstr "Webcam"
+msgstr "Camera Gwe"
 
 #: harddrake/data.pm:68
 #, c-format
@@ -2917,36 +2953,41 @@ msgstr "Prosesyddion"
 msgid "ISDN adapters"
 msgstr "Addaswyr ISDN"
 
-#: harddrake/data.pm:71
+#: harddrake/data.pm:70
 #, c-format
 msgid "Ethernetcard"
 msgstr "Cerdyn Ethernet"
 
-#: harddrake/data.pm:79 network/netconnect.pm:366 standalone/drakconnect:277
-#: standalone/drakconnect:447 standalone/drakconnect:448
-#: standalone/drakconnect:540
+#: harddrake/data.pm:78 network/netconnect.pm:452 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:472
+#: standalone/drakconnect:473 standalone/drakconnect:576
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:80
+#: harddrake/data.pm:79
 #, c-format
 msgid "ADSL adapters"
 msgstr "Addaswyr ADSL"
 
+#: harddrake/data.pm:81
+#, c-format
+msgid "AGP controllers"
+msgstr "Rheolyddion AGP"
+
 #: harddrake/data.pm:82
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Rheolyddion pontydd a system"
 
 #: harddrake/data.pm:83 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:935 printer/printerdrake.pm:680
-#: printer/printerdrake.pm:3970
+#: install_steps_interactive.pm:940 printer/printerdrake.pm:687
+#: printer/printerdrake.pm:4175
 #, c-format
 msgid "Printer"
 msgstr "Argraffydd"
 
-#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:928
+#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:933
 #, c-format
 msgid "Mouse"
 msgstr "Llygoden"
@@ -2961,52 +3002,52 @@ msgstr "Ffon hud"
 msgid "(E)IDE/ATA controllers"
 msgstr "Rheolyddion (E)IDE/ATA"
 
-#: harddrake/data.pm:93
+#: harddrake/data.pm:94
 #, c-format
 msgid "Firewire controllers"
 msgstr "Rheolyddion firewire"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:95
 #, c-format
 msgid "SCSI controllers"
 msgstr "Rheolyddion SCSI"
 
-#: harddrake/data.pm:95
+#: harddrake/data.pm:96
 #, c-format
 msgid "USB controllers"
 msgstr "Rheolyddion USB"
 
-#: harddrake/data.pm:96
+#: harddrake/data.pm:97
 #, c-format
 msgid "SMBus controllers"
 msgstr "Rheolyddion SMBus"
 
-#: harddrake/data.pm:97
+#: harddrake/data.pm:98
 #, c-format
 msgid "Scanner"
 msgstr "Sganiwr"
 
-#: harddrake/data.pm:99 standalone/harddrake2:315
+#: harddrake/data.pm:100 standalone/harddrake2:319
 #, c-format
 msgid "Unknown/Others"
 msgstr "Anhysbys/Eraill"
 
-#: harddrake/data.pm:113
+#: harddrake/data.pm:114
 #, c-format
 msgid "cpu # "
 msgstr "cpu # "
 
-#: harddrake/sound.pm:150 standalone/drakconnect:166
+#: harddrake/sound.pm:150 standalone/drakconnect:169
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Arhoswch...Gosod y ffurfweddiad"
 
-#: harddrake/sound.pm:182
+#: harddrake/sound.pm:186
 #, c-format
 msgid "No alternative driver"
 msgstr "Dim gyrwyr eraill"
 
-#: harddrake/sound.pm:183
+#: harddrake/sound.pm:187
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3015,12 +3056,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:189
+#: harddrake/sound.pm:193
 #, c-format
 msgid "Sound configuration"
 msgstr "Ffurfweddiad sain"
 
-#: harddrake/sound.pm:191
+#: harddrake/sound.pm:195
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3029,7 +3070,7 @@ msgstr ""
 "Yma gallwch ddewis gyrrwr arall (un ai OSS neu ALSA) ar gyfer eich cerdyn "
 "sain (%s)"
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:197
 #, c-format
 msgid ""
 "\n"
@@ -3042,7 +3083,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:195
+#: harddrake/sound.pm:199
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3077,17 +3118,17 @@ msgstr ""
 "- api ALSA newydd sy'n darparu llawer o nodweddion gell ond sydd angen "
 "defnyddio llyfrgell ALSA.\n"
 
-#: harddrake/sound.pm:209 harddrake/sound.pm:289
+#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
 #, c-format
 msgid "Driver:"
 msgstr "Gyrrwr:"
 
-#: harddrake/sound.pm:214
+#: harddrake/sound.pm:218
 #, c-format
 msgid "Trouble shooting"
 msgstr "Datrys problemau"
 
-#: harddrake/sound.pm:222
+#: harddrake/sound.pm:226
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3102,12 +3143,12 @@ msgstr ""
 "\n"
 "Bydd y gyrrwr \"%s|\"'n cael ei ddefnyddio ar y cychwyn"
 
-#: harddrake/sound.pm:230
+#: harddrake/sound.pm:234
 #, c-format
 msgid "No open source driver"
 msgstr "Dim gyrrwr cod agored"
 
-#: harddrake/sound.pm:231
+#: harddrake/sound.pm:235
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3116,32 +3157,32 @@ msgstr ""
 "Nid oes gyrrwr rhydd ar gyfer eich cerdyn sain (%s) ond mae gyrrwr "
 "perchnogol yn \"%s\" ."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:238
 #, c-format
 msgid "No known driver"
 msgstr "Dim gyrrwr hysbys"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:239
 #, 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:239
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Unknown driver"
 msgstr "Gyrrwr anhysbys"
 
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:244
 #, 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:253
+#: harddrake/sound.pm:257
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Datrys problemau sain"
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:258
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3184,17 +3225,17 @@ msgstr ""
 "\n"
 "- \"/sbin/fuser -v /dev/dsp\" pa rhaglen sy'n defnyddio'r cerdyn sain.\n"
 
-#: harddrake/sound.pm:280
+#: harddrake/sound.pm:284
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Dewis gyrrwr fy hun"
 
-#: harddrake/sound.pm:283
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Dewis gyrrwr ar hap"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:288
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3280,17 +3321,17 @@ msgstr "galluogi cynnal radio"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\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."
 msgstr ""
 "Cyn parhau dylech ddarllen amodau'r drwydded yn ofalus. Mae'n ymwneud\n"
-"â holl ddosbarthiad Mandrake Linux. Os ydych yn cytuno â'r holl amodau,\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:596 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:697 standalone/drakautoinst:199
+#: install_steps_interactive.pm:697 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "Derbyn"
@@ -3383,10 +3424,9 @@ msgstr ""
 
 #: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
 #: install_steps_gtk.pm:275 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:242 network/tools.pm:208 printer/printerdrake.pm:2922
-#: standalone/drakTermServ:392 standalone/drakbackup:4487
-#: standalone/drakbackup:4513 standalone/drakbackup:4543
-#: standalone/drakbackup:4567 ugtk2.pm:509
+#: network/netconnect.pm:262 network/tools.pm:206 printer/printerdrake.pm:3090
+#: standalone/drakTermServ:408 standalone/drakbackup:4199
+#: standalone/drakbackup:4229 standalone/drakbackup:4251 ugtk2.pm:510
 #, c-format
 msgid "Next"
 msgstr "Nesaf"
@@ -3467,11 +3507,11 @@ msgstr ""
 #: help.pm:86
 #, c-format
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"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."
 msgstr ""
-"Mae gosodiad Mandrake Linux yn cynnwys nifer o CD-ROMau. Mae DrakX\n"
+"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."
 
@@ -3479,12 +3519,12 @@ msgstr ""
 #, 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 Mandrake Linux, and\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"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\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"
@@ -3527,11 +3567,11 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "Mae'n amser penderfynu pa raglenni rydych am eu gosod ar eich\n"
-"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrake Linux, ond\n"
+"system. Mae yna filoedd o becynnau ar gael ar gyfer Mandrakelinux, ond\n"
 "does dim disgwyl i chi wybod amdanyn nhw i gyd.\n"
 "\n"
 "Mae pecynnau wedi eu trefnu i grwpiau yn dibynnu ar ddefnydd penodol\n"
-"eich peiriant. Mae gan Mandrake Linux bedair gosodiad rhagosodedig. Mae\n"
+"eich peiriant. Mae gan Mandrakelinux bedair gosodiad rhagosodedig. Mae\n"
 "modd meddwl amdanynt fel blychau ar gyfer pecynnau amrywiol, fel mae modd\n"
 "i \"Man Gwaith\" fod a rhaglenni o \"Datblygu\" wedi eu gosod.\n"
 "\n"
@@ -3631,10 +3671,10 @@ msgid ""
 "!! 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"
-"installed. By default Mandrake Linux will automatically start any installed\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"
-"security holes were discovered after this version of Mandrake Linux was\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"
@@ -3663,11 +3703,11 @@ msgstr ""
 "ymddangos ar y dde. \n"
 "!! Os oes pecyn gweinydd wedi ei ddewis yn fwriadol neu am ei fod yn rhan\n"
 "o grwp cyfan, bydd angen i chi gadarnhau eich bod eisiau i'r gweinyddion\n"
-"gael eu gosod. Ym Mandrake Linux mae unrhyw weinydd sydd wedi ei\n"
+"gael eu gosod. Ym Mandrakelinux mae unrhyw weinydd sydd wedi ei\n"
 "osod yn cael ei gychwyn fel rhagosodiad wrth gychwyn. Hyd yn oed os ydynt\n"
 "yn ddiogel a doedd dim materion pryder pan gafodd y dosbarthiad ei ryddhau,\n"
 "mae'n bosibl i fylchau diogelwch gael eu darganfod wedi i'r fersiwn hwn o\n"
-"Mandrake Linux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
+"Mandrakelinux gael ei gwblhau. Os nad ydych yn gwybod beth mae\n"
 "gwasanaeth arbennig i fod i'w wneud na pham mae wedi ei osod, yna cliciwch\n"
 "\"%s\". Bydd clicio \"%s\" yn gosod y gwasanaethau hynny a byddant yn\n"
 "cael eu cychwyn yn ddiofyn drwy ragosodiad!!\n"
@@ -3683,17 +3723,17 @@ 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:422
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:218
-#: ugtk2.pm:1046 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:420
+#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:219
+#: ugtk2.pm:1074 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Na"
 
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:422 interactive.pm:149
-#: modules/interactive.pm:71 standalone/drakgw:280 standalone/drakgw:281
-#: standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:217
-#: ugtk2.pm:1046 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:420 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:218 ugtk2.pm:1074 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
@@ -3708,7 +3748,7 @@ msgstr "Dibyniaethau awtomatig"
 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"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\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"
@@ -3723,7 +3763,7 @@ msgid ""
 "\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 Mandrake Linux, some others do not. You\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"
@@ -3732,7 +3772,7 @@ msgid ""
 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 Mandrake Linux yn awtoganfod dyfeisiau rhwydwaith\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"
@@ -3767,8 +3807,8 @@ msgstr ""
 "yn debyg i'r un welwyd wrth osod y system."
 
 #: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:646
-#: standalone/drakbackup:2688 standalone/drakbackup:2696
-#: standalone/drakbackup:2704 standalone/drakbackup:2712
+#: standalone/drakbackup:2406 standalone/drakbackup:2414
+#: standalone/drakbackup:2422 standalone/drakbackup:2430
 #, c-format
 msgid "Configure"
 msgstr "Ffurfweddu"
@@ -3843,7 +3883,7 @@ msgstr ""
 "o ddewis yn medru cael ei ddefnyddio gan beiriannau eraill ar eich "
 "rhwydwaith."
 
-#: help.pm:235 install_steps_interactive.pm:834
+#: help.pm:235 install_steps_interactive.pm:835
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "Cloc caledwedd wedi ei osod i GMT"
@@ -3881,7 +3921,7 @@ msgstr ""
 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 Mandrake Linux rely upon.\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"
@@ -3935,7 +3975,7 @@ msgid ""
 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"
-"WindowMaker, etc) sy'n dod gyda Mandrake Linux yn dibynnu arno.\n"
+"WindowMaker, etc) sy'n dod gyda Mandrakelinux yn dibynnu arno.\n"
 "\n"
 "Byddwch yn derbyn rhestr o baramedrau gwahanol i'w newid i gael\n"
 "y dangosiad graffigol gorau: Cerdyn Graffig\n"
@@ -4053,7 +4093,7 @@ msgid ""
 "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"
-"Mandrake Linux system.\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"
@@ -4080,7 +4120,7 @@ msgid ""
 "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"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\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"
@@ -4089,7 +4129,7 @@ msgid ""
 "Windows 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 Mandrake Linux system,\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"
 "\n"
@@ -4142,7 +4182,7 @@ msgstr ""
 "Windows. Mae modd ail lunio maint y rhaniad heb golli data cynbelled eich\n"
 "bod wedi dad-ddarnio rhaniad Windows ac mae'n defnyddio fformat Windows.\n"
 "Argymellir cadw data wrth gefn hefyd.Argymhellir gwneud hyn os ydych am\n"
-"ddefnyddio Mandrake Linux a Microsoft Windows ar yr un cyfrifiadur.\n"
+"ddefnyddio Mandrakelinux a Microsoft Windows ar yr un cyfrifiadur.\n"
 "\n"
 "  Cyn gwneud y dewis hwn, cofiwch y bydd maint eich rhaniad Microsoft\n"
 "Windows yn llai nag yw ar hyn o bryd ar âl dilyn y drefn yma. Bydd\n"
@@ -4150,7 +4190,7 @@ msgstr ""
 "meddalwedd newydd.\n"
 "\n"
 " * \"%s\" os ydych am ddileu'r holl ddata a rhaniadau\n"
-"presennol ar eich disg caled a'u cyfnewid am system Mandrake Linux,\n"
+"presennol ar eich disg caled a'u cyfnewid am system Mandrakelinux,\n"
 "yna dewiswch hwn. Byddwch yn ofalus wrth wneud hyn gan na fydd\n"
 "modd troi'n ôl ar ôl cadarnhau.\n"
 "\n"
@@ -4266,17 +4306,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "Creu disg meddal awto gosod"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Replay"
 msgstr "Ail chwarae"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Automated"
 msgstr "Awtomeiddwyd"
 
-#: help.pm:418 install_steps_interactive.pm:1323
+#: help.pm:418 install_steps_interactive.pm:1332
 #, c-format
 msgid "Save packages selection"
 msgstr "Cadw'r dewis becynnau"
@@ -4304,7 +4344,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -4329,18 +4369,18 @@ msgstr ""
 "Cliciwch \"%s\" pan ydych yn barod i fformatio rhaniadau.\n"
 "\n"
 "Cliciwch \"%s\" os ydych am ddewis rhaniad arall ar gyfer eich gosodiad\n"
-"Mandrake Linux newydd\n"
+"Mandrakelinux newydd\n"
 "\n"
 "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:431 interactive.pm:404
-#: interactive/newt.pm:307 printer/printerdrake.pm:2920
-#: standalone/drakTermServ:371 standalone/drakbackup:4288
-#: standalone/drakbackup:4316 standalone/drakbackup:4374
-#: standalone/drakbackup:4400 standalone/drakbackup:4426
-#: standalone/drakbackup:4483 standalone/drakbackup:4509
-#: standalone/drakbackup:4539 standalone/drakbackup:4563 ugtk2.pm:507
+#: interactive/newt.pm:307 printer/printerdrake.pm:3088
+#: standalone/drakTermServ:387 standalone/drakbackup:4012
+#: standalone/drakbackup:4041 standalone/drakbackup:4095
+#: standalone/drakbackup:4119 standalone/drakbackup:4143
+#: standalone/drakbackup:4195 standalone/drakbackup:4225
+#: standalone/drakbackup:4247 ugtk2.pm:508
 #, c-format
 msgid "Previous"
 msgstr "Blaenorol"
@@ -4348,7 +4388,7 @@ msgstr "Blaenorol"
 #: help.pm:447
 #, c-format
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"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"
@@ -4360,7 +4400,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"Ar yr adeg pan fyddwch yn gosod Mandrake Linux, mae'n debygol y bydd\n"
+"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"
 "gwallau wedi eu cywiro a materion diogelwch wedi eu datrys. I ganiatáu\n"
 "i chi fanteisio ar hyn mae cynnig i chi eu llwytho i lawr o'r rhyngrwyd.\n"
@@ -4373,7 +4413,7 @@ msgstr ""
 "\"%s\" i estyn a gosod y pecynnau hynny neu \"%s\" i beidio."
 
 #: help.pm:457 help.pm:602 install_steps_gtk.pm:430
-#: install_steps_interactive.pm:148 standalone/drakbackup:4602
+#: install_steps_interactive.pm:148 standalone/drakbackup:4279
 #, c-format
 msgid "Install"
 msgstr "Gosodiad"
@@ -4418,7 +4458,7 @@ msgstr "Cyfrinair Gweinyddwr"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4489,7 +4529,7 @@ msgid ""
 "emergency boot situations."
 msgstr ""
 "Yn awr mae angen i chi ddewis pa raniadau i'w defnyddio ar gyfer gosodiad\n"
-"eich system Mandrake Linux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
+"eich system Mandrakelinux. Os oes rhaniadau wedi eu diffinio eisoes, un\n"
 "ai drwy osodiad blaenorol o GNU/Linux neu gan offeryn rhannu arall, mae\n"
 "modd i chi ddefnyddio'r rhaniadau presennol. Os nad, rhaid i' rhaniadau'r\n"
 "ddisg caled gael eu diffinio.\n"
@@ -4574,7 +4614,7 @@ msgstr "Amnewid rhwng modd arferol/arbenigol"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4604,7 +4644,7 @@ msgid ""
 msgstr ""
 "Mae mwy nag un rhaniad Microsoft wedi ei ganfod ar eich disg caled.\n"
 "Dewiswch ba un rydych am newid ei faint er mwyn gosod eich\n"
-"system weithredu Mandrake Linux newydd\n"
+"system weithredu Mandrakelinux newydd\n"
 "\n"
 "Mae pob rhaniad wedi ei restri fel hyn: \"Enw Linux\", \"Enw Windows\",\n"
 "\"Maint\".\n"
@@ -4652,7 +4692,7 @@ msgid ""
 "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 Mandrake Linux system:\n"
+"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"
@@ -4660,19 +4700,19 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\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"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\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"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"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"
 "ei ganfod ar y cyfrifiadur.\n"
 "\n"
 "Bydd DrakX angen gwybod a ydych am osod o'r newydd neu uwchraddio\n"
-"system Mandrake Linux presennol.\n"
+"system Mandrakelinux presennol.\n"
 "\n"
 " *\"%s\" Ar y cyfan, mae hwn yn tynnu'r hen system gyfan oddi ar eich\n"
 "cyfrifiadur. Os ydych am newid rhaniadau eich disgiau caled, neu newid y\n"
@@ -4680,13 +4720,13 @@ msgstr ""
 "rhannu, mae modd atal peth o'ch data rhag cael ei ysgrifennu drosto gan\n"
 "y gosodiad newydd.\n"
 " *\"%s\": mae'r dosbarth gosod hwn yn caniatáu i chi ddiweddaru'r\n"
-"pecynnau sydd wedi eu gosod ar eich system Mandrake Linux. Bydd eich\n"
+"pecynnau sydd wedi eu gosod ar eich system Mandrakelinux. Bydd eich\n"
 "rhaniadau presenol a'ch data personol yn cael eu cadw. Bydd y rhan fwyaf\n"
 "o'r camau ffurfweddu ar gael fel gyda'r gosod arferol.\n"
 "\n"
-"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrake Linux\n"
+"Dylai defnyddio \"Diweddaru\" weithio'n iawn ar systemau Mandrakelinux\n"
 "sy'n rhedeg systemau \"8.1\" neu'n ddiweddarach. Nid yw uwchraddio\n"
-"fersiynau cyn Mandrake Linux \"8.1\" yn cael ei gymeradwyo."
+"fersiynau cyn Mandrakelinux \"8.1\" yn cael ei gymeradwyo."
 
 #: help.pm:605
 #, c-format
@@ -4746,7 +4786,7 @@ msgid ""
 "\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, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -4803,7 +4843,7 @@ msgid "Espanol"
 msgstr "Sbaeneg"
 
 #: help.pm:663
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Usually, DrakX has no problems detecting the number of buttons on your\n"
 "mouse. If it does, it assumes you have a two-button mouse and will\n"
@@ -4835,30 +4875,36 @@ msgid ""
 "buttons and check that the mouse pointer moves on-screen as you move your\n"
 "mouse."
 msgstr ""
-"Drwy ragosodiad mae DrakX yn cymryd bod gennych lygoden dau fotwm\n"
-"a bydd yn ei osod i efelychu tri botwm. Bydd DrakX yn gwybod yn awtomatig\n"
-"p'un a'i yw'n lygoden PS/2, cyfresol neu USB.\n"
+"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"
+"ffurfweddu efelychiad trydydd botwm. Mae modd \"pwyso\" trydydd botwm\n"
+"llygoden dau fotwm ar unwaith gan glicio'r botymau chwith a de. Bydd DrakX\n"
+"yn gwybod yn awtomatig p'un ai yw'r llygoden yn defnyddio rhyngwyneb PS/2\n"
+"cyfresol neu USB.\n"
 "\n"
-" Os hoffech chi bennu math arall o lygoden, dewiswch y math priodol o'r "
-"rhestr.\n"
+"Lle mae gennych lygoden 3 botwm heb olwyn, cewch ddewis y llygoden sy'n\n"
+"dweud  \"%s\". Bydd DrakX yn ffurfweddu eich llygoden fel bod modd "
+"efelychu'r\n"
+"olwyn gydag ef: i wneud hynny pwyswch y botwm canol a symud eich llygodennôl "
+"a blaen.\n"
 "\n"
-"Os byddwch yn dewis llygoden ar wahân i'r rhagosodedig, byddwch yn gweld\n"
-"ffenestr profi'r llygoden. Defnyddiwch y botymau a'r olwyn i wneud yn siwr "
-"fod\n"
-"y gosodiadau'n gweithio. Os nad yw'r llygoden yn gweithio'n iawn pwyswch\n"
-"ar y bylchwr neu [Return] i ddileu'r prawf ac mynd yn ôl at y rhestr dewis.\n"
+"Os am rhyw rheswm yr hoffech nodi llygoden o fath gwahanol, dewiswch un\n"
+"o'r rhestr amgaëdig.\n"
 "\n"
-"Weithiau ni fydd llygod olwyn yn cael eu canfod yn awtomatig. Bydd rhaid i "
-"chi\n"
-"eu dewis o'r rhestr. Gwnewch yn siwr eich bod yn dewis yr un sy'n cyfateb "
-"i'r porth\n"
-"mae wedi ei gysylltu iddo. Wedi i chi wasgu'r botwm \"%s\" bydd delwedd\n"
-"llygoden yn cael ei ddangos. Bydd angen i chi symud olwyn y llygoden iddo \n"
-"weithio'n gywir. Wrth i chi wedl yr olwyn sgroli ar y sgrîn yn symud wrth i "
-"chi droi'r\n"
-"olwyn, profwch y botymau a gwirio fod cyfeirydd y llygoden yn symud ar y "
-"sgrîn\n"
-"wrth i chi symud eich l;lygoden."
+"If you choose a mouse other than the default, a test screen will be\n"
+"displayed. Use the buttons and wheel to verify that the settings are\n"
+"correct and that the mouse is working correctly. If the mouse is not\n"
+"working well, press the space bar or [Return] key to cancel the test and to\n"
+"go back to the list of choices.\n"
+"\n"
+"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"select your mouse from a list. Be sure to select the one corresponding to\n"
+"the port that your mouse is attached to. After selecting a mouse and\n"
+"pressing the \"%s\" button, a mouse image is displayed on-screen. Scroll\n"
+"the mouse wheel to ensure that it is activated correctly. Once you see the\n"
+"on-screen scroll wheel moving as you scroll your mouse wheel, test the\n"
+"buttons and check that the mouse pointer moves on-screen as you move your\n"
+"mouse."
 
 #: help.pm:691
 #, c-format
@@ -4965,7 +5011,7 @@ 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:1154
+#: help.pm:733 install_steps_interactive.pm:1159
 #, c-format
 msgid "No password"
 msgstr "Dim cyfrinair"
@@ -5000,7 +5046,7 @@ msgid ""
 "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 Mandrake Linux\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"
@@ -5112,8 +5158,9 @@ msgstr ""
 "gweithredu eraill rheini!"
 
 #: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1843 standalone/drakfont:586 standalone/drakfont:649
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakbackup:1604 standalone/drakfont:589 standalone/drakfont:655
+#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
@@ -5124,13 +5171,14 @@ msgid "Modify"
 msgstr "Newid"
 
 #: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
 
 #: help.pm:787
-#, fuzzy, c-format
+#, 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"
@@ -5147,25 +5195,26 @@ msgid ""
 "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."
 msgstr ""
-"Cychwynnwr GNU/Linux yw LILO a grub. Fel rheol mae'r rhan yma'n\n"
+"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"
 "disg a gweithredu yn â'r yr hyn mae'n ei ganfod yno.\n"
 "\n"
 " *os yw'n canfod adran cychwyn Windows, bydd yn ei amnewid gyda\n"
-"adran cychwyn grub/LILO. O ganlyniad bydd modd i chi gychwyn un\n"
+"adran cychwyn GRUB/LILO. O ganlyniad bydd modd i chi gychwyn un\n"
 "ai GNU/Linux neu system arall.\n"
 "\n"
-" *os fydd adran gychwyn grub neu LILO'n cael ei ganfod bydd yn ei\n"
+" *os fydd adran gychwyn GRUB neu LILO'n cael ei ganfod bydd yn ei\n"
 "amnewid gydag un mwy diweddar.\n"
 "\n"
-"Os nad yw'n gallu penderfynu, bydd DrakX yn gofyn i chi lle i osod\n"
-"y cychwynnwr."
+"Os nad yw'n medru penderfynu, bydd DrakX yn gofyn i chi lle i osod\n"
+"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
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -5197,20 +5246,20 @@ msgstr ""
 "gysylltiad uniongyrchol â'ch argraffydd a'ch bod eisiau medru tynnu allan o "
 "waith\n"
 "argraffu pan fo'r papur wedi mynd yn sownd ac nad oes gennych argraffyddion\n"
-"wedi eu cysylltu drwy rwydwaith. (\"Dim ond rhwydweithiau syml mae \"pdq\" "
-"yn ei\n"
+"wedi eu cysylltu drwy rwydwaith. (Dim ond rhwydweithiau syml mae \"%s\" yn "
+"ei\n"
 "drin ac mae'n araf ar rwydweithiau) Dewiswch \"pdq\" os mai dyma yw eich\n"
 "tro cyntaf yn GNU/Linux.\n"
-"\n"
 " *\"%s\" - \"Common Unix Printing System\". Mae hwn yn dda ar gyfer\n"
 "argraffu i argraffyddion lleol a hanner ffordd rownd y byd. Mae'n symlach, "
 "yn\n"
-"medru gweithredu fel gweinydd neu cleient ar gyfer yr hen system \"lpd\"\n"
+"medru gweithredu fel gwasanaethwr neu cleient ar gyfer yr hen system \"lpd"
+"\"\n"
 "felly mae'n cydweddi â'r systemau sydd wedi mynd o'i flaen. Mae'n gallu "
 "gwneud\n"
 "nifer o driciau, ond mae bron mor syml i'w osod  \"pdq\". Os ydych amgen "
 "hwn\n"
-"i efelychu gweinydd \"lpd\", yna rhaid cychwyn daemon \"cups-lpd\".\n"
+"i efelychu gwasanaethwr \"lpd\", yna rhaid cychwyn daemon \"cups-lpd\".\n"
 "Mae gan \"%s\" wyneb graffigol ar gyfer argraffu neu rheoli'r argraffu.\n"
 "\n"
 "Os ydych yn dewis yn awr ac yn ddiweddarach yn penderfynu eich bod\n"
@@ -5222,7 +5271,7 @@ msgstr ""
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:826 printer/cups.pm:99 printer/data.pm:82
+#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
@@ -5444,14 +5493,14 @@ msgstr ""
 "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:962
-#: install_steps_interactive.pm:979
+#: help.pm:929 help.pm:991 install_steps_interactive.pm:967
+#: install_steps_interactive.pm:984
 #, c-format
 msgid "Sound card"
 msgstr "Cerdyn sain"
 
 #: help.pm:932
-#, fuzzy, c-format
+#, 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"
@@ -5522,14 +5571,16 @@ msgstr ""
 "\n"
 " *\"%s\": gwirio ffurfweddiad map y bysellfwrdd a'i newid os oes angen.\n"
 "\n"
-" *\"%s\": gwirio'r dewis iaith. Os nad ydych yn y wlad hon, cliciwch y "
+" *\"%s\": gwirio'r dewis gwlad. Os nad ydych yn y wlad hon, cliciwch y "
 "botwm\n"
 "\"%s\" a dewis un arall. Os nad yw eich gwlad ar y rhestr gyntaf i'w\n"
-"dangos, cliciwch y botwm \"Rhagor\"  am y rhestr gyflawn o wledydd.\n"
+"dangos, cliciwch y botwm \"%s\"  am y rhestr gyflawn o wledydd.\n"
+"\n"
 "\n"
 " *\"%s\": Mae DrakX yn dyfalu eich parth amser yn ôl y wlad rydych\n"
 "wedi ei dewis. Mae modd clicio ar y botwm \"%s\" i'w gywiro.\n"
 "\n"
+"\n"
 " *\"%s\": gwirio ffurfweddiad y llygoden bresennol a chlicio ar y botwm\n"
 "i'w newid os oes angen.\n"
 "\n"
@@ -5549,7 +5600,7 @@ msgstr ""
 "\n"
 " *\"%s\": os oes cerdyn teledu wedi ei ganfod ar eich system\n"
 "bydd yn cael ei ddangos yma. Os oes gennych gerdyn ac nid yw wedi cael\n"
-"ei ganfod, cliciwch \"Ffurfweddu\" i geisio ei ffurfweddu â llaw.\n"
+"ei ganfod, cliciwch \"%s\" i geisio ei ffurfweddu â llaw.\n"
 "\n"
 " *\"%s\": os oes cerdyn ISDN wedi ei ganfod ar eich system bydd\n"
 "yn cael ei ddangos yma. Mae modd clicio ar \"%s\" i newid y\n"
@@ -5566,21 +5617,21 @@ msgstr ""
 "Darllennwch y bennod perthnasol yn y \"Starter Guide\" am fanylion\n"
 "gosodiadau mur cadarn.\n"
 "\n"
-" *\"%s\": os hoffech newid ffurfweddiad eich cychwynnydd\n"
+" *\"%s\": os hoffech newid ffurfweddiad eich cychwynnwr\n"
 "cliciwch y botwm honno. Ar gyfer defnyddwyr profiadol.\n"
 "\n"
 " *\"%s\": yma bydd modd i chi wneud man newidiadau i'r\n"
 "gwasanaethau sy'n cael eu rhedeg ar eich cyfrifiadur. Os ydych yn\n"
-" bwriadu defnyddio'r cyfrifiadur fel gweinydd mae'n syniad da\n"
+" 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:899 standalone/keyboarddrake:23
+#: install_steps_interactive.pm:900 standalone/keyboarddrake:23
 #, c-format
 msgid "Keyboard"
 msgstr "Bysellfwrdd"
 
-#: help.pm:991 install_steps_interactive.pm:921
+#: help.pm:991 install_steps_interactive.pm:926
 #, c-format
 msgid "Timezone"
 msgstr "Cylchfa amser"
@@ -5590,7 +5641,7 @@ msgstr "Cylchfa amser"
 msgid "Graphical Interface"
 msgstr "Rhyngwyneb Graffigol"
 
-#: help.pm:991 install_steps_interactive.pm:995
+#: help.pm:991 install_steps_interactive.pm:1000
 #, c-format
 msgid "TV card"
 msgstr "Cerdyn Teledu"
@@ -5600,27 +5651,27 @@ msgstr "Cerdyn Teledu"
 msgid "ISDN card"
 msgstr "Cerdyn ISDN"
 
-#: help.pm:991 install_steps_interactive.pm:1013 standalone/drakbackup:2394
+#: help.pm:991 install_steps_interactive.pm:1018 standalone/drakbackup:2101
 #, c-format
 msgid "Network"
 msgstr "Rhwydwaith"
 
-#: help.pm:991 install_steps_interactive.pm:1039
+#: help.pm:991 install_steps_interactive.pm:1044
 #, c-format
 msgid "Security Level"
 msgstr "Lefel Diogelwch"
 
-#: help.pm:991 install_steps_interactive.pm:1053
+#: help.pm:991 install_steps_interactive.pm:1058
 #, c-format
 msgid "Firewall"
 msgstr "Mur Cadarn"
 
-#: help.pm:991 install_steps_interactive.pm:1067
+#: help.pm:991 install_steps_interactive.pm:1072
 #, c-format
 msgid "Bootloader"
 msgstr "Cychwynnwr ar waith"
 
-#: help.pm:991 install_steps_interactive.pm:1077 services.pm:195
+#: help.pm:991 install_steps_interactive.pm:1082 services.pm:195
 #, c-format
 msgid "Services"
 msgstr "Gwasanaethau"
@@ -5629,11 +5680,11 @@ msgstr "Gwasanaethau"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
 "Dewiswch y ddisg galed rydych am ei ddileu er mwy n gosod eich rhaniad\n"
-"Mandrake Linux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
+"Mandrakelinux newydd. Byddwch ofalus, bydd yr holl ddata sydd arno'n\n"
 "cael ei ddileu ac ni fydd modd ei adfer!"
 
 #: help.pm:999
@@ -5671,7 +5722,7 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Rhaid fformatio %s hefyd"
 
-#: install_any.pm:413
+#: install_any.pm:411
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5693,7 +5744,7 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gosod y gweinyddion hyn?\n"
 
-#: install_any.pm:434
+#: install_any.pm:432
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5707,17 +5758,17 @@ msgstr ""
 "\n"
 "Ydych chi am dynnu'r pecynnau hyn?\n"
 
-#: install_any.pm:812
+#: install_any.pm:827
 #, 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:816
+#: install_any.pm:831
 #, c-format
 msgid "This floppy is not FAT formatted"
 msgstr "Nid yw 'r disg meddal hwn wedi ei fformatio i FAT"
 
-#: install_any.pm:828
+#: install_any.pm:843
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5726,12 +5777,12 @@ msgstr ""
 "I ddefnyddio'r dewis o becynnau wedi eu cadw, cychwynnwch y gosodiad gyda "
 "``linux defcfg=floppy''"
 
-#: install_any.pm:856 partition_table.pm:845
+#: install_any.pm:871 partition_table.pm:847
 #, c-format
 msgid "Error reading file %s"
 msgstr "Gwall wrth ddarllen ffeil %s"
 
-#: install_any.pm:973
+#: install_any.pm:995
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5856,11 +5907,11 @@ msgstr "Cyfrifo maint rhaniad Windows"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
+"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
 "installation."
 msgstr ""
 "Mae eich rhaniad Windows yn rhy ysgyriog, rhedwch \"defrag\" yn gyntaf o dan "
-"Windows ac yna ailgychwyn gosodi Mandrake Linux."
+"Windows ac yna ailgychwyn gosodi Mandrakelinux."
 
 #: install_interactive.pm:164
 #, c-format
@@ -5971,13 +6022,13 @@ msgstr "Cau'r rhwydwaith"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandrake "
-"Linux distribution \n"
+"The operating system and the different components available in the "
+"Mandrakelinux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrake Linux distribution.\n"
+"system and the different components of the Mandrakelinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6031,7 +6082,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrake Linux sites  which are prohibited or restricted in some "
+"from one of Mandrakelinux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6068,7 +6119,7 @@ msgid ""
 "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\", \"Mandrake Linux\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -6090,13 +6141,13 @@ msgstr ""
 "Cyflwyniad\n"
 "\n"
 "Bydd y system weithredu a'r cydrannau gwahanol sydd o fewn dosbarthiad "
-"Mandrake Linux yn\n"
+"Mandrakelinux yn\n"
 "cael eu galw yn \"Gynnyrch Meddalwedd\" o hyn ymlaen. Mae'r Cynnyrch "
 "Meddalwedd yn\n"
 "cynnwys, ond heb eu cyfyngu, i'r  casgliad o raglenni , dulliau, rheolau a "
 "dogfennau mewn\n"
-"perthynas â'r system weithredu a chydrannau gwahanol dosbarthiad Mandrake "
-"Linux.\n"
+"perthynas â'r system weithredu a chydrannau gwahanol dosbarthiad "
+"Mandrakelinux.\n"
 "\n"
 "\n"
 "1. Cytundeb Trwyddedu\n"
@@ -6114,6 +6165,7 @@ msgstr ""
 "neu ddefnyddio'r Cynnyrch Meddalwedd.\n"
 "Bydd unrhyw ymgais i osod, dyblygu neu ddefnyddio'r Cynnyrch Meddalwedd mewn "
 "modd\n"
+"\n"
 "nad yw'n cyd-fynd â thelerau ac amodau'r Drwydded yn ddi-rym a bydd yn "
 "terfynu eich\n"
 "hawliau o dan y Drwydded hon. Ar ddiwedd y Drwydded, rhaid i chi "
@@ -6125,18 +6177,19 @@ msgstr ""
 "\n"
 "Mae'r Cynnyrch Meddalwedd a'r ddogfennaeth gysylltiedig yn cael eu darparu "
 "\"fel ag y maent\",\n"
-"heb ddim gwarant, hyd y mae'r gyfraith yn caniatáu.\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 "
 "y bydd y gyfraith yn\n"
-"caniatáu,  am unrhyw iawn o gwbl, arbennig, damweiniol, uniongyrchol neu "
-"anuniongyrchol (gan\n"
-"gynnwys heb gyfyngu ar iawndal am golli busnes, tarfu ar fusnes, colled "
-"ariannol, costau cyfreithiol,\n"
-"a chosb o ganlyniad i achos llys, neu unrhyw golled o ganlyniad) yn codi o'r "
-"defnydd neu'r anallu i\n"
-"ddefnyddio'r Cynnyrch Meddalwedd, hyd yn oed os yw MandrakeSoft wedi eu "
-"cynghori o'r posibilrwydd\n"
-"o'r fath iawn.\n"
+"caniatáu,  am unrhyw iawn o gwbl,\n"
+"arbennig, damweiniol, uniongyrchol neu anuniongyrchol (gangynnwys heb "
+"gyfyngu ar iawndal\n"
+"am golli busnes, tarfu ar fusnes, colled ariannol, costau cyfreithiol, a "
+"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 "
+"iawn.\n"
 "\n"
 "CYFRIFOLDEB CYFYNGEDIG YN GYSYLLTIEDIG GYDA'R MEDDIANT NEU'R DEFNYDD O "
 "FEDDALWEDD\n"
@@ -6150,11 +6203,13 @@ msgstr ""
 "costau cyfreithiol, a chosb o ganlyniad\n"
 "i achos llys, neu unrhyw golled o ganlyniad) yn codi o lwytho i lawr "
 "cydrannau meddalwedd o un o safleoedd\n"
-" Mandrake Linux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
+" Mandrakelinux, sydd wedi eu gwahardd neu eu hatal mewn rhai gwledydd gan "
 "gyfreithiau lleol. Mae'r\n"
 "cyfrifoldeb cyfyngedig hwn yn perthyn i , ond heb ei gyfyngu i'r, cydrannau "
 "cryptograffiaeth cryf sy'n cael\n"
 "eu cynnwys o fewn y Cynnyrch Meddalwedd.\n"
+"\n"
+"\n"
 "3. Trwydded GPL a Thrwyddedau Cysylltiedig\n"
 "\n"
 "Mae'r Cynnyrch Meddalwedd yn cynnwys cydrannau sydd wedi eu creu gan "
@@ -6175,6 +6230,7 @@ msgstr ""
 "benodol. Darllenwch y dogfennau\n"
 "am fwy o fanylion.\n"
 "\n"
+"\n"
 "4. Hawliau Eiddo Deallusol\n"
 "\n"
 "Mae pob hawl cydrannau'r Cynnyrch Meddalwedd yn perthyn i'w hawduron "
@@ -6183,11 +6239,13 @@ msgstr ""
 "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. Mae \"Mandrake\", \"Mandrake Linux\"  a'r logos cysylltiedig "
-"yn nodau masnachol sy'n\n"
-"perthyn i MandrakeSoft S.A.\n"
+"unrhyw bwrpas.\n"
+"Mae \"Mandrake\", \"Mandrakelinux\"  a'r logos cysylltiedig yn nodau "
+"masnachol sy'n perthyn i MandrakeSoft S.A.\n"
+"\n"
 "\n"
 "5. Cyfreithiau Llywodraethol\n"
+"\n"
 "Os bydd unrhyw rhan o'r cytundeb hwn yn cael ei ddal yn ddi-rym, "
 "anghyfreithlon neu amherthnasol gan\n"
 "benderfyniad llys, bydd y rhan yma'n cael ei dynnu o'r cytundeb hwn. Byddwch "
@@ -6287,8 +6345,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrake "
-"Linux,\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6296,21 +6354,22 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrake Linux User's Guide."
+"install chapter of the Official Mandrakelinux User's Guide."
 msgstr ""
 "Llongyfarchiadau, mae'r gosod wedi ei gwblhau.\n"
 "Tynnwch y cyfrwng cychwyn a chlicio Ailgychwyn.\n"
 "\n"
 "\n"
-"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o Mandrake\n"
-"Linux, cysylltwch a'r atodiad, sydd i'w gael yn:\n"
+"Am wybodaeth am gywiriadau sydd ar gael ar gyfer y rhyddhad hwn o "
+"Mandrakelinux,\n"
+"cysylltwch a'r atodiad, sydd i'w gael yn:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Mae gwybodaeth ar ffurfweddu eich system ar gael ym mhenawdau ôl osod\n"
-"yr Official Mandrake Linux User's Guide."
+"yr Official Mandrakelinux User's Guide."
 
 #: install_messages.pm:141
 #, c-format
@@ -6322,7 +6381,7 @@ msgstr "http://www.mandrakelinux.com/en/100errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "Pwynt gosod dyblyg %s"
 
-#: install_steps.pm:410
+#: install_steps.pm:406
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -6335,7 +6394,7 @@ msgstr ""
 "Gwiriwch y CD-ROM ar gyfrifiadur wedi ei osod gan ddefnyddio \"rpm -qpl "
 "Mandrake/RPMS/*.rpm\"\n"
 
-#: install_steps.pm:541
+#: install_steps.pm:535
 #, c-format
 msgid "No floppy drive available"
 msgstr "Does dim disg meddal ar gael"
@@ -6349,12 +6408,12 @@ msgstr "Cychwyn cam '%s\"\n"
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
-"Mandrake Linux. If that occurs, you can try a text install instead. For "
+"Mandrakelinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Mae eich system yn brin o adnoddau. Efallai y cewch anhawsterau wrth osod\n"
-"Mandrake Linux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
+"Mandrakelinux. Os bydd hynny'n digwydd, gallwch geisio gwneud gosodiad\n"
 "testunol. I wneud hynny, gwasgwch F1 wrth gychwyn ar y CD-ROM ac yna rhoi "
 "'text'."
 
@@ -6554,8 +6613,8 @@ msgstr "Mynd yn ein blaen beth bynnag?"
 msgid "There was an error installing packages:"
 msgstr "Digwyddodd gwall wrth osod pecyn"
 
-#: install_steps_gtk.pm:656 install_steps_interactive.pm:881
-#: install_steps_interactive.pm:1029
+#: install_steps_gtk.pm:656 install_steps_interactive.pm:882
+#: install_steps_interactive.pm:1034
 #, c-format
 msgid "not configured"
 msgstr "heb ffurfweddu"
@@ -6603,7 +6662,7 @@ msgstr "Allwedd amgryptio ar gyfer %s"
 #: install_steps_interactive.pm:177
 #, c-format
 msgid "Please choose your type of mouse."
-msgstr "Dewiswch math eich llygoden"
+msgstr "Dewiswch fath eich llygoden"
 
 #: install_steps_interactive.pm:186 standalone/mousedrake:46
 #, c-format
@@ -6650,7 +6709,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "Ffurfweddu IDE"
 
-#: install_steps_interactive.pm:248 network/tools.pm:197
+#: install_steps_interactive.pm:248 network/tools.pm:195
 #, c-format
 msgid "No partition available"
 msgstr "dim rhaniadau ar gael"
@@ -6769,6 +6828,9 @@ msgid ""
 "tests, the 2.4 series kernel will be installed as the default to insure\n"
 "compliance under the \"LSB\" group selection."
 msgstr ""
+"Oherwydd anhydweddiad cnewyllyn cyfres 2.6 gyda phtofion amser\n"
+"rhedeg LSB, bydd cnewyllyn 2.4 yn cael ei osod felr rhagosodiad i\n"
+"sicrhau cydweddiad o dan ddewid grwp \"LSB\"."
 
 #: install_steps_interactive.pm:540
 #, c-format
@@ -6873,175 +6935,173 @@ msgstr ""
 #: install_steps_interactive.pm:782
 #, c-format
 msgid ""
-"Contacting Mandrake Linux web site to get the list of available mirrors..."
-msgstr ""
-"Cysylltu â safle Mandrake Linux i estyn rhestr o'r drychau sydd ar gael"
+"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:786
+#: install_steps_interactive.pm:787
 #, 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:800
+#: install_steps_interactive.pm:801
 #, 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:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Methu canfod drych: %s."
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Hoffech chi geisio eto?"
 
-#: install_steps_interactive.pm:830 standalone/drakclock:42
+#: install_steps_interactive.pm:831 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Pa un yw eich parth amser?"
 
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:836
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Cydweddi amser awtomatig (defnyddio NTP)"
 
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "NTP Server"
 msgstr "Gweinydd NTP"
 
-#: install_steps_interactive.pm:885 steps.pm:30
+#: install_steps_interactive.pm:886 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Crynodeb"
 
-#: install_steps_interactive.pm:898 install_steps_interactive.pm:906
-#: install_steps_interactive.pm:920 install_steps_interactive.pm:927
-#: install_steps_interactive.pm:1076 services.pm:135
-#: standalone/drakbackup:1937
+#: install_steps_interactive.pm:899 install_steps_interactive.pm:907
+#: install_steps_interactive.pm:925 install_steps_interactive.pm:932
+#: install_steps_interactive.pm:1081 services.pm:135
+#: standalone/drakbackup:1663
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: install_steps_interactive.pm:934 install_steps_interactive.pm:961
-#: install_steps_interactive.pm:978 install_steps_interactive.pm:994
-#: install_steps_interactive.pm:1005
+#: install_steps_interactive.pm:939 install_steps_interactive.pm:966
+#: install_steps_interactive.pm:983 install_steps_interactive.pm:999
+#: install_steps_interactive.pm:1010
 #, c-format
 msgid "Hardware"
 msgstr "Caledwedd"
 
-#: install_steps_interactive.pm:940 install_steps_interactive.pm:949
+#: install_steps_interactive.pm:945 install_steps_interactive.pm:954
 #, c-format
 msgid "Remote CUPS server"
 msgstr "Gweinydd CUPS pell"
 
-#: install_steps_interactive.pm:940
+#: install_steps_interactive.pm:945
 #, c-format
 msgid "No printer"
 msgstr "Nid oes argraffydd"
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:987
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "A oes gennych gerdyn sain ISA?"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr "Rhedwch \"sndconfig\" wedi'r gosodiad i ffurfweddu'ch cerdyn sain"
 
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:991
 #, 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:1006
+#: install_steps_interactive.pm:1011
 #, c-format
 msgid "Graphical interface"
 msgstr "Rhyngwyneb graffigol"
 
-#: install_steps_interactive.pm:1012 install_steps_interactive.pm:1027
+#: install_steps_interactive.pm:1017 install_steps_interactive.pm:1032
 #, c-format
 msgid "Network & Internet"
 msgstr "Rhwydwaith a'r Rhyngrwyd"
 
-#: install_steps_interactive.pm:1028
+#: install_steps_interactive.pm:1033
 #, c-format
 msgid "Proxies"
 msgstr "Dirprwyon"
 
-#: install_steps_interactive.pm:1029
+#: install_steps_interactive.pm:1034
 #, c-format
 msgid "configured"
 msgstr "ffurfweddu"
 
-#: install_steps_interactive.pm:1038 install_steps_interactive.pm:1052
+#: install_steps_interactive.pm:1043 install_steps_interactive.pm:1057
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Diogelwch"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "activated"
 msgstr "gweithredu"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "disabled"
 msgstr "anablwyd"
 
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1071
 #, c-format
 msgid "Boot"
 msgstr "Cychwyn"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1070
+#: install_steps_interactive.pm:1075
 #, c-format
 msgid "%s on %s"
 msgstr "%s ar %s"
 
-#: install_steps_interactive.pm:1081 services.pm:177
+#: install_steps_interactive.pm:1086 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:1091
+#: install_steps_interactive.pm:1096
 #, 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:1149
+#: install_steps_interactive.pm:1154
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Gosod dulliau gwirio cyfrinair gwraidd a rhwydwaith."
 
-#: install_steps_interactive.pm:1150
+#: install_steps_interactive.pm:1155
 #, c-format
 msgid "Set root password"
 msgstr "Gosod cyfrinair gwraidd"
 
-#: install_steps_interactive.pm:1160
+#: install_steps_interactive.pm:1165
 #, 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:1165 network/netconnect.pm:492
-#: standalone/drakauth:26 standalone/drakconnect:428
-#: standalone/drakconnect:917
+#: install_steps_interactive.pm:1170 network/netconnect.pm:563
+#: standalone/drakauth:26 standalone/drakconnect:451
 #, c-format
 msgid "Authentication"
 msgstr "Dilysu"
 
-#: install_steps_interactive.pm:1196
+#: install_steps_interactive.pm:1201
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Paratoi cychwynnwr"
 
-#: install_steps_interactive.pm:1206
+#: install_steps_interactive.pm:1211
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7056,12 +7116,12 @@ msgstr ""
 "rhaid defnyddio BootX i gychwyn\n"
 "eich peiriant."
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Ydych chi eisiau defnyddio aboot?"
 
-#: install_steps_interactive.pm:1215
+#: install_steps_interactive.pm:1220
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7070,17 +7130,17 @@ msgstr ""
 "Gwall gosod aboot, \n"
 "ceisiwch orfodi gosodiad hyd yn oed os yw hynny'n dinistrio'r rhaniad cyntaf?"
 
-#: install_steps_interactive.pm:1226
+#: install_steps_interactive.pm:1231
 #, c-format
 msgid "Installing bootloader"
 msgstr "Gosod cychwynnwr"
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1238
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Methodd gosod cychwynnwr. Digwyddodd y gwall canlynol:"
 
-#: install_steps_interactive.pm:1238
+#: install_steps_interactive.pm:1243
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -7097,24 +7157,31 @@ msgstr ""
 " Yna teipiwch: shut-down\n"
 "Wrth gychwyn eto dylech weld anogwr y cychwynnwr."
 
-#: install_steps_interactive.pm:1251
+#: install_steps_interactive.pm:1256
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
+"Ar y lefel diogelwch yma, mae mynedfa i ffeiliau yn rhaniad Windows wedi eu "
+"cyfyngu i'r Gweinyddwr."
 
-#: install_steps_interactive.pm:1283 standalone/drakautoinst:75
+#: install_steps_interactive.pm:1288 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Rhowch ddisg meddal  yng ngyrrwr %s"
 
-#: install_steps_interactive.pm:1287
+#: install_steps_interactive.pm:1293
+#, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr "Mewnosodwch ddisg meddal arall ar gyfer gyrwyr disg"
+
+#: install_steps_interactive.pm:1295
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Creu disg meddal awto gosod"
 
-#: install_steps_interactive.pm:1298
+#: install_steps_interactive.pm:1307
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7125,12 +7192,12 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau gorffen?"
 
-#: install_steps_interactive.pm:1313
+#: install_steps_interactive.pm:1322
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Creu disg meddal awto gosod"
 
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7148,15 +7215,15 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrake Linux Installation %s"
-msgstr "Gosodiad %s Mandrake Linux"
+msgid "Mandrakelinux Installation %s"
+msgstr "Gosodiad %s Mandrakelinux"
 
 #: install_steps_newt.pm:33
 #, c-format
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
-"  <Tab>/<Alt-Tab> rhwng elfennau  | <Space> yn dewis | <F12> y sgrîn nesaf "
+"  <Tab>/<Alt-Tab> rhwng elfennau  | <Space> yn dewis | <F12> y sgrin nesaf "
 
 #: interactive.pm:170
 #, c-format
@@ -7168,7 +7235,7 @@ msgstr "Dewis ffeil"
 msgid "Basic"
 msgstr "Elfennol"
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:509
+#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
 #, c-format
 msgid "Finish"
 msgstr "Gorffen"
@@ -7260,7 +7327,7 @@ msgstr "Tsiec (QWERTY)"
 #: keyboard.pm:138 keyboard.pm:171
 #, c-format
 msgid "German"
-msgstr "Almaeneg"
+msgstr "Almaenaidd"
 
 #: keyboard.pm:139
 #, c-format
@@ -7282,7 +7349,7 @@ msgstr "Ffinaidd"
 msgid "French"
 msgstr "Ffrengig"
 
-#: keyboard.pm:143 keyboard.pm:217
+#: keyboard.pm:143 keyboard.pm:220
 #, c-format
 msgid "Norwegian"
 msgstr "Norwyaidd"
@@ -7292,22 +7359,22 @@ msgstr "Norwyaidd"
 msgid "Polish"
 msgstr "Pwylaidd"
 
-#: keyboard.pm:145 keyboard.pm:226
+#: keyboard.pm:145 keyboard.pm:229
 #, c-format
 msgid "Russian"
 msgstr "Rwsiaidd"
 
-#: keyboard.pm:147 keyboard.pm:230
+#: keyboard.pm:147 keyboard.pm:233
 #, c-format
 msgid "Swedish"
 msgstr "Swedaidd"
 
-#: keyboard.pm:148 keyboard.pm:249
+#: keyboard.pm:148 keyboard.pm:252
 #, c-format
 msgid "UK keyboard"
 msgstr "Bysellfwrdd DG"
 
-#: keyboard.pm:149 keyboard.pm:250
+#: keyboard.pm:149 keyboard.pm:253
 #, c-format
 msgid "US keyboard"
 msgstr "Bysellfwrdd UDA"
@@ -7335,7 +7402,7 @@ msgstr "Armenaidd (ffonetig)"
 #: keyboard.pm:155
 #, c-format
 msgid "Arabic"
-msgstr "Arabeg"
+msgstr "Arabaidd"
 
 #: keyboard.pm:156
 #, c-format
@@ -7350,7 +7417,7 @@ msgstr "Belgaidd"
 #: keyboard.pm:159
 #, c-format
 msgid "Bengali"
-msgstr "Bengali"
+msgstr "Bengalaidd"
 
 #: keyboard.pm:160
 #, c-format
@@ -7370,7 +7437,7 @@ msgstr "Brasilaidd (ABNT-2)"
 #: keyboard.pm:165
 #, c-format
 msgid "Bosnian"
-msgstr "Bosnieg"
+msgstr "Bosniaidd"
 
 #: keyboard.pm:166
 #, c-format
@@ -7445,7 +7512,7 @@ msgstr "Groegaidd"
 #: keyboard.pm:185
 #, c-format
 msgid "Greek (polytonic)"
-msgstr "Groeg (polytonic)"
+msgstr "Groegaidd (polytonic)"
 
 #: keyboard.pm:186
 #, c-format
@@ -7502,312 +7569,312 @@ msgstr "Eidalaidd"
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: keyboard.pm:197
+#: keyboard.pm:200
 #, c-format
 msgid "Japanese 106 keys"
 msgstr "Siapaëaidd 106 bysell"
 
-#: keyboard.pm:198
+#: keyboard.pm:201
 #, c-format
 msgid "Kannada"
 msgstr "Kannada"
 
-#: keyboard.pm:201
+#: keyboard.pm:204
 #, c-format
 msgid "Korean keyboard"
 msgstr "Bysellfwrdd Corëaidd"
 
-#: keyboard.pm:202
+#: keyboard.pm:205
 #, c-format
 msgid "Latin American"
 msgstr "Lladin America"
 
-#: keyboard.pm:203
+#: keyboard.pm:206
 #, c-format
 msgid "Laotian"
-msgstr "Laotieg"
+msgstr "Laotiaidd"
 
-#: keyboard.pm:204
+#: keyboard.pm:207
 #, c-format
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lithuenaidd AZERTY (hen)"
 
-#: keyboard.pm:206
+#: keyboard.pm:209
 #, c-format
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lithuenaidd AZERTY (newydd)"
 
-#: keyboard.pm:207
+#: keyboard.pm:210
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lithuenaidd \"rhes rhif\" QWERTY"
 
-#: keyboard.pm:208
+#: keyboard.pm:211
 #, c-format
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lithuenaidd \"ffonetig\" QWERTY"
 
-#: keyboard.pm:209
+#: keyboard.pm:212
 #, c-format
 msgid "Latvian"
 msgstr "Latfiaidd"
 
-#: keyboard.pm:210
+#: keyboard.pm:213
 #, c-format
 msgid "Malayalam"
-msgstr "Malayalam"
+msgstr "Malayalamaidd"
 
-#: keyboard.pm:211
+#: keyboard.pm:214
 #, c-format
 msgid "Macedonian"
 msgstr "Macedonaidd"
 
-#: keyboard.pm:212
+#: keyboard.pm:215
 #, c-format
 msgid "Myanmar (Burmese)"
 msgstr "Myanmar (Burma)"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
 msgid "Mongolian (cyrillic)"
 msgstr "Mongolaidd (cyrillic)"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
 msgid "Maltese (UK)"
 msgstr "Maltaidd (DU)"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
 msgid "Maltese (US)"
 msgstr "Maltaidd (UDA)"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
 msgid "Dutch"
 msgstr "Isalmaenaidd"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
 msgid "Oriya"
 msgstr "Oriya"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
 msgid "Polish (qwerty layout)"
 msgstr "Pwylaidd (gosodiad qwerty)"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
 msgid "Polish (qwertz layout)"
 msgstr "Pwylaidd (gosodiad qwerty)"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
 msgid "Portuguese"
 msgstr "Portiwgalaidd"
 
-#: keyboard.pm:222
+#: keyboard.pm:225
 #, c-format
 msgid "Canadian (Quebec)"
 msgstr "Canada (Quebec)"
 
-#: keyboard.pm:224
+#: keyboard.pm:227
 #, c-format
 msgid "Romanian (qwertz)"
 msgstr "Romanaidd (qwertz)"
 
-#: keyboard.pm:225
+#: keyboard.pm:228
 #, c-format
 msgid "Romanian (qwerty)"
 msgstr "Romanaidd (qwerty)"
 
-#: keyboard.pm:227
+#: keyboard.pm:230
 #, c-format
 msgid "Russian (Phonetic)"
 msgstr "Rwsiaidd (Ffonetig)"
 
-#: keyboard.pm:228
+#: keyboard.pm:231
 #, c-format
 msgid "Saami (norwegian)"
 msgstr "Saami (norwyaidd)"
 
-#: keyboard.pm:229
+#: keyboard.pm:232
 #, c-format
 msgid "Saami (swedish/finnish)"
 msgstr "Saami (Swedaidd/Ffinaidd)"
 
-#: keyboard.pm:231
+#: keyboard.pm:234
 #, c-format
 msgid "Slovenian"
 msgstr "Slfenaidd"
 
-#: keyboard.pm:232
+#: keyboard.pm:235
 #, c-format
 msgid "Slovakian (QWERTZ)"
 msgstr "Slofacaidd (QWERTZ)"
 
-#: keyboard.pm:233
+#: keyboard.pm:236
 #, c-format
 msgid "Slovakian (QWERTY)"
 msgstr "Slofacaidd (QWERTY)"
 
-#: keyboard.pm:235
+#: keyboard.pm:238
 #, c-format
 msgid "Serbian (cyrillic)"
 msgstr "Serbaidd (cyrilig)"
 
-#: keyboard.pm:236
+#: keyboard.pm:239
 #, c-format
 msgid "Syriac"
 msgstr "Syriaidd"
 
-#: keyboard.pm:237
+#: keyboard.pm:240
 #, c-format
 msgid "Syriac (phonetic)"
 msgstr "Syriaidd (ffonetig)"
 
-#: keyboard.pm:238
+#: keyboard.pm:241
 #, c-format
 msgid "Telugu"
 msgstr "Telugu"
 
-#: keyboard.pm:240
+#: keyboard.pm:243
 #, c-format
 msgid "Tamil (ISCII-layout)"
 msgstr "Tamil (cynllun TSCII)"
 
-#: keyboard.pm:241
+#: keyboard.pm:244
 #, c-format
 msgid "Tamil (Typewriter-layout)"
 msgstr "Tamil (cynllun teipiadur)"
 
-#: keyboard.pm:242
+#: keyboard.pm:245
 #, c-format
 msgid "Thai keyboard"
 msgstr "Bysellfwrdd Thai"
 
-#: keyboard.pm:244
+#: keyboard.pm:247
 #, c-format
 msgid "Tajik keyboard"
 msgstr "Bysellfwrdd Tajig"
 
-#: keyboard.pm:245
+#: keyboard.pm:248
 #, c-format
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Twrcaidd (model traddodiadol \"F\")"
 
-#: keyboard.pm:246
+#: keyboard.pm:249
 #, c-format
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Twrcaidd (model modern \"Q\")"
 
-#: keyboard.pm:248
+#: keyboard.pm:251
 #, c-format
 msgid "Ukrainian"
 msgstr "Wcranaidd"
 
-#: keyboard.pm:251
+#: keyboard.pm:254
 #, c-format
 msgid "US keyboard (international)"
 msgstr "Bysellfwrdd UDA (rhyngwladol)"
 
-#: keyboard.pm:252
+#: keyboard.pm:255
 #, c-format
 msgid "Uzbek (cyrillic)"
-msgstr "Uzbek (cyrillig)"
+msgstr "Uzbekaidd (cyrillig)"
 
-#: keyboard.pm:253
+#: keyboard.pm:256
 #, c-format
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Fietnamëaidd \"rhes rhifol\" QWERTY"
 
-#: keyboard.pm:254
+#: keyboard.pm:257
 #, c-format
 msgid "Yugoslavian (latin)"
 msgstr "Iwgoslafaidd (lladin)"
 
-#: keyboard.pm:261
+#: keyboard.pm:264
 #, c-format
 msgid "Right Alt key"
 msgstr "Bysell Alt dde"
 
-#: keyboard.pm:262
+#: keyboard.pm:265
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Y ddwy fysell Shift gyda'i gilydd"
 
-#: keyboard.pm:263
+#: keyboard.pm:266
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Bysellau Control a Shift gyda'i gilydd"
 
-#: keyboard.pm:264
+#: keyboard.pm:267
 #, c-format
 msgid "CapsLock key"
 msgstr "Bysell CapsLock"
 
-#: keyboard.pm:265
+#: keyboard.pm:268
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Bysellau Ctrl ac Alt gyda'i gilydd"
 
-#: keyboard.pm:266
+#: keyboard.pm:269
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Bysellau Alt a Shift  gyda'i gilydd"
 
-#: keyboard.pm:267
+#: keyboard.pm:270
 #, c-format
 msgid "\"Menu\" key"
 msgstr "Bysell \"Dewislen\""
 
-#: keyboard.pm:268
+#: keyboard.pm:271
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Bysell \"Windows\" chwith"
 
-#: keyboard.pm:269
+#: keyboard.pm:272
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Bysell \"Windows\" de"
 
-#: keyboard.pm:270
+#: keyboard.pm:273
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Y ddwy fysell Control gyda'i gilydd"
 
-#: keyboard.pm:271
+#: keyboard.pm:274
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Y ddwy fysell Alt gyda'i gilydd"
 
-#: keyboard.pm:272
+#: keyboard.pm:275
 #, c-format
 msgid "Left Shift key"
 msgstr "Bysell Shift chwith"
 
-#: keyboard.pm:273
+#: keyboard.pm:276
 #, c-format
 msgid "Right Shift key"
 msgstr "Bysell Alt dde"
 
-#: keyboard.pm:274
+#: keyboard.pm:277
 #, c-format
 msgid "Left Alt key"
 msgstr "Bysell Alt chwith"
 
-#: keyboard.pm:275
+#: keyboard.pm:278
 #, c-format
 msgid "Left Control key"
 msgstr "Bysell Control chwith"
 
-#: keyboard.pm:276
+#: keyboard.pm:279
 #, c-format
 msgid "Right Control key"
 msgstr "Bysell Control dde"
 
-#: keyboard.pm:307
+#: keyboard.pm:310
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7818,7 +7885,7 @@ msgstr ""
 "caniatáu newid rhwng bysellfyrddau gwahanol (e.e.: lladin neu\n"
 "arall)"
 
-#: keyboard.pm:312
+#: keyboard.pm:315
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7829,1144 +7896,1144 @@ msgstr ""
 "Yn ystod y gosod, bydd angen i chi ddefnyddio'r fysell\n"
 "Crtl de i newid rhwng bysellfyrddau cynllun gwahanol."
 
-#: lang.pm:144
+#: lang.pm:149
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:160
+#: lang.pm:165
 #, c-format
 msgid "Afghanistan"
 msgstr "Afghanistan"
 
-#: lang.pm:161
+#: lang.pm:166
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:162
+#: lang.pm:167
 #, c-format
 msgid "United Arab Emirates"
 msgstr "United Arab Emirates"
 
-#: lang.pm:163
+#: lang.pm:168
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua a Barbuda"
 
-#: lang.pm:164
+#: lang.pm:169
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:165
+#: lang.pm:170
 #, c-format
 msgid "Albania"
 msgstr "Albania"
 
-#: lang.pm:166
+#: lang.pm:171
 #, c-format
 msgid "Armenia"
 msgstr "Armenia"
 
-#: lang.pm:167
+#: lang.pm:172
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Netherlands Antilles"
 
-#: lang.pm:168
+#: lang.pm:173
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:169
+#: lang.pm:174
 #, c-format
 msgid "Antarctica"
 msgstr "Antarctica"
 
-#: lang.pm:170 standalone/drakxtv:51
+#: lang.pm:175 standalone/drakxtv:51
 #, c-format
 msgid "Argentina"
 msgstr "Yr Ariannin"
 
-#: lang.pm:171
+#: lang.pm:176
 #, c-format
 msgid "American Samoa"
 msgstr "American Samoa"
 
-#: lang.pm:173 standalone/drakxtv:49
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
 #, c-format
 msgid "Australia"
 msgstr "Awstralia"
 
-#: lang.pm:174
+#: lang.pm:179
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:175
+#: lang.pm:180
 #, c-format
 msgid "Azerbaijan"
 msgstr "Azerbaijan"
 
-#: lang.pm:176
+#: lang.pm:181
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia ac Herzegovina"
 
-#: lang.pm:177
+#: lang.pm:182
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:178
+#: lang.pm:183
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:180
+#: lang.pm:185
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:181
+#: lang.pm:186
 #, c-format
 msgid "Bulgaria"
 msgstr "Bwlgaria"
 
-#: lang.pm:182
+#: lang.pm:187
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrain"
 
-#: lang.pm:183
+#: lang.pm:188
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:184
+#: lang.pm:189
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:185
+#: lang.pm:190
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:186
+#: lang.pm:191
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei Darussalam"
 
-#: lang.pm:187
+#: lang.pm:192
 #, c-format
 msgid "Bolivia"
 msgstr "Bolivia"
 
-#: lang.pm:188
+#: lang.pm:193
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: lang.pm:189
+#: lang.pm:194
 #, c-format
 msgid "Bahamas"
 msgstr "Bahamas"
 
-#: lang.pm:190
+#: lang.pm:195
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:191
+#: lang.pm:196
 #, c-format
 msgid "Bouvet Island"
 msgstr "Ynys Bouvet"
 
-#: lang.pm:192
+#: lang.pm:197
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:193
+#: lang.pm:198
 #, c-format
 msgid "Belarus"
 msgstr "Belarus"
 
-#: lang.pm:194
+#: lang.pm:199
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:195
+#: lang.pm:200
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: lang.pm:196
+#: lang.pm:201
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Ynysoedd Cocos (Keeling)"
 
-#: lang.pm:197
+#: lang.pm:202
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Congo (Kinshasa)"
 
-#: lang.pm:198
+#: lang.pm:203
 #, c-format
 msgid "Central African Republic"
 msgstr "Gweriniaeth Canol Affrica"
 
-#: lang.pm:199
+#: lang.pm:204
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Congo (Brazzaville)"
 
-#: lang.pm:200
+#: lang.pm:205
 #, c-format
 msgid "Switzerland"
 msgstr "Y Swisdir"
 
-#: lang.pm:201
+#: lang.pm:206
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: lang.pm:202
+#: lang.pm:207
 #, c-format
 msgid "Cook Islands"
 msgstr "Ynysoedd Cook"
 
-#: lang.pm:203
+#: lang.pm:208
 #, c-format
 msgid "Chile"
 msgstr "Chile"
 
-#: lang.pm:204
+#: lang.pm:209
 #, c-format
 msgid "Cameroon"
 msgstr "Cameroon"
 
-#: lang.pm:205
+#: lang.pm:210
 #, c-format
 msgid "China"
 msgstr "Tsieina"
 
-#: lang.pm:206
+#: lang.pm:211
 #, c-format
 msgid "Colombia"
 msgstr "Colombia"
 
-#: lang.pm:208
+#: lang.pm:213
 #, c-format
 msgid "Cuba"
 msgstr "Ciwba"
 
-#: lang.pm:209
+#: lang.pm:214
 #, c-format
 msgid "Cape Verde"
 msgstr "Cape Verde"
 
-#: lang.pm:210
+#: lang.pm:215
 #, c-format
 msgid "Christmas Island"
 msgstr "Ynys Christmas"
 
-#: lang.pm:211
+#: lang.pm:216
 #, c-format
 msgid "Cyprus"
 msgstr "Cyprus"
 
-#: lang.pm:214
+#: lang.pm:219
 #, c-format
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:215
+#: lang.pm:220
 #, c-format
 msgid "Denmark"
 msgstr "Denmarc"
 
-#: lang.pm:216
+#: lang.pm:221
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:217
+#: lang.pm:222
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominican Republic"
 
-#: lang.pm:218
+#: lang.pm:223
 #, c-format
 msgid "Algeria"
 msgstr "Algeria"
 
-#: lang.pm:219
+#: lang.pm:224
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:220
+#: lang.pm:225
 #, c-format
 msgid "Estonia"
 msgstr "Estonia"
 
-#: lang.pm:221
+#: lang.pm:226
 #, c-format
 msgid "Egypt"
 msgstr "Yr Aifft"
 
-#: lang.pm:222
+#: lang.pm:227
 #, c-format
 msgid "Western Sahara"
 msgstr "Western Sahara"
 
-#: lang.pm:223
+#: lang.pm:228
 #, c-format
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: lang.pm:224 network/adsl_consts.pm:193 network/adsl_consts.pm:200
-#: network/adsl_consts.pm:209 network/adsl_consts.pm:220
+#: lang.pm:229 network/adsl_consts.pm:202 network/adsl_consts.pm:210
+#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
 #, c-format
 msgid "Spain"
 msgstr "Sbaen"
 
-#: lang.pm:225
+#: lang.pm:230
 #, c-format
 msgid "Ethiopia"
 msgstr "Ethiopia"
 
-#: lang.pm:226 network/adsl_consts.pm:119
+#: lang.pm:231 network/adsl_consts.pm:127
 #, c-format
 msgid "Finland"
 msgstr "Y Ffindir"
 
-#: lang.pm:227
+#: lang.pm:232
 #, c-format
 msgid "Fiji"
 msgstr "Ffiji"
 
-#: lang.pm:228
+#: lang.pm:233
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Ynysoedd y Falkland (Malvinas)"
 
-#: lang.pm:229
+#: lang.pm:234
 #, c-format
 msgid "Micronesia"
 msgstr "Micronesia"
 
-#: lang.pm:230
+#: lang.pm:235
 #, c-format
 msgid "Faroe Islands"
 msgstr "Ynysoedd Faroe"
 
-#: lang.pm:232
+#: lang.pm:237
 #, c-format
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:233 network/adsl_consts.pm:237 network/adsl_consts.pm:244
+#: lang.pm:238 network/adsl_consts.pm:247 network/adsl_consts.pm:255
 #: network/netconnect.pm:51
 #, c-format
 msgid "United Kingdom"
 msgstr "Y Deyrnas Unedig"
 
-#: lang.pm:234
+#: lang.pm:239
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:235
+#: lang.pm:240
 #, c-format
 msgid "Georgia"
 msgstr "Georgia"
 
-#: lang.pm:236
+#: lang.pm:241
 #, c-format
 msgid "French Guiana"
 msgstr "French Guiana"
 
-#: lang.pm:237
+#: lang.pm:242
 #, c-format
 msgid "Ghana"
 msgstr "Ghana"
 
-#: lang.pm:238
+#: lang.pm:243
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:239
+#: lang.pm:244
 #, c-format
 msgid "Greenland"
 msgstr "Greenland"
 
-#: lang.pm:240
+#: lang.pm:245
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:241
+#: lang.pm:246
 #, c-format
 msgid "Guinea"
 msgstr "Guinea"
 
-#: lang.pm:242
+#: lang.pm:247
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:243
+#: lang.pm:248
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Equatorial Guinea"
 
-#: lang.pm:245
+#: lang.pm:250
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "De Georgia ac Ynysoedd De Sandwich"
 
-#: lang.pm:246
+#: lang.pm:251
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: lang.pm:247
+#: lang.pm:252
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:248
+#: lang.pm:253
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: lang.pm:249
+#: lang.pm:254
 #, c-format
 msgid "Guyana"
 msgstr "Guyana"
 
-#: lang.pm:250
+#: lang.pm:255
 #, c-format
 msgid "China (Hong Kong)"
 msgstr "Tseina (Hong Kong)"
 
-#: lang.pm:251
+#: lang.pm:256
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard a McDonald Islands"
 
-#: lang.pm:252
+#: lang.pm:257
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:253
+#: lang.pm:258
 #, c-format
 msgid "Croatia"
 msgstr "Croatia"
 
-#: lang.pm:254
+#: lang.pm:259
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:255 network/adsl_consts.pm:144
+#: lang.pm:260 network/adsl_consts.pm:152
 #, c-format
 msgid "Hungary"
 msgstr "Hwngari"
 
-#: lang.pm:256
+#: lang.pm:261
 #, c-format
 msgid "Indonesia"
 msgstr "Indonesia"
 
-#: lang.pm:257 standalone/drakxtv:48
+#: lang.pm:262 standalone/drakxtv:48
 #, c-format
 msgid "Ireland"
 msgstr "Iwerddon"
 
-#: lang.pm:258
+#: lang.pm:263
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: lang.pm:259
+#: lang.pm:264
 #, c-format
 msgid "India"
 msgstr "India"
 
-#: lang.pm:260
+#: lang.pm:265
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "British Indian Ocean Territory"
 
-#: lang.pm:261
+#: lang.pm:266
 #, c-format
 msgid "Iraq"
 msgstr "Irac"
 
-#: lang.pm:262
+#: lang.pm:267
 #, c-format
 msgid "Iran"
 msgstr "Iran"
 
-#: lang.pm:263
+#: lang.pm:268
 #, c-format
 msgid "Iceland"
 msgstr "Ynys yr Iâ"
 
-#: lang.pm:265
+#: lang.pm:270
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:266
+#: lang.pm:271
 #, c-format
 msgid "Jordan"
 msgstr "Yr Iorddonen"
 
-#: lang.pm:267
+#: lang.pm:272
 #, c-format
 msgid "Japan"
 msgstr "Siapan"
 
-#: lang.pm:268
+#: lang.pm:273
 #, c-format
 msgid "Kenya"
 msgstr "Kenya"
 
-#: lang.pm:269
+#: lang.pm:274
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kyrgyzstan"
 
-#: lang.pm:270
+#: lang.pm:275
 #, c-format
 msgid "Cambodia"
 msgstr "Cambodia"
 
-#: lang.pm:271
+#: lang.pm:276
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:272
+#: lang.pm:277
 #, c-format
 msgid "Comoros"
 msgstr "Comoros"
 
-#: lang.pm:273
+#: lang.pm:278
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts a Nevis"
 
-#: lang.pm:274
+#: lang.pm:279
 #, c-format
 msgid "Korea (North)"
 msgstr "Corea (Gogledd)"
 
-#: lang.pm:275
+#: lang.pm:280
 #, c-format
 msgid "Korea"
 msgstr "Corea"
 
-#: lang.pm:276
+#: lang.pm:281
 #, c-format
 msgid "Kuwait"
 msgstr "Kuwait"
 
-#: lang.pm:277
+#: lang.pm:282
 #, c-format
 msgid "Cayman Islands"
 msgstr "Cayman Islands"
 
-#: lang.pm:278
+#: lang.pm:283
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kazakhstan"
 
-#: lang.pm:279
+#: lang.pm:284
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:280
+#: lang.pm:285
 #, c-format
 msgid "Lebanon"
 msgstr "Libanus"
 
-#: lang.pm:281
+#: lang.pm:286
 #, c-format
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: lang.pm:282
+#: lang.pm:287
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:283
+#: lang.pm:288
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:284
+#: lang.pm:289
 #, c-format
 msgid "Liberia"
 msgstr "Liberia"
 
-#: lang.pm:285
+#: lang.pm:290
 #, c-format
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:286
+#: lang.pm:291
 #, c-format
 msgid "Lithuania"
 msgstr "Lithuania"
 
-#: lang.pm:287
+#: lang.pm:292
 #, c-format
 msgid "Luxembourg"
 msgstr "Luxembourg"
 
-#: lang.pm:288
+#: lang.pm:293
 #, c-format
 msgid "Latvia"
 msgstr "Latfia"
 
-#: lang.pm:289
+#: lang.pm:294
 #, c-format
 msgid "Libya"
 msgstr "Libya"
 
-#: lang.pm:290
+#: lang.pm:295
 #, c-format
 msgid "Morocco"
 msgstr "Morocco"
 
-#: lang.pm:291
+#: lang.pm:296
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:292
+#: lang.pm:297
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:293
+#: lang.pm:298
 #, c-format
 msgid "Madagascar"
 msgstr "Madagascar"
 
-#: lang.pm:294
+#: lang.pm:299
 #, c-format
 msgid "Marshall Islands"
 msgstr "Ynysoedd Marshall"
 
-#: lang.pm:295
+#: lang.pm:300
 #, c-format
 msgid "Macedonia"
 msgstr "Macedonia"
 
-#: lang.pm:296
+#: lang.pm:301
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:297
+#: lang.pm:302
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:298
+#: lang.pm:303
 #, c-format
 msgid "Mongolia"
 msgstr "Mongolia"
 
-#: lang.pm:299
+#: lang.pm:304
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Ynysoedd Gogledd Mariana"
 
-#: lang.pm:300
+#: lang.pm:305
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:301
+#: lang.pm:306
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritania"
 
-#: lang.pm:302
+#: lang.pm:307
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:303
+#: lang.pm:308
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:304
+#: lang.pm:309
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:305
+#: lang.pm:310
 #, c-format
 msgid "Maldives"
 msgstr "Maldives"
 
-#: lang.pm:306
+#: lang.pm:311
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:307
+#: lang.pm:312
 #, c-format
 msgid "Mexico"
 msgstr "Mecsico"
 
-#: lang.pm:308
+#: lang.pm:313
 #, c-format
 msgid "Malaysia"
 msgstr "Malaysia"
 
-#: lang.pm:309
+#: lang.pm:314
 #, c-format
 msgid "Mozambique"
 msgstr "Mozambique"
 
-#: lang.pm:310
+#: lang.pm:315
 #, c-format
 msgid "Namibia"
 msgstr "Namibia"
 
-#: lang.pm:311
+#: lang.pm:316
 #, c-format
 msgid "New Caledonia"
 msgstr "Caledonia Newydd"
 
-#: lang.pm:312
+#: lang.pm:317
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:313
+#: lang.pm:318
 #, c-format
 msgid "Norfolk Island"
 msgstr "Ynys Norfolk"
 
-#: lang.pm:314
+#: lang.pm:319
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeria"
 
-#: lang.pm:315
+#: lang.pm:320
 #, c-format
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:318
+#: lang.pm:323
 #, c-format
 msgid "Nepal"
 msgstr "Nepal"
 
-#: lang.pm:319
+#: lang.pm:324
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:320
+#: lang.pm:325
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:321
+#: lang.pm:326
 #, c-format
 msgid "New Zealand"
 msgstr "Seland Newydd"
 
-#: lang.pm:322
+#: lang.pm:327
 #, c-format
 msgid "Oman"
 msgstr "Oman"
 
-#: lang.pm:323
+#: lang.pm:328
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:324
+#: lang.pm:329
 #, c-format
 msgid "Peru"
 msgstr "Periw"
 
-#: lang.pm:325
+#: lang.pm:330
 #, c-format
 msgid "French Polynesia"
 msgstr "Polynesia Ffrengig"
 
-#: lang.pm:326
+#: lang.pm:331
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Papua New Guinea"
 
-#: lang.pm:327
+#: lang.pm:332
 #, c-format
 msgid "Philippines"
 msgstr "Philippines"
 
-#: lang.pm:328
+#: lang.pm:333
 #, c-format
 msgid "Pakistan"
 msgstr "Pacistan"
 
-#: lang.pm:329 network/adsl_consts.pm:177
+#: lang.pm:334 network/adsl_consts.pm:186
 #, c-format
 msgid "Poland"
 msgstr "Gwlad Pwyl"
 
-#: lang.pm:330
+#: lang.pm:335
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre a Miquelon"
 
-#: lang.pm:331
+#: lang.pm:336
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:332
+#: lang.pm:337
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:333
+#: lang.pm:338
 #, c-format
 msgid "Palestine"
 msgstr "Palestina"
 
-#: lang.pm:334 network/adsl_consts.pm:187
+#: lang.pm:339 network/adsl_consts.pm:196
 #, c-format
 msgid "Portugal"
 msgstr "Portiwgal"
 
-#: lang.pm:335
+#: lang.pm:340
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:336
+#: lang.pm:341
 #, c-format
 msgid "Palau"
 msgstr "Palau"
 
-#: lang.pm:337
+#: lang.pm:342
 #, c-format
 msgid "Qatar"
 msgstr "Qatar"
 
-#: lang.pm:338
+#: lang.pm:343
 #, c-format
 msgid "Reunion"
 msgstr "Reunion"
 
-#: lang.pm:339
+#: lang.pm:344
 #, c-format
 msgid "Romania"
 msgstr "Rwmania"
 
-#: lang.pm:340
+#: lang.pm:345
 #, c-format
 msgid "Russia"
 msgstr "Rwsia"
 
-#: lang.pm:341
+#: lang.pm:346
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:342
+#: lang.pm:347
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Saudi Arabia"
 
-#: lang.pm:343
+#: lang.pm:348
 #, c-format
 msgid "Solomon Islands"
 msgstr "Ynysoedd Solomon"
 
-#: lang.pm:344
+#: lang.pm:349
 #, c-format
 msgid "Seychelles"
 msgstr "Seychelles"
 
-#: lang.pm:345
+#: lang.pm:350
 #, c-format
 msgid "Sudan"
 msgstr "Swdan"
 
-#: lang.pm:347
+#: lang.pm:352
 #, c-format
 msgid "Singapore"
 msgstr "Singapore"
 
-#: lang.pm:348
+#: lang.pm:353
 #, c-format
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: lang.pm:349
+#: lang.pm:354
 #, c-format
 msgid "Slovenia"
 msgstr "Slovenia"
 
-#: lang.pm:350
+#: lang.pm:355
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Ynysoedd Svalbard a Jan Mayen"
 
-#: lang.pm:351
+#: lang.pm:356
 #, c-format
 msgid "Slovakia"
 msgstr "Slofacia"
 
-#: lang.pm:352
+#: lang.pm:357
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: lang.pm:353
+#: lang.pm:358
 #, c-format
 msgid "San Marino"
 msgstr "San Marino"
 
-#: lang.pm:354
+#: lang.pm:359
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:355
+#: lang.pm:360
 #, c-format
 msgid "Somalia"
 msgstr "Somalia"
 
-#: lang.pm:356
+#: lang.pm:361
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:357
+#: lang.pm:362
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tome a Principe"
 
-#: lang.pm:358
+#: lang.pm:363
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:359
+#: lang.pm:364
 #, c-format
 msgid "Syria"
 msgstr "Syria"
 
-#: lang.pm:360
+#: lang.pm:365
 #, c-format
 msgid "Swaziland"
 msgstr "Swaziland"
 
-#: lang.pm:361
+#: lang.pm:366
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Ynysoedd Turks a Caicos"
 
-#: lang.pm:362
+#: lang.pm:367
 #, c-format
 msgid "Chad"
 msgstr "Chad"
 
-#: lang.pm:363
+#: lang.pm:368
 #, c-format
 msgid "French Southern Territories"
 msgstr "French Southern Territories"
 
-#: lang.pm:364
+#: lang.pm:369
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:365
+#: lang.pm:370
 #, c-format
 msgid "Thailand"
 msgstr "Gwlad Thail"
 
-#: lang.pm:366
+#: lang.pm:371
 #, c-format
 msgid "Tajikistan"
 msgstr "Tajikistan"
 
-#: lang.pm:367
+#: lang.pm:372
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:368
+#: lang.pm:373
 #, c-format
 msgid "East Timor"
 msgstr "Dwyrain Timor"
 
-#: lang.pm:369
+#: lang.pm:374
 #, c-format
 msgid "Turkmenistan"
 msgstr "Turkmenistan"
 
-#: lang.pm:370
+#: lang.pm:375
 #, c-format
 msgid "Tunisia"
 msgstr "Tunisia"
 
-#: lang.pm:371
+#: lang.pm:376
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:372
+#: lang.pm:377
 #, c-format
 msgid "Turkey"
 msgstr "Twrci"
 
-#: lang.pm:373
+#: lang.pm:378
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad a Tobago"
 
-#: lang.pm:374
+#: lang.pm:379
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:375
+#: lang.pm:380
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: lang.pm:376
+#: lang.pm:381
 #, c-format
 msgid "Tanzania"
 msgstr "Tanzania"
 
-#: lang.pm:377
+#: lang.pm:382
 #, c-format
 msgid "Ukraine"
 msgstr "Wcrain"
 
-#: lang.pm:378
+#: lang.pm:383
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:379
+#: lang.pm:384
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "United States Minor Outlying Islands"
 
-#: lang.pm:381
+#: lang.pm:386
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:382
+#: lang.pm:387
 #, c-format
 msgid "Uzbekistan"
 msgstr "Uzbekistan"
 
-#: lang.pm:383
+#: lang.pm:388
 #, c-format
 msgid "Vatican"
 msgstr "Fatican"
 
-#: lang.pm:384
+#: lang.pm:389
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent a'r Grenadines"
 
-#: lang.pm:385
+#: lang.pm:390
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:386
+#: lang.pm:391
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Virgin Islands (British)"
 
-#: lang.pm:387
+#: lang.pm:392
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Virgin Islands (U.S.)"
 
-#: lang.pm:388
+#: lang.pm:393
 #, c-format
 msgid "Vietnam"
 msgstr "Fietnam"
 
-#: lang.pm:389
+#: lang.pm:394
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:390
+#: lang.pm:395
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis a Futuna"
 
-#: lang.pm:391
+#: lang.pm:396
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:392
+#: lang.pm:397
 #, c-format
 msgid "Yemen"
 msgstr "Yemen"
 
-#: lang.pm:393
+#: lang.pm:398
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:394
+#: lang.pm:399
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr "Serbia a Montenegro"
 
-#: lang.pm:395 standalone/drakxtv:50
+#: lang.pm:400 standalone/drakxtv:50
 #, c-format
 msgid "South Africa"
 msgstr "De Affrica"
 
-#: lang.pm:396
+#: lang.pm:401
 #, c-format
 msgid "Zambia"
 msgstr "Zambia"
 
-#: lang.pm:397
+#: lang.pm:402
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:966
+#: lang.pm:983
 #, c-format
 msgid "Welcome to %s"
 msgstr "Croeso i %s"
@@ -8981,7 +9048,7 @@ msgstr "Gosodiadau cylch %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "Tynnu'r cyfrolau rhesymegol yn gyntaf\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:962
+#: modules/interactive.pm:21 standalone/drakconnect:959
 #, c-format
 msgid "Parameters"
 msgstr "Paramedrau"
@@ -9112,7 +9179,7 @@ msgstr "rhif"
 #: modules/parameters.pm:51
 #, c-format
 msgid "%d comma separated numbers"
-msgstr "%d rhifau gwahanwyd gan gollnod"
+msgstr "%d rhifau gwahanwyd gan collnod"
 
 #: modules/parameters.pm:51
 #, c-format
@@ -9154,12 +9221,11 @@ msgstr "Llygoden Olwyn PS Generig"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:23 network/modem.pm:37 network/modem.pm:42
-#: network/modem.pm:73 network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:503
-#: network/netconnect.pm:508 network/netconnect.pm:520
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#: network/netconnect.pm:543
+#: 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:574 network/netconnect.pm:579
+#: network/netconnect.pm:591 network/netconnect.pm:596
+#: network/netconnect.pm:612 network/netconnect.pm:614
 #, c-format
 msgid "Automatic"
 msgstr "Awtomatig"
@@ -9202,7 +9268,7 @@ msgstr "Llygoden 3 Botwm Generig gydag efelychiad Olwyn"
 #: mouse.pm:51
 #, c-format
 msgid "Wheel"
-msgstr "Ôlwyn"
+msgstr "Olwyn"
 
 #: mouse.pm:55
 #, c-format
@@ -9295,16 +9361,16 @@ msgid "3 buttons with Wheel emulation"
 msgstr "3 botwm gydag efelychiad Olwyn"
 
 #: mouse.pm:86
-#, fuzzy, c-format
+#, c-format
 msgid "Universal"
-msgstr "Dad osod"
+msgstr "Cyffredinol"
 
 #: mouse.pm:88
 #, c-format
 msgid "Any PS/2 & USB mice"
-msgstr ""
+msgstr "Unrhyw lygoden PS/2 ac USB"
 
-#: mouse.pm:92
+#: mouse.pm:92 standalone/drakvpn:1138
 #, c-format
 msgid "none"
 msgstr "dim"
@@ -9364,12 +9430,12 @@ msgstr "USB Sagem (defnyddio pppoa)"
 msgid "Sagem (using dhcp) usb"
 msgstr "USB Sagem (defnyddio dhcp)"
 
-#: network/adsl.pm:35 network/netconnect.pm:679
+#: network/adsl.pm:35 network/netconnect.pm:754
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Cysylltu â'r We"
 
-#: network/adsl.pm:36 network/netconnect.pm:680
+#: network/adsl.pm:36 network/netconnect.pm:755
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -9380,7 +9446,7 @@ msgstr ""
 "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:684
+#: network/adsl.pm:41 network/netconnect.pm:759
 #, c-format
 msgid "ADSL connection type :"
 msgstr "Math o gysylltiad ADSL :"
@@ -9445,14 +9511,14 @@ msgstr "Dim cerdyn rhwydwaith"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrake Linux machine.\n"
+"This configures a personal firewall for this Mandrakelinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
 "ffurfweddiadur drakfirewall\n"
 "\n"
 "Mae hwn yn ffurfweddu mur gwarchod personol ar gyfer y peiriant \n"
-"Mandrake Linux hwn. Am fur gwarchod pwrpasol pwerus, \n"
+"Mandrakelinux hwn. Am fur gwarchod pwrpasol pwerus, \n"
 "edrychwch ddosbarthiad arbennigol MandrakeSecurity Firewall."
 
 #: network/drakfirewall.pm:152
@@ -9477,11 +9543,11 @@ msgstr "Pa wasanaethau'r hoffech i'r Rhyngrwyd gysylltu â hwy?"
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
-"Valid examples are: 139/tcp 139/udp.\n"
+"Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Have a look at /etc/services for information."
 msgstr ""
 "Gallwch roi amrywiol byrth.\n"
-"Eng. dilys: 139/tcp 139/udp.\n"
+"Eng. dilys: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Am wybodaeth ewch i /etc/services."
 
 #: network/drakfirewall.pm:176
@@ -9509,321 +9575,272 @@ msgstr "Popeth (dim mur cadarn)"
 msgid "Other ports"
 msgstr "Pyrth eraill"
 
-#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157
-#: network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183
-#: network/netconnect.pm:332
-#, c-format
-msgid "ISDN Configuration"
-msgstr "Ffurfweddiad ISDN"
-
-#: network/isdn.pm:127
-#, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
-msgstr ""
-"Dewiswch eich darparwr.\n"
-"Os nad yw ar eich rhestr, dewiswch Heb ei Restri"
-
-#: network/isdn.pm:140 standalone/drakconnect:503
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocol Ewropeaidd (EDSSI)"
-
-#: network/isdn.pm:140
-#, c-format
-msgid "European protocol"
-msgstr "Protocol Ewropeaidd"
-
-#: network/isdn.pm:142 standalone/drakconnect:504
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocol ar gyfer gweddill y byd\n"
-" dim D-Channel (llinell les)"
-
-#: network/isdn.pm:142
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr "Protocol ar gyfer gweddill y byd"
-
-#: network/isdn.pm:146
+#: network/isdn.pm:113 network/netconnect.pm:424
 #, c-format
-msgid "Which protocol do you want to use?"
-msgstr "Pa brotocol ydych chi eisiau ei ddefnyddio?"
-
-#: network/isdn.pm:157
-#, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "Wedi canfod rhyngwyneb \"%s\", hoffech chi ei ddefnyddio?"
-
-#: network/isdn.pm:164
-#, c-format
-msgid "What kind of card do you have?"
-msgstr "Pa fath o gerdyn sydd gennych?"
+msgid "Unlisted - edit manually"
+msgstr "Heb ei restru - golygu gyda llaw"
 
-#: network/isdn.pm:165
+#: network/isdn.pm:156 network/netconnect.pm:376
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:165
+#: network/isdn.pm:156 network/netconnect.pm:376
+#, c-format
+msgid "I don't know"
+msgstr "Dim syniad"
+
+#: network/isdn.pm:157 network/netconnect.pm:376
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:165
+#: network/isdn.pm:158 network/netconnect.pm:376
 #, c-format
 msgid "USB"
 msgstr "USB"
 
-#: network/isdn.pm:165
-#, c-format
-msgid "I don't know"
-msgstr "Dim syniad"
-
-#: network/isdn.pm:174
+#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
+#: network/netconnect.pm:579 network/netconnect.pm:596
+#: network/netconnect.pm:612
 #, c-format
-msgid ""
-"\n"
-"If you have an ISA card, the values on the next screen should be right.\n"
-"\n"
-"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
-"card.\n"
-msgstr ""
-"\n"
-"Os oes gennych gerdyn, dylai'r gwerthoedd ar y sgrîn nesaf fod yn gywir.\n"
-"\n"
-"Os oes gennych gerdyn PCMCIA, rhaid i chi wybod irq ac io eich cerdyn.\n"
-
-#: network/isdn.pm:178
-#, c-format
-msgid "Continue"
-msgstr "Parhau"
+msgid "Manual"
+msgstr "Llaw"
 
-#: network/isdn.pm:178
+#: network/netconnect.pm:88 network/netconnect.pm:453
+#: network/netconnect.pm:463 network/netconnect.pm:822
+#: network/netconnect.pm:827
 #, c-format
-msgid "Abort"
-msgstr "Peidio"
+msgid "Manual choice"
+msgstr "Dewis gyda llaw"
 
-#: network/isdn.pm:184
+#: network/netconnect.pm:88
 #, c-format
-msgid "Which of the following is your ISDN card?"
-msgstr "Pa un o'r canlynol yw eich cerdyn IDSN?"
+msgid "Internal ISDN card"
+msgstr "Cerdyn ISDN mewnol"
 
-#: network/netconnect.pm:95
+#: network/netconnect.pm:97
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: network/netconnect.pm:96
+#: network/netconnect.pm:98
 #, c-format
 msgid "Managed"
 msgstr "Rheolwyd"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:99
 #, c-format
 msgid "Master"
 msgstr "Meistr"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, c-format
 msgid "Repeater"
 msgstr "Eilydd"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, c-format
 msgid "Secondary"
 msgstr "Eilradd"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, c-format
 msgid "Auto"
 msgstr "Awtomatig"
 
-#: network/netconnect.pm:103 printer/printerdrake.pm:1118
+#: network/netconnect.pm:105 printer/printerdrake.pm:1133
+#: standalone/drakups:64
 #, c-format
 msgid "Manual configuration"
 msgstr "Ffurfweddiad gyda llaw"
 
-#: network/netconnect.pm:104
+#: network/netconnect.pm:106
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "IP awtomatig (BOOTP/DHCP)"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "IP awtomatig (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "Protocol ar gyfer gweddill y byd"
+
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocol Ewropeaidd (EDSSI)"
+
+#: network/netconnect.pm:114 standalone/drakconnect:529
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocol ar gyfer gweddill y byd\n"
+" dim D-Channel (llinell les)"
+
+#: network/netconnect.pm:146
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Modem USB Alcatel Speedtouch"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:147
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Modem USB Sagem"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:148
 #, c-format
-msgid "Bewan USB modem"
-msgstr "Modem USB Bewan"
+msgid "Bewan modem"
+msgstr "Modem Bewan"
 
-#: network/netconnect.pm:159
-#, c-format
-msgid "Bewan PCI modem"
-msgstr "Modem PCI Bewan"
-
-#: network/netconnect.pm:160
+#: network/netconnect.pm:149
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "Modem ECI Hi-Focus"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:153
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "Dynamic Host Configuration Protocol (DHCP)"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:154
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "Ffurfweddu TCP/IP  gyda llaw"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:155
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "Point to Point Tunneling Protocol (PPTP)"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:156
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPP over Ethernet (PPPoE)"
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:157
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPP over ATM (PPPoA)"
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:161
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Pont Ethernet LLC"
 
-#: network/netconnect.pm:173
+#: network/netconnect.pm:162
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Pont Ethernet VC"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:163
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Trywydd IP LLC"
 
-#: network/netconnect.pm:175
+#: network/netconnect.pm:164
 #, c-format
 msgid "Routed IP VC"
 msgstr "Trywydd IP VC"
 
-#: network/netconnect.pm:176
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPPOA LLC"
 msgstr "PPPOA LLC"
 
-#: network/netconnect.pm:177
+#: network/netconnect.pm:166
 #, c-format
 msgid "PPPOA VC"
 msgstr "PPPOA VC"
 
-#: network/netconnect.pm:181 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:170 standalone/drakconnect:466
 #, c-format
 msgid "Script-based"
 msgstr "Seiliedig ar sgript"
 
-#: network/netconnect.pm:182 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:171 standalone/drakconnect:466
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:183 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:172 standalone/drakconnect:466
 #, c-format
 msgid "Terminal-based"
 msgstr "Seiliedig ar derfynell"
 
-#: network/netconnect.pm:184 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:173 standalone/drakconnect:466
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:185
+#: network/netconnect.pm:174 standalone/drakconnect:466
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:199 standalone/drakconnect:54
+#: network/netconnect.pm:219 standalone/drakconnect:55
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Ffurfweddiad y Rhwydwaith a'r Rhyngrwyd"
 
-#: network/netconnect.pm:205
+#: network/netconnect.pm:225
 #, 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:207
+#: network/netconnect.pm:227
 #, c-format
 msgid "(detected %s)"
 msgstr "(canfyddwyd %s)"
 
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, c-format
 msgid "(detected)"
 msgstr "(canfuwyd)"
 
-#: network/netconnect.pm:209
+#: network/netconnect.pm:229
 #, c-format
 msgid "Modem connection"
 msgstr "Cysylltiad modem"
 
-#: network/netconnect.pm:210
+#: network/netconnect.pm:230
 #, c-format
 msgid "ISDN connection"
 msgstr "Cysylltiad ISDN"
 
-#: network/netconnect.pm:211
+#: network/netconnect.pm:231
 #, c-format
 msgid "ADSL connection"
 msgstr "Cysylltiad ADSL"
 
-#: network/netconnect.pm:212
+#: network/netconnect.pm:232
 #, c-format
 msgid "Cable connection"
 msgstr "Cysylltiad cebl"
 
-#: network/netconnect.pm:213
+#: network/netconnect.pm:233
 #, c-format
 msgid "LAN connection"
 msgstr "cysylltiad LAN"
 
-#: network/netconnect.pm:214 network/netconnect.pm:228
+#: network/netconnect.pm:234 network/netconnect.pm:248
 #, c-format
 msgid "Wireless connection"
 msgstr "Cysylltiad diwyfr"
 
-#: network/netconnect.pm:224
+#: network/netconnect.pm:244
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Dewiswch y math o gysylltiad rydych am ei ffurfweddu"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:261
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9836,138 +9853,191 @@ msgstr ""
 "\n"
 "Pwyswch \"%s\" i barhau."
 
-#: network/netconnect.pm:249 network/netconnect.pm:710
+#: network/netconnect.pm:269 network/netconnect.pm:781
 #, c-format
 msgid "Connection Configuration"
 msgstr "Ffurfweddiad y Cysylltiad"
 
-#: network/netconnect.pm:250 network/netconnect.pm:711
+#: network/netconnect.pm:270 network/netconnect.pm:782
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Llanwch neu ticiwch y maes islaw"
 
-#: network/netconnect.pm:256 standalone/drakconnect:494
-#: standalone/drakconnect:899
+#: network/netconnect.pm:277 standalone/drakconnect:519
 #, c-format
 msgid "Card IRQ"
 msgstr "IRQ y cerdyn"
 
-#: network/netconnect.pm:257 standalone/drakconnect:495
-#: standalone/drakconnect:900
+#: network/netconnect.pm:278 standalone/drakconnect:520
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Cof Cerdyn (DMA)"
 
-#: network/netconnect.pm:258 standalone/drakconnect:496
-#: standalone/drakconnect:901
+#: network/netconnect.pm:279 standalone/drakconnect:521
 #, c-format
 msgid "Card IO"
 msgstr "IO'r Cerdyn"
 
-#: network/netconnect.pm:259 standalone/drakconnect:497
-#: standalone/drakconnect:902
+#: network/netconnect.pm:280 standalone/drakconnect:522
 #, c-format
 msgid "Card IO_0"
 msgstr "IO_O y cerdyn"
 
-#: network/netconnect.pm:260 standalone/drakconnect:903
+#: network/netconnect.pm:281
 #, c-format
 msgid "Card IO_1"
 msgstr "IO_1 y cerdyn"
 
-#: network/netconnect.pm:261 standalone/drakconnect:904
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "Eich rhif ffôn personol"
 
-#: network/netconnect.pm:262 network/netconnect.pm:714
-#: standalone/drakconnect:905
+#: network/netconnect.pm:283 network/netconnect.pm:785
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Enw darparwr (eng. darparwr.net)"
 
-#: network/netconnect.pm:263 standalone/drakconnect:440
-#: standalone/drakconnect:906
+#: network/netconnect.pm:284 standalone/drakconnect:463
 #, c-format
 msgid "Provider phone number"
 msgstr "Rhif ffôn y darparwr"
 
-#: network/netconnect.pm:264
+#: network/netconnect.pm:285
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "Darparwr DNS 1 (dewisol)"
 
-#: network/netconnect.pm:265
+#: network/netconnect.pm:286
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "Darparwr DNS 2 (dewisol)"
 
-#: network/netconnect.pm:266 standalone/drakconnect:396
-#: standalone/drakconnect:462 standalone/drakconnect:911
+#: network/netconnect.pm:287 standalone/drakconnect:419
 #, c-format
 msgid "Dialing mode"
 msgstr "Modd deialu"
 
-#: network/netconnect.pm:267 standalone/drakconnect:401
-#: standalone/drakconnect:459 standalone/drakconnect:923
+#: network/netconnect.pm:288 standalone/drakconnect:424
+#: standalone/drakconnect:484
 #, c-format
 msgid "Connection speed"
 msgstr "Cyflymder y cysylltiad"
 
-#: network/netconnect.pm:268 standalone/drakconnect:406
-#: standalone/drakconnect:924
+#: network/netconnect.pm:289 standalone/drakconnect:429
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Oediad yn y cysylltiad (mewn eiliadau)"
 
-#: network/netconnect.pm:271 network/netconnect.pm:717
-#: standalone/drakconnect:438 standalone/drakconnect:909
+#: network/netconnect.pm:292 network/netconnect.pm:788
+#: standalone/drakconnect:461
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Mewngofnod Cyfrif (enw defnyddiwr)"
 
-#: network/netconnect.pm:272 network/netconnect.pm:718
-#: standalone/drakconnect:439 standalone/drakconnect:910
-#: standalone/drakconnect:944
+#: network/netconnect.pm:293 network/netconnect.pm:789
+#: standalone/drakconnect:462
 #, c-format
 msgid "Account Password"
 msgstr "Cyfrinair y Cyfrif"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:323 network/netconnect.pm:637
+#: network/netconnect.pm:820
 #, c-format
-msgid "What kind is your ISDN connection?"
-msgstr "Pa fath o gysylltiad IDSN?"
+msgid "Select the network interface to configure:"
+msgstr "Dewis y rhyngwyneb rhwydwaith i'w ffurfweddu:"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:323 network/netconnect.pm:457
+#: network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
 #, c-format
-msgid "Internal ISDN card"
-msgstr "Cerdyn ISDN mewnol"
+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:325 network/netconnect.pm:366
+#: network/netconnect.pm:638 network/netconnect.pm:822 network/shorewall.pm:84
+#: standalone/drakconnect:643 standalone/drakgw:225 standalone/drakvpn:219
+#, c-format
+msgid "Net Device"
+msgstr "Dyfais Rhyngrwyd"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:326 network/netconnect.pm:334
 #, c-format
 msgid "External ISDN modem"
 msgstr "Modem IDSN Allanol"
 
-#: network/netconnect.pm:332
+#: network/netconnect.pm:365 standalone/harddrake2:115
+#, c-format
+msgid "Select a device !"
+msgstr "Dewis dyfais!"
+
+#: network/netconnect.pm:374 network/netconnect.pm:384
+#: network/netconnect.pm:394 network/netconnect.pm:410
+#: network/netconnect.pm:421
+#, c-format
+msgid "ISDN Configuration"
+msgstr "Ffurfweddiad ISDN"
+
+#: network/netconnect.pm:375
+#, c-format
+msgid "What kind of card do you have?"
+msgstr "Pa fath o gerdyn sydd gennych?"
+
+#: network/netconnect.pm:385
+#, c-format
+msgid ""
+"\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
+"card.\n"
+msgstr ""
+"\n"
+"Os oes gennych gerdyn, dylai'r gwerthoedd ar y sgrîn nesaf fod yn gywir.\n"
+"\n"
+"Os oes gennych gerdyn PCMCIA, rhaid i chi wybod irq ac io eich cerdyn.\n"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Continue"
+msgstr "Parhau"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "Peidio"
+
+#: network/netconnect.pm:395
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr "Pa un o'r canlynol yw eich cerdyn IDSN?"
+
+#: network/netconnect.pm:410
+#, c-format
+msgid "Which protocol do you want to use?"
+msgstr "Pa brotocol ydych chi eisiau ei ddefnyddio?"
+
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
 #, c-format
-msgid "Do you want to start a new configuration ?"
-msgstr "Ydych chi eisiau cychwyn ffurfweddiad newydd?"
+msgid "Protocol"
+msgstr "Protocol"
 
-#: network/netconnect.pm:335
+#: network/netconnect.pm:421
 #, c-format
 msgid ""
-"I have detected an ISDN PCI card, but I don't know its type. Please select a "
-"PCI card on the next screen."
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
 msgstr ""
-"Rwyf wedi canfod cerdyn IDSN, ond nid wyf yn gwybod pa fath. Dewiswch un "
-"cerdyn PCI ar y sgrîn nesaf."
+"Dewiswch eich darparwr.\n"
+"Os nad yw ar eich rhestr, dewiswch Heb ei Restri"
 
-#: network/netconnect.pm:344
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
 #, c-format
-msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "Heb ganfod cerdyn PCI ISDN. Dewiswch un o'r sgrîn nesaf."
+msgid "Provider:"
+msgstr "Darparwr:"
 
-#: network/netconnect.pm:353
+#: network/netconnect.pm:438
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -9976,140 +10046,117 @@ msgstr ""
 "Nid yw'r system yn cynnal eich modem.\n"
 "Ewch i http://www.linmodems.org"
 
-#: network/netconnect.pm:364
+#: network/netconnect.pm:450
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Dewis y modem i'w ffurfweddu:"
 
-#: network/netconnect.pm:403
+#: network/netconnect.pm:498
 #, 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:427
+#: network/netconnect.pm:527
 #, c-format
 msgid "Select your provider:"
 msgstr "Dewis eich darparwr:"
 
-#: network/netconnect.pm:429 network/netconnect.pm:599
-#, c-format
-msgid "Provider:"
-msgstr "Darparwr:"
-
-#: network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:508
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#, c-format
-msgid "Manual"
-msgstr "Llaw"
-
-#: network/netconnect.pm:485
+#: network/netconnect.pm:556
 #, c-format
 msgid "Dialup: account options"
 msgstr "Deialu: dewisiadau cyfrif"
 
-#: network/netconnect.pm:488 standalone/drakconnect:913
+#: network/netconnect.pm:559
 #, c-format
 msgid "Connection name"
 msgstr "Enw'r cysylltiad"
 
-#: network/netconnect.pm:489 standalone/drakconnect:914
+#: network/netconnect.pm:560
 #, c-format
 msgid "Phone number"
 msgstr "Rhif ffôn"
 
-#: network/netconnect.pm:490 standalone/drakconnect:915
+#: network/netconnect.pm:561
 #, c-format
 msgid "Login ID"
 msgstr "Dynodiad Mewngofnodi"
 
-#: network/netconnect.pm:505 network/netconnect.pm:538
+#: network/netconnect.pm:576 network/netconnect.pm:609
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Deialu: paramedrau'r IP"
 
-#: network/netconnect.pm:508
+#: network/netconnect.pm:579
 #, c-format
 msgid "IP parameters"
 msgstr "Paramedrau IP"
 
-#: network/netconnect.pm:509 network/netconnect.pm:829
-#: printer/printerdrake.pm:431 standalone/drakconnect:113
-#: standalone/drakconnect:306 standalone/drakconnect:764
+#: network/netconnect.pm:580 network/netconnect.pm:912
+#: printer/printerdrake.pm:431 standalone/drakconnect:116
+#: standalone/drakconnect:325 standalone/drakconnect:806
+#: standalone/drakups:266
 #, c-format
 msgid "IP address"
 msgstr "Cyfeiriad IP"
 
-#: network/netconnect.pm:510
+#: network/netconnect.pm:581
 #, c-format
 msgid "Subnet mask"
 msgstr "Masg Isnet"
 
-#: network/netconnect.pm:522
+#: network/netconnect.pm:593
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Deialu: paramedrau DNS"
 
-#: network/netconnect.pm:525
+#: network/netconnect.pm:596
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:526 standalone/drakconnect:918
+#: network/netconnect.pm:597
 #, c-format
 msgid "Domain name"
 msgstr "Enw parth"
 
-#: network/netconnect.pm:527 network/netconnect.pm:715
-#: standalone/drakconnect:919
+#: network/netconnect.pm:598 network/netconnect.pm:786
+#: standalone/drakconnect:924
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Gweinydd DNS Cyntaf (dewisol)"
 
-#: network/netconnect.pm:528 network/netconnect.pm:716
-#: standalone/drakconnect:920
+#: network/netconnect.pm:599 network/netconnect.pm:787
+#: standalone/drakconnect:925
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Ail Wasanaethwr DNS (dewisol)"
 
-#: network/netconnect.pm:529
+#: network/netconnect.pm:600
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Gosod enw'r gwesteiwr o'r IP"
 
-#: network/netconnect.pm:541 standalone/drakconnect:317
-#: standalone/drakconnect:912
+#: network/netconnect.pm:612 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "Mynedfa"
 
-#: network/netconnect.pm:542
+#: network/netconnect.pm:613
 #, c-format
 msgid "Gateway IP address"
 msgstr "Cyfeiriad porth IP"
 
-#: network/netconnect.pm:567
+#: network/netconnect.pm:637
 #, c-format
 msgid "ADSL configuration"
 msgstr "Ffurfweddiad ADSL"
 
-#: network/netconnect.pm:567 network/netconnect.pm:746
-#, c-format
-msgid "Select the network interface to configure:"
-msgstr "Dewis y rhyngwyneb rhwydwaith i'w ffurfweddu:"
-
-#: network/netconnect.pm:568 network/netconnect.pm:748 network/shorewall.pm:77
-#: standalone/drakconnect:602 standalone/drakgw:218 standalone/drakvpn:217
-#, c-format
-msgid "Net Device"
-msgstr "Dyfais Rhyngrwyd"
-
-#: network/netconnect.pm:597
+#: network/netconnect.pm:673
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Dewiswch eich darparwr ADSL"
 
-#: network/netconnect.pm:616
+#: network/netconnect.pm:691
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10120,32 +10167,32 @@ msgstr ""
 "Mae modd ei ddarparu ar ddisg meddal neu o'ch rhaniad windows,\n"
 "neu ei adael tan rhywbryd eto."
 
-#: network/netconnect.pm:620 network/netconnect.pm:625
+#: network/netconnect.pm:695 network/netconnect.pm:700
 #, c-format
 msgid "Use a floppy"
 msgstr "Defnyddiwch ddisg meddal"
 
-#: network/netconnect.pm:620 network/netconnect.pm:629
+#: network/netconnect.pm:695 network/netconnect.pm:704
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Defnyddio fy rhaniad Windows"
 
-#: network/netconnect.pm:620 network/netconnect.pm:633
+#: network/netconnect.pm:695 network/netconnect.pm:708
 #, c-format
 msgid "Do it later"
 msgstr "Gwneud yn hwyrach"
 
-#: network/netconnect.pm:640
+#: network/netconnect.pm:715
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Methodd copïo'r gadarnwedd, heb ganfod ffeil %s"
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:722
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Copïo'r gadarnwedd yn llwyddiant"
 
-#: network/netconnect.pm:662
+#: network/netconnect.pm:737
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10158,22 +10205,22 @@ msgstr ""
 "%s\n"
 "achopio'r mgmt.o i /usr/share/speedtouch"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:790
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:791
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:721
+#: network/netconnect.pm:793
 #, c-format
 msgid "Encapsulation :"
 msgstr "Mewngapsiwleiddio :"
 
-#: network/netconnect.pm:736
+#: network/netconnect.pm:810
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10185,17 +10232,7 @@ msgstr ""
 "\n"
 "Mae modd canfod gyrrwr ar http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:753
-#, fuzzy, c-format
-msgid "No wireless network adapter on your system!"
-msgstr "Nid oes addasydd rhwydwaith ar eich system!"
-
-#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
-#, c-format
-msgid "No network adapter on your system!"
-msgstr "Nid oes addasydd rhwydwaith ar eich system!"
-
-#: network/netconnect.pm:766
+#: network/netconnect.pm:837
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -10208,17 +10245,26 @@ msgstr ""
 "Derbyniwch y cynnig i gadw'r ddyfais wedi ei ffurfweddi.\n"
 "Bydd newid y meysydd islaw'n newid y ffurfweddiad."
 
-#: network/netconnect.pm:784
+#: network/netconnect.pm:850 network/netconnect.pm:1222
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"\n"
+msgstr ""
+"Llongyfarchiadau, mae ffurfweddiad y rhwydwaith a'r Rhyngrwyd wedi ei "
+"gwblhau\n"
+
+#: network/netconnect.pm:864
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Cydraniad enw gwesteiwr Zeroconf"
 
-#: network/netconnect.pm:785 network/netconnect.pm:816
+#: network/netconnect.pm:865 network/netconnect.pm:899
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Ffurfweddu dyfais rhwydwaith %s (gyrrwr %s)"
 
-#: network/netconnect.pm:786
+#: network/netconnect.pm:866
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10227,7 +10273,7 @@ msgstr ""
 "Mae modd defnyddio'r protocolau canlynol i ffurfweddu cysylltiad ethernet. "
 "Dewiswch yr un i'w ddefnyddio."
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:900
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10238,89 +10284,89 @@ msgstr ""
 "Dylai pob eitem ei roi fel cyfeiriad IP nodiant collnod degymol\n"
 "(e.e.1.2.3.4)."
 
-#: network/netconnect.pm:824
+#: network/netconnect.pm:907
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Rhowch enw'r gwesteiwr o'r cyfeiriad DHCP"
 
-#: network/netconnect.pm:825
+#: network/netconnect.pm:908
 #, c-format
 msgid "DHCP host name"
 msgstr "Enw gwesteiwr DHCP"
 
-#: network/netconnect.pm:830 standalone/drakconnect:311
-#: standalone/drakconnect:765 standalone/drakgw:313
+#: network/netconnect.pm:913 standalone/drakconnect:330
+#: standalone/drakconnect:807 standalone/drakgw:321
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
 
-#: network/netconnect.pm:832 standalone/drakconnect:389
+#: network/netconnect.pm:915 standalone/drakconnect:412
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "Dilynwch gyfernod cerdyn rhwydwaith (defnyddiol ar gyfer gliniadur)"
 
-#: network/netconnect.pm:833 standalone/drakconnect:390
+#: network/netconnect.pm:916 standalone/drakconnect:413
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Plygio byw'r Rhwydwaith"
 
-#: network/netconnect.pm:834 standalone/drakconnect:384
+#: network/netconnect.pm:917 standalone/drakconnect:407
 #, c-format
 msgid "Start at boot"
 msgstr "Cychwyn y peiriant"
 
-#: network/netconnect.pm:836 standalone/drakconnect:768
+#: network/netconnect.pm:919 standalone/drakconnect:810
 #, c-format
 msgid "DHCP client"
 msgstr "Cleient DHCP"
 
-#: network/netconnect.pm:846 printer/printerdrake.pm:1349
-#: standalone/drakconnect:569
+#: network/netconnect.pm:929 printer/printerdrake.pm:1383
+#: standalone/drakconnect:608
 #, 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:849
+#: network/netconnect.pm:932
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr "Rhybudd : cyfeiriad IP %s wedi ei gadw fel rheol !"
 
-#: network/netconnect.pm:879 network/netconnect.pm:908
+#: network/netconnect.pm:962 network/netconnect.pm:991
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Rhowch baramedrau diwyfr y cerdyn:"
 
-#: network/netconnect.pm:882 standalone/drakconnect:355
+#: network/netconnect.pm:965 standalone/drakconnect:378
 #, c-format
 msgid "Operating Mode"
 msgstr "Modd Gweithredu"
 
-#: network/netconnect.pm:884 standalone/drakconnect:356
+#: network/netconnect.pm:967 standalone/drakconnect:379
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Enw'r rhwydwaith (ESSID)"
 
-#: network/netconnect.pm:885 standalone/drakconnect:357
+#: network/netconnect.pm:968 standalone/drakconnect:380
 #, c-format
 msgid "Network ID"
 msgstr "Enw Rhwydwaith"
 
-#: network/netconnect.pm:886 standalone/drakconnect:358
+#: network/netconnect.pm:969 standalone/drakconnect:381
 #, c-format
 msgid "Operating frequency"
 msgstr "Amledd gweithredu"
 
-#: network/netconnect.pm:887 standalone/drakconnect:359
+#: network/netconnect.pm:970 standalone/drakconnect:382
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Trothwy sensitifrwydd"
 
-#: network/netconnect.pm:888 standalone/drakconnect:360
+#: network/netconnect.pm:971 standalone/drakconnect:383
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Didradd (mewn b/s)"
 
-#: network/netconnect.pm:894
+#: network/netconnect.pm:977
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10329,7 +10375,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:898
+#: network/netconnect.pm:981
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10338,12 +10384,12 @@ msgstr ""
 "Dylai'r raddfa gael rhagosodiad K, M neu G (e.e.\"11M\" am 11M),  neu "
 "ychwanegi '0' (sero)."
 
-#: network/netconnect.pm:911 standalone/drakconnect:371
+#: network/netconnect.pm:994 standalone/drakconnect:394
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:912
+#: network/netconnect.pm:995
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10366,17 +10412,17 @@ msgstr ""
 "i awto,\n"
 "gosodedig  neu ddiffodd"
 
-#: network/netconnect.pm:919 standalone/drakconnect:372
+#: network/netconnect.pm:1002 standalone/drakconnect:395
 #, c-format
 msgid "Fragmentation"
 msgstr "Darniad"
 
-#: network/netconnect.pm:920 standalone/drakconnect:373
+#: network/netconnect.pm:1003 standalone/drakconnect:396
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn Iwconfig"
 
-#: network/netconnect.pm:921
+#: network/netconnect.pm:1004
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10392,12 +10438,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:928 standalone/drakconnect:374
+#: network/netconnect.pm:1011 standalone/drakconnect:397
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn lwspy"
 
-#: network/netconnect.pm:929
+#: network/netconnect.pm:1012
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10416,12 +10462,12 @@ msgstr ""
 "\n"
 "Gw. tudalennau man iwpspy(8) am ragor o wybodaeth. "
 
-#: network/netconnect.pm:937 standalone/drakconnect:375
+#: network/netconnect.pm:1020 standalone/drakconnect:398
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn Iwpriv"
 
-#: network/netconnect.pm:938
+#: network/netconnect.pm:1021
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10449,7 +10495,7 @@ msgstr ""
 "\n"
 "Gw. tudalen iwpriv(8) man am rhagor o wybodaeth."
 
-#: network/netconnect.pm:965
+#: network/netconnect.pm:1048
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
@@ -10458,19 +10504,19 @@ 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:969 standalone/drakgw:254 standalone/drakpxe:142
+#: network/netconnect.pm:1052 standalone/drakgw:261 standalone/drakpxe:142
 #, c-format
 msgid "Choose the network interface"
 msgstr "Dewiswch rhag wyneb  y rhwydwaith"
 
-#: network/netconnect.pm:970
+#: network/netconnect.pm:1053
 #, 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:991
+#: network/netconnect.pm:1074
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10483,68 +10529,68 @@ msgstr ""
 "megis \"fymlwch.fynesg.fyngho.com\".\n"
 "Gallwch hefyd gynnig eich cyfeiriad IP os oes gennych un"
 
-#: network/netconnect.pm:995
+#: network/netconnect.pm:1078
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr ""
+msgstr "Yn olaf mae modd i chi deipio cyfeiriadau IP eich gweinydd DNS."
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080 standalone/drakconnect:923
 #, c-format
 msgid "Host name (optional)"
 msgstr "Enw gwesteiwr (dewisol)"
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080
 #, c-format
 msgid "Host name"
 msgstr "Enw gwesteiwr"
 
-#: network/netconnect.pm:998
+#: network/netconnect.pm:1082
 #, c-format
 msgid "DNS server 1"
 msgstr "Gweinydd DNS 1"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1083
 #, c-format
 msgid "DNS server 2"
 msgstr "Gweinydd DNS 2"
 
-#: network/netconnect.pm:1000
+#: network/netconnect.pm:1084
 #, c-format
 msgid "DNS server 3"
 msgstr "Gweinydd DNS 3"
 
-#: network/netconnect.pm:1001
+#: network/netconnect.pm:1085
 #, c-format
 msgid "Search domain"
 msgstr "Chwilio parth"
 
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1086
 #, 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:1003
+#: network/netconnect.pm:1087
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Mynedfa (e.e. %s)"
 
-#: network/netconnect.pm:1005
+#: network/netconnect.pm:1089
 #, c-format
 msgid "Gateway device"
 msgstr "Dyfais mynedfa"
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1098
 #, 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:1019 standalone/drakconnect:571
+#: network/netconnect.pm:1103 standalone/drakconnect:611
 #, 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:1030
+#: network/netconnect.pm:1114
 #, c-format
 msgid ""
 "Enter a Zeroconf host name which will be the one that your machine will get "
@@ -10553,17 +10599,17 @@ msgstr ""
 "Rhowch enw gwesteiwr Zeroconf sef yr un fydd eich peiriant yn cael yn ôl at "
 "beiriannau etraill ar y rhwydwaith:"
 
-#: network/netconnect.pm:1031
+#: network/netconnect.pm:1115
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Enw Gwesteiwr Zeroconf"
 
-#: network/netconnect.pm:1034
+#: network/netconnect.pm:1118
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Rhaid i enw gwesteiwr Zeroconf beidio cynnwys ."
 
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1128
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10574,32 +10620,32 @@ msgstr ""
 "Dewiswch ba un rydych am ei ddefnyddio.\n"
 "\n"
 
-#: network/netconnect.pm:1046
+#: network/netconnect.pm:1130
 #, c-format
 msgid "Internet connection"
 msgstr "Cysylltiad â'r Rhyngrwyd"
 
-#: network/netconnect.pm:1054
+#: network/netconnect.pm:1144
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr "Mae'r ffurfweddu wedi ei gwblhau, hoffech eu gosod?"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1154
 #, 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:1094
+#: network/netconnect.pm:1166
 #, 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:1100 network/netconnect.pm:1165
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
 #, c-format
 msgid "Network Configuration"
 msgstr "Ffurfweddiad y Rhwydwaith"
 
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1174
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -10610,27 +10656,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1110
+#: network/netconnect.pm:1182
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Hoffech chi gysylltu â'r Rhyngrwyd nawr?"
 
-#: network/netconnect.pm:1118 standalone/drakconnect:958
+#: network/netconnect.pm:1190 standalone/drakconnect:955
 #, c-format
 msgid "Testing your connection..."
 msgstr "Profi eich cysylltiad..."
 
-#: network/netconnect.pm:1134
+#: network/netconnect.pm:1206
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Mae'r system wedi cysylltu â'r Rhyngrwyd."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1207
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Am resymau diogelwch, bydd yn cael ei ddatgysylltu."
 
-#: network/netconnect.pm:1136
+#: network/netconnect.pm:1208
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10639,16 +10685,7 @@ msgstr ""
 "Nid yw'n ymddangos i'ch system gysylltu â'r Rhyngrwyd.\n"
 "Ailffurfweddwch eich cysylltiad."
 
-#: network/netconnect.pm:1150
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"Llongyfarchiadau, mae ffurfweddiad y rhwydwaith a'r Rhyngrwyd wedi ei "
-"gwblhau\n"
-
-#: network/netconnect.pm:1153
+#: network/netconnect.pm:1225
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10658,7 +10695,7 @@ msgstr ""
 "amgylchedd X i osgoi unrhyw anawsterau'n perthyn i enwau gwesteiwr.\n"
 "."
 
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1226
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
@@ -10669,7 +10706,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:1166
+#: network/netconnect.pm:1239
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10682,37 +10719,46 @@ msgstr ""
 "Cliciwch Iawn i gadw eich ffurfweddiad, neu ddileu i ail ffurfweddi eich "
 "cysylltiad Rhyngrwyd a Rhwydwaith.\n"
 
-#: network/network.pm:314
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr ""
+"Digwyddodd gwall annisgwyl:\n"
+"%s"
+
+#: network/network.pm:315
 #, c-format
 msgid "Proxies configuration"
 msgstr "Ffurfweddiad dirprwyon"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "HTTP proxy"
 msgstr "Dirprwy HTTP"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "FTP proxy"
 msgstr "Dirprwy FTP"
 
-#: network/network.pm:319
+#: network/network.pm:320
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Dylai dirprwyon fod yn gyfanrif!"
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "Dylai'r URL ddechrau gyda 'ftp' neu 'http:'"
 
-#: network/shorewall.pm:26
+#: network/shorewall.pm:28
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Wedi canfod ffurfweddiad mur gwarchod!"
 
-#: network/shorewall.pm:27
+#: network/shorewall.pm:29
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10721,31 +10767,29 @@ msgstr ""
 "Rhybudd! Mae ffurfweddiad mur gwarchod wedi ei ganfod. Efallai bydd angen "
 "atgyweirio gyda llaw ar ôl y gosodiad."
 
-#: network/shorewall.pm:70
+#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:212
 #, c-format
 msgid ""
-"Please enter the name of the interface connected to the "
-"internet.              \n"
-"                \n"
+"Please enter the name of the interface connected to the internet.\n"
+"\n"
 "Examples:\n"
-"                ppp+ for modem or DSL connections, \n"
-"                eth0, or eth1 for cable connection, \n"
-"                ippp+ for a isdn connection.\n"
+"\t\tppp+ for modem or DSL connections, \n"
+"\t\teth0, or eth1 for cable connection, \n"
+"\t\tippp+ for a isdn connection.\n"
 msgstr ""
-"Rhowch enw'r rhyngwyneb sy'n cysylltu â'r "
-"rhyngrwyd.                                \n"
+"Rhowch enw'r rhyngwyneb sy'n cysylltu â'r rhyngrwyd.\n"
 "\n"
 "Enghreifftiau:\n"
-"                    ppp+ cysylltiad modem neu DSL, \n"
-"                    eth0, neu eth1 fam gysylltiad cebl, \n"
-"                    ppp+ am gysylltiad idsn.\n"
+"\t\tppp+ cysylltiad modem neu DSL, \n"
+"\t\teth0, neu eth1 fam gysylltiad cebl, \n"
+"\t\tippp+ am gysylltiad idsn.\n"
 
-#: network/tools.pm:207
+#: network/tools.pm:205
 #, c-format
 msgid "Insert floppy"
 msgstr "Rhowch ddisg meddal"
 
-#: network/tools.pm:208
+#: network/tools.pm:206
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
@@ -10754,22 +10798,22 @@ msgstr ""
 "Rhowch ddisg meddal wedi ei fformatio i FAT yng ngyrrwr %s gyda %s yng "
 "nghyfeiriadur gwraidd a phwyso %s"
 
-#: network/tools.pm:209
+#: network/tools.pm:207
 #, 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:642
+#: partition_table.pm:644
 #, c-format
 msgid "mount failed: "
 msgstr "maethodd y gosodiad"
 
-#: partition_table.pm:747
+#: partition_table.pm:749
 #, 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:765
+#: partition_table.pm:767
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -10780,22 +10824,22 @@ msgstr ""
 "Yr unig ateb yw i symud eich rhaniadau cynradd fel bo'r twll nesaf at y "
 "rhaniadau estynedig "
 
-#: partition_table.pm:852
+#: partition_table.pm:854
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Methodd adfer o ffeil %s: %s"
 
-#: partition_table.pm:854
+#: partition_table.pm:856
 #, c-format
 msgid "Bad backup file"
 msgstr "Ffeil wrth gefn gwallus"
 
-#: partition_table.pm:874
+#: partition_table.pm:876
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Gwall wrth ysgrifennu i ffeil %s"
 
-#: partition_table/raw.pm:181
+#: partition_table/raw.pm:187
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10832,70 +10876,70 @@ msgstr "hyfryd"
 msgid "maybe"
 msgstr "efallai"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
 msgstr "(ar %s)"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on this machine)"
 msgstr "(ar y peiriant hwn)"
 
-#: printer/cups.pm:99 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:197
 #, c-format
 msgid "Configured on other machines"
 msgstr "Ffurfweddu ar beiriannau eraill"
 
-#: printer/cups.pm:101
+#: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "Ar weinydd CUPS \"%s\""
 
-#: printer/cups.pm:101 printer/printerdrake.pm:3784
-#: printer/printerdrake.pm:3793 printer/printerdrake.pm:3934
-#: printer/printerdrake.pm:3945 printer/printerdrake.pm:4157
+#: printer/cups.pm:117 printer/printerdrake.pm:3989
+#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
+#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
 #, c-format
 msgid " (Default)"
 msgstr "(Rhagosodedig)"
 
-#: printer/data.pm:21
+#: printer/data.pm:22
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Print, Don't Queue"
 
-#: printer/data.pm:22
+#: printer/data.pm:23
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:33
+#: printer/data.pm:34
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - Line Printer Daemon"
 
-#: printer/data.pm:34
+#: printer/data.pm:35
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:55
+#: printer/data.pm:56
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR New Generation"
 
-#: printer/data.pm:56
+#: printer/data.pm:57
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:81
+#: printer/data.pm:82
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Common Unix Printing System"
 
 #: printer/detect.pm:148 printer/detect.pm:226 printer/detect.pm:428
-#: printer/detect.pm:465 printer/printerdrake.pm:679
+#: printer/detect.pm:465 printer/printerdrake.pm:686
 #, c-format
 msgid "Unknown Model"
 msgstr "Model anhysbys"
@@ -10915,7 +10959,7 @@ msgstr "Argraffydd pell"
 msgid "Printer on remote CUPS server"
 msgstr "Argraffydd ar weinydd CUPS pell"
 
-#: printer/main.pm:31 printer/printerdrake.pm:1372
+#: printer/main.pm:31 printer/printerdrake.pm:1406
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "Argraffydd ar weinydd lpd pell"
@@ -10935,7 +10979,7 @@ msgstr "Argraffydd ar weinydd SMB/Windows 95/98/NT"
 msgid "Printer on NetWare server"
 msgstr "Argraffydd ar weinydd NetWare"
 
-#: printer/main.pm:35 printer/printerdrake.pm:1376
+#: printer/main.pm:35 printer/printerdrake.pm:1410
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "Rhowch URI dyfais argraffydd"
@@ -10946,8 +10990,8 @@ msgid "Pipe job into a command"
 msgstr "Peipio'r gwaith i orchymyn"
 
 #: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544
-#: printer/main.pm:2217 printer/printerdrake.pm:1781
-#: printer/printerdrake.pm:4191
+#: printer/main.pm:2228 printer/main.pm:2239 printer/printerdrake.pm:1866
+#: printer/printerdrake.pm:4396
 #, c-format
 msgid "Unknown model"
 msgstr "Model anhysbys"
@@ -10957,12 +11001,12 @@ msgstr "Model anhysbys"
 msgid "Configured on this machine"
 msgstr "Ffurfweddwyd ar y peiriant hwn"
 
-#: printer/main.pm:337 printer/printerdrake.pm:948
+#: printer/main.pm:337 printer/printerdrake.pm:963
 #, c-format
 msgid " on parallel port #%s"
 msgstr " ar borth paralel #\"%s"
 
-#: printer/main.pm:340 printer/printerdrake.pm:950
+#: printer/main.pm:340 printer/printerdrake.pm:965
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", argraffydd USB #\"%s"
@@ -11032,8 +11076,8 @@ msgstr ", defnyddio gorchymyn %s"
 msgid "Parallel port #%s"
 msgstr "Porth paralel #\"%s"
 
-#: printer/main.pm:391 printer/printerdrake.pm:964 printer/printerdrake.pm:987
-#: printer/printerdrake.pm:1005
+#: printer/main.pm:391 printer/printerdrake.pm:979
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
 #, c-format
 msgid "USB printer #%s"
 msgstr "Argraffydd USB #\"%s"
@@ -11103,8 +11147,8 @@ msgstr "Defnyddio gorchymyn %s"
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:571 printer/printerdrake.pm:725
-#: printer/printerdrake.pm:2331
+#: printer/main.pm:571 printer/printerdrake.pm:732
+#: printer/printerdrake.pm:2463
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "Argraffydd crai (dim gyrrwr)"
@@ -11148,7 +11192,7 @@ msgid ""
 msgstr ""
 "Mae'r HP LaserJet 1000 angen cael ei gadarnwedd wedi ei lwytho i fyny ar ôl "
 "ei gychwyn. Estynnwch y pecyn gyrrwr Windows o safle gwe HP (nid yw'r "
-"cadarnwedd ar CD'r argraffydd yn gweithio) a thynnwch y ffeil cadarnwedd "
+"gadarnwedd ar CD'r argraffydd yn gweithio) a thynnwch y ffeil cadarnwedd "
 "ohono gan ddatgywasgu 'r ffeil 'exe' gyda rhaglen 'datgywasgu' a chwilio am "
 "y ffeil 'sihp1000.img'. Copïo'r ffeil i gyfeiriadur '/etc/printer'. Yna bydd "
 "yn cael ei ganfod gan y sgript llwytho awtomatig a'i lwytho pryd bynnag fydd "
@@ -11163,7 +11207,7 @@ msgstr "Ffurfweddiad argraffydd CUPS "
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
-"accessable by remote machines and by which remote machines."
+"accessible by remote machines and by which remote machines."
 msgstr ""
 "Yma gallwch benderfynu a ddylai'r argraffyddion sy'n gysylltiedig â'r "
 "cyfrifiadur hwn fod ar gael i gyfrifiaduron pell a pha rai."
@@ -11197,8 +11241,8 @@ msgstr "Rhannu argraffydd ar westeiwr/rhwydwaith:"
 msgid "Custom configuration"
 msgstr "Ffurfweddiad addasu"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:554
-#: standalone/scannerdrake:571
+#: printer/printerdrake.pm:78 standalone/scannerdrake:561
+#: standalone/scannerdrake:578
 #, c-format
 msgid "No remote machines"
 msgstr "Dim cyfrifiaduron pell"
@@ -11414,7 +11458,7 @@ msgstr "IP'r gweinydd ar goll!"
 msgid "The entered IP is not correct.\n"
 msgstr "Nid yw'r IP'n gywir.\n"
 
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1582
+#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "Dylai rhif porth fod yn gyfanrif!"
@@ -11425,36 +11469,37 @@ 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:1603
-#: standalone/harddrake2:64
+#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
+#: standalone/drakups:233 standalone/harddrake2:64
 #, c-format
 msgid "Port"
 msgstr "Porth"
 
 #: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:605 printer/printerdrake.pm:621
-#: printer/printerdrake.pm:704 printer/printerdrake.pm:761
-#: printer/printerdrake.pm:787 printer/printerdrake.pm:1800
-#: printer/printerdrake.pm:1808 printer/printerdrake.pm:1830
-#: printer/printerdrake.pm:1857 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1929 printer/printerdrake.pm:1939
-#: printer/printerdrake.pm:2182 printer/printerdrake.pm:2187
-#: printer/printerdrake.pm:2326 printer/printerdrake.pm:2436
-#: printer/printerdrake.pm:2901 printer/printerdrake.pm:2966
-#: printer/printerdrake.pm:3000 printer/printerdrake.pm:3003
-#: printer/printerdrake.pm:3122 printer/printerdrake.pm:3184
-#: printer/printerdrake.pm:3256 printer/printerdrake.pm:3277
-#: printer/printerdrake.pm:3286 printer/printerdrake.pm:3377
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3481
-#: printer/printerdrake.pm:3488 printer/printerdrake.pm:3534
-#: printer/printerdrake.pm:3574 printer/printerdrake.pm:3586
-#: printer/printerdrake.pm:3597 printer/printerdrake.pm:3606
-#: printer/printerdrake.pm:3619 printer/printerdrake.pm:3689
-#: printer/printerdrake.pm:3740 printer/printerdrake.pm:3805
-#: printer/printerdrake.pm:4065 printer/printerdrake.pm:4108
-#: printer/printerdrake.pm:4254 printer/printerdrake.pm:4312
-#: printer/printerdrake.pm:4341 standalone/printerdrake:65
-#: standalone/printerdrake:85 standalone/printerdrake:515
+#: 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:515
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
@@ -11485,35 +11530,40 @@ msgstr ""
 "Nid oes angen ffurfweddu argraffyddion ar weinyddion CUPS pell: byddant yn "
 "cael eu canfod yn awtomatig."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
 #, c-format
 msgid ""
 "\n"
 "WARNING: No local network connection active, remote printers can neither be "
 "detected nor tested!"
 msgstr ""
+"\n"
+"RHYBUDD: Nid oes cyswllt rhwydwaith lleol yn weithredol, nid oes modd canfod "
+"na phrofi argraffyddion pell!"
 
 #: printer/printerdrake.pm:515
 #, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
-msgstr "Awtoganfod argraffydd (Argraffyddion lleôl, TCP/Socket, ac SMB)"
+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
 #, c-format
 msgid "Checking your system..."
 msgstr "Gwirio eich system..."
 
-#: printer/printerdrake.pm:560
+#: printer/printerdrake.pm:561
 #, c-format
 msgid "and one unknown printer"
 msgstr "ac un argraffydd anhysbys"
 
-#: printer/printerdrake.pm:562
+#: printer/printerdrake.pm:563
 #, c-format
 msgid "and %d unknown printers"
 msgstr "a %d argraffydd anhysbys"
 
-#: printer/printerdrake.pm:566
+#: printer/printerdrake.pm:567
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11526,7 +11576,7 @@ msgstr ""
 "%s%s\n"
 "wedi eu cysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:568
+#: printer/printerdrake.pm:569
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11539,7 +11589,7 @@ msgstr ""
 "%s%s\n"
 "wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:570
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11552,7 +11602,7 @@ msgstr ""
 "%s%s\n"
 "wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:573
+#: printer/printerdrake.pm:574
 #, c-format
 msgid ""
 "\n"
@@ -11561,7 +11611,7 @@ msgstr ""
 "\n"
 "Mae un argraffydd anhysbys wedi ei gysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:575
 #, c-format
 msgid ""
 "\n"
@@ -11570,7 +11620,7 @@ msgstr ""
 "\n"
 "Mae yna %d argraffydd anhysbys wedi eu cysylltu'n uniongyrchol â'ch system"
 
-#: printer/printerdrake.pm:577
+#: printer/printerdrake.pm:578
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
@@ -11578,13 +11628,13 @@ msgstr ""
 "Nid oes unrhyw argraffydd wedi ei ganfod wedi ei gysylltu'n uniongyrchol "
 "â'ch cyfrifiadur"
 
-#: printer/printerdrake.pm:580
+#: printer/printerdrake.pm:581
 #, 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:593
+#: printer/printerdrake.pm:594
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -11593,22 +11643,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:594
+#: printer/printerdrake.pm:595
 #, 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:596
+#: printer/printerdrake.pm:597
 #, 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:597
+#: printer/printerdrake.pm:598
 #, 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:598
+#: printer/printerdrake.pm:599
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11617,48 +11667,48 @@ 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:622
+#: printer/printerdrake.pm:629
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Chwilio am argraffyddion newydd..."
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:713
 #, c-format
 msgid "Configuring printer ..."
 msgstr "Ffurfweddu argraffydd  ..."
 
-#: printer/printerdrake.pm:707 printer/printerdrake.pm:762
-#: printer/printerdrake.pm:3598
+#: 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:727
+#: printer/printerdrake.pm:734
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:728
+#: printer/printerdrake.pm:735
 #, c-format
 msgid " on "
 msgstr "ar "
 
-#: printer/printerdrake.pm:729 standalone/scannerdrake:130
+#: printer/printerdrake.pm:736 standalone/scannerdrake:136
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:734 printer/printerdrake.pm:2338
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
 #, c-format
 msgid "Printer model selection"
 msgstr "Dewis model yr argraffydd"
 
-#: printer/printerdrake.pm:735 printer/printerdrake.pm:2339
+#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "Pa fath o argraffydd sydd gennych?"
 
-#: printer/printerdrake.pm:736
+#: printer/printerdrake.pm:743
 #, c-format
 msgid ""
 "\n"
@@ -11671,7 +11721,7 @@ msgstr ""
 "Nid oedd Printerdrake yn gallu adnabod eich argraffydd %s. Dewiswch yr un "
 "cywir o'r rhestr."
 
-#: printer/printerdrake.pm:739 printer/printerdrake.pm:2344
+#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -11680,21 +11730,21 @@ msgstr ""
 "Nid yw eich argraffydd wedi ei rhestri, dewiswch un cyfatebol (gw. llawlyfr "
 "eich argraffydd) neu un tebyg."
 
-#: printer/printerdrake.pm:788 printer/printerdrake.pm:3587
-#: printer/printerdrake.pm:3741 printer/printerdrake.pm:4066
-#: printer/printerdrake.pm:4109 printer/printerdrake.pm:4313
+#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
+#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
+#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
 #, c-format
 msgid "Configuring applications..."
 msgstr "Ffurfweddi'u rhaglenni"
 
-#: printer/printerdrake.pm:824 printer/printerdrake.pm:836
-#: printer/printerdrake.pm:894 printer/printerdrake.pm:1787
-#: printer/printerdrake.pm:3823 printer/printerdrake.pm:4006
+#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
+#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
+#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
 #, c-format
 msgid "Add a new printer"
 msgstr "Ychwanegu argraffydd newydd"
 
-#: printer/printerdrake.pm:825
+#: printer/printerdrake.pm:832
 #, c-format
 msgid ""
 "\n"
@@ -11718,7 +11768,7 @@ msgstr ""
 "yn rhoi mynediad i'r holl yrwyr argraffyddion sydd ar gael, dewisiadau "
 "gyrwyr a mathau o gysylltiadau argraffyddion."
 
-#: printer/printerdrake.pm:838
+#: printer/printerdrake.pm:845
 #, c-format
 msgid ""
 "\n"
@@ -11758,7 +11808,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:847
+#: printer/printerdrake.pm:854
 #, c-format
 msgid ""
 "\n"
@@ -11785,7 +11835,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:855
+#: printer/printerdrake.pm:862
 #, c-format
 msgid ""
 "\n"
@@ -11823,7 +11873,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:864
+#: printer/printerdrake.pm:871
 #, c-format
 msgid ""
 "\n"
@@ -11850,26 +11900,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:873
+#: printer/printerdrake.pm:880
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Awto ganfod argraffyddion sy'n gysylltiedig a'r peiriant hwn"
 
-#: printer/printerdrake.pm:876
+#: printer/printerdrake.pm:883
 #, 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:879
+#: printer/printerdrake.pm:886
 #, 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:895
+#: printer/printerdrake.pm:902
 #, c-format
 msgid ""
 "\n"
@@ -11892,54 +11942,70 @@ msgstr ""
 "gosodiadau dewis rhagosodedig (mewnflwch papur, ansawdd y printiad,...), "
 "dewiswch \"Argraffydd\" yn adran \"Caledwedd\" Canolfan Rheoli %s."
 
-#: printer/printerdrake.pm:930 printer/printerdrake.pm:1060
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: 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
+#, c-format
+msgid "Could not install the %s packages!"
+msgstr "Methu gosod pecynnau: %s!"
+
+#: printer/printerdrake.pm:939
+#, 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
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Awto ganfod argraffydd"
 
-#: printer/printerdrake.pm:930
+#: printer/printerdrake.pm:945
 #, c-format
 msgid "Detecting devices..."
 msgstr "Canfod dyfeisiau..."
 
-#: printer/printerdrake.pm:952
+#: printer/printerdrake.pm:967
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", rhwydwaith argraffu \"%s\", porth %s"
 
-#: printer/printerdrake.pm:954
+#: printer/printerdrake.pm:969
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", argraffydd \"%s\" ar weinydd  SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:958
+#: printer/printerdrake.pm:973
 #, c-format
 msgid "Detected %s"
 msgstr "Canfyddwyd %s"
 
-#: printer/printerdrake.pm:962 printer/printerdrake.pm:985
-#: printer/printerdrake.pm:1002
+#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
+#: printer/printerdrake.pm:1017
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "Argraffydd ar borth paralel #\"%s"
 
-#: printer/printerdrake.pm:966
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Argraffydd rhwydwaith \"%s\", porth %s"
 
-#: printer/printerdrake.pm:968
+#: printer/printerdrake.pm:983
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Argraffydd  \"%s\" ar weinydd SMB/Windows \"%s\""
 
-#: printer/printerdrake.pm:1047
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "Local Printer"
 msgstr "Argraffydd Lleol"
 
-#: printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1063
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -11952,32 +12018,32 @@ msgstr ""
 "dev/,...., cyfatebol i LPT1:, LPT2,..., argraffydd USB 1af: /dev/usb/lp0,  "
 "ail argraffydd USB: /dev/usb/lp1,...)."
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Rhaid cynnig enw dyfais neu ffeil!"
 
-#: printer/printerdrake.pm:1061
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid "No printer found!"
 msgstr "Heb ganfod argraffydd!"
 
-#: printer/printerdrake.pm:1069
+#: printer/printerdrake.pm:1084
 #, c-format
 msgid "Local Printers"
 msgstr "Argraffyddion Lleol"
 
-#: printer/printerdrake.pm:1070
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Available printers"
 msgstr "Argraffyddion ar gael"
 
-#: printer/printerdrake.pm:1074 printer/printerdrake.pm:1083
+#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "Mae'r argraffydd canlynol wedi ei awtoganfod"
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1091
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -11986,18 +12052,18 @@ msgstr ""
 "Os nad hwn yw'r un rydych am ei ffurfweddu, rhowch enw dyfais/enw ffeil ar y "
 "llinell mewnbwn."
 
-#: printer/printerdrake.pm:1077
+#: printer/printerdrake.pm:1092
 #, 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:1078 printer/printerdrake.pm:1087
+#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "Dyma restr o argraffyddion wedi eu awtoganfod."
 
-#: printer/printerdrake.pm:1080
+#: printer/printerdrake.pm:1095
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -12006,7 +12072,7 @@ msgstr ""
 "Dewiswch yr argraffydd i'w osod neu rhowch enw dyfais/ffeil ar y llinell "
 "mewnbwn"
 
-#: printer/printerdrake.pm:1081
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -12015,7 +12081,7 @@ msgstr ""
 "Dewiswch yr argraffydd i drin y gwaith argraffu neu rhowch enw dyfais/ffeil "
 "ar y llinell mewnbwn"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1100
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12026,12 +12092,12 @@ msgstr ""
 "argraffydd ei ganfod yn gywir neu byddai'n well gennych ffurfweddiad unigryw "
 "i'ch argraffydd, cychwynnwch \"Ffurfweddiad gyda Llaw\"."
 
-#: printer/printerdrake.pm:1086
+#: printer/printerdrake.pm:1101
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Does dim dewis arall ar gael ar hyn o bryd"
 
-#: printer/printerdrake.pm:1089
+#: printer/printerdrake.pm:1104
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12044,12 +12110,12 @@ msgstr ""
 "byddai'n well gennych ffurfweddiad unigryw i'ch argraffydd, cychwynnwch "
 "\"Ffurfweddiad gyda Llaw\"."
 
-#: printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1105
 #, 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:1092
+#: printer/printerdrake.pm:1107
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -12058,12 +12124,12 @@ msgstr ""
 "Dewiswch y porth y mae eich argraffydd wedi cysylltu iddo neu rhowch enw "
 "dyfais/ffeil ar y llinell mewnbwn"
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1108
 #, 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:1095
+#: printer/printerdrake.pm:1110
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12072,17 +12138,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:1099
+#: printer/printerdrake.pm:1114
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Rhaid dewis/rhoi argraffydd/dyfais!"
 
-#: printer/printerdrake.pm:1168
+#: 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
+#, c-format
+msgid "Aborting"
+msgstr "Atal"
+
+#: printer/printerdrake.pm:1189
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Dewisiadau Argraffydd lpd Pell"
 
-#: printer/printerdrake.pm:1169
+#: printer/printerdrake.pm:1190
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -12091,66 +12166,65 @@ msgstr ""
 "I ddefnyddio argraffydd lpd pell, rhaid darparu enw gwesteiwr gweinydd yr "
 "argraffydd ac enw'r argraffydd ar y gweinydd hwnnw."
 
-#: printer/printerdrake.pm:1170
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "Remote host name"
 msgstr "Enw gwesteiwr pell"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1192
 #, c-format
 msgid "Remote printer name"
 msgstr "Enw'r argraffydd pell"
 
-#: printer/printerdrake.pm:1174
+#: printer/printerdrake.pm:1195
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Mae enw'r gwesteiwr pell ar goll!"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Mae enw'r argraffydd pell ar goll!"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
-#: standalone/drakTermServ:442 standalone/drakTermServ:725
-#: standalone/drakTermServ:741 standalone/drakTermServ:1332
-#: standalone/drakTermServ:1340 standalone/drakTermServ:1351
-#: standalone/drakbackup:767 standalone/drakbackup:874
-#: standalone/drakbackup:908 standalone/drakbackup:1027
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#: standalone/drakconnect:254 standalone/drakconnect:283
-#: standalone/drakconnect:512 standalone/drakconnect:516
-#: standalone/drakconnect:540 standalone/harddrake2:159
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: standalone/drakTermServ:465 standalone/drakTermServ:763
+#: standalone/drakTermServ:779 standalone/drakTermServ:1417
+#: standalone/drakTermServ:1425 standalone/drakTermServ:1436
+#: standalone/drakbackup:582 standalone/drakbackup:687
+#: standalone/drakbackup:722 standalone/drakbackup:840
+#: standalone/drakconnect:263 standalone/drakconnect:298
+#: standalone/drakconnect:542 standalone/drakconnect:552
+#: standalone/drakconnect:576 standalone/harddrake2:160
 #, c-format
 msgid "Information"
 msgstr "Gwybodaeth"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Canfyddwyd model %s %s"
 
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Scanning network..."
 msgstr "Chwilio'r rhwydwaith..."
 
-#: printer/printerdrake.pm:1287 printer/printerdrake.pm:1308
+#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", argraffydd \"%s\" ar weinydd \"%s\""
 
-#: printer/printerdrake.pm:1290 printer/printerdrake.pm:1311
+#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Argraffydd \"%s\" ar weinydd \"%s\""
 
-#: printer/printerdrake.pm:1332
+#: printer/printerdrake.pm:1366
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Dewisiadau Argraffydd SMB (Windows 9x/NT)"
 
-#: printer/printerdrake.pm:1333
+#: printer/printerdrake.pm:1367
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12164,7 +12238,7 @@ msgstr ""
 "am gael mynediad iddo ac unrhyw enw defnyddiwr, cyfrinair a gwybodaeth am "
 "grwp gwaith perthynol."
 
-#: printer/printerdrake.pm:1334
+#: printer/printerdrake.pm:1368
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12173,47 +12247,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:1336
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid "SMB server host"
 msgstr "Gweinydd gwesteiwr SMB"
 
-#: printer/printerdrake.pm:1337
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "SMB server IP"
 msgstr "IP Gweinydd SMB"
 
-#: printer/printerdrake.pm:1338
+#: printer/printerdrake.pm:1372
 #, c-format
 msgid "Share name"
 msgstr "Rhannu enw"
 
-#: printer/printerdrake.pm:1341
+#: printer/printerdrake.pm:1375
 #, c-format
 msgid "Workgroup"
 msgstr "Grwp gwaith"
 
-#: printer/printerdrake.pm:1343
+#: printer/printerdrake.pm:1377
 #, c-format
 msgid "Auto-detected"
 msgstr "Awto ganfod"
 
-#: printer/printerdrake.pm:1353
+#: printer/printerdrake.pm:1387
 #, 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:1357
+#: printer/printerdrake.pm:1391
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Mae enw rhannu Samba ar goll!"
 
-#: printer/printerdrake.pm:1363
+#: printer/printerdrake.pm:1397
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "RHYBUDD DIOGELWCH!"
 
-#: printer/printerdrake.pm:1364
+#: printer/printerdrake.pm:1398
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -12257,7 +12331,7 @@ msgstr ""
 "Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1374
+#: printer/printerdrake.pm:1408
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12269,7 +12343,7 @@ msgstr ""
 "a gosod argraffu o'r peiriant hwn gyda'r \"%s\" yn Printerdrake.\n"
 "\n"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1411
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12282,12 +12356,12 @@ msgstr ""
 "\n"
 "Ydych chi am barhau i osod yr argraffydd hwn?"
 
-#: printer/printerdrake.pm:1449
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "Dewisiadau Argraffydd NetWare"
 
-#: printer/printerdrake.pm:1450
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12300,42 +12374,42 @@ msgstr ""
 "â'r rhes waith argraffu am yr argraffydd rydych am gael mynediad iddo ac "
 "unrhyw enw defnyddiwr a chyfrinair perthnasol."
 
-#: printer/printerdrake.pm:1451
+#: printer/printerdrake.pm:1491
 #, c-format
 msgid "Printer Server"
 msgstr "Gweinydd Argraffydd"
 
-#: printer/printerdrake.pm:1452
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Print Queue Name"
 msgstr "Enw Rhes Argraffu"
 
-#: printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1497
 #, c-format
 msgid "NCP server name missing!"
 msgstr "Mae enw gweinydd NCP ar goll!"
 
-#: printer/printerdrake.pm:1461
+#: printer/printerdrake.pm:1501
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "Mae enw rhes NCP ar goll"
 
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1547
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", gwesteiwr \"%s\", porth %s"
 
-#: printer/printerdrake.pm:1530 printer/printerdrake.pm:1550
+#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr ",Gwesteiwr  \"%s\", porth %s"
 
-#: printer/printerdrake.pm:1571
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "Dewisiadau Argraffydd TCP/Soced"
 
-#: printer/printerdrake.pm:1573
+#: printer/printerdrake.pm:1620
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -12345,7 +12419,7 @@ msgstr ""
 "yr enw gwesteiwr neu IP a'r rhif porth dewisol (9100 yw'r rhagosodedig) i'r "
 "meysydd mewnbwn."
 
-#: printer/printerdrake.pm:1574
+#: printer/printerdrake.pm:1621
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12358,22 +12432,27 @@ msgstr ""
 "weinyddion HP JetDirect rhif y porth, fel rheol, yw 9100, gall amrywio ar "
 "weinyddion eraill. Gweler llawlyfr eich caledwedd"
 
-#: printer/printerdrake.pm:1578
+#: printer/printerdrake.pm:1625
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Mae enw'r gwesteiwr argraffu neu IP ar goll!"
 
-#: printer/printerdrake.pm:1601
+#: printer/printerdrake.pm:1648
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Enw'r gwesteiwr neu IP yr argraffydd"
 
-#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
+#: printer/printerdrake.pm:1704
+#, c-format
+msgid "Refreshing Device URI list..."
+msgstr "Adnewyddu rhestr Dyfais URI..."
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
 #, c-format
 msgid "Printer Device URI"
 msgstr "URI Dyfais Argraffu"
 
-#: printer/printerdrake.pm:1650
+#: printer/printerdrake.pm:1708
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12384,17 +12463,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:1668
+#: printer/printerdrake.pm:1731
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Rhaid cynnig URI dilys!"
 
-#: printer/printerdrake.pm:1749
+#: printer/printerdrake.pm:1834
 #, c-format
 msgid "Pipe into command"
 msgstr "Peipio i orchymyn"
 
-#: printer/printerdrake.pm:1750
+#: printer/printerdrake.pm:1835
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
@@ -12403,17 +12482,17 @@ msgstr ""
 "Yma gallwch bennu unrhyw fan lle dylid cyfeirio'r gwaith yn lle ei anfon at "
 "yr argraffydd."
 
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1836
 #, c-format
 msgid "Command line"
 msgstr "Llinell orchymyn"
 
-#: printer/printerdrake.pm:1755
+#: printer/printerdrake.pm:1840
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Rhaid rhoi llinell gorchymyn!"
 
-#: printer/printerdrake.pm:1788
+#: printer/printerdrake.pm:1873
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12424,59 +12503,74 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300 gyda sganiwr, DeskJet 450, Sony IJP-V100), "
 "HP PhotoSmart neu HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1801
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "Gosod pecyn HPOJ..."
 
-#: printer/printerdrake.pm:1809 printer/printerdrake.pm:1893
+#: printer/printerdrake.pm:1894
+#, 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
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "Gwirio'r ddyfais a ffurfweddu HPOJ..."
 
-#: printer/printerdrake.pm:1831
+#: printer/printerdrake.pm:1946
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "Gosod pecynnau SANE..."
 
-#: printer/printerdrake.pm:1858
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr "Ni fydd sganio'n bosibl ar %s"
+
+#: printer/printerdrake.pm:1983
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Gosod pecynnau mtools..."
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1990
+#, 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
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Sganio eich dyfais amlbwrpas HP"
 
-#: printer/printerdrake.pm:1881
+#: printer/printerdrake.pm:2013
 #, 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:1930
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Gwneud porth argraffu ar gael ar gyfer CUPS..."
 
-#: printer/printerdrake.pm:1939 printer/printerdrake.pm:2183
-#: printer/printerdrake.pm:2327
+#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
+#: printer/printerdrake.pm:2459
 #, c-format
 msgid "Reading printer database..."
 msgstr "Darllen cronfa ddata argraffydd..."
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2281
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Rhowch Enw'r Argraffydd a Sylw"
 
-#: printer/printerdrake.pm:2153 printer/printerdrake.pm:3241
+#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
 #, 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:2159 printer/printerdrake.pm:3246
+#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -12485,7 +12579,7 @@ msgstr ""
 "Mae argraffydd \"%s\" yn bodoli eisoes,\n"
 "ydych chi wir eisiau ailysgrifennu ei ffurfweddiad?"
 
-#: printer/printerdrake.pm:2168
+#: printer/printerdrake.pm:2300
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12494,35 +12588,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:2169
+#: printer/printerdrake.pm:2301
 #, c-format
 msgid "Name of printer"
 msgstr "Enw'r argraffydd"
 
-#: printer/printerdrake.pm:2170 standalone/drakconnect:521
+#: printer/printerdrake.pm:2302 standalone/drakconnect:557
 #: standalone/harddrake2:40 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: printer/printerdrake.pm:2171 standalone/printerdrake:212
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Location"
 msgstr "Lleoliad"
 
-#: printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:2320
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Paratoi cronfa ddata argraffydd..."
 
-#: printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2438
 #, c-format
 msgid "Your printer model"
 msgstr "Model eich argraffydd"
 
-#: printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2439
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12548,18 +12642,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2312 printer/printerdrake.pm:2315
+#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
 #, c-format
 msgid "The model is correct"
 msgstr "Mae'r model yn gywir"
 
-#: printer/printerdrake.pm:2313 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2317
+#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
+#: printer/printerdrake.pm:2449
 #, c-format
 msgid "Select model manually"
 msgstr "Dewiswch y model gyda llaw"
 
-#: printer/printerdrake.pm:2340
+#: printer/printerdrake.pm:2472
 #, c-format
 msgid ""
 "\n"
@@ -12574,12 +12668,12 @@ msgstr ""
 "Chwiliwch am y model cywir pan fo'r cyrchwr yn sefyll ar y model anghywir "
 "neu ar \"Argraffydd bras\"."
 
-#: printer/printerdrake.pm:2359
+#: printer/printerdrake.pm:2491
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Gosod ffeil PPD gan y cynhyrchwyr"
 
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2522
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12588,7 +12682,7 @@ msgstr ""
 "Mae pob argraffydd PostSgript yn cael ei ddarparu gyda ffeil PPD sy'n "
 "disgrifio dewisiadau a nodweddion yr argraffydd."
 
-#: printer/printerdrake.pm:2391
+#: printer/printerdrake.pm:2523
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
@@ -12597,12 +12691,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:2392
+#: printer/printerdrake.pm:2524
 #, 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:2393
+#: printer/printerdrake.pm:2525
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
@@ -12611,7 +12705,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:2394
+#: printer/printerdrake.pm:2526
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -12621,7 +12715,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:2395
+#: printer/printerdrake.pm:2527
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
@@ -12630,58 +12724,58 @@ msgstr ""
 "Yma cewch ddewis y ffeil PPD i'w osod ar eich peiriant, i'w ddefnyddio ar "
 "gyfer gosod eith peiriant."
 
-#: printer/printerdrake.pm:2397
+#: printer/printerdrake.pm:2529
 #, c-format
 msgid "Install PPD file from"
 msgstr "Gosod ffeil PPD o"
 
-#: printer/printerdrake.pm:2399 printer/printerdrake.pm:2406
-#: standalone/scannerdrake:174 standalone/scannerdrake:182
-#: standalone/scannerdrake:233 standalone/scannerdrake:240
+#: 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:2400 printer/printerdrake.pm:2408
-#: standalone/scannerdrake:175 standalone/scannerdrake:184
-#: standalone/scannerdrake:234 standalone/scannerdrake:242
+#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
+#: standalone/scannerdrake:181 standalone/scannerdrake:190
+#: standalone/scannerdrake:240 standalone/scannerdrake:248
 #, c-format
 msgid "Floppy Disk"
 msgstr "Disg Meddal"
 
-#: printer/printerdrake.pm:2401 printer/printerdrake.pm:2410
-#: standalone/scannerdrake:176 standalone/scannerdrake:186
-#: standalone/scannerdrake:235 standalone/scannerdrake:244
+#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
+#: standalone/scannerdrake:182 standalone/scannerdrake:192
+#: standalone/scannerdrake:241 standalone/scannerdrake:250
 #, c-format
 msgid "Other place"
 msgstr "Man arall"
 
-#: printer/printerdrake.pm:2416
+#: printer/printerdrake.pm:2548
 #, c-format
 msgid "Select PPD file"
 msgstr "Dewis ffeil PPD"
 
-#: printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2552
 #, 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:2426
+#: printer/printerdrake.pm:2558
 #, 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:2437
+#: printer/printerdrake.pm:2569
 #, c-format
 msgid "Installing PPD file..."
 msgstr "Gosod ffeil PPD..."
 
-#: printer/printerdrake.pm:2539
+#: printer/printerdrake.pm:2682
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "Ffurfweddiad OKI winprinter "
 
-#: printer/printerdrake.pm:2540
+#: printer/printerdrake.pm:2683
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12699,12 +12793,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:2564 printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Ffurfweddiad inkjet Lexmark"
 
-#: printer/printerdrake.pm:2565
+#: printer/printerdrake.pm:2708
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12716,7 +12810,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:2594
+#: printer/printerdrake.pm:2737
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12738,12 +12832,30 @@ msgstr ""
 "dudalennau'r alinio'r pen argraffu gyda \"lexmarkmaintain\" a newid "
 "gosodiadau aliniad y pen gyda'r rhaglen."
 
-#: printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:2746
+#, c-format
+msgid "Lexmark X125 configuration"
+msgstr "Ffurfweddiad Lexmark 125"
+
+#: printer/printerdrake.pm:2747
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected via "
+"USB, no printers on remote machines or print server boxes. Please connect "
+"your printer to a local USB 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:2765
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "Llwytho Cadarnwedd i Fyny ar gyfer HP LaserJet 1000"
 
-#: printer/printerdrake.pm:2710
+#: printer/printerdrake.pm:2878
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12761,27 +12873,27 @@ msgstr ""
 "argraffiad ansawdd/cydraniad uchel iawn yn gallu arafu'r argraffu'n "
 "sylweddol.."
 
-#: printer/printerdrake.pm:2835
+#: printer/printerdrake.pm:3003
 #, c-format
 msgid "Printer default settings"
 msgstr "Gosod yr Argraffydd Rhagosodedig"
 
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:3010
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Rhaid i ddewis %s fod yn gyfanrif"
 
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:3014
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Rhaid i ddewis %s fod yn rhif!"
 
-#: printer/printerdrake.pm:2850
+#: printer/printerdrake.pm:3018
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Dewis %s allan o amrediad!"
 
-#: printer/printerdrake.pm:2901
+#: printer/printerdrake.pm:3069
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12790,12 +12902,12 @@ msgstr ""
 "Ydych chi am osod argraffydd  (\"%s\")\n"
 "fel yr argraffydd rhagosodedig?"
 
-#: printer/printerdrake.pm:2916
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "Test pages"
 msgstr "Tudalennau prawf"
 
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12808,47 +12920,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:2921
+#: printer/printerdrake.pm:3089
 #, c-format
 msgid "No test pages"
 msgstr "Dim tudalennau prawf"
 
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3090
 #, c-format
 msgid "Print"
 msgstr "Argraffu"
 
-#: printer/printerdrake.pm:2947
+#: printer/printerdrake.pm:3115
 #, c-format
 msgid "Standard test page"
 msgstr "Tudalen prawf safonol"
 
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3118
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Prawf tudalen arall (Llythyr)"
 
-#: printer/printerdrake.pm:2953
+#: printer/printerdrake.pm:3121
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Prawf tudalen arall (A4)"
 
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:3123
 #, c-format
 msgid "Photo test page"
 msgstr "Tudalen prawf llun"
 
-#: printer/printerdrake.pm:2959
+#: printer/printerdrake.pm:3127
 #, c-format
 msgid "Do not print any test page"
 msgstr "Peidiwch argraffu tudalennau prawf"
 
-#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Argraffu tudalen(nau) prawf..."
 
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:3150
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "Methu gosod pecyn %s!"
+
+#: printer/printerdrake.pm:3152
+#, c-format
+msgid "Skipping photo test page."
+msgstr "Osgoi prawf llun ffoto"
+
+#: printer/printerdrake.pm:3169
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12863,7 +12985,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:2996
+#: printer/printerdrake.pm:3173
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12872,17 +12994,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:3003
+#: printer/printerdrake.pm:3180
 #, c-format
 msgid "Did it work properly?"
 msgstr "A weithiodd hwnnw'n iawn?"
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
 #, c-format
 msgid "Raw printer"
 msgstr "Argraffydd bras"
 
-#: printer/printerdrake.pm:3054
+#: printer/printerdrake.pm:3231
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -12895,7 +13017,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:3056
+#: printer/printerdrake.pm:3233
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -12906,8 +13028,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:3059 printer/printerdrake.pm:3076
-#: printer/printerdrake.pm:3086
+#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "\n"
@@ -12920,7 +13042,7 @@ msgstr ""
 "tasg argraffu penodol. Ychwanegwch y gosodiadau angenrheidiol i'r llinell "
 "gorchymyn, e.e \"%s <file>\". "
 
-#: printer/printerdrake.pm:3062 printer/printerdrake.pm:3102
+#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -12931,7 +13053,7 @@ msgstr ""
 "ai'r rhestr isod neu cliciwch ar y botwm \"Rhestr dewis argraffu\".%s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3066
+#: printer/printerdrake.pm:3243
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -12941,7 +13063,7 @@ msgstr ""
 "presennol:\n"
 "\n"
 
-#: printer/printerdrake.pm:3071 printer/printerdrake.pm:3081
+#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -12950,8 +13072,8 @@ msgstr ""
 "I argraffu ffeil o'r llinell orchymyn (ffenestr terfynell) defnyddiwch "
 "orchymyn \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3073 printer/printerdrake.pm:3083
-#: printer/printerdrake.pm:3093
+#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
+#: printer/printerdrake.pm:3270
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -12962,7 +13084,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:3078 printer/printerdrake.pm:3088
+#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -12971,7 +13093,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:3091
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -12980,7 +13102,7 @@ msgstr ""
 "I argraffu ffeil o'r llinell orchymyn (ffenestr terfynell) defnyddiwch y "
 "gorchymyn \"%s <file>\" neu \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3272
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12998,7 +13120,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:3099
+#: printer/printerdrake.pm:3276
 #, c-format
 msgid ""
 "\n"
@@ -13011,42 +13133,42 @@ msgstr ""
 "ar gyfer tasg argraffu penodol. Ychwanegwch y gosodiadau angenrheidiol i'r "
 "llinell gorchymyn, e.e \"%s <file>\".\n"
 
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3286
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Argraffu/Sganio/Cardiau Llun ar  \"%s\""
 
-#: printer/printerdrake.pm:3110
+#: printer/printerdrake.pm:3287
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Argraffu/Sganio ar  \"%s\""
 
-#: printer/printerdrake.pm:3112
+#: printer/printerdrake.pm:3289
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Argraffu/Mynediad Cardiau Llun ar  \"%s\""
 
-#: printer/printerdrake.pm:3113
+#: printer/printerdrake.pm:3290
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Argraffu ar argraffydd \"%s\""
 
-#: printer/printerdrake.pm:3116 printer/printerdrake.pm:3119
-#: printer/printerdrake.pm:3120 printer/printerdrake.pm:3121
-#: printer/printerdrake.pm:4179 standalone/drakTermServ:321
-#: standalone/drakbackup:4583 standalone/drakbug:177 standalone/drakfont:497
-#: standalone/drakfont:588 standalone/net_monitor:106
+#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
+#: printer/printerdrake.pm:4384 standalone/drakTermServ:324
+#: standalone/drakbackup:4265 standalone/drakbug:177 standalone/drakfont:500
+#: standalone/drakfont:591 standalone/net_monitor:106
 #: standalone/printerdrake:508
 #, c-format
 msgid "Close"
 msgstr "Cau"
 
-#: printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Print option list"
 msgstr "Rhestr ddewis argraffu"
 
-#: printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3317
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13069,7 +13191,7 @@ msgstr ""
 "\n"
 "Peidiwch defnyddio \"scannerdrake\" ar gyfer y ddyfais hon."
 
-#: printer/printerdrake.pm:3163
+#: printer/printerdrake.pm:3343
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13082,7 +13204,7 @@ msgid ""
 "can switch between drive letters with the field at the upper-right corners "
 "of the file lists."
 msgstr ""
-"Mae eich argraffydd wedi ei ffurfweddu'n awtomatig i rhoi mynediad i chi i'r "
+"Mae eich argraffydd wedi ei ffurfweddu'n awtomatig i rhoi fynediad i chi i'r "
 "gyrrwr cerdyn llun o'c cyfrifiadur. Mae modd i chi gael mynediad at eich "
 "cardiau llun drwy'r rhaglen graffigol \"MtoolsFM\" (Dewislen: \"Rhaglenni\" -"
 "> \"Offer ffeil\" -> \"Rheolwr Ffeiliau MTools\") neu ar y llinell "
@@ -13091,18 +13213,18 @@ 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:3185 printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
 #, c-format
 msgid "Reading printer data..."
 msgstr "Darllen data argraffydd..."
 
-#: printer/printerdrake.pm:3205 printer/printerdrake.pm:3232
-#: printer/printerdrake.pm:3267
+#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
+#: printer/printerdrake.pm:3447
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "Trosglwyddo ffurfweddiad yr argraffydd"
 
-#: printer/printerdrake.pm:3206
+#: printer/printerdrake.pm:3386
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13117,7 +13239,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:3209
+#: printer/printerdrake.pm:3389
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13126,7 +13248,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:3211
+#: printer/printerdrake.pm:3391
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13134,12 +13256,12 @@ msgid ""
 msgstr ""
 "Mae PDQ yn cynnal argraffyddion lleol,  LDP pell, a Socket/TCP, yn unig.\n"
 
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3393
 #, 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:3215
+#: printer/printerdrake.pm:3395
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13148,7 +13270,7 @@ msgstr ""
 "Yn ogystal, nid oes modd trosglwyddo rhesi grëwyd gan y rhaglen hon na "
 "\"foomatic-configure\"."
 
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3396
 #, c-format
 msgid ""
 "\n"
@@ -13159,7 +13281,7 @@ msgstr ""
 "Hefyd nid oes modd trosglwyddo argraffyddion ffurfweddwyd gyda ffeiliau PPD "
 "ddarparwyd gan eu gwneuthurwyr na gyrrwyr CUPS brodorol."
 
-#: printer/printerdrake.pm:3217
+#: printer/printerdrake.pm:3397
 #, c-format
 msgid ""
 "\n"
@@ -13170,17 +13292,17 @@ msgstr ""
 "Nodwch yr argraffydd rydych am ei drosglwddo a chliciwch\n"
 "\"Trosglwyddo\"."
 
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3400
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Peidio trosglwyddo argraffydd"
 
-#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
 #, c-format
 msgid "Transfer"
 msgstr "Trosglwyddo"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3413
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13191,17 +13313,17 @@ msgstr ""
 "Cliciwch \"Trosglwyddo\" i ysgrifennu drosto.\n"
 "Mae modd i chi osod enw newydd arno neu ei hepgor."
 
-#: printer/printerdrake.pm:3254
+#: printer/printerdrake.pm:3434
 #, c-format
 msgid "New printer name"
 msgstr "Enw'r argraffydd newydd"
 
-#: printer/printerdrake.pm:3257
+#: printer/printerdrake.pm:3437
 #, c-format
 msgid "Transferring %s..."
 msgstr "Trosglwyddo %s..."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13211,28 +13333,28 @@ msgstr ""
 "(\"%s\"). A ddylai fod yn argraffydd rhagosodedig y system argraffu newydd %"
 "s ?"
 
-#: printer/printerdrake.pm:3278
+#: printer/printerdrake.pm:3458
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Adnewyddu data'r argraffydd..."
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3467
 #, c-format
 msgid "Starting network..."
 msgstr "Cychwyn y rhwydwaith..."
 
-#: printer/printerdrake.pm:3328 printer/printerdrake.pm:3332
-#: printer/printerdrake.pm:3334
+#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
+#: printer/printerdrake.pm:3514
 #, c-format
 msgid "Configure the network now"
 msgstr "Ffurfweddwch y rhwydwaith"
 
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Nid yw swyddogaethau'r rhwydwaith wedi ei ffurfweddu"
 
-#: printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3510
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13245,16 +13367,16 @@ 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:3333
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Parhau heb ffurfweddu'r rhwydwaith"
 
-#: printer/printerdrake.pm:3367
+#: printer/printerdrake.pm:3547
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
-"now. Please check whether the network is accessable after booting your "
+"now. Please check whether the network is accessible after booting your "
 "system and correct the configuration using the %s Control Center, section "
 "\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
@@ -13265,7 +13387,7 @@ msgstr ""
 "\"Rrhwydwaith a'r Rhyngrwyd\"/\"Cysylltiad\", ac yna gosod yr argraffydd, "
 "eto gan ddefnyddio Canolfan Rheoli %s, adran \"Caledwedd\"/\"Argraffydd\""
 
-#: printer/printerdrake.pm:3368
+#: printer/printerdrake.pm:3548
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13276,34 +13398,34 @@ msgstr ""
 "Gwiriwch eich ffurfweddiad a'ch caledwedd. Yna ceisiwch ail ffurfweddi eich "
 "argraffydd."
 
-#: printer/printerdrake.pm:3378
+#: printer/printerdrake.pm:3558
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Ailgychwyn system argraffu..."
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "high"
 msgstr "uchel"
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "paranoid"
 msgstr "Paranoia"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Gosod system argraffu yn lefel diogelwch %s"
 
-#: printer/printerdrake.pm:3419
+#: printer/printerdrake.pm:3599
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
 "s security level.\n"
 "\n"
 "This printing system runs a daemon (background process) which waits for "
-"print jobs and handles them. This daemon is also accessable by remote "
+"print jobs and handles them. This daemon is also accessible by remote "
 "machines through the network and so it is a possible point for attacks. "
 "Therefore only a few selected daemons are started by default in this "
 "security level.\n"
@@ -13320,12 +13442,12 @@ msgstr ""
 "\n"
 "Ydych chi wir eisiau ffurfweddu argraffu ar y peiriant hwn?"
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Cychwyn y system argraffu wrth gychwyn y cyfrifiadur"
 
-#: printer/printerdrake.pm:3454
+#: printer/printerdrake.pm:3634
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13347,99 +13469,119 @@ msgstr ""
 "\n"
 "Ydych chi am i'r cychwyn awtomatig gael ei droi ymlaen eto?"
 
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
 #, c-format
 msgid "Checking installed software..."
 msgstr "Gwirio'r meddalwedd sydd wedi ei osod..."
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3661
 #, c-format
 msgid "Removing %s ..."
 msgstr "Tynnu %s..."
 
-#: printer/printerdrake.pm:3488
+#: printer/printerdrake.pm:3665
+#, c-format
+msgid "Could not remove the %s printing system!"
+msgstr "Methu tynnu'r system argraffu %s!"
+
+#: printer/printerdrake.pm:3674
 #, c-format
 msgid "Installing %s ..."
 msgstr "Gosod %s..."
 
-#: printer/printerdrake.pm:3535
+#: printer/printerdrake.pm:3678
+#, c-format
+msgid "Could not install the %s printing system!"
+msgstr "Methu gosod system argraffu %s!"
+
+#: printer/printerdrake.pm:3727
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Gosod yr Argraffydd Rhagosodedig"
 
-#: printer/printerdrake.pm:3555
+#: printer/printerdrake.pm:3747
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Dewiswch Sbwlydd Argraffydd"
 
-#: printer/printerdrake.pm:3556
+#: printer/printerdrake.pm:3748
 #, 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:3607
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Methu ffurfweddu argraffydd \"%s\"!"
 
-#: printer/printerdrake.pm:3620
+#: printer/printerdrake.pm:3812
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Gosod Foomatic..."
 
-#: printer/printerdrake.pm:3806
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3818
+#, 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
+#, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
 "it. "
 msgstr ""
-"Mae'r argraffyddion canlynol wedi eu ffurfweddi. Cliciwch ar un i newid ei "
+"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:3834
+#: printer/printerdrake.pm:4039
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Arddangos pob  argraffydd CUPS pell sydd ar gael"
 
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:4040
 #, 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:3845
+#: printer/printerdrake.pm:4050
 #, c-format
 msgid "CUPS configuration"
 msgstr "Ffurfweddiad CUPS"
 
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:4062
 #, c-format
 msgid "Change the printing system"
 msgstr "Newidiwch y system argraffu"
 
-#: printer/printerdrake.pm:3866
+#: printer/printerdrake.pm:4071
 #, c-format
 msgid "Normal Mode"
 msgstr "Modd Arferol"
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4072
 #, c-format
 msgid "Expert Mode"
 msgstr "Modd Uwch"
 
-#: printer/printerdrake.pm:4138 printer/printerdrake.pm:4193
-#: printer/printerdrake.pm:4274 printer/printerdrake.pm:4284
+#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
+#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
 #, c-format
 msgid "Printer options"
 msgstr "Dewisiadau argraffydd"
 
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4379
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Newid ffurfweddiad yr argraffydd"
 
-#: printer/printerdrake.pm:4176
+#: printer/printerdrake.pm:4381
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -13448,72 +13590,72 @@ msgstr ""
 "Argraffydd %s\n"
 "Beth ydych am ei newid ar yr argraffydd hwn?"
 
-#: printer/printerdrake.pm:4180
+#: printer/printerdrake.pm:4385
 #, c-format
 msgid "Do it!"
 msgstr "Gwna!!"
 
-#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
 #, c-format
 msgid "Printer connection type"
 msgstr "Math o gyswllt argraffydd"
 
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Enw'r argraffydd, disgrifiad, lleoliad"
 
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Gwneuthurwr yr argraffydd, model, gyrrwr"
 
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Gwneuthurwr yr argraffydd, model"
 
-#: printer/printerdrake.pm:4195 printer/printerdrake.pm:4278
+#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
 #, c-format
 msgid "Set this printer as the default"
 msgstr "Gosod yr argraffydd fel y rhagosodedig"
 
-#: printer/printerdrake.pm:4197 printer/printerdrake.pm:4285
+#: 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:4198 printer/printerdrake.pm:4290
+#: 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:4199 printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
 #, c-format
 msgid "Print test pages"
 msgstr "Argraffu tudalennau prawf"
 
-#: printer/printerdrake.pm:4200 printer/printerdrake.pm:4297
+#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "Gwybod sut i ddefnyddio'r argraffydd"
 
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
 #, c-format
 msgid "Remove printer"
 msgstr "Tynnu argraffydd"
 
-#: printer/printerdrake.pm:4255
+#: printer/printerdrake.pm:4460
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Tynnu hen argraffydd \"%s\"..."
 
-#: printer/printerdrake.pm:4286
+#: 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:4288
+#: printer/printerdrake.pm:4493
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
@@ -13521,18 +13663,18 @@ msgstr ""
 "Mae argraffydd \"%s\" wedi ei ychwanegu'n llwyddiannus i Star Office/"
 "OpenOffice.org/GIMP."
 
-#: printer/printerdrake.pm:4289
+#: 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:4291
+#: 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:4293
+#: printer/printerdrake.pm:4498
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
@@ -13541,28 +13683,28 @@ msgstr ""
 "Cafodd argraffydd \"%s\" ei dynnu'n llwyddiannus o Star Office/OpenOffice."
 "org."
 
-#: printer/printerdrake.pm:4294
+#: 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:4338
+#: printer/printerdrake.pm:4543
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Ydych chi wir eisiau tynnu argraffydd \"%s\""
 
-#: printer/printerdrake.pm:4342
+#: printer/printerdrake.pm:4547
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Tynnu argraffydd \"%s\"..."
 
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:4571
 #, c-format
 msgid "Default printer"
 msgstr "Argraffydd rhagosodedig"
 
-#: printer/printerdrake.pm:4367
+#: printer/printerdrake.pm:4572
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Mae argraffydd \"%s\" wedi ei osod fel yr argraffydd rhagosodedig."
@@ -13592,31 +13734,36 @@ msgstr "Dim digon o raniadau ar gyfer RAID lefel %d\n"
 msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr "Methu creu cyfeiriadur /usr/share/sane/firmware!"
 
-#: scanner.pm:102
+#: scanner.pm:107
+#, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr "Methu creu cyswllt /usr/share/sane/%s!"
+
+#: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr "Methu copïo ffeil cadarnwedd %s i /usr/share/sane/firmware!"
 
-#: scanner.pm:109
+#: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
 msgstr "Methu gosod caniatâd ffeiliau cadarnwedd %s!"
 
-#: scanner.pm:188 standalone/scannerdrake:59 standalone/scannerdrake:63
-#: standalone/scannerdrake:71 standalone/scannerdrake:333
-#: standalone/scannerdrake:407 standalone/scannerdrake:451
-#: standalone/scannerdrake:455 standalone/scannerdrake:477
-#: standalone/scannerdrake:542
+#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
+#: standalone/scannerdrake:77 standalone/scannerdrake:339
+#: standalone/scannerdrake:414 standalone/scannerdrake:458
+#: standalone/scannerdrake:462 standalone/scannerdrake:484
+#: standalone/scannerdrake:549
 #, c-format
 msgid "Scannerdrake"
 msgstr "Scannerdrake"
 
-#: scanner.pm:189 standalone/scannerdrake:903
+#: scanner.pm:201 standalone/scannerdrake:915
 #, 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)."
 
-#: scanner.pm:190
+#: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
 msgstr "Ni fydd eich sganiwr(wyr) ar gael ar gyfer defnyddwyr anwraidd"
@@ -14766,7 +14913,7 @@ msgid ""
 "about this service, sorry."
 msgstr "Dim gwybodaeth ychwanegol am y gwasanaeth hwn."
 
-#: services.pm:226 ugtk2.pm:1139
+#: services.pm:226 ugtk2.pm:1167
 #, c-format
 msgid "Info"
 msgstr "Gwybodaeth"
@@ -14794,8 +14941,8 @@ 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
 #, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
-msgstr "<b>Llongyfarchiadau ar ddewis Mandrake Linux!</b>"
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgstr "<b>Llongyfarchiadau ar ddewis 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
@@ -14806,13 +14953,13 @@ msgstr "Croeso i fyd Cod Agored!"
 #: share/advertising/dis-01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrake Linux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and Mandrake "
-"Linux contributors throughout the world."
+"Your new Mandrakelinux operating system and its many applications is the "
+"result of collaborative efforts between MandrakeSoft developers and "
+"Mandrakelinux contributors throughout the world."
 msgstr ""
-"Mae eich system weithredu Mandrake Linux a'i raglenni niferus yn ganlyniad "
-"ymdrechion cydweithredol rhwng datblygwyr MandrakeSoft â chyfranwyr Mandrake "
-"Linux drwy'r byd i gyd."
+"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
@@ -14867,38 +15014,39 @@ msgid "<b>OpenOffice.org</b>: The complete Linux office suite."
 msgstr "Cyfieithiad"
 
 #: share/advertising/dis-04.pl:15
-#, fuzzy, c-format
+#, 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."
 msgstr ""
-"Mae WRITER yn brosesydd geiriau pwerus ar gyfer creu pob math o ddogfennau "
-"testun. Gall y dogfennau gynnwys delweddau, diagramau a thablau."
+"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
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>CALC</b> is a feature-packed spreadsheet which enables you to compute, "
 "analyze and manage all of your data."
 msgstr ""
-"Mae CALC yn daenlen gynhwysfawr sy'n eich galluogi chi i gyfrifo, dadansoddi "
-"a rheoli eich holl ddata."
+"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
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>IMPRESS</b> is the fastest, most powerful way to create effective "
 "multimedia presentations."
 msgstr ""
-"IMPRESS yw'r ffordd gyflymaf, a'r mwyaf pwerus i greu cyflwyniadau aml-"
-"gyfrwng effeithio."
+"<b>IMPRESS</b> yw'r ffordd gyflymaf, a'r mwyaf pwerus i greu cyflwyniadau "
+"aml-gyfrwng effeithio."
 
 #: share/advertising/dis-04.pl:18
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<b>DRAW</b> will produce everything from simple diagrams to dynamic 3D "
 "illustrations."
-msgstr "Bydd DRAW yn cynhyrchu unrhywbeth o ddiagramau syml i luniau 3D byw."
+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
 #, c-format
@@ -14911,14 +15059,15 @@ msgid "Discover the new integrated personal information suite KDE Kontact."
 msgstr "Canfod y casgliad manylion personol integredig KDE Kontact"
 
 #: share/advertising/dis-05.pl:17
-#, fuzzy, c-format
+#, 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!"
 msgstr ""
-"Mwy na dim ond rhaglen e-bost cynhwysfawr, mae Kontact hefyd yn cynnwys "
-"llyfr cyfeiriadau, calendr ac amserlen, yn ogystal â rhaglen cymryd nodiadau!"
+"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/dis-06.pl:15
 #, c-format
@@ -14951,9 +15100,9 @@ msgid "\t- ..."
 msgstr "\t- ..."
 
 #: share/advertising/dis-07.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Multimedia</b>: Software for every need!"
-msgstr "<b>Aml-gyfrwng: Meddalwedd ar gyfer pob angen</b>"
+msgstr "<b>Aml-gyfrwng</b>: Meddalwedd ar gyfer pob angen!"
 
 #: share/advertising/dis-07.pl:15
 #, c-format
@@ -15054,8 +15203,8 @@ msgstr "\t- Rhestr drych llwytho i lawr ar gyfer Aelodau MandrakeClub yn unig"
 #: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
 #: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
-msgstr "\t- Pleidleisio am feddalwedd i'w rhoi yn Mandrake Linux"
+msgid "\t- Voting for software to put in Mandrakelinux"
+msgstr "\t- Pleidleisio am feddalwedd i'w rhoi yn Mandrakelinux"
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
 #: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
@@ -15087,7 +15236,7 @@ msgstr "Ydych chi angen help?"
 #: share/advertising/ppp-11.pl:15 share/advertising/pwp-10.pl:15
 #, c-format
 msgid "<b>MandrakeExpert</b> is the primary source for technical support."
-msgstr "<b>MandrakeExpert</> yw'r brif ffynhonnell cefnogaeth dechnegol.."
+msgstr "<b>MandrakeExpert</b> yw'r brif ffynhonnell am gefnogaeth dechnegol.."
 
 #: share/advertising/dis-11.pl:17 share/advertising/dwd-08.pl:18
 #: share/advertising/ppp-11.pl:17 share/advertising/pwp-10.pl:17
@@ -15102,20 +15251,19 @@ msgstr ""
 #: share/advertising/dwd-01.pl:17
 #, c-format
 msgid ""
-"Mandrake Linux is committed to the Open Source Model and fully respects the "
+"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 "
-"Mandrake Linux contributors."
+"Mandrakelinux contributors."
 msgstr ""
-"Mae Mandrake Linux 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 "
-"Mandrake Linux."
+"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
 #, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
-msgstr "<b>Ymunwch â chymuned Mandrake Linux!</b>"
+msgid "<b>Join the Mandrakelinux community!</b>"
+msgstr "<b>Ymunwch â chymuned Mandrakelinux!</b>"
 
 #: share/advertising/dwd-02.pl:15
 #, c-format
@@ -15136,37 +15284,37 @@ msgstr ""
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrake Linux?</b>"
-msgstr "<b>Beth yw Mandrake Linux?</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Beth yw Mandrakelinux?</b>"
 
 #: share/advertising/dwd-03.pl:15
 #, c-format
 msgid ""
-"Mandrake Linux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrake Linux is one of "
+"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!"
 msgstr ""
-"Mae Mandrake Linux yn system weithredu Cod Agored sy'n cynnwys miloedd o'r "
-"rhaglenni gorau o'r byd Meddalwedd Rhydd. Mandrake Linux yw un o'r fersiynau "
+"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
 #, c-format
 msgid ""
-"Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus "
-"the latest versions of the most popular Open Source applications."
+"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
+"latest versions of the most popular Open Source applications."
 msgstr ""
-"Mae Mandrake Linux yn cynnwys y byrddau gwaith enwog KDE GNOME, yn ogystal "
+"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
 #, c-format
 msgid ""
-"Mandrake Linux is widely known as the most user-friendly and the easiest to "
+"Mandrakelinux is widely known as the most user-friendly and the easiest to "
 "install and easy to use Linux distribution."
 msgstr ""
-"Mae Mandrake Linux yn hysbys fel y dosbarthiad Linux mwyaf cyfeillgar a "
-"hawdd ei osod a'i ddefnyddio."
+"Mae Mandrakelinux yn hysbys fel y dosbarthiad Linux mwyaf cyfeillgar a hawdd "
+"ei osod a'i ddefnyddio."
 
 #: share/advertising/dwd-04.pl:15
 #, c-format
@@ -15175,8 +15323,8 @@ msgstr "Dewch i wybod am ein <b>Atebion Personol</b>"
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
-msgstr "\t- Canfod Mandrake Linux ar CD hunan gychwyn <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgstr "\t- Canfod Mandrakelinux ar CD hunan gychwyn <b>MandrakeMove</b>"
 
 #: share/advertising/dwd-04.pl:17
 #, c-format
@@ -15236,11 +15384,11 @@ msgstr ""
 #, 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 Mandrake Linux "
+"with the stability and easy-of-use of the world-famous Mandrakelinux "
 "distribution. A unique blend for incomparable HPC performance."
 msgstr ""
 "<b>MandrakeClustering</b>: pwer a grym clwstwr Linux wedi ei gyfuno gyda "
-"cadarnrwydd a rhwyddineb dosbarthiad Mandrake Linux.Cyfuniad unigryw o "
+"chadernid a rhwyddineb dosbarthiad Mandrakelinux.Cyfuniad unigryw o "
 "berfformiad digymar HPC."
 
 #: share/advertising/dwd-06.pl:15
@@ -15290,8 +15438,8 @@ msgstr "<b>Nodyn</b>"
 
 #: share/advertising/dwd-09.pl:18
 #, c-format
-msgid "This is the Mandrake Linux <b>Download version</b>."
-msgstr " Dyma <b>Fersiwn Llwytho i Lawr</b> Mandrake Linux"
+msgid "This is the Mandrakelinux <b>Download version</b>."
+msgstr " Dyma <b>Fersiwn Llwytho i Lawr</b> Mandrakelinux"
 
 #: share/advertising/dwd-09.pl:20
 #, c-format
@@ -15300,17 +15448,20 @@ msgid ""
 "therefore may not work with certain modems (such as some ADSL and RTC) and "
 "video cards (such as ATI® and NVIDIA®)."
 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
 #, c-format
 msgid ""
-"Your new Mandrake Linux distribution and its many applications are the "
-"result of collaborative efforts between MandrakeSoft developers and Mandrake "
-"Linux contributors throughout the world."
+"Your new Mandrakelinux distribution and its many applications are the result "
+"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
+"contributors throughout the world."
 msgstr ""
-"Mae eich system weithredu Mandrake Linux a'i raglenni niferus yn ganlyniad "
-"ymdrechion cydweithredol rhwng datblygwyr MandrakeSoft â chyfranwyr Mandrake "
-"Linux drwy'r byd i gyd."
+"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
@@ -15331,10 +15482,9 @@ msgstr ""
 #: share/advertising/ppp-02.pl:17
 #, c-format
 msgid ""
-"It is the only Mandrake Linux product that includes the groupware solution."
+"It is the only Mandrakelinux product that includes the groupware solution."
 msgstr ""
-"Dyma'r unig becyn gan Mandrake Linux sy'n cynnwys darpariaeth meddalwedd "
-"grwp."
+"Dyma'r unig becyn gan Mandrakelinux sy'n cynnwys darpariaeth meddalwedd grwp."
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
 #, c-format
@@ -15344,7 +15494,7 @@ msgstr "<b> Dewiswch amgylchedd Bwrdd Gwaith graffigol!</b>"
 #: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
 #, c-format
 msgid ""
-"When you log into your Mandrake Linux system for the first time, you can "
+"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."
 msgstr ""
@@ -15355,10 +15505,10 @@ msgstr ""
 #: share/advertising/ppp-04.pl:13
 #, c-format
 msgid ""
-"In the Mandrake Linux menu you will find easy-to-use applications for all "
+"In the Mandrakelinux menu you will find easy-to-use applications for all "
 "tasks:"
 msgstr ""
-"Yn newislen Mandrake Linux cewch raglenni hawdd eu defnyddio ar gyfer pob "
+"Yn newislen Mandrakelinux cewch raglenni hawdd eu defnyddio ar gyfer pob "
 "tasg."
 
 #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
@@ -15387,10 +15537,11 @@ msgid "\t- Participate in online chat with <b>Kopete</b>"
 msgstr "\t- Cymryd rhan mewn sgyrsiau ar-lein gyda <b>Kopete</b>"
 
 #: share/advertising/ppp-04.pl:19
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\t- Listen to audio CDs and music files with <b>KsCD</b> and <b>Totem</b>"
-msgstr "\t- Gwrando ar CDau a ffeiliau cerddoriaeth gyda KsCD a <b>Totem</b>"
+msgstr ""
+"\t- Gwrando ar CDau a ffeiliau cerddoriaeth gyda <b>KsCD</b> a <b>Totem</b>"
 
 #: share/advertising/ppp-04.pl:20 share/advertising/pwp-04.pl:20
 #, c-format
@@ -15474,43 +15625,44 @@ msgid "\t- Address Book (server and client)"
 msgstr "\t- Llyfr Cyfeiriadau (gweinydd a chleient)"
 
 #: share/advertising/ppp-07.pl:13
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
-"Ymrymuswch eich rhwydwaith fusnes gyda darpariaethau o'r radd flaenaf, gan "
-"gynnwys:"
+"Cryfhewch eich rhwydwaith fusnes gyda <b>darpariaethau o'r radd flaenaf</b>, "
+"gan gynnwys:"
 
 #: share/advertising/ppp-07.pl:15
-#, fuzzy, c-format
+#, c-format
 msgid "\t- <b>Samba</b>: File and print services for MS-Windows clients"
 msgstr ""
-"\t- Samba: Gwasanaethau ffeil ac argraffu ar gyfer cleientiaid MS-Windows"
+"\t- <b>Samba</b>: Gwasanaethau ffeil ac argraffu ar gyfer cleientiaid MS-"
+"Windows"
 
 #: share/advertising/ppp-07.pl:16
-#, fuzzy, c-format
+#, c-format
 msgid "\t- <b>Apache</b>: The most widely used Web server"
-msgstr "\t- Apache: Y gweinydd Gwe mwyaf poblogaidd"
+msgstr "\t- <b>Apache</b>: Y gweinydd Gwe mwyaf poblogaidd"
 
 #: share/advertising/ppp-07.pl:17
-#, fuzzy, c-format
+#, c-format
 msgid "\t- <b>MySQL</b>: The world's most popular Open Source database"
-msgstr "\t- MySQL: Cronfa ddata mwyaf poblogaidd y byd Cod Agored"
+msgstr "\t- <b>MySQL</b>: Cronfa ddata mwyaf poblogaidd y byd Cod Agored"
 
 #: share/advertising/ppp-07.pl:18
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\t- <b>CVS</b>: Concurrent Versions System, the dominant open-source network-"
 "transparent version control system"
 msgstr ""
-"\t- CVS: Concurrent Versions System, y system rheoli fersiwn cod agored "
-"amlycaf"
+"\t- <b>CVS</b>: Concurrent Versions System, y system rheoli fersiwn cod "
+"agored amlycaf"
 
 #: share/advertising/ppp-07.pl:19
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\t- <b>ProFTPD</b>: the highly configurable GPL-licensed FTP server software"
-msgstr "\t- ProFTPD: meddalwedd ffurfweddadwy gweinydd FTP GPL"
+msgstr "\t- <b>ProFTPD</b>: meddalwedd ffurfweddadwy gweinydd FTP GPL"
 
 #: share/advertising/ppp-07.pl:20
 #, c-format
@@ -15520,12 +15672,12 @@ msgstr "\t- Ac eraill"
 #: share/advertising/pwp-01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrake Linux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrake Linux contributors throughout "
+"Your new Mandrakelinux distribution is the result of collaborative efforts "
+"between MandrakeSoft developers and Mandrakelinux contributors throughout "
 "the world."
 msgstr ""
-"Mae eich pecyn Mandrake Linux newydd yn ganlyniad cydweithrediad rhwng "
-"datblygwyr Mandrake Linux a chyfranwyr Mandrake Linux drwy'r byd i gyd."
+"Mae eich pecyn Mandrakelinux newydd yn ganlyniad cydweithrediad rhwng "
+"datblygwyr Mandrakelinux a chyfranwyr Mandrakelinux drwy'r byd i gyd."
 
 #: share/advertising/pwp-01.pl:19
 #, c-format
@@ -15549,17 +15701,17 @@ msgid ""
 "includes thousands of applications - everything from the most popular to the "
 "most technical."
 msgstr ""
-"PowerPack yw prif gynnyrch bwrdd gwaith Linux Mandrake Linux. Yn ogystal â "
+"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/pwp-04.pl:13
 #, c-format
 msgid ""
-"In the Mandrake Linux menu you will find easy-to-use applications for all of "
+"In the Mandrakelinux menu you will find easy-to-use applications for all of "
 "your tasks:"
 msgstr ""
-"Yn newislen Mandrake Linux cewch raglenni hawdd eu defnyddio ar gyfer pob "
+"Yn newislen Mandrakelinux cewch raglenni hawdd eu defnyddio ar gyfer pob "
 "tasg:"
 
 #: share/advertising/pwp-04.pl:16
@@ -15572,9 +15724,9 @@ msgstr ""
 "integredig: Kontact ac Evolution"
 
 #: share/advertising/pwp-04.pl:17
-#, fuzzy, c-format
+#, 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 a Konqueror</b>"
+msgstr "\t- Pori'r We gyda <b>Gwe-lywiwr-Mozilla</b> a <b>Konqueror</b>"
 
 #: share/advertising/pwp-04.pl:19
 #, c-format
@@ -15584,7 +15736,7 @@ msgstr "\t- Gwrando ar CDau a ffeiliau cerddoriaeth gyda KsCD a <b>Totem</b>"
 #: share/advertising/pwp-05.pl:13 share/advertising/pwp-06.pl:13
 #, c-format
 msgid "<b>Development tools</b>"
-msgstr "<b>Offer datblygiadol</b>"
+msgstr "<b>Offer datblygu</b>"
 
 #: share/advertising/pwp-05.pl:15
 #, c-format
@@ -15883,17 +16035,17 @@ msgstr "Allgofnodwch ac yna defnyddiwch Ctrl Alt-BackSpace"
 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:71
+#: standalone/drakTermServ:77
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Diwerth heb Wasanaethwr Terfynell"
 
-#: standalone/drakTermServ:101 standalone/drakTermServ:108
+#: standalone/drakTermServ:114 standalone/drakTermServ:121
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: mae %s angen enw gwesteiwr...\n"
 
-#: standalone/drakTermServ:121
+#: standalone/drakTermServ:134
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15902,78 +16054,78 @@ 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:128
+#: standalone/drakTermServ:141
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: mae %s angen enw gwesteiwr...\n"
 
-#: standalone/drakTermServ:140
+#: standalone/drakTermServ:153
 #, c-format
 msgid "You must be root to read configuration file. \n"
 msgstr "Rhaid bod yn wraidd i ddarllen ffeil ffurfweddu. \n"
 
-#: standalone/drakTermServ:219 standalone/drakTermServ:488
-#: standalone/drakfont:572
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
 #, c-format
 msgid "OK"
 msgstr "Iawn"
 
-#: standalone/drakTermServ:235
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
 #, c-format
 msgid "Terminal Server Configuration"
 msgstr "Enwch Wasanaethwr Ffurfweddiad"
 
-#: standalone/drakTermServ:240
-#, c-format
-msgid "DrakTermServ"
-msgstr "DrakTermServ"
-
-#: standalone/drakTermServ:264
+#: standalone/drakTermServ:267
 #, c-format
 msgid "Enable Server"
 msgstr "Galluogi'r Gweinydd"
 
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Disable Server"
 msgstr "Analluogi'r Gweinydd"
 
-#: standalone/drakTermServ:278
+#: standalone/drakTermServ:281
 #, c-format
 msgid "Start Server"
 msgstr "Cychwyn y Gweinydd"
 
-#: standalone/drakTermServ:284
+#: standalone/drakTermServ:287
 #, c-format
 msgid "Stop Server"
 msgstr "Atal y Gweinydd"
 
-#: standalone/drakTermServ:292
+#: standalone/drakTermServ:295
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Floppy/ISO"
 
-#: standalone/drakTermServ:296
+#: standalone/drakTermServ:299
 #, c-format
 msgid "Net Boot Images"
 msgstr "Delweddau Cychwyn y Rhwyd"
 
-#: standalone/drakTermServ:302
+#: standalone/drakTermServ:305
 #, c-format
 msgid "Add/Del Users"
 msgstr "Ychwanegu/Diddymu Defnyddwyr"
 
-#: standalone/drakTermServ:306
+#: standalone/drakTermServ:309
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Ychwanegu/Dileu Cleientiaid"
 
-#: standalone/drakTermServ:317 standalone/drakbug:54
+#: standalone/drakTermServ:320 standalone/drakbug:54
 #, c-format
 msgid "First Time Wizard"
 msgstr "Dewin Tro Cyntaf"
 
-#: standalone/drakTermServ:342
+#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#, 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:358
 #, c-format
 msgid ""
 "\n"
@@ -16014,59 +16166,64 @@ msgstr ""
 "    e) Gofyn i chi wneud disg meddal cychwyn.\n"
 "    f) Os yw'n gleient tennauKDM.\n"
 
-#: standalone/drakTermServ:387
+#: standalone/drakTermServ:403
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Diddymu'r Dewin"
 
-#: standalone/drakTermServ:399
+#: standalone/drakTermServ:415
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Cadwch ffurfweddiad dhcpd!"
 
-#: standalone/drakTermServ:427
+#: standalone/drakTermServ:443
+#, c-format
+msgid "Use thin clients."
+msgstr "Defnyddiwch gleientiaid tenau"
+
+#: standalone/drakTermServ:445
 #, c-format
 msgid ""
-"Please select client type.\n"
+"Please select default client type.\n"
 "    'Thin' clients run everything off the server's CPU/RAM, using the client "
 "display.\n"
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
-"Dewis y math o gleient.\n"
+"Dewis y math o gleient rhagosodedig.\n"
 "    Cleient 'Tennau' sy'n rhedeg popeth oddi ar CPU/RAM gweinydd, gyda "
 "dangosydd cleient.\n"
 "    Cleient 'Tew' sy'n defnyddio eu CPU/RAM eu hun ond system ffeiliau'r "
 "gweinydd."
 
-#: standalone/drakTermServ:433
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
 #, c-format
-msgid "Allow thin clients."
-msgstr "Caniatáu cleientiaid tenau"
+msgid "Sync client X keyboard settings with server."
+msgstr "Cydweddu gosodiadau bysellfwrdd clientX gyda gweinydd"
 
-#: standalone/drakTermServ:441
+#: standalone/drakTermServ:464
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Creu delwedd cychwyn rhyngrwyd ar gyfer pob cnewyllyn"
 
-#: standalone/drakTermServ:442 standalone/drakTermServ:725
-#: standalone/drakTermServ:741
+#: standalone/drakTermServ:465 standalone/drakTermServ:763
+#: standalone/drakTermServ:779
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Bydd hyn yn cymryd rhai munudau"
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:466
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
 #, c-format
 msgid "Done!"
 msgstr "Gorffen!"
 
-#: standalone/drakTermServ:452
+#: standalone/drakTermServ:475
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 "Cydweddu rhestr defnyddwyr y gweinydd gyda'r rhestr cleient, gan gynnwys "
-"root."
+"gwraidd."
 
-#: standalone/drakTermServ:472
+#: standalone/drakTermServ:495
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -16075,12 +16232,12 @@ msgstr ""
 "Er mwyn galluogi newidiadau i'r cleient tenau, rhaid i'r rheolwr arddangos "
 "gael ei gychwyn. Cychwyn?"
 
-#: standalone/drakTermServ:507
+#: standalone/drakTermServ:530
 #, c-format
-msgid "drakTermServ Overview"
-msgstr "Trosolwg drakTermServ"
+msgid "Terminal Server Overview"
+msgstr "Trosolwg Gweinydd Terfynnell"
 
-#: standalone/drakTermServ:508
+#: standalone/drakTermServ:531
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16104,7 +16261,7 @@ msgstr ""
 "        \t/etc/dhcpd.conf.etherboot-pcimap.dylech greu'r ddelwedd etherboot "
 "ar gyfer o leiaf un                  \tcnewyllyn llawn."
 
-#: standalone/drakTermServ:514
+#: standalone/drakTermServ:537
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16138,7 +16295,7 @@ msgstr ""
 "        \t\tMae stanzal dhcpd.conf arferol i gynnal cleient diddisg yn "
 "edrych fel:"
 
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:555
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16212,7 +16369,7 @@ msgstr ""
 "        Note: You must stop/start the server after adding or changing "
 "clients."
 
-#: standalone/drakTermServ:552
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16243,7 +16400,7 @@ msgstr ""
 "\t\t\t\n"
 "        \tWith SUBNET/MASK being defined for your network."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:587
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16259,7 +16416,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:568
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16276,7 +16433,7 @@ msgstr ""
 "ffurfweddiad caledwedd cleient,\n"
 "        \t\tbydd drakTermServ yn cynorthwyo i greu'r ffeiliau hyn."
 
-#: standalone/drakTermServ:573
+#: standalone/drakTermServ:596
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16311,7 +16468,7 @@ msgstr ""
 "        ffurfweddiad lleol, cadw'r ffeiliau ffurfweddu, un waith mae'r "
 "peiriant cleient wedi ei ffurfweddu"
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16366,7 +16523,7 @@ msgstr ""
 "mkinitrd-net\n"
 "        \t\tyn gosod ei ddelweddau."
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:626
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -16397,57 +16554,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:638
+#: standalone/drakTermServ:661
 #, c-format
 msgid "Boot Floppy"
 msgstr "Disg Meddal Cychwyn"
 
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot ISO"
 msgstr "Cychwyn yr ISO"
 
-#: standalone/drakTermServ:642
+#: standalone/drakTermServ:665
 #, c-format
 msgid "PXE Image"
 msgstr "Delwedd PXE"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:734
+#, c-format
+msgid "Default kernel version"
+msgstr "Fersiwn rhagosodedig y cnewyllyn"
+
+#: standalone/drakTermServ:761
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Adeiladu'r cnewyllyn cyfan -->"
 
-#: standalone/drakTermServ:730
+#: standalone/drakTermServ:768
 #, c-format
 msgid "No kernel selected!"
 msgstr "Heb ddewis cnewyllyn"
 
-#: standalone/drakTermServ:733
+#: standalone/drakTermServ:771
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Adeiladau NIC unigol -->"
 
-#: standalone/drakTermServ:737
+#: standalone/drakTermServ:775
 #, c-format
 msgid "No NIC selected!"
 msgstr "Heb ddewis NIC!"
 
-#: standalone/drakTermServ:740
+#: standalone/drakTermServ:778
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Adeiladu pob cnewyllyn -->"
 
-#: standalone/drakTermServ:747
+#: standalone/drakTermServ:786
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Dileu"
 
-#: standalone/drakTermServ:754
+#: standalone/drakTermServ:793
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Dileu Pob NBI"
 
-#: standalone/drakTermServ:841
+#: standalone/drakTermServ:880
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16458,27 +16620,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:846
+#: standalone/drakTermServ:885
 #, c-format
 msgid "Add User -->"
 msgstr "Pob Defnyddiwr -->"
 
-#: standalone/drakTermServ:852
+#: standalone/drakTermServ:891
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Dileu Defnyddiwr"
 
-#: standalone/drakTermServ:888
+#: standalone/drakTermServ:927
 #, c-format
 msgid "type: %s"
 msgstr "math:  %s"
 
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:931
 #, c-format
 msgid "local config: %s"
 msgstr "Ffurfweddiad lleol: %s"
 
-#: standalone/drakTermServ:922
+#: standalone/drakTermServ:961
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16487,67 +16649,67 @@ msgstr ""
 "Caniatáu ffurfweddiad\n"
 "caledwedd lleol"
 
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:970
 #, c-format
 msgid "No net boot images created!"
 msgstr "Heb greu delweddau cychwyn y rhwyd!"
 
-#: standalone/drakTermServ:949
+#: standalone/drakTermServ:988
 #, c-format
 msgid "Thin Client"
 msgstr "Cleient Tenau"
 
-#: standalone/drakTermServ:953
+#: standalone/drakTermServ:992
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Caniatáu Cleientiaid Tenau"
 
-#: standalone/drakTermServ:954
+#: standalone/drakTermServ:993
 #, c-format
 msgid "Add Client -->"
 msgstr "Ychwanegu Cleient -->"
 
-#: standalone/drakTermServ:968
+#: standalone/drakTermServ:1007
 #, c-format
 msgid "type: fat"
 msgstr "math:  fat"
 
-#: standalone/drakTermServ:969
+#: standalone/drakTermServ:1008
 #, c-format
 msgid "type: thin"
 msgstr "math:  tenau"
 
-#: standalone/drakTermServ:976
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "local config: false"
 msgstr "ffurfweddiad lleol: false"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1016
 #, c-format
 msgid "local config: true"
 msgstr "ffurfweddiad lleol: true"
 
-#: standalone/drakTermServ:985
+#: standalone/drakTermServ:1024
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Golygu Cleient"
 
-#: standalone/drakTermServ:1011
+#: standalone/drakTermServ:1050
 #, c-format
 msgid "Disable Local Config"
 msgstr "Analluogi Ffurfweddiad Lleol"
 
-#: standalone/drakTermServ:1018
+#: standalone/drakTermServ:1057
 #, c-format
 msgid "Delete Client"
 msgstr "Diddymu Cleient"
 
-#: standalone/drakTermServ:1027
+#: standalone/drakTermServ:1066
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Ffurfweddu dhcpd..."
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1082
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16556,57 +16718,69 @@ msgstr ""
 "Mae angen cychwyn y Rheolwr Dangosydd i'r newid ddigwydd.\n"
 "(ailgychwyn gwasanaeth dm - yn y consol)"
 
-#: standalone/drakTermServ:1084
+#: standalone/drakTermServ:1122
+#, 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:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr "Bydd pob cleient yn defnyddio %s"
+
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Subnet:"
 msgstr "Isnet:"
 
-#: standalone/drakTermServ:1091
+#: standalone/drakTermServ:1175
 #, c-format
 msgid "Netmask:"
 msgstr "Netmask:"
 
-#: standalone/drakTermServ:1098
+#: standalone/drakTermServ:1182
 #, c-format
 msgid "Routers:"
 msgstr "Llwybryddion:"
 
-#: standalone/drakTermServ:1105
+#: standalone/drakTermServ:1189
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Masg Isnet"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1196
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Cyfeiriad Darlledu:"
 
-#: standalone/drakTermServ:1119
+#: standalone/drakTermServ:1203
 #, c-format
 msgid "Domain Name:"
 msgstr "Enw Parth:"
 
-#: standalone/drakTermServ:1127
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Name Servers:"
 msgstr "Enwi Gweinydd:"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1222
 #, c-format
 msgid "IP Range Start:"
 msgstr "Cychwyn Amrediad IP:"
 
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1223
 #, c-format
 msgid "IP Range End:"
 msgstr "Diwedd Amrediad IP:"
 
-#: standalone/drakTermServ:1191
+#: standalone/drakTermServ:1275
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Ffurfweddiad Gweinydd dhcpd"
 
-#: standalone/drakTermServ:1192
+#: standalone/drakTermServ:1276
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16617,134 +16791,134 @@ msgstr ""
 "hyn o'ch system ar waith.\n"
 "Gallwch eu newid yn ôl y galw."
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1279
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Pwll Cyfeiriad IP dynameg"
 
-#: standalone/drakTermServ:1208
+#: standalone/drakTermServ:1292
 #, c-format
 msgid "Write Config"
 msgstr "Ysgrifennu ffurfweddu"
 
-#: standalone/drakTermServ:1326
+#: standalone/drakTermServ:1411
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Mewnosodwch ddisg meddal:"
 
-#: standalone/drakTermServ:1330
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Couldn't access the floppy!"
 msgstr "Methu cael mynediad i'r disg meddal!"
 
-#: standalone/drakTermServ:1332
+#: standalone/drakTermServ:1417
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Mae modd tynnu'r disg meddal nawr"
 
-#: standalone/drakTermServ:1335
+#: standalone/drakTermServ:1420
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Does dim gyrrwr disg meddal ar gael!"
 
-#: standalone/drakTermServ:1340
+#: standalone/drakTermServ:1425
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "Delwedd PXE yw %s/%s"
 
-#: standalone/drakTermServ:1342
+#: standalone/drakTermServ:1427
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Gwall ysgrifennu %s/%s"
 
-#: standalone/drakTermServ:1351
+#: standalone/drakTermServ:1436
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "%s yw'r ddelwedd ISO etherboot"
 
-#: standalone/drakTermServ:1353
+#: standalone/drakTermServ:1438
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Aeth rhywbeth o'i le! - ydy mkisofs wedi ei osod?"
 
-#: standalone/drakTermServ:1372
+#: standalone/drakTermServ:1458
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Mae angen creu /etc/dhcpd.conf yn gyntaf"
 
-#: standalone/drakTermServ:1533
+#: standalone/drakTermServ:1619
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "%s passwd gwael yng Ngweinydd Terfynell - ail ysgrifennu...\n"
 
-#: standalone/drakTermServ:1551
+#: standalone/drakTermServ:1637
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "Nid yw %s yn ddefnyddiwr..\n"
 
-#: standalone/drakTermServ:1552
+#: standalone/drakTermServ:1638
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "Mae %s yn ddefnyddiwr Gweinydd Terfynell eisoes\n"
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1640
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
-msgstr "Methodd ychwanegu %s 'r Gweinydd Terfynnell\n"
+msgstr "Methodd ychwanegu %s 'r Gweinydd Terfynell\n"
 
-#: standalone/drakTermServ:1556
-#, fuzzy, c-format
+#: standalone/drakTermServ:1642
+#, c-format
 msgid "%s added to Terminal Server\n"
-msgstr "Diwerth heb Wasanaethwr Terfynell\n"
+msgstr "Ychwanegu %s i'r Gweinydd Terfynell\n"
 
-#: standalone/drakTermServ:1608
+#: standalone/drakTermServ:1694
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Dilëwyd %s...\n"
 
-#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
 #, c-format
 msgid "%s not found...\n"
 msgstr "Heb ganfod %s...\n"
 
-#: standalone/drakTermServ:1632 standalone/drakTermServ:1633
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1718 standalone/drakTermServ:1719
+#: standalone/drakTermServ:1720
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s yn cael ei ddefnyddio eisoes\n"
 
-#: standalone/drakTermServ:1658
+#: standalone/drakTermServ:1744
 #, c-format
 msgid "Can't open %s!"
 msgstr "Methu agor %s!"
 
-#: standalone/drakTermServ:1715
+#: standalone/drakTermServ:1801
 #, 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:1872
+#: standalone/drakTermServ:1958
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Newidiodd ffurfweddiad - ailgychwyn clusternfs/dhcpd?"
 
-#: standalone/drakautoinst:37
+#: standalone/drakautoinst:38
 #, c-format
 msgid "Error!"
 msgstr "Gwall!"
 
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:39
 #, c-format
 msgid "I can't find needed image file `%s'."
 msgstr "Methu canfod ffeil delwedd angenrheidiol '%s'."
 
-#: standalone/drakautoinst:40
+#: standalone/drakautoinst:41
 #, c-format
 msgid "Auto Install Configurator"
 msgstr "Ffurfweddwr Awto-Osod"
 
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:42
 #, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
@@ -16772,22 +16946,22 @@ msgstr ""
 "\n"
 "Cloiciwch iawn i barhau?"
 
-#: standalone/drakautoinst:59
+#: standalone/drakautoinst:60
 #, c-format
 msgid "replay"
 msgstr "ail chwarae"
 
-#: standalone/drakautoinst:59 standalone/drakautoinst:68
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
 #, c-format
 msgid "manual"
 msgstr "llaw"
 
-#: standalone/drakautoinst:63
+#: standalone/drakautoinst:64
 #, c-format
 msgid "Automatic Steps Configuration"
 msgstr "Ffurfweddiad Camau Awtomatig"
 
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:65
 #, c-format
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
@@ -16796,12 +16970,23 @@ msgstr ""
 "Dewiswch ar gyfer pob cam a fydd yn ail chwarae fel eich gosodiad, neu a "
 "fydd gyda llaw"
 
-#: standalone/drakautoinst:76 standalone/drakautoinst:77
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
 #, c-format
 msgid "Creating auto install floppy"
 msgstr "Creu disg meddal awto gosod"
 
-#: standalone/drakautoinst:141
+#: standalone/drakautoinst:90
+#, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr "Rhowch ddisg meddal  yng ngyrrwr %s (ar gyfer disg gyrrwyr)"
+
+#: standalone/drakautoinst:91
+#, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "Creu disg meddal awto gosod (disg gyrrwyr)"
+
+#: standalone/drakautoinst:158
 #, c-format
 msgid ""
 "\n"
@@ -16814,13 +16999,13 @@ msgstr ""
 "\n"
 "Mae paramedrau'r awto osod i'w cael yn yr adran ar y chwith"
 
-#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/drakvpn:898
-#: standalone/scannerdrake:367
+#: standalone/drakautoinst:252 standalone/drakgw:594 standalone/drakvpn:900
+#: standalone/scannerdrake:374
 #, c-format
 msgid "Congratulations!"
 msgstr "Llongyfarchiadau!"
 
-#: standalone/drakautoinst:236
+#: standalone/drakautoinst:253
 #, c-format
 msgid ""
 "The floppy has been successfully generated.\n"
@@ -16829,37 +17014,37 @@ msgstr ""
 "Mae'r disg meddal wedi ei gynhyrchu'n llwyddiannus. \n"
 "Gallwch ail chwarae eich gosodiad."
 
-#: standalone/drakautoinst:272
+#: standalone/drakautoinst:289
 #, c-format
 msgid "Auto Install"
 msgstr "Awto Gosod"
 
-#: standalone/drakautoinst:341
+#: standalone/drakautoinst:358
 #, c-format
 msgid "Add an item"
 msgstr "Ychwanegu eitem"
 
-#: standalone/drakautoinst:348
+#: standalone/drakautoinst:365
 #, c-format
 msgid "Remove the last item"
 msgstr "Tynnu'r eitem olaf"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "hd"
 msgstr "hd"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "tape"
 msgstr "tâp"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:112
 #, c-format
 msgid "No devices found"
 msgstr "Heb ganfod dyfais"
 
-#: standalone/drakbackup:196
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "Expect is an extension to the Tcl scripting language that allows interactive "
@@ -16868,12 +17053,12 @@ msgstr ""
 "Mae Expect yn estyniad o'r iaith sgriptio Tcl sy'n caniatáu sesiynau "
 "rhyngweithiol heb ymyrraeth y defnyddiwr."
 
-#: standalone/drakbackup:197
+#: standalone/drakbackup:155
 #, 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:198
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -16882,16 +17067,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:199
-#, c-format
-msgid ""
-"This uses the same syntax as the command line program 'cdrecord'. 'cdrecord -"
-"scanbus' would also show you the device number."
-msgstr ""
-"Mae hwn yn defnyddio'r un cystrawen â'r rhaglen llinell gorchymyn 'cdrecord'."
-"Byddai 'cdrecord -scanbus' hefyd yn dangos  rhif y ddyfais i chi."
-
-#: standalone/drakbackup:200
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -16900,7 +17076,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:201
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -16909,7 +17085,7 @@ msgstr ""
 "Dim ond ffeiliau sydd wedi newid neu sy'n newydd fydd cadw wrth gefn "
 "cynyddol yn eu cadw."
 
-#: standalone/drakbackup:202
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -16918,17 +17094,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:203
-#, fuzzy, c-format
+#: standalone/drakbackup:160
+#, c-format
 msgid ""
 "This should be a local user or email addresse that you want the backup "
 "results sent to. You will need to define a functioning mail server."
 msgstr ""
-"Dylai hyn fod yn rhestr coma gwahanedig o ddefnyddwyr lleol neu gyfeiriadau "
-"e-bost er mwyn anfon y canlyniadau wrth gefn atynt. Rhaid cael asiant "
-"trosglwyddo e-bost ar eich system."
+"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:204
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16937,7 +17112,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:205
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -16948,7 +17123,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:206
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -16959,7 +17134,7 @@ msgstr ""
 "defnyddio llwybr cyfeiriadur, byddwch yn defnyddio enw 'modiwl' ar gyfer y "
 "llwybr gwasanaeth."
 
-#: standalone/drakbackup:207
+#: standalone/drakbackup:164
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -16968,17 +17143,27 @@ msgstr ""
 "Mae Addasu'n caniatáu i chi enw eich dyddiad ac amser. Mae'r dewisiadau "
 "eraill yn defnyddio rhannau rhedeg yn /etc/crontab."
 
-#: standalone/drakbackup:604
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr "Dim cyfrwng wedi ei ddewis ar gyfer gweithredu cron."
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr "Dim cyfnod wedi ei ddewis ar gyfer gweithredu cron."
+
+#: standalone/drakbackup:447
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Nid yw interval cron ar gael ar gyfer di-wraidd"
 
-#: standalone/drakbackup:715 standalone/logdrake:415
+#: standalone/drakbackup:532 standalone/logdrake:467
 #, 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:719 standalone/logdrake:420
+#: standalone/drakbackup:536 standalone/logdrake:472
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -16987,22 +17172,22 @@ msgstr ""
 "Mae \"%s\" yn ddefnyddiwr lleol, ond nid ydych wedi dewis smtp lleol, felly "
 "mae'n rhaid i chi ddefnyddio cyfeiriad e-bost cyfan!"
 
-#: standalone/drakbackup:728
+#: standalone/drakbackup:545
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "Rhestr defnyddwyr dilys wedi newid, ailysgrifennu ffeil ffurfweddu."
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:547
 #, c-format
 msgid "Old user list:\n"
 msgstr "Rhestr hen ddefnyddiwr:\n"
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:549
 #, c-format
 msgid "New user list:\n"
 msgstr "Rhestr defnyddiwr newydd:\n"
 
-#: standalone/drakbackup:779
+#: standalone/drakbackup:594
 #, c-format
 msgid ""
 "\n"
@@ -17012,7 +17197,7 @@ msgstr ""
 "                      Adroddiad DrakBackup  \n"
 "\n"
 
-#: standalone/drakbackup:780
+#: standalone/drakbackup:595
 #, c-format
 msgid ""
 "\n"
@@ -17023,7 +17208,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:786
+#: standalone/drakbackup:601
 #, c-format
 msgid ""
 "\n"
@@ -17036,13 +17221,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:810 standalone/drakbackup:883
-#: standalone/drakbackup:939
+#: standalone/drakbackup:625 standalone/drakbackup:696
+#: standalone/drakbackup:752
 #, c-format
 msgid "Total progress"
 msgstr "Cyfanswm cynnydd"
 
-#: standalone/drakbackup:865
+#: standalone/drakbackup:678
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17055,42 +17240,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:874
+#: standalone/drakbackup:687
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Bydd hyn yn cymryd amser i gynhyrchu'r allweddi"
 
-#: standalone/drakbackup:881
+#: standalone/drakbackup:694
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "Methu agor %s"
 
-#: standalone/drakbackup:898
+#: standalone/drakbackup:711
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Dim cais am gyfrinair ar %s ym mhorth %s"
 
-#: standalone/drakbackup:899
+#: standalone/drakbackup:712
 #, c-format
 msgid "Bad password on %s"
 msgstr "Cyfrinair gwallus yn %s"
 
-#: standalone/drakbackup:900
+#: standalone/drakbackup:713
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Gwrthodwyd caniatâd wrth drosglwyddo %s i %s"
 
-#: standalone/drakbackup:901
+#: standalone/drakbackup:714
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Methu canfod %s ar %s"
 
-#: standalone/drakbackup:904
+#: standalone/drakbackup:718
 #, c-format
 msgid "%s not responding"
 msgstr "Nid yw %s yn ymateb"
 
-#: standalone/drakbackup:908
+#: standalone/drakbackup:722
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17107,47 +17292,47 @@ msgstr ""
 "ssh -i %s %s@%s\n"
 "heb dderbyn cais am gyfrinair"
 
-#: standalone/drakbackup:953
+#: standalone/drakbackup:766
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "Mae safle pell WebDAV eisoes wedi cydamseru!"
 
-#: standalone/drakbackup:957
+#: standalone/drakbackup:770
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "Methodd trosglwyddiad WebDaAV!"
 
-#: standalone/drakbackup:978
+#: standalone/drakbackup:791
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "Dim CDR/DVDR yn y gyrrwr!"
 
-#: standalone/drakbackup:982
+#: standalone/drakbackup:795
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "Nid yw'n ymddangos fel cyfrwng cofnodi."
 
-#: standalone/drakbackup:986
+#: standalone/drakbackup:799
 #, c-format
 msgid "Not erasable media!"
 msgstr "Nid yw'n gyfrwng dileadwy!"
 
-#: standalone/drakbackup:1027
+#: standalone/drakbackup:840
 #, 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:1103
+#: standalone/drakbackup:898
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "Anawsterau caniatâd wrth gael mynediad i'r CD."
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:925
 #, c-format
 msgid "No tape in %s!"
 msgstr "Dim tâp yn %s!"
 
-#: standalone/drakbackup:1232
+#: standalone/drakbackup:1025
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -17156,37 +17341,37 @@ msgstr ""
 "Wedi mynd tu hwnt i'r cwota wrth gefn\n"
 "%d Mb wedi ei ddefnyddio vs %d Mb ar gael."
 
-#: standalone/drakbackup:1251 standalone/drakbackup:1305
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
 #, c-format
 msgid "Backup system files..."
 msgstr "Ffeiliau system wrth gefn"
 
-#: standalone/drakbackup:1306 standalone/drakbackup:1368
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Ffeiliau cadw wrth gefn y Disg Caled"
 
-#: standalone/drakbackup:1367
+#: standalone/drakbackup:1118
 #, c-format
 msgid "Backup User files..."
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn..."
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1153
 #, c-format
 msgid "Backup Other files..."
 msgstr "Cadw wrth gefn ffeiliau eraill..."
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1154
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Cynnydd Disg Caled wrth Gefn..."
 
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1159
 #, c-format
 msgid "No changes to backup!"
-msgstr "Dim newid i'r ffeil wrth gefn"
+msgstr "Dim newid i'r ffeil wrth gefn!"
 
-#: standalone/drakbackup:1445 standalone/drakbackup:1469
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
 #, c-format
 msgid ""
 "\n"
@@ -17197,7 +17382,7 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy %s:\n"
 "\n"
 
-#: standalone/drakbackup:1454
+#: standalone/drakbackup:1186
 #, c-format
 msgid ""
 "\n"
@@ -17208,20 +17393,18 @@ msgstr ""
 " Anhawster cysylltiad FTP: Nid oedd yn bosibl anfon eich ffeiliau wrth gefn "
 "drwy FTP.\n"
 
-#: standalone/drakbackup:1455
+#: standalone/drakbackup:1187
 #, 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:1457
-#, fuzzy, c-format
+#: standalone/drakbackup:1189
+#, c-format
 msgid "file list sent by FTP: %s\n"
-msgstr ""
-"rhestr ffeil yrrwyd gan FTP: %s\n"
-" "
+msgstr "rhestr ffeil yrrwyd gan FTP: %s\n"
 
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1206
 #, c-format
 msgid ""
 "\n"
@@ -17232,7 +17415,7 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy CD:\n"
 "\n"
 
-#: standalone/drakbackup:1479
+#: standalone/drakbackup:1211
 #, c-format
 msgid ""
 "\n"
@@ -17243,40 +17426,27 @@ msgstr ""
 "Gweithgaredd Drakbackup drwy dâp:\n"
 "\n"
 
-#: standalone/drakbackup:1488
-#, fuzzy, c-format
+#: standalone/drakbackup:1220
+#, c-format
 msgid "Error sending mail. Your report mail was not sent."
-msgstr ""
-"Gwall wrth ddefnyddio sendmail. Chafodd eich adroddiad e-bost mo'i anfon. "
-"Ffurfweddwch sendmail"
+msgstr "Gwall wrth anfon e-bost.l. Chafodd eich adroddiad e-bost mo'i anfon."
 
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1221
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Gwall wrth anfon e-bost. \n"
 
-#: standalone/drakbackup:1518
+#: standalone/drakbackup:1249
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Methu creu catalog!"
 
-#: standalone/drakbackup:1639
-#, c-format
-msgid "Can't create log file!"
-msgstr "Methu creu catalog!"
-
-#: standalone/drakbackup:1656 standalone/drakbackup:1667
-#: standalone/drakfont:584
-#, c-format
-msgid "File Selection"
-msgstr "Dewis ffeiliau"
-
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1455
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Dewiswch y ffeiliau neu gyfeiriaduron a chliciwch 'Iawn'"
 
-#: standalone/drakbackup:1723
+#: standalone/drakbackup:1484
 #, c-format
 msgid ""
 "\n"
@@ -17285,7 +17455,7 @@ msgstr ""
 "\n"
 "Gwiriwch pob dewis sydd angen arnoch.\n"
 
-#: standalone/drakbackup:1724
+#: standalone/drakbackup:1485
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
@@ -17293,37 +17463,37 @@ msgstr ""
 "Mae'r dewisiadau hyn yn gallu cadw wrth gefn ac adfer pob ffeil yn eich "
 "cyfeiriadur /etc.\n"
 
-#: standalone/drakbackup:1725
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Cadw wrth gefn ffeiliau System. ( cyfeiriadur /etc )"
 
-#: standalone/drakbackup:1726 standalone/drakbackup:1790
-#: standalone/drakbackup:1856
+#: standalone/drakbackup:1487 standalone/drakbackup:1551
+#: standalone/drakbackup:1617
 #, 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:1728 standalone/drakbackup:1792
-#: standalone/drakbackup:1858
+#: standalone/drakbackup:1489 standalone/drakbackup:1553
+#: standalone/drakbackup:1619
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "Defnyddio Cadw wrth Gefn Cynyddol"
 
-#: standalone/drakbackup:1728 standalone/drakbackup:1792
-#: standalone/drakbackup:1858
+#: standalone/drakbackup:1489 standalone/drakbackup:1553
+#: standalone/drakbackup:1619
 #, c-format
 msgid "Use Differential Backups"
 msgstr "Defnyddio Cadw wrth Gefn differu"
 
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1491
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Peidio cynnwys ffeiliau hanfodol (passwd, group, fstab)"
 
-#: standalone/drakbackup:1731
+#: standalone/drakbackup:1492
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
@@ -17332,186 +17502,172 @@ msgstr ""
 "Gyda'e dewis hwn gallwch adfer unrhyw fersiwn\n"
 "o'ch cyfeiriadur /etc."
 
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1523
 #, 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:1789
+#: standalone/drakbackup:1550
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Peidio cynnwys storfa'r porwr"
 
-#: standalone/drakbackup:1844 standalone/drakfont:650
+#: standalone/drakbackup:1605 standalone/drakfont:656
 #, c-format
 msgid "Remove Selected"
 msgstr "Tynnu'r Dewis"
 
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#, c-format
-msgid "Under Devel ... please wait."
-msgstr "O dan ddatblygiad...arhoswch."
-
-#: standalone/drakbackup:1909
-#, c-format
-msgid "Windows (FAT32)"
-msgstr "Windows (FAT32)"
-
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1668
 #, c-format
 msgid "Users"
 msgstr "Defnyddwyr"
 
-#: standalone/drakbackup:1961
+#: standalone/drakbackup:1688
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Defnyddiwch gysylltiad rhwydwaith i gadw wrth gefn"
 
-#: standalone/drakbackup:1963
+#: standalone/drakbackup:1690
 #, c-format
 msgid "Net Method:"
 msgstr "Dull Rhwyd:"
 
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1694
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Defnyddiwch Expect ar gyfer SSH"
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1695
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Creu/Trosglwyddo allweddi wrth gefn ar gyfer SSH"
 
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1697
 #, c-format
 msgid "Transfer Now"
 msgstr "Trosglwyddo Nawr"
 
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1699
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Allweddi eraill (nid drakbackup) yn eu lle yn barod"
 
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1702
 #, c-format
 msgid "Host name or IP."
 msgstr "Enw gwesteiwr neu IP"
 
-#: standalone/drakbackup:1980
+#: standalone/drakbackup:1707
 #, 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:1985
+#: standalone/drakbackup:1712
 #, c-format
 msgid "Login name"
 msgstr "Enw mewngofnodi"
 
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1719
 #, c-format
 msgid "Remember this password"
 msgstr "Cofiwch y cyfrinair"
 
-#: standalone/drakbackup:2004
+#: standalone/drakbackup:1735
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Angen enw gwesteiwr, enw defnyddiwr a chyfrinair"
 
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:1833
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Defnyddiwch y CD/DVDROM i gadw wrth gefn"
 
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:1836
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "Dewiswch eich dyfais CD/DVD"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:1841
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Dewiswch faint eich cyfrwng CD/DVD"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:1848
 #, c-format
 msgid "Multisession CD"
 msgstr "CD aml-sesiwn"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:1850
 #, c-format
 msgid "CDRW media"
 msgstr "Cyfrwng CDRW"
 
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:1856
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "Dileu eich cyfrwng RW(Sesiwn 1af)"
 
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:1857
 #, c-format
 msgid " Erase Now "
 msgstr "Dileu Nawr"
 
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:1863
 #, c-format
 msgid "DVD+RW media"
 msgstr "Cyfrwng DVD+RW"
 
-#: standalone/drakbackup:2138
+#: standalone/drakbackup:1865
 #, c-format
 msgid "DVD-R media"
 msgstr "Cyfrwng DVD-R"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:1867
 #, c-format
 msgid "DVDRAM device"
 msgstr "dyfais DVDRAM"
 
-#: standalone/drakbackup:2145
-#, c-format
-msgid ""
-"Enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-"Rhowch enw dyfais eich Ysgrifennwr CD\n"
-"ex: 0,1,0"
-
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:1898
 #, c-format
 msgid "No CD device defined!"
 msgstr "Heb ddiffinio dyfais CD!"
 
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:1945
 #, c-format
 msgid "Use tape to backup"
 msgstr "Defnyddiwch dâp i gadw wrth gefn"
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:1948
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Enw dyfais i'w ddefnyddio ar gyfer cadw wrth gefn"
 
-#: standalone/drakbackup:2237
+#: standalone/drakbackup:1954
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Peidio ailddirwyn y tâp wedi ei gadw wrth gefn"
 
-#: standalone/drakbackup:2243
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Dileu'r tâp cyn cadw wrth gefn"
 
-#: standalone/drakbackup:2249
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Tynnwch y tâp wedi cadw wrth gefn"
 
-#: standalone/drakbackup:2317
+#: standalone/drakbackup:2033
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Rhowch y cyfeiriadur i gadw iddo:"
 
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2037
+#, c-format
+msgid "Directory to save to"
+msgstr "Y cyfeiriadur i gadw iddo:"
+
+#: standalone/drakbackup:2042
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17520,313 +17676,308 @@ msgstr ""
 "Rhowch y maint mwyaf\n"
 " i'w ganiatáu ar gyfer Drakbackup (MB)"
 
-#: standalone/drakbackup:2399
+#: standalone/drakbackup:2106
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CDROM / DVDROM"
 
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2111
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Disg Caled / NFS"
 
-#: standalone/drakbackup:2420 standalone/drakbackup:2425
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2127 standalone/drakbackup:2132
+#: standalone/drakbackup:2137
 #, c-format
 msgid "hourly"
 msgstr "bob awr"
 
-#: standalone/drakbackup:2421 standalone/drakbackup:2426
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2128 standalone/drakbackup:2133
+#: standalone/drakbackup:2137
 #, c-format
 msgid "daily"
 msgstr "dyddiol"
 
-#: standalone/drakbackup:2422 standalone/drakbackup:2427
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2129 standalone/drakbackup:2134
+#: standalone/drakbackup:2137
 #, c-format
 msgid "weekly"
 msgstr "bob wythnos"
 
-#: standalone/drakbackup:2423 standalone/drakbackup:2428
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2130 standalone/drakbackup:2135
+#: standalone/drakbackup:2137
 #, c-format
 msgid "monthly"
 msgstr "bob mis"
 
-#: standalone/drakbackup:2424 standalone/drakbackup:2429
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2131 standalone/drakbackup:2136
+#: standalone/drakbackup:2137
 #, c-format
 msgid "custom"
 msgstr "arddull"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "January"
 msgstr "Ionawr"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "February"
 msgstr "Chwefror"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "March"
 msgstr "Mawrth"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "April"
 msgstr "Ebrill"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "May"
 msgstr "Mai"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "June"
 msgstr "Mehefin"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "July"
 msgstr "Gorffennaf"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "August"
 msgstr "Awst"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "September"
 msgstr "Medi"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "October"
 msgstr "Hydref"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "November"
 msgstr "Tachwedd"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "December"
 msgstr "Rhagfyr"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Sunday"
 msgstr "Sul"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Monday"
 msgstr "Llun"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Tuesday"
 msgstr "Mawrth"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Wednesday"
 msgstr "Mercher"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Thursday"
 msgstr "Iau"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Friday"
 msgstr "Gwener"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Saturday"
 msgstr "Sadwrn"
 
-#: standalone/drakbackup:2478
+#: standalone/drakbackup:2185
 #, c-format
 msgid "Use daemon"
 msgstr "Defnyddiwch ddaemon"
 
-#: standalone/drakbackup:2483
+#: standalone/drakbackup:2190
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Dewiswch faint o amser fydd rhwng pob cadw wrth gefn"
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2196
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Gosodiad addasu/cofnod crontab:"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Minute"
 msgstr "Munud"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Hour"
 msgstr "Awr"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Day"
 msgstr "Diwrnod"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2213
 #, c-format
 msgid "Month"
 msgstr "Mis"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2217
 #, c-format
 msgid "Weekday"
 msgstr "Diwrnod yr wythnos"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2223
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn."
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2230
 #, 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:2524
+#: standalone/drakbackup:2231
 #, 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:2571
+#: standalone/drakbackup:2281
 #, c-format
-msgid "Use tar and bzip2 (rather than tar and gzip)"
-msgstr "Defnyddio tar abzip2 (yn lle tar a gzip)"
+msgid "Please choose the compression type"
+msgstr "Dewiswch y y math o gywasgiad"
 
-#: standalone/drakbackup:2572
+#: standalone/drakbackup:2285
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Defnyddiwch ffeiliau .backupignore"
 
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2287
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Anfonwch adroddiad e-bost wedi pob cadw wrth gefn i :"
 
-#: standalone/drakbackup:2580
-#, fuzzy, c-format
+#: standalone/drakbackup:2293
+#, c-format
 msgid "SMTP server for mail:"
-msgstr "Gweinydd gwesteiwr SMB"
+msgstr "Gweinydd SMTP ar gyfer e-bost:"
 
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2298
 #, 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:2624
+#: standalone/drakbackup:2338
 #, c-format
 msgid "What"
 msgstr "Beth"
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2343
 #, c-format
 msgid "Where"
 msgstr "Lle"
 
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2348
 #, c-format
 msgid "When"
 msgstr "Pryd"
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2353
 #, c-format
 msgid "More Options"
 msgstr "Dewisiadau Eraill"
 
-#: standalone/drakbackup:2651
-#, fuzzy, c-format
+#: standalone/drakbackup:2366
+#, c-format
 msgid "Backup destination not configured..."
-msgstr "Nid yw swyddogaethau'r rhwydwaith wedi ei ffurfweddu"
+msgstr "Nid yw cyrchfan cadw wrth gefn wedi ei ffurfweddu..."
 
-#: standalone/drakbackup:2667 standalone/drakbackup:4731
+#: standalone/drakbackup:2385 standalone/drakbackup:4413
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Ffurfweddiad Drakbackup"
 
-#: standalone/drakbackup:2684
+#: standalone/drakbackup:2402
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Dewiswch i le rydych am gadw ffeiliau wrth gefn"
 
-#: standalone/drakbackup:2686
+#: standalone/drakbackup:2404
 #, 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:2694
+#: standalone/drakbackup:2412
 #, c-format
 msgid "Across Network"
 msgstr "ar draws Rhwydwaith"
 
-#: standalone/drakbackup:2702
+#: standalone/drakbackup:2420
 #, c-format
 msgid "On CD-R"
 msgstr "ar CDROM"
 
-#: standalone/drakbackup:2710
+#: standalone/drakbackup:2428
 #, c-format
 msgid "On Tape Device"
 msgstr "ar Ddyfais Tâp"
 
-#: standalone/drakbackup:2738
-#, c-format
-msgid "Please select media for backup..."
-msgstr "Dewiswch y cyfrwng ar gyfer cadw wrth gefn..."
-
-#: standalone/drakbackup:2760
+#: standalone/drakbackup:2468
 #, c-format
 msgid "Backup Users"
 msgstr "Defnyddwyr Cadw wrth Gefn"
 
-#: standalone/drakbackup:2761
+#: standalone/drakbackup:2469
 #, c-format
 msgid " (Default is all users)"
 msgstr "(Rhagosodedig yw pob defnyddiwr)"
 
-#: standalone/drakbackup:2773
+#: standalone/drakbackup:2481
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Dewiswch beth rydych am ei gadw wrth gefn"
 
-#: standalone/drakbackup:2774
+#: standalone/drakbackup:2482
 #, c-format
 msgid "Backup System"
 msgstr "System cadw wrth gefn"
 
-#: standalone/drakbackup:2776
+#: standalone/drakbackup:2484
 #, c-format
 msgid "Select user manually"
 msgstr "Dewis defnyddwyr gyda llaw"
 
-#: standalone/drakbackup:2805
+#: standalone/drakbackup:2513
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Dewiswch y data i'w gadw wrth gefn..."
 
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2585
 #, c-format
 msgid ""
 "\n"
@@ -17835,7 +17986,7 @@ msgstr ""
 "\n"
 "Ffynhonell Cadw wrth Gefn:\n"
 
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2586
 #, c-format
 msgid ""
 "\n"
@@ -17844,7 +17995,7 @@ msgstr ""
 "\n"
 "- Ffeiliau System: \n"
 
-#: standalone/drakbackup:2882
+#: standalone/drakbackup:2588
 #, c-format
 msgid ""
 "\n"
@@ -17853,7 +18004,7 @@ msgstr ""
 "\n"
 "- Ffeiliau Defnyddiwr:\n"
 
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2590
 #, c-format
 msgid ""
 "\n"
@@ -17862,7 +18013,7 @@ msgstr ""
 "\n"
 "- Ffeiliau Eraill: \n"
 
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2592
 #, c-format
 msgid ""
 "\n"
@@ -17871,12 +18022,12 @@ msgstr ""
 "\n"
 "Cadw ar Ddisg caled ar lwybr: %s\n"
 
-#: standalone/drakbackup:2887
+#: standalone/drakbackup:2593
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tCyfyngu defnydd disg i %s Mb\n"
 
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2596
 #, c-format
 msgid ""
 "\n"
@@ -17885,17 +18036,17 @@ msgstr ""
 "\n"
 "- Dileu ffeiliau tar y disg caled wedi'r cadw wrth gefn.\n"
 
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2600
 #, c-format
 msgid "NO"
 msgstr "NA"
 
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2601
 #, c-format
 msgid "YES"
 msgstr "IAWN"
 
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2602
 #, c-format
 msgid ""
 "\n"
@@ -17904,22 +18055,22 @@ msgstr ""
 "\n"
 "- Llosgi i CD"
 
-#: standalone/drakbackup:2897
+#: standalone/drakbackup:2603
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2898
+#: standalone/drakbackup:2604
 #, c-format
 msgid " on device: %s"
 msgstr "ar ddyfais: %s"
 
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2605
 #, c-format
 msgid " (multi-session)"
 msgstr "(aml-sesiwn)"
 
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2606
 #, c-format
 msgid ""
 "\n"
@@ -17928,12 +18079,12 @@ msgstr ""
 "\n"
 "- Cadw i dâp ar ddyfais: %s"
 
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2607
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tDileu=%s"
 
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2610
 #, c-format
 msgid ""
 "\n"
@@ -17942,7 +18093,7 @@ msgstr ""
 "\n"
 "- Cadw drwy %s ar westeiwr: %s\n"
 
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2611
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17951,7 +18102,7 @@ msgstr ""
 "\t\t enw defnyddiwr:%s\n"
 "\t\t ar lwybr: %s \n"
 
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2612
 #, c-format
 msgid ""
 "\n"
@@ -17960,37 +18111,42 @@ msgstr ""
 "\n"
 "-Dewisiadau:\n"
 
-#: standalone/drakbackup:2907
+#: standalone/drakbackup:2613
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tPeidiwch cynnwys Ffeiliau System\n"
 
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2615
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\t Bydd Cadw wrth gefn yn defnyddio tar a bzip2\n"
 
-#: standalone/drakbackup:2912
+#: standalone/drakbackup:2616
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tBydd Cadw wrth Gefn yn defnyddio tar a gzip\n"
 
-#: standalone/drakbackup:2915
+#: standalone/drakbackup:2617
+#, c-format
+msgid "\tBackups use tar only\n"
+msgstr "\tBydd Cadw wrth Gefn yn defnyddio tar yn unig\n"
+
+#: standalone/drakbackup:2619
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tDefnyddiwch ffeiliau .backupignorey\n"
 
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2620
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\tAnfon e-bost at %s\n"
 
-#: standalone/drakbackup:2917
-#, fuzzy, c-format
+#: standalone/drakbackup:2621
+#, c-format
 msgid "\tUsing SMTP server %s\n"
-msgstr "Ar weinydd CUPS \"%s\""
+msgstr "\tDefnyddio gweinydd SMTP %s\n"
 
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2623
 #, c-format
 msgid ""
 "\n"
@@ -17999,47 +18155,47 @@ msgstr ""
 "\n"
 "- Daemon %s trwy:\n"
 
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2624
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-Disg Caled.\n"
 
-#: standalone/drakbackup:2921
+#: standalone/drakbackup:2625
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R.\n"
 
-#: standalone/drakbackup:2922
+#: standalone/drakbackup:2626
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-Tâp \n"
 
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2627
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Rhwydwaith drwy FTP.\n"
 
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2628
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Rhwydwaith drwy SSH.\n"
 
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2629
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Rhwydwaith drwy rsync.\n"
 
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2630
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Rhwydwaith drwy webday.\n"
 
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2632
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Dim ffurfweddiad, cliciwch Dewin neu Uwch.\n"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2637
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18048,27 +18204,27 @@ msgstr ""
 "Rhestr o ddata i'w adfer:\n"
 "\n"
 
-#: standalone/drakbackup:2935
+#: standalone/drakbackup:2639
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "Adfer Ffeiliau'r System.\n"
 
-#: standalone/drakbackup:2937 standalone/drakbackup:2947
+#: standalone/drakbackup:2641 standalone/drakbackup:2651
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "       - o ddyddiad: %s %s\n"
 
-#: standalone/drakbackup:2940
+#: standalone/drakbackup:2644
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Adfer Ffeiliau'r System: \n"
 
-#: standalone/drakbackup:2945
+#: standalone/drakbackup:2649
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Adfer Ffeiliau Eraill: \n"
 
-#: standalone/drakbackup:3121
+#: standalone/drakbackup:2830
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18077,128 +18233,140 @@ msgstr ""
 "Rhestr o ddata llwgr:\n"
 "\n"
 
-#: standalone/drakbackup:3123
+#: standalone/drakbackup:2832
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Dad-diciwch hwn neu ei dynnu'r tro nesaf."
 
-#: standalone/drakbackup:3133
+#: standalone/drakbackup:2842
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Mae'r ffeiliau wrth gefn wedi eu llygru"
 
-#: standalone/drakbackup:3154
+#: standalone/drakbackup:2863
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "         Mae eich dewis data wedi ei          "
 
-#: standalone/drakbackup:3155
+#: standalone/drakbackup:2864
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr "          Ei adfer yn Llwyddiannus ar %s     "
 
-#: standalone/drakbackup:3270
+#: standalone/drakbackup:2987
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "           Adfer y Ffurfweddiad"
 
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3015
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Iawn i adfer ffeiliau eraill"
 
-#: standalone/drakbackup:3316
+#: standalone/drakbackup:3031
 #, 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:3382
-#, fuzzy, c-format
+#: standalone/drakbackup:3098
+#, c-format
 msgid "Please choose the date to restore:"
-msgstr "dewiswch y data i'w adfer"
+msgstr "Dewiswch y dyddiad i'w adfer:"
 
-#: standalone/drakbackup:3420
+#: standalone/drakbackup:3135
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Adfer o'r Ddisg Caled."
 
-#: standalone/drakbackup:3422
+#: standalone/drakbackup:3137
 #, 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:3478
+#: standalone/drakbackup:3141
+#, c-format
+msgid "Directory with backups"
+msgstr "Cyfeiriadur gyda chadw wrth gefn"
+
+#: standalone/drakbackup:3194
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Dewis cyfrwng arall i adfer ohono"
 
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Other Media"
 msgstr "Cyfrwng Arall"
 
-#: standalone/drakbackup:3485
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Restore system"
 msgstr "Adfer y system"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3202
 #, c-format
 msgid "Restore Users"
 msgstr "Adfer Defnyddwyr"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3203
 #, c-format
 msgid "Restore Other"
 msgstr "Adfer Arall"
 
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3205
 #, c-format
-msgid "select path to restore (instead of /)"
+msgid "Select path to restore (instead of /)"
 msgstr "dewis llwybr arall i adfer ( yn lle / )"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#, c-format
+msgid "Path To Restore To"
+msgstr "Llwybr i Adfer Iddo"
+
+#: standalone/drakbackup:3212
 #, 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:3495
+#: standalone/drakbackup:3214
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Tynnu cyfeiriaduron defnyddiwr cyn adfer."
 
-#: standalone/drakbackup:3575
-#, fuzzy, c-format
+#: standalone/drakbackup:3298
+#, c-format
 msgid "Filename text substring to search for (empty string matches all):"
-msgstr "Testun enw ffeil i chwilio amdano:"
+msgstr "Testun enw ffeil i chwilio amdano (llinyn gwag yn cydweddu popeth):"
 
-#: standalone/drakbackup:3578
+#: standalone/drakbackup:3301
 #, c-format
 msgid "Search Backups"
 msgstr "Chwilio Copïau wrth Gefn"
 
-#: standalone/drakbackup:3597
-#, fuzzy, c-format
+#: standalone/drakbackup:3320
+#, c-format
 msgid "No matches found..."
-msgstr "Heb ganfod delwedd"
+msgstr "Heb ganfod cydweddiad..."
 
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3324
 #, c-format
 msgid "Restore Selected"
 msgstr "Adfer y Dewis"
 
-#: standalone/drakbackup:3735
+#: standalone/drakbackup:3458
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
 "Ctrl-Click files to select multiple files."
 msgstr ""
+"Cliciwch dyddiad/amser i weld ffeiliau wrth gefn.\n"
+"Clicio+Ctr; ffeiliau i ddewis ffeiliau niferus."
 
-#: standalone/drakbackup:3741
+#: standalone/drakbackup:3464
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18207,7 +18375,7 @@ msgstr ""
 "Adfer Cofnod\n"
 "Catalog Ddewiswyd"
 
-#: standalone/drakbackup:3750
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18216,26 +18384,17 @@ msgstr ""
 "Adfer y Dewis\n"
 "Ffeiliau"
 
-#: standalone/drakbackup:3766
-#, c-format
-msgid ""
-"Change\n"
-"Restore Path"
-msgstr ""
-"Newid\n"
-"Llwybr Adfer"
-
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3550
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Heb ganfod y  ffeiliau wrth gefn yn %s."
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid "Restore From CD"
 msgstr "Adfer o'r CD"
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18244,17 +18403,17 @@ msgstr ""
 "Rhowch yr CD gyda label cynnwys%s\n"
 "yn yr gyrrwr CD o dan bwynt gosod /mnt/cdrom"
 
-#: standalone/drakbackup:3848
+#: standalone/drakbackup:3565
 #, 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:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid "Restore From Tape"
 msgstr "Adfer o Dâp"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18263,213 +18422,218 @@ msgstr ""
 "Rhowch y tâp gyda label cynnwys%s\n"
 "yn yr gyrrwr tâp %s"
 
-#: standalone/drakbackup:3860
+#: standalone/drakbackup:3577
 #, 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:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network"
 msgstr "Adfer drwy'r Rhwydwaith"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Adfer drwy Protocol Rhwydwaith: %s"
 
-#: standalone/drakbackup:3872
+#: standalone/drakbackup:3589
 #, c-format
 msgid "Host Name"
 msgstr "Enw Gwesteiwr"
 
-#: standalone/drakbackup:3873
+#: standalone/drakbackup:3590
 #, c-format
 msgid "Host Path or Module"
 msgstr "Llwybr Gwesteiwr neu Fodiwl "
 
-#: standalone/drakbackup:3880
+#: standalone/drakbackup:3597
 #, c-format
 msgid "Password required"
 msgstr "Mae angen cyfrinair"
 
-#: standalone/drakbackup:3886
+#: standalone/drakbackup:3603
 #, c-format
 msgid "Username required"
 msgstr "Mae angen enw defnyddiwr"
 
-#: standalone/drakbackup:3889
+#: standalone/drakbackup:3606
 #, c-format
 msgid "Hostname required"
 msgstr "Mae angen enw gwesteiwr"
 
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Path or Module required"
 msgstr "Llwybr neu Fodiwl angenrheidiol"
 
-#: standalone/drakbackup:3907
+#: standalone/drakbackup:3624
 #, c-format
 msgid "Files Restored..."
 msgstr "Adferwyd ffeiliau..."
 
-#: standalone/drakbackup:3910
+#: standalone/drakbackup:3627
 #, c-format
 msgid "Restore Failed..."
 msgstr "Methodd Adfer..."
 
-#: standalone/drakbackup:4015 standalone/drakbackup:4031
-#, fuzzy, c-format
+#: standalone/drakbackup:3737 standalone/drakbackup:3754
+#, c-format
 msgid "%s not retrieved..."
-msgstr "Heb ganfod %s...\n"
+msgstr "Heb ail estyn %s..."
 
-#: standalone/drakbackup:4155 standalone/drakbackup:4228
+#: standalone/drakbackup:3880 standalone/drakbackup:3953
 #, c-format
 msgid "Search for files to restore"
 msgstr "Chwilio am ffeiliau i'w hadfer"
 
-#: standalone/drakbackup:4160
+#: standalone/drakbackup:3885
 #, c-format
 msgid "Restore all backups"
 msgstr "Adfer pob cadw wrth gefn"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:3894
 #, c-format
 msgid "Custom Restore"
 msgstr "Adfer Dewisol"
 
-#: standalone/drakbackup:4174 standalone/drakbackup:4224
+#: standalone/drakbackup:3899 standalone/drakbackup:3949
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Adfer o'r Catalog"
 
-#: standalone/drakbackup:4196
+#: standalone/drakbackup:3921
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Methu canfod cadw wrth gefn i'w hadfer...\n"
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:3922
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Gwirio mai %s yw'r llwybr cywir"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:3923
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " ac mae'r CD yn y gyrrwr"
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:3925
 #, 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:4216
+#: standalone/drakbackup:3941
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD yn ei le - ewch ymlaen"
 
-#: standalone/drakbackup:4221
+#: standalone/drakbackup:3946
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Pori i'r ystorfa newydd adferwyd"
 
-#: standalone/drakbackup:4258
+#: standalone/drakbackup:3947
+#, c-format
+msgid "Directory To Restore From"
+msgstr "Cyfeiriadur i Adfer Ohono"
+
+#: standalone/drakbackup:3986
 #, c-format
 msgid "Restore Progress"
 msgstr "Adfer Cynnydd"
 
-#: standalone/drakbackup:4292 standalone/drakbackup:4404
-#: standalone/logdrake:175
+#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/logdrake:174
 #, c-format
 msgid "Save"
 msgstr "Gorffen"
 
-#: standalone/drakbackup:4378
+#: standalone/drakbackup:4099
 #, c-format
 msgid "Build Backup"
 msgstr "Adeiladu Cadw wrth Gefn"
 
-#: standalone/drakbackup:4430 standalone/drakbackup:4829
+#: standalone/drakbackup:4147 standalone/drakbackup:4512
 #, c-format
 msgid "Restore"
 msgstr "Adfer"
 
-#: standalone/drakbackup:4600
+#: standalone/drakbackup:4277
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Mae'r pecynnau canlynol angen eu gosod:\n"
 
-#: standalone/drakbackup:4622
+#: standalone/drakbackup:4304
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Dewiswch y data i'w adfer..."
 
-#: standalone/drakbackup:4662
+#: standalone/drakbackup:4344
 #, c-format
 msgid "Backup system files"
 msgstr "Ffeiliau System Cadw wrth Gefn"
 
-#: standalone/drakbackup:4665
+#: standalone/drakbackup:4347
 #, c-format
 msgid "Backup user files"
 msgstr "Ffeiliau Defnyddiwr Cadw wrth Gefn"
 
-#: standalone/drakbackup:4668
+#: standalone/drakbackup:4350
 #, c-format
 msgid "Backup other files"
 msgstr "Cadw'r ffeiliau eraill wrth gefn"
 
-#: standalone/drakbackup:4671 standalone/drakbackup:4707
+#: standalone/drakbackup:4353 standalone/drakbackup:4389
 #, c-format
 msgid "Total Progress"
 msgstr "Cyfanswm Cynydd"
 
-#: standalone/drakbackup:4699
+#: standalone/drakbackup:4381
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Anfon ffeiliau drwy FTP"
 
-#: standalone/drakbackup:4702
+#: standalone/drakbackup:4384
 #, c-format
 msgid "Sending files..."
 msgstr "Anfon ffeiliau..."
 
-#: standalone/drakbackup:4772
+#: standalone/drakbackup:4455
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Cadwch wrth Gefn eich ffeiliau ffurfweddu"
 
-#: standalone/drakbackup:4777
+#: standalone/drakbackup:4460
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Edrych ar Ffurfweddiad Cadw wrth Gefn"
 
-#: standalone/drakbackup:4803
+#: standalone/drakbackup:4486
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Ffurfweddiad y Dewin"
 
-#: standalone/drakbackup:4808
+#: standalone/drakbackup:4491
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Ffurfweddiad Uwch"
 
-#: standalone/drakbackup:4813
+#: standalone/drakbackup:4496
 #, c-format
 msgid "View Configuration"
 msgstr "Edrych ar Ffurfweddiad"
 
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4500
 #, c-format
 msgid "View Last Log"
 msgstr "Darllen y Cofnod Olaf"
 
-#: standalone/drakbackup:4822
+#: standalone/drakbackup:4505
 #, c-format
 msgid "Backup Now"
 msgstr "Cadw wrth Gefn Nawr"
 
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4509
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18478,56 +18642,56 @@ msgstr ""
 "Ni chanfyddwyd y ffeil ffurfweddu \n"
 "cliciwch Dewin neu Uwch."
 
-#: standalone/drakbackup:4858 standalone/drakbackup:4865
+#: standalone/drakbackup:4530 standalone/drakbackup:4533
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "Dewis themâu cychwyn graffigol"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "System mode"
 msgstr "Modd system"
 
-#: standalone/drakboot:66 standalone/drakfloppy:46 standalone/harddrake2:97
-#: standalone/harddrake2:98 standalone/logdrake:70 standalone/printerdrake:150
+#: standalone/drakboot:67 standalone/drakfloppy:46 standalone/harddrake2:97
+#: standalone/harddrake2:98 standalone/logdrake:71 standalone/printerdrake:150
 #: standalone/printerdrake:151 standalone/printerdrake:152
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Ffeil/_Gadael"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/harddrake2:98
-#: standalone/logdrake:76 standalone/printerdrake:152
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/harddrake2:98
+#: standalone/logdrake:77 standalone/printerdrake:152
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: standalone/drakboot:118
+#: standalone/drakboot:119
 #, c-format
 msgid "Install themes"
 msgstr "Gosod themâu"
 
-#: standalone/drakboot:119
+#: standalone/drakboot:120
 #, c-format
 msgid "Create new theme"
 msgstr "Creu thema newydd"
 
-#: standalone/drakboot:133
+#: standalone/drakboot:134
 #, c-format
 msgid "Use graphical boot"
 msgstr "Defnyddio cychwyn graffigol"
 
-#: standalone/drakboot:138
-#, fuzzy, c-format
+#: standalone/drakboot:139
+#, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
@@ -18535,12 +18699,12 @@ 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:145
+#: standalone/drakboot:146
 #, c-format
 msgid "Theme"
 msgstr "Thema"
 
-#: standalone/drakboot:147
+#: standalone/drakboot:149
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18549,32 +18713,32 @@ msgstr ""
 "Dangos thema\n"
 "yn y consol"
 
-#: standalone/drakboot:156
+#: standalone/drakboot:158
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "Cychwyn yr amgylchedd graffigol wrth gychwyn eich system"
 
-#: standalone/drakboot:164
+#: standalone/drakboot:166
 #, c-format
-msgid "Yes, I want autologin with this (user, desktop)"
-msgstr "Iawn, rwyf eisiau awtomewngofnodi gyda (defnyddiwr, bwrdd gwaith)"
+msgid "No, I don't want autologin"
+msgstr "Na, dydw i ddim eisiau awtomewngofnodi"
 
-#: standalone/drakboot:165
+#: standalone/drakboot:167
 #, c-format
-msgid "No, I don't want autologin"
-msgstr "Na, dydw i ddim eisiau awto-mewngofnodi"
+msgid "Yes, I want autologin with this (user, desktop)"
+msgstr "Iawn, rwyf eisiau awtomewngofnodi gyda (defnyddiwr, bwrdd gwaith)"
 
-#: standalone/drakboot:171
+#: standalone/drakboot:173
 #, c-format
 msgid "Default user"
 msgstr "Defnyddiwr rhagosodedig"
 
-#: standalone/drakboot:172
+#: standalone/drakboot:174
 #, c-format
 msgid "Default desktop"
 msgstr "Bwrdd gwaith rhagosodedig"
 
-#: standalone/drakboot:236
+#: standalone/drakboot:238
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr "Mae gosod %s wedi methu. Digwyddodd y gwall canlynol:"
@@ -18830,12 +18994,12 @@ msgstr "Galluogi Protocol Amser Rhwydwaith"
 msgid "Server:"
 msgstr "Gweinydd:"
 
-#: standalone/drakclock:125 standalone/drakclock:137
+#: standalone/drakclock:129 standalone/drakclock:141
 #, c-format
 msgid "Reset"
 msgstr "Ailosod"
 
-#: standalone/drakclock:200
+#: standalone/drakclock:204
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -18848,214 +19012,203 @@ msgstr ""
 "\n"
 "Hoffech chi osod ntp?"
 
-#: standalone/drakconnect:78
+#: standalone/drakconnect:81
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Ffurfweddiad y rhwydwaith (%d addasydd)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Gateway:"
 msgstr "Mynedfa:"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Interface:"
 msgstr "Rhyngwyneb:"
 
-#: standalone/drakconnect:93 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:105
 #, c-format
 msgid "Wait please"
 msgstr "Arhoswch"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "Interface"
 msgstr "Rhyngwyneb"
 
-#: standalone/drakconnect:113 standalone/drakconnect:502
-#: standalone/drakvpn:1136
-#, c-format
-msgid "Protocol"
-msgstr "Protocol"
-
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116 standalone/drakups:233
 #, c-format
 msgid "Driver"
 msgstr "Gyrrwr"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "State"
 msgstr "Stad"
 
-#: standalone/drakconnect:130
+#: standalone/drakconnect:133
 #, c-format
 msgid "Hostname: "
 msgstr "Enw gwesteiwr:"
 
-#: standalone/drakconnect:132
+#: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
 msgstr "Ffurfweddu enw gwestai"
 
-#: standalone/drakconnect:146 standalone/drakconnect:727
+#: standalone/drakconnect:149 standalone/drakconnect:769
 #, c-format
 msgid "LAN configuration"
 msgstr "Ffurfweddiad y Rhwydwaith Lleol"
 
-#: standalone/drakconnect:151
+#: standalone/drakconnect:154
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr "Ffurfweddu'r Rhwydwaith Lleol..."
 
-#: standalone/drakconnect:159 standalone/drakconnect:228
-#: standalone/drakconnect:232
+#: standalone/drakconnect:162 standalone/drakconnect:237
+#: standalone/drakconnect:241
 #, c-format
 msgid "Apply"
 msgstr "Gosod"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:293 standalone/drakconnect:294
-#: standalone/drakconnect:540
+#: standalone/drakconnect:197
+#, c-format
+msgid "Manage connections"
+msgstr "Rheoli cysylltiadau"
+
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:298
+#: standalone/drakconnect:308 standalone/drakconnect:309
+#: standalone/drakconnect:576
 #, c-format
 msgid "TCP/IP"
 msgstr "TCP/IP"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:421
-#: standalone/drakconnect:425 standalone/drakconnect:540
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:444
+#: standalone/drakconnect:448 standalone/drakconnect:576
 #, c-format
 msgid "Account"
 msgstr "Cyfrif"
 
-#: standalone/drakconnect:283 standalone/drakconnect:347
-#: standalone/drakconnect:348 standalone/drakconnect:540
+#: standalone/drakconnect:298 standalone/drakconnect:370
+#: standalone/drakconnect:371 standalone/drakconnect:576
 #, c-format
 msgid "Wireless"
 msgstr "Diwyfr"
 
-#: standalone/drakconnect:325
+#: standalone/drakconnect:344
 #, c-format
 msgid "DNS servers"
 msgstr "Gweinydd DNS"
 
-#: standalone/drakconnect:332
+#: standalone/drakconnect:351
 #, c-format
 msgid "Search Domain"
 msgstr "Chwilio Parth"
 
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
 #, c-format
 msgid "static"
 msgstr "statig"
 
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
 #, c-format
-msgid "dhcp"
-msgstr "dhccp"
+msgid "DHCP"
+msgstr "DHCP"
 
-#: standalone/drakconnect:457
-#, fuzzy, c-format
+#: standalone/drakconnect:482
+#, c-format
 msgid "Flow control"
-msgstr "<control>S"
+msgstr "Rheolwr llif"
 
-#: standalone/drakconnect:458
-#, fuzzy, c-format
-msgid "Line termination"
-msgstr "Man Rhyngrwyd"
-
-#: standalone/drakconnect:463
+#: standalone/drakconnect:483
 #, c-format
-msgid "Tone dialing"
-msgstr ""
+msgid "Line termination"
+msgstr "Terfyn llinell"
 
-#: standalone/drakconnect:463
+#: standalone/drakconnect:493
 #, c-format
-msgid "Pulse dialing"
-msgstr ""
-
-#: standalone/drakconnect:468
-#, fuzzy, c-format
 msgid "Use lock file"
-msgstr "Dewiswch ffeil"
+msgstr "Dewiswch ffeil clo"
 
-#: standalone/drakconnect:471
-#, fuzzy, c-format
+#: standalone/drakconnect:496
+#, c-format
 msgid "Modem timeout"
-msgstr "Goramser cragen"
+msgstr "Goramser modem"
 
-#: standalone/drakconnect:475
+#: standalone/drakconnect:500
 #, c-format
 msgid "Wait for dialup tone before dialing"
-msgstr ""
+msgstr "Arhoswch am y tôn deialu cyn deialu"
 
-#: standalone/drakconnect:478
-#, fuzzy, c-format
+#: standalone/drakconnect:503
+#, c-format
 msgid "Busy wait"
-msgstr "Kuwait"
+msgstr "Prysur arhoswch"
 
-#: standalone/drakconnect:482
-#, fuzzy, c-format
+#: standalone/drakconnect:507
+#, c-format
 msgid "Modem sound"
-msgstr "Modem"
+msgstr "Sain modem"
 
-#: standalone/drakconnect:483
-#, fuzzy, c-format
+#: standalone/drakconnect:508
+#, c-format
 msgid "Enable"
-msgstr "galluogi"
+msgstr "Galluogi"
 
-#: standalone/drakconnect:483
-#, fuzzy, c-format
+#: standalone/drakconnect:508
+#, c-format
 msgid "Disable"
-msgstr "dymunol"
+msgstr "Analluogi"
 
-#: standalone/drakconnect:522 standalone/harddrake2:58
+#: standalone/drakconnect:558 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr "Dosbarth y cyfrwng"
 
-#: standalone/drakconnect:523 standalone/drakfloppy:140
+#: standalone/drakconnect:559 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr "Enw'r modiwl"
 
-#: standalone/drakconnect:524
+#: standalone/drakconnect:560
 #, c-format
 msgid "Mac Address"
 msgstr "Cyfeiriad Mac"
 
-#: standalone/drakconnect:525 standalone/harddrake2:21
+#: standalone/drakconnect:561 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr "Bws"
 
-#: standalone/drakconnect:526 standalone/harddrake2:29
+#: standalone/drakconnect:562 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Lleoliad ar y bws"
 
-#: standalone/drakconnect:587
+#: standalone/drakconnect:632 standalone/drakgw:248 standalone/drakpxe:138
 #, c-format
 msgid ""
-"An unexpected error has happened:\n"
-"%s"
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
 msgstr ""
-"Digwyddodd gwall annisgwyl:\n"
-"%s"
+"Nid oes addasydd rhwydwaith ethernet wedi ei ganfod ar eich system. Rhedwch "
+"yr offeryn ffurfweddu caledwedd."
 
-#: standalone/drakconnect:597
+#: standalone/drakconnect:638
 #, c-format
 msgid "Remove a network interface"
 msgstr "Tynnu rhyngwyneb rhwydwaith"
 
-#: standalone/drakconnect:601
+#: standalone/drakconnect:642
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Dewis y rhyngwyneb rhwydwaith i'w dynnu:"
 
-#: standalone/drakconnect:617
+#: standalone/drakconnect:656
 #, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -19066,53 +19219,53 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:619
+#: standalone/drakconnect:658
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been succesfully deleted"
 msgstr "Llongyfarchiadau, dilëwyd rhyngwyneb \"%s\" yn llwyddiannus"
 
-#: standalone/drakconnect:636
+#: standalone/drakconnect:675
 #, c-format
 msgid "No Ip"
 msgstr "Dim Ip"
 
-#: standalone/drakconnect:637
+#: standalone/drakconnect:676
 #, c-format
 msgid "No Mask"
 msgstr "Dim Mask"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "up"
 msgstr "fyny"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "down"
 msgstr "lawr"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Connected"
 msgstr "Wedi cysylltu"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Not connected"
 msgstr "Heb gysylltu"
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Disconnect..."
 msgstr "Datgysylltu..."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Connect..."
 msgstr "Cysylltu..."
 
-#: standalone/drakconnect:707
+#: standalone/drakconnect:749
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19121,17 +19274,17 @@ msgstr ""
 "Rhybudd, mae cysylltiad arall gyda'r rhyngrwyd wedi ei ganfod, efallai'n "
 "defnyddio eich rhwydwaith."
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Deactivate now"
 msgstr "Dad weithredu nawr"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Activate now"
 msgstr "Cychwyn nawr"
 
-#: standalone/drakconnect:731
+#: standalone/drakconnect:773
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19141,27 +19294,27 @@ msgstr ""
 "eu ffurfweddio. Ffurfweddwch nhw'n gyntaf\n"
 "drwy glicio ar 'Ffurfweddu'"
 
-#: standalone/drakconnect:745
+#: standalone/drakconnect:787
 #, c-format
 msgid "LAN Configuration"
 msgstr "Ffurfweddiad Rhwydwaith Lleol (LAN)"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:799
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Addasydd %s: %s"
 
-#: standalone/drakconnect:766
+#: standalone/drakconnect:808
 #, c-format
 msgid "Boot Protocol"
 msgstr "Protocol Cychwyn"
 
-#: standalone/drakconnect:767
+#: standalone/drakconnect:809
 #, c-format
 msgid "Started on boot"
 msgstr "Cychwyn y peiriant"
 
-#: standalone/drakconnect:803
+#: standalone/drakconnect:845
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -19171,7 +19324,7 @@ msgstr ""
 "Cychwynnwch y cynorthwy-ydd \"Ychwanegu rhyngwyneb\" o' Ganolfan Rheoli "
 "Mandrake"
 
-#: standalone/drakconnect:858
+#: standalone/drakconnect:900
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
@@ -19180,47 +19333,32 @@ msgstr ""
 "Nid oes gennych cysylltiad ffurfweddedig â'r Rhyngrwyd.\n"
 "Cliciwch \"Mynediad rhyngrwyd\" yn y ganolfan reoli'"
 
-#: standalone/drakconnect:866
+#: standalone/drakconnect:908
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Ffurfweddiad cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakconnect:907
-#, c-format
-msgid "Provider dns 1 (optional)"
-msgstr "Dns 1 y darparwr (dewisol)"
-
-#: standalone/drakconnect:908
-#, c-format
-msgid "Provider dns 2 (optional)"
-msgstr "Dns 2 y darparwr (dewisol)"
-
-#: standalone/drakconnect:921
-#, c-format
-msgid "Ethernet Card"
-msgstr "Cerdyn Ethernet"
-
-#: standalone/drakconnect:922
-#, c-format
-msgid "DHCP Client"
-msgstr "Cleient DHCP"
+#: standalone/drakconnect:926
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Trydydd gweinydd DNS (dewisol)\""
 
-#: standalone/drakconnect:951
+#: standalone/drakconnect:948
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Ffurfweddu Cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakconnect:952
+#: standalone/drakconnect:949
 #, c-format
 msgid "Internet access"
 msgstr "Mynediad i'r Rhyngrwyd"
 
-#: standalone/drakconnect:954 standalone/net_monitor:87
+#: standalone/drakconnect:951 standalone/net_monitor:87
 #, c-format
 msgid "Connection type: "
 msgstr "Math o gyswllt:"
 
-#: standalone/drakconnect:957
+#: standalone/drakconnect:954
 #, c-format
 msgid "Status:"
 msgstr "Statws"
@@ -19361,109 +19499,109 @@ msgstr ""
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
-#: standalone/drakfont:181
+#: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
 msgstr "Chwilio am ffontiau wedi eu gosod"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "Tynnu ffontiau wedi eu gosod"
 
-#: standalone/drakfont:206
+#: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
 msgstr "pob ffont"
 
-#: standalone/drakfont:208
+#: standalone/drakfont:210
 #, c-format
 msgid "No fonts found"
 msgstr "Heb ganfod ffontiau"
 
-#: standalone/drakfont:216 standalone/drakfont:256 standalone/drakfont:323
-#: standalone/drakfont:356 standalone/drakfont:364 standalone/drakfont:390
-#: standalone/drakfont:408 standalone/drakfont:422
+#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
+#: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
+#: standalone/drakfont:410 standalone/drakfont:424
 #, c-format
 msgid "done"
 msgstr "gorffen"
 
-#: standalone/drakfont:221
+#: standalone/drakfont:223
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "Methu canfod unrhyw ffont yn eich rhaniad gosodedig"
 
-#: standalone/drakfont:254
+#: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "Ailddewis y ffontiau cywir"
 
-#: standalone/drakfont:257
+#: standalone/drakfont:259
 #, c-format
 msgid "Could not find any font.\n"
 msgstr "Methu canfod unrhyw ffontiau.\n"
 
-#: standalone/drakfont:267
+#: standalone/drakfont:269
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr "Chwilio am ffontiau yn y rhestr gosod"
 
-#: standalone/drakfont:292
+#: standalone/drakfont:294
 #, c-format
 msgid "%s fonts conversion"
 msgstr "trosi ffontiau %s"
 
-#: standalone/drakfont:321
+#: standalone/drakfont:323
 #, c-format
 msgid "Fonts copy"
 msgstr "Copïo ffontiau"
 
-#: standalone/drakfont:324
+#: standalone/drakfont:326
 #, c-format
 msgid "True Type fonts installation"
 msgstr "Gosod ffontiau True Type"
 
-#: standalone/drakfont:331
+#: standalone/drakfont:333
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "arhoswch yn ystod ttmkfdir..."
 
-#: standalone/drakfont:332
+#: standalone/drakfont:334
 #, c-format
 msgid "True Type install done"
 msgstr "Wedi gosod True Type"
 
-#: standalone/drakfont:338 standalone/drakfont:353
+#: standalone/drakfont:340 standalone/drakfont:355
 #, c-format
 msgid "type1inst building"
 msgstr "adeiladu math 1inst"
 
-#: standalone/drakfont:347
+#: standalone/drakfont:349
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "cyfeirio Ghostscript"
 
-#: standalone/drakfont:357
+#: standalone/drakfont:359
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "Llethu Ffeiliau Dros dro"
 
-#: standalone/drakfont:360
+#: standalone/drakfont:362
 #, c-format
 msgid "Restart XFS"
 msgstr "Ail gychwyn XFS"
 
-#: standalone/drakfont:406 standalone/drakfont:416
+#: standalone/drakfont:408 standalone/drakfont:418
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "Llethu ffeiliau Ffontiau"
 
-#: standalone/drakfont:418
+#: standalone/drakfont:420
 #, c-format
 msgid "xfs restart"
 msgstr "ail gychwyn xfs"
 
-#: standalone/drakfont:426
+#: standalone/drakfont:428
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19478,32 +19616,32 @@ msgstr ""
 "- Gallwch osod y ffontiau yn y dull arferol. Mewn achosion prin, gall "
 "ffontiau ffug rewi eich Gweinydd X."
 
-#: standalone/drakfont:474 standalone/drakfont:483
+#: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
 msgid "DrakFont"
 msgstr "DrakFont"
 
-#: standalone/drakfont:484
+#: standalone/drakfont:487
 #, c-format
 msgid "Font List"
 msgstr "Rhestr Ffontiau"
 
-#: standalone/drakfont:490
+#: standalone/drakfont:493
 #, c-format
 msgid "About"
 msgstr "Ynghylch"
 
-#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
+#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
 #, c-format
 msgid "Uninstall"
 msgstr "Dad osod"
 
-#: standalone/drakfont:493
+#: standalone/drakfont:496
 #, c-format
 msgid "Import"
 msgstr "Mewnforio"
 
-#: standalone/drakfont:509
+#: standalone/drakfont:512
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -19524,7 +19662,7 @@ msgstr ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:518
+#: standalone/drakfont:521
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -19561,7 +19699,7 @@ msgstr ""
 " Free Software  Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA"
 
-#: standalone/drakfont:534
+#: standalone/drakfont:537
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19591,12 +19729,12 @@ msgstr ""
 "\t  gan Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Trosi ffeiliau ffont i ffontiau afm pfb\n"
 
-#: standalone/drakfont:553
+#: standalone/drakfont:556
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Dewiswch y rhaglenni fydd yn cynnal ffontiau:"
 
-#: standalone/drakfont:554
+#: standalone/drakfont:557
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19611,195 +19749,195 @@ msgstr ""
 "- Gallwch osod y ffontiau yn y dull arferol. Mewn achosion prin, gall "
 "ffontiau ffug rewi Gwasanaethwr X."
 
-#: standalone/drakfont:564
+#: standalone/drakfont:567
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:565
+#: standalone/drakfont:568
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:566
+#: standalone/drakfont:569
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:567
+#: standalone/drakfont:570
 #, c-format
 msgid "Generic Printers"
 msgstr "Argraffyddion Generig"
 
-#: standalone/drakfont:583
+#: standalone/drakfont:586
 #, 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:597
+#: standalone/drakfont:587
+#, c-format
+msgid "File Selection"
+msgstr "Dewis ffeiliau"
+
+#: standalone/drakfont:600
 #, c-format
 msgid "You've not selected any font"
 msgstr "Heb ddewis ffontiau"
 
-#: standalone/drakfont:646
+#: standalone/drakfont:652
 #, c-format
 msgid "Import fonts"
 msgstr "Mewnforio ffontiau"
 
-#: standalone/drakfont:651
+#: standalone/drakfont:657
 #, c-format
 msgid "Install fonts"
 msgstr "Ychwanegu ffontiau"
 
-#: standalone/drakfont:686
+#: standalone/drakfont:692
 #, c-format
 msgid "click here if you are sure."
 msgstr "cliciwch yma os ydych yn siwr."
 
-#: standalone/drakfont:688
+#: standalone/drakfont:694
 #, c-format
 msgid "here if no."
 msgstr "yma os nad."
 
-#: standalone/drakfont:727
+#: standalone/drakfont:733
 #, c-format
 msgid "Unselected All"
 msgstr "Dad ddewis Popeth"
 
-#: standalone/drakfont:730
+#: standalone/drakfont:736
 #, c-format
 msgid "Selected All"
 msgstr "Dewis Popeth"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:739
 #, c-format
 msgid "Remove List"
 msgstr "Rhestr Tynnu"
 
-#: standalone/drakfont:744 standalone/drakfont:763
+#: standalone/drakfont:750 standalone/drakfont:769
 #, c-format
 msgid "Importing fonts"
 msgstr "Mewnforio ffontiau"
 
-#: standalone/drakfont:748 standalone/drakfont:768
+#: standalone/drakfont:754 standalone/drakfont:774
 #, c-format
 msgid "Initial tests"
 msgstr "Prawf Init"
 
-#: standalone/drakfont:749
+#: standalone/drakfont:755
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Copïo'r ffontiau ar eich system!"
 
-#: standalone/drakfont:750
+#: standalone/drakfont:756
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Gosod a throsi ffontiau"
 
-#: standalone/drakfont:751
+#: standalone/drakfont:757
 #, c-format
 msgid "Post Install"
 msgstr "Wedi'r Gosod"
 
-#: standalone/drakfont:769
+#: standalone/drakfont:775
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Tynnu ffontiau oddi ar eich system!"
 
-#: standalone/drakfont:770
+#: standalone/drakfont:776
 #, c-format
 msgid "Post Uninstall"
 msgstr "Wedi'r dad osod"
 
-#: standalone/drakgw:59 standalone/drakgw:190
+#: standalone/drakgw:58 standalone/drakgw:193
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Rhannu Cysylltiad â'r Rhyngrwyd"
 
-#: standalone/drakgw:117 standalone/drakvpn:49
+#: standalone/drakgw:124
 #, 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:128
-#, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi"
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Mae Rhannu Cysylltiad a'r Rhyngrwyd wedi ei analluogi"
 
-#: standalone/drakgw:129
+#: standalone/drakgw:125
 #, c-format
 msgid ""
-"The setup of Internet Connection Sharing has already been done.\n"
-"It's currently enabled.\n"
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"Mae gosodiad Rhannu Cysylltiad a'r Rhyngrwyd wedi ei gyflawni. \n"
-"Mae wedi ei alluogi. \n"
+"Mae gosodiad rhannu cysylltiad a'r Rhyngrwyd wedi ei gyflawni. \n"
+"Mae wedi ei analluogi. \n"
 "\n"
 "Beth hoffech ei wneud?"
 
-#: standalone/drakgw:133 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakvpn:125
 #, c-format
-msgid "disable"
-msgstr "dymunol"
+msgid "enable"
+msgstr "galluogi"
 
-#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99
 #: standalone/drakvpn:125
 #, c-format
 msgid "reconfigure"
 msgstr "ailffurfweddu"
 
-#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:99
-#: standalone/drakvpn:125 standalone/drakvpn:372 standalone/drakvpn:731
+#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99
+#: standalone/drakvpn:125 standalone/drakvpn:374 standalone/drakvpn:733
 #, c-format
 msgid "dismiss"
 msgstr "gwrthod"
 
 #: standalone/drakgw:136
 #, c-format
-msgid "Disabling servers..."
-msgstr "Analluogi gweinyddion..."
+msgid "Enabling servers..."
+msgstr "Galluogi gweinyddion..."
 
-#: standalone/drakgw:150
+#: standalone/drakgw:148
 #, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei analluogi."
+msgid "Internet Connection Sharing is now enabled."
+msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi."
 
-#: standalone/drakgw:157
+#: standalone/drakgw:151
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "Mae Rhannu Cysylltiad a'r Rhyngrwyd wedi ei analluogi"
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi"
 
-#: standalone/drakgw:158
+#: standalone/drakgw:152
 #, c-format
 msgid ""
-"The setup of Internet connection sharing has already been done.\n"
-"It's currently disabled.\n"
+"The setup of Internet Connection Sharing has already been done.\n"
+"It's currently enabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"Mae gosodiad rhannu cysylltiad a'r Rhyngrwyd wedi ei gyflawni. \n"
-"Mae wedi ei analluogi. \n"
+"Mae gosodiad Rhannu Cysylltiad a'r Rhyngrwyd wedi ei gyflawni. \n"
+"Mae wedi ei alluogi. \n"
 "\n"
 "Beth hoffech ei wneud?"
 
-#: standalone/drakgw:162 standalone/drakvpn:125
+#: standalone/drakgw:156 standalone/drakvpn:99
 #, c-format
-msgid "enable"
-msgstr "galluogi"
+msgid "disable"
+msgstr "dymunol"
 
-#: standalone/drakgw:169
+#: standalone/drakgw:159
 #, c-format
-msgid "Enabling servers..."
-msgstr "Galluogi gweinyddion..."
+msgid "Disabling servers..."
+msgstr "Analluogi gweinyddion..."
 
-#: standalone/drakgw:175
+#: standalone/drakgw:174
 #, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi."
+msgid "Internet Connection Sharing is now disabled."
+msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei analluogi."
 
-#: standalone/drakgw:191
+#: standalone/drakgw:194
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19822,48 +19960,27 @@ msgstr ""
 "Sylwer: bydd angen Addasydd Rhwydwaith un-pwrpas i greu Rhwydwaith Lleol "
 "(LAN)."
 
-#: standalone/drakgw:211 standalone/drakvpn:210
-#, c-format
-msgid ""
-"Please enter the name of the interface connected to the internet.\n"
-"\n"
-"Examples:\n"
-"\t\tppp+ for modem or DSL connections, \n"
-"\t\teth0, or eth1 for cable connection, \n"
-"\t\tippp+ for a isdn connection.\n"
-msgstr ""
-"Rhowch enw'r rhyngwyneb sy'n cysylltu â'r rhyngrwyd.\n"
-"\n"
-"Enghreifftiau:\n"
-"\t\tppp+ cysylltiad modem neu DSL, \n"
-"\t\teth0, neu eth1 fam gysylltiad cebl, \n"
-"\t\tippp+ am gysylltiad idsn.\n"
-
-#: standalone/drakgw:230
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Rhyngwyneb %s (gan ddefnyddio modiwl %s)"
 
-#: standalone/drakgw:231
+#: standalone/drakgw:238
 #, c-format
 msgid "Interface %s"
 msgstr "Rhagwyneb %s"
 
-#: standalone/drakgw:241 standalone/drakpxe:138
+#: standalone/drakgw:247 standalone/drakpxe:137
 #, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system. Please run the "
-"hardware configuration tool."
-msgstr ""
-"Nid oes addasydd rhwydwaith ethernet wedi ei ganfod ar eich system. Rhedwch "
-"yr offeryn ffurfweddu caledwedd."
+msgid "No network adapter on your system!"
+msgstr "Nid oes addasydd rhwydwaith ar eich system!"
 
-#: standalone/drakgw:247
+#: standalone/drakgw:254
 #, c-format
 msgid "Network interface"
 msgstr "Rhyngwyneb rhwydwaith"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:255
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19878,7 +19995,7 @@ msgstr ""
 "\n"
 "Rwyf ar fin gosod eich Rhwydwaith Lleol gyda'r addasydd hwnnw.."
 
-#: standalone/drakgw:255
+#: standalone/drakgw:262
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
@@ -19887,12 +20004,12 @@ msgstr ""
 "Dewiswch ba addasyddion rhwydwaith fydd yn cael eu cysylltu â'ch Rhwydwaith "
 "Lleol."
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Network interface already configured"
 msgstr "Mae rhag wyneb y rhwydwaith wedi ei ffurfweddu eisoes"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19908,27 +20025,27 @@ msgstr ""
 "Gallwch ei wneud gyda llaw ond mae'n rhaid i chi wybod beth ydych yn ei "
 "wneud."
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Ail ffurfweddiad awtomatig"
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "No (experts only)"
 msgstr "Na (arbenigwyr yn unig)"
 
-#: standalone/drakgw:290
+#: standalone/drakgw:298
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Dangoswch y ffurfweddiad rhag wyneb cyfredol"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:299
 #, c-format
 msgid "Current interface configuration"
 msgstr "Ffurfweddiad rhyngwyneb cyfredol"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:300
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19945,7 +20062,7 @@ msgstr ""
 "Priodweddau IP: %s\n"
 "Gyrrwr: %s"
 
-#: standalone/drakgw:305
+#: standalone/drakgw:313
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19971,12 +20088,12 @@ msgstr ""
 "Neu, medraf ail ffurfweddu eich rhag wyneb ac (ail)ffurfweddi gweinydd DHCP "
 "ar eich cyfer.\n"
 
-#: standalone/drakgw:312
+#: standalone/drakgw:320
 #, c-format
 msgid "Local Network adress"
 msgstr "Cyfeiriad y Rhwydwaith Lleol "
 
-#: standalone/drakgw:316
+#: standalone/drakgw:324
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -19989,73 +20106,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:320
+#: standalone/drakgw:328
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "Gweinydd DHCP IP (Hwn)"
 
-#: standalone/drakgw:321
+#: standalone/drakgw:329
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Y Gweinydd DHCP IP"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:330
 #, c-format
 msgid "The internal domain name"
 msgstr "Enw'r parth mewnol"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP start range"
 msgstr "Amrediad cychwyn DHCP"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:332
 #, c-format
 msgid "The DHCP end range"
 msgstr "Amrediad terfyn DHCP"
 
-#: standalone/drakgw:325
+#: standalone/drakgw:333
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Les rhagosodedig (mewn eiliadau)"
 
-#: standalone/drakgw:326
+#: standalone/drakgw:334
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Les fwyaf (mewn eiliadau)"
 
-#: standalone/drakgw:327
+#: standalone/drakgw:335
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Ail ffurfweddi rhag wyneb a gweinydd DHCP"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:342
 #, 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:344
+#: standalone/drakgw:352
 #, 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:354
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring..."
 msgstr "Ffurfweddu..."
 
-#: standalone/drakgw:355
+#: standalone/drakgw:363
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Ffurfweddi sgriptiau, gosod meddalwedd, cychwyn gweinyddion..."
 
-#: standalone/drakgw:391 standalone/drakpxe:231 standalone/drakvpn:274
+#: standalone/drakgw:399 standalone/drakpxe:231 standalone/drakvpn:276
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Anhawster wrth osod pecyn %s"
 
-#: standalone/drakgw:584
+#: standalone/drakgw:595
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20145,7 +20262,7 @@ msgstr "Gosodiadau addasu a system"
 msgid "Editable"
 msgstr "Golygadwy"
 
-#: standalone/drakperm:48 standalone/drakperm:315
+#: standalone/drakperm:48 standalone/drakperm:314
 #, c-format
 msgid "Path"
 msgstr "Llwybr"
@@ -20160,7 +20277,7 @@ msgstr "Defnyddiwr"
 msgid "Group"
 msgstr "Grwp"
 
-#: standalone/drakperm:48 standalone/drakperm:327
+#: standalone/drakperm:48 standalone/drakperm:326
 #, c-format
 msgid "Permissions"
 msgstr "Caniatadau"
@@ -20221,7 +20338,8 @@ msgstr "Ychwanegu rheol newydd ar y diwedd"
 msgid "Delete selected rule"
 msgstr "Dileu'r rheol hwn"
 
-#: standalone/drakperm:125 standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
+#: standalone/drakups:350 standalone/drakvpn:331 standalone/drakvpn:692
 #: standalone/printerdrake:229
 #, c-format
 msgid "Edit"
@@ -20322,12 +20440,12 @@ msgstr "Derbyn presennol"
 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:301
+#: standalone/drakperm:300
 #, c-format
 msgid "Path selection"
 msgstr "Dewis llwybr"
 
-#: standalone/drakperm:321
+#: standalone/drakperm:320
 #, c-format
 msgid "Property"
 msgstr "Eiddo"
@@ -20464,7 +20582,7 @@ msgstr "ALL"
 msgid "LOCAL"
 msgstr "LOCAL"
 
-#: standalone/draksec:44
+#: standalone/draksec:44 standalone/drakvpn:1144
 #, c-format
 msgid "default"
 msgstr "rhagosodedig"
@@ -20484,7 +20602,7 @@ msgstr "na"
 msgid "yes"
 msgstr "iawn"
 
-#: standalone/draksec:70
+#: standalone/draksec:81
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
@@ -20577,32 +20695,32 @@ msgstr ""
 "blaenorol ond mae'r\n"
 "system yn hollol gaeëdig ac mae'r nodfwediddion diogelwch ar eu heithaf."
 
-#: standalone/draksec:118
+#: standalone/draksec:129
 #, c-format
 msgid "(default value: %s)"
 msgstr "(gwerth rhagosodedig: %s)"
 
-#: standalone/draksec:159
+#: standalone/draksec:170
 #, c-format
 msgid "Security Level:"
 msgstr "Lefel diogelwch:"
 
-#: standalone/draksec:162
+#: standalone/draksec:173
 #, c-format
 msgid "Security Alerts:"
 msgstr "Rhybuddion Diogelwch:"
 
-#: standalone/draksec:166
+#: standalone/draksec:177
 #, c-format
 msgid "Security Administrator:"
 msgstr "Gweinyddwr Diogelwch:"
 
-#: standalone/draksec:168
+#: standalone/draksec:179
 #, c-format
 msgid "Basic options"
 msgstr "Dewisiadau Sylfaenol"
 
-#: standalone/draksec:181
+#: standalone/draksec:192
 #, c-format
 msgid ""
 "The following options can be set to customize your\n"
@@ -20611,27 +20729,27 @@ msgstr ""
 "Mae modd gosod y dewisiadau canlynol i addasu\n"
 "diogelwch eich system. Os oes arnoch esboniadau, cliciwch ar cymorth.\n"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "Network Options"
 msgstr "Dewisiadau Rhwydwaith"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "System Options"
 msgstr "Dewisiadau System"
 
-#: standalone/draksec:229
+#: standalone/draksec:240
 #, c-format
 msgid "Periodic Checks"
 msgstr "Gwirydd Cyfnodol"
 
-#: standalone/draksec:247
+#: standalone/draksec:258
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Arhoswch, gosod lefel diogelwch..."
 
-#: standalone/draksec:253
+#: standalone/draksec:264
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Arhoswch, gosod dewisiadau diogelwch..."
@@ -20686,37 +20804,37 @@ msgstr ""
 "i weithio'n iawn mae angen 'ImageMagick' i gwblhau'r ffurfweddiad.\n"
 "Cliciwch \"Iawn\" i osod 'Image Magick' neu \"Diddymu\" i orffen"
 
-#: standalone/draksplash:67
+#: standalone/draksplash:68
 #, c-format
 msgid "first step creation"
 msgstr "creu'r cam cyntaf"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:71
 #, c-format
 msgid "final resolution"
 msgstr "cydraniad terfynol"
 
-#: standalone/draksplash:71 standalone/draksplash:165
+#: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
 msgstr "dewis ffeil delwedd"
 
-#: standalone/draksplash:72
+#: standalone/draksplash:73
 #, c-format
 msgid "Theme name"
 msgstr "Enw Thema"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:78
 #, c-format
 msgid "Browse"
 msgstr "Pori"
 
-#: standalone/draksplash:87 standalone/draksplash:153
+#: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
 msgstr "Ffurfweddu llun croeso cychwyn"
 
-#: standalone/draksplash:90
+#: standalone/draksplash:96
 #, c-format
 msgid ""
 "x coordinate of text box\n"
@@ -20725,7 +20843,7 @@ msgstr ""
 "blwch testun cydfesuryn x\n"
 "mewn rhif nodau"
 
-#: standalone/draksplash:91
+#: standalone/draksplash:97
 #, c-format
 msgid ""
 "y coordinate of text box\n"
@@ -20734,17 +20852,17 @@ msgstr ""
 "blwch testun cydfesuryn y\n"
 "mewn rhif nodau"
 
-#: standalone/draksplash:92
+#: standalone/draksplash:98
 #, c-format
 msgid "text width"
 msgstr "lled testun"
 
-#: standalone/draksplash:93
+#: standalone/draksplash:99
 #, c-format
 msgid "text box height"
 msgstr "uchder blwch testun"
 
-#: standalone/draksplash:94
+#: standalone/draksplash:100
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
@@ -20753,7 +20871,7 @@ msgstr ""
 "bar cynnydd cydfesuryn x\n"
 "yn ei gornel uchaf chwith"
 
-#: standalone/draksplash:95
+#: standalone/draksplash:101
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
@@ -20762,99 +20880,262 @@ msgstr ""
 "bar cynnydd cydfesuryn y\n"
 "yn ei gornel uchaf chwith"
 
-#: standalone/draksplash:96
+#: standalone/draksplash:102
 #, c-format
 msgid "the width of the progress bar"
 msgstr "lled y bar cynnydd"
 
-#: standalone/draksplash:97
+#: standalone/draksplash:103
 #, c-format
 msgid "the height of the progress bar"
 msgstr "uchder y bar cynnydd"
 
-#: standalone/draksplash:98
+#: standalone/draksplash:104
 #, c-format
 msgid "the color of the progress bar"
 msgstr "lliw'r bar cynnydd"
 
-#: standalone/draksplash:113
+#: standalone/draksplash:119
 #, c-format
 msgid "Preview"
 msgstr "rhagolwg"
 
-#: standalone/draksplash:115
+#: standalone/draksplash:121
 #, c-format
 msgid "Save theme"
 msgstr "cadw thema"
 
-#: standalone/draksplash:116
+#: standalone/draksplash:122
 #, c-format
 msgid "Choose color"
 msgstr "dewis lliw"
 
-#: standalone/draksplash:119
+#: standalone/draksplash:125
 #, c-format
 msgid "Display logo on Console"
 msgstr "Arddangos logo yn y Consol"
 
-#: standalone/draksplash:120
+#: standalone/draksplash:126
 #, c-format
 msgid "Make kernel message quiet by default"
 msgstr "Gwneud neges y cnewyllyn yn dawel drwy ragosodiad"
 
-#: standalone/draksplash:156 standalone/draksplash:320
-#: standalone/draksplash:448
+#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:462
 #, c-format
 msgid "Notice"
 msgstr "Nodyn"
 
-#: standalone/draksplash:156 standalone/draksplash:320
+#: standalone/draksplash:161 standalone/draksplash:319
 #, c-format
 msgid "This theme does not yet have a bootsplash in %s !"
 msgstr "Does gan y thema ddim croeso cychwyn yn %s !"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:167
 #, c-format
 msgid "choose image"
 msgstr "dewis ymyl"
 
-#: standalone/draksplash:204
+#: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "cadw thema Croeso cychwyn..."
 
-#: standalone/draksplash:428
+#: standalone/draksplash:443
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Dewis lliw ProgressBar"
 
-#: standalone/draksplash:448
+#: standalone/draksplash:462
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Rhaid dewis ffeil delwedd yn gyntaf!"
 
-#: standalone/draksplash:453
+#: standalone/draksplash:467
 #, c-format
 msgid "Generating preview ..."
 msgstr "Cynhyrchu rhagolwg..."
 
-#: standalone/draksplash:499
+#: standalone/draksplash:512
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s Rhagolwg Croeso Cychwyn (%s)"
 
-#: standalone/drakvpn:71
+#: standalone/drakups:63
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr ""
+
+#: standalone/drakups:69
 #, fuzzy, c-format
-msgid "DrakVPN"
+msgid "Add an UPS device"
+msgstr "Ychwanegu eitem"
+
+#: standalone/drakups:72
+#, fuzzy, c-format
+msgid ""
+"Welcome to the UPS configuration utility.\n"
+"\n"
+"Here, you'll be add a new UPS to your system.\n"
+msgstr ""
+"Croeso i'r gwasanaeth ffurfweddu e-bost\n"
+"\n"
+"Yma bydd modd i chi osod y system rhybuddio.\n"
+
+#: standalone/drakups:79
+#, c-format
+msgid ""
+"We're going to add an UPS device.\n"
+"\n"
+"Do you prefer autodetect UPS devices connected to this machine or  ?"
+msgstr ""
+
+#: standalone/drakups:82
+#, fuzzy, c-format
+msgid "Autodetection"
+msgstr "Awtoganfod"
+
+#: standalone/drakups:90 standalone/harddrake2:134
+#, c-format
+msgid "Detection in progress"
+msgstr "Canfod ar waith"
+
+#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
+#: standalone/logdrake:485
+#, c-format
+msgid "Congratulations"
+msgstr "Llongyfarchiadau"
+
+#: standalone/drakups:109
+#, fuzzy, c-format
+msgid "The wizard successfully added the following UPS devices:"
+msgstr "Mae'r dewin wedi ffurfweddu'r rhybudd e-bost yn llwyddiannus."
+
+#: standalone/drakups:111
+#, fuzzy, c-format
+msgid "No new UPS devices was found"
+msgstr "Heb ganfod dyfais"
+
+#: standalone/drakups:116 standalone/drakups:128
+#, fuzzy, c-format
+msgid "UPS driver configuration"
+msgstr "Ffurfweddiad argraffydd CUPS "
+
+#: standalone/drakups:116
+#, fuzzy, c-format
+msgid "Please select your UPS model."
+msgstr "Profwch y llygoden"
+
+#: standalone/drakups:117
+#, fuzzy, c-format
+msgid "Manufacturer / Model:"
+msgstr "Gwneuthurwr yr argraffydd, model"
+
+#: standalone/drakups:128
+#, c-format
+msgid ""
+"We are configuring the \"%s\" UPS from \"%s\".\n"
+"Please fill in its name, its driver and its port."
+msgstr ""
+
+#: standalone/drakups:133
+#, c-format
+msgid "Name:"
+msgstr "Enw:"
+
+#: standalone/drakups:133
+#, fuzzy, c-format
+msgid "The name of your ups"
+msgstr "enw'r prosesydd"
+
+#: standalone/drakups:134
+#, c-format
+msgid "The driver that manage your ups"
+msgstr ""
+
+#: standalone/drakups:135
+#, c-format
+msgid "Port:"
+msgstr "Porth :"
+
+#: standalone/drakups:137
+#, fuzzy, c-format
+msgid "The port on which is connected your ups"
+msgstr "y math o fws mae eich llygoden wedi cysylltu iddi"
+
+#: standalone/drakups:144
+#, fuzzy, c-format
+msgid "The wizard successfully configured the new \"%s\" UPS device."
+msgstr "Mae'r dewin wedi ffurfweddu'r rhybudd e-bost yn llwyddiannus."
+
+#: standalone/drakups:232
+#, fuzzy, c-format
+msgid "UPS devices"
+msgstr "Gwasanaethau"
+
+#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
+#: standalone/harddrake2:63
+#, c-format
+msgid "Name"
+msgstr "Enw"
+
+#: standalone/drakups:250
+#, fuzzy, c-format
+msgid "UPS users"
+msgstr "Defnyddwyr"
+
+#: standalone/drakups:265
+#, fuzzy, c-format
+msgid "Access Control Lists"
+msgstr "mynediad i offer rhwydwaith"
+
+#: standalone/drakups:266
+#, c-format
+msgid "IP mask"
+msgstr "Masg IP"
+
+#: standalone/drakups:277
+#, fuzzy, c-format
+msgid "Rules"
+msgstr "Llwybryddion:"
+
+#: standalone/drakups:278
+#, fuzzy, c-format
+msgid "Action"
+msgstr "/_Gweithredoedd"
+
+#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#, c-format
+msgid "Level"
+msgstr "Lefel"
+
+#: standalone/drakups:278
+#, c-format
+msgid "ACL name"
+msgstr "Enw ACL"
+
+#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#, c-format
+msgid "DrakUPS"
 msgstr "DrakUPS"
 
-#: standalone/drakvpn:93
+#: standalone/drakups:307
 #, fuzzy, c-format
+msgid "Welcome to the UPS configuration tools"
+msgstr "Prawf o'r ffurfweddiad"
+
+#: standalone/drakvpn:71
+#, c-format
+msgid "DrakVPN"
+msgstr "DrakVPN"
+
+#: standalone/drakvpn:93
+#, c-format
 msgid "The VPN connection is enabled."
-msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi."
+msgstr "Mae cyswllt VPN wedi ei alluogi"
 
 #: standalone/drakvpn:94
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
 "\n"
@@ -20862,28 +21143,29 @@ msgid ""
 "\n"
 "What would you like to do ?"
 msgstr ""
-"Mae gosodiad Rhannu Cysylltiad a'r Rhyngrwyd wedi ei gyflawni. \n"
+"Mae gosodiad VPN wedi ei gyflawni.\n"
+"\n"
 "Mae wedi ei alluogi. \n"
 "\n"
 "Beth hoffech ei wneud?"
 
 #: standalone/drakvpn:103
-#, fuzzy, c-format
+#, c-format
 msgid "Disabling VPN..."
-msgstr "Analluogi gweinyddion..."
+msgstr "Analluogi VPN..."
 
 #: standalone/drakvpn:112
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is now disabled."
-msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei analluogi."
+msgstr "Mae cyswllt VPN wedi ei analluogi."
 
 #: standalone/drakvpn:119
-#, fuzzy, c-format
+#, c-format
 msgid "VPN connection currently disabled"
-msgstr "Mae Rhannu Cysylltiad a'r Rhyngrwyd wedi ei analluogi"
+msgstr "Mae cyswllt VPN wedi ei analluogi"
 
 #: standalone/drakvpn:120
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The setup of a VPN connection has already been done.\n"
 "\n"
@@ -20891,25 +21173,26 @@ msgid ""
 "\n"
 "What would you like to do ?"
 msgstr ""
-"Mae gosodiad rhannu cysylltiad a'r Rhyngrwyd wedi ei gyflawni. \n"
+"Mae gosodiad cyswllt VPN wedi ei gyflawni.\n"
+"\n"
 "Mae wedi ei analluogi. \n"
 "\n"
 "Beth hoffech ei wneud?"
 
 #: standalone/drakvpn:133
-#, fuzzy, c-format
+#, c-format
 msgid "Enabling VPN..."
-msgstr "Galluogi gweinyddion..."
+msgstr "Galluogi VPN..."
 
 #: standalone/drakvpn:139
-#, fuzzy, c-format
+#, c-format
 msgid "The VPN connection is now enabled."
-msgstr "Mae Rhannu Cysylltiad â'r Rhyngrwyd wedi ei alluogi."
+msgstr "Mae cyswllt VPN wedi ei alluogi."
 
-#: standalone/drakvpn:153 standalone/drakvpn:179
+#: standalone/drakvpn:153 standalone/drakvpn:181
 #, c-format
 msgid "Simple VPN setup."
-msgstr ""
+msgstr "Gosodiad VPN syml."
 
 #: standalone/drakvpn:154
 #, c-format
@@ -20926,8 +21209,19 @@ msgid ""
 "Make sure you have configured your Network/Internet access using\n"
 "drakconnect before going any further."
 msgstr ""
+"Rydych ar fin ffurfweddu eich cyfrifiadur i ddefnyddio cysylltiad VPN.\n"
+"\n"
+"Gyda'r nodwedd yma, mae cyfrifiaduron ar eich rhwydwaith breifat leol\n"
+"a chyfrifiaduron ar rhwydweithiau preifat pell yn gallu rhannu adnoddau,\n"
+"drwy eu muriau cadarn, dros y rhyngrwyd, mew dull diogel.\n"
+"\n"
+"Mae'r cyfathrebu ar draws y we wedi ei amgryptio. Mae'r cyfrifiaduron\n"
+"lleol a phell yn edrych fel petaent ar yr un rhwydwaith.\n"
+"\n"
+"Gwnewch yn siwr eich bod wedi ffurfweddu eich mynediad\n"
+"Rhwydwaith/Rhyngrwyd gan ddefnyddio drakaccess cyn mynd ymhellach."
 
-#: standalone/drakvpn:180
+#: standalone/drakvpn:182
 #, c-format
 msgid ""
 "VPN connection.\n"
@@ -20942,13 +21236,24 @@ msgid ""
 "Please read AT LEAST the ipsec-howto docs\n"
 "before going any further."
 msgstr ""
+"Cyswllt VPN.\n"
+"\n"
+"Mae'r rhaglen hon wedi ei seilio ar y projectau canlynol:\n"
+" - FreeSwan: \t\t\thttp://www.freeswan.org/\n"
+" - Super-FreeSwan: \t\thttp://www.freeswan.ca/\n"
+" - ipsec-tools: \t\t\thttp://ipsec-tools.sourceforge.net/\n"
+" - ipsec-howto: \t\thttp://www.ipsec-howto.org\n"
+" - the docs and man pages coming with the %s package\n"
+"\n"
+"Darllennwch O LEIAF dogfennau ipsec-howto\n"
+"cyn mynd ymhellach."
 
-#: standalone/drakvpn:192
-#, fuzzy, c-format
+#: standalone/drakvpn:194
+#, c-format
 msgid "Kernel module."
-msgstr "Tynnu modiwl"
+msgstr "Modiwl cnewyllyn."
 
-#: standalone/drakvpn:193
+#: standalone/drakvpn:195
 #, c-format
 msgid ""
 "The kernel need to have ipsec support.\n"
@@ -20957,23 +21262,28 @@ msgid ""
 "\n"
 "This kernel has '%s' support."
 msgstr ""
+"Rhaid i'r cnewyllyn gael cefnogaeth ipsec.\n"
+"\n"
+"Rydych yn rhedeg fersiwn cnewyllyn %s.\n"
+"\n"
+"Mae gan y cnewyllyn gefnogaeth '%s'."
 
-#: standalone/drakvpn:288
-#, fuzzy, c-format
+#: standalone/drakvpn:290
+#, c-format
 msgid "Security Policies"
-msgstr "Rhybuddion Diogelwch:"
+msgstr "Polisïau Diogelwch"
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, c-format
 msgid "IKE daemon racoon"
-msgstr ""
+msgstr "racoon daemon IKE"
 
-#: standalone/drakvpn:291 standalone/drakvpn:302
-#, fuzzy, c-format
+#: standalone/drakvpn:293 standalone/drakvpn:304
+#, c-format
 msgid "Configuration file"
-msgstr "Ffurfweddiad"
+msgstr "Ffeil ffurfweddiad"
 
-#: standalone/drakvpn:292
+#: standalone/drakvpn:294
 #, c-format
 msgid ""
 "Configuration step !\n"
@@ -20984,8 +21294,15 @@ msgid ""
 "\n"
 "What would you like to configure ?\n"
 msgstr ""
+"Cam ffurfweddu !\n"
+"\n"
+"Rhaid diffinio polisïau ac yna ffurfweddu'r daemon\n"
+"cyfnewid (IKE) allwedd awtomatig. Enw'r daemon KAME\n"
+"IKE rydym yn ei ddefnyddio yw 'racoon'.\n"
+"\n"
+"Beth hoffech chi ei ffurfweddu?\n"
 
-#: standalone/drakvpn:303
+#: standalone/drakvpn:305
 #, c-format
 msgid ""
 "Next, we will configure the %s file.\n"
@@ -20993,13 +21310,17 @@ msgid ""
 "\n"
 "Simply click on Next.\n"
 msgstr ""
+"Newaf byddwn yn ffurfweddu ffeil %s.\n"
+"\n"
+"\n"
+"Cliciwch Nesaf.\n"
 
-#: standalone/drakvpn:321 standalone/drakvpn:681
-#, fuzzy, c-format
+#: standalone/drakvpn:323 standalone/drakvpn:683
+#, c-format
 msgid "%s entries"
-msgstr ", %s sector"
+msgstr "%s cofnod"
 
-#: standalone/drakvpn:322
+#: standalone/drakvpn:324
 #, c-format
 msgid ""
 "The %s file contents\n"
@@ -21012,24 +21333,37 @@ msgid ""
 "\n"
 "What would you like to do ?\n"
 msgstr ""
+"Mae cynnwys ffeil %s\n"
+"wedi ei rannu yn adrannau.\n"
+"\n"
+"Gallwch:\n"
+"\n"
+"  - ddangos, ychwanegu, olygu, neu dynnu adrannau, ac yna\n"
+"  - cyfrannu'r newidiadau\n"
+"\n"
+"Beth hoffech chi ei wneud ?\n"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
-#, fuzzy, c-format
-msgid "Display"
-msgstr "dyddiol"
+#: standalone/drakvpn:331 standalone/drakvpn:692
+#, c-format
+msgid ""
+"_:display here is a verb\n"
+"Display"
+msgstr "Arddangos"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, c-format
 msgid "Commit"
-msgstr ""
+msgstr "Cyflwyno"
 
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705
-#: standalone/drakvpn:709
-#, fuzzy, c-format
-msgid "Display configuration"
-msgstr "Ffurfweddiad ADSL"
+#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
+#: standalone/drakvpn:711
+#, c-format
+msgid ""
+"_:display here is a verb\n"
+"Display configuration"
+msgstr "Dangos ffurfweddiad"
 
-#: standalone/drakvpn:348
+#: standalone/drakvpn:350
 #, c-format
 msgid ""
 "The %s file does not exist.\n"
@@ -21038,13 +21372,18 @@ msgid ""
 "\n"
 "You'll have to go back and choose 'add'.\n"
 msgstr ""
+"Nid yw ffeil %s yn bod.\n"
+"\n"
+"Rhaid mai ffurfweddiad newydd yw hwn.\n"
+"\n"
+"Bydd rhaid mynd yn ôl  a dewis 'ychwanegu'.\n"
 
-#: standalone/drakvpn:364
+#: standalone/drakvpn:366
 #, c-format
 msgid "ipsec.conf entries"
-msgstr ""
+msgstr "cofnodion ipsec.conf"
 
-#: standalone/drakvpn:365
+#: standalone/drakvpn:367
 #, c-format
 msgid ""
 "The %s file contains different sections.\n"
@@ -21058,28 +21397,38 @@ msgid ""
 "\n"
 "Choose the section you would like to add.\n"
 msgstr ""
+"Mae'r ffeil %s yn cynnwys adrannau gwahanol.\n"
+"\n"
+"Dyma'i sgerbwd :\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"
+"\n"
+"Mae modd ychwanegu un o'r adrannau hyn.\n"
+"\n"
+"Dewiswch yr adran i'w hychwnaegu.\n"
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "config setup"
-msgstr "ffurfweddu"
+msgstr "gosodiad ffurfweddu"
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "conn %default"
-msgstr "rhagosodedig"
+msgstr "conn %default"
 
-#: standalone/drakvpn:372
-#, fuzzy, c-format
+#: standalone/drakvpn:374
+#, c-format
 msgid "normal conn"
-msgstr "Modd Arferol"
+msgstr "normal conn"
 
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
-#, fuzzy, c-format
+#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
+#, c-format
 msgid "Exists !"
-msgstr "Gadael"
+msgstr "Yn Bodoli!"
 
-#: standalone/drakvpn:379 standalone/drakvpn:420
+#: standalone/drakvpn:381 standalone/drakvpn:422
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -21088,8 +21437,13 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change its name.\n"
 msgstr ""
+"Mae adran gyda'r ewn hwn yn bodoli eisoes.\n"
+"Rhaid i enw'r adrannau fod yn unigryw.\n"
+"\n"
+"Rhaid i chi fynd yn ôl ac ychwanegu adran arall\n"
+"neu newid ei enw.\n"
 
-#: standalone/drakvpn:396
+#: standalone/drakvpn:398
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -21100,38 +21454,45 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Rhaid i'r adran hon fod ar frig eich ffeil %s.\n"
+"\n"
+"\n"
+"Gwnewch yn siwr fod yr adrannau eraill yn dilyn\n"
+"yr adran ffurfweddu.\n"
+"\n"
+"Dewiswch parhau neu nôl ar ôl gorffen.\n"
 
-#: standalone/drakvpn:401
-#, fuzzy, c-format
+#: standalone/drakvpn:403
+#, c-format
 msgid "interfaces"
-msgstr "Rhyngwyneb"
+msgstr "rhyngwyneb"
 
-#: standalone/drakvpn:402
+#: standalone/drakvpn:404
 #, c-format
 msgid "klipsdebug"
-msgstr ""
+msgstr "klipsdebug"
 
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
 #, c-format
 msgid "plutodebug"
-msgstr ""
+msgstr "plutodebug"
 
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
 #, c-format
 msgid "plutoload"
-msgstr ""
+msgstr "plutoload"
 
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
 #, c-format
 msgid "plutostart"
-msgstr ""
+msgstr "plutostart"
 
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
 #, c-format
 msgid "uniqueids"
-msgstr ""
+msgstr "uniqueids"
 
-#: standalone/drakvpn:440
+#: standalone/drakvpn:442
 #, c-format
 msgid ""
 "This is the first section after the config\n"
@@ -21143,53 +21504,61 @@ msgid ""
 "them here, globally, you can define them in each\n"
 "section.\n"
 msgstr ""
+"Dyma'r adran gyntaf wedi'r un ffurfweddu'r\n"
+"gosod.\n"
+"\n"
+"Yma cewch ddiffinio'r gosodiadau rhagosodedig.\n"
+"Bydd yr adranau eraill yn dilyn hyn.\n"
+"Mae'r gosodiadau ar y chwith yn ddewisol.\n"
+"Os nad ydych am eu diffinio'n eang yma,\n"
+"cewch eu diffinio ym mhob adran.\n"
 
-#: standalone/drakvpn:447
+#: standalone/drakvpn:449
 #, c-format
-msgid "pfs"
-msgstr ""
+msgid "PFS"
+msgstr "PFS"
 
-#: standalone/drakvpn:448
+#: standalone/drakvpn:450
 #, c-format
 msgid "keyingtries"
-msgstr ""
+msgstr "keyingtries"
 
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
 #, c-format
 msgid "compress"
-msgstr ""
+msgstr "compress"
 
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
 #, c-format
 msgid "disablearrivalcheck"
-msgstr ""
+msgstr "disablearrivalcheck"
 
-#: standalone/drakvpn:451 standalone/drakvpn:490
-#, fuzzy, c-format
+#: standalone/drakvpn:453 standalone/drakvpn:492
+#, c-format
 msgid "left"
-msgstr "Dileu"
+msgstr "chwith"
 
-#: standalone/drakvpn:452 standalone/drakvpn:491
+#: standalone/drakvpn:454 standalone/drakvpn:493
 #, c-format
 msgid "leftcert"
-msgstr ""
+msgstr "leftcert"
 
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
 #, c-format
 msgid "leftrsasigkey"
-msgstr ""
+msgstr "leftrsasigkey"
 
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
 msgid "leftsubnet"
-msgstr ""
+msgstr "leftsubnet"
 
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
 #, c-format
 msgid "leftnexthop"
-msgstr ""
+msgstr "leftnexthop"
 
-#: standalone/drakvpn:484
+#: standalone/drakvpn:486
 #, c-format
 msgid ""
 "Your %s file has several sections, or connections.\n"
@@ -21197,48 +21566,52 @@ msgid ""
 "You can now add a new section.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Mae i'r ffeil %s nifer o adrannau, neu gysylltiadau.\n"
+"\n"
+"Cewch ychwanegu adran newydd yn awr.\n"
+"Dewiswch parhau wedi I chi orffen i ysgrifennu at y data.\n"
 
-#: standalone/drakvpn:487
-#, fuzzy, c-format
+#: standalone/drakvpn:489
+#, c-format
 msgid "section name"
-msgstr "Enw'r cysylltiad"
+msgstr "enw'r adran"
 
-#: standalone/drakvpn:488
-#, fuzzy, c-format
+#: standalone/drakvpn:490
+#, c-format
 msgid "authby"
-msgstr "Llwybr"
+msgstr "authby"
 
-#: standalone/drakvpn:489
-#, fuzzy, c-format
+#: standalone/drakvpn:491
+#, c-format
 msgid "auto"
-msgstr "Awtomatig"
+msgstr "awtomatig"
 
-#: standalone/drakvpn:495
-#, fuzzy, c-format
+#: standalone/drakvpn:497
+#, c-format
 msgid "right"
-msgstr "Uchel"
+msgstr "de"
 
-#: standalone/drakvpn:496
-#, fuzzy, c-format
+#: standalone/drakvpn:498
+#, c-format
 msgid "rightcert"
-msgstr "Uwch"
+msgstr "rightcert"
 
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
 #, c-format
 msgid "rightrsasigkey"
-msgstr ""
+msgstr "rightrsasigkey"
 
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
 #, c-format
 msgid "rightsubnet"
-msgstr ""
+msgstr "rightsubnet"
 
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
 #, c-format
 msgid "rightnexthop"
-msgstr ""
+msgstr "rightnexthop"
 
-#: standalone/drakvpn:507
+#: standalone/drakvpn:509
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -21247,8 +21620,13 @@ msgid ""
 "You'll have to go back and add another section\n"
 "or change the name of the section.\n"
 msgstr ""
+"Mae adran gyda'r enw yma'n bod eisoes.\n"
+"Rhaid i enwau'r adrannau fod yn unigryw.\n"
+"\n"
+"Rhaid i chi fynd yn ôl ac ychwanegu adran arall\n"
+"neu newid enw'r adran.\n"
 
-#: standalone/drakvpn:539
+#: standalone/drakvpn:541
 #, c-format
 msgid ""
 "Add a Security Policy.\n"
@@ -21257,13 +21635,18 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Ychwanegu Polisi Diogelwch.\n"
+"\n"
+"Cewch ychwanegu Polisi Diogelwch.\n"
+"\n"
+"Dewiswch parhau pan fyddwch wedi ysgrifenu'r data.\n"
 
-#: standalone/drakvpn:572 standalone/drakvpn:822
-#, fuzzy, c-format
+#: standalone/drakvpn:574 standalone/drakvpn:824
+#, c-format
 msgid "Edit section"
-msgstr "Dewis llwybr"
+msgstr "Golygu adran"
 
-#: standalone/drakvpn:573
+#: standalone/drakvpn:575
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21271,19 +21654,23 @@ msgid ""
 "You can choose here below the one you want to edit \n"
 "and then click on next.\n"
 msgstr ""
+"Mae gan eich ffeil %s nifer o adrannau neu gysylltiadau.\n"
+"\n"
+"Gallwch ddewis yr un i'w olygu ac yna cchilicio nesaf\n"
+"\n"
 
-#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827
-#: standalone/drakvpn:873
-#, fuzzy, c-format
+#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
+#: standalone/drakvpn:875
+#, c-format
 msgid "Section names"
-msgstr "Enw'r cysylltiad"
+msgstr "Enw'r adran"
 
-#: standalone/drakvpn:586
-#, fuzzy, c-format
+#: standalone/drakvpn:588
+#, c-format
 msgid "Can't edit !"
-msgstr "Methu agor %s!"
+msgstr "Methu golygu!"
 
-#: standalone/drakvpn:587
+#: standalone/drakvpn:589
 #, c-format
 msgid ""
 "You cannot edit this section.\n"
@@ -21293,8 +21680,14 @@ msgid ""
 "of the %s file, and eventually, disable or\n"
 "enable the oportunistic encryption.\n"
 msgstr ""
+"Nid oes modd golygu'r adran hon.\n"
+"\n"
+"Mae'r adran yn orfodol ar gyfer Freswan 2X.\n"
+"Rhaid pennu fersiwn 2.0 ar ben ffeil %s ac yn\n"
+"y diwedd, anablu neu alluogu amgryptiad cyfle.\n"
+"\n"
 
-#: standalone/drakvpn:596
+#: standalone/drakvpn:598
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21302,8 +21695,12 @@ msgid ""
 "You can now edit the config setup section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Mae gan eich ffeil %s nifer o adrannau.\n"
+"\n"
+"Mae modd golygu gosodiad adranconfig.\n"
+"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
 
-#: standalone/drakvpn:607
+#: standalone/drakvpn:609
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21311,8 +21708,12 @@ msgid ""
 "You can now edit the default section entries.\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Mae gan eich ffeil %s nifer o adranau neu gysylltiadau.\n"
+"\n"
+"Mae modd i chi nawr olygu cofnodion adran rhagosodedig\n"
+"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
 
-#: standalone/drakvpn:620
+#: standalone/drakvpn:622
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21321,8 +21722,12 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Mae gan eich ffeil %s nifer o adranau neu gysylltiadau.\n"
+"\n"
+"Mae modd i chi nawr olygu cofnodion adran rhagosodedig\n"
+"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
 
-#: standalone/drakvpn:641
+#: standalone/drakvpn:643
 #, c-format
 msgid ""
 "Edit a Security Policy.\n"
@@ -21331,13 +21736,18 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Golygu'r Polisi Diogelwch.\n"
+"\n"
+"Mae modd ychwanegu Polisi Diogelwch.\n"
+"\n"
+"Dewiswch parhau wedi i chi orffen ysgrifennu'r data\n"
 
-#: standalone/drakvpn:652 standalone/drakvpn:869
-#, fuzzy, c-format
+#: standalone/drakvpn:654 standalone/drakvpn:871
+#, c-format
 msgid "Remove section"
-msgstr "Rhestr Tynnu"
+msgstr "Tynnu adran"
 
-#: standalone/drakvpn:653 standalone/drakvpn:870
+#: standalone/drakvpn:655 standalone/drakvpn:872
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21345,8 +21755,12 @@ msgid ""
 "You can choose here below the one you want to remove\n"
 "and then click on next.\n"
 msgstr ""
+"Mae gan eich ffeil %s nifer o adrannau neu gysylltiadau.\n"
+"\n"
+"Mae modd golygu gosodiad adranconfig.\n"
+"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
 
-#: standalone/drakvpn:682
+#: standalone/drakvpn:684
 #, c-format
 msgid ""
 "The racoon.conf file configuration.\n"
@@ -21359,8 +21773,17 @@ msgid ""
 "  - remove \t\t (remove an existing section)\n"
 "  - commit \t\t (writes the changes to the real file)"
 msgstr ""
+"Ffurfweddiad ffeil racoon.conf.\n"
+"\n"
+"Mae cynnwys yr adran wedi ei rannu'n adranau.\n"
+"Gallwch :\n"
+"  - dangos \t\t (dangos cynnwys y ffeil)\n"
+"  - ychwanegu\t\t\t (ychwanegu adran)\n"
+"  - golygu \t\t\t (newid paramedrau adran presennol)\n"
+"  - tynnu \t\t (tynnu adran presennol)\n"
+"  - cyflwyno \t\t (ysgrifennu'r newidiadau i'r ffeil go iawn)"
 
-#: standalone/drakvpn:710
+#: standalone/drakvpn:712
 #, c-format
 msgid ""
 "The %s file does not exist\n"
@@ -21369,13 +21792,18 @@ msgid ""
 "\n"
 "You'll have to go back and choose configure.\n"
 msgstr ""
+"Nid yw ffeil %s yn bodoli \n"
+"\n"
+"Rhaid mai ffurfweddiad newydd yw hwn.\n"
+"\n"
+"Rhaid myn yn ôl a dewis ffurfweddu.\n"
 
-#: standalone/drakvpn:724
+#: standalone/drakvpn:726
 #, c-format
 msgid "racoonf.conf entries"
-msgstr ""
+msgstr "cofnodion racoonf.conf"
 
-#: standalone/drakvpn:725
+#: standalone/drakvpn:727
 #, c-format
 msgid ""
 "The 'add' sections step.\n"
@@ -21387,23 +21815,31 @@ msgid ""
 "\n"
 "Choose the section you would like to add.\n"
 msgstr ""
+"Cam 'ychwanegu' adran.\n"
+"\n"
+"Dyma sgerbwd ffeil racoon.conf :\n"
+"\t'llwybr'\n"
+"\t'pell'\n"
+"\t'sainfo' \n"
+"\n"
+"Dewiswch yr adran hoffech ei hychwanegu.\n"
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "path"
-msgstr "Llwybr"
+msgstr "llwybr"
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "remote"
-msgstr "Tynnu"
+msgstr "pell"
 
-#: standalone/drakvpn:731
-#, fuzzy, c-format
+#: standalone/drakvpn:733
+#, c-format
 msgid "sainfo"
-msgstr "Sbaeneg"
+msgstr "sainfo"
 
-#: standalone/drakvpn:739
+#: standalone/drakvpn:741
 #, c-format
 msgid ""
 "The 'add path' section step.\n"
@@ -21412,13 +21848,18 @@ msgid ""
 "\n"
 "Put your mouse over the certificate entry to obtain online help."
 msgstr ""
+"Cam adran 'ychwanegu llwybr'.\n"
+"\n"
+"Rhaid i'r adran llwybr fod ar frig eich ffeil racoon.conf.\n"
+"\n"
+"Rhowch eich llygoden dros y cofnod tystysgrif I gael cymorth ar-lein."
 
-#: standalone/drakvpn:742
-#, fuzzy, c-format
+#: standalone/drakvpn:744
+#, c-format
 msgid "path type"
-msgstr "Newid y math"
+msgstr "math o lwybr"
 
-#: standalone/drakvpn:746
+#: standalone/drakvpn:748
 #, c-format
 msgid ""
 "path include path : specifies a path to include\n"
@@ -21441,13 +21882,33 @@ msgid ""
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
+"llwybr i gynnwys llwybr : pennu llwybr i gynnwys\n"
+"ffeil. Gw. Cynnwys Ffeil.\n"
+"\tE.e.: llwybr yn cynnwys '/etc/racoon'\n"
+"\n"
+"llwybr ffeil pre_shared_key : pennu ffeil yn cynnwys\n"
+"allwedd(i) rhag rannwyd ar gyfer enwau amrywiol. Gw. Ffeil Allwedd Rhag "
+"rannu.\n"
+"\tE.e: llwybr pre_shared_key '/etc/racoon/psk.txt' ;\n"
+"\n"
+"llwybr tystysgrif llwybr : bydd racoon(8) yn chwilio'r cyfeiriadur\n"
+"os oes cais am dystysgrif neu dystysgrif wedi ei dderbyn.\n"
+"\tE.e. : llwybr tystysgrif '/etc/cert' ;\n"
+"\n"
+"Cynnwys Ffeil : cynnwys ffeil \n"
+"cynnwys ffeiliau ffurfweddiad eraill.\n"
+"\tE.e.: cynnwys \"remote.conf\" ;\n"
+"\n"
+"Ffeil Allwedd Rhag rannu : Mae ffeil rhag rannu'n diffinio pâr \n"
+"o ddynodwyr a'r allwedd gudd sy'n cael ei ddefnyddio yn\n"
+"Null dilysu allwedd rhag rannu yn rhan1."
 
-#: standalone/drakvpn:766
-#, fuzzy, c-format
+#: standalone/drakvpn:768 standalone/drakvpn:861
+#, c-format
 msgid "real file"
-msgstr "Dewiswch ffeil"
+msgstr "darllen ffeil"
 
-#: standalone/drakvpn:789
+#: standalone/drakvpn:791
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -21456,8 +21917,13 @@ msgid ""
 "You can now choose the remote settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Gwnewch yn siwr fod gennych adranau llwybr\n"
+"ar frig ffeil racoon.conf.\n"
+"\n"
+"Gallwch ddewis y gosodiadau pell yn awr.\n"
+"Dewiswch parhau neu nôl wedi I chi orffen.\n"
 
-#: standalone/drakvpn:806
+#: standalone/drakvpn:808
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -21466,8 +21932,13 @@ msgid ""
 "You can now choose the sainfo settings.\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Gwnewch yn siwr fod yr adrannau llwybr\n"
+"eisoes ar frig eich ffeil %s.\n"
+"\n"
+"Gallwch nawr ddewis eich gosodiadau sainfo.\n"
+"Dewiswch Parhau neu Blaenorol wedi i chi orffen.\n"
 
-#: standalone/drakvpn:823
+#: standalone/drakvpn:825
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21475,8 +21946,12 @@ msgid ""
 "You can choose here in the list below the one you want\n"
 "to edit and then click on next.\n"
 msgstr ""
+"Mae gan eich ffeil %s nifer o adranau neu gysylltiadau.\n"
+"\n"
+"Mae modd i chi ddewis o'r rhestr yr un i'w\n"
+"olygu a chlicio nesaf.\n"
 
-#: standalone/drakvpn:834
+#: standalone/drakvpn:836
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21486,8 +21961,14 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
+"Mae gan eich ffeil %s nifer o adrannau.\n"
+"\n"
+"\n"
+"Mae modd golygu cofnodion yr adrannau pell.\n"
+"\n"
+"Dewiswch parhau wedi i chi orffen ysgrifennu'r data.\n"
 
-#: standalone/drakvpn:843
+#: standalone/drakvpn:845
 #, c-format
 msgid ""
 "Your %s file has several sections.\n"
@@ -21496,8 +21977,14 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data."
 msgstr ""
+"Mae gan eich ffeil %s nifer o adrannau.\n"
+"\n"
+"\n"
+"Mae modd golygu cofnodion yr adrannau pell.\n"
+"\n"
+"Dewiswch parhau wedi i chi orffen ysgrifennu'r data."
 
-#: standalone/drakvpn:851
+#: standalone/drakvpn:853
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -21510,18 +21997,22 @@ msgid ""
 "\n"
 "Choose continue or previous when you are done.\n"
 msgstr ""
+"Rhaid i'r adran hon fod ar frig eich\n"
+"ffeil %s.\n"
+"\n"
+"Gwnewch yn siwr fod yr holl adrannau eraill yn dilyn\n"
+"yr adrannau llwybr hyn.\n"
+"\n"
+"Gallwch olygu'r cofnodion llwybr.\n"
+"\n"
+"Dewiswch parhau neu nôl wedi i chi orffen.\n"
 
-#: standalone/drakvpn:858
+#: standalone/drakvpn:860
 #, c-format
 msgid "path_type"
-msgstr ""
+msgstr "path_type"
 
-#: standalone/drakvpn:859
-#, fuzzy, c-format
-msgid "real_file"
-msgstr "Dewiswch ffeil"
-
-#: standalone/drakvpn:899
+#: standalone/drakvpn:901
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -21532,13 +22023,20 @@ msgid ""
 "You should make sure that that the tunnels shorewall\n"
 "section is configured."
 msgstr ""
+"Mae popeth wedi ei ffurfweddu.\n"
+"\n"
+"Cewch rannu adnoddau ar draws y Rhyngrwyd.\n"
+"mewn modd diogel, gan ddefnyddio cysylltiad VPN.\n"
+"\n"
+"Rhaid gwneud yn siwr fod yr adran twnel Shorewall\n"
+"wedi ei ffurfweddu."
 
-#: standalone/drakvpn:919
+#: standalone/drakvpn:921
 #, c-format
 msgid "Sainfo source address"
-msgstr ""
+msgstr "Cyfeiriad ffynhonnell sainfo"
 
-#: standalone/drakvpn:920
+#: standalone/drakvpn:922
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21560,13 +22058,31 @@ msgid ""
 "sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
 "\t172.16.1.0/24 is the source address"
 msgstr ""
+"sainfo (source_id destination_id | anonymous) { statements }\n"
+"diffinio'r paramedrau rhan 2 IKE\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"adeiladu source_id ac destination_id fel:\n"
+"\n"
+"\tcyfeiriad cyfeiriad [/ prefix] [[port]] ul_proto\n"
+"\n"
+"E.e. : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tgadael y cofnod yn wag os ydych am fod yn anhysbys\n"
+"\n"
+"cyfeiriad sainfo 203.178.141.209 unrhyw gyfeiriad 203.178.141.218\n"
+"\t203.178.141.209 yw cyfeiriad y ffynhonnell\n"
+"\n"
+"cyfeiriad address 172.16.1.0/24 unrhyw gyfeiriad 172.16.2.0/24 \n"
+"\t172.16.1.0/24 yw cyfeiriad y ffynhonnell"
 
-#: standalone/drakvpn:937
-#, fuzzy, c-format
+#: standalone/drakvpn:939
+#, c-format
 msgid "Sainfo source protocol"
-msgstr "Protocol Ewropeaidd"
+msgstr "Protocol ffynhonnell sainfo"
 
-#: standalone/drakvpn:938
+#: standalone/drakvpn:940
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21585,13 +22101,28 @@ msgid ""
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
 "\tthe first 'any' allows any protocol for the source"
 msgstr ""
+"sainfo (source_id destination_id | anonymous) { statements }\n"
+"diffinio'r paramedrau rhan 2 IKE\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"adeiladu source_id ac destination_id fel:\n"
+"\n"
+"\tcyfeiriad cyfeiriad [/ prefix] [[port]] ul_proto\n"
+"\n"
+"E.e. : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tgadael y cofnod yn wag os ydych am fod yn anhysbys\n"
+"\n"
+"cyfeiriad sainfo 203.178.141.209 unrhyw gyfeiriad 203.178.141.218\n"
+"\t203.178.141.209 yw cyfeiriad y ffynhonnell"
 
-#: standalone/drakvpn:952
+#: standalone/drakvpn:954
 #, c-format
 msgid "Sainfo destination address"
-msgstr ""
+msgstr "Cyfeiriad cyrchfan sainfo"
 
-#: standalone/drakvpn:953
+#: standalone/drakvpn:955
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21613,13 +22144,31 @@ msgid ""
 "sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
 "\t172.16.2.0/24 is the destination address"
 msgstr ""
+"sainfo (source_id destination_id | anonymous) { statements }\n"
+"diffinio'r paramedrau rhan 2 IKE\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"adeiladu source_id ac destination_id fel:\n"
+"\n"
+"\tcyfeiriad cyfeiriad [/ prefix] [[port]] ul_proto\n"
+"\n"
+"E.e. : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tgadael y cofnod yn wag os ydych am fod yn anhysbys\n"
+"\n"
+"cyfeiriad sainfo 203.178.141.209 unrhyw gyfeiriad 203.178.141.218\n"
+"\t203.178.141.218 yw cyfeiriad y cyrchfan\n"
+"\n"
+"cyfeiriad address 172.16.1.0/24 unrhyw gyfeiriad 172.16.2.0/24 \n"
+"\t172.16.1.0/24 yw cyfeiriad y ffynhonnell"
 
-#: standalone/drakvpn:970
-#, fuzzy, c-format
+#: standalone/drakvpn:972
+#, c-format
 msgid "Sainfo destination protocol"
-msgstr "Offeryn Trosglwyddo o Windows"
+msgstr "Protocol cyrchfan sainfo"
 
-#: standalone/drakvpn:971
+#: standalone/drakvpn:973
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21638,13 +22187,28 @@ msgid ""
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
 "\tthe last 'any' allows any protocol for the destination"
 msgstr ""
+"sainfo (source_id destination_id | anonymous) { statements }\n"
+"diffinio'r paramedrau rhan 2 IKE\n"
+"(IPsec-SA establishment).\n"
+"\n"
+"adeiladu source_id ac destination_id fel:\n"
+"\n"
+"\tcyfeiriad cyfeiriad [/ prefix] [[port]] ul_proto\n"
+"\n"
+"E.e. : \n"
+"\n"
+"sainfo anonymous (accepts connections from anywhere)\n"
+"\tgadael y cofnod yn wag os ydych am fod yn anhysbys\n"
+"\n"
+"cyfeiriad sainfo 203.178.141.209 unrhyw gyfeiriad 203.178.141.218\n"
+"\t203.178.141.209 yw cyfeiriad y cyrchfan"
 
-#: standalone/drakvpn:985
+#: standalone/drakvpn:987
 #, c-format
 msgid "PFS group"
-msgstr ""
+msgstr "Grwp PFS"
 
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
 #, c-format
 msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
@@ -21653,13 +22217,18 @@ msgid ""
 "group is one of 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"
+"Os nad ydych angen PFS yna cewch ymatal rhag y gyfarwyddeb.\n"
+"Bydd unrhyw gynnig yn cael ei dderbyn on na newch chi enwi un.\n"
+"y grwp yn un o'r canlynol: modp768, modp1024, modp1536.\n"
+"Neu mae modd diffinio 1, 2, neu 5 fel rhif grwp DH."
 
-#: standalone/drakvpn:992
-#, fuzzy, c-format
+#: standalone/drakvpn:994
+#, c-format
 msgid "Lifetime number"
-msgstr "rhif"
+msgstr "rhif hyd oes"
 
-#: standalone/drakvpn:993
+#: standalone/drakvpn:995
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21679,13 +22248,29 @@ msgid ""
 "\n"
 "So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
 msgstr ""
+"diffinio hyd oes o amser penodol fydd yn cael ei gynnig\n"
+"wrth negydu rhan 1. Bydd unrhyw gynnig yn cael ei dderbyn\n"
+"ac ni fydd y briodwedd(au)'n cael eu cynnig i'r cyfoed os nad\n"
+"ydynt yn cael eu cynnig.  Mae modd iddynt\n"
+"gael eu henwi yn unigol ym mhob cynnig .\n"
+"\n"
+"Enghreifftiau : \n"
+"\n"
+"        amser hyd oes 1 mun;    # eil,mun,awr\n"
+"        amser hyd oes 1 mun;    # eil,mun,awr\n"
+"        amser hyd oes 30 eil;\n"
+"        amser hyd oes 30 eil;\n"
+"        amser hyd oes 60 eil;\n"
+"\tamser hyd oes 12 awr;\n"
+"\n"
+"Felly, yma rifau hyd oes yw 1, 1, 30, 30, 60 a 12.\n"
 
-#: standalone/drakvpn:1009
+#: standalone/drakvpn:1011
 #, c-format
 msgid "Lifetime unit"
-msgstr ""
+msgstr "Uned hyd oes"
 
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21706,28 +22291,49 @@ msgid ""
 "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
 "'hour'.\n"
 msgstr ""
+"diffinio hyd oes o amser penodol fydd yn cael ei gynnig\n"
+"wrth negydu rhan 1. Bydd unrhyw gynnig yn cael ei dderbyn\n"
+"ac ni fydd y priodwedd(au)'n cael eu cynnig i'r cyfoed os nad\n"
+"ydynt yn cael eu cynnig.  Mae modd iddynt\n"
+"gael eu henwi yn unigol ym mhob cynnig .\n"
+"\n"
+"Enghreifftiau : \n"
+"\n"
+"        amser hyd oes 1 mun;    # eil,mun,awr\n"
+"        amser hyd oes 1 mun;    # eil,mun,awr\n"
+"        amser hyd oes 30 eil;\n"
+"        amser hyd oes 30 eil;\n"
+"        amser hyd oes 60 eil;\n"
+"\tamser hyd oes 12 awr;\n"
+"\n"
+"Felly, yma unedau hyd oes yw 'mun', 'mun', 'eil', 'eil', 'eil' ac 'awr'.\n"
 
-#: standalone/drakvpn:1027 standalone/drakvpn:1112
-#, fuzzy, c-format
+#: standalone/drakvpn:1029 standalone/drakvpn:1114
+#, c-format
 msgid "Encryption algorithm"
-msgstr "dilysu"
+msgstr "Algorithym amgryptio"
 
-#: standalone/drakvpn:1029
-#, fuzzy, c-format
+#: standalone/drakvpn:1031
+#, c-format
 msgid "Authentication algorithm"
-msgstr "dilysu"
+msgstr "Algoritym dilysu"
 
-#: standalone/drakvpn:1031
+#: standalone/drakvpn:1033
 #, c-format
 msgid "Compression algorithm"
-msgstr ""
+msgstr "Algorithm cywasgu"
 
-#: standalone/drakvpn:1039
-#, fuzzy, c-format
+#: standalone/drakvpn:1034
+#, c-format
+msgid "deflate"
+msgstr "dadchwythu"
+
+#: standalone/drakvpn:1041
+#, c-format
 msgid "Remote"
-msgstr "Tynnu"
+msgstr "Pell"
 
-#: standalone/drakvpn:1040
+#: standalone/drakvpn:1042
 #, c-format
 msgid ""
 "remote (address | anonymous) [[port]] { statements }\n"
@@ -21741,13 +22347,23 @@ msgid ""
 "remote anonymous\n"
 "remote ::1 [8000]"
 msgstr ""
+"remote (address | anonymous) [[port]] { statements }\n"
+"pennu paramedrau rhan1 IKE ar gyfer  pob nod pell.\n"
+"Y porth rhagosodedig yw 500.  Os yw anhysbys yn cael eu bennu\n"
+"mae'r gosodiad yn wir i'r holl gyfoed nad ydynt yn cydweddu â\n"
+"chyfarwyddeb pell arall\n"
+"\n"
+"Enghreifftiau : \n"
+"\n"
+"pell anhysbys\n"
+"anhysbys ::1 [8000]"
 
-#: standalone/drakvpn:1048
-#, fuzzy, c-format
+#: standalone/drakvpn:1050
+#, c-format
 msgid "Exchange mode"
-msgstr "Modd deialu"
+msgstr "Modd cyfnewid"
 
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
 #, c-format
 msgid ""
 "defines the exchange mode for phase 1 when racoon is the\n"
@@ -21757,13 +22373,29 @@ msgid ""
 "modes are acceptable. The first exchange mode is what\n"
 "racoon uses when it is the initiator.\n"
 msgstr ""
+"diffinio'r modd cyfnewid ar gyfer rhan 1 lle mae racoon sy'n\n"
+"cychwyn. Mae hefyd yn golygu'r modd cyfnewid derbyniol lle\n"
+"mai racoon yw'r ymatebwr. Mae modd pennu mwy nag un\n"
+"modd drwy eu ymwahanu gan gollnod. Mae'r holl foddau'n\n"
+"dderbyniol. Y modd cyfnewid cyntaf yw'r hyn mae racoon yn\n"
+"ei ddefnyddio pan yw'n gychwynnydd.\n"
 
-#: standalone/drakvpn:1056
-#, fuzzy, c-format
+#: standalone/drakvpn:1058
+#, c-format
 msgid "Generate policy"
-msgstr "Diogelwch"
+msgstr "Polisi cynhyrchu"
 
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "off"
+msgstr "diffodd "
+
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "on"
+msgstr "ymlaen"
+
+#: standalone/drakvpn:1060
 #, c-format
 msgid ""
 "This directive is for the responder.  Therefore you\n"
@@ -21781,73 +22413,92 @@ msgid ""
 "tiator and the responder.  This directive is ignored in\n"
 "the initiator case.  The default value is off."
 msgstr ""
+"Mae'r gyfarwyddeb hon ar gyfer yr ymatebwr. Rhaid\n"
+"gosod goddefol ymlaen fel bod racoon(8) yn unig\n"
+"sy'n dod ynn ymatebwr. Os nad oes gan yr ymatebwr\n"
+"unrhyw bolisi yn SPD yn ystod negydu rhan 2 ac mae'r\n"
+"cyfeiriad wedi ei droi ymlaen, yna bydd racoon(8) yn\n"
+"dewis y cynnig cyntaf yn y llwyth SA oddi wrth y\n"
+"cychwynnydd, a chynhyrchu cofnodion polisi o'r cynnig.\n"
+"Mae'n ddefnyddiol; negydu gyda'r cleient sydd wedi cyfeiriad\n"
+"IP yn ddeinamig. Sylwch y gall bo polisi anaddas wedi ei\n"
+"osod o fewn SPD'r ymatebydd gan y cychwynnydd. Fel bo\n"
+"cyfathrebu arall yn methu os yw polisïau'n gwrthdaro rhwng\n"
+"y cychwynnydd â'r ymatebwr. Bydd y gyfarwyddeb yn cael\n"
+"ei anwybyddu yn achos y cychwynnydd.\n"
+"Y gwerth rhagosodedig yw diffodd."
 
-#: standalone/drakvpn:1072
-#, fuzzy, c-format
+#: standalone/drakvpn:1074
+#, c-format
 msgid "Passive"
-msgstr "Palestina"
+msgstr "Goddefol"
 
-#: standalone/drakvpn:1074
+#: standalone/drakvpn:1076
 #, c-format
 msgid ""
 "If you do not want to initiate the negotiation, set this\n"
 "to on.  The default value is off.  It is useful for a\n"
 "server."
 msgstr ""
+"Os nad ydych am gychwyn y negydu, gosodwch hwn\n"
+"i ymlaen. Y gwerth rhagosodedig yw diffodd.\n"
+"Mae'n ddefnyddiol ar gyfer gweinydd."
 
-#: standalone/drakvpn:1077
+#: standalone/drakvpn:1079
 #, c-format
 msgid "Certificate type"
-msgstr ""
+msgstr "Math o dystysgrif"
 
-#: standalone/drakvpn:1079
-#, fuzzy, c-format
+#: standalone/drakvpn:1081
+#, c-format
 msgid "My certfile"
-msgstr "Dewiswch ffeil"
+msgstr "Ffeil Tystysgif"
 
-#: standalone/drakvpn:1080
-#, fuzzy, c-format
+#: standalone/drakvpn:1082
+#, c-format
 msgid "Name of the certificate"
-msgstr "Enw'r argraffydd"
+msgstr "Enw'r dystysgrif"
 
-#: standalone/drakvpn:1081
+#: standalone/drakvpn:1083
 #, c-format
 msgid "My private key"
-msgstr ""
+msgstr "Fy allwedd breifat"
 
-#: standalone/drakvpn:1082
-#, fuzzy, c-format
+#: standalone/drakvpn:1084
+#, c-format
 msgid "Name of the private key"
-msgstr "Enw'r argraffydd"
+msgstr "Enw'r allwedd breifat"
 
-#: standalone/drakvpn:1083
-#, fuzzy, c-format
+#: standalone/drakvpn:1085
+#, c-format
 msgid "Peers certfile"
-msgstr "Dewiswch ffeil"
+msgstr "Tystysgrif ffeil cyfoed"
 
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
 #, c-format
 msgid "Name of the peers certificate"
-msgstr ""
+msgstr "Enw tystysgrif cyfoed"
 
-#: standalone/drakvpn:1085
-#, fuzzy, c-format
+#: standalone/drakvpn:1087
+#, c-format
 msgid "Verify cert"
-msgstr "hyfryd iawn"
+msgstr "Gwirio tystysgrif"
 
-#: standalone/drakvpn:1087
+#: standalone/drakvpn:1089
 #, c-format
 msgid ""
 "If you do not want to verify the peer's certificate for\n"
 "some reason, set this to off.  The default is on."
 msgstr ""
+"Os nad ydych am wirio tystysgrif y cyfoed am rhyw reswm,\n"
+"rhowch hwn ar diffodd. Y rhagosodedig yw ymlaen."
 
-#: standalone/drakvpn:1089
+#: standalone/drakvpn:1091
 #, c-format
 msgid "My identifier"
-msgstr ""
+msgstr "Fy enw"
 
-#: standalone/drakvpn:1090
+#: standalone/drakvpn:1092
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
@@ -21873,18 +22524,40 @@ msgid ""
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
-
-#: standalone/drakvpn:1110
-#, fuzzy, c-format
+"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"
+"cant eu defnyddio fel:\n"
+"\tcyfeiriad my_identifier [address];\n"
+"\t\ty math yw'r cyfeiriad IP. Hwn yw'r math rhagosodedig\n"
+"\t\tos nad ydych yn pennu enw i'w ddefnyddio.\n"
+"\tllinyn my_identifier user_fqdn;\n"
+"\t\tty math yw USER_FQDN (enw parth\n"
+"\t\tdefnyddiwr cymwysedig llawn).\n"
+"\tllinyn my_identifier fqdn;\n"
+"\t\ty math FQDN (enw parth cymwysedig llawn).\n"
+"\tffeil keyid my_identifier;\n"
+"\t\ty math yw KEY_ID.\n"
+"\tmy_identifier asn1dn [llinyn];\n"
+"\t\tmath enw  ASN.1 amlwg.  If\n"
+"\t\thpgor llinyn, bydd racoon(8) yn estyn DN o\n"
+"\t\tmaes pwnc yn y dystysgrif.\n"
+"\n"
+"Enghreifftiau : \n"
+"\n"
+"my_identifier user_fqdn \"fye-bost@fymharth.com\""
+
+#: standalone/drakvpn:1112
+#, c-format
 msgid "Peers identifier"
-msgstr "Argraffydd"
+msgstr "Dynodydd cyfoed"
 
-#: standalone/drakvpn:1111
-#, fuzzy, c-format
+#: standalone/drakvpn:1113
+#, c-format
 msgid "Proposal"
-msgstr "Protocol"
+msgstr "Cynnig"
 
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
 #, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
@@ -21895,71 +22568,113 @@ msgid ""
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
+"pennu yr algorithm amgryptio i'w ddefnyddio ar gyfer\n"
+"negydu rhan 1. Rhaid i'r gyfarwyddeb gael ei diffinio.\n"
+"algorithm yw un o'r canlynol:\n"
+"\n"
+"des, 3des, blowfish, cast128 for oakley.\n"
+"\n"
+"Ni ddylid defnyddio'r gosodiad ar gyfer trawsffurfiau eraill. "
 
-#: standalone/drakvpn:1120
+#: standalone/drakvpn:1122
 #, c-format
 msgid "Hash algorithm"
-msgstr ""
+msgstr "Algorithm hash "
 
-#: standalone/drakvpn:1121
-#, fuzzy, c-format
+#: standalone/drakvpn:1123
+#, c-format
 msgid "Authentication method"
-msgstr "dilysu"
+msgstr "Dull dilysu"
 
-#: standalone/drakvpn:1122
-#, fuzzy, c-format
+#: standalone/drakvpn:1124
+#, c-format
 msgid "DH group"
-msgstr "Grwp"
+msgstr "Grwp DH"
 
-#: standalone/drakvpn:1129
-#, fuzzy, c-format
+#: standalone/drakvpn:1131
+#, c-format
 msgid "Command"
-msgstr "Llinell orchymyn"
+msgstr "Gorchymyn"
 
-#: standalone/drakvpn:1130
+#: standalone/drakvpn:1132
 #, c-format
 msgid "Source IP range"
-msgstr ""
+msgstr "Ystod IP ffynhonnell"
 
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
 #, c-format
 msgid "Destination IP range"
-msgstr ""
+msgstr "Ystod IP cyrchfan"
 
-#: standalone/drakvpn:1132
-#, fuzzy, c-format
+#: standalone/drakvpn:1134
+#, c-format
 msgid "Upper-layer protocol"
-msgstr "Protocol Ewropeaidd"
+msgstr "Protocol haen uchaf"
 
-#: standalone/drakvpn:1133
-#, fuzzy, c-format
+#: standalone/drakvpn:1134 standalone/drakvpn:1141
+#, c-format
+msgid "any"
+msgstr "unrhyw"
+
+#: standalone/drakvpn:1136
+#, c-format
 msgid "Flag"
-msgstr "Baneri"
+msgstr "Baner"
 
-#: standalone/drakvpn:1134
-#, fuzzy, c-format
+#: standalone/drakvpn:1137
+#, c-format
 msgid "Direction"
-msgstr "Disgrifiad"
+msgstr "Cyfeiriad"
 
-#: standalone/drakvpn:1135
+#: standalone/drakvpn:1138
 #, c-format
 msgid "IPsec policy"
-msgstr ""
+msgstr "Polisi IPsec"
 
-#: standalone/drakvpn:1137
-#, fuzzy, c-format
-msgid "Mode"
-msgstr "Model"
+#: standalone/drakvpn:1138
+#, c-format
+msgid "ipsec"
+msgstr "ipsec "
 
 #: standalone/drakvpn:1138
-#, fuzzy, c-format
+#, c-format
+msgid "discard"
+msgstr "dileu"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "Mode"
+msgstr "Modd"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "tunnel"
+msgstr "twnel"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "transport"
+msgstr "trosglwyddo"
+
+#: standalone/drakvpn:1143
+#, c-format
 msgid "Source/destination"
-msgstr "Man Gwaith"
+msgstr "Ffynhonnell/cyrchfan"
 
-#: standalone/drakvpn:1139 standalone/harddrake2:57
+#: standalone/drakvpn:1144
 #, c-format
-msgid "Level"
-msgstr "Lefel"
+msgid "require"
+msgstr "gofynnol"
+
+#: standalone/drakvpn:1144
+#, c-format
+msgid "use"
+msgstr "defnydd"
+
+#: standalone/drakvpn:1144
+#, c-format
+msgid "unique"
+msgstr "unigryw"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -22392,11 +23107,6 @@ msgstr "nifer y botymau sydd gan y llygoden"
 
 #: standalone/harddrake2:63
 #, c-format
-msgid "Name"
-msgstr "Enw"
-
-#: standalone/harddrake2:63
-#, c-format
 msgid "the name of the CPU"
 msgstr "enw'r prosesydd"
 
@@ -22456,13 +23166,13 @@ msgstr ""
 "ar lefel cof tudalen, felly'n caniatáu'r prosesydd i atal mynediad i wirio "
 "cnewyllyn i gof y defnyddiwr (hy diogelwch rhag gwall)"
 
-#: standalone/harddrake2:84 standalone/logdrake:77 standalone/printerdrake:146
+#: standalone/harddrake2:84 standalone/logdrake:78 standalone/printerdrake:146
 #: standalone/printerdrake:159
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:79
+#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:80
 #: standalone/printerdrake:171 standalone/printerdrake:172
 #: standalone/printerdrake:173 standalone/printerdrake:174
 #, c-format
@@ -22510,11 +23220,6 @@ msgstr ""
 
 #: standalone/harddrake2:115
 #, c-format
-msgid "Select a device !"
-msgstr "Dewis dyfais!"
-
-#: standalone/harddrake2:115
-#, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
 "in fields displayed on the right frame (\"Information\")"
@@ -22552,63 +23257,58 @@ msgstr ""
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 
-#: standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "Canfod ar waith"
-
-#: standalone/harddrake2:140
+#: standalone/harddrake2:141
 #, c-format
 msgid "Harddrake2 version %s"
 msgstr "Harddrake2 fersiwn %s"
 
-#: standalone/harddrake2:156
+#: standalone/harddrake2:157
 #, c-format
 msgid "Detected hardware"
 msgstr "Caledwedd canfyddwyd"
 
-#: standalone/harddrake2:161
+#: standalone/harddrake2:162
 #, c-format
 msgid "Configure module"
 msgstr "Modd ffurfweddu"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:169
 #, c-format
 msgid "Run config tool"
 msgstr "Rhedeg offeryn ffurfweddu"
 
-#: standalone/harddrake2:215
+#: standalone/harddrake2:216
 #, c-format
 msgid "unknown"
 msgstr "anhysbys"
 
-#: standalone/harddrake2:216
+#: standalone/harddrake2:217
 #, c-format
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: standalone/harddrake2:234
+#: standalone/harddrake2:235
 #, 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:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "secondary"
 msgstr "eilradd"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "primary"
 msgstr "cynradd"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "burner"
 msgstr "llosgwr"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "DVD"
 msgstr "DVD"
@@ -22630,72 +23330,72 @@ msgstr ""
 "Mae'r newid wedi ei gyflawni, ond i fod yn effeithiol mae'n rhaid i chi "
 "allgofnodi"
 
-#: standalone/logdrake:50
+#: standalone/logdrake:51
 #, c-format
-msgid "Mandrake Tools Explanation"
-msgstr "Esboniadau Offer Mandrake"
+msgid "Mandrake Tools Logs"
+msgstr "Cofnodion Offer Mandrake"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:52
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:64
+#: standalone/logdrake:65
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Dangos ar y diwrnod penodol yn unig"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_New"
 msgstr "/Ffeil/_Newydd"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>N"
 msgstr "<control>N"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Open"
 msgstr "/Ffeil/_Agor"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/_Save"
 msgstr "/Ffeil/_Cawd"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:74
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Ffeil/Cawd _fel"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:76
 #, c-format
 msgid "/File/-"
 msgstr "/Ffeil/-"
 
-#: standalone/logdrake:78
+#: standalone/logdrake:79
 #, c-format
 msgid "/Options/Test"
 msgstr "/Dewisiadau/Test"
 
-#: standalone/logdrake:80
+#: standalone/logdrake:81
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Cymorth/_Ynghylch..."
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
@@ -22704,7 +23404,7 @@ msgstr ""
 "_:dyma'r ffeil cofnod auth.log \n"
 "Dilysu"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
@@ -22713,7 +23413,7 @@ msgstr ""
 "_:dyma ffeil cofnod user.log\n"
 "Defnyddiwr"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
@@ -22722,7 +23422,7 @@ msgstr ""
 "_:dyma'r ffeil cofnod /var/log/messages\n"
 "Negeseuon"
 
-#: standalone/logdrake:114
+#: standalone/logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
@@ -22731,117 +23431,117 @@ msgstr ""
 "_:dyma'r cofnod ffeil /var/log/syslog\n"
 "Syslog"
 
-#: standalone/logdrake:118
+#: standalone/logdrake:117
 #, c-format
 msgid "search"
 msgstr "chwilio"
 
-#: standalone/logdrake:130
+#: standalone/logdrake:129
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Offeryn i fonitro eich cofnodion"
 
-#: standalone/logdrake:131 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:85
 #, c-format
 msgid "Settings"
 msgstr "Gosodiadau"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "Matching"
 msgstr "Cydweddu"
 
-#: standalone/logdrake:137
+#: standalone/logdrake:136
 #, c-format
 msgid "but not matching"
 msgstr "ond heb fod yn cydweddu"
 
-#: standalone/logdrake:141
+#: standalone/logdrake:140
 #, c-format
 msgid "Choose file"
 msgstr "Dewis ffeil"
 
-#: standalone/logdrake:150
+#: standalone/logdrake:149
 #, c-format
 msgid "Calendar"
 msgstr "Calendr"
 
-#: standalone/logdrake:160
+#: standalone/logdrake:159
 #, c-format
 msgid "Content of the file"
 msgstr "Cynnwys y ffeil"
 
-#: standalone/logdrake:164 standalone/logdrake:377
+#: standalone/logdrake:163 standalone/logdrake:429
 #, c-format
 msgid "Mail alert"
 msgstr "Rhybudd e-bost"
 
-#: standalone/logdrake:171
+#: standalone/logdrake:170
 #, c-format
 msgid "The alert wizard had unexpectly failled:"
 msgstr "Methodd y dewin rhybudd yn annisgwyl:"
 
-#: standalone/logdrake:219
+#: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "arhoswch, dosbarthu ffeil: %s"
 
-#: standalone/logdrake:355
+#: standalone/logdrake:406
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Gweinydd Gwe Fyd Eang Apache"
 
-#: standalone/logdrake:356
+#: standalone/logdrake:407
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Datrysydd Enw Parth"
 
-#: standalone/logdrake:357
+#: standalone/logdrake:408
 #, c-format
 msgid "Ftp Server"
 msgstr "Gweinydd Ftp"
 
-#: standalone/logdrake:358
+#: standalone/logdrake:409
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Gweinydd E-bost Postfix"
 
-#: standalone/logdrake:359
+#: standalone/logdrake:410
 #, c-format
 msgid "Samba Server"
 msgstr "Gweinydd Samba"
 
-#: standalone/logdrake:360
+#: standalone/logdrake:411
 #, c-format
 msgid "SSH Server"
 msgstr "Gweinydd SSH"
 
-#: standalone/logdrake:361
+#: standalone/logdrake:412
 #, c-format
 msgid "Webmin Service"
 msgstr "Gwasanaethau Webmin"
 
-#: standalone/logdrake:362
+#: standalone/logdrake:413
 #, c-format
 msgid "Xinetd Service"
 msgstr "Gwasanaeth Xinetd"
 
-#: standalone/logdrake:372
+#: standalone/logdrake:424
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Ffurfweddu'r system argraffu CUPS"
 
-#: standalone/logdrake:373
+#: standalone/logdrake:425
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Atal y system rhybudd e-bost"
 
-#: standalone/logdrake:380
+#: standalone/logdrake:432
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Ffurfweddiad rhybudd e-bost"
 
-#: standalone/logdrake:381
+#: standalone/logdrake:433
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -22852,34 +23552,34 @@ msgstr ""
 "\n"
 "Yma bydd modd i chi osod y system rhybuddio.\n"
 
-#: standalone/logdrake:384
+#: standalone/logdrake:436
 #, c-format
 msgid "What do you want to do?"
 msgstr "Beth hoffech chi ei wneud?"
 
-#: standalone/logdrake:391
+#: standalone/logdrake:443
 #, c-format
 msgid "Services settings"
 msgstr "Gosodiad gwasanaeth"
 
-#: standalone/logdrake:392
+#: standalone/logdrake:444
 #, 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:399
+#: standalone/logdrake:451
 #, c-format
 msgid "Load setting"
 msgstr "Gosodiad llwyth"
 
-#: standalone/logdrake:400
+#: standalone/logdrake:452
 #, 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:401
+#: standalone/logdrake:453
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
@@ -22888,37 +23588,32 @@ msgstr ""
 "_: mae llwytho'n enw yma, llwyth y system\n"
 "Llwyth"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:458
 #, c-format
 msgid "Alert configuration"
 msgstr "Ffurfweddiad rhybudd"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:459
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Rhowch eich cyfeiriad e-bost islaw"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:460
 #, c-format
 msgid "and enter the name (or the IP) of the SMTP server you whish to use"
 msgstr "rhowch enw (neu'r IP) y gweinydd SMTP rydych am ei ddefnyddio."
 
-#: standalone/logdrake:427 standalone/logdrake:433
-#, c-format
-msgid "Congratulations"
-msgstr "Llongyfarchiadau"
-
-#: standalone/logdrake:427
+#: standalone/logdrake:479
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "Mae'r dewin wedi ffurfweddu'r rhybudd e-bost yn llwyddiannus."
 
-#: standalone/logdrake:433
+#: standalone/logdrake:485
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "Mae'r dewin wedi ffurfweddu'r rhybudd e-bost yn llwyddiannus."
 
-#: standalone/logdrake:492
+#: standalone/logdrake:544
 #, c-format
 msgid "Save as.."
 msgstr "Cadw fel..."
@@ -23235,86 +23930,102 @@ msgstr "Awduron:"
 msgid "Printer Management \n"
 msgstr "Rheoli Argraffydd \n"
 
-#: standalone/scannerdrake:53
+#: standalone/scannerdrake:50
+#, c-format
+msgid ""
+"SANE packages need to be installed to use scanners.\n"
+"\n"
+"Do you want to install the SANE packages?"
+msgstr ""
+"Mane angen gosod pecynnau SANE i ddefndyyio sganwyr.\n"
+"\n"
+"Hoffech chi osod y pecynnau SANE?"
+
+#: standalone/scannerdrake:54
+#, c-format
+msgid "Aborting Scannerdrake."
+msgstr "Atal Scannerdrake."
+
+#: standalone/scannerdrake:59
 #, 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:54
+#: standalone/scannerdrake:60
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Ni fydd Scannerdrake yn cael ei gychwyn."
 
-#: standalone/scannerdrake:60 standalone/scannerdrake:452
+#: standalone/scannerdrake:66 standalone/scannerdrake:459
 #, c-format
 msgid "Searching for configured scanners ..."
 msgstr "Chwilio am sganiwr wedi ei ffurfweddu..."
 
-#: standalone/scannerdrake:64 standalone/scannerdrake:456
+#: standalone/scannerdrake:70 standalone/scannerdrake:463
 #, c-format
 msgid "Searching for new scanners ..."
 msgstr "Chwilio am sganiwr newydd..."
 
-#: standalone/scannerdrake:72 standalone/scannerdrake:478
+#: standalone/scannerdrake:78 standalone/scannerdrake:485
 #, c-format
 msgid "Re-generating list of configured scanners ..."
 msgstr "Ail gynhyrchu rhestr o sganwyr wedi eu ffurfweddu..."
 
-#: standalone/scannerdrake:94 standalone/scannerdrake:135
-#: standalone/scannerdrake:149
+#: standalone/scannerdrake:100 standalone/scannerdrake:141
+#: standalone/scannerdrake:155
 #, 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:97
+#: standalone/scannerdrake:103
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "Wedi canfod %s ar %s, ei ffurfweddi'n awtomatig?"
 
-#: standalone/scannerdrake:109
+#: standalone/scannerdrake:115
 #, 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:124
+#: standalone/scannerdrake:130
 #, c-format
 msgid "Select a scanner model"
 msgstr "Dewiswch fodel sganiwr"
 
-#: standalone/scannerdrake:125
+#: standalone/scannerdrake:131
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:126
+#: standalone/scannerdrake:132
 #, c-format
 msgid "Detected model: %s"
 msgstr "Canfyddwyd model: %s"
 
-#: standalone/scannerdrake:128
+#: standalone/scannerdrake:134
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: standalone/scannerdrake:129
+#: standalone/scannerdrake:135
 #, c-format
 msgid "Port: %s"
 msgstr "Porth: %s"
 
-#: standalone/scannerdrake:155
+#: 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:163 standalone/scannerdrake:177
+#: standalone/scannerdrake:169 standalone/scannerdrake:183
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Peidio gosod ffeil cadarnwedd"
 
-#: standalone/scannerdrake:167 standalone/scannerdrake:219
+#: standalone/scannerdrake:173 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
@@ -23323,12 +24034,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:168 standalone/scannerdrake:220
+#: standalone/scannerdrake:174 standalone/scannerdrake:226
 #, 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:169 standalone/scannerdrake:223
+#: standalone/scannerdrake:175 standalone/scannerdrake:229
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
@@ -23337,31 +24048,31 @@ msgstr ""
 "I wneud felly, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel "
 "bod modd ei osod."
 
-#: standalone/scannerdrake:170 standalone/scannerdrake:224
+#: standalone/scannerdrake:176 standalone/scannerdrake:230
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
 "manufacturer's home page, or on your Windows partition."
 msgstr ""
-"Cewch hyd i'r ffeil ar yr CD neu ddisg meddal sy'n dod gyda'r sganiwr, ar "
+"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:172 standalone/scannerdrake:231
+#: standalone/scannerdrake:178 standalone/scannerdrake:237
 #, c-format
 msgid "Install firmware file from"
 msgstr "Gosod ffeil cadarnwedd o"
 
-#: standalone/scannerdrake:192
+#: standalone/scannerdrake:198
 #, c-format
 msgid "Select firmware file"
 msgstr "Dewiswch ffeil cadarnwedd"
 
-#: standalone/scannerdrake:195 standalone/scannerdrake:254
+#: standalone/scannerdrake:201 standalone/scannerdrake:260
 #, 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:218
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -23370,7 +24081,7 @@ msgstr ""
 "Mae'n bosib fod angen i'ch sganiwr gael ei gadarnwedd ei ddiweddaru bob tro "
 "fydd yn cael ei gychwyn."
 
-#: standalone/scannerdrake:222
+#: standalone/scannerdrake:228
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
@@ -23379,7 +24090,7 @@ msgstr ""
 "I wneud hynny, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel "
 "bod modd ei osod."
 
-#: standalone/scannerdrake:225
+#: standalone/scannerdrake:231
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -23388,27 +24099,27 @@ msgstr ""
 "Os ydych eisoes wedi gosod cadarnwedd eich sganiwr mae modd ei ddiweddaru "
 "drwy ddarparu'r ffeil newydd"
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware for the"
 msgstr "Gosod ffeil cadarnwedd ar gyfer"
 
-#: standalone/scannerdrake:250
+#: standalone/scannerdrake:256
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Dewis ffeil cadarnwedd ar gyfer %s"
 
-#: standalone/scannerdrake:276
+#: standalone/scannerdrake:282
 #, 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:286
+#: standalone/scannerdrake:292
 #, c-format
 msgid "The %s is unsupported"
 msgstr "Nid yw %s yn cael ei gynnal"
 
-#: standalone/scannerdrake:291
+#: standalone/scannerdrake:297
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -23417,44 +24128,44 @@ msgstr ""
 "Rhaid i %s gael ei ffurfweddu gan printerdrake.\n"
 "Gallwch gychwyn printerdrake o adran Galedwedd Canolfan Rheoli %s"
 
-#: standalone/scannerdrake:295 standalone/scannerdrake:302
-#: standalone/scannerdrake:332
+#: standalone/scannerdrake:301 standalone/scannerdrake:308
+#: standalone/scannerdrake:338
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "Awtoganfod pyrth ar gael"
 
-#: standalone/scannerdrake:297 standalone/scannerdrake:343
+#: standalone/scannerdrake:303 standalone/scannerdrake:349
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Dewiswch y ddyfais lle mae %s wedi ei gysylltu"
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Sylwer: Nid oes modd awtoganfod pyrth paralel)"
 
-#: standalone/scannerdrake:300 standalone/scannerdrake:345
+#: standalone/scannerdrake:306 standalone/scannerdrake:351
 #, c-format
 msgid "choose device"
 msgstr "dewis dyfais"
 
-#: standalone/scannerdrake:334
+#: standalone/scannerdrake:340
 #, c-format
 msgid "Searching for scanners ..."
 msgstr "Chwilio am sganwyr..."
 
-#: standalone/scannerdrake:368
-#, c-format
+#: standalone/scannerdrake:375
+#, fuzzy, c-format
 msgid ""
 "Your %s has been configured.\n"
-"You may now scan documents using \"XSane\" from Multimedia/Graphics in the "
-"applications menu."
+"You may now scan documents using \"XSane\" or \"Kooka\" from Multimedia/"
+"Graphics in the applications menu."
 msgstr ""
 "Mae eich %s wedi ei ffurfweddu.\n"
 "Gallwch ddefnyddio \"XSane\" i sganio dogfennau o'r ddewislen rhaglenni Aml-"
 "gyfrwng/Graffigau."
 
-#: standalone/scannerdrake:392
+#: standalone/scannerdrake:399
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -23467,7 +24178,7 @@ msgstr ""
 "%s\n"
 "ar gael ar eich system.\n"
 
-#: standalone/scannerdrake:393
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -23480,51 +24191,51 @@ msgstr ""
 "%s\n"
 "ar gael ar eich system.\n"
 
-#: standalone/scannerdrake:396 standalone/scannerdrake:399
+#: standalone/scannerdrake:403 standalone/scannerdrake:406
 #, 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:413
+#: standalone/scannerdrake:420
 #, c-format
 msgid "Search for new scanners"
 msgstr "Chwilio am sganwyr newydd"
 
-#: standalone/scannerdrake:419
+#: standalone/scannerdrake:426
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Ychwanegu sganiwr gyda llaw"
 
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:433
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Gosod/Diweddaru ffeiliau cadarnwedd"
 
-#: standalone/scannerdrake:432
+#: standalone/scannerdrake:439
 #, c-format
 msgid "Scanner sharing"
 msgstr "Rhannu sganiwr"
 
-#: standalone/scannerdrake:491 standalone/scannerdrake:656
+#: standalone/scannerdrake:498 standalone/scannerdrake:663
 #, c-format
 msgid "All remote machines"
 msgstr "Pob cyfrifiadur pell"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:806
+#: standalone/scannerdrake:510 standalone/scannerdrake:813
 #, c-format
 msgid "This machine"
 msgstr "Y peiriant hwn"
 
-#: standalone/scannerdrake:543
+#: standalone/scannerdrake:550
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
-"accessable by remote machines and by which remote machines."
+"accessible by remote machines and by which remote machines."
 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:544
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -23533,33 +24244,33 @@ msgstr ""
 "Gallwch benderfynu a ddylai sganwyr ar gyfrifiadur pell fod ar gael ar gyfer "
 "y cyfrifiadur hwn."
 
-#: standalone/scannerdrake:547
+#: standalone/scannerdrake:554
 #, 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:549
+#: standalone/scannerdrake:556
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Rhannu sganwyr i westeiwyr:"
 
-#: standalone/scannerdrake:563
+#: standalone/scannerdrake:570
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Defnyddio sganiwr ar gyfrifiaduron pell"
 
-#: standalone/scannerdrake:566
+#: standalone/scannerdrake:573
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Defnyddio sganwyr ar westeiwyr:"
 
-#: standalone/scannerdrake:593 standalone/scannerdrake:665
-#: standalone/scannerdrake:815
+#: standalone/scannerdrake:600 standalone/scannerdrake:672
+#: standalone/scannerdrake:822
 #, c-format
 msgid "Sharing of local scanners"
 msgstr "Rhannu sganwyr lleol"
 
-#: standalone/scannerdrake:594
+#: standalone/scannerdrake:601
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -23567,55 +24278,66 @@ msgid ""
 msgstr ""
 "Dyma'r cyfrifiaduron a rhwydweithiau ddylai'r sganiwr lleol fod ar gael:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:755
+#: standalone/scannerdrake:612 standalone/scannerdrake:762
 #, c-format
 msgid "Add host"
 msgstr "Ychwanegu gwesteiwr"
 
-#: standalone/scannerdrake:611 standalone/scannerdrake:761
+#: standalone/scannerdrake:618 standalone/scannerdrake:768
 #, c-format
 msgid "Edit selected host"
 msgstr "Golygu'r gwesteiwr"
 
-#: standalone/scannerdrake:620 standalone/scannerdrake:770
+#: standalone/scannerdrake:627 standalone/scannerdrake:777
 #, c-format
 msgid "Remove selected host"
 msgstr "Tynnu'r gwesteiwr"
 
-#: standalone/scannerdrake:644 standalone/scannerdrake:652
-#: standalone/scannerdrake:657 standalone/scannerdrake:703
-#: standalone/scannerdrake:794 standalone/scannerdrake:802
-#: standalone/scannerdrake:807 standalone/scannerdrake:853
+#: standalone/scannerdrake:651 standalone/scannerdrake:659
+#: standalone/scannerdrake:664 standalone/scannerdrake:710
+#: standalone/scannerdrake:801 standalone/scannerdrake:809
+#: standalone/scannerdrake:814 standalone/scannerdrake:860
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "Enw/cyfeiriad IP gwesteiwr"
 
-#: standalone/scannerdrake:666 standalone/scannerdrake:816
+#: standalone/scannerdrake:673 standalone/scannerdrake:823
 #, 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:677 standalone/scannerdrake:827
+#: standalone/scannerdrake:684 standalone/scannerdrake:834
 #, 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:688 standalone/scannerdrake:838
+#: standalone/scannerdrake:695 standalone/scannerdrake:845
 #, 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:743
+#: standalone/scannerdrake:750
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Defnyddiwch o sganwyr pell"
 
-#: standalone/scannerdrake:744
+#: standalone/scannerdrake:751
 #, 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:904
+#: standalone/scannerdrake:908
+#, c-format
+msgid ""
+"saned needs to be installed to share the local scanner(s).\n"
+"\n"
+"Do you want to install the saned package?"
+msgstr ""
+"Mae angen gosdod saned i rannu sganiwr(wyr) lleol.\n"
+"\n"
+"Hoffech chi osod pecyn saned?"
+
+#: standalone/scannerdrake:912 standalone/scannerdrake:916
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Ni fydd eich sganiwr(sganwyr) ar gael ar y rhwydwaith"
@@ -23630,7 +24352,7 @@ msgstr "Cafodd rhai dyfeisiau yn nosbarth caledwedd\"%s\" eu tynnu:\n"
 msgid "Some devices were added: %s\n"
 msgstr "Ychwanegwyd rhai dyfeisiau: %s\n"
 
-#: standalone/service_harddrake:94
+#: standalone/service_harddrake:98
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Canfod caledwedd ar waith"
@@ -23725,22 +24447,22 @@ msgstr "Diweddaru"
 msgid "Exit install"
 msgstr "Gorffen"
 
-#: ugtk2.pm:1047
+#: ugtk2.pm:1075
 #, c-format
 msgid "Is this correct?"
 msgstr "Ydi hyn yn gywir?"
 
-#: ugtk2.pm:1175
+#: ugtk2.pm:1203
 #, c-format
 msgid "Expand Tree"
 msgstr "Estyn y goeden"
 
-#: ugtk2.pm:1176
+#: ugtk2.pm:1204
 #, c-format
 msgid "Collapse Tree"
 msgstr "Cau'r goeden"
 
-#: ugtk2.pm:1177
+#: ugtk2.pm:1205
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Newid rhwng gwastad a'r grwp wedi ei ddidoli"
@@ -23759,332 +24481,180 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Methodd y gosod"
 
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "Ffurfweddiad argraffydd pell"
-
-#, fuzzy
-#~ msgid "configure %s"
-#~ msgstr "ffurfweddu"
-
-#, fuzzy
-#~ msgid "protocol = "
-#~ msgstr "Protocol"
-
-#, fuzzy
-#~ msgid "level = "
-#~ msgstr "lefel"
-
-#~ msgid "Office Workstation"
-#~ msgstr "Gweithfan Swyddfa"
-
-#~ 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"
-
-#~ msgid "Game station"
-#~ msgstr "Man chwarae"
-
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "Rhaglenni difyrrwch: arcêd, gemau bwrdd, strategaeth, ag ati"
-
-#~ msgid "Multimedia station"
-#~ msgstr "Man aml-gyfrwng"
-
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "Chwarae sain a fideo/rhaglenni golygu"
-
-#~ msgid "Internet station"
-#~ msgstr "Man Rhyngrwyd"
-
-#~ 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"
-
-#~ msgid "Network Computer (client)"
-#~ msgstr "Cyfrifiadur Rhwydwaith (cleient)"
-
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "Cleientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Gweithfan Swyddfa"
 
-#~ msgid "Configuration"
-#~ msgstr "Ffurfweddiad"
-
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
-
-#~ msgid "Scientific Workstation"
-#~ msgstr "Gweithfan Wyddonol"
-
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "Rhaglenni gwyddonol megis gnuplot"
-
-#~ msgid "Console Tools"
-#~ msgstr "Offer y Consol"
+#: ../../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"
 
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
+#: ../../share/compssUsers:999
+msgid "Game station"
+msgstr "Man chwarae"
 
-#~ msgid "KDE Workstation"
-#~ msgstr "Man Gwaith KDE"
+#: ../../share/compssUsers:999
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Rhaglenni difyrrwch: arcêd, gemau bwrdd, strategaeth, ag ati"
 
-#~ 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"
+#: ../../share/compssUsers:999
+msgid "Multimedia station"
+msgstr "Man aml-gyfrwng"
 
-#~ msgid "Gnome Workstation"
-#~ msgstr "Man Gwaith Gnome"
+#: ../../share/compssUsers:999
+msgid "Sound and video playing/editing programs"
+msgstr "Chwarae sain a fideo/rhaglenni golygu"
 
-#~ 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."
+#: ../../share/compssUsers:999
+msgid "Internet station"
+msgstr "Man Rhyngrwyd"
 
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "Byrddau Gwaith Graffigol Eraill"
+#: ../../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"
 
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
+#: ../../share/compssUsers:999
+msgid "Network Computer (client)"
+msgstr "Cyfrifiadur Rhwydwaith (cleient)"
 
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr "Cleientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
 
-#~ msgid "Documentation"
-#~ msgstr "Dogfennaeth"
+#: ../../share/compssUsers:999
+msgid "Configuration"
+msgstr "Ffurfweddiad"
 
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr "Offer i wneud ffurfweddu'ch cyfrifiadur yn haws"
 
-#~ msgid "LSB"
-#~ msgstr "LSB"
+#: ../../share/compssUsers:999
+msgid "Console Tools"
+msgstr "Offer y Consol"
 
-#~ msgid "Linux Standard Base. Third party applications support"
-#~ msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
+#: ../../share/compssUsers:999
+msgid "Editors, shells, file tools, terminals"
+msgstr "Golygyddion, cregyn, offer ffeilio, terfynellau"
 
-#~ msgid "Web/FTP"
-#~ msgstr "Gwe/FTP"
+#: ../../share/compssUsers:999
+msgid "KDE Workstation"
+msgstr "Man Gwaith KDE"
 
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache, Pro-ftpd"
+#: ../../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 "Mail"
-#~ msgstr "E-bost"
+#: ../../share/compssUsers:999
+msgid "GNOME Workstation"
+msgstr "Man Gwaith Gnome"
 
-#~ msgid "Postfix mail server"
-#~ msgstr "Gweinydd e-bost Postfix"
+#: ../../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 "Database"
-#~ msgstr "Cronfa Ddata"
+#: ../../share/compssUsers:999
+msgid "Other Graphical Desktops"
+msgstr "Byrddau Gwaith Graffigol Eraill"
 
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, ag ati"
 
-#~ msgid "Firewall/Router"
-#~ msgstr "Mur Gwarchod/Llwybrydd"
+#: ../../share/compssUsers:999
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Llyfrgelloedd datblygiadol C a C++, rhaglenni a ffeiliau cynnwys"
 
-#~ msgid "Internet gateway"
-#~ msgstr "Porth i'r rhyngrwyd"
+#: ../../share/compssUsers:999
+msgid "Documentation"
+msgstr "Dogfennaeth"
 
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS "
+#: ../../share/compssUsers:999
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Llyfrau a Howto's ar Linux a Meddalwedd Rhydd"
 
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "Enw Parth a gweinydd Gwybodaeth Rhwydwaith"
+#: ../../share/compssUsers:999
+msgid "LSB"
+msgstr "LSB"
 
-#~ msgid "Network Computer server"
-#~ msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
+#: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Cefnogaeth i raglenni trydydd parti"
 
-#~ msgid "NFS server, SMB server, Proxy server, ssh server"
-#~ msgstr "Gweinydd NFS, gweinydd SMB, gweinydd dirprwyol, gweinydd ssh"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Gwe/FTP"
 
-#~ 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"
-
-#, fuzzy
-#~ msgid "add"
-#~ msgstr "Ychwanegu"
-
-#, fuzzy
-#~ msgid "edit"
-#~ msgstr "Golygu"
-
-#, fuzzy
-#~ msgid "remove"
-#~ msgstr "Tynnu"
-
-#~ msgid ""
-#~ "WRITER is a powerful word processor for creating all types of text "
-#~ "documents. Documents may include images, diagrams and tables."
-#~ msgstr ""
-#~ "Mae WRITER yn brosesydd geiriau pwerus ar gyfer creu pob math o "
-#~ "ddogfennau testun. Gall y dogfennau gynnwys delweddau, diagramau a "
-#~ "thablau."
-
-#~ msgid ""
-#~ "CALC is a feature-packed spreadsheet which enables you to compute, "
-#~ "analyze and manage all of your data."
-#~ msgstr ""
-#~ "Mae CALC yn daenlen gynhwysfawr sy'n eich galluogi chi i gyfrifo, "
-#~ "dadansoddi a rheoli eich holl ddata."
-
-#~ msgid ""
-#~ "IMPRESS is the fastest, most powerful way to create effective multimedia "
-#~ "presentations."
-#~ msgstr ""
-#~ "IMPRESS yw'r ffordd gyflymaf, a'r mwyaf pwerus i greu cyflwyniadau aml-"
-#~ "gyfrwng effeithio."
-
-#~ msgid "<b>Multimedia: Software for every need!</b>"
-#~ msgstr "<b>Aml-gyfrwng: Meddalwedd ar gyfer pob angen</b>"
-
-#~ msgid ""
-#~ "Empower your business network with premier server solutions including:"
-#~ msgstr ""
-#~ "Ymrymuswch eich rhwydwaith fusnes gyda darpariaethau o'r radd flaenaf, "
-#~ "gan gynnwys:"
-
-#~ msgid "\t- Samba: File and print services for MS-Windows clients"
-#~ msgstr ""
-#~ "\t- Samba: Gwasanaethau ffeil ac argraffu ar gyfer cleientiaid MS-Windows"
-
-#~ msgid "\t- MySQL: The world's most popular Open Source database"
-#~ msgstr "\t- MySQL: Cronfa ddata mwyaf poblogaidd y byd Cod Agored"
-
-#~ msgid ""
-#~ "\t- CVS: Concurrent Versions System, the dominant open-source network-"
-#~ "transparent version control system"
-#~ msgstr ""
-#~ "\t- CVS: Concurrent Versions System, y system rheoli fersiwn cod agored "
-#~ "amlycaf"
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr "Apache, Pro-ftpd"
 
-#~ msgid ""
-#~ "\t- ProFTPD: the highly configurable GPL-licensed FTP server software"
-#~ msgstr "\t- ProFTPD: meddalwedd ffurfweddadwy gweinydd FTP GPL"
-
-#~ msgid ""
-#~ "This should be a comma-separated list of local users or email addresses "
-#~ "that you want the backup results sent to. You will need a functioning "
-#~ "mail transfer agent setup on your system."
-#~ msgstr ""
-#~ "Dylai hyn fod yn rhestr coma gwahanedig o ddefnyddwyr lleol neu "
-#~ "gyfeiriadau e-bost er mwyn anfon y canlyniadau wrth gefn atynt. Rhaid "
-#~ "cael asiant trosglwyddo e-bost ar eich system."
-
-#~ msgid ""
-#~ "Error during sendmail. Your report mail was not sent. Please configure "
-#~ "sendmail"
-#~ msgstr ""
-#~ "Gwall wrth ddefnyddio sendmail. Chafodd eich adroddiad e-bost mo'i anfon. "
-#~ "Ffurfweddwch sendmail"
-
-#~ msgid "please choose the date to restore"
-#~ msgstr "dewiswch y data i'w adfer"
-
-#~ msgid "Connected through a serial port or an usb cable"
-#~ msgstr "Cysylltwyd drwy borth cyfresol neu gebl usb"
-
-#~ msgid "Add an UPS device"
-#~ msgstr "Ychwanegu dyfais UPS "
-
-#~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\n"
-#~ msgstr ""
-#~ "Croeso i'r offeryn ffurfweddu UPS\n"
-#~ "\n"
-#~ "Yma bydd modd i chi ychwanegu UPS newydd i'ch system.\n"
-
-#~ msgid ""
-#~ "We're going to add an UPS device.\n"
-#~ "\n"
-#~ "Do you prefer autodetect UPS devices connected to this machine or  ?"
-#~ msgstr ""
-#~ "Rydym yn mynd i ychwanegu dyfais UPS.\n"
-#~ "\n"
-#~ "Ydi hi'n well cysylltu dyfeisiau UPS awtoganfod i'r peiriant neu  ?"
-
-#~ msgid "Autodetection"
-#~ msgstr "Awtoganfod"
-
-#~ msgid "The wizard successfully added the following UPS devices:"
-#~ msgstr "Mae'r dewin wedi ychwanegu'r ddyfais UPS canlynol yn llwyddiannus:"
-
-#~ msgid "No new UPS devices was found"
-#~ msgstr "Heb ganfod dyfais UPS newydd"
-
-#~ msgid "UPS driver configuration"
-#~ msgstr "Ffurfweddu gyrrwr UPS"
-
-#~ msgid "Please select your UPS model."
-#~ msgstr "Dewiswch fodel eich UPS."
-
-#~ msgid "Manufacturer / Model:"
-#~ msgstr "Gwneuthurwr / Model:"
-
-#~ msgid ""
-#~ "We are configuring the \"%s\" UPS from \"%s\".\n"
-#~ "Please fill in its name, its driver and its port."
-#~ msgstr ""
-#~ "Rydym yn ffurfweddu'r UPS \"%s\" o \"%s\".\n"
-#~ "Rhowch ei enw, gyrrwr a phorth."
-
-#~ msgid "Name:"
-#~ msgstr "Enw :"
+#: ../../share/compssUsers:999
+msgid "Mail"
+msgstr "E-bost"
 
-#~ msgid "The name of your ups"
-#~ msgstr "Enw eich ups"
+#: ../../share/compssUsers:999
+msgid "Postfix mail server"
+msgstr "Gweinydd e-bost Postfix"
 
-#~ msgid "The driver that manage your ups"
-#~ msgstr "Mae'r gyrwyr sy'n rheoli eich ups"
-
-#~ msgid "Port:"
-#~ msgstr "Porth:"
+#: ../../share/compssUsers:999
+msgid "Database"
+msgstr "Cronfa Ddata"
 
-#~ msgid "The port on which is connected your ups"
-#~ msgstr "Y porth sy'n gysylltiedig â'ch UPS"
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
+msgstr "Gweinydd cronfa data PostgreSQL neu MySQL"
 
-#~ msgid "The wizard successfully configured the new \"%s\" UPS device."
-#~ msgstr ""
-#~ "Mae'r dewin wedi ffurfweddu'r ddyfais UPS newydd\"%s\" yn llwyddiannus."
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Mur Gwarchod/Llwybrydd"
 
-#~ msgid "UPS devices"
-#~ msgstr "Dyfeisiau UPS"
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Porth i'r rhyngrwyd"
 
-#~ msgid "UPS users"
-#~ msgstr "Defnyddwyr UPS"
+#: ../../share/compssUsers:999
+msgid "Network Computer server"
+msgstr "Gweinydd Cyfrifiadur Rhwydwaith"
 
-#~ msgid "Access Control Lists"
-#~ msgstr "Rhestr Rheolydd Mynediad"
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Gweinydd NFS, gweinydd SMB, gweinydd dirprwyol, gweinydd ssh"
 
-#~ msgid "IP mask"
-#~ msgstr "Masg IP"
+#: ../../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 "Rules"
-#~ msgstr "Rheolau"
+#~ msgid "Provider dns 1 (optional)"
+#~ msgstr "Dns 1 y darparwr (dewisol)"
 
-#~ msgid "Action"
-#~ msgstr "Gweithred"
+#~ msgid "Provider dns 2 (optional)"
+#~ msgstr "Dns 2 y darparwr (dewisol)"
 
-#~ msgid "ACL name"
-#~ msgstr "Enw ACL"
+#~ msgid "Ethernet Card"
+#~ msgstr "Cerdyn Ethernet"
 
-#~ msgid "Welcome to the UPS configuration tools"
-#~ msgstr "Croeso i offer ffurfweddu UPS"
+#~ msgid "DHCP Client"
+#~ msgstr "Cleient DHCP"
 
-#~ msgid "Running \"%s\" ..."
-#~ msgstr "Rhedeg \"%s\"..."
+#~ msgid "Display"
+#~ msgstr "Arddangos"
 
-#~ msgid "utopia 25"
-#~ msgstr "utopia 25"
+#~ msgid "Display configuration"
+#~ msgstr "Dangos ffurfweddiad"