Updated cy translation

1 files changed, 348 insertions, 358 deletions

diff --git a/po/cy.po b/po/cy.po
index 05fd4926..0d2c9a2c 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Mandriva Linux\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-13 22:24+0800\n"
-"PO-Revision-Date: 2007-03-02 20:33-0000\n"
+"PO-Revision-Date: 2007-09-19 23:09+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gurpmi:30 ../gurpmi2:65
+#: ../gurpmi:30
+#: ../gurpmi2:65
 #, c-format
 msgid "RPM installation"
 msgstr "Gosod RPM"
@@ -30,7 +31,9 @@ msgstr "Gosod RPM"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
 
-#: ../gurpmi:45 ../gurpmi2:154 ../gurpmi2:177
+#: ../gurpmi:45
+#: ../gurpmi2:154
+#: ../gurpmi2:177
 #, c-format
 msgid "_Ok"
 msgstr "_Iawn"
@@ -42,8 +45,7 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would "
-"allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -51,12 +53,12 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Efallai nad oeddech wedi bwriadu ei osod ar eich cyfrifiadur (byddai ei osod "
-"yn caniatáu i chi i wneud newidiadau i'r cod ffynhonnell a'i grynhoi.).\n"
+"Efallai nad oeddech wedi bwriadu ei osod ar eich cyfrifiadur (byddai ei osod yn caniatáu i chi i wneud newidiadau i'r cod ffynhonnell a'i grynhoi.).\n"
 "\n"
 "Beth hoffech chi ei wneud?"
 
-#: ../gurpmi:73 ../gurpmi:84
+#: ../gurpmi:73
+#: ../gurpmi:84
 #, c-format
 msgid ""
 "You are about to install the following software packages on your computer:\n"
@@ -96,7 +98,8 @@ msgstr "_Gosod"
 msgid "_Save"
 msgstr "_Cadw"
 
-#: ../gurpmi:99 ../gurpmi2:154
+#: ../gurpmi:99
+#: ../gurpmi2:154
 #, c-format
 msgid "_Cancel"
 msgstr "_Dileu"
@@ -142,7 +145,8 @@ msgstr ""
 msgid "Warning"
 msgstr "Rhybudd"
 
-#: ../gurpmi2:113 ../urpmi:624
+#: ../gurpmi2:113
+#: ../urpmi:624
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -183,16 +187,16 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:217 ../urpmi:590
+#: ../gurpmi2:217
+#: ../urpmi:590
 #, c-format
-msgid ""
-"To satisfy dependencies, the following package is going to be installed:"
+msgid "To satisfy dependencies, the following package is going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
 
-#: ../gurpmi2:218 ../urpmi:591
+#: ../gurpmi2:218
+#: ../urpmi:591
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed:"
+msgid "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
 
 #: ../gurpmi2:220
@@ -207,12 +211,14 @@ msgstr[1] "(%d pecyn, %d MB)"
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:228 ../urpm/main_loop.pm:48
+#: ../gurpmi2:228
+#: ../urpm/main_loop.pm:48
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:242 ../urpm/install.pm:81
+#: ../gurpmi2:242
+#: ../urpm/install.pm:81
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
@@ -222,7 +228,8 @@ msgstr "Paratoi..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:262 ../urpmi:618
+#: ../gurpmi2:262
+#: ../urpmi:618
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
@@ -237,7 +244,8 @@ msgstr "Llwytho pecynnau i lawr ' %s'..."
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:298 ../urpm/main_loop.pm:253
+#: ../gurpmi2:298
+#: ../urpm/main_loop.pm:253
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -248,7 +256,9 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:304 ../urpm/main_loop.pm:191 ../urpm/main_loop.pm:209
+#: ../gurpmi2:304
+#: ../urpm/main_loop.pm:191
+#: ../urpm/main_loop.pm:209
 #: ../urpm/main_loop.pm:227
 #, c-format
 msgid "Installation failed:"
@@ -264,7 +274,8 @@ msgstr "Popeth wedi eu gosod eisoes"
 msgid "Installation finished"
 msgstr "Cwblhawyd y gosod"
 
-#: ../gurpmi2:312 ../urpme:134
+#: ../gurpmi2:312
+#: ../urpme:134
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
@@ -303,7 +314,8 @@ msgstr "  -f            - allbynnu enw llawn rpm (NVRA)\n"
 msgid "                    defaults to %s.\n"
 msgstr "                   rhagosodedig yw %s.\n"
 
-#: ../rurpmi:11 ../urpmi:267
+#: ../rurpmi:11
+#: ../urpmi:267
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -333,13 +345,18 @@ msgstr "enw ffeil rpm annilys [%s]"
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:152 ../urpm/get_pkgs.pm:135
+#: ../urpm.pm:152
+#: ../urpm/get_pkgs.pm:135
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:155 ../urpm/download.pm:612 ../urpm/get_pkgs.pm:137
-#: ../urpm/media.pm:744 ../urpm/media.pm:1269 ../urpm/media.pm:1491
+#: ../urpm.pm:155
+#: ../urpm/download.pm:612
+#: ../urpm/get_pkgs.pm:137
+#: ../urpm/media.pm:744
+#: ../urpm/media.pm:1269
+#: ../urpm/media.pm:1491
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
@@ -374,7 +391,8 @@ msgstr "gwall cofrestru pecynnau lleol"
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
 
-#: ../urpm/args.pm:121 ../urpm/args.pm:130
+#: ../urpm/args.pm:121
+#: ../urpm/args.pm:130
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
@@ -394,7 +412,8 @@ msgstr "Nid yw cyfeiriadur chroot yn bodoli"
 msgid "Can't use %s without %s"
 msgstr "Methu defnyddio %s heb %s"
 
-#: ../urpm/args.pm:431 ../urpm/args.pm:434
+#: ../urpm/args.pm:431
+#: ../urpm/args.pm:434
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "Methu defnyddio %s gyda %s"
@@ -404,12 +423,14 @@ msgstr "Methu defnyddio %s gyda %s"
 msgid "Too many arguments\n"
 msgstr "Gormod o ymresymiadau\n"
 
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1151
+#: ../urpm/bug_report.pm:36
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/bug_report.pm:51 ../urpmi:247
+#: ../urpm/bug_report.pm:51
+#: ../urpmi:247
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
@@ -429,7 +450,8 @@ msgstr "Methu creu ffeil config (%s)"
 msgid "medium `%s' is defined twice, aborting"
 msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
 
-#: ../urpm/cfg.pm:244 ../urpm/media.pm:450
+#: ../urpm/cfg.pm:244
+#: ../urpm/media.pm:450
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -562,7 +584,7 @@ msgstr "URL gwallus: [%s]"
 #: ../urpm/get_pkgs.pm:126
 #, c-format
 msgid "sorry, you can't use --install-src to install remote .src.rpm files"
-msgstr ""
+msgstr "nid oes modd ei ddefnyddio --install-src i osod y ffeiliau pell .src.rpm files"
 
 #: ../urpm/get_pkgs.pm:132
 #, c-format
@@ -576,10 +598,8 @@ msgstr "[ailbecynnu]"
 
 #: ../urpm/install.pm:154
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr ""
-"crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
+msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "crëwyd trosglwyddiad ar gyfer gosod ar %s (tynnu=%d, gosod=%d, uwchraddio=%d)"
 
 #: ../urpm/install.pm:157
 #, c-format
@@ -597,9 +617,9 @@ msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
 #: ../urpm/install.pm:227
-#, fuzzy, c-format
+#, c-format
 msgid "Removing package %s"
-msgstr "tynnu pecyn %s."
+msgstr "Tynnu pecyn %s."
 
 #: ../urpm/install.pm:228
 #, c-format
@@ -636,20 +656,21 @@ msgstr "Heb ddiffinio gweinydd, uri neu westeiwr coll"
 msgid "No base defined"
 msgstr "Sail heb ei ddiffinio"
 
-#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
+#: ../urpm/ldap.pm:172
+#: ../urpm/ldap.pm:175
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "Methu cysylltu  æg uri ldap:"
 
 #: ../urpm/lock.pm:62
-#, fuzzy, c-format
+#, c-format
 msgid "%s database locked. waiting..."
-msgstr "Cronfa ddata %s wedi cloi"
+msgstr "Cronfa ddata %s wedi cloi, aros..."
 
 #: ../urpm/lock.pm:63
-#, fuzzy, c-format
+#, c-format
 msgid "aborting"
-msgstr "Rhybudd"
+msgstr "atal"
 
 #: ../urpm/lock.pm:65
 #, c-format
@@ -671,7 +692,9 @@ msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpm/main_loop.pm:125 ../urpm/main_loop.pm:198 ../urpm/main_loop.pm:216
+#: ../urpm/main_loop.pm:125
+#: ../urpm/main_loop.pm:198
+#: ../urpm/main_loop.pm:216
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
@@ -755,12 +778,8 @@ msgstr "cyfrifo md5sum ffynhonnell presennol hdlist (neu synthesis) [%s]"
 
 #: ../urpm/media.pm:172
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr ""
-"dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
-"cyfrwng"
+msgid "virtual medium \"%s\" should not have defined hdlist or list file, medium ignored"
+msgstr "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y cyfrwng"
 
 #: ../urpm/media.pm:176
 #, c-format
@@ -787,7 +806,9 @@ msgstr "nid ddylai \"synthesis\" gael ei osod (canolig \"%s\")"
 msgid "\"synthesis\" should be set (medium \"%s\")"
 msgstr "\"synthesis\" i'w osod (canolig \"%s\")"
 
-#: ../urpm/media.pm:210 ../urpm/media.pm:1429 ../urpm/media.pm:1517
+#: ../urpm/media.pm:210
+#: ../urpm/media.pm:1429
+#: ../urpm/media.pm:1517
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
@@ -805,14 +826,12 @@ msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 #: ../urpm/media.pm:230
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr ""
-"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
+msgstr "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
 #: ../urpm/media.pm:231
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr ""
-"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
+msgstr "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
 
 #: ../urpm/media.pm:256
 #, c-format
@@ -832,15 +851,15 @@ msgstr "cymryd dyfais symudol fel \"%s\""
 #: ../urpm/media.pm:403
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
-msgstr ""
-"Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio."
+msgstr "Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio."
 
 #: ../urpm/media.pm:406
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
 
-#: ../urpm/media.pm:411 ../urpm/media.pm:414
+#: ../urpm/media.pm:411
+#: ../urpm/media.pm:414
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
@@ -867,26 +886,21 @@ msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
 #: ../urpm/media.pm:521
 #, c-format
-msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update, --use-distrib or --parallel"
-msgstr ""
-"--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
-"sortmedia, --diweddaru, --use-distrib or --parallel"
+msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update, --use-distrib or --parallel"
+msgstr "--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, --diweddaru, --use-distrib or --parallel"
 
 #: ../urpm/media.pm:588
 #, c-format
 msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
-msgstr ""
-"Sylw: dim hdlist ar gyfer cyfrwng \"%s\", methu dychwelyd canlyniadau ar ei "
-"gyfer"
+msgstr "Sylw: dim hdlist ar gyfer cyfrwng \"%s\", methu dychwelyd canlyniadau ar ei gyfer"
 
 #: ../urpm/media.pm:597
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm/media.pm:603 ../urpm/media.pm:1815
+#: ../urpm/media.pm:603
+#: ../urpm/media.pm:1815
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
@@ -949,13 +963,12 @@ msgstr "methu didoli media.cfg"
 #: ../urpm/media.pm:745
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr ""
-"methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
+msgstr "methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
 
 #: ../urpm/media.pm:763
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
-msgstr ""
+msgstr "hepgor cyfrwng anghymarus '%s' (ar gyfer %s)"
 
 #: ../urpm/media.pm:836
 #, c-format
@@ -1019,24 +1032,23 @@ msgstr "adeiladu hdlist [%s]"
 
 #: ../urpm/media.pm:1147
 #, c-format
-msgid ""
-"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
-"corrupted."
-msgstr ""
-"Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
-"ffeil hdlist yn llygredig."
+msgid "Unable to build synthesis file for medium \"%s\". Your hdlist file may be corrupted."
+msgstr "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich ffeil hdlist yn llygredig."
 
 #: ../urpm/media.pm:1166
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1177 ../urpm/media.pm:1242
+#: ../urpm/media.pm:1177
+#: ../urpm/media.pm:1242
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
 
-#: ../urpm/media.pm:1179 ../urpm/media.pm:1217 ../urpm/media.pm:1504
+#: ../urpm/media.pm:1179
+#: ../urpm/media.pm:1217
+#: ../urpm/media.pm:1504
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
@@ -1046,7 +1058,8 @@ msgstr "...methodd y copïo"
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm/media.pm:1215 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1215
+#: ../urpm/media.pm:1246
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
@@ -1100,8 +1113,7 @@ msgstr "heb ddarllen rpmau"
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"this could happen if you mounted manually the directory when creating the medium."
 msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
@@ -1121,7 +1133,8 @@ msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm/media.pm:1490 ../urpm/media.pm:1624
+#: ../urpm/media.pm:1490
+#: ../urpm/media.pm:1624
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
@@ -1146,7 +1159,8 @@ msgstr "methu mewnforio ffeil pubkey \"%s\""
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm/media.pm:1633 ../urpm/media.pm:1663
+#: ../urpm/media.pm:1633
+#: ../urpm/media.pm:1663
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
@@ -1166,7 +1180,10 @@ msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm/msg.pm:62 ../urpmi:508 ../urpmi:524 ../urpmi:609
+#: ../urpm/msg.pm:62
+#: ../urpmi:508
+#: ../urpmi:524
+#: ../urpmi:609
 #, c-format
 msgid "Nn"
 msgstr "Nn"
@@ -1176,8 +1193,15 @@ msgstr "Nn"
 #  can hit those keys in their keyboard to reply.
 #  please keep the 'Yy' for compatibility reasons
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:63 ../urpme:37 ../urpmi:509 ../urpmi:525 ../urpmi:564
-#: ../urpmi:610 ../urpmi:640 ../urpmi:646 ../urpmi.addmedia:128
+#: ../urpm/msg.pm:63
+#: ../urpme:37
+#: ../urpmi:509
+#: ../urpmi:525
+#: ../urpmi:564
+#: ../urpmi:610
+#: ../urpmi:640
+#: ../urpmi:646
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Yy"
 msgstr "Yy"
@@ -1188,64 +1212,65 @@ msgid "Sorry, bad choice, try again\n"
 msgstr "Dewis gwael, ceisiwch eto\n"
 
 #: ../urpm/msg.pm:151
-#, fuzzy, c-format
+#, c-format
 msgid "Package"
-msgstr "Dewis pecyn"
+msgstr "Pecyn"
 
 #: ../urpm/msg.pm:151
 #, c-format
 msgid "Version"
-msgstr ""
+msgstr "Fersiwn"
 
 #: ../urpm/msg.pm:151
 #, c-format
 msgid "Release"
-msgstr ""
+msgstr "Ryddhad"
 
 #: ../urpm/msg.pm:151
 #, c-format
 msgid "Arch"
-msgstr ""
+msgstr "Arch"
 
 #: ../urpm/msg.pm:160
 #, c-format
 msgid "(suggested)"
-msgstr ""
+msgstr "(awgrym)"
 
 #: ../urpm/msg.pm:175
-#, fuzzy, c-format
+#, c-format
 msgid "medium \"%s\""
-msgstr "ychwanegu cyfrwng \"%s\""
+msgstr "cyfrwng \"%s\""
 
 #: ../urpm/msg.pm:175
 #, c-format
 msgid "command line"
-msgstr ""
+msgstr "llinell orchymyn"
 
 #: ../urpm/msg.pm:189
 #, c-format
 msgid "B"
-msgstr ""
+msgstr "B"
 
 #: ../urpm/msg.pm:189
 #, c-format
 msgid "KB"
-msgstr ""
+msgstr "KB"
 
 #: ../urpm/msg.pm:189
 #, c-format
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: ../urpm/msg.pm:189
 #, c-format
 msgid "GB"
-msgstr ""
+msgstr "GB"
 
-#: ../urpm/msg.pm:189 ../urpm/msg.pm:198
+#: ../urpm/msg.pm:189
+#: ../urpm/msg.pm:198
 #, c-format
 msgid "TB"
-msgstr ""
+msgstr "TB"
 
 #: ../urpm/parallel.pm:14
 #, c-format
@@ -1277,7 +1302,9 @@ msgstr "gosod %s"
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
+#: ../urpm/removable.pm:112
+#: ../urpm/removable.pm:117
+#: ../urpm/removable.pm:147
 #, c-format
 msgid "medium \"%s\" is not available"
 msgstr "nid yw cyfrwng \"%s\" ar gael"
@@ -1300,35 +1327,37 @@ msgstr "methu cael mynediad at gyfrwng. \"%s\""
 #: ../urpm/select.pm:21
 #, c-format
 msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr ""
+msgstr "ail gychwynnwyd urpmi, ac nid yw'r rhestr prif pecynnau wedi newid"
 
 #: ../urpm/select.pm:23
 #, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr ""
+msgid "urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr "ail gychwynnwyd urpmi, ac mae'r rhestr prif pecynnau wedi newid: %s vs %s"
 
 #: ../urpm/select.pm:160
 #, c-format
 msgid "No package named %s"
 msgstr "Dim pecyn o'r enw %s"
 
-#: ../urpm/select.pm:162 ../urpme:109
+#: ../urpm/select.pm:162
+#: ../urpme:109
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm/select.pm:480 ../urpm/select.pm:523
+#: ../urpm/select.pm:480
+#: ../urpm/select.pm:523
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
 #: ../urpm/select.pm:481
-#, fuzzy, c-format
+#, c-format
 msgid "due to already installed %s"
-msgstr "Pecyn %s wedi ei osod eisoes"
+msgstr "oherwydd %s wedi ei osod eisoes"
 
-#: ../urpm/select.pm:482 ../urpm/select.pm:521
+#: ../urpm/select.pm:482
+#: ../urpm/select.pm:521
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
@@ -1369,22 +1398,21 @@ msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
 #: ../urpm/sys.pm:216
-#, fuzzy, c-format
+#, c-format
 msgid "Can't write file"
-msgstr "Methu creu ffeil Config (%s)"
+msgstr "Methu ysgrifennu'r ffeil"
 
 #: ../urpm/sys.pm:216
-#, fuzzy, c-format
+#, c-format
 msgid "Can't open file"
-msgstr "Methodd y copïo"
+msgstr "Methu agor y ffeil"
 
 #: ../urpme:40
 #, c-format
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2006 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 ""
@@ -1394,8 +1422,14 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpme:45 ../urpmf:35 ../urpmi:79 ../urpmi.addmedia:44
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../urpme:45
+#: ../urpmf:35
+#: ../urpmi:79
+#: ../urpmi.addmedia:44
+#: ../urpmi.recover:33
+#: ../urpmi.removemedia:40
+#: ../urpmi.update:32
+#: ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - argraffu neges cymorth.\n"
@@ -1410,21 +1444,22 @@ msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd tynnu'n iawn.\n"
 
-#: ../urpme:48 ../urpmi:106 ../urpmq:64
+#: ../urpme:48
+#: ../urpmi:106
+#: ../urpmq:64
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr ""
-"  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
-"bodoli.\n"
+msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n bodoli.\n"
 
-#: ../urpme:49 ../urpmi:111 ../urpmq:66
+#: ../urpme:49
+#: ../urpmi:111
+#: ../urpmq:66
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr ""
-"  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
+msgstr "  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
-#: ../urpme:50 ../urpmi:143
+#: ../urpme:50
+#: ../urpmi:143
 #, c-format
 msgid "  --repackage    - Re-package the files before erasing\n"
 msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
@@ -1434,13 +1469,17 @@ msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
-#: ../urpme:52 ../urpmf:40 ../urpmi:113 ../urpmi.addmedia:58
-#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:68
+#: ../urpme:52
+#: ../urpmf:40
+#: ../urpmi:113
+#: ../urpmi.addmedia:58
+#: ../urpmi.recover:36
+#: ../urpmi.removemedia:46
+#: ../urpmi.update:46
+#: ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr ""
-"  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac "
-"rpm.\n"
+msgstr "  --urpmi-root         - defnyddio root arall ar gyfer gosod urpmi db ac rpm.\n"
 
 #: ../urpme:53
 #, c-format
@@ -1456,17 +1495,23 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth (ddad)osod chroot gyda dewis  --root.\n"
 
-#: ../urpme:56 ../urpmi:116 ../urpmq:71
+#: ../urpme:56
+#: ../urpmi:116
+#: ../urpmq:71
 #, c-format
 msgid "    --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - defnyddio ffeil synthesis.\n"
 
-#: ../urpme:57 ../urpmi:117 ../urpmq:72
+#: ../urpme:57
+#: ../urpmi:117
+#: ../urpmq:72
 #, c-format
 msgid "    --probe-hdlist - use hdlist file.\n"
 msgstr "  --probe-hdlist - defnyddio ffeil hdlist.\n"
 
-#: ../urpme:58 ../urpmi:154 ../urpmq:83
+#: ../urpme:58
+#: ../urpmi:154
+#: ../urpmq:83
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - modd llafar.\n"
@@ -1491,7 +1536,8 @@ msgstr "pecynnau anhysbys"
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:115 ../urpmi:538
+#: ../urpme:115
+#: ../urpmi:538
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
@@ -1509,8 +1555,7 @@ msgstr "Ticio i ddileu'r pecynnau canlynol"
 #: ../urpme:126
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
+msgid_plural "To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
 msgstr[1] "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
 
@@ -1521,7 +1566,10 @@ msgid_plural "Remove %d packages?"
 msgstr[0] "Tynnu pecynnau %d?"
 msgstr[1] "Tynnu pecynnau %d?"
 
-#: ../urpme:130 ../urpmi:565 ../urpmi:641 ../urpmi.addmedia:131
+#: ../urpme:130
+#: ../urpmi:565
+#: ../urpmi:641
+#: ../urpmi.addmedia:131
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
@@ -1536,8 +1584,7 @@ msgstr "Methodd y tynnu"
 msgid ""
 "urpmf version %s\n"
 "Copyright (C) 2002-2006 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: urpmf [options] pattern-expression\n"
 msgstr ""
@@ -1552,46 +1599,47 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
 
-#: ../urpmf:37 ../urpmi:134 ../urpmq:80
+#: ../urpmf:37
+#: ../urpmi:134
+#: ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr ""
-"  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
-"rheol).\n"
+msgstr "  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel rheol).\n"
 
-#: ../urpmf:38 ../urpmi:81 ../urpmq:49
+#: ../urpmf:38
+#: ../urpmi:81
+#: ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr ""
-"  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
+msgstr "  --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n"
 
 #: ../urpmf:39
 #, c-format
-msgid ""
-"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
-msgstr ""
-"  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn "
-"llythrennedd.\n"
+msgid "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
+msgstr "  --literal, -l  - peidio cydweddu patrymau, defnyddio ymresymiad fel llinyn llythrennedd.\n"
 
-#: ../urpmf:41 ../urpmi:80 ../urpmq:47
+#: ../urpmf:41
+#: ../urpmi:80
+#: ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
 
-#: ../urpmf:42 ../urpmi:84 ../urpmq:50
+#: ../urpmf:42
+#: ../urpmi:84
+#: ../urpmq:50
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr ""
-"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
-"choma.\n"
+msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda choma.\n"
 
 #: ../urpmf:43
-#, fuzzy, c-format
+#, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+msgstr "  --use-distrib  - defnyddio'r llwybr yma i gael mynediad ar y cyfrwng.\n"
 
-#: ../urpmf:44 ../urpmi:85 ../urpmq:51
+#: ../urpmf:44
+#: ../urpmi:85
+#: ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
@@ -1601,7 +1649,9 @@ msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
 
-#: ../urpmf:46 ../urpmi:82 ../urpmq:46
+#: ../urpmf:46
+#: ../urpmi:82
+#: ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
@@ -1614,15 +1664,12 @@ msgstr "  --verbose      - modd llafar.\n"
 #: ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
-msgstr ""
-"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
+msgstr "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
 #: ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
-msgstr ""
-"  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm "
-"(rhagosodiad).\n"
+msgstr "  -i             - cadw gwahaniaeth maint llythrennau ym mhob patrwm (rhagosodiad).\n"
 
 #: ../urpmf:50
 #, c-format
@@ -1637,9 +1684,7 @@ msgstr "Mynegiadau patrymau:\n"
 #: ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
-msgstr ""
-"  text           - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l "
-"yn cael ei ddefnyddio.\n"
+msgstr "  text           - unrhyw destun wedi ei ddidoli fel regexp, onibai fod -l yn cael ei ddefnyddio.\n"
 
 #: ../urpmf:53
 #, c-format
@@ -1737,9 +1782,9 @@ msgid "  --group        - group\n"
 msgstr "  --group        - grŵp\n"
 
 #: ../urpmf:72
-#, fuzzy, c-format
+#, c-format
 msgid "  --license      - license\n"
-msgstr "  --name          - enw'r pecyn\n"
+msgstr "  --license          - trwydded\n"
 
 #: ../urpmf:73
 #, c-format
@@ -1777,9 +1822,9 @@ msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
 #: ../urpmf:80
-#, fuzzy, c-format
+#, c-format
 msgid "  --suggests     - suggests tags\n"
-msgstr "  --obsoletes     - tagiau'r hen\n"
+msgstr "  --suggests     - cynnig tagiau\n"
 
 #: ../urpmf:81
 #, c-format
@@ -1801,7 +1846,8 @@ msgstr "  --vendor       - gwerthwr\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
 
-#: ../urpmf:85 ../urpmq:92
+#: ../urpmf:85
+#: ../urpmq:92
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
@@ -1811,19 +1857,17 @@ msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
 
-#: ../urpmf:190 ../urpmi:254 ../urpmq:135
+#: ../urpmf:190
+#: ../urpmi:254
+#: ../urpmq:135
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
 #: ../urpmf:229
 #, c-format
-msgid ""
-"Note: since no media searched uses hdlists, urpmf was unable to return any "
-"result\n"
-msgstr ""
-"Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
-"urpmf â chynnig canlyniad\n"
+msgid "Note: since no media searched uses hdlists, urpmf was unable to return any result\n"
+msgstr "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd urpmf â chynnig canlyniad\n"
 
 #: ../urpmf:230
 #, c-format
@@ -1835,8 +1879,7 @@ msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2006 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 ""
@@ -1848,25 +1891,18 @@ msgstr ""
 
 #: ../urpmi:83
 #, c-format
-msgid ""
-"  --searchmedia  - use only the given media to search requested packages.\n"
-msgstr ""
-"  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
-"gofynnwyd.\n"
+msgid "  --searchmedia  - use only the given media to search requested packages.\n"
+msgstr "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau gofynnwyd.\n"
 
 #: ../urpmi:86
 #, c-format
-msgid ""
-"  --auto         - non-interactive mode, assume default answers to "
-"questions.\n"
-msgstr ""
-"  --auto         - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
-"gwestiynau.\n"
+msgid "  --auto         - non-interactive mode, assume default answers to questions.\n"
+msgstr "  --auto         - modd anrhyngweithiol, derbyn atebion rhagosodedig i gwestiynau.\n"
 
-#: ../urpmi:87 ../urpmq:52
+#: ../urpmi:87
+#: ../urpmq:52
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
 
 #: ../urpmi:88
@@ -1886,18 +1922,16 @@ msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 
 #: ../urpmi:91
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
+msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
 #: ../urpmi:92
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
-msgstr ""
-"  --no-install   - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
+msgstr "  --no-install   - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
 
-#: ../urpmi:93 ../urpmq:54
+#: ../urpmi:93
+#: ../urpmq:54
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1913,8 +1947,7 @@ msgid ""
 "                   are going to be installed or upgraded,\n"
 "                   default is %d.\n"
 msgstr ""
-"  --split-level  - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn "
-"cael\n"
+"  --split-level  - hollti'n ddarnau llai os yw mwy na'r pecynnau hyn yn cael\n"
 "                   eu gosod neu eu uwchraddio\n"
 "                   rhagosodiad yw %d.\n"
 
@@ -1936,8 +1969,7 @@ msgstr "  --src, -s      - pecyn nesaf yn becyn ffynhonnell.\n"
 #: ../urpmi:101
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr ""
-"  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
+msgstr "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
 #: ../urpmi:102
 #, c-format
@@ -1950,15 +1982,14 @@ msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - peidio glanhau rpm o'r storfa.\n"
 
 #: ../urpmi:104
-#, fuzzy, c-format
+#, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+msgstr "  --justdb       - diweddaru'n unig db yr rpm, nid y system ffeilio.\n"
 
 #: ../urpmi:105
 #, c-format
-msgid ""
-"  --replacepkgs  - force installing packages which are already installed.\n"
-msgstr ""
+msgid "  --replacepkgs  - force installing packages which are already installed.\n"
+msgstr "  --replacepkgs  - gorfodi gosod pecynnau sydd wedi eu gosod eisoes.\n"
 
 #: ../urpmi:107
 #, c-format
@@ -1978,7 +2009,8 @@ msgstr ""
 "  --allow-force  - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
 "                   wirio dibyniaethau na'u cyfanrwydd.\n"
 
-#: ../urpmi:112 ../urpmq:67
+#: ../urpmi:112
+#: ../urpmq:67
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer gosod rpm.\n"
@@ -1992,17 +2024,26 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
 "                   wrth osod chroot gyda dewis o  --root.\n"
 
-#: ../urpmi:118 ../urpmi.addmedia:45 ../urpmi.update:33 ../urpmq:73
+#: ../urpmi:118
+#: ../urpmi.addmedia:45
+#: ../urpmi.update:33
+#: ../urpmq:73
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - defnyddio wget i estyn ffeiliau pell.\n"
 
-#: ../urpmi:119 ../urpmi.addmedia:46 ../urpmi.update:34 ../urpmq:74
+#: ../urpmi:119
+#: ../urpmi.addmedia:46
+#: ../urpmi.update:34
+#: ../urpmq:74
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
-#: ../urpmi:120 ../urpmi.addmedia:47 ../urpmi.update:35 ../urpmq:75
+#: ../urpmi:120
+#: ../urpmi.addmedia:47
+#: ../urpmi.update:35
+#: ../urpmq:75
 #, c-format
 msgid "  --prozilla     - use prozilla to retrieve distant files.\n"
 msgstr "  --prozilla         - defnyddio prozilla i estyn ffeiliau pell.\n"
@@ -2027,7 +2068,9 @@ msgstr "  --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
 msgid "  --prozilla-options - additional options to pass to prozilla\n"
 msgstr "  --cprozilla-options - dewis ychwanegol wrth ddefnyddio prozilla\n"
 
-#: ../urpmi:125 ../urpmi.addmedia:48 ../urpmi.update:36
+#: ../urpmi:125
+#: ../urpmi.addmedia:48
+#: ../urpmi.update:36
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - cyfyngu cyflymder y llwytho i lawr.\n"
@@ -2041,7 +2084,10 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:37 ../urpmq:76
+#: ../urpmi:128
+#: ../urpmi.addmedia:49
+#: ../urpmi.update:37
+#: ../urpmq:76
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -2050,7 +2096,10 @@ msgstr ""
 "  --proxy        - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
 "                   rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
 
-#: ../urpmi:130 ../urpmi.addmedia:51 ../urpmi.update:39 ../urpmq:78
+#: ../urpmi:130
+#: ../urpmi.addmedia:51
+#: ../urpmi.update:39
+#: ../urpmq:78
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -2079,9 +2128,7 @@ msgstr ""
 
 #: ../urpmi:137
 #, c-format
-msgid ""
-"  --test         - only verify if the installation can be achieved "
-"correctly.\n"
+msgid "  --test         - only verify if the installation can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
 #: ../urpmi:138
@@ -2115,9 +2162,9 @@ msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
 
 #: ../urpmi:145
-#, fuzzy, c-format
+#, c-format
 msgid "  --prefer       - packages which should be preferred\n"
-msgstr "  --skip          - pecynnau dylid osgoi eu gosod.\n"
+msgstr "  --prefer       - pecynnau angenrheidiol\n"
 
 #: ../urpmi:146
 #, c-format
@@ -2125,8 +2172,7 @@ msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
 msgstr ""
-"  --more-choices - pan fydd nifer o becynnau wedi eu canfod, cynnig mwy o "
-"ddewis\n"
+"  --more-choices - pan fydd nifer o becynnau wedi eu canfod, cynnig mwy o ddewis\n"
 "                   na'r rhagosodiad.\n"
 
 #: ../urpmi:148
@@ -2137,10 +2183,10 @@ msgstr "  --nolock       - peidio cloi db rpm.\n"
 #: ../urpmi:149
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
-msgstr ""
-"  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
+msgstr "  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
 
-#: ../urpmi:150 ../urpmq:89
+#: ../urpmi:150
+#: ../urpmq:89
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
@@ -2163,9 +2209,7 @@ msgstr "  --quiet, -q    - modd distaw.\n"
 #: ../urpmi:155
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
-msgstr ""
-" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
-"eu gosod.\n"
+msgstr " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael eu gosod.\n"
 
 #: ../urpmi:184
 #, c-format
@@ -2178,8 +2222,7 @@ msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr ""
-"Gwall: I gynhyrchu adroddiad gwall, nodwch yr ymresymiad llinell orchymyn "
-"arferol\n"
+"Gwall: I gynhyrchu adroddiad gwall, nodwch yr ymresymiad llinell orchymyn arferol\n"
 "ynghyd a --bug.\n"
 
 #: ../urpmi:218
@@ -2189,12 +2232,8 @@ msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
 
 #: ../urpmi:241
 #, c-format
-msgid ""
-"Directory [%s] already exists, please use another directory for bug report "
-"or delete it"
-msgstr ""
-"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
-"adroddiad gwall neu ei ddileu."
+msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
+msgstr "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am adroddiad gwall neu ei ddileu."
 
 #: ../urpmi:242
 #, c-format
@@ -2245,11 +2284,9 @@ msgid "%s (to install)"
 msgstr "%s (gosod)"
 
 #: ../urpmi:457
-#, fuzzy, c-format
-msgid ""
-"In order to satisfy the '%s' dependency, one of the following packages is "
-"needed:"
-msgstr "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu"
+#, c-format
+msgid "In order to satisfy the '%s' dependency, one of the following packages is needed:"
+msgstr "I fodloni dibyniaethau, bydd angen un o'r pecynnau canlynol:"
 
 #: ../urpmi:460
 #, c-format
@@ -2278,7 +2315,8 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:510 ../urpmi:526
+#: ../urpmi:510
+#: ../urpmi:526
 #, c-format
 msgid ""
 "\n"
@@ -2287,7 +2325,10 @@ msgstr ""
 "\n"
 "Parhau i osod beth bynnag?"
 
-#: ../urpmi:511 ../urpmi:527 ../urpmi:611 ../urpmi.addmedia:131
+#: ../urpmi:511
+#: ../urpmi:527
+#: ../urpmi:611
+#: ../urpmi.addmedia:131
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -2372,12 +2413,12 @@ msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 #: ../urpmi:599
 #, c-format
 msgid "%s of additional disk space will be used."
-msgstr ""
+msgstr "Bydd %s o le ychwanegol ar ddisg yn cael ei ddefnyddio."
 
 #: ../urpmi:600
 #, c-format
 msgid "%s of disk space will be freed."
-msgstr ""
+msgstr "Bydd %s o le ar ddisg ar gael."
 
 #: ../urpmi:601
 #, c-format
@@ -2449,8 +2490,7 @@ msgstr "  --probe-rpms   - defnyddio ffeiliau rpm (yn lle synthesis/hdlist).\n"
 #: ../urpmi.addmedia:57
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis or hdlist file.\n"
-msgstr ""
-"  --no-probe     - peidio ceisio canfod unrhyw ffeil synthesis neu hdlist\n"
+msgstr "  --no-probe     - peidio ceisio canfod unrhyw ffeil synthesis neu hdlist\n"
 
 #: ../urpmi.addmedia:59
 #, c-format
@@ -2464,8 +2504,7 @@ msgstr ""
 #: ../urpmi.addmedia:61
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
-msgstr ""
-"  --rhyngweithiol  - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
+msgstr "  --rhyngweithiol  - gyda --distrib, gofyn cadarnhad gyda phob cyfrwng\n"
 
 #: ../urpmi.addmedia:62
 #, c-format
@@ -2478,8 +2517,7 @@ msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr ""
-"  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y "
-"rhagosodedig yw\n"
+"  --from         - defnyddio url pennwyd ar gyfer rhestr drychau, y rhagosodedig yw\n"
 "                   %s\n"
 
 #: ../urpmi.addmedia:65
@@ -2491,7 +2529,8 @@ msgstr ""
 "  --virtual      - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
 "                   dom ond protocol file:// sy'n cael ei ganiatáu.\n"
 
-#: ../urpmi.addmedia:67 ../urpmi.update:42
+#: ../urpmi.addmedia:67
+#: ../urpmi.update:42
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - analluogi gwirio ffeil  MD5SUM.\n"
@@ -2504,20 +2543,25 @@ msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 #: ../urpmi.addmedia:69
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
-msgstr ""
-"  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
+msgstr "  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
-#: ../urpmi.addmedia:70 ../urpmi.removemedia:42 ../urpmi.update:49
+#: ../urpmi.addmedia:70
+#: ../urpmi.removemedia:42
+#: ../urpmi.update:49
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - glanhau penawdau yng nghyfeiriadur y storfa.\n"
 
-#: ../urpmi.addmedia:71 ../urpmi.removemedia:44 ../urpmi.update:51
+#: ../urpmi.addmedia:71
+#: ../urpmi.removemedia:44
+#: ../urpmi.update:51
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - modd distaw.\n"
 
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:45 ../urpmi.update:52
+#: ../urpmi.addmedia:72
+#: ../urpmi.removemedia:45
+#: ../urpmi.update:52
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
@@ -2528,10 +2572,9 @@ msgid "unable to update medium \"%s\"\n"
 msgstr "methu diweddaru cyfrwng \"%s\"\n"
 
 #: ../urpmi.addmedia:109
-#, fuzzy, c-format
+#, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
-msgstr ""
-"<url> gwallus (rhaid i'r llwybr fod yn absoliwt ar gyfer cyfeiriadur lleol)\n"
+msgstr "gwallus <url> (ar gyfer cyfeiriadur lleol, rhaid i'r llwybr fod yn absoliwt)"
 
 #: ../urpmi.addmedia:112
 #, c-format
@@ -2582,8 +2625,7 @@ msgstr "methu creu cyfrwng \"%s\"\n"
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 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 ""
@@ -2605,10 +2647,8 @@ msgstr "  --noclean      - peidio glanhau rpm ar checkpoint\n"
 
 #: ../urpmi.recover:37
 #, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
-msgstr ""
-"  --list         - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
+msgid "  --list         - list transactions since provided date/duration argument\n"
+msgstr "  --list         - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
 
 #: ../urpmi.recover:38
 #, c-format
@@ -2696,7 +2736,8 @@ msgstr "Dim trafodion ers %s\n"
 msgid "You must be superuser to do this"
 msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
 
-#: ../urpmi.recover:143 ../urpmi.recover:209
+#: ../urpmi.recover:143
+#: ../urpmi.recover:209
 #, c-format
 msgid "Writing rpm macros file [%s]...\n"
 msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
@@ -2776,22 +2817,17 @@ msgstr "  --force-key    - gorfodi diweddaru allwedd gpg.\n"
 #: ../urpmi.update:44
 #, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
-msgstr ""
-"  --norebuild    - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
+msgstr "  --norebuild    - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n"
 
 #: ../urpmi.update:45
 #, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
-msgstr ""
-"  --no-ignore    - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
+msgstr "  --no-ignore    - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n"
 
 #: ../urpmi.update:47
 #, c-format
-msgid ""
-"  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
-msgstr ""
-"  --probe-rpms     - peidio defnyddio synthesis/hdlist, defnyddiwch ffeiliau "
-"rpm\n"
+msgid "  --probe-rpms   - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr "  --probe-rpms     - peidio defnyddio synthesis/hdlist, defnyddiwch ffeiliau rpm\n"
 
 #: ../urpmi.update:48
 #, c-format
@@ -2842,8 +2878,7 @@ msgstr "galluogi cyfrwng %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 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 ""
@@ -2855,12 +2890,8 @@ msgstr ""
 
 #: ../urpmq:48
 #, c-format
-msgid ""
-"  --searchmedia  - use only the given media to search requested (or updated) "
-"packages.\n"
-msgstr ""
-"  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
-"gofynnwyd (neu diweddarwyd).\n"
+msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgstr "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau gofynnwyd (neu diweddarwyd).\n"
 
 #: ../urpmq:53
 #, c-format
@@ -2885,8 +2916,7 @@ msgstr "  --list-url     - rhestri'r holl gyfrwng ar gael.\n"
 #: ../urpmq:59
 #, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr ""
-"  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
+msgstr "  --list-nodes   - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n"
 
 #: ../urpmq:60
 #, c-format
@@ -2895,30 +2925,23 @@ msgstr "  --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n"
 
 #: ../urpmq:61
 #, c-format
-msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
-msgstr ""
-"  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi."
-"addmedia.\n"
+msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr "  --dump-config  - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi.addmedia.\n"
 
 #: ../urpmq:62
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr ""
-"  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
+msgstr "  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
 
 #: ../urpmq:63
 #, c-format
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr ""
-"  --sources      - give all source packages before downloading (root only).\n"
+msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - give all source packages before downloading (root only).\n"
 
 #: ../urpmq:65
 #, c-format
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr ""
-"  --ignorearch   - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
+msgstr "  --ignorearch   - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
 
 #: ../urpmq:69
 #, c-format
@@ -2954,11 +2977,13 @@ msgstr ""
 "                  - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
 
 #: ../urpmq:87
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "  --whatprovides, -p\n"
 "                   - search in provides to find package.\n"
-msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
+msgstr ""
+"  --whatprovides, -p\n"
+"                   - chwilio yn provides i ganfod pecyn.\n"
 
 #: ../urpmq:90
 #, c-format
@@ -2978,9 +3003,7 @@ msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 #: ../urpmq:94
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
-msgstr ""
-"  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
-"i bobl.\n"
+msgstr "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy i bobl.\n"
 
 #: ../urpmq:95
 #, c-format
@@ -3000,17 +3023,12 @@ msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 #: ../urpmq:98
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr ""
-"  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
+msgstr "  --s          - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
 
 #: ../urpmq:99
 #, c-format
-msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr ""
-"  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
-"osod.\n"
+msgid "  -u             - remove package if a more recent version is already installed.\n"
+msgstr "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei osod.\n"
 
 #: ../urpmq:100
 #, c-format
@@ -3020,16 +3038,12 @@ msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 #: ../urpmq:101
 #, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
-msgstr ""
-"  -Y             - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint "
-"llythrennau.\n"
+msgstr "  -Y             - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint llythrennau.\n"
 
 #: ../urpmq:102
 #, c-format
 msgid "  names or rpm files given on command line are queried.\n"
-msgstr ""
-" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
-"eu holi.\n"
+msgstr " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael eu holi.\n"
 
 #: ../urpmq:180
 #, c-format
@@ -3039,31 +3053,22 @@ msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 #: ../urpmq:359
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgstr ""
-"dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecyn "
-"%s"
+msgstr "dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecyn %s"
 
 #: ../urpmq:360
 #, c-format
 msgid "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr ""
-"dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
-"pecynnau %s"
+msgstr "dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecynnau %s"
 
 #: ../urpmq:363
 #, c-format
 msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgstr ""
-"dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
-"pecyn %s"
+msgstr "dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer pecyn %s"
 
 #: ../urpmq:364
 #, c-format
-msgid ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr ""
-"dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
-"pecynnau %s"
+msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr "dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer pecynnau %s"
 
 #: ../urpmq:425
 #, c-format
@@ -3072,33 +3077,25 @@ msgstr "Heb ganfod changelog\n"
 
 #~ msgid "there are multiple packages with the same rpm filename \"%s\""
 #~ msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
-
 #~ msgid "unable to correctly parse [%s] on value \"%s\""
 #~ msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
-
 #~ msgid "(retry as root?)"
 #~ msgstr "(ceisio eto fel root)"
-
 #~ msgid ""
 #~ "medium \"%s\" uses an invalid list file:\n"
 #~ "  mirror is probably not up-to-date, trying to use alternate method"
 #~ msgstr ""
 #~ "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
 #~ "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
-
 #~ msgid "medium \"%s\" does not define any location for rpm files"
 #~ msgstr ""
 #~ "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
-
 #~ msgid "unrequested"
 #~ msgstr "diofyn"
-
 #~ msgid " (%d MB)"
 #~ msgstr " (%d MB)"
-
 #~ msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 #~ msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
-
 #~ msgid ""
 #~ "The following packages have bad signatures:\n"
 #~ "%s\n"
@@ -3109,34 +3106,27 @@ msgstr "Heb ganfod changelog\n"
 #~ "%s\n"
 #~ "\n"
 #~ "Hoffech chi barhau gyda'r gosod?"
-
 #~ msgid "You need to be root to use --use-distrib"
 #~ msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"
-
 #~ msgid "unable to remove package %s"
 #~ msgstr "methu tynnu pecyn %s"
-
 #~ msgid "No filelist found\n"
 #~ msgstr "Heb ganfod filelist\n"
-
 #~ msgid ""
 #~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 #~ msgstr ""
 #~ "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu (%d MB)"
-
 #~ msgid "Proceed with the installation of the %d package? (%d MB)"
 #~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
 #~ msgstr[0] "Parhau gyda gosod %d pecyn? (%d MB)"
 #~ msgstr[1] "Parhau gyda gosod %d pecyn? (%d MB)"
-
 #~ msgid "(%d packages, %d MB)"
 #~ msgstr "(%d pecyn, %d MB)"
-
 #~ msgid ""
 #~ "  -P             - do not search in provides to find package (default).\n"
 #~ msgstr ""
 #~ "  -P             - peidio chwilio yn provides i ganfod pecyn "
 #~ "(rhagosodedig).\n"
-
 #~ msgid "  -R             - reverse search to what requires package.\n"
 #~ msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
+