updated pot file

1 files changed, 512 insertions, 333 deletions

diff --git a/po/cy.po b/po/cy.po
index 7c280a86..6d3b737e 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-09-20 20:00+0200\n"
+"POT-Creation-Date: 2005-10-27 16:02+0200\n"
 "PO-Revision-Date: 2005-06-28 21:39-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -54,22 +54,22 @@ msgstr ""
 "Gosodiad pecynnau awtomatig...\n"
 "Roeddech wedi gofyn i gael gosod pecyn %s\n"
 
-#: ../_irpm:33 ../urpme:31 ../urpmi:494
+#: ../_irpm:33 ../urpme:31 ../urpmi:498
 #, c-format
 msgid "Is this OK?"
 msgstr "Mae'r model yn gywir"
 
-#: ../_irpm:35 ../urpmi:525
+#: ../_irpm:35 ../urpmi:529
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
 
-#: ../_irpm:36 ../urpmi:525
+#: ../_irpm:36 ../urpmi:529
 #, c-format
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../_irpm:44 ../urpmi:400 ../urpmi:418 ../urpmi:498
+#: ../_irpm:44 ../urpmi:404 ../urpmi:422 ../urpmi:502
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) "
@@ -167,11 +167,11 @@ msgid "Must be root"
 msgstr "Rhaid bod yn root"
 
 #: ../gurpmi2:75
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
+"Some requested packages cannot be installed:\n"
 "%s\n"
-"Continue?"
+"Continue installation anyway?"
 msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s\n"
@@ -197,7 +197,7 @@ msgstr "Dewis pecyn"
 msgid "_Ok"
 msgstr "_Iawn"
 
-#: ../gurpmi2:120 ../urpmi:360
+#: ../gurpmi2:120 ../urpmi:364
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
@@ -208,11 +208,11 @@ msgid "_Abort"
 msgstr "_Atal"
 
 #: ../gurpmi2:163
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"Continue?"
+"Continue installation anyway?"
 msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
@@ -233,12 +233,12 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Gosod y pecyn..."
 
-#: ../gurpmi2:186 ../urpmi:507 ../urpmq:308
+#: ../gurpmi2:186 ../urpmi:511 ../urpmq:307
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "methu estyn pecynnau ffynhonnell, atal"
 
-#: ../gurpmi2:200 ../urpmi:518
+#: ../gurpmi2:200 ../urpmi:522
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
@@ -261,7 +261,7 @@ msgstr ""
 "\n"
 "Hoffech chi barhau gyda'r gosod?"
 
-#: ../gurpmi2:251 ../gurpmi2:300 ../urpmi:588 ../urpmi:704
+#: ../gurpmi2:251 ../gurpmi2:300 ../urpmi:593 ../urpmi:710
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -272,12 +272,12 @@ msgstr ""
 "%s\n"
 "Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
 
-#: ../gurpmi2:258 ../urpme:118 ../urpmi:631
+#: ../gurpmi2:258 ../urpme:118 ../urpmi:636
 #, c-format
 msgid "removing %s"
 msgstr "tynnu %s"
 
-#: ../gurpmi2:266 ../urpm.pm:2879
+#: ../gurpmi2:266 ../urpm.pm:2901
 #, c-format
 msgid "Preparing..."
 msgstr "Paratoi..."
@@ -287,7 +287,7 @@ msgstr "Paratoi..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Gosod pecyn `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:598 ../urpmi:649 ../urpmi:667 ../urpmi:683
+#: ../gurpmi2:286 ../urpmi:603 ../urpmi:655 ../urpmi:673 ../urpmi:689
 #, c-format
 msgid "Installation failed"
 msgstr "Methodd y gosod"
@@ -297,7 +297,7 @@ msgstr "Methodd y gosod"
 msgid "_Done"
 msgstr "_Gorffen"
 
-#: ../gurpmi2:303 ../urpmi:720
+#: ../gurpmi2:303 ../urpmi:726
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "Popeth wedi eu gosod eisoes"
@@ -336,7 +336,7 @@ msgstr "   -g [group]     - cyfyngu canlyniadau i'r grŵp.\n"
 msgid "                    defaults is %s.\n"
 msgstr "                   rhagosodedig yw %s.\n"
 
-#: ../rurpmi:8 ../urpmi:223
+#: ../rurpmi:8 ../urpmi:227
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
@@ -373,12 +373,12 @@ 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:225 ../urpm.pm:1294 ../urpm.pm:1304
+#: ../urpm.pm:225 ../urpm.pm:1314 ../urpm.pm:1324
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "methu cael mynediad i  ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:228 ../urpm.pm:2485
+#: ../urpm.pm:228 ../urpm.pm:2508
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
@@ -458,42 +458,42 @@ msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
 msgid "wrote config file [%s]"
 msgstr "ysgrifennu ffeil ffurfweddu (%s)"
 
-#: ../urpm.pm:424
+#: ../urpm.pm:440
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
 
-#: ../urpm.pm:434
+#: ../urpm.pm:450
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
 
-#: ../urpm.pm:446
+#: ../urpm.pm:462
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "archwilio trinydd paralel mewn ffeil [%s]"
 
-#: ../urpm.pm:457
+#: ../urpm.pm:473
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "canfod trinydd paralel ar gyfer nodau: %s"
 
-#: ../urpm.pm:461
+#: ../urpm.pm:477
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
 
-#: ../urpm.pm:465
+#: ../urpm.pm:481
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "methu defnyddio dewis paralel \"%s\""
 
-#: ../urpm.pm:473
+#: ../urpm.pm:489
 #, 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:479
+#: ../urpm.pm:495
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -502,153 +502,152 @@ msgstr ""
 "-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
 "--update neu --parallel"
 
-#: ../urpm.pm:540 ../urpm.pm:566 ../urpm.pm:1048 ../urpm.pm:1059
-#: ../urpm.pm:1131 ../urpm.pm:1148 ../urpm.pm:1218 ../urpm.pm:1277
-#: ../urpm.pm:1492 ../urpm.pm:1616 ../urpm.pm:1733 ../urpm.pm:1739
-#: ../urpm.pm:1842 ../urpm.pm:1927 ../urpm.pm:1931
+#: ../urpm.pm:556 ../urpm.pm:582 ../urpm.pm:1068 ../urpm.pm:1079
+#: ../urpm.pm:1151 ../urpm.pm:1168 ../urpm.pm:1238 ../urpm.pm:1297
+#: ../urpm.pm:1512 ../urpm.pm:1635 ../urpm.pm:1752 ../urpm.pm:1758
+#: ../urpm.pm:1861 ../urpm.pm:1946 ../urpm.pm:1950
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "archwilio ffeil synthesis [%s]"
 
-#: ../urpm.pm:544 ../urpm.pm:559 ../urpm.pm:572 ../urpm.pm:1051
-#: ../urpm.pm:1062 ../urpm.pm:1137 ../urpm.pm:1143 ../urpm.pm:1223
-#: ../urpm.pm:1281 ../urpm.pm:1496 ../urpm.pm:1620 ../urpm.pm:1727
-#: ../urpm.pm:1745 ../urpm.pm:1937
+#: ../urpm.pm:560 ../urpm.pm:575 ../urpm.pm:588 ../urpm.pm:1071
+#: ../urpm.pm:1082 ../urpm.pm:1157 ../urpm.pm:1163 ../urpm.pm:1243
+#: ../urpm.pm:1301 ../urpm.pm:1516 ../urpm.pm:1639 ../urpm.pm:1746
+#: ../urpm.pm:1764 ../urpm.pm:1956
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "archwilio ffeil hdlist [%s]"
 
-#: ../urpm.pm:554 ../urpm.pm:1055
+#: ../urpm.pm:570 ../urpm.pm:1075
 #, 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:584
+#: ../urpm.pm:600
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Cychwyn chwilio: %s diwedd: %s"
 
-#: ../urpm.pm:589 ../urpm.pm:1069 ../urpm.pm:1156 ../urpm.pm:1227
-#: ../urpm.pm:1624
+#: ../urpm.pm:605 ../urpm.pm:1089 ../urpm.pm:1176 ../urpm.pm:1247
+#: ../urpm.pm:1643
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
 
-#: ../urpm.pm:596 ../urpm.pm:1880
+#: ../urpm.pm:612 ../urpm.pm:1899
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
 
-#: ../urpm.pm:612
+#: ../urpm.pm:628
 #, c-format
 msgid "skipping package %s"
 msgstr "hepgor pecyn  %s"
 
-#: ../urpm.pm:625
+#: ../urpm.pm:641
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "gosod yn lle uwchraddio pecyn %s"
 
-#: ../urpm.pm:636 ../urpm.pm:2292 ../urpm.pm:2353 ../urpm.pm:2542
-#: ../urpm.pm:2944 ../urpm.pm:3066
+#: ../urpm.pm:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2565
+#: ../urpm.pm:2966 ../urpm.pm:3088
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "methu agor rpmdb"
 
-#: ../urpm.pm:676
+#: ../urpm.pm:692
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "cyfrwng \"%s\" yn bodoli eisoes"
 
-#: ../urpm.pm:683
+#: ../urpm.pm:699
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
 
-#: ../urpm.pm:710
+#: ../urpm.pm:724
 #, c-format
 msgid "added medium %s"
 msgstr "ychwanegwyd cyfrwng %s"
 
-#: ../urpm.pm:752
+#: ../urpm.pm:769
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
 
-#: ../urpm.pm:756
+#: ../urpm.pm:773
 #, c-format
 msgid "copying hdlists file..."
 msgstr "copïo ffeil hdlists..."
 
-#: ../urpm.pm:758 ../urpm.pm:1172 ../urpm.pm:1247
+#: ../urpm.pm:775 ../urpm.pm:1192 ../urpm.pm:1267
 #, c-format
 msgid "...copying done"
 msgstr "...cwblhau'r copïo"
 
-#: ../urpm.pm:759 ../urpm.pm:1173 ../urpm.pm:1322 ../urpm.pm:1381
-#: ../urpm.pm:1561 ../urpm.pm:1568
+#: ../urpm.pm:776 ../urpm.pm:1193 ../urpm.pm:1342 ../urpm.pm:1401
+#: ../urpm.pm:1581 ../urpm.pm:1588
 #, c-format
 msgid "...copying failed"
 msgstr "...methodd y copïo"
 
-#: ../urpm.pm:762 ../urpm.pm:787 ../urpm.pm:826
+#: ../urpm.pm:779 ../urpm.pm:804 ../urpm.pm:843
 #, c-format
 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:769
+#: ../urpm.pm:786
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "adfer ffeil hdlists..."
 
-#: ../urpm.pm:781 ../urpm.pm:1606 ../urpm.pm:2096 ../urpm.pm:2812
+#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2834
 #, c-format
 msgid "...retrieving done"
 msgstr ".cwblhau adfer"
 
-#: ../urpm.pm:783 ../urpm.pm:1589 ../urpm.pm:1599 ../urpm.pm:2099
-#: ../urpm.pm:2814
+#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2836
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "... methodd ail-lwytho: %s"
 
-#: ../urpm.pm:807
+#: ../urpm.pm:824
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
 
-#: ../urpm.pm:863
+#: ../urpm.pm:880
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
 
-#: ../urpm.pm:865
+#: ../urpm.pm:882
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "dewis aml-gyfrwng: %s"
 
-#: ../urpm.pm:881
+#: ../urpm.pm:898
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "dewis cyfrwng \"%s\":"
 
-#: ../urpm.pm:932
+#: ../urpm.pm:949
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:961
+#: ../urpm.pm:978
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...methodd ail-ffurfweddu"
 
-#: ../urpm.pm:968
+#: ../urpm.pm:985
 #, c-format
 msgid "reconfiguration done"
 msgstr "cwblhau ail-ffurfweddu"
 
-#: ../urpm.pm:1109
+#: ../urpm.pm:1129
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -658,7 +657,7 @@ msgstr ""
 "maethu cael mynediad i gyfrwng \"%s\",\n"
 "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
 
-#: ../urpm.pm:1160
+#: ../urpm.pm:1180
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -667,142 +666,142 @@ msgstr ""
 "dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
 "anwybyddu'r cyfrwng"
 
-#: ../urpm.pm:1170
+#: ../urpm.pm:1190
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "copïo ffeil disgrifiad o \"%s\""
 
-#: ../urpm.pm:1194 ../urpm.pm:1468
+#: ../urpm.pm:1214 ../urpm.pm:1488
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
 
-#: ../urpm.pm:1243
+#: ../urpm.pm:1263
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1257
+#: ../urpm.pm:1277
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
 
-#: ../urpm.pm:1262
+#: ../urpm.pm:1282
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
 
-#: ../urpm.pm:1264
+#: ../urpm.pm:1284
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "methodd copïo (%s) (md5sum gwallus)"
 
-#: ../urpm.pm:1285 ../urpm.pm:1500 ../urpm.pm:1845
+#: ../urpm.pm:1305 ../urpm.pm:1520 ../urpm.pm:1864
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
 
-#: ../urpm.pm:1339
+#: ../urpm.pm:1359
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "darllen ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1354
+#: ../urpm.pm:1374
 #, c-format
 msgid "no rpms read"
 msgstr "heb ddarllen rpmau"
 
-#: ../urpm.pm:1364
+#: ../urpm.pm:1384
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "methu darllen ffeiliau rpm o (%s): %s"
 
-#: ../urpm.pm:1369
+#: ../urpm.pm:1389
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "heb ganfod ffeiliau rpm o [%s]"
 
-#: ../urpm.pm:1518
+#: ../urpm.pm:1538
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
 
-#: ../urpm.pm:1546
+#: ../urpm.pm:1566
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
 
-#: ../urpm.pm:1596
+#: ../urpm.pm:1616
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
 
-#: ../urpm.pm:1599
+#: ../urpm.pm:1618
 #, c-format
-msgid "md5sum mismatch"
-msgstr "anghysondeb md5sum"
+msgid "...retrieving failed: md5sum mismatch"
+msgstr "... methodd ail-lwytho: anghysondeb md5sum"
 
-#: ../urpm.pm:1697
+#: ../urpm.pm:1716
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
 
-#: ../urpm.pm:1704
+#: ../urpm.pm:1723
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1715 ../urpm.pm:1769
+#: ../urpm.pm:1734 ../urpm.pm:1788
 #, 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:1755
+#: ../urpm.pm:1774
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "methu didoli ffeil hdlist \"%s\""
 
-#: ../urpm.pm:1794
+#: ../urpm.pm:1813
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
 
-#: ../urpm.pm:1802
+#: ../urpm.pm:1821
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "ysgrifennu rhestr ffeil  ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1804
+#: ../urpm.pm:1823
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
 
-#: ../urpm.pm:1819
+#: ../urpm.pm:1838
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "archwilio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1826
+#: ../urpm.pm:1845
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1829
+#: ../urpm.pm:1848
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "methu mewnforio ffeil pubkey \"%s\""
 
-#: ../urpm.pm:1894
+#: ../urpm.pm:1913
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "darllen pennawd o'r cyfrwng \"%s\""
 
-#: ../urpm.pm:1899
+#: ../urpm.pm:1918
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "adeiladu hdlist [%s]"
 
-#: ../urpm.pm:1914 ../urpm.pm:1949
+#: ../urpm.pm:1933 ../urpm.pm:1968
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -811,82 +810,82 @@ msgstr ""
 "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
 "ffeil hdlist yn llygredig."
 
-#: ../urpm.pm:1917 ../urpm.pm:1952 ../urpmi:317
+#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:321
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
 
-#: ../urpm.pm:1975
+#: ../urpm.pm:1994
 #, c-format
 msgid "found %d headers in cache"
 msgstr "canfod %d pennawd mewn storfa"
 
-#: ../urpm.pm:1979
+#: ../urpm.pm:1998
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "tynnu hen benawdau %d yn y storfa"
 
-#: ../urpm.pm:2035
+#: ../urpm.pm:2054
 #, c-format
 msgid "mounting %s"
 msgstr "gosod %s"
 
-#: ../urpm.pm:2057
+#: ../urpm.pm:2076
 #, c-format
 msgid "unmounting %s"
 msgstr "dadosod %s"
 
-#: ../urpm.pm:2081
+#: ../urpm.pm:2100
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "enw ffeil rpm annilys [%s]"
 
-#: ../urpm.pm:2087
+#: ../urpm.pm:2106
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "adfer ffeil rpm (%s)..."
 
-#: ../urpm.pm:2101
+#: ../urpm.pm:2124
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "methu cael mynediad  ffeil rpm (%s)"
 
-#: ../urpm.pm:2106
+#: ../urpm.pm:2129
 #, c-format
 msgid "unable to register rpm file"
 msgstr "methu cofrestr ffeil rpm"
 
-#: ../urpm.pm:2109
+#: ../urpm.pm:2132
 #, c-format
 msgid "error registering local packages"
 msgstr "gwall cofrestru pecynnau lleol"
 
-#: ../urpm.pm:2133
+#: ../urpm.pm:2156
 #, c-format
 msgid "Search"
 msgstr "Chwilio"
 
-#: ../urpm.pm:2220
+#: ../urpm.pm:2243
 #, c-format
 msgid "no package named %s"
 msgstr "heb enwi pecyn %s"
 
-#: ../urpm.pm:2222 ../urpme:94
+#: ../urpm.pm:2245 ../urpme:94
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpm.pm:2416 ../urpm.pm:2462 ../urpm.pm:2493
+#: ../urpm.pm:2439 ../urpm.pm:2485 ../urpm.pm:2516
 #, 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:2476
+#: ../urpm.pm:2499
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
 
-#: ../urpm.pm:2509
+#: ../urpm.pm:2532
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -895,169 +894,174 @@ msgstr ""
 "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
 "  nid yw'r drych yn un diweddar, ceisiwch ddull arall"
 
-#: ../urpm.pm:2513
+#: ../urpm.pm:2536
 #, 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:2525
+#: ../urpm.pm:2548
 #, c-format
 msgid "package %s is not found."
 msgstr "heb ganfod pecyn %s"
 
-#: ../urpm.pm:2583 ../urpm.pm:2597 ../urpm.pm:2617 ../urpm.pm:2631
+#: ../urpm.pm:2606 ../urpm.pm:2620 ../urpm.pm:2640 ../urpm.pm:2654
 #, c-format
 msgid "urpmi database locked"
 msgstr "cronfa ddata urpmi wedi cloi"
 
-#: ../urpm.pm:2683 ../urpm.pm:2688 ../urpm.pm:2714
+#: ../urpm.pm:2706 ../urpm.pm:2711 ../urpm.pm:2737
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "heb ddewis cyfrwng \"%s\""
 
-#: ../urpm.pm:2710
+#: ../urpm.pm:2733
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
 
-#: ../urpm.pm:2718
+#: ../urpm.pm:2741
 #, 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:2730
+#: ../urpm.pm:2753
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "methu cael mynediad at gyfrwng. \"%s\""
 
-#: ../urpm.pm:2789
+#: ../urpm.pm:2812
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "allbwn gwallus: [%s]"
 
-#: ../urpm.pm:2796
+#: ../urpm.pm:2819
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:2917
+#: ../urpm.pm:2939
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
 
-#: ../urpm.pm:2948
+#: ../urpm.pm:2970
 #, 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:2951
+#: ../urpm.pm:2973
 #, c-format
 msgid "unable to create transaction"
 msgstr "methu creu trosglwyddiad."
 
-#: ../urpm.pm:2959
+#: ../urpm.pm:2981
 #, c-format
 msgid "removing package %s"
 msgstr "tynnu pecyn %s."
 
-#: ../urpm.pm:2961
+#: ../urpm.pm:2983
 #, c-format
 msgid "unable to remove package %s"
 msgstr "methu tynnu pecyn %s"
 
-#: ../urpm.pm:2973
+#: ../urpm.pm:2995
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "methu tynnu rpm o becyn delta-rpm %s"
 
-#: ../urpm.pm:2979
+#: ../urpm.pm:3001
 #, 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:2982
+#: ../urpm.pm:3004
 #, c-format
 msgid "unable to install package %s"
 msgstr "methu gosod pecyn %s"
 
-#: ../urpm.pm:3041
+#: ../urpm.pm:3063
 #, c-format
 msgid "More information on package %s"
 msgstr "Rhagor o wybodaeth ar becyn %s"
 
-#: ../urpm.pm:3206 ../urpm.pm:3239
+#: ../urpm.pm:3228 ../urpm.pm:3261
 #, c-format
 msgid "due to missing %s"
 msgstr "oherwydd %s coll"
 
-#: ../urpm.pm:3207 ../urpm.pm:3237
+#: ../urpm.pm:3229 ../urpm.pm:3259
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "%s heb ei foddloni"
 
-#: ../urpm.pm:3208
+#: ../urpm.pm:3230
 #, c-format
 msgid "trying to promote %s"
 msgstr "ceisio hybu %s"
 
-#: ../urpm.pm:3209
+#: ../urpm.pm:3231
 #, c-format
 msgid "in order to keep %s"
 msgstr "fel modd i gadw %s"
 
-#: ../urpm.pm:3232
+#: ../urpm.pm:3254
 #, c-format
 msgid "in order to install %s"
 msgstr "er mwyn gosod %s"
 
-#: ../urpm.pm:3243
+#: ../urpm.pm:3265
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "oherwydd gwrthdaro gyda %s"
 
-#: ../urpm.pm:3244
+#: ../urpm.pm:3266
 #, c-format
 msgid "unrequested"
 msgstr "diofyn"
 
-#: ../urpm.pm:3260
+#: ../urpm.pm:3282
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Llofnod annilys (%s)"
 
-#: ../urpm.pm:3292
+#: ../urpm.pm:3314
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Enw Allwedd Annilys (%s)"
 
-#: ../urpm.pm:3294
+#: ../urpm.pm:3316
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Llofnod coll (%s)"
 
-#: ../urpm.pm:3343
+#: ../urpm.pm:3365
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "archwilio ffeil MD5SUM"
 
-#: ../urpm.pm:3354
+#: ../urpm.pm:3376
 #, 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:3376
+#: ../urpm.pm:3398
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr ""
 
-#: ../urpm/args.pm:93 ../urpm/args.pm:102
+#: ../urpm/args.pm:99 ../urpm/args.pm:108
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
 
-#: ../urpm/args.pm:242
+#: ../urpm/args.pm:217
+#, fuzzy, c-format
+msgid "You need to be root to use --use-distrib"
+msgstr "Rhaid i chi fod yn wraidd i ddefnyddio'r gorchymyn hwn!\n"
+
+#: ../urpm/args.pm:249
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
@@ -1083,7 +1087,7 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpme:43 ../urpmf:32 ../urpmi:79 ../urpmi.addmedia:43
+#: ../urpme:43 ../urpmf:33 ../urpmi:79 ../urpmi.addmedia:43
 #: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
@@ -1128,7 +1132,7 @@ msgstr ""
 "                   wrth (ddad)osod chroot gyda dewis o  --root.\n"
 
 #: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
-#: ../urpmi.update:48 ../urpmq:92
+#: ../urpmi.update:48 ../urpmq:91
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  --verbose      - modd llafar.\n"
@@ -1153,7 +1157,7 @@ msgstr "pecynnau anhysbys"
 msgid "unknown package"
 msgstr "pecyn anhysbys"
 
-#: ../urpme:99 ../urpmi:433
+#: ../urpme:99 ../urpmi:437
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "bydd tynnu pecynnau %s yn torri'r system"
@@ -1175,7 +1179,7 @@ msgid ""
 msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecyn canlynol yn cael eu tynnu (%d MB)"
 
-#: ../urpme:115 ../urpmi:452 ../urpmi:581
+#: ../urpme:115 ../urpmi:456 ../urpmi:586
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) "
@@ -1186,14 +1190,14 @@ msgid "Removing failed"
 msgstr "Methodd y tynnu"
 
 #: ../urpmf:27
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
+"Copyright (C) 2002-2005 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
-"usage:\n"
+"usage: urpmf [options] pattern-expression\n"
 msgstr ""
 "urpmf fersiwn %s\n"
 "Hawlfraint © 2002 - 2004 Mandriva.\n"
@@ -1201,210 +1205,254 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmf:33 ../urpmi:80 ../urpmq:44
-#, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
+#: ../urpmf:34
+#, fuzzy, c-format
+msgid "  --version      - print this tool's version number.\n"
+msgstr "  --help         - argraffu neges cymorth.\n"
 
-#: ../urpmf:34 ../urpmi:81 ../urpmq:45
+#: ../urpmf:35 ../urpmi:121 ../urpmq:74
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr ""
+"  --env          - defnyddio amgylchedd penodol (adroddiad gwall fel "
+"rheol).\n"
 
-#: ../urpmf:35 ../urpmi:83 ../urpmq:47
+#: ../urpmf:36 ../urpmi:83 ../urpmq:47
 #, 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"
 
-#: ../urpmf:36 ../urpmi:84 ../urpmq:48
+#: ../urpmf:37
 #, c-format
 msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
+"  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
-"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
-"choma.\n"
-
-#: ../urpmf:37 ../urpmq:49
-#, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
-#: ../urpmf:38
+#: ../urpmf:38 ../urpmi:81 ../urpmq:45
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  --verbose      - modd llafar.\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media          - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
 
-#: ../urpmf:39
+#: ../urpmf:39 ../urpmi:84 ../urpmq:48
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr ""
-"  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes tag "
-"yn\n"
-"                    cael ei roi ar y llinell orchymyn gyda modd "
-"rhyngweithiol).\n"
+"   --sortmedia    - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda "
+"choma.\n"
+
+#: ../urpmf:40 ../urpmi:85 ../urpmq:49
+#, c-format
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
 
 #: ../urpmf:41
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
+msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
 
-#: ../urpmf:42
+#: ../urpmf:42 ../urpmi:80 ../urpmq:44
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all          - argraffu pob tag.\n"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update          - defnyddio cyfrwng diweddaru'n unig.\n"
 
 #: ../urpmf:43
 #, c-format
-msgid "  --name         - print only package names.\n"
-msgstr "  --name          - argraffu enwau pecyn yn unig \n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  --verbose      - modd llafar.\n"
 
 #: ../urpmf:44
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group        - argraffu grŵp tag: grŵp.\n"
+msgid "  -i             - ignore case distinctions in patterns.\n"
+msgstr ""
+"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
 
 #: ../urpmf:45
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size         - argraffu maint tag: maint.\n"
+msgid "  -F<str>        - change field separator (defaults to ':').\n"
+msgstr ""
 
 #: ../urpmf:46
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
+msgid "Pattern expressions:\n"
+msgstr ""
 
 #: ../urpmf:47
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary      - argraffu crynodeb tag: crynodeb.\n"
+msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
+msgstr ""
 
 #: ../urpmf:48
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
 
 #: ../urpmf:49
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
+msgid "  -a             - binary AND operator.\n"
+msgstr "  -a             - gweithredwr deuaidd AND.\n"
 
 #: ../urpmf:50
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
+msgid "  -o             - binary OR operator.\n"
+msgstr "  -o             - gweithredwr deuaidd OR.\n"
 
 #: ../urpmf:51
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
+msgid "  !              - unary NOT.\n"
+msgstr "  !              - unaidd NOT.\n"
 
 #: ../urpmf:52
-#, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - argraffu tag url: url.\n"
+#, fuzzy, c-format
+msgid "  ( )            - left and right parentheses.\n"
+msgstr "  )              - parenthesis de i gau mynegiad grŵp.\n"
 
 #: ../urpmf:53
-#, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
+#, fuzzy, c-format
+msgid "List of tags:\n"
+msgstr ""
+"Rhestr o ddata i'w adfer:\n"
+"\n"
 
 #: ../urpmf:54
-#, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
+#, fuzzy, c-format
+msgid "  --qf           - specify a printf-like output format\n"
+msgstr "  --X            - defnyddio rhyngwyneb  X.\n"
 
 #: ../urpmf:55
-#, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files        - argraffu tagiau ffeiliau: pob ffeil\n"
+#, fuzzy, c-format
+msgid "                   example: '%%name:%%files'\n"
+msgstr "                   rhagosodedig yw %s.\n"
 
 #: ../urpmf:56
-#, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
+#, fuzzy, c-format
+msgid "  --arch         - architecture\n"
+msgstr "  --url          - argraffu tag url: url.\n"
 
 #: ../urpmf:57
-#, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr ""
-"  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
-"niferus).\n"
+#, fuzzy, c-format
+msgid "  --buildhost    - build host\n"
+msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
 
-#: ../urpmf:58 ../urpmi:121 ../urpmq:74
+#: ../urpmf:58
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
+msgid "  --buildtime    - build time\n"
 msgstr ""
-"  --env          - defnyddio amgylchedd penodol (adroddiad gwall \n"
-"                   fel rheol.\n"
+
+#: ../urpmf:59
+#, fuzzy, c-format
+msgid "  --conffiles    - configuration files\n"
+msgstr "Modiwl ffurfweddu Konsole"
 
 #: ../urpmf:60
-#, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr ""
-"  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n"
+#, fuzzy, c-format
+msgid "  --conflicts    - conflict tags\n"
+msgstr "  --conflicts    - tag argraffu'n gwrthdaro: pob gwrthdaro\n"
 
-#: ../urpmf:61 ../urpmq:81
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
+#: ../urpmf:61
+#, fuzzy, c-format
+msgid "  --description  - package description\n"
+msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
 
 #: ../urpmf:62
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - cynnwys perl cod yn union fel perl -e.\n"
+msgid "  --distribution - distribution\n"
+msgstr ""
 
 #: ../urpmf:63
-#, c-format
-msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr ""
-"  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+#, fuzzy, c-format
+msgid "  --epoch        - epoch\n"
+msgstr "  --epoch        - argraffu cyfnod tag: cyfnod.\n"
 
 #: ../urpmf:64
-#, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
-"gywir.\n"
+#, fuzzy, c-format
+msgid "  --filename     - filename of the package\n"
+msgstr "  --name          - argraffu enwau pecyn yn unig \n"
 
 #: ../urpmf:65
-#, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - unaidd NOT, true os yw'r mynegiad yn false.\n"
+#, fuzzy, c-format
+msgid "  --files        - list of files contained in the package\n"
+msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
 #: ../urpmf:66
-#, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - parenthesis chwith i agor mynegiad grŵp.\n"
+#, fuzzy, c-format
+msgid "  --group        - group\n"
+msgstr "  --group        - argraffu grŵp tag: grŵp.\n"
 
 #: ../urpmf:67
+#, fuzzy, c-format
+msgid "  --name         - package name\n"
+msgstr "  --name          - argraffu enwau pecyn yn unig \n"
+
+#: ../urpmf:68
+#, fuzzy, c-format
+msgid "  --obsoletes    - obsoletes tags\n"
+msgstr ""
+"  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
+"niferus).\n"
+
+#: ../urpmf:69
+#, fuzzy, c-format
+msgid "  --packager     - packager\n"
+msgstr "  --packager      - argraffu pencynydd tag: pencynydd.\n"
+
+#: ../urpmf:70
+#, fuzzy, c-format
+msgid "  --provides     - provides tags\n"
+msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
+
+#: ../urpmf:71
+#, fuzzy, c-format
+msgid "  --requires     - requires tags\n"
+msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
+
+#: ../urpmf:72
+#, fuzzy, c-format
+msgid "  --size         - installed size\n"
+msgstr "  --size         - argraffu maint tag: maint.\n"
+
+#: ../urpmf:73
+#, fuzzy, c-format
+msgid "  --sourcerpm    - source rpm name\n"
+msgstr "  --sourcerpm    - argraffu ourcerpm tag: ffynhonnell rpm.\n"
+
+#: ../urpmf:74
+#, fuzzy, c-format
+msgid "  --summary      - summary\n"
+msgstr "  --summary, -S  - crynodeb argraffu.\n"
+
+#: ../urpmf:75
+#, fuzzy, c-format
+msgid "  --url          - url\n"
+msgstr "  --url          - argraffu tag url: url.\n"
+
+#: ../urpmf:76
+#, fuzzy, c-format
+msgid "  --vendor       - vendor\n"
+msgstr "  --verbose      - modd llafar.\n"
+
+#: ../urpmf:77
+#, fuzzy, c-format
+msgid "  -m             - the media in which the package was found\n"
+msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
+
+#: ../urpmf:78 ../urpmq:80
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - parenthesis de i gau mynegiad grŵp.\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
 
-#: ../urpmf:119
+#: ../urpmf:130
 #, c-format
-msgid ""
-"callback is:\n"
-"%s\n"
+msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
-"galw nôl yw: \n"
-"%s\n"
 
-#: ../urpmf:124 ../urpmi:212 ../urpmq:116
+#: ../urpmf:172 ../urpmi:216 ../urpmq:115
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "ddefnyddio amgylchedd penodol ar %s\n"
 
-#: ../urpmf:157
+#: ../urpmf:218
 #, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1413,7 +1461,7 @@ msgstr ""
 "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
 "urpmf â chynnig canlyniad\n"
 
-#: ../urpmf:158
+#: ../urpmf:219
 #, c-format
 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"
@@ -1443,11 +1491,6 @@ msgstr ""
 "  --searchmedia  - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
 "gofynnwyd (neu diweddarwyd).\n"
 
-#: ../urpmi:85
-#, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
-msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
-
 #: ../urpmi:87 ../urpmq:50
 #, c-format
 msgid ""
@@ -1602,7 +1645,7 @@ msgstr ""
 "  --bug          - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
 "                   yr arg. nesaf\n"
 
-#: ../urpmi:123
+#: ../urpmi:122
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1611,22 +1654,27 @@ msgstr ""
 "  --verify-rpm   - gwirio llofnod rpm cyn gosod\n"
 "                   (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
 
-#: ../urpmi:125
+#: ../urpmi:124
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test          - gwirio os oes modd gosod yn iawn.\n"
 
-#: ../urpmi:126
+#: ../urpmi:125
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - eithrio llwybr wedi ei wahanu a chollnod.\n"
 
-#: ../urpmi:127
+#: ../urpmi:126
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - eithrio ffeiliau docs.\n"
 
+#: ../urpmi:127
+#, fuzzy, c-format
+msgid "  --ignoresize   - don't verify disk space before installation.\n"
+msgstr "  --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
+
 #: ../urpmi:128
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
@@ -1655,7 +1703,7 @@ msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr ""
 "  --strict-arch  - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
 
-#: ../urpmi:133 ../urpmq:78
+#: ../urpmi:133 ../urpmq:77
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - dewis pob cydweddiad ar y llinell gorchymyn.\n"
@@ -1670,12 +1718,12 @@ msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - peidio chwilio yn provides i ganfod pecyn.\n"
 
-#: ../urpmi:136 ../urpmq:93
+#: ../urpmi:136 ../urpmq:92
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - gosod chwilio fuzzy (fel --fuzzy).\n"
 
-#: ../urpmi:137 ../urpmq:90
+#: ../urpmi:137 ../urpmq:89
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr ""
@@ -1694,13 +1742,13 @@ msgstr ""
 " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
 "eu gosod.\n"
 
-#: ../urpmi:183
+#: ../urpmi:187
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr ""
 "Beth mae modd gwneud gyda ffeiliau deuaidd wrth ddefnyddio --install-src"
 
-#: ../urpmi:202
+#: ../urpmi:206
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1709,17 +1757,17 @@ msgstr ""
 "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
 "adroddiad gwall neu ei ddileu."
 
-#: ../urpmi:203
+#: ../urpmi:207
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
 
-#: ../urpmi:206 ../urpmi:327
+#: ../urpmi:210 ../urpmi:331
 #, c-format
 msgid "Copying failed"
 msgstr "Methodd y copïo"
 
-#: ../urpmi:232
+#: ../urpmi:236
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1728,12 +1776,12 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --allow-force gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:362
+#: ../urpmi:366
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Beth yw eich dewis? (1-%d)"
 
-#: ../urpmi:392
+#: ../urpmi:396
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1744,25 +1792,23 @@ msgstr ""
 "sy'n hyn na'r rhai sydd wedi eu gosod:\n"
 "%s"
 
-#: ../urpmi:400 ../urpmi:418
-#, c-format
+#: ../urpmi:404 ../urpmi:422
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Continue?"
-msgstr ""
-"\n"
-"Parhau?"
+"Continue installation anyway?"
+msgstr "Parhau beth bynnag?"
 
-#: ../urpmi:411
+#: ../urpmi:415
 #, c-format
 msgid ""
-"Some package requested cannot be installed:\n"
+"Some requested packages cannot be installed:\n"
 "%s"
 msgstr ""
 "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
 "%s"
 
-#: ../urpmi:441
+#: ../urpmi:445
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1773,7 +1819,7 @@ msgstr ""
 "gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s\n"
 
-#: ../urpmi:446
+#: ../urpmi:450
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1782,7 +1828,7 @@ msgstr ""
 "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
 "%s"
 
-#: ../urpmi:481 ../urpmi:492
+#: ../urpmi:485 ../urpmi:496
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
@@ -1790,7 +1836,7 @@ msgid ""
 msgstr ""
 "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
 
-#: ../urpmi:482 ../urpmi:493
+#: ../urpmi:486 ../urpmi:497
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
@@ -1798,7 +1844,7 @@ msgid ""
 msgstr ""
 "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod (%d MB)"
 
-#: ../urpmi:488
+#: ../urpmi:492
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1807,62 +1853,62 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:519
+#: ../urpmi:523
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "Pwyso Enter pan yn barod..."
 
-#: ../urpmi:572
+#: ../urpmi:577
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 
-#: ../urpmi:573
+#: ../urpmi:578
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:615
+#: ../urpmi:620
 #, c-format
 msgid "distributing %s"
 msgstr "dosbarthu %s"
 
-#: ../urpmi:626
+#: ../urpmi:631
 #, c-format
 msgid "installing %s from %s"
 msgstr "gosod %s o %s"
 
-#: ../urpmi:628
+#: ../urpmi:633
 #, c-format
 msgid "installing %s"
 msgstr "gosod %s"
 
-#: ../urpmi:656
+#: ../urpmi:662
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
 
-#: ../urpmi:672
+#: ../urpmi:678
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
 
-#: ../urpmi:709
+#: ../urpmi:715
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "methodd trosglwyddiad gosod %d"
 
-#: ../urpmi:717
+#: ../urpmi:723
 #, c-format
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpmi:724
+#: ../urpmi:730
 #, fuzzy, c-format
 msgid "The following package names were assumed: %s"
 msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
 
-#: ../urpmi:741
+#: ../urpmi:747
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -2027,7 +2073,7 @@ msgstr "<llwybr perthynnol hdlist> ar goll\n"
 msgid "`with' missing for network media\n"
 msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
 
-#: ../urpmi.addmedia:156
+#: ../urpmi.addmedia:157
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "methu creu cyfrwng \"%s\"\n"
@@ -2224,44 +2270,44 @@ msgstr ""
 "  --use-distrib  - ffurfweddu urpmi wrth fynd o goeden distrib.\n"
 "                   Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n"
 
-#: ../urpmq:76
+#: ../urpmq:75
 #, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - cofnod argraffu.\n"
 
-#: ../urpmq:77
+#: ../urpmq:76
 #, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - crynodeb argraffu.\n"
 
-#: ../urpmq:79
+#: ../urpmq:78
 #, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - allbwn cyfan a phecyn i'w dynnu\n"
 
-#: ../urpmq:80
+#: ../urpmq:79
 #, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
 
-#: ../urpmq:82
+#: ../urpmq:81
 #, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g            - argraffu grwpiau gydag enw hefyd.\n"
 
-#: ../urpmq:83
+#: ../urpmq:82
 #, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
 "i bobl.\n"
 
-#: ../urpmq:84
+#: ../urpmq:83
 #, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - rhestri'r ffeiliau mewn pecyn.\n"
 
-#: ../urpmq:85
+#: ../urpmq:84
 #, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
@@ -2269,29 +2315,29 @@ msgstr ""
 "  -P             - peidio chwilio yn provides i ganfod pecyn "
 "(rhagosodedig).\n"
 
-#: ../urpmq:86
+#: ../urpmq:85
 #, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - caniatáu i chwilio canfod pecyn.\n"
 
-#: ../urpmq:87
+#: ../urpmq:86
 #, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
 
-#: ../urpmq:88
+#: ../urpmq:87
 #, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - chwilio nôl  i'r hyn sydd angen ar becyn.\n"
 
-#: ../urpmq:89
+#: ../urpmq:88
 #, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR             - chwilio nôl  estyndig (yn cynnwys rhith becynnau) \n"
 
-#: ../urpmq:91
+#: ../urpmq:90
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
@@ -2300,40 +2346,173 @@ msgstr ""
 "  -u             - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
 "osod.\n"
 
-#: ../urpmq:94
+#: ../urpmq:93
 #, 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"
 
-#: ../urpmq:95
+#: ../urpmq:94
 #, 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"
 
-#: ../urpmq:157
+#: ../urpmq:156
 #, c-format
 msgid "--list-nodes can only be used with --parallel"
 msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 
-#: ../urpmq:344
+#: ../urpmq:343
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "hepgor cyfrwng %s: dim hdliist"
 
-#: ../urpmq:415
+#: ../urpmq:414
 #, c-format
 msgid "No filelist found\n"
 msgstr "Heb ganfod filelist\n"
 
-#: ../urpmq:425
+#: ../urpmq:424
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ msgid ""
+#~ "Some package requested cannot be installed:\n"
+#~ "%s\n"
+#~ "Continue?"
+#~ msgstr ""
+#~ "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
+#~ "%s\n"
+#~ "Parhau?"
+
+#~ msgid ""
+#~ "The following packages have to be removed for others to be upgraded:\n"
+#~ "%s\n"
+#~ "Continue?"
+#~ msgstr ""
+#~ "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+#~ "%s\n"
+#~ "Parhau?"
+
+#~ msgid "md5sum mismatch"
+#~ msgstr "anghysondeb md5sum"
+
+#~ msgid ""
+#~ "urpmf version %s\n"
+#~ "Copyright (C) 2002-2004 Mandriva.\n"
+#~ "This is free software and may be redistributed under the terms of the GNU "
+#~ "GPL.\n"
+#~ "\n"
+#~ "usage:\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"
+#~ "\n"
+#~ "defnydd:\n"
+
+#~ msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
+#~ msgstr "  --synthesis    - defnyddio'r synthesis yn lle urpmi db.\n"
+
+#~ msgid ""
+#~ "  --quiet        - do not print tag name (default if no tag given on "
+#~ "command\n"
+#~ "                   line, incompatible with interactive mode).\n"
+#~ msgstr ""
+#~ "  --quiet         - peidiwch argraffu enw tag (rhagosodedig os nad oes "
+#~ "tag yn\n"
+#~ "                    cael ei roi ar y llinell orchymyn gyda modd "
+#~ "rhyngweithiol).\n"
+
+#~ msgid "  --uniq         - do not print identical lines.\n"
+#~ msgstr "  --uniq         - peidio argraffu llinellau'r un fath.\n"
+
+#~ msgid "  --all          - print all tags.\n"
+#~ msgstr "  --all          - argraffu pob tag.\n"
+
+#~ msgid "  --summary      - print tag summary: summary.\n"
+#~ msgstr "  --summary      - argraffu crynodeb tag: crynodeb.\n"
+
+#~ msgid "  --description  - print tag description: description.\n"
+#~ msgstr "  --summary      - argraffu disgrifiad tag: disgrifiad.\n"
+
+#~ msgid "  --buildhost    - print tag buildhost: build host.\n"
+#~ msgstr "  --buildhost    - argraffu buildhost tag: build host.\n"
+
+#~ msgid "  --provides     - print tag provides: all provides.\n"
+#~ msgstr "  --provides      - tag argraffu'n darparu: pob darpariaeth. \n"
+
+#~ msgid "  --requires     - print tag requires: all requires.\n"
+#~ msgstr "  --requires     - argraffu tagiau angenrheidiol: pob anghenraid\n"
+
+#~ msgid "  --files        - print tag files: all files.\n"
+#~ msgstr "  --files        - argraffu tagiau ffeiliau: pob ffeil\n"
+
+#~ msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+#~ msgstr ""
+#~ "  --obsoletes     - argraffu hen dagiau: yr holl hen rai (llinellau "
+#~ "niferus).\n"
+
+#~ msgid ""
+#~ "  --env          - use specific environment (typically a bug\n"
+#~ "                   report).\n"
+#~ msgstr ""
+#~ "  --env          - defnyddio amgylchedd penodol (adroddiad gwall \n"
+#~ "                   fel rheol.\n"
+
+#~ msgid "  -i             - ignore case distinctions in every pattern.\n"
+#~ msgstr ""
+#~ "  -i             - anwybyddu gwahaniaeth maint llythrennau ym mhob "
+#~ "patrwm.\n"
+
+#~ msgid ""
+#~ "  -a             - binary AND operator, true if both expression are "
+#~ "true.\n"
+#~ msgstr ""
+#~ "  -a             - gweithredwr deuaidd AND, gwir os yw'r ddau ymadrodd yn "
+#~ "gywir.\n"
+
+#~ msgid ""
+#~ "  -o             - binary OR operator, true if one expression is true.\n"
+#~ msgstr ""
+#~ "  -o             - gweithredwr deuaidd OR, gwir os yw'r ddau ymadrodd yn "
+#~ "gywir.\n"
+
+#~ msgid "  !              - unary NOT, true if expression is false.\n"
+#~ msgstr "  !              - unaidd NOT, true os yw'r mynegiad yn false.\n"
+
+#~ msgid "  (              - left parenthesis to open group expression.\n"
+#~ msgstr "  (              - parenthesis chwith i agor mynegiad grŵp.\n"
+
+#~ msgid "  )              - right parenthesis to close group expression.\n"
+#~ msgstr "  )              - parenthesis de i gau mynegiad grŵp.\n"
+
+#~ msgid ""
+#~ "callback is:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "galw nôl yw: \n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Continue?"
+#~ msgstr ""
+#~ "\n"
+#~ "Parhau?"
+
+#~ msgid ""
+#~ "Some package requested cannot be installed:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
+#~ "%s"
+
 #~ msgid "skipping media %s: no hdlist\n"
 #~ msgstr "hepgor cyfrwng %s: dim hdliist\n"