updated po file

1 files changed, 341 insertions, 373 deletions

diff --git a/po/cy.po b/po/cy.po
index 60459da5..144144cb 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,4 +1,3 @@
-# Latest versions of po files are at http://www.mandrivalinux.com/l10n/cy.php3
 #
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
@@ -8,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-05 18:43+0800\n"
-"PO-Revision-Date: 2005-09-14 21:48-0000\n"
+"POT-Creation-Date: 2006-03-10 17:02+0100\n"
+"PO-Revision-Date: 2006-03-11 19:16-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
 "MIME-Version: 1.0\n"
@@ -20,12 +19,12 @@ msgstr ""
 
 #: ../gurpmi:30 ../gurpmi2:56
 msgid "RPM installation"
-msgstr "Gosodiad RPM"
+msgstr "Gosod RPM"
 
 #: ../gurpmi:43
 #, c-format
 msgid "Error: unable to find file %s, will cancel operation"
-msgstr ""
+msgstr "Gwall: methu canfod ffeil %s, diddymu'r weithred"
 
 #: ../gurpmi:44 ../gurpmi2:127 ../gurpmi2:150
 msgid "_Ok"
@@ -47,9 +46,8 @@ msgstr ""
 "\n"
 "%s\n"
 "\n"
-"Mwy na thebyg niad 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?"
 
@@ -100,12 +98,12 @@ msgstr "_Dileu"
 msgid "Choose location to save file"
 msgstr "Dewiswch leoliad i gadw'r ffeil"
 
-#: ../gurpmi.pm:75
+#: ../gurpmi.pm:76
 #, c-format
 msgid "Unknown option %s"
 msgstr "Dewis anhysbys %s"
 
-#: ../gurpmi.pm:83
+#: ../gurpmi.pm:85
 msgid "No packages specified"
 msgstr "Heb enwi pecyn"
 
@@ -118,7 +116,7 @@ msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
 #: ../gurpmi2:80
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
 "%s\n"
@@ -126,7 +124,7 @@ msgid ""
 msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s\n"
-"Parhau?"
+"Parhau beth bynnag?"
 
 #: ../gurpmi2:123
 msgid " (to upgrade)"
@@ -149,7 +147,7 @@ msgid "_Abort"
 msgstr "_Atal"
 
 #: ../gurpmi2:171
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
@@ -157,7 +155,7 @@ msgid ""
 msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
-"Parhau?"
+"Parhau beth bynnag?"
 
 #: ../gurpmi2:185
 #, c-format
@@ -182,12 +180,12 @@ msgstr "methu estyn pecynnau ffynhonnell, atal"
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:236
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "Llwytho pecynnau i lawr ' %s'..."
 
-#: ../gurpmi2:250
+#: ../gurpmi2:251
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -201,7 +199,7 @@ msgstr ""
 "Hoffech chi barhau gyda'r gosod?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:257 ../gurpmi2:313 ../urpmi:651 ../urpmi:782
+#: ../gurpmi2:258 ../gurpmi2:313 ../urpmi:651 ../urpmi:782
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -213,12 +211,12 @@ msgstr ""
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:264 ../urpme:129 ../urpmi:698
+#: ../gurpmi2:265 ../urpme:128 ../urpmi:698
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:272 ../urpm.pm:2907
+#: ../gurpmi2:272 ../urpm.pm:2908
 msgid "Preparing..."
 msgstr "Paratoi..."
 
@@ -277,53 +275,53 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
 
 #: ../rurpmi:18
 msgid "Running urpmi in restricted mode..."
-msgstr ""
+msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
 
-#: ../urpm.pm:73
+#: ../urpm.pm:72
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "protocol anhysbys ar gyfer %s"
 
-#: ../urpm.pm:109
+#: ../urpm.pm:108
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "heb ganfod webfetch, yn cael eu cynnal gan webfetch: %s\n"
 
-#: ../urpm.pm:125
+#: ../urpm.pm:124
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "methu trin protocol: %s"
 
-#: ../urpm.pm:222
+#: ../urpm.pm:221
 #, 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"
 
-#: ../urpm.pm:223
+#: ../urpm.pm:222
 #, 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"
 
-#: ../urpm.pm:236 ../urpm.pm:1311 ../urpm.pm:1321
+#: ../urpm.pm:235 ../urpm.pm:1310 ../urpm.pm:1320
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
 #. list file exists but isn't readable
 #. report error only if no result found, list files are only readable by root
-#: ../urpm.pm:239 ../urpm.pm:2517
+#: ../urpm.pm:238 ../urpm.pm:2518
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:267
-#, fuzzy, c-format
+#: ../urpm.pm:266
+#, c-format
 msgid "trying to override existing medium \"%s\", skipping"
-msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
+msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
 
-#: ../urpm.pm:278
+#: ../urpm.pm:277
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -332,103 +330,103 @@ msgstr ""
 "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
 "cyfrwng"
 
-#: ../urpm.pm:283
+#: ../urpm.pm:282
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "dylai cyfrwng rhithiol  \"%s\" gael url clir, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:292
+#: ../urpm.pm:291
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:299
+#: ../urpm.pm:298
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:323
+#: ../urpm.pm:322
 #, c-format
 msgid "inconsistent list file for \"%s\", medium ignored"
 msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
 
-#: ../urpm.pm:333
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
 
 #. - return value is suitable for an hash.
-#: ../urpm.pm:373
+#: ../urpm.pm:372
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
 
-#: ../urpm.pm:374
+#: ../urpm.pm:373
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "cymryd dyfais symudol fel \"%s\""
 
-#: ../urpm.pm:377
+#: ../urpm.pm:376
 #, 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."
 
-#: ../urpm.pm:380
+#: ../urpm.pm:379
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
 
-#: ../urpm.pm:385 ../urpm.pm:388
+#: ../urpm.pm:384 ../urpm.pm:387
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
 
-#: ../urpm.pm:414
+#: ../urpm.pm:413
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 
-#: ../urpm.pm:424
+#: ../urpm.pm:423
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm.pm:452
+#: ../urpm.pm:451
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
 
-#: ../urpm.pm:462
+#: ../urpm.pm:461
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
 
-#: ../urpm.pm:474
+#: ../urpm.pm:473
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "archwilio trinydd paralel mewn ffeil [%s]"
 
-#: ../urpm.pm:485
+#: ../urpm.pm:484
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "canfod trinydd paralel ar gyfer nodau: %s"
 
-#: ../urpm.pm:489
+#: ../urpm.pm:488
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm.pm:493
+#: ../urpm.pm:492
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "methu defnyddio dewis paralel \"%s\""
 
-#: ../urpm.pm:501
+#: ../urpm.pm:500
 #, c-format
 msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr "does dim dyfeisiau i'w gweld yn chroot yn \"%s\""
 
