20080322

1 files changed, 421 insertions, 426 deletions

diff --git a/perl-install/standalone/po/cy.po b/perl-install/standalone/po/cy.po
index ec5156d79..8ae62e836 100644
--- a/perl-install/standalone/po/cy.po
+++ b/perl-install/standalone/po/cy.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-02-14 13:23+0100\n"
-"PO-Revision-Date: 2008-02-14 20:53-0000\n"
+"PO-Revision-Date: 2008-03-22 19:56+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
 "MIME-Version: 1.0\n"
@@ -19,16 +19,35 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: drakauth:24 drakauth:26 draksec:279 draksec:328
+#: drakauth:24
+#: drakauth:26
+#: draksec:279
+#: draksec:328
 #, c-format
 msgid "Authentication"
 msgstr "Dilysu"
 
-#: drakauth:36 drakclock:111 drakclock:125 drakfont:214 drakfont:227
-#: drakfont:265 draksplash:169 finish-install:85 logdrake:170 logdrake:445
-#: logdrake:450 scannerdrake:59 scannerdrake:101 scannerdrake:142
-#: scannerdrake:200 scannerdrake:259 scannerdrake:730 scannerdrake:741
-#: scannerdrake:880 scannerdrake:891 scannerdrake:961
+#: drakauth:36
+#: drakclock:111
+#: drakclock:125
+#: drakfont:214
+#: drakfont:227
+#: drakfont:265
+#: draksplash:169
+#: finish-install:85
+#: logdrake:170
+#: logdrake:445
+#: logdrake:450
+#: scannerdrake:59
+#: scannerdrake:101
+#: scannerdrake:142
+#: scannerdrake:200
+#: scannerdrake:259
+#: scannerdrake:730
+#: scannerdrake:741
+#: scannerdrake:880
+#: scannerdrake:891
+#: scannerdrake:961
 #, c-format
 msgid "Error"
 msgstr "Gwall"
@@ -38,17 +57,23 @@ msgstr "Gwall"
 msgid "No bootloader found, creating a new configuration"
 msgstr "Heb ganfod cychwynnwr, creu ffurfweddiad newydd"
 
-#: drakboot:83 harddrake2:196 harddrake2:197 logdrake:71
+#: drakboot:83
+#: harddrake2:196
+#: harddrake2:197
+#: logdrake:71
 #, c-format
 msgid "/_File"
 msgstr "/_Ffeil"
 
-#: drakboot:84 logdrake:77
+#: drakboot:84
+#: logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Ffeil/_Gadael"
 
-#: drakboot:84 harddrake2:197 logdrake:77
+#: drakboot:84
+#: harddrake2:197
+#: logdrake:77
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -68,21 +93,27 @@ msgstr "Geiriol"
 msgid "Silent"
 msgstr "Tawel"
 
-#: drakboot:132 drakbug:233 drakfont:693 drakperm:375 drakperm:385 drakups:27
-#: harddrake2:515 localedrake:43 scannerdrake:51 scannerdrake:54
-#: scannerdrake:297 scannerdrake:302 scannerdrake:955
+#: drakboot:132
+#: drakbug:233
+#: drakfont:693
+#: drakperm:375
+#: drakperm:385
+#: drakups:27
+#: harddrake2:515
+#: localedrake:43
+#: scannerdrake:51
+#: scannerdrake:54
+#: scannerdrake:297
+#: scannerdrake:302
+#: scannerdrake:955
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
 
 #: drakboot:133
 #, 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."
-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."
+msgid "Your system bootloader is not in framebuffer mode. To activate graphical boot, select a graphic video mode from the bootloader configuration tool."
+msgstr "Nid yw eich cychwynnwr ym modd byffer ffrâm. I weithredu cychwyn graffigol, dewiswch y modd fideo graffig i'r offeryn ffurfweddu'r cychwynnwr."
 
 #: drakboot:134
 #, c-format
@@ -118,7 +149,8 @@ msgstr ""
 "Dangos thema\n"
 "yn y consol"
 
-#: drakboot:158 draksplash:25
+#: drakboot:158
+#: draksplash:25
 #, c-format
 msgid "Create new theme"
 msgstr "Creu thema newydd"
@@ -158,7 +190,8 @@ msgstr "Cychwyn yr amgylchedd graffigol wrth gychwyn eich system"
 msgid "Boot Style Configuration"
 msgstr "Ffurfweddu'r Math o Gychwyn"
 
-#: drakboot:259 drakboot:263
+#: drakboot:259
+#: drakboot:263
 #, c-format
 msgid "Video mode"
 msgstr "Modd fideo"
@@ -166,15 +199,14 @@ msgstr "Modd fideo"
 #: drakboot:260
 #, c-format
 msgid ""
-"Please choose a video mode, it will be applied to each of the boot entries "
-"selected below.\n"
+"Please choose a video mode, it will be applied to each of the boot entries selected below.\n"
 "Be sure your video card supports the mode you choose."
 msgstr ""
-"Dewiswch fodd fideo, fydd yn cael ei osod ar gyfer pob cofnod cychwyn "
-"dewiswyd isod.\n"
+"Dewiswch fodd fideo, fydd yn cael ei osod ar gyfer pob cofnod cychwyn dewiswyd isod.\n"
 "Gwnewch yn siŵr fod eich cerdyn fideo yn cynnal y modd rydych yn ei ddewis."
 
-#: drakbug:65 drakbug:143
+#: drakbug:65
+#: drakbug:143
 #, c-format
 msgid "The \"%s\" program has crashed with the following error:"
 msgstr "Mae'r rhaglen \"%s\" wedi chwalu gyda'r neges canlynol:"
@@ -197,14 +229,16 @@ msgstr "Dewin Tro Cyntaf"
 #: drakbug:83
 #, c-format
 msgid "Synchronization tool"
-msgstr "Offeryn Cydamseru"
+msgstr "Offeryn cydamseru"
 
-#: drakbug:84 drakbug:195
+#: drakbug:84
+#: drakbug:195
 #, c-format
 msgid "Standalone Tools"
 msgstr "Offer Unigol"
 
-#: drakbug:86 drakbug:87
+#: drakbug:86
+#: drakbug:87
 #, c-format
 msgid "Mandriva Online"
 msgstr "Mandriva Online"
@@ -272,23 +306,24 @@ msgstr "Olrheiniad trace yw:"
 #, c-format
 msgid ""
 "To submit a bug report, click on the report button.  \n"
-"This will open a web browser window on %s where you'll find a form to fill "
-"in.  The information displayed above will be transferred to that server.  \n"
-"Things useful to include in your report are the output of lspcidrake -v, "
-"kernel version, and /proc/cpuinfo."
+"This will open a web browser window on %s where you'll find a form to fill in.  The information displayed above will be transferred to that server.  \n"
+"Things useful to include in your report are the output of lspcidrake -v, kernel version, and /proc/cpuinfo."
 msgstr ""
 "I gyflwyno adroddiad gwall, cliciwch ar y botwm adroddiad.\n"
-"Bydd hyn yn agor ffenestr porwr gwe yn %s lle welwch ffurflen i'w llenwi. "
-"Bydd yr wybodaeth rhowch arno'n cael ei drosglwyddo i'r gweinydd.\n"
-"Pethau defnyddiol i'w cynnwys yn yr adroddiad fyddai allbwn lspcidrake -v, "
-"fersiwn y cnewyllyn a /proc/cpuinfo."
+"Bydd hyn yn agor ffenestr porwr gwe yn %s lle welwch ffurflen i'w llenwi. Bydd yr wybodaeth rhowch arno'n cael ei drosglwyddo i'r gweinydd.\n"
+"Pethau defnyddiol i'w cynnwys yn yr adroddiad fyddai allbwn lspcidrake -v, fersiwn y cnewyllyn a /proc/cpuinfo."
 
 #: drakbug:152
 #, c-format
 msgid "Please describe what you were doing when it crashed:"
 msgstr "Disgrifiwch beth roeddech yn ei wneud pa cafwyd chwalfa:"
 
-#: drakbug:164 drakperm:135 draksec:438 draksec:440 draksec:459 draksec:461
+#: drakbug:164
+#: drakperm:135
+#: draksec:438
+#: draksec:440
+#: draksec:459
+#: draksec:461
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
@@ -298,7 +333,8 @@ msgstr "Cymorth"
 msgid "Report"
 msgstr "Adroddiad"
 
-#: drakbug:169 drakfont:517
+#: drakbug:169
+#: drakfont:517
 #, c-format
 msgid "Close"
 msgstr "Cau"
@@ -315,19 +351,16 @@ msgstr "Pecyn heb ei osod"
 
 #: drakbug:234
 #, c-format
-msgid ""
-"You must type in what you were doing when this bug happened in order to "
-"enable us to reproduce this bug and to increase the odds of fixing it"
-msgstr ""
-"Rhaid teipio beth roeddech yn ei wneud pan ddigwyddodd y gwall er mwyn i ni "
-"ail greu'r gwall ac i gynyddu'r siawns o'i drwsio."
+msgid "You must type in what you were doing when this bug happened in order to enable us to reproduce this bug and to increase the odds of fixing it"
+msgstr "Rhaid teipio beth roeddech yn ei wneud pan ddigwyddodd y gwall er mwyn i ni ail greu'r gwall ac i gynyddu'r siawns o'i drwsio."
 
 #: drakbug:235
 #, c-format
 msgid "Thanks."
 msgstr "Diolch."
 
-#: drakclock:30 draksec:334
+#: drakclock:30
+#: draksec:334
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "Gosodiadau Dyddiad Cloc a Chylchedd Amser"
@@ -401,7 +434,10 @@ msgstr "Rhowch gyfeiriad gweinydd NTP dilys."
 msgid "Could not synchronize with %s."
 msgstr "Methu cydweddu gyda %s."
 
-#: drakclock:127 draksplash:93 logdrake:175 scannerdrake:492
+#: drakclock:127
+#: draksplash:93
+#: logdrake:175
+#: scannerdrake:492
 #, c-format
 msgid "Quit"
 msgstr "Gadael"
@@ -411,7 +447,8 @@ msgstr "Gadael"
 msgid "Retry"
 msgstr "Ail geisiwch."
 
-#: drakclock:151 drakclock:161
+#: drakclock:151
+#: drakclock:161
 #, c-format
 msgid "Reset"
 msgstr "Ailosod"
@@ -454,12 +491,8 @@ msgstr "Mae'r newid wedi ei gyflawni. Ailgychwyn gwasanaeth dm?"
 
 #: drakedm:74
 #, c-format
-msgid ""
-"You are going to close all running programs and lose your current session. "
-"Are you really sure that you want to restart the dm service?"
-msgstr ""
-"Rydych yn mynd i gau pob rhaglen sy'n rhedeg a cholli eich sesiwn presennol. "
-"Ydych chi'n siŵr eich bod am ailgychwyn y gwasanaeth dm?"
+msgid "You are going to close all running programs and lose your current session. Are you really sure that you want to restart the dm service?"
+msgstr "Rydych yn mynd i gau pob rhaglen sy'n rhedeg a cholli eich sesiwn presennol. Ydych chi'n siŵr eich bod am ailgychwyn y gwasanaeth dm?"
 
 #: drakfont:188
 #, c-format
@@ -481,8 +514,14 @@ msgstr "Heb ganfod ffontiau"
 msgid "parse all fonts"
 msgstr "pob ffont"
 
-#: drakfont:223 drakfont:264 drakfont:338 drakfont:379 drakfont:387
-#: drakfont:413 drakfont:431 drakfont:445
+#: drakfont:223
+#: drakfont:264
+#: drakfont:338
+#: drakfont:379
+#: drakfont:387
+#: drakfont:413
+#: drakfont:431
+#: drakfont:445
 #, c-format
 msgid "done"
 msgstr "gorffen"
@@ -532,7 +571,8 @@ msgstr "arhoswch yn ystod ttmkfdir..."
 msgid "True Type install done"
 msgstr "Wedi gosod True Type"
 
-#: drakfont:354 drakfont:369
+#: drakfont:354
+#: drakfont:369
 #, c-format
 msgid "type1inst building"
 msgstr "adeiladu math 1inst"
@@ -547,12 +587,14 @@ msgstr "cyfeirio Ghostscript"
 msgid "Suppress Temporary Files"
 msgstr "Llethu Ffeiliau Dros dro"
 
-#: drakfont:383 drakfont:441
+#: drakfont:383
+#: drakfont:441
 #, c-format
 msgid "Restart XFS"
 msgstr "Ail gychwyn XFS"
 
-#: drakfont:429 drakfont:439
+#: drakfont:429
+#: drakfont:439
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "Llethu ffeiliau Ffontiau"
@@ -560,17 +602,13 @@ msgstr "Llethu ffeiliau Ffontiau"
 #: drakfont:449
 #, c-format
 msgid ""
-"Before installing any fonts, be sure that you have the right to use and "
-"install them on your system.\n"
+"Before installing any fonts, be sure that you have the right to use and install them on your system.\n"
 "\n"
-"You can install the fonts the normal way. In rare cases, bogus fonts may "
-"hang up your X Server."
+"You can install the fonts the normal way. In rare cases, bogus fonts may hang up your X Server."
 msgstr ""
-"Cyn gosod unrhyw ffontiau, gwnewch yn siŵr fod gennych yr hawl i'w defnyddio "
-"a'u gosod ar eich system.\n"
+"Cyn gosod unrhyw ffontiau, gwnewch yn siŵr fod gennych yr hawl i'w defnyddio a'u gosod ar eich system.\n"
 "\n"
-"- Gallwch osod y ffontiau yn y dull arferol. Mewn achosion prin, gall "
-"ffontiau ffug rewi Gwasanaethwr X."
+"- Gallwch osod y ffontiau yn y dull arferol. Mewn achosion prin, gall ffontiau ffug rewi Gwasanaethwr X."
 
 #: drakfont:489
 #, c-format
@@ -582,7 +620,8 @@ msgstr "Gosod Ffont"
 msgid "DrakFont"
 msgstr "DrakFont"
 
-#: drakfont:501 drakfont:653
+#: drakfont:501
+#: drakfont:653
 #, c-format
 msgid "Font List"
 msgstr "Rhestr Ffontiau"
@@ -597,12 +636,14 @@ msgstr "Estyn Ffontiau Windows"
 msgid "About"
 msgstr "Ynghylch"
 
-#: drakfont:511 drakfont:552
+#: drakfont:511
+#: drakfont:552
 #, c-format
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: drakfont:512 drakfont:732
+#: drakfont:512
+#: drakfont:732
 #, c-format
 msgid "Uninstall"
 msgstr "Dad osod"
@@ -617,7 +658,8 @@ msgstr "Mewnforio"
 msgid "Drakfont"
 msgstr "Drakfont"
 
-#: drakfont:533 harddrake2:234
+#: drakfont:533
+#: harddrake2:234
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Hawlfraint (C) %s  Mandriva"
@@ -627,14 +669,16 @@ msgstr "Hawlfraint (C) %s  Mandriva"
 msgid "Font installer."
 msgstr "Gosod ffont."
 
-#: drakfont:537 harddrake2:238
+#: drakfont:537
+#: harddrake2:238
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: drakfont:544 harddrake2:243
+#: drakfont:544
+#: harddrake2:243
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Rhoslyn Prys <post@meddal.com>\n"
@@ -664,7 +708,10 @@ msgstr "Abiword"
 msgid "Generic Printers"
 msgstr "Argraffyddion Generig"
 
-#: drakfont:573 drakfont:583 draksplash:180 drakups:210
+#: drakfont:573
+#: drakfont:583
+#: draksplash:180
+#: drakups:210
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -679,7 +726,11 @@ msgstr "Dewiswch ffeil neu gyfeiriadur y ffont a chlicio 'Ychwanegu'"
 msgid "File Selection"
 msgstr "Dewis ffeiliau"
 
-#: drakfont:583 drakfont:663 drakfont:747 draksplash:180 drakups:217
+#: drakfont:583
+#: drakfont:663
+#: drakfont:747
+#: draksplash:180
+#: drakups:217
 #: logdrake:175
 #, c-format
 msgid "Cancel"
@@ -690,17 +741,25 @@ msgstr "Diddymu"
 msgid "Fonts"
 msgstr "Wynebfathau"
 
-#: drakfont:651 draksec:330
+#: drakfont:651
+#: draksec:330
 #, c-format
 msgid "Import fonts"
 msgstr "Mewnforio ffontiau"
 
-#: drakfont:657 drakups:299 drakups:361 drakups:381
+#: drakfont:657
+#: drakups:299
+#: drakups:361
+#: drakups:381
 #, c-format
 msgid "Add"
 msgstr "Ychwanegu"
 
-#: drakfont:658 drakfont:746 drakups:301 drakups:363 drakups:383
+#: drakfont:658
+#: drakfont:746
+#: drakups:301
+#: drakups:363
+#: drakups:383
 #, c-format
 msgid "Remove"
 msgstr "Tynnu"
@@ -715,12 +774,16 @@ msgstr "Gosod"
 msgid "Are you sure you want to uninstall the following fonts?"
 msgstr "Ydych chi'n siŵr eich bod am ddadosod y ffontiau canlynol?"
 
-#: drakfont:699 draksec:59 harddrake2:323
+#: drakfont:699
+#: draksec:59
+#: harddrake2:323
 #, c-format
 msgid "Yes"
 msgstr "Iawn"
 
-#: drakfont:701 draksec:58 harddrake2:324
+#: drakfont:701
+#: draksec:58
+#: harddrake2:324
 #, c-format
 msgid "No"
 msgstr "Na"
@@ -735,12 +798,14 @@ msgstr "Dad ddewis Popeth"
 msgid "Select All"
 msgstr "Dewis Popeth"
 
-#: drakfont:760 drakfont:779
+#: drakfont:760
+#: drakfont:779
 #, c-format
 msgid "Importing fonts"
 msgstr "Mewnforio ffontiau"
 
-#: drakfont:764 drakfont:784
+#: drakfont:764
+#: drakfont:784
 #, c-format
 msgid "Initial tests"
 msgstr "Prawf Init"
@@ -775,15 +840,13 @@ msgstr "Wedi'r dad osod"
 msgid ""
 " drakhelp 0.1\n"
 "Copyright (C) %s Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU GPL.\n"
 "\n"
 "Usage: \n"
 msgstr ""
 " drakhelp 0.1\n"
 "Hawlfraint (C) %s Mandriva.\n"
-"Mae hwn yn feddalwedd rhydd ac mae modd ei ailddosbarthu o dan amodau GNU "
-"GPL.\n"
+"Mae hwn yn feddalwedd rhydd ac mae modd ei ailddosbarthu o dan amodau GNU GPL.\n"
 "\n"
 "Defnydd: \n"
 
@@ -794,20 +857,13 @@ msgstr " --help                - dangos cymorth     \n"
 
 #: drakhelp:23
 #, c-format
-msgid ""
-" --id <id_label>       - load the html help page which refers to id_label\n"
-msgstr ""
-" --id <id_label>       - llwyth y dudalen cymorth html  sy'n cyfeirio at "
-"id_label\n"
+msgid " --id <id_label>       - load the html help page which refers to id_label\n"
+msgstr " --id <id_label>       - llwyth y dudalen cymorth html  sy'n cyfeirio at id_label\n"
 
 #: drakhelp:24
 #, c-format
-msgid ""
-" --doc <link>          - link to another web page ( for WM welcome "
-"frontend)\n"
-msgstr ""
-" --doc <link>          - cyswllt i dudalen we arall ( ar gyfer blaen croeso  "
-"WM)\n"
+msgid " --doc <link>          - link to another web page ( for WM welcome frontend)\n"
+msgstr " --doc <link>          - cyswllt i dudalen we arall ( ar gyfer blaen croeso  WM)\n"
 
 #: drakhelp:52
 #, c-format
@@ -844,22 +900,26 @@ msgstr "Caniatâd Diogelwch"
 msgid "Editable"
 msgstr "Golygadwy"
 
-#: drakperm:50 drakperm:319
+#: drakperm:50
+#: drakperm:319
 #, c-format
 msgid "Path"
 msgstr "Llwybr"
 
-#: drakperm:50 drakperm:248
+#: drakperm:50
+#: drakperm:248
 #, c-format
 msgid "User"
 msgstr "Defnyddiwr"
 
-#: drakperm:50 drakperm:248
+#: drakperm:50
+#: drakperm:248
 #, c-format
 msgid "Group"
 msgstr "Grŵp"
 
-#: drakperm:50 drakperm:331
+#: drakperm:50
+#: drakperm:331
 #, c-format
 msgid "Permissions"
 msgstr "Caniatâd"
@@ -869,7 +929,9 @@ msgstr "Caniatâd"
 msgid "Add a new rule"
 msgstr "Ychwanegu rheol newydd"
 
-#: drakperm:67 drakperm:102 drakperm:127
+#: drakperm:67
+#: drakperm:102
+#: drakperm:127
 #, c-format
 msgid "Edit current rule"
 msgstr "Golygu'r rheol bresennol"
@@ -877,14 +939,11 @@ msgstr "Golygu'r rheol bresennol"
 #: drakperm:109
 #, c-format
 msgid ""
-"Here you can see files to use in order to fix permissions, owners, and "
-"groups via msec.\n"
+"Here you can see files to use in order to fix permissions, owners, and groups via msec.\n"
 "You can also edit your own rules which will owerwrite the default rules."
 msgstr ""
-"Mae modd gweld ffeiliau i'w defnyddio i drwsio caniatâd, perchnogion, a "
-"grwpiau drwy msec.\n"
-"Mae modd i chi olygu eich rheolau eich hun fydd yn ysgrifennu dros y rheolau "
-"rhagosodedig."
+"Mae modd gweld ffeiliau i'w defnyddio i drwsio caniatâd, perchnogion, a grwpiau drwy msec.\n"
+"Mae modd i chi olygu eich rheolau eich hun fydd yn ysgrifennu dros y rheolau rhagosodedig."
 
 #: drakperm:111
 #, c-format
@@ -935,7 +994,10 @@ msgstr "Dileu"
 msgid "Delete selected rule"
 msgstr "Dileu'r rheol hon"
 
-#: drakperm:127 drakups:300 drakups:362 drakups:382
+#: drakperm:127
+#: drakups:300
+#: drakups:362
+#: drakups:382
 #, c-format
 msgid "Edit"
 msgstr "Golygu"
@@ -1010,8 +1072,7 @@ msgid ""
 " only owner of directory or file in this directory can delete it"
 msgstr ""
 "Defnydd cyfeiriadur:\n"
-" dim ond perchennog y cyfeiriadur neu ffeil yn y cyfeiriadur hwn fydd yn "
-"cael ei ddileu."
+" dim ond perchennog y cyfeiriadur neu ffeil yn y cyfeiriadur hwn fydd yn cael ei ddileu."
 
 #: drakperm:271
 #, c-format
@@ -1112,9 +1173,18 @@ msgstr "Rhagosodedig"
 msgid "Ignore"
 msgstr "Anwybyddu"
 
-#: draksec:72 drakups:99 harddrake2:369 scannerdrake:66 scannerdrake:70
-#: scannerdrake:78 scannerdrake:319 scannerdrake:368 scannerdrake:505
-#: scannerdrake:509 scannerdrake:531 service_harddrake:253
+#: draksec:72
+#: drakups:99
+#: harddrake2:369
+#: scannerdrake:66
+#: scannerdrake:70
+#: scannerdrake:78
+#: scannerdrake:319
+#: scannerdrake:368
+#: scannerdrake:505
+#: scannerdrake:509
+#: scannerdrake:531
+#: service_harddrake:253
 #, c-format
 msgid "Please wait"
 msgstr "Arhoswch"
@@ -1128,31 +1198,22 @@ msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
 "\n"
 "\n"
-"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
-"will receive security alerts if the\n"
-"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
-"username or an email.\n"
+"The '<span weight=\"bold\">Security Administrator</span>' is the one who will receive security alerts if the\n"
+"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a username or an email.\n"
 "\n"
 "\n"
-"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
-"one of the six preconfigured security levels\n"
-"provided with msec. These levels range from '<span weight=\"bold\">poor</"
-"span>' security and ease of use, to\n"
-"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
-"server applications:\n"
+"The '<span weight=\"bold\">Security Level</span>' menu allows you to select one of the six preconfigured security levels\n"
+"provided with msec. These levels range from '<span weight=\"bold\">poor</span>' security and ease of use, to\n"
+"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive server applications:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
-"very\n"
-"easy to use security level. It should only be used for machines not "
-"connected to\n"
+"<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but very\n"
+"easy to use security level. It should only be used for machines not connected to\n"
 "any network and that are not accessible to everybody.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Standard</span>: This is the standard "
-"security\n"
-"recommended for a computer that will be used to connect to the Internet as "
-"a\n"
+"<span foreground=\"royalblue3\">Standard</span>: This is the standard security\n"
+"recommended for a computer that will be used to connect to the Internet as a\n"
 "client.\n"
 "\n"
 "\n"
@@ -1160,16 +1221,12 @@ msgid ""
 "restrictions, and more automatic checks are run every night.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Higher</span>: The security is now high "
-"enough\n"
-"to use the system as a server which can accept connections from many "
-"clients. If\n"
-"your machine is only a client on the Internet, you should choose a lower "
-"level.\n"
+"<span foreground=\"royalblue3\">Higher</span>: The security is now high enough\n"
+"to use the system as a server which can accept connections from many clients. If\n"
+"your machine is only a client on the Internet, you should choose a lower level.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the "
-"previous\n"
+"<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the previous\n"
 "level, but the system is entirely closed and security features are at their\n"
 "maximum"
 msgstr ""
@@ -1189,15 +1246,12 @@ msgstr ""
 "rhaglenni gwasanaethwr sensitif:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Gwan</span>: Mae'n hollol anniogel ond yn "
-"hawdd iawn i'w\n"
-"ddefnyddio. Dim ond ar gyfer peiriannau had ydynt wedi eu cysylltu ag unrhyw "
-"rwydwaith ac nad\n"
+"<span foreground=\"royalblue3\">Gwan</span>: Mae'n hollol anniogel ond yn hawdd iawn i'w\n"
+"ddefnyddio. Dim ond ar gyfer peiriannau had ydynt wedi eu cysylltu ag unrhyw rwydwaith ac nad\n"
 "ydynt ar agor i bawb\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Safonol</span>:Dyma'r diogelwch safonol ar "
-"gyfer\n"
+"<span foreground=\"royalblue3\">Safonol</span>:Dyma'r diogelwch safonol ar gyfer\n"
 "cyfrifiadur sy'n gysylltiedig â'r rhyngrwyd fel cleient.\n"
 "\n"
 "\n"
@@ -1205,19 +1259,16 @@ msgstr ""
 "ac mae gwiriadau awtomatig ychwanegol yn cael eu rhedeg bob nos.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Uwch</span>: Mae'r diogelwch yn ddigon "
-"uchel\n"
-"i ddefnyddio'r system fel gweinydd sy'n gallu derbyn cysylltiadau gan lawer "
-"o\n"
-"gleientiaid. Os mai eich peiriant chi yw'r unig gleient ar i Fewnrwyd, "
-"dylech ddefnyddio lefel is.\n"
+"<span foreground=\"royalblue3\">Uwch</span>: Mae'r diogelwch yn ddigon uchel\n"
+"i ddefnyddio'r system fel gweinydd sy'n gallu derbyn cysylltiadau gan lawer o\n"
+"gleientiaid. Os mai eich peiriant chi yw'r unig gleient ar i Fewnrwyd, dylech ddefnyddio lefel is.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Paranoia</span>. Mae'n debyg i'r lefel "
-"blaenorol ond mae'r\n"
+"<span foreground=\"royalblue3\">Paranoia</span>. Mae'n debyg i'r lefel blaenorol ond mae'r\n"
 "system yn hollol gaeedig ac mae'r nodweddion diogelwch ar eu heithaf."
 
-#: draksec:147 harddrake2:213
+#: draksec:147
+#: harddrake2:213
 #, c-format
 msgid ""
 "Description of the fields:\n"
@@ -1286,7 +1337,8 @@ msgstr "Cyfrinair root"
 msgid "User password"
 msgstr "Cyfrinair defnyddiwr"
 
-#: draksec:314 draksec:360
+#: draksec:314
+#: draksec:360
 #, c-format
 msgid "Software Management"
 msgstr "Rheoli Meddalwedd"
@@ -1361,7 +1413,8 @@ msgstr "Rhannu Cysylltiadau"
 msgid "Backups"
 msgstr "Wrth gefn"
 
-#: draksec:331 logdrake:52
+#: draksec:331
+#: logdrake:52
 #, c-format
 msgid "Logs"
 msgstr "Cofnodion"
@@ -1420,8 +1473,7 @@ msgstr "Heb ganfod Cerdyn Sain!"
 #: draksound:51
 #, c-format
 msgid ""
-"No Sound Card has been detected on your machine. Please verify that a Linux-"
-"supported Sound Card is correctly plugged in.\n"
+"No Sound Card has been detected on your machine. Please verify that a Linux-supported Sound Card is correctly plugged in.\n"
 "\n"
 "\n"
 "You can visit our hardware database at:\n"
@@ -1429,8 +1481,7 @@ msgid ""
 "\n"
 "http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
-"Nid oes Cerdyn Sain wedi ei ganfod ar eich peiriant. Gwriwch fod Cerdyn Sain "
-"sy'n cael ei gynnal gan Linux wedi ei osod yn gywir.\n"
+"Nid oes Cerdyn Sain wedi ei ganfod ar eich peiriant. Gwriwch fod Cerdyn Sain sy'n cael ei gynnal gan Linux wedi ei osod yn gywir.\n"
 "\n"
 "\n"
 "Cewch ymweld â'n cronfa ddata caledwedd yn:\n"
@@ -1444,14 +1495,12 @@ msgid ""
 "\n"
 "\n"
 "\n"
-"Note: if you've an ISA PnP sound card, you'll have to use the alsaconf or "
-"the sndconfig program.  Just type \"alsaconf\" or \"sndconfig\" in a console."
+"Note: if you've an ISA PnP sound card, you'll have to use the alsaconf or the sndconfig program.  Just type \"alsaconf\" or \"sndconfig\" in a console."
 msgstr ""
 "\n"
 "\n"
 "\n"
-"Nodyn: os oes gennych gerdyn sain ISA PnP, bydd rhaid i chi ddefnyddio "
-"rhaglen sndconfig. Teipiwch \"sndconfig\" mewn consol."
+"Nodyn: os oes gennych gerdyn sain ISA PnP, bydd rhaid i chi ddefnyddio rhaglen sndconfig. Teipiwch \"sndconfig\" mewn consol."
 
 #: draksplash:32
 #, c-format
@@ -1551,7 +1600,8 @@ msgstr "Math o raddiant"
 msgid "Choose text color"
 msgstr "Dewiswch liw'r testun"
 
-#: draksplash:67 draksplash:74
+#: draksplash:67
+#: draksplash:74
 #, c-format
 msgid "Choose picture"
 msgstr "Dewis llun"
@@ -1662,8 +1712,7 @@ msgstr ""
 msgid ""
 "We're going to add an UPS device.\n"
 "\n"
-"Do you want to autodetect UPS devices connected to this machine or to "
-"manually select them?"
+"Do you want to autodetect UPS devices connected to this machine or to manually select them?"
 msgstr ""
 "Rydym am ychwanegu dyfais UPS.\n"
 "\n"
@@ -1674,12 +1723,16 @@ msgstr ""
 msgid "Autodetection"
 msgstr "Awtoganfod"
 
-#: drakups:99 harddrake2:369
+#: drakups:99
+#: harddrake2:369
 #, c-format
 msgid "Detection in progress"
 msgstr "Canfod ar waith"
 
-#: drakups:118 drakups:157 logdrake:457 logdrake:463
+#: drakups:118
+#: drakups:157
+#: logdrake:457
+#: logdrake:463
 #, c-format
 msgid "Congratulations"
 msgstr "Llongyfarchiadau"
@@ -1694,7 +1747,8 @@ msgstr "Mae'r dewin wedi ychwanegu'r dyfeiriau UPS yn llwyddiannus:"
 msgid "No new UPS devices was found"
 msgstr "Wedi canfod dyfais UPS newydd"
 
-#: drakups:126 drakups:138
+#: drakups:126
+#: drakups:138
 #, c-format
 msgid "UPS driver configuration"
 msgstr "Ffurfweddiad gyrrwr UPS"
@@ -1758,18 +1812,24 @@ msgstr "Mae'r dewin wedi ffurfweddu eich dyfais UPS \"%s\"  yn llwyddiannus."
 msgid "UPS devices"
 msgstr "Dyfeisiau UPS"
 
-#: drakups:249 drakups:268 drakups:284 harddrake2:87 harddrake2:113
+#: drakups:249
+#: drakups:268
+#: drakups:284
+#: harddrake2:87
+#: harddrake2:113
 #: harddrake2:120
 #, c-format
 msgid "Name"
 msgstr "Enw"
 
-#: drakups:249 harddrake2:135
+#: drakups:249
+#: harddrake2:135
 #, c-format
 msgid "Driver"
 msgstr "Gyrrwr"
 
-#: drakups:249 harddrake2:53
+#: drakups:249
+#: harddrake2:53
 #, c-format
 msgid "Port"
 msgstr "Porth"
@@ -1804,7 +1864,8 @@ msgstr "Rheolau"
 msgid "Action"
 msgstr "Gweithred"
 
-#: drakups:297 harddrake2:84
+#: drakups:297
+#: harddrake2:84
 #, c-format
 msgid "Level"
 msgstr "Lefel"
@@ -1814,7 +1875,8 @@ msgstr "Lefel"
 msgid "ACL name"
 msgstr "Enw ACL"
 
-#: drakups:297 finish-install:119
+#: drakups:297
+#: finish-install:119
 #, c-format
 msgid "Password"
 msgstr "Cyfrinair"
@@ -1824,7 +1886,8 @@ msgstr "Cyfrinair"
 msgid "UPS Management"
 msgstr "Rheoli UPS"
 
-#: drakups:333 drakups:342
+#: drakups:333
+#: drakups:342
 #, c-format
 msgid "DrakUPS"
 msgstr "DrakUPS"
@@ -1843,8 +1906,7 @@ msgstr "Heb ganfod Cerdyn Teledu!"
 #: drakxtv:69
 #, c-format
 msgid ""
-"No TV Card has been detected on your machine. Please verify that a Linux-"
-"supported Video/TV Card is correctly plugged in.\n"
+"No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in.\n"
 "\n"
 "\n"
 "You can visit our hardware database at:\n"
@@ -1852,8 +1914,7 @@ msgid ""
 "\n"
 "http://www.mandrivalinux.com/en/hardware.php3"
 msgstr ""
-"Nid oes Cerdyn Teledu wedi ei ganfod ar eich peiriant. Gwiriwch fod Cerdyn "
-"Fideo/Teledu sy'n cael ei gynnal gan Linux wedi ei osod yn gywir.\n"
+"Nid oes Cerdyn Teledu wedi ei ganfod ar eich peiriant. Gwiriwch fod Cerdyn Fideo/Teledu sy'n cael ei gynnal gan Linux wedi ei osod yn gywir.\n"
 "\n"
 "\n"
 "Cewch ymweld â'n cronfa ddata caledwedd yn:\n"
@@ -1871,7 +1932,9 @@ msgstr "Bysellfwrdd"
 msgid "Please, choose your keyboard layout."
 msgstr "Dewiswch gynllun allweddell."
 
-#: finish-install:117 finish-install:135 finish-install:147
+#: finish-install:117
+#: finish-install:135
+#: finish-install:147
 #, c-format
 msgid "Encrypted home partition"
 msgstr "Rhaniad cartref wedi ei amgryptio"
@@ -1906,31 +1969,27 @@ msgstr "Gyrwyr eraill"
 msgid "the list of alternative drivers for this sound card"
 msgstr "rhestr o yrrwr eraill ar gyfer eich cerdyn sain"
 
-#: harddrake2:30 harddrake2:122
+#: harddrake2:30
+#: harddrake2:122
 #, c-format
 msgid "Bus"
 msgstr "Bws"
 
 #: harddrake2:31
 #, c-format
-msgid ""
-"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-"dyma'r bws corfforol i'r ddyfais gael ei gysylltu iddo (e.e. PCI, USB,...)"
+msgid "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
+msgstr "dyma'r bws corfforol i'r ddyfais gael ei gysylltu iddo (e.e. PCI, USB,...)"
 
-#: harddrake2:33 harddrake2:148
+#: harddrake2:33
+#: harddrake2:148
 #, c-format
 msgid "Bus identification"
 msgstr "Dynodiad bws"
 
 #: harddrake2:34
 #, c-format
-msgid ""
-"- PCI and USB devices: this lists the vendor, device, subvendor and "
-"subdevice PCI/USB ids"
-msgstr ""
-"- dyfeisiau PCI ac USB : dyma restr gwerthwyr, dyfais, is werthwyr ac is "
-"ddyfais PCI/USB"
+msgid "- PCI and USB devices: this lists the vendor, device, subvendor and subdevice PCI/USB ids"
+msgstr "- dyfeisiau PCI ac USB : dyma restr gwerthwyr, dyfais, is werthwyr ac is ddyfais PCI/USB"
 
 #: harddrake2:36
 #, c-format
@@ -2039,7 +2098,8 @@ msgstr "Dosbarth y cyfrwng"
 msgid "class of hardware device"
 msgstr "dosbarth y ddyfais caledwedd"
 
-#: harddrake2:52 harddrake2:85
+#: harddrake2:52
+#: harddrake2:85
 #, c-format
 msgid "Model"
 msgstr "Model"
@@ -2064,7 +2124,8 @@ msgstr "Prif raniadau"
 msgid "the number of the primary partitions"
 msgstr "y nifer o brif raniadau"
 
-#: harddrake2:55 harddrake2:90
+#: harddrake2:55
+#: harddrake2:90
 #, c-format
 msgid "Vendor"
 msgstr "Gwerthwr"
@@ -2171,14 +2232,8 @@ msgstr "Bogomips"
 
 #: harddrake2:68
 #, c-format
-msgid ""
-"the GNU/Linux kernel needs to run a calculation loop at boot time to "
-"initialize a timer counter.  Its result is stored as bogomips as a way to "
-"\"benchmark\" the cpu."
-msgstr ""
-"mae angen i'r cnewyllyn GNU/Linux gyflawni cyfrif cylch wrth gychwyn i "
-"gychwyn y cyfrif amser. Mae'r canlyniad yn cael ei gadw fel bogomips fel "
-"ffordd o \"feincnod\" y cpu."
+msgid "the GNU/Linux kernel needs to run a calculation loop at boot time to initialize a timer counter.  Its result is stored as bogomips as a way to \"benchmark\" the cpu."
+msgstr "mae angen i'r cnewyllyn GNU/Linux gyflawni cyfrif cylch wrth gychwyn i gychwyn y cyfrif amser. Mae'r canlyniad yn cael ei gadw fel bogomips fel ffordd o \"feincnod\" y cpu."
 
 #: harddrake2:69
 #, c-format
@@ -2228,13 +2283,8 @@ msgstr "Amledd (MHz)"
 
 #: harddrake2:75
 #, c-format
-msgid ""
-"the CPU frequency in MHz (Megahertz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
-msgstr ""
-"amledd y cpu mewn MHz (y nifer o gyfarwyddiadau'r eiliad mae'r cpu'n gallu "
-"eu trin)"
+msgid "the CPU frequency in MHz (Megahertz which in first approximation may be coarsely assimilated to number of instructions the cpu is able to execute per second)"
+msgstr "amledd y cpu mewn MHz (y nifer o gyfarwyddiadau'r eiliad mae'r cpu'n gallu eu trin)"
 
 #: harddrake2:76
 #, c-format
@@ -2253,14 +2303,8 @@ msgstr "Gwall Fdiv"
 
 #: harddrake2:78
 #, c-format
-msgid ""
-"Early Intel Pentium chips manufactured have a bug in their floating point "
-"processor which did not achieve the required precision when performing a "
-"Floating point DIVision (FDIV)"
-msgstr ""
-"Mae gan brosesyddion Pentium cynnar wall yn eu prosesydd pwynt arnofio nad "
-"yw'n ymgyrraedd â'r cywirdeb angenrheidiol wrth berfformio Floating point "
-"DIVision (FDIV)"
+msgid "Early Intel Pentium chips manufactured have a bug in their floating point processor which did not achieve the required precision when performing a Floating point DIVision (FDIV)"
+msgstr "Mae gan brosesyddion Pentium cynnar wall yn eu prosesydd pwynt arnofio nad yw'n ymgyrraedd â'r cywirdeb angenrheidiol wrth berfformio Floating point DIVision (FDIV)"
 
 #: harddrake2:79
 #, c-format
@@ -2280,8 +2324,7 @@ msgstr "P'un ai oes gan y FPU fector irq"
 #: harddrake2:80
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
-msgstr ""
-"mae iawn yn golygu fod gan y cyd-brosesydd fector eithriad yn gysylltiedig"
+msgstr "mae iawn yn golygu fod gan y cyd-brosesydd fector eithriad yn gysylltiedig"
 
 #: harddrake2:81
 #, c-format
@@ -2291,8 +2334,7 @@ msgstr "Gwall F00f"
 #: harddrake2:81
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
-msgstr ""
-"roedd rhai Pentium cynnar yn wallus ac yn rhewi wrth ddadgodio F00F bytecode"
+msgstr "roedd rhai Pentium cynnar yn wallus ac yn rhewi wrth ddadgodio F00F bytecode"
 
 #: harddrake2:82
 #, c-format
@@ -2301,12 +2343,8 @@ msgstr "Gwall halt"
 
 #: harddrake2:83
 #, c-format
-msgid ""
-"Some of the early i486DX-100 chips cannot reliably return to operating mode "
-"after the \"halt\" instruction is used"
-msgstr ""
-"Nid yw rhai prosesyddion i486DX-100 cynnar yn gallu dychwelyd i'w cyflwr "
-"gweithredu a'r ôl defnyddio \"halt\""
+msgid "Some of the early i486DX-100 chips cannot reliably return to operating mode after the \"halt\" instruction is used"
+msgstr "Nid yw rhai prosesyddion i486DX-100 cynnar yn gallu dychwelyd i'w cyflwr gweithredu a'r ôl defnyddio \"halt\""
 
 #: harddrake2:84
 #, c-format
@@ -2365,14 +2403,8 @@ msgstr "Diogelwch ysgrifennu"
 
 #: harddrake2:91
 #, c-format
-msgid ""
-"the WP flag in the CR0 register of the cpu enforce write protection at the "
-"memory page level, thus enabling the processor to prevent unchecked kernel "
-"accesses to user memory (aka this is a bug guard)"
-msgstr ""
-"mae'r faner WP yng nghofrestr CRO y cpu yn gorfodi diogelwch rhag ysgrifennu "
-"ar lefel cof tudalen, felly'n caniatáu'r prosesydd i atal mynediad i wirio "
-"cnewyllyn i gof y defnyddiwr (hy diogelwch rhag gwall)"
+msgid "the WP flag in the CR0 register of the cpu enforce write protection at the memory page level, thus enabling the processor to prevent unchecked kernel accesses to user memory (aka this is a bug guard)"
+msgstr "mae'r faner WP yng nghofrestr CRO y cpu yn gorfodi diogelwch rhag ysgrifennu ar lefel cof tudalen, felly'n caniatáu'r prosesydd i atal mynediad i wirio cnewyllyn i gof y defnyddiwr (hy diogelwch rhag gwall)"
 
 #: harddrake2:95
 #, c-format
@@ -2412,12 +2444,10 @@ msgstr "Rhif yr uned resymegol"
 #: harddrake2:101
 #, c-format
 msgid ""
-"the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
-"identified by a\n"
+"the SCSI target number (LUN). SCSI devices connected to a host are uniquely identified by a\n"
 "channel number, a target id and a logical unit number"
 msgstr ""
-"y rhif targed SCSI (LUN). Mae dyfeisiau SCSI sydd wedi eu cysylltu i "
-"westeiwr yn cael eu\n"
+"y rhif targed SCSI (LUN). Mae dyfeisiau SCSI sydd wedi eu cysylltu i westeiwr yn cael eu\n"
 "hadnabod yn unigryw drwy rif sianel, enw targed a rhif uned resymegol"
 
 #. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...)
@@ -2441,7 +2471,8 @@ msgstr "Maint Galluogwyd"
 msgid "Enabled size of the memory bank"
 msgstr "Maint galluogi'r banc cof"
 
-#: harddrake2:110 harddrake2:119
+#: harddrake2:110
+#: harddrake2:119
 #, c-format
 msgid "Type"
 msgstr "Math"
@@ -2478,11 +2509,8 @@ msgstr "Ffeil dyfais"
 
 #: harddrake2:117
 #, c-format
-msgid ""
-"the device file used to communicate with the kernel driver for the mouse"
-msgstr ""
-"y ffeil dyfais sy'n cael ei ddefnyddio i gyfathrebu â gyrrwr y cnewyllyn ar "
-"gyfer y llygoden"
+msgid "the device file used to communicate with the kernel driver for the mouse"
+msgstr "y ffeil dyfais sy'n cael ei ddefnyddio i gyfathrebu â gyrrwr y cnewyllyn ar gyfer y llygoden"
 
 #: harddrake2:118
 #, c-format
@@ -2527,15 +2555,19 @@ msgstr "Protocol llygoden defnyddir gan y X11"
 #: harddrake2:123
 #, c-format
 msgid "the protocol that the graphical desktop use with the mouse"
-msgstr ""
-"y protocol mae'r bwrdd gwaith graffigol yn ei ddefnyddio gyda'r llygoden"
+msgstr "y protocol mae'r bwrdd gwaith graffigol yn ei ddefnyddio gyda'r llygoden"
 
-#: harddrake2:130 harddrake2:139 harddrake2:146 harddrake2:154 harddrake2:334
+#: harddrake2:130
+#: harddrake2:139
+#: harddrake2:146
+#: harddrake2:154
+#: harddrake2:334
 #, c-format
 msgid "Identification"
 msgstr "Dynodiad"
 
-#: harddrake2:131 harddrake2:147
+#: harddrake2:131
+#: harddrake2:147
 #, c-format
 msgid "Connection"
 msgstr "Cysylltiad"
@@ -2571,12 +2603,15 @@ msgid "Features"
 msgstr "Nodweddion"
 
 #. -PO: please keep all "/" characters !!!
-#: harddrake2:178 logdrake:78
+#: harddrake2:178
+#: logdrake:78
 #, c-format
 msgid "/_Options"
 msgstr "/_Dewisiadau"
 
-#: harddrake2:179 harddrake2:208 logdrake:80
+#: harddrake2:179
+#: harddrake2:208
+#: logdrake:80
 #, c-format
 msgid "/_Help"
 msgstr "/_Cymorth"
@@ -2628,12 +2663,8 @@ msgstr "Dewis dyfais!"
 
 #: harddrake2:221
 #, 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\")"
-msgstr ""
-"Unwaith i chi ddewis dyfais, gallwch weld esboniad mewn meysydd yn y ffrâm "
-"dde [\"Gwybodaeth\"]"
+msgid "Once you've selected a device, you'll be able to see the device information in fields displayed on the right frame (\"Information\")"
+msgstr "Unwaith i chi ddewis dyfais, gallwch weld esboniad mewn meysydd yn y ffrâm dde [\"Gwybodaeth\"]"
 
 #: harddrake2:227
 #, c-format
@@ -2660,7 +2691,8 @@ msgstr "Dyma HardDrake, offeryn ffurfweddu caledwedd %s."
 msgid "Detected hardware"
 msgstr "Caledwedd canfuwyd"
 
-#: harddrake2:272 scannerdrake:286
+#: harddrake2:272
+#: scannerdrake:286
 #, c-format
 msgid "Information"
 msgstr "Gwybodaeth"
@@ -2677,8 +2709,7 @@ msgstr "Rhedeg offeryn ffurfweddu"
 
 #: harddrake2:301
 #, c-format
-msgid ""
-"Click on a device in the left tree in order to display its information here."
+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"
 
 #: harddrake2:321
@@ -2745,9 +2776,7 @@ msgstr ", "
 #: localedrake:55
 #, c-format
 msgid "The change is done, but to be effective you must logout"
-msgstr ""
-"Mae'r newid wedi ei gyflawni, ond i fod yn effeithiol mae'n rhaid i chi "
-"allgofnodi"
+msgstr "Mae'r newid wedi ei gyflawni, ond i fod yn effeithiol mae'n rhaid i chi allgofnodi"
 
 #: logdrake:51
 #, c-format
@@ -2877,7 +2906,8 @@ msgstr "Calendr"
 msgid "Content of the file"
 msgstr "Cynnwys y ffeil"
 
-#: logdrake:163 logdrake:407
+#: logdrake:163
+#: logdrake:407
 #, c-format
 msgid "Mail alert"
 msgstr "Rhybudd e-bost"
@@ -2985,9 +3015,7 @@ msgstr "Gosodiad gwasanaeth"
 
 #: logdrake:422
 #, c-format
-msgid ""
-"You will receive an alert if one of the selected services is no longer "
-"running"
+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"
 
 #: logdrake:429
@@ -3029,12 +3057,8 @@ msgstr "Nid yw \"%s\" yn e-bost dilys nac yn ddefnyddiwr lleol presennol!"
 
 #: logdrake:450
 #, c-format
-msgid ""
-"\"%s\" is a local user, but you did not select a local smtp, so you must use "
-"a complete email address!"
-msgstr ""
-"Mae \"%s\" yn ddefnyddiwr lleol, ond nid ydych wedi dewis SMTP lleol, felly "
-"mae'n rhaid i chi ddefnyddio cyfeiriad e-bost cyfan!"
+msgid "\"%s\" is a local user, but you did not select a local smtp, so you must use a complete email address!"
+msgstr "Mae \"%s\" yn ddefnyddiwr lleol, ond nid ydych wedi dewis SMTP lleol, felly mae'n rhaid i chi ddefnyddio cyfeiriad e-bost cyfan!"
 
 #: logdrake:457
 #, c-format
@@ -3069,27 +3093,28 @@ msgstr "Atal Scannerdrake."
 
 #: scannerdrake:60
 #, c-format
-msgid ""
-"Could not install the packages needed to set up a scanner with Scannerdrake."
-msgstr ""
-"Methu gosod y pecynnau sydd eu hangen i osod sganiwr gyda Scannerdrake."
+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."
 
 #: scannerdrake:61
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Ni fydd Scannerdrake yn cael ei gychwyn."
 
-#: scannerdrake:67 scannerdrake:506
+#: scannerdrake:67
+#: scannerdrake:506
 #, c-format
 msgid "Searching for configured scanners..."
 msgstr "Chwilio am sganiwr wedi ei ffurfweddu..."
 
-#: scannerdrake:71 scannerdrake:510
+#: scannerdrake:71
+#: scannerdrake:510
 #, c-format
 msgid "Searching for new scanners..."
 msgstr "Chwilio am sganiwr newydd..."
 
-#: scannerdrake:79 scannerdrake:532
+#: scannerdrake:79
+#: scannerdrake:532
 #, c-format
 msgid "Re-generating list of configured scanners..."
 msgstr "Ail gynhyrchu rhestr o sganwyr wedi eu ffurfweddu..."
@@ -3099,7 +3124,8 @@ msgstr "Ail gynhyrchu rhestr o sganwyr wedi eu ffurfweddu..."
 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."
 
-#: scannerdrake:104 scannerdrake:115
+#: scannerdrake:104
+#: scannerdrake:115
 #, c-format
 msgid "Confirmation"
 msgstr "Gwiriad"
@@ -3112,8 +3138,7 @@ msgstr "Wedi canfod %s ar %s, ei ffurfweddi'n awtomatig?"
 #: scannerdrake:116
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
-msgstr ""
-"Nid yw %s yng nghronfa ddata sganwyr. Hoffech chi ei ffurfweddu â llaw?"
+msgstr "Nid yw %s yng nghronfa ddata sganwyr. Hoffech chi ei ffurfweddu â llaw?"
 
 #: scannerdrake:130
 #, c-format
@@ -3135,7 +3160,8 @@ msgstr "Dewiswch fodel y sganiwr (Canfod: %s)"
 msgid "Select a scanner model (Port: %s)"
 msgstr "Dewiswch fodel y sganiwr (Porth: %s)"
 
-#: scannerdrake:136 scannerdrake:139
+#: scannerdrake:136
+#: scannerdrake:139
 #, c-format
 msgid " (UNSUPPORTED)"
 msgstr "(HEB EI GYNNAL)"
@@ -3145,64 +3171,68 @@ msgstr "(HEB EI GYNNAL)"
 msgid "The %s is not supported under Linux."
 msgstr "Nid yw %s yn cael ei gynnal gan Linux."
 
-#: scannerdrake:169 scannerdrake:183
+#: scannerdrake:169
+#: scannerdrake:183
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Peidio gosod ffeil cadarnwedd"
 
-#: scannerdrake:172 scannerdrake:222
+#: scannerdrake:172
+#: scannerdrake:222
 #, c-format
 msgid "Scanner Firmware"
 msgstr "Caledwar Sganiwr"
 
-#: scannerdrake:173 scannerdrake:225
+#: scannerdrake:173
+#: scannerdrake:225
 #, c-format
-msgid ""
-"It is possible that your %s needs its firmware to be uploaded everytime when "
-"it is turned on."
-msgstr ""
-"Mae'n bosib fod %s angen i'w gadarnwedd gael ei lwytho i fyny bob tro fydd "
-"yn cael ei gychwyn."
+msgid "It is possible that your %s needs its firmware to be uploaded everytime when it is turned on."
+msgstr "Mae'n bosib fod %s angen i'w gadarnwedd gael ei lwytho i fyny bob tro fydd yn cael ei gychwyn."
 
-#: scannerdrake:174 scannerdrake:226
+#: scannerdrake:174
+#: 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."
 
-#: scannerdrake:175 scannerdrake:229
+#: scannerdrake:175
+#: scannerdrake:229
 #, c-format
-msgid ""
-"To do so, you need to supply the firmware file for your scanner so that it "
-"can be installed."
-msgstr ""
-"I wneud felly, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel "
-"bod modd ei osod."
+msgid "To do so, you need to supply the firmware file for your scanner so that it can be installed."
+msgstr "I wneud felly, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel bod modd ei osod."
 
-#: scannerdrake:176 scannerdrake:230
+#: scannerdrake:176
+#: 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 y CD neu ddisg meddal sy'n dod gyda'r sganiwr, ar "
-"dudalen gwe'r gwneuthurwr, neu ar eich rhaniad Windows."
+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 y CD neu ddisg meddal sy'n dod gyda'r sganiwr, ar dudalen gwe'r gwneuthurwr, neu ar eich rhaniad Windows."
 
-#: scannerdrake:178 scannerdrake:237
+#: scannerdrake:178
+#: scannerdrake:237
 #, c-format
 msgid "Install firmware file from"
 msgstr "Gosod ffeil cadarnwedd o"
 
-#: scannerdrake:180 scannerdrake:188 scannerdrake:239 scannerdrake:246
+#: scannerdrake:180
+#: scannerdrake:188
+#: scannerdrake:239
+#: scannerdrake:246
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: scannerdrake:181 scannerdrake:190 scannerdrake:240 scannerdrake:248
+#: scannerdrake:181
+#: scannerdrake:190
+#: scannerdrake:240
+#: scannerdrake:248
 #, c-format
 msgid "Floppy Disk"
 msgstr "Disg Meddal"
 
-#: scannerdrake:182 scannerdrake:192 scannerdrake:241 scannerdrake:250
+#: scannerdrake:182
+#: scannerdrake:192
+#: scannerdrake:241
+#: scannerdrake:250
 #, c-format
 msgid "Other place"
 msgstr "Man arall"
@@ -3212,37 +3242,26 @@ msgstr "Man arall"
 msgid "Select firmware file"
 msgstr "Dewiswch ffeil cadarnwedd"
 
-#: scannerdrake:201 scannerdrake:260
+#: scannerdrake:201
+#: 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!"
 
 #: scannerdrake:224
 #, c-format
-msgid ""
-"It is possible that your scanners need their firmware to be uploaded "
-"everytime when they are turned on."
-msgstr ""
-"Mae'n bosib fod angen i'ch sganiwr gael ei gadarnwedd ei ddiweddaru bob tro "
-"fydd yn cael ei gychwyn."
+msgid "It is possible that your scanners need their firmware to be uploaded everytime when they are turned on."
+msgstr "Mae'n bosib fod angen i'ch sganiwr gael ei gadarnwedd ei ddiweddaru bob tro fydd yn cael ei gychwyn."
 
 #: scannerdrake:228
 #, c-format
-msgid ""
-"To do so, you need to supply the firmware files for your scanners so that it "
-"can be installed."
-msgstr ""
-"I wneud hynny, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel "
-"bod modd ei osod."
+msgid "To do so, you need to supply the firmware files for your scanners so that it can be installed."
+msgstr "I wneud hynny, rhaid darparu'r ffeil cadarnwedd ar gyfer eich sganiwr fel bod modd ei osod."
 
 #: scannerdrake:231
 #, c-format
-msgid ""
-"If you have already installed your scanner's firmware you can update the "
-"firmware here by supplying the new firmware file."
-msgstr ""
-"Os ydych eisoes wedi gosod cadarnwedd eich sganiwr mae modd ei ddiweddaru "
-"drwy ddarparu'r ffeil newydd"
+msgid "If you have already installed your scanner's firmware you can update the firmware here by supplying the new firmware file."
+msgstr "Os ydych eisoes wedi gosod cadarnwedd eich sganiwr mae modd ei ddiweddaru drwy ddarparu'r ffeil newydd"
 
 #: scannerdrake:233
 #, c-format
@@ -3283,17 +3302,21 @@ msgstr ""
 msgid "Setting up kernel modules..."
 msgstr "Gosod modiwlau'r cnewyllyn..."
 
-#: scannerdrake:330 scannerdrake:337 scannerdrake:367
+#: scannerdrake:330
+#: scannerdrake:337
+#: scannerdrake:367
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "Awtoganfod pyrth ar gael"
 
-#: scannerdrake:331 scannerdrake:377
+#: scannerdrake:331
+#: scannerdrake:377
 #, c-format
 msgid "Device choice"
 msgstr "Dewis dyfais"
 
-#: scannerdrake:332 scannerdrake:378
+#: scannerdrake:332
+#: scannerdrake:378
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Dewiswch y ddyfais lle mae %s wedi ei gysylltu"
@@ -3303,7 +3326,8 @@ msgstr "Dewiswch y ddyfais lle mae %s wedi ei gysylltu"
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Sylwer: Nid oes modd awtoganfod pyrth paralel)"
 
-#: scannerdrake:335 scannerdrake:380
+#: scannerdrake:335
+#: scannerdrake:380
 #, c-format
 msgid "choose device"
 msgstr "dewis dyfais"
@@ -3313,7 +3337,8 @@ msgstr "dewis dyfais"
 msgid "Searching for scanners..."
 msgstr "Chwilio am sganwyr..."
 
-#: scannerdrake:405 scannerdrake:412
+#: scannerdrake:405
+#: scannerdrake:412
 #, c-format
 msgid "Attention!"
 msgstr "Sylwch!"
@@ -3323,50 +3348,34 @@ msgstr "Sylwch!"
 msgid ""
 "Your %s cannot be configured fully automatically.\n"
 "\n"
-"Manual adjustments are required. Please edit the configuration file /etc/"
-"sane.d/%s.conf. "
+"Manual adjustments are required. Please edit the configuration file /etc/sane.d/%s.conf. "
 msgstr ""
 "Nid oes modd ffurfweddu %s yn awtomatig.\n"
 "\n"
 "\n"
-"Mae angen newidiadau gyda llaw. Golygwch y ffeil ffurfweddiad /etc/sane.d/%s."
-"conf. "
+"Mae angen newidiadau gyda llaw. Golygwch y ffeil ffurfweddiad /etc/sane.d/%s.conf. "
 
-#: scannerdrake:407 scannerdrake:416
+#: scannerdrake:407
+#: scannerdrake:416
 #, c-format
-msgid ""
-"More info in the driver's manual page. Run the command \"man sane-%s\" to "
-"read it."
-msgstr ""
-"Mae rhagor o wybodaeth ar dudalen llawlyfr y gyrrwr. Rhedwch y gorchymyn "
-"\"man sane-%s\" i'w ddarllen."
+msgid "More info in the driver's manual page. Run the command \"man sane-%s\" to read it."
+msgstr "Mae rhagor o wybodaeth ar dudalen llawlyfr y gyrrwr. Rhedwch y gorchymyn \"man sane-%s\" i'w ddarllen."
 
-#: scannerdrake:409 scannerdrake:418
+#: scannerdrake:409
+#: scannerdrake:418
 #, c-format
-msgid ""
-"After that you may scan documents using \"XSane\" or \"Kooka\" from "
-"Multimedia/Graphics in the applications menu."
-msgstr ""
-"Wedi hynny gallwch sganio dogfennau gan ddefnyddio \"XSane\" neu \"Kooka\" "
-"o'r ddewislen Aml-gyfrwng/Graffigau."
+msgid "After that you may scan documents using \"XSane\" or \"Kooka\" from Multimedia/Graphics in the applications menu."
+msgstr "Wedi hynny gallwch sganio dogfennau gan ddefnyddio \"XSane\" neu \"Kooka\" o'r ddewislen Aml-gyfrwng/Graffigau."
 
 #: scannerdrake:413
 #, c-format
-msgid ""
-"Your %s has been configured, but it is possible that additional manual "
-"adjustments are needed to get it to work. "
-msgstr ""
-"Mae eich %s wedi ei ffurfweddu, ond mae'n bosibl bod angen newidiadau llaw "
-"ychwanegol i'w gael i weithio."
+msgid "Your %s has been configured, but it is possible that additional manual adjustments are needed to get it to work. "
+msgstr "Mae eich %s wedi ei ffurfweddu, ond mae'n bosibl bod angen newidiadau llaw ychwanegol i'w gael i weithio."
 
 #: scannerdrake:414
 #, c-format
-msgid ""
-"If it does not appear in the list of configured scanners in the main window "
-"of Scannerdrake or if it does not work correctly, "
-msgstr ""
-"Nid yw'n ymddangos ar restr sganwyr wedi eu ffurfweddu ym mhrif ffenestr "
-"Scannerdrake neu nid yw'n gweithio'n iawn."
+msgid "If it does not appear in the list of configured scanners in the main window of Scannerdrake or if it does not work correctly, "
+msgstr "Nid yw'n ymddangos ar restr sganwyr wedi eu ffurfweddu ym mhrif ffenestr Scannerdrake neu nid yw'n gweithio'n iawn."
 
 #: scannerdrake:415
 #, c-format
@@ -3382,12 +3391,10 @@ msgstr "Llongyfarchiadau!"
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
-"You may now scan documents using \"XSane\" or \"Kooka\" 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."
+"Gallwch ddefnyddio \"XSane\" i sganio dogfennau o'r ddewislen rhaglenni Aml-gyfrwng/Graffigau."
 
 #: scannerdrake:446
 #, c-format
@@ -3415,7 +3422,8 @@ msgstr ""
 "%s\n"
 "ar gael ar eich system.\n"
 
-#: scannerdrake:450 scannerdrake:453
+#: scannerdrake:450
+#: scannerdrake:453
 #, 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"
@@ -3445,12 +3453,14 @@ msgstr "Gosod/Diweddaru ffeiliau cadarnwedd"
 msgid "Scanner sharing"
 msgstr "Rhannu sganiwr"
 
-#: scannerdrake:545 scannerdrake:710
+#: scannerdrake:545
+#: scannerdrake:710
 #, c-format
 msgid "All remote machines"
 msgstr "Pob cyfrifiadur pell"
 
-#: scannerdrake:557 scannerdrake:860
+#: scannerdrake:557
+#: scannerdrake:860
 #, c-format
 msgid "This machine"
 msgstr "Y peiriant hwn"
@@ -3462,21 +3472,13 @@ msgstr "Rhannu Sganiwr"
 
 #: scannerdrake:597
 #, c-format
-msgid ""
-"Here you can choose whether the scanners connected to this machine should be "
-"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."
+msgid "Here you can choose whether the scanners connected to this machine should be 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."
 
 #: scannerdrake:598
 #, c-format
-msgid ""
-"You can also decide here whether scanners on remote machines should be made "
-"available on this machine."
-msgstr ""
-"Gallwch benderfynu a ddylai sganwyr ar gyfrifiadur pell fod ar gael ar gyfer "
-"y cyfrifiadur hwn."
+msgid "You can also decide here whether scanners on remote machines should be made available on this machine."
+msgstr "Gallwch benderfynu a ddylai sganwyr ar gyfrifiadur pell fod ar gael ar gyfer y cyfrifiadur hwn."
 
 #: scannerdrake:601
 #, c-format
@@ -3488,7 +3490,8 @@ msgstr "Mae' sganwyr y cyfrifiadur hwn ar gael ar gyfer rhai eraill"
 msgid "Scanner sharing to hosts: "
 msgstr "Rhannu sganwyr i westeiwyr:"
 
-#: scannerdrake:608 scannerdrake:625
+#: scannerdrake:608
+#: scannerdrake:625
 #, c-format
 msgid "No remote machines"
 msgstr "Dim cyfrifiaduron pell"
@@ -3503,56 +3506,68 @@ msgstr "Defnyddio sganiwr ar gyfrifiaduron pell"
 msgid "Use the scanners on hosts: "
 msgstr "Defnyddio sganwyr ar westeiwyr:"
 
-#: scannerdrake:647 scannerdrake:719 scannerdrake:869
+#: scannerdrake:647
+#: scannerdrake:719
+#: scannerdrake:869
 #, c-format
 msgid "Sharing of local scanners"
 msgstr "Rhannu sganwyr lleol"
 
 #: scannerdrake:648
 #, c-format
-msgid ""
-"These are the machines on which the locally connected scanner(s) should be "
-"available:"
-msgstr ""
-"Dyma'r cyfrifiaduron a rhwydweithiau ddylai'r sganiwr lleol fod ar gael:"
+msgid "These are the machines on which the locally connected scanner(s) should be available:"
+msgstr "Dyma'r cyfrifiaduron a rhwydweithiau ddylai'r sganiwr lleol fod ar gael:"
 
-#: scannerdrake:659 scannerdrake:809
+#: scannerdrake:659
+#: scannerdrake:809
 #, c-format
 msgid "Add host"
 msgstr "Ychwanegu gwesteiwr"
 
-#: scannerdrake:665 scannerdrake:815
+#: scannerdrake:665
+#: scannerdrake:815
 #, c-format
 msgid "Edit selected host"
 msgstr "Golygu'r gwesteiwr"
 
-#: scannerdrake:674 scannerdrake:824
+#: scannerdrake:674
+#: scannerdrake:824
 #, c-format
 msgid "Remove selected host"
 msgstr "Tynnu'r gwesteiwr"
 
-#: scannerdrake:683 scannerdrake:833
+#: scannerdrake:683
+#: scannerdrake:833
 #, c-format
 msgid "Done"
 msgstr "Gorffen"
 
-#: scannerdrake:698 scannerdrake:706 scannerdrake:711 scannerdrake:757
-#: scannerdrake:848 scannerdrake:856 scannerdrake:861 scannerdrake:907
+#: scannerdrake:698
+#: scannerdrake:706
+#: scannerdrake:711
+#: scannerdrake:757
+#: scannerdrake:848
+#: scannerdrake:856
+#: scannerdrake:861
+#: scannerdrake:907
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "Enw/cyfeiriad IP gwesteiwr:"
 
-#: scannerdrake:720 scannerdrake:870
+#: scannerdrake:720
+#: scannerdrake:870
 #, 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:"
 
-#: scannerdrake:731 scannerdrake:881
+#: scannerdrake:731
+#: scannerdrake:881
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "Rhowch enw'r gwesteiwr neu'r cyfeiriad IP.\n"
 
-#: scannerdrake:742 scannerdrake:892
+#: scannerdrake:742
+#: scannerdrake:892
 #, 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"
@@ -3578,7 +3593,8 @@ msgstr ""
 "\n"
 "Hoffech chi osod pecyn saned?"
 
-#: scannerdrake:959 scannerdrake:963
+#: scannerdrake:959
+#: scannerdrake:963
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Ni fydd eich sganiwr(sganwyr) ar gael ar y rhwydwaith."
@@ -3649,19 +3665,14 @@ msgstr "Gosodiadau Rhanbarthol"
 
 #~ msgid "Copyright (C) 2001-2008 by Mandriva"
 #~ msgstr "Hawlfraint (C) 2001-2008  Mandriva"
-
 #~ msgid "The \"%s\" program has crashed."
 #~ msgstr "Mae'r rhaglen \"%s\" wedi chwalu."
-
 #~ msgid "Error!"
 #~ msgstr "Gwall!"
-
 #~ msgid "I can not find needed image file `%s'."
 #~ msgstr "Methu canfod ffeil delwedd angenrheidiol '%s'."
-
 #~ msgid "Auto Install Configurator"
 #~ msgstr "Ffurfweddwr Awto-Osod"
-
 #~ msgid ""
 #~ "You are about to configure an Auto Install floppy. This feature is "
 #~ "somewhat dangerous and must be used circumspectly.\n"
@@ -3688,35 +3699,26 @@ msgstr "Gosodiadau Rhanbarthol"
 #~ "awtomatig, beth bynnag wnewch chi wrth osod y cyfrifiadur.\n"
 #~ "\n"
 #~ "Cliciwch iawn i barhau?"
-
 #~ msgid "replay"
 #~ msgstr "ail chwarae"
-
 #~ msgid "manual"
 #~ msgstr "llaw"
-
 #~ msgid "Automatic Steps Configuration"
 #~ msgstr "Ffurfweddiad Camau Awtomatig"
-
 #~ msgid ""
 #~ "Please choose for each step whether it will replay like your install, or "
 #~ "it will be manual"
 #~ msgstr ""
 #~ "Dewiswch ar gyfer pob cam a fydd yn ail chwarae fel eich gosodiad, neu a "
 #~ "fydd gyda llaw"
-
 #~ msgid "Insert a blank floppy in drive %s"
 #~ msgstr "Rhowch ddisg meddal  yng ngyrrwr %s"
-
 #~ msgid "Creating auto install floppy"
 #~ msgstr "Creu disg meddal awto gosod"
-
 #~ msgid "Insert another blank floppy in drive %s (for drivers disk)"
 #~ msgstr "Rhowch ddisg meddal  yng ngyrrwr %s (ar gyfer disg gyrwyr)"
-
 #~ msgid "Creating auto install floppy (drivers disk)"
 #~ msgstr "Creu disg meddal awto gosod (disg gyrwyr)"
-
 #~ msgid ""
 #~ "\n"
 #~ "Welcome.\n"
@@ -3728,31 +3730,24 @@ msgstr "Gosodiadau Rhanbarthol"
 #~ "Croeso\n"
 #~ "\n"
 #~ "Mae paramedrau'r awto osod i'w cael yn yr adran ar y chwith"
-
 #~ msgid ""
 #~ "The floppy has been successfully generated.\n"
 #~ "You may now replay your installation."
 #~ msgstr ""
 #~ "Mae'r disg meddal wedi ei gynhyrchu'n llwyddiannus. \n"
 #~ "Gallwch ail chwarae eich gosodiad."
-
 #~ msgid "Auto Install"
 #~ msgstr "Awto Gosod"
-
 #~ msgid "Add an item"
 #~ msgstr "Ychwanegu eitem"
-
 #~ msgid "Remove the last item"
 #~ msgstr "Tynnu'r eitem olaf"
-
 #~ msgid "Menudrake"
 #~ msgstr "Menudrake"
-
 #~ msgid "Msec"
 #~ msgstr "Msec"
-
 #~ msgid "Urpmi"
 #~ msgstr "Urpmi"
-
 #~ msgid "Userdrake"
 #~ msgstr "Userdrake"
+