-#: ../urpm.pm:507
+#: ../urpm.pm:506
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
@@ -445,144 +443,144 @@ msgstr ""
 #. - (However links need to be managed. see bug #12391.)
 #. - as previously done, just read synthesis file here, this is enough.
 #. - read default synthesis (we have to make sure nothing get out of depslist).
-#: ../urpm.pm:571 ../urpm.pm:597 ../urpm.pm:1083 ../urpm.pm:1094
-#: ../urpm.pm:1166 ../urpm.pm:1183 ../urpm.pm:1238 ../urpm.pm:1294
-#: ../urpm.pm:1504 ../urpm.pm:1624 ../urpm.pm:1741 ../urpm.pm:1747
-#: ../urpm.pm:1850 ../urpm.pm:1936 ../urpm.pm:1940
+#: ../urpm.pm:570 ../urpm.pm:596 ../urpm.pm:1082 ../urpm.pm:1093
+#: ../urpm.pm:1165 ../urpm.pm:1182 ../urpm.pm:1237 ../urpm.pm:1293
+#: ../urpm.pm:1503 ../urpm.pm:1623 ../urpm.pm:1740 ../urpm.pm:1746
+#: ../urpm.pm:1849 ../urpm.pm:1935 ../urpm.pm:1939
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm.pm:575 ../urpm.pm:590 ../urpm.pm:603 ../urpm.pm:1086
-#: ../urpm.pm:1097 ../urpm.pm:1172 ../urpm.pm:1178 ../urpm.pm:1243
-#: ../urpm.pm:1298 ../urpm.pm:1508 ../urpm.pm:1628 ../urpm.pm:1735
-#: ../urpm.pm:1753 ../urpm.pm:1946
+#: ../urpm.pm:574 ../urpm.pm:589 ../urpm.pm:602 ../urpm.pm:1085
+#: ../urpm.pm:1096 ../urpm.pm:1171 ../urpm.pm:1177 ../urpm.pm:1242
+#: ../urpm.pm:1297 ../urpm.pm:1507 ../urpm.pm:1627 ../urpm.pm:1734
+#: ../urpm.pm:1752 ../urpm.pm:1945
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpm.pm:585 ../urpm.pm:1090
+#: ../urpm.pm:584 ../urpm.pm:1089
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:615
+#: ../urpm.pm:614
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
 #. - this is almost a fatal error, ignore it by default?
-#: ../urpm.pm:620 ../urpm.pm:1104 ../urpm.pm:1191 ../urpm.pm:1247
-#: ../urpm.pm:1632
+#: ../urpm.pm:619 ../urpm.pm:1103 ../urpm.pm:1190 ../urpm.pm:1246
+#: ../urpm.pm:1631
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm.pm:627 ../urpm.pm:1888
+#: ../urpm.pm:626 ../urpm.pm:1887
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
-#: ../urpm.pm:643
+#: ../urpm.pm:642
 #, c-format
 msgid "skipping package %s"
-msgstr "hepgor pecyn  %s"
+msgstr "hepgor pecyn %s"
 
-#: ../urpm.pm:656
+#: ../urpm.pm:655
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
 #. - beware this can be a child process or the main process now...
 #. - open in read/write mode unless testing installation.
-#: ../urpm.pm:667 ../urpm.pm:2325 ../urpm.pm:2386 ../urpm.pm:2574
-#: ../urpm.pm:2972 ../urpm.pm:3090
+#: ../urpm.pm:666 ../urpm.pm:2326 ../urpm.pm:2387 ../urpm.pm:2575
+#: ../urpm.pm:2973 ../urpm.pm:3100
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:707
+#: ../urpm.pm:706
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm.pm:714
+#: ../urpm.pm:713
 msgid "virtual medium needs to be local"
 msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
-#: ../urpm.pm:739
+#: ../urpm.pm:738
 #, c-format
 msgid "added medium %s"
 msgstr "ychwanegwyd cyfrwng %s"
 
-#: ../urpm.pm:784
+#: ../urpm.pm:783
 msgid "unable to access first installation medium"
 msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 
-#: ../urpm.pm:788
+#: ../urpm.pm:787
 msgid "copying hdlists file..."
 msgstr "copïo ffeil hdlists..."
 
-#: ../urpm.pm:790 ../urpm.pm:1207 ../urpm.pm:1264
+#: ../urpm.pm:789 ../urpm.pm:1206 ../urpm.pm:1263
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm.pm:791 ../urpm.pm:1208 ../urpm.pm:1339 ../urpm.pm:1402
-#: ../urpm.pm:1570 ../urpm.pm:1577
+#: ../urpm.pm:790 ../urpm.pm:1207 ../urpm.pm:1338 ../urpm.pm:1401
+#: ../urpm.pm:1569 ../urpm.pm:1576
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm.pm:794 ../urpm.pm:819 ../urpm.pm:858
+#: ../urpm.pm:793 ../urpm.pm:818 ../urpm.pm:857
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr ""
 "methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil hdlists)"
 
-#: ../urpm.pm:801
+#: ../urpm.pm:800
 msgid "retrieving hdlists file..."
 msgstr "adfer ffeil hdlists..."
 
-#: ../urpm.pm:813 ../urpm.pm:1614 ../urpm.pm:2115 ../urpm.pm:2832
+#: ../urpm.pm:812 ../urpm.pm:1613 ../urpm.pm:2114 ../urpm.pm:2833
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:815 ../urpm.pm:1598 ../urpm.pm:2119 ../urpm.pm:2834
+#: ../urpm.pm:814 ../urpm.pm:1597 ../urpm.pm:2118 ../urpm.pm:2835
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:839
+#: ../urpm.pm:838
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 
-#: ../urpm.pm:895
+#: ../urpm.pm:894
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
 #. - several elements in found and/or foundi lists.
-#: ../urpm.pm:897
+#: ../urpm.pm:896
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm.pm:913
+#: ../urpm.pm:912
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm.pm:964
+#: ../urpm.pm:963
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:993
+#: ../urpm.pm:992
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm.pm:1000
+#: ../urpm.pm:999
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm.pm:1144
+#: ../urpm.pm:1143
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -592,7 +590,7 @@ msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
 
-#: ../urpm.pm:1195
+#: ../urpm.pm:1194
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -601,135 +599,135 @@ msgstr ""
 "dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
 "anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1205
+#: ../urpm.pm:1204
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm.pm:1260
+#: ../urpm.pm:1259
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1274
+#: ../urpm.pm:1273
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm.pm:1279
+#: ../urpm.pm:1278
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm.pm:1281
+#: ../urpm.pm:1280
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm.pm:1302 ../urpm.pm:1512 ../urpm.pm:1853
+#: ../urpm.pm:1301 ../urpm.pm:1511 ../urpm.pm:1852
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm.pm:1360
+#: ../urpm.pm:1359
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1375
+#: ../urpm.pm:1374
 msgid "no rpms read"
 msgstr "heb ddarllen rpmau"
 
-#: ../urpm.pm:1385
+#: ../urpm.pm:1384
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm.pm:1390
+#: ../urpm.pm:1389
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
 #. - try to probe for possible with_hdlist parameter, unless
 #. - it is already defined (and valid).
-#: ../urpm.pm:1527
+#: ../urpm.pm:1526
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1555
+#: ../urpm.pm:1554
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm.pm:1605
+#: ../urpm.pm:1604
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm.pm:1607
+#: ../urpm.pm:1606
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "... methodd ail-lwytho: anghysondeb md5sum"
 
-#: ../urpm.pm:1705
+#: ../urpm.pm:1704
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
-#: ../urpm.pm:1712
+#: ../urpm.pm:1711
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1723 ../urpm.pm:1777
+#: ../urpm.pm:1722 ../urpm.pm:1776
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "file [%s] yn cael ei ddefnyddio eisoes yn yr un cyfrwng \"%s\""
 
-#: ../urpm.pm:1763
+#: ../urpm.pm:1762
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm.pm:1802
+#: ../urpm.pm:1801
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
 
-#: ../urpm.pm:1810
+#: ../urpm.pm:1809
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1812
+#: ../urpm.pm:1811
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
 
-#: ../urpm.pm:1827
+#: ../urpm.pm:1826
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1834
+#: ../urpm.pm:1833
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1837
+#: ../urpm.pm:1836
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1902
+#: ../urpm.pm:1901
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm.pm:1907
+#: ../urpm.pm:1906
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
 #. - XXX this happens when building a synthesis for a local media from RPMs... why ?
-#: ../urpm.pm:1922 ../urpm.pm:1958
+#: ../urpm.pm:1921 ../urpm.pm:1957
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -738,91 +736,96 @@ msgstr ""
 "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
 "ffeil hdlist yn llygredig."
 
-#: ../urpm.pm:1926 ../urpm.pm:1962 ../urpmi:370
+#: ../urpm.pm:1925 ../urpm.pm:1961 ../urpmi:370
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1985
+#: ../urpm.pm:1984
 #, c-format
 msgid "found %d headers in cache"
 msgstr "canfod %d pennawd mewn storfa"
 
-#: ../urpm.pm:1989
+#: ../urpm.pm:1988
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "tynnu hen benawdau %d yn y storfa"
 
-#: ../urpm.pm:2010
+#: ../urpm.pm:2009
 #, c-format
 msgid "Error generating names file: dependency %d not found"
-msgstr ""
+msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
 
-#: ../urpm.pm:2015
+#: ../urpm.pm:2014
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
-msgstr ""
+msgstr "Gwall wrth gynhyrchu ffeil enwau: Methu ysgrifennu ffeil (%s)"
 
-#: ../urpm.pm:2051
+#: ../urpm.pm:2050
 #, c-format
 msgid "mounting %s"
 msgstr "gosod %s"
 
-#: ../urpm.pm:2075
+#: ../urpm.pm:2074
 #, c-format
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm.pm:2100
+#: ../urpm.pm:2099
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:2106
+#: ../urpm.pm:2105
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:2124
+#: ../urpm.pm:2123
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:2129
-#, fuzzy, c-format
+#: ../urpm.pm:2128
+#, c-format
 msgid "unable to parse spec file %s [%s]"
-msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
+msgstr "methu didoli ffeil spec %s [%s]"
 
-#: ../urpm.pm:2139
+#: ../urpm.pm:2138
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:2143
+#: ../urpm.pm:2140
+#, c-format
+msgid "Incompatible architecture for rpm [%s]"
+msgstr ""
+
+#: ../urpm.pm:2144
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:2253
+#: ../urpm.pm:2254
 #, c-format
 msgid "no package named %s"
 msgstr "heb enwi pecyn %s"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm.pm:2255 ../urpme:102
+#: ../urpm.pm:2256 ../urpme:101
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm.pm:2448 ../urpm.pm:2494 ../urpm.pm:2525
+#: ../urpm.pm:2449 ../urpm.pm:2495 ../urpm.pm:2526
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
 
-#: ../urpm.pm:2508
+#: ../urpm.pm:2509
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpm.pm:2541
+#: ../urpm.pm:2542
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -831,174 +834,173 @@ msgstr ""
 "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
 "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:2545
+#: ../urpm.pm:2546
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "nid yw cyfrwng \"%s\" yn diffinio unrhyw leoliad ar gyfer ffeiliau rpm"
 
-#: ../urpm.pm:2557
+#: ../urpm.pm:2558
 #, c-format
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm.pm:2608 ../urpm.pm:2622 ../urpm.pm:2642 ../urpm.pm:2656
+#: ../urpm.pm:2609 ../urpm.pm:2623 ../urpm.pm:2643 ../urpm.pm:2657
 msgid "urpmi database locked"
 msgstr "cronfa ddata urpmi wedi cloi"
 
-#: ../urpm.pm:2708 ../urpm.pm:2713 ../urpm.pm:2739
+#: ../urpm.pm:2709 ../urpm.pm:2714 ../urpm.pm:2740
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "heb ddewis cyfrwng \"%s\""
 
 #. - fallback to use other method for retrieving the file later.
-#: ../urpm.pm:2735
+#: ../urpm.pm:2736
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
 #. - we have a removable device that is not removable, well...
-#: ../urpm.pm:2743
+#: ../urpm.pm:2744
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
 
-#: ../urpm.pm:2755
+#: ../urpm.pm:2756
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:2810
-#, fuzzy, c-format
+#: ../urpm.pm:2811
+#, c-format
 msgid "malformed URL: [%s]"
-msgstr "allbwn gwallus: [%s]"
+msgstr "URL gwallus: [%s]"
 
-#: ../urpm.pm:2817
+#: ../urpm.pm:2818
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:2945
+#: ../urpm.pm:2946
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpm.pm:2977
+#: ../urpm.pm:2978
 #, 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)"
 
-#: ../urpm.pm:2980
+#: ../urpm.pm:2981
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:2988
+#: ../urpm.pm:2989
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:2990
+#: ../urpm.pm:2991
 #, c-format
 msgid "unable to remove package %s"
 msgstr "methu tynnu pecyn %s"
 
-#: ../urpm.pm:3002
+#: ../urpm.pm:3003
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm.pm:3008
+#: ../urpm.pm:3009
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "ychwanegu pecyn %s (id=%d, eid=%d, update=%d, file=%s)"
 
-#: ../urpm.pm:3011
+#: ../urpm.pm:3012
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm.pm:3061
+#: ../urpm.pm:3062
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
 
-#: ../urpm.pm:3233 ../urpm.pm:3271
+#: ../urpm.pm:3243 ../urpm.pm:3281
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:3234 ../urpm.pm:3269
+#: ../urpm.pm:3244 ../urpm.pm:3279
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm.pm:3240
+#: ../urpm.pm:3250
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:3241
+#: ../urpm.pm:3251
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm.pm:3264
+#: ../urpm.pm:3274
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm.pm:3275
+#: ../urpm.pm:3285
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:3276
+#: ../urpm.pm:3286
 msgid "unrequested"
 msgstr "diofyn"
 
-#: ../urpm.pm:3295
+#: ../urpm.pm:3305
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm.pm:3328
+#: ../urpm.pm:3338
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm.pm:3330
+#: ../urpm.pm:3340
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
-#: ../urpm.pm:3389
+#: ../urpm.pm:3399
 msgid "examining MD5SUM file"
 msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpm.pm:3399
+#: ../urpm.pm:3409
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "rhybudd: nid yw md5sum ar gyfer %s ar gael yn ffeil MD5SUM"
 
-#: ../urpm.pm:3410
+#: ../urpm.pm:3420
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
-#: ../urpm.pm:3440
+#: ../urpm.pm:3450
 msgid "This operation is forbidden while running in restricted mode"
-msgstr ""
+msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
 
 #: ../urpm/args.pm:106 ../urpm/args.pm:115
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:229
-#, fuzzy
+#: ../urpm/args.pm:230
 msgid "You need to be root to use --use-distrib"
-msgstr "Rhaid i chi fod yn wraidd i ddefnyddio'r gorchymyn hwn!\n"
+msgstr "Rhaid i chi fod yn wraidd i ddefnyddio --use-distrib"
 
-#: ../urpm/args.pm:261
+#: ../urpm/args.pm:262
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
@@ -1026,45 +1028,45 @@ msgstr "Dewis gwael, ceisiwch eto\n"
 #: ../urpm/parallel_ka_run.pm:27 ../urpm/parallel_ka_run.pm:121
 #: ../urpm/parallel_ka_run.pm:215
 msgid "mput failed, maybe a node is unreacheable"
-msgstr ""
+msgstr "methodd mput, efallai bod nod yn anghyraeddadwy"
 
 #: ../urpm/parallel_ka_run.pm:64
 #, c-format
 msgid "node %s has an old version of urpme, please upgrade"
-msgstr ""
+msgstr "mae gan nod %s hen fersiwn o urpmi, diweddarwch"
 
 #: ../urpm/parallel_ka_run.pm:88 ../urpm/parallel_ka_run.pm:200
 #: ../urpm/parallel_ka_run.pm:230
 msgid "rshp failed, maybe a node is unreacheable"
-msgstr ""
+msgstr "methodd rshp, efallai bod y nod yn anghyraeddadwy"
 
 #: ../urpm/parallel_ka_run.pm:97 ../urpm/parallel_ssh.pm:102
 #, c-format
 msgid "on node %s"
-msgstr ""
+msgstr "ar nod %s"
 
 #. - first propagate the synthesis file to all machine.
 #: ../urpm/parallel_ka_run.pm:119
 msgid "Propagating synthesis to nodes..."
-msgstr ""
+msgstr "Lledaenu synthesis i nodau"
 
 #. - now try an iteration of urpmq.
 #: ../urpm/parallel_ka_run.pm:170
 msgid "Resolving dependencies on nodes..."
-msgstr ""
+msgstr "Datrys dibyniaethau ar y nodau"
 
 #: ../urpm/parallel_ka_run.pm:213
 msgid "Distributing files to nodes..."
-msgstr ""
+msgstr "Dosbarthu ffeiliau i nodau"
 
 #: ../urpm/parallel_ka_run.pm:220
 msgid "Verifying if install is possible on nodes..."
-msgstr ""
+msgstr "Gwirio os yw gosod yn bosib ar nodau"
 
 #: ../urpm/parallel_ka_run.pm:234 ../urpm/parallel_ssh.pm:249
-#, fuzzy, c-format
+#, c-format
 msgid "Installation failed on node %s"
-msgstr "Methodd y gosod"
+msgstr "Methodd y gosod ar nod %s"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
 #: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:796
@@ -1073,58 +1075,57 @@ msgstr "Gosod yn bosibl"
 
 #. - continue installation.
 #: ../urpm/parallel_ka_run.pm:244
-#, fuzzy
 msgid "Installing packages on nodes..."
-msgstr "Gosod pecyn `%s' (%s/%s)..."
+msgstr "Gosod pecynnau ar nodau..."
 
 #: ../urpm/parallel_ssh.pm:28 ../urpm/parallel_ssh.pm:126
 #: ../urpm/parallel_ssh.pm:230
 #, c-format
 msgid "scp failed on host %s (%d)"
-msgstr ""
+msgstr "methodd scp ar westai %s (%d)"
 
 #: ../urpm/parallel_ssh.pm:124
-#, fuzzy, c-format
+#, c-format
 msgid "Propagating synthesis to %s..."
-msgstr "archwilio ffeil synthesis [%s]"
+msgstr "Lledaenu synthesis i %s..."
 
 #: ../urpm/parallel_ssh.pm:177
 #, c-format
 msgid "Resolving dependencies on %s..."
-msgstr ""
+msgstr "Datrys dibyniaethau ar %s..."
 
 #: ../urpm/parallel_ssh.pm:207
 #, c-format
 msgid "host %s does not have a good version of urpmi (%d)"
-msgstr ""
+msgstr "nid oes gan westai %s fersiwn dda o urpmi (%d)"
 
 #: ../urpm/parallel_ssh.pm:223
-#, fuzzy, c-format
+#, c-format
 msgid "Distributing files to %s..."
-msgstr "dosbarthu %s"
+msgstr "Dosbarthu ffeiliau i %s..."
 
 #: ../urpm/parallel_ssh.pm:237
 #, c-format
 msgid "Verifying if install is possible on %s..."
-msgstr ""
+msgstr "Gwirio os yw gosod yn bosibl ar %s..."
 
 #: ../urpm/parallel_ssh.pm:261
-#, fuzzy, c-format
+#, c-format
 msgid "Performing install on %s..."
-msgstr "Gosod y pecyn..."
+msgstr "Gosod pecyn ar %s..."
 
 #: ../urpm/parallel_ssh.pm:274
-#, fuzzy, c-format
+#, c-format
 msgid "Installing %s on %s..."
-msgstr "gosod %s o %s"
+msgstr "Gosod %s ar %s..."
 
 #: ../urpm/parallel_ssh.pm:275
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing install on %s..."
-msgstr "Gosod y pecyn..."
+msgstr "Paratoi gosod ar %s..."
 
 #: ../urpme:37
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2006 Mandriva.\n"
@@ -1134,8 +1135,8 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpmf fersiwn %s\n"
-"Hawlfraint © 1999 - 2004 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"Hawlfraint (C) 1999 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
 "\n"
 "defnydd:\n"
 
@@ -1146,7 +1147,7 @@ msgstr "  --help         - argraffu neges cymorth.\n"
 
 #: ../urpme:43
 msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
+msgstr "  --auto         - dewis pecyn yn awtomatig o fewn dewisiadau.\n"
 
 #: ../urpme:44
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
@@ -1165,27 +1166,24 @@ msgstr ""
 "  --parallel    - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n"
 
 #: ../urpme:47 ../urpmi:134
-#, fuzzy
 msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
+msgstr "  --repackage    - Ailbecynnu'r ffeiliau cyn eu dileu\n"
 
 #: ../urpme:48
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - defnyddio root arall ar gyfer tynnu rpm.\n"
 
 #: ../urpme:49
-#, fuzzy
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
+msgstr "  --noscripts    - peidio gweithredu sgriptledi'r pecyn(au).\n"
 
 #: ../urpme:50
-#, fuzzy
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
-"                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
+"                   wrth (ddad)osod chroot gyda dewis  --root.\n"
 
 #: ../urpme:52 ../urpmi:145 ../urpmi.addmedia:70 ../urpmi.removemedia:59
 #: ../urpmi.update:49 ../urpmq:91
@@ -1200,53 +1198,53 @@ msgstr "  -a             - select all packages matching expression.\n"
 msgid "Only superuser is allowed to remove packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau"
 
-#: ../urpme:96
+#: ../urpme:95
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:96
+#: ../urpme:95
 msgid "unknown packages"
 msgstr "pecynnau anhysbys"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:108 ../urpmi:488
+#: ../urpme:107 ../urpmi:488
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
 
-#: ../urpme:111
+#: ../urpme:110
 msgid "Nothing to remove"
 msgstr "Dim i'w dynnu"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:116
+#: ../urpme:115
 msgid "Checking to remove the following packages"
 msgstr "Ticio i ddileu'r pecynnau canlynol"
 
-#: ../urpme:123
+#: ../urpme:122
 #, c-format
 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)"
 
-#: ../urpme:125 ../urpmi:510 ../urpmi:643
+#: ../urpme:124 ../urpmi:510 ../urpmi:643
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:125
-#, fuzzy, c-format
+#: ../urpme:124
+#, c-format
 msgid "Remove %d packages?"
-msgstr "tynnu pecyn %s."
+msgstr "Tynnu pecynnau %d?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:149
+#: ../urpme:148
 msgid "Removal failed"
 msgstr "Methodd y tynnu"
 
 #: ../urpmf:28
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmf version %s\n"
 "Copyright (C) 2002-2006 Mandriva.\n"
@@ -1256,15 +1254,14 @@ msgid ""
 "usage: urpmf [options] pattern-expression\n"
 msgstr ""
 "urpmf fersiwn %s\n"
-"Hawlfraint © 2002 - 2004 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"Hawlfraint © 2002 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU..\n"
 "\n"
 "defnydd:\n"
 
 #: ../urpmf:35
-#, fuzzy
 msgid "  --version      - print this tool's version number.\n"
-msgstr "  --help         - argraffu neges cymorth.\n"
+msgstr "  --version      - argraffu rhif fersiwn yr offeryn.\n"
 
 #: ../urpmf:36 ../urpmi:125 ../urpmq:74
 msgid "  --env          - use specific environment (typically a bug report).\n"
@@ -1281,6 +1278,8 @@ msgstr ""
 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:39 ../urpmi:81 ../urpmq:46
 msgid "  --media        - use only the given media, separated by comma.\n"
@@ -1316,15 +1315,17 @@ msgstr ""
 
 #: ../urpmf:46
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
-msgstr ""
+msgstr "  -F<str>        - newid ymwahanydd maes (arferol i ':').\n"
 
 #: ../urpmf:47
 msgid "Pattern expressions:\n"
-msgstr ""
+msgstr "Mynegiadau patrymau:\n"
 
 #: ../urpmf:48
 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"
 
 #: ../urpmf:49
 msgid "  -e             - include perl code directly as perl -e.\n"
@@ -1343,136 +1344,109 @@ msgid "  !              - unary NOT.\n"
 msgstr "  !              - unaidd NOT.\n"
 
 #: ../urpmf:53
-#, fuzzy
 msgid "  ( )            - left and right parentheses.\n"
-msgstr "  )              - parenthesis de i gau mynegiad grŵp.\n"
+msgstr "  ( )              - parenthesis de a chwith.\n"
 
 #: ../urpmf:54
-#, fuzzy
 msgid "List of tags:\n"
-msgstr ""
-"Rhestr o ddata i'w adfer:\n"
-"\n"
+msgstr "Rhestr tagiau:\n"
 
 #: ../urpmf:55
-#, fuzzy
 msgid "  --qf           - specify a printf-like output format\n"
-msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
+msgstr "  --qf           - pennu allbwn fformat printf-aidd\n"
 
 #: ../urpmf:56
-#, fuzzy, c-format
+#, c-format
 msgid "                   example: '%%name:%%files'\n"
-msgstr "                   rhagosodedig yw %s.\n"
+msgstr "                   esiampl: '%%enw:%%ffeil'\n"
 
 #: ../urpmf:57
-#, fuzzy
 msgid "  --arch         - architecture\n"
-msgstr "  --url          - argraffu tag url: url.\n"
+msgstr "  --arch         - saernïaeth\n"
 
 #: ../urpmf:58
-#, fuzzy
 msgid "  --buildhost    - build host\n"
-msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
+msgstr "  --buildhost    - gwestai'r adeiladedd\n"
 
 #: ../urpmf:59
 msgid "  --buildtime    - build time\n"
-msgstr ""
+msgstr "  --buildtime    - amser adeiladu\n"
 
 #: ../urpmf:60
-#, fuzzy
 msgid "  --conffiles    - configuration files\n"
-msgstr "Modiwl ffurfweddu Konsole"
+msgstr "  --conffiles    - ffeiliau ffurfweddiad\n"
 
 #: ../urpmf:61
-#, fuzzy
 msgid "  --conflicts    - conflict tags\n"
-msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
+msgstr "  --conflicts    - tagiau gwrthdaro\n"
 
 #: ../urpmf:62
-#, fuzzy
 msgid "  --description  - package description\n"
-msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
+msgstr "  --description  - disgrifiad pecyn\n"
 
 #: ../urpmf:63
 msgid "  --distribution - distribution\n"
-msgstr ""
+msgstr "  --distribution - dosbarthiad\n"
 
 #: ../urpmf:64
-#, fuzzy
 msgid "  --epoch        - epoch\n"
-msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
+msgstr "  --epoch        - cyfnod\n"
 
 #: ../urpmf:65
-#, fuzzy
 msgid "  --filename     - filename of the package\n"
-msgstr "  --name          - argraffu enwau pecyn yn unig \n"
+msgstr "  --filename     - enw ffeil y pecyn\n"
 
 #: ../urpmf:66
-#, fuzzy
 msgid "  --files        - list of files contained in the package\n"
-msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
+msgstr "  --files        - rhestr ffeiliau o fewn y pecyn\n"
 
 #: ../urpmf:67
-#, fuzzy
 msgid "  --group        - group\n"
-msgstr "  --group        - argraffu grŵp tag: grŵp.\n"
+msgstr "  --group        - grŵp\n"
 
 #: ../urpmf:68
-#, fuzzy
 msgid "  --name         - package name\n"
-msgstr "  --name          - argraffu enwau pecyn yn unig \n"
+msgstr "  --name          - enw'r pecyn\n"
 
 #: ../urpmf:69
-#, fuzzy
 msgid "  --obsoletes    - obsoletes tags\n"
-msgstr ""
-"  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
-"niferus).\n"
+msgstr "  --obsoletes     - tagiau'r hen\n"
 
 #: ../urpmf:70
-#, fuzzy
 msgid "  --packager     - packager\n"
-msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
+msgstr "  --packager      - pecynydd\n"
 
 #: ../urpmf:71
-#, fuzzy
 msgid "  --provides     - provides tags\n"
-msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
+msgstr "  --provides      - tag darparu\n"
 
 #: ../urpmf:72
-#, fuzzy
 msgid "  --requires     - requires tags\n"
-msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
+msgstr "  --requires     - tagiau angenrhaid\n"
 
 #: ../urpmf:73
-#, fuzzy
 msgid "  --size         - installed size\n"
-msgstr "  --size         - argraffu maint tag: maint.\n"
+msgstr "  --size         - maint wedi gosod\n"
 
 #: ../urpmf:74
-#, fuzzy
 msgid "  --sourcerpm    - source rpm name\n"
-msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
+msgstr "  --sourcerpm    - enw rpm ffynhonnell\n"
 
 #: ../urpmf:75
-#, fuzzy
 msgid "  --summary      - summary\n"
-msgstr "  --summary, -S  - crynodeb argraffu.\n"
+msgstr "  --summary      - crynodeb\n"
 
 #: ../urpmf:76
-#, fuzzy
 msgid "  --url          - url\n"
-msgstr "  --url          - argraffu tag url: url.\n"
+msgstr "  --url          - url\n"
 
 #: ../urpmf:77
-#, fuzzy
 msgid "  --vendor       - vendor\n"
-msgstr "  --verbose      - modd llafar.\n"
+msgstr "  --vendor       - gwerthwr\n"
 
 #: ../urpmf:78
-#, fuzzy
 msgid "  -m             - the media in which the package was found\n"
-msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
+msgstr "  -m             - y cyfrwng lle cafwyd y pecyn\n"
 
 #: ../urpmf:79 ../urpmq:80
 msgid "  -f             - print version, release and arch with name.\n"
@@ -1480,7 +1454,7 @@ msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
 #: ../urpmf:131
 msgid "Incorrect format: you may use only one multi-valued tag"
-msgstr ""
+msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
 
 #: ../urpmf:173 ../urpmi:231 ../urpmq:126
 #, c-format
@@ -1500,7 +1474,7 @@ msgid "You may want to use --name to search for package names.\n"
 msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
 
 #: ../urpmi:75
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2006 Mandriva.\n"
@@ -1510,24 +1484,25 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpmf fersiwn %s\n"
-"Hawlfraint © 1999 - 2004 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"Hawlfraint © 1999 - 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
 "\n"
 "defnydd:\n"
 
 #: ../urpmi:84
-#, fuzzy
 msgid ""
 "  --searchmedia  - use only the given media to search requested packages.\n"
 msgstr ""
 "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
-"gofynnwyd (neu diweddarwyd).\n"
+"gofynnwyd.\n"
 
 #: ../urpmi:87
 msgid ""
 "  --auto         - non-interactive mode, assume default answers to "
 "questions.\n"
 msgstr ""
+"  --auto         - modd anrhyngweithiol, derbyn atebion rhagosodedig i "
+"gwestiynau.\n"
 
 #: ../urpmi:88 ../urpmq:51
 msgid ""
@@ -1541,9 +1516,9 @@ msgid ""
 msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
 
 #: ../urpmi:90
-#, fuzzy
 msgid "  --no-install   - don't install packages (only download)\n"
-msgstr "  --install-src  - peidio gosod pecynnau (llawyth i lawr yn unig).\n"
+msgstr ""
+"  --no-install   - peidio gosod y pecynnau (dim ond eu llwytho i lawr)\n"
 
 #: ../urpmi:91 ../urpmq:53
 msgid ""
@@ -1571,15 +1546,12 @@ msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
 
 #: ../urpmi:97
-#, fuzzy
 msgid "  --fuzzy, -y    - impose fuzzy search.\n"
-msgstr "  --fuzzy        - mynnu chwiliad fuzzy (fel -y).\n"
+msgstr "  --fuzzy        - mynnu chwiliad bras.\n"
 
 #: ../urpmi:98
-#, fuzzy
 msgid "  --src, -s      - next package is a source package.\n"
-msgstr ""
-"  --src          - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
+msgstr "  --src, -s      - pecyn nesaf yn becyn ffynhonnell.\n"
 
 #: ../urpmi:99
 msgid "  --install-src  - install only source package (no binaries).\n"
@@ -1632,15 +1604,15 @@ msgstr "  --curl         - defnyddio curl i estyn ffeiliau pell.\n"
 
 #: ../urpmi:113
 msgid "  --curl-options - additional options to pass to curl\n"
-msgstr ""
+msgstr "  --curl-options - dewis ychwanegol wrth ddefnyddio curl\n"
 
 #: ../urpmi:114
 msgid "  --rsync-options- additional options to pass to rsync\n"
-msgstr ""
+msgstr "  --rsync-options- dewis ychwanegol wrth ddefnyddio rsync\n"
 
 #: ../urpmi:115
 msgid "  --wget-options - additional options to pass to wget\n"
-msgstr ""
+msgstr "  --wget-options - dewis ychwanegol wrth ddefnyddio wget\n"
 
 #: ../urpmi:116 ../urpmi.addmedia:47 ../urpmi.update:34
 msgid "  --limit-rate   - limit the download speed.\n"
@@ -1679,16 +1651,14 @@ msgstr ""
 "                   yr arg. nesaf\n"
 
 #: ../urpmi:126
-#, fuzzy
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disables it, default is enabled).\n"
 msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
-"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
+"                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig).\n"
 
 #: ../urpmi:128
-#, fuzzy
 msgid ""
 "  --test         - only verify if the installation can be achieved "
 "correctly.\n"
@@ -1703,19 +1673,16 @@ msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
 #: ../urpmi:131
-#, fuzzy
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
-msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
+msgstr "  --ignoresize   - peidio gwirio maint ar ddisg cyn gosod.\n"
 
 #: ../urpmi:132
-#, fuzzy
 msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
-msgstr "  --url          - argraffu tag url: url.\n"
+msgstr "  --ignorearch   - caniatáu gosod rpm ar gyfer saernïaeth annhebyg.\n"
 
 #: ../urpmi:133
-#, fuzzy
 msgid "  --noscripts    - do not execute package scriptlet(s)\n"
-msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
+msgstr "  --noscripts    - peidio gweithredu sgripledi pecyn(au)\n"
 
 #: ../urpmi:135
 msgid "  --skip         - packages which installation should be skipped\n"
@@ -1737,9 +1704,8 @@ msgstr ""
 "ddarllenadwy.\n"
 
 #: ../urpmi:139
-#, fuzzy
 msgid "  --nolock       - don't lock rpm db.\n"
-msgstr "  --noclean      - peidio glanhau rpm o'r storfa.\n"
+msgstr "  --nolock       - peidio cloi db rpm.\n"
 
 #: ../urpmi:140
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
@@ -1770,10 +1736,8 @@ msgstr ""
 "eu gosod.\n"
 
 #: ../urpmi:197
-#, fuzzy
 msgid "You can't install binary rpm files when using --install-src"
-msgstr ""
-"Beth mae modd gwneud gyda ffeiliau deuaidd wrth ddefnyddio --install-src"
+msgstr "Methu gosod ffeiliau deuaidd rpm wrth ddefnyddio --install-src"
 
 #: ../urpmi:220
 #, c-format
@@ -1796,7 +1760,7 @@ msgstr "Methodd y copïo"
 #: ../urpmi:230
 #, c-format
 msgid "Environment directory %s does not exist"
-msgstr ""
+msgstr "Nid yw cyfeiriadur amgylchedd %s yn bodoli"
 
 #: ../urpmi:248
 #, c-format
@@ -1810,7 +1774,7 @@ msgstr ""
 #. - For translators : there are several media here
 #: ../urpmi:332
 msgid "Updating media...\n"
-msgstr ""
+msgstr "Diweddaru cyfrwng...\n"
 
 #: ../urpmi:417
 #, c-format
@@ -1829,11 +1793,12 @@ msgstr ""
 "%s"
 
 #: ../urpmi:455 ../urpmi:473
-#, fuzzy
 msgid ""
 "\n"
 "Continue installation anyway?"
-msgstr "Parhau beth bynnag?"
+msgstr ""
+"\n"
+"Parhau i osod beth bynnag?"
 
 #: ../urpmi:455 ../urpmi:473 ../urpmi:560
 msgid " (Y/n) "
@@ -1855,7 +1820,7 @@ msgid ""
 "have to be removed for others to be upgraded:\n"
 "%s\n"
 msgstr ""
-"Nid oes modd i'r gosod parhau gan fo rhaid i'r pecynnau canlynol\n"
+"Nid oes modd i'r gosod parhau gan fo'n rhaid i'r pecynnau canlynol\n"
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
@@ -1870,26 +1835,21 @@ msgstr ""
 
 #: ../urpmi:503
 msgid "(test only, removal will not be actually done)"
-msgstr ""
+msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
 #: ../urpmi:539 ../urpmi:551
-#, fuzzy
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
-msgstr ""
-"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n"
-"%s\n"
+msgstr "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
 
 #: ../urpmi:540 ../urpmi:552
-#, fuzzy
 msgid "To satisfy dependencies, the following package is going to be installed"
-msgstr ""
-"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod (%d MB)"
+msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
 
 #: ../urpmi:541
 #, c-format
 msgid "(%d packages, %d MB)"
-msgstr ""
+msgstr "(%d pecyn, %d MB)"
 
 #: ../urpmi:547
 #, c-format
@@ -1902,12 +1862,12 @@ msgstr ""
 
 #: ../urpmi:554
 msgid "(test only, installation will not be actually done)"
-msgstr ""
+msgstr "(prawf yn unig, ni fydd yn cael ei osod)"
 
 #: ../urpmi:556
 #, c-format
 msgid "Proceed with the installation of the %d packages? (%d MB)"
-msgstr ""
+msgstr "Parhau gyda gosod %d pecyn? (%d MB)"
 
 #: ../urpmi:580
 msgid "Press Enter when ready..."
@@ -1950,9 +1910,8 @@ msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
 #: ../urpmi:747
-#, fuzzy
 msgid "Try harder to install (--force)? (y/N) "
-msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
+msgstr "Mwy o orfodaeth gyda'r gosod?  (--force)? (y/N)"
 
 #: ../urpmi:787
 #, c-format
@@ -2053,7 +2012,7 @@ msgstr "  --nopubkey     - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n"
 #: ../urpmi.addmedia:66
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr ""
-"  --raw          - ychwnaegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
+"  --raw          - ychwanegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n"
 
 #: ../urpmi.addmedia:67 ../urpmi.removemedia:56 ../urpmi.update:46
 msgid "  -c             - clean headers cache directory.\n"
@@ -2100,7 +2059,7 @@ msgid "unable to create medium \"%s\"\n"
 msgstr "methu creu cyfrwng \"%s\"\n"
 
 #: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmi.recover version %s\n"
 "Copyright (C) 2006 Mandriva.\n"
@@ -2109,117 +2068,115 @@ msgid ""
 "\n"
 "usage:\n"
 msgstr ""
-"urpmf fersiwn %s\n"
-"Hawlfraint © 1999 - 2004 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"urpmi.recover fersiwn %s\n"
+"Hawlfraint (C) 2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
 "\n"
 "defnydd:\n"
 
 #: ../urpmi.recover:34
 msgid "  --checkpoint   - set repackaging start now\n"
-msgstr ""
+msgstr "  --checkpoint   - gosod cychwyn ailbacio nawr\n"
 
 #: ../urpmi.recover:35
-#, fuzzy
 msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - peidio glanhau rpm o'r storfa.\n"
+msgstr "  --noclean      - peidio glanhau rpm ar checkpoint\n"
 
 #: ../urpmi.recover:36
 msgid ""
 "  --list         - list transactions since provided date/duration argument\n"
 msgstr ""
+"  --list         - rhestri trafodion ers darparu ymresymiad dyddiad hyd\n"
 
 #: ../urpmi.recover:37
-#, fuzzy
 msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
+msgstr "  --list-all     - rhestri'r holl drafodion yn rpmdb (hir)\n"
 
 #: ../urpmi.recover:38
 msgid ""
 "  --rollback     - rollback until specified date,\n"
 "                   or rollback the specified number of transactions\n"
 msgstr ""
+"  --rollback     - mynd yn ôl i'r dyddiad penodol,\n"
+"                   neu nôl y nifer o drafodion penodwyd\n"
 
 #: ../urpmi.recover:40
-#, fuzzy
 msgid "  --disable      - turn off repackaging\n"
-msgstr "  --name          - argraffu enwau pecyn yn unig \n"
+msgstr "  --disable      - diffodd ailbecynnu\n"
 
 #: ../urpmi.recover:55
 #, c-format
 msgid "Invalid date or duration [%s]\n"
-msgstr ""
+msgstr "Dyddiad neu hyd annilys [%s]\n"
 
 #: ../urpmi.recover:63
-#, fuzzy
 msgid "Repackage directory not defined\n"
-msgstr "heb ganfod pecyn %s"
+msgstr "Heb ddiffinio cyfeiriadur ailbecynnu\n"
 
 #: ../urpmi.recover:66
 #, c-format
 msgid "Can't write to repackage directory [%s]\n"
-msgstr ""
+msgstr "Methu ysgrifennu i gyfeiriadur ailbacio [%s]\n"
 
 #: ../urpmi.recover:68
 #, c-format
 msgid "Cleaning up repackage directory [%s]...\n"
-msgstr ""
+msgstr "Glanhau cyfeiriadur ailbacio [%s]...\n"
 
 #: ../urpmi.recover:70
 #, c-format
 msgid "%d files removed\n"
-msgstr ""
+msgstr "Tynnwyd %d pecyn\n"
 
 #: ../urpmi.recover:80
 #, c-format
 msgid "Spurious command-line arguments [%s]\n"
-msgstr ""
+msgstr "Ymresymiadau llinell orchymyn annilys [%s]\n"
 
 #: ../urpmi.recover:82
 msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr ""
+msgstr "Methu pennu --checkpoint a --rollback ar yr un pryd\n"
 
 #: ../urpmi.recover:84
 msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr ""
+msgstr "Methu pennu --checkpoint a --list ar yr un pryd\n"
 
 #: ../urpmi.recover:86
 msgid "You can't specify --rollback and --list at the same time\n"
-msgstr ""
+msgstr "Methu pennu --rollback a --list ar yr un pryd\n"
 
 #: ../urpmi.recover:88
 msgid "You can't specify --disable along with another option"
-msgstr ""
+msgstr "Methu pennu --disable gyda dewis arall"
 
 #: ../urpmi.recover:110
 #, c-format
 msgid "No transaction found since %s\n"
-msgstr ""
+msgstr "Dim trafodion ers %s\n"
 
 #. - check we're running as root
 #: ../urpmi.recover:125
 msgid "You must be superuser to do this"
-msgstr ""
+msgstr "Rhaid bod yn uwch-ddefnyddiwr i wneud hyn"
 
 #. - write rpm config file
 #: ../urpmi.recover:138 ../urpmi.recover:204
-#, fuzzy, c-format
+#, c-format
 msgid "Writing rpm macros file [%s]...\n"
-msgstr "adfer ffeil rpm (%s)..."
+msgstr "Ysgrifennu ffeil macros rpm [%s]...\n"
 
 #: ../urpmi.recover:180
-#, fuzzy
 msgid "No rollback date found\n"
-msgstr "Heb ganfod filelist\n"
+msgstr "Heb ganfod dyddiad rholio nôl\n"
 
 #: ../urpmi.recover:183
 #, c-format
 msgid "Rollback until %s...\n"
-msgstr ""
+msgstr "Rholio nôl hyd %s...\n"
 
 #: ../urpmi.recover:190
 msgid "Disabling repackaging\n"
-msgstr ""
+msgstr "Anablu ailbecynnu\n"
 
 #: ../urpmi.removemedia:52
 msgid ""
@@ -2326,7 +2283,7 @@ msgid "ignoring media %s"
 msgstr "anwybyddu cyfrwng %s"
 
 #: ../urpmq:39
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2006 Mandriva.\n"
@@ -2336,8 +2293,8 @@ msgid ""
 "usage:\n"
 msgstr ""
 "urpmq fersiwn %s\n"
-"Hawlfraint © 2002-2005 Mandriva.\n"
-"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n"
+"Hawlfraint (C) 2002-2006 Mandriva.\n"
+"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan amodau'r GPL GNU.\n"
 "\n"
 "defnydd:\n"
 
@@ -2363,7 +2320,7 @@ msgstr "  --list-media   - rhestri'r holl gyfrwng ar gael.\n"
 
 #: ../urpmq:57
 msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     - rhestru'r holl gyfrwng ar gael.\n"
+msgstr "  --list-url     - rhestri'r holl gyfrwng ar gael.\n"
 
 #: ../urpmq:58
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
@@ -2393,9 +2350,9 @@ msgstr ""
 "  --sources      - give all source packages before downloading (root only).\n"
 
 #: ../urpmq:64
-#, fuzzy
 msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
-msgstr "  --url          - argraffu tag url: url.\n"
+msgstr ""
+"  --ignorearch   - caniatáu ymholi rpmau ar gyfer saernïaeth annhebyg.\n"
 
 #: ../urpmq:66
 msgid ""
@@ -2506,6 +2463,17 @@ msgstr "Heb ganfod filelist\n"
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid "   -g [group]     - restrict results to given group.\n"
+#~ msgstr "   -g [group]     - cyfyngu canlyniadau i'r grŵp.\n"
+
+#~ msgid "                    defaults is %s.\n"
+#~ msgstr "                   rhagosodedig yw %s.\n"
+
+#~ msgid "Medium \"%s\" is ân ISO image, will be mounted on-the-fly"
+#~ msgstr ""
+#~ "Delwedd ISO yw'r cyfrwng \"%s\" , a bydd yn cael ei osod wrth ei "
+#~ "ddefnyddio."
+
 #~ msgid "installing %s\n"
 #~ msgstr "gosod %s\n"
 
@@ -2632,7 +2600,7 @@ msgstr "Heb ganfod changelog\n"
 #~ msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
 
 #~ msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-#~ msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
+#~ msgstr "  --sourcerpm    - argraffu sourcerpm tag: ffynhonnell rpm.\n"
 
 #~ msgid "  --packager     - print tag packager: packager.\n"
 #~ msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
@@ -2710,7 +2678,7 @@ msgstr "Heb ganfod changelog\n"
 #~ "usage:\n"
 #~ msgstr ""
 #~ "urpmf fersiwn %s\n"
-#~ "Hawlfraint © 1999 - 2004 Mandriva.\n"
+#~ "Hawlfraint (C) 1999 - 2005 Mandriva.\n"
 #~ "Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL "
 #~ "GNU..\n"
 #~ "\n"