summaryrefslogtreecommitdiffstats
path: root/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po327
1 files changed, 168 insertions, 159 deletions
diff --git a/po/cy.po b/po/cy.po
index 27eb02ef..fdb4df72 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-09 23:20+0100\n"
+"POT-Creation-Date: 2004-11-22 14:36+0100\n"
"PO-Revision-Date: 2004-06-11 21:12-0000\n"
"Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
"Language-Team: Cymraeg/Welsh <rhoslyn.prys@meddal.org.uk>\n"
@@ -53,7 +53,7 @@ msgstr ""
"Gosodiad pecynnau awtomatig...\n"
"Roeddech wedi gofyn i gael gosod pecyn %s\n"
-#: ../_irpm:33 ../urpme:29 ../urpmi:528
+#: ../_irpm:33 ../urpme:29 ../urpmi:552
#, c-format
msgid "Is this OK?"
msgstr "Mae'r model yn gywir"
@@ -68,7 +68,7 @@ msgstr "Iawn"
msgid "Cancel"
msgstr "Dileu"
-#: ../_irpm:44 ../urpmi:456 ../urpmi:536
+#: ../_irpm:44 ../urpmi:457 ../urpmi:480 ../urpmi:560
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -134,12 +134,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:209 ../urpm.pm:1212 ../urpm.pm:1222
+#: ../urpm.pm:209 ../urpm.pm:1185 ../urpm.pm:1195
#, 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:212 ../urpm.pm:2367
+#: ../urpm.pm:212 ../urpm.pm:2323
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
@@ -257,34 +257,34 @@ msgstr ""
"-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
"--update neu --paralel"
-#: ../urpm.pm:493 ../urpm.pm:519 ../urpm.pm:954 ../urpm.pm:965 ../urpm.pm:1034
-#: ../urpm.pm:1051 ../urpm.pm:1136 ../urpm.pm:1195 ../urpm.pm:1421
-#: ../urpm.pm:1542 ../urpm.pm:1657 ../urpm.pm:1663 ../urpm.pm:1763
-#: ../urpm.pm:1848 ../urpm.pm:1852
+#: ../urpm.pm:493 ../urpm.pm:519 ../urpm.pm:944 ../urpm.pm:955 ../urpm.pm:1024
+#: ../urpm.pm:1041 ../urpm.pm:1109 ../urpm.pm:1168 ../urpm.pm:1377
+#: ../urpm.pm:1498 ../urpm.pm:1613 ../urpm.pm:1619 ../urpm.pm:1719
+#: ../urpm.pm:1804 ../urpm.pm:1808
#, c-format
msgid "examining synthesis file [%s]"
msgstr "archwilio ffeil synthesis [%s]"
-#: ../urpm.pm:497 ../urpm.pm:512 ../urpm.pm:525 ../urpm.pm:957 ../urpm.pm:968
-#: ../urpm.pm:1040 ../urpm.pm:1046 ../urpm.pm:1141 ../urpm.pm:1199
-#: ../urpm.pm:1425 ../urpm.pm:1546 ../urpm.pm:1651 ../urpm.pm:1669
-#: ../urpm.pm:1858
+#: ../urpm.pm:497 ../urpm.pm:512 ../urpm.pm:525 ../urpm.pm:947 ../urpm.pm:958
+#: ../urpm.pm:1030 ../urpm.pm:1036 ../urpm.pm:1114 ../urpm.pm:1172
+#: ../urpm.pm:1381 ../urpm.pm:1502 ../urpm.pm:1607 ../urpm.pm:1625
+#: ../urpm.pm:1814
#, c-format
msgid "examining hdlist file [%s]"
msgstr "archwilio ffeil hdlist [%s]"
-#: ../urpm.pm:507 ../urpm.pm:961
+#: ../urpm.pm:507 ../urpm.pm:951
#, 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:535 ../urpm.pm:975 ../urpm.pm:1059 ../urpm.pm:1145
-#: ../urpm.pm:1550
+#: ../urpm.pm:535 ../urpm.pm:965 ../urpm.pm:1049 ../urpm.pm:1118
+#: ../urpm.pm:1506
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
-#: ../urpm.pm:541 ../urpm.pm:1801
+#: ../urpm.pm:541 ../urpm.pm:1757
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
@@ -299,112 +299,112 @@ msgstr "hepgor pecyn %s"
msgid "would install instead of upgrade package %s"
msgstr "gosod yn lle uwchraddio pecyn %s"
-#: ../urpm.pm:580 ../urpm.pm:2181 ../urpm.pm:2244 ../urpm.pm:2808
-#: ../urpm.pm:2925
+#: ../urpm.pm:580 ../urpm.pm:2137 ../urpm.pm:2200 ../urpm.pm:2764
+#: ../urpm.pm:2881
#, c-format
msgid "unable to open rpmdb"
msgstr "methu agor rpmdb"
-#: ../urpm.pm:618
+#: ../urpm.pm:617
#, c-format
msgid "medium \"%s\" already exists"
msgstr "cyfrwng \"%s\" yn bodoli eisoes"
-#: ../urpm.pm:625
+#: ../urpm.pm:624
#, c-format
msgid "virtual medium needs to be local"
msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
-#: ../urpm.pm:663
+#: ../urpm.pm:650
#, c-format
msgid "added medium %s"
msgstr "ychwanegwyd cyfrwng %s"
-#: ../urpm.pm:683
+#: ../urpm.pm:670
#, c-format
msgid "unable to access first installation medium"
msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
-#: ../urpm.pm:687
+#: ../urpm.pm:674
#, c-format
msgid "copying hdlists file..."
msgstr "copïo ffeil hdlists..."
-#: ../urpm.pm:689 ../urpm.pm:1073 ../urpm.pm:1165
+#: ../urpm.pm:676 ../urpm.pm:1063 ../urpm.pm:1138
#, c-format
msgid "...copying done"
msgstr "...cwblhau'r copïo"
-#: ../urpm.pm:690 ../urpm.pm:1074 ../urpm.pm:1240 ../urpm.pm:1296
-#: ../urpm.pm:1489 ../urpm.pm:1496
+#: ../urpm.pm:677 ../urpm.pm:1064 ../urpm.pm:1213 ../urpm.pm:1269
+#: ../urpm.pm:1445 ../urpm.pm:1452
#, c-format
msgid "...copying failed"
msgstr "...methodd y copïo"
-#: ../urpm.pm:693 ../urpm.pm:716 ../urpm.pm:747
+#: ../urpm.pm:680 ../urpm.pm:703 ../urpm.pm:734
#, 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:699
+#: ../urpm.pm:686
#, c-format
msgid "retrieving hdlists file..."
msgstr "adfer ffeil hdlists..."
-#: ../urpm.pm:710 ../urpm.pm:1532 ../urpm.pm:1996 ../urpm.pm:2681
+#: ../urpm.pm:697 ../urpm.pm:1488 ../urpm.pm:1952 ../urpm.pm:2637
#: ../urpmi.addmedia:167
#, c-format
msgid "...retrieving done"
msgstr ".cwblhau adfer"
-#: ../urpm.pm:712 ../urpm.pm:1516 ../urpm.pm:1525 ../urpm.pm:1999
-#: ../urpm.pm:2683 ../urpmi:627 ../urpmi.addmedia:169
+#: ../urpm.pm:699 ../urpm.pm:1472 ../urpm.pm:1481 ../urpm.pm:1955
+#: ../urpm.pm:2639 ../urpmi.addmedia:169
#, c-format
msgid "...retrieving failed: %s"
msgstr "... methodd ail-lwytho: %s"
-#: ../urpm.pm:732
+#: ../urpm.pm:719
#, c-format
msgid "invalid hdlist description \"%s\" in hdlists file"
msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
-#: ../urpm.pm:783
+#: ../urpm.pm:770
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
-#: ../urpm.pm:785
+#: ../urpm.pm:772
#, c-format
msgid "selecting multiple media: %s"
msgstr "dewis aml-gyfrwng: %s"
-#: ../urpm.pm:785
+#: ../urpm.pm:772
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpm.pm:801
+#: ../urpm.pm:788
#, c-format
msgid "removing medium \"%s\""
msgstr "dewis cyfrwng \"%s\":"
-#: ../urpm.pm:852
+#: ../urpm.pm:839
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
-#: ../urpm.pm:878
+#: ../urpm.pm:868
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "...methodd y copïo"
-#: ../urpm.pm:885
+#: ../urpm.pm:875
#, c-format
msgid "reconfiguration done"
msgstr ""
-#: ../urpm.pm:1012
+#: ../urpm.pm:1002
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -414,7 +414,7 @@ msgstr ""
"maethu cael mynediad i gyfrwng \"%s\",\n"
"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur gyda wrth greu'r cyfrwng."
-#: ../urpm.pm:1063
+#: ../urpm.pm:1053
#, c-format
msgid ""
"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -423,224 +423,219 @@ msgstr ""
"dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
"anwybyddu'r cyfrwng"
-#: ../urpm.pm:1071
+#: ../urpm.pm:1061
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copïo ffeil disgrifiad o \"%s\""
-#: ../urpm.pm:1095 ../urpm.pm:1380
+#: ../urpm.pm:1085 ../urpm.pm:1353
#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis)"
msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
-#: ../urpm.pm:1106 ../urpm.pm:1391
-#, c-format
-msgid "examining MD5SUM file"
-msgstr "archwilio ffeil MD5SUM"
-
-#: ../urpm.pm:1161
+#: ../urpm.pm:1134
#, c-format
msgid "copying source hdlist (or synthesis) of \"%s\"..."
msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
-#: ../urpm.pm:1175
+#: ../urpm.pm:1148
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
-#: ../urpm.pm:1180
+#: ../urpm.pm:1153
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
-#: ../urpm.pm:1182
+#: ../urpm.pm:1155
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "methodd copïo (%s) (md5sum gwallus)"
-#: ../urpm.pm:1203 ../urpm.pm:1429 ../urpm.pm:1766
+#: ../urpm.pm:1176 ../urpm.pm:1385 ../urpm.pm:1722
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
-#: ../urpm.pm:1253
+#: ../urpm.pm:1226
#, c-format
msgid "reading rpm files from [%s]"
msgstr "darllen ffeiliau rpm o [%s]"
-#: ../urpm.pm:1268
+#: ../urpm.pm:1241
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm.pm:1278
+#: ../urpm.pm:1251
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "methu darllen ffeiliau rpm o (%s): %s"
-#: ../urpm.pm:1283
+#: ../urpm.pm:1256
#, c-format
msgid "no rpm files found from [%s]"
msgstr "heb ganfod ffeiliau rpm o [%s]"
-#: ../urpm.pm:1447
+#: ../urpm.pm:1403
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
-#: ../urpm.pm:1474
+#: ../urpm.pm:1430
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
-#: ../urpm.pm:1523
+#: ../urpm.pm:1479
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
-#: ../urpm.pm:1525
+#: ../urpm.pm:1481
#, c-format
msgid "md5sum mismatch"
msgstr "anghysondeb md5sum"
-#: ../urpm.pm:1621
+#: ../urpm.pm:1577
#, c-format
msgid "retrieval of source hdlist (or synthesis) failed"
msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
-#: ../urpm.pm:1628
+#: ../urpm.pm:1584
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpm.pm:1639 ../urpm.pm:1693
+#: ../urpm.pm:1595 ../urpm.pm:1649
#, 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:1679
+#: ../urpm.pm:1635
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "methu didoli ffeil hdlist \"%s\""
-#: ../urpm.pm:1716
+#: ../urpm.pm:1672
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
-#: ../urpm.pm:1723
+#: ../urpm.pm:1679
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "ysgrifennu rhestr ffeil ar gyfer cyfrwng \"%s\""
-#: ../urpm.pm:1725
+#: ../urpm.pm:1681
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
-#: ../urpm.pm:1740
+#: ../urpm.pm:1696
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "archwilio ffeil pubkey \"%s\""
-#: ../urpm.pm:1747
+#: ../urpm.pm:1703
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
-#: ../urpm.pm:1750
+#: ../urpm.pm:1706
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "methu mewnforio ffeil pubkey \"%s\""
-#: ../urpm.pm:1815
+#: ../urpm.pm:1771
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "darllen pennawd o'r cyfrwng \"%s\""
-#: ../urpm.pm:1820
+#: ../urpm.pm:1776
#, c-format
msgid "building hdlist [%s]"
msgstr "adeiladu hdlist [%s]"
-#: ../urpm.pm:1835 ../urpm.pm:1870
+#: ../urpm.pm:1791 ../urpm.pm:1826
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm.pm:1838 ../urpm.pm:1873 ../urpmi:357
+#: ../urpm.pm:1794 ../urpm.pm:1829 ../urpmi:357
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpm.pm:1894
+#: ../urpm.pm:1850
#, c-format
msgid "found %d headers in cache"
msgstr "canfod %d pennawd mewn storfa"
-#: ../urpm.pm:1898
+#: ../urpm.pm:1854
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "tynnu hen benawdau %d yn y storfa"
-#: ../urpm.pm:1948
+#: ../urpm.pm:1904
#, c-format
msgid "mounting %s"
msgstr "gosod %s"
-#: ../urpm.pm:1964
+#: ../urpm.pm:1920
#, c-format
msgid "unmounting %s"
msgstr "dadosod %s"
-#: ../urpm.pm:1988
+#: ../urpm.pm:1944
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "enw ffeil rpm annilys [%s]"
-#: ../urpm.pm:1994
+#: ../urpm.pm:1950
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "adfer ffeil rpm (%s)..."
-#: ../urpm.pm:2001 ../urpm.pm:2850
+#: ../urpm.pm:1957 ../urpm.pm:2806
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "methu cael mynediad ffeil rpm (%s)"
-#: ../urpm.pm:2006
+#: ../urpm.pm:1962
#, c-format
msgid "unable to register rpm file"
msgstr "methu cofrestr ffeil rpm"
-#: ../urpm.pm:2009
+#: ../urpm.pm:1965
#, c-format
msgid "error registering local packages"
msgstr "gwall cofrestru pecynnau lleol"
-#: ../urpm.pm:2118
+#: ../urpm.pm:2074
#, c-format
msgid "no package named %s"
msgstr "heb enwi pecyn %s"
-#: ../urpm.pm:2121 ../urpme:88
+#: ../urpm.pm:2077 ../urpme:88
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-#: ../urpm.pm:2304 ../urpm.pm:2348 ../urpm.pm:2374
+#: ../urpm.pm:2260 ../urpm.pm:2304 ../urpm.pm:2330
#, 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:2359
+#: ../urpm.pm:2315
#, c-format
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
-#: ../urpm.pm:2386
+#: ../urpm.pm:2342
#, c-format
msgid ""
"medium \"%s\" uses an invalid list file:\n"
@@ -649,148 +644,158 @@ msgstr ""
"cyfrwng \"%s\" yndefnyddio rhestr ffeiliau annilys:\n"
" nid yw'r drych yn un diweddar, ceisiwch ddull arall"
-#: ../urpm.pm:2390
+#: ../urpm.pm:2346
#, 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:2402
+#: ../urpm.pm:2358
#, c-format
msgid "package %s is not found."
msgstr "heb ganfod pecyn %s"
-#: ../urpm.pm:2442 ../urpm.pm:2457 ../urpm.pm:2481 ../urpm.pm:2496
+#: ../urpm.pm:2398 ../urpm.pm:2413 ../urpm.pm:2437 ../urpm.pm:2452
#, c-format
msgid "urpmi database locked"
msgstr "cronfa ddata urmi wedi cloi"
-#: ../urpm.pm:2548 ../urpm.pm:2551 ../urpm.pm:2581
+#: ../urpm.pm:2504 ../urpm.pm:2507 ../urpm.pm:2537
#, c-format
msgid "medium \"%s\" is not selected"
msgstr "heb ddewis cyfrwng \"%s\""
-#: ../urpm.pm:2577
+#: ../urpm.pm:2533
#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
-#: ../urpm.pm:2585
+#: ../urpm.pm:2541
#, 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:2597
+#: ../urpm.pm:2553
#, c-format
msgid "unable to access medium \"%s\""
msgstr "methu cael mynediad at gyfrwng. \"%s\""
-#: ../urpm.pm:2659
+#: ../urpm.pm:2615
#, c-format
msgid "malformed input: [%s]"
msgstr "allbwn gwallus: [%s]"
-#: ../urpm.pm:2666
+#: ../urpm.pm:2622
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
-#: ../urpm.pm:2747 ../urpmi:705
+#: ../urpm.pm:2703 ../urpmi:712
#, c-format
msgid "Preparing..."
msgstr "Paratoi..."
-#: ../urpm.pm:2781
+#: ../urpm.pm:2737
#, c-format
msgid "using process %d for executing transaction"
msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
-#: ../urpm.pm:2812
+#: ../urpm.pm:2768
#, 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:2815
+#: ../urpm.pm:2771
#, c-format
msgid "unable to create transaction"
msgstr "methu creu trosglwyddiad."
-#: ../urpm.pm:2822
+#: ../urpm.pm:2778
#, c-format
msgid "removing package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm.pm:2824
+#: ../urpm.pm:2780
#, c-format
msgid "unable to remove package %s"
msgstr "methu tynnu pecyn %s"
-#: ../urpm.pm:2834
+#: ../urpm.pm:2790
#, 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:2837
+#: ../urpm.pm:2793
#, c-format
msgid "unable to install package %s"
msgstr "methu gosod pecyn %s"
-#: ../urpm.pm:2899
+#: ../urpm.pm:2855
#, fuzzy, c-format
msgid "More information on package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm.pm:3057 ../urpm.pm:3090
+#: ../urpm.pm:3013 ../urpm.pm:3046
#, c-format
msgid "due to missing %s"
msgstr "oherwydd %s coll"
-#: ../urpm.pm:3058 ../urpm.pm:3088
+#: ../urpm.pm:3014 ../urpm.pm:3044
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s heb ei foddloni"
-#: ../urpm.pm:3059
+#: ../urpm.pm:3015
#, c-format
msgid "trying to promote %s"
msgstr "ceisio hybu %s"
-#: ../urpm.pm:3060
+#: ../urpm.pm:3016
#, c-format
msgid "in order to keep %s"
msgstr "fel modd i gadw %s"
-#: ../urpm.pm:3083
+#: ../urpm.pm:3039
#, c-format
msgid "in order to install %s"
msgstr "er mwyn gosod %s"
-#: ../urpm.pm:3095
+#: ../urpm.pm:3051
#, c-format
msgid "due to conflicts with %s"
msgstr "oherwydd gwrthdaro gyda %s"
-#: ../urpm.pm:3097
+#: ../urpm.pm:3053
#, c-format
msgid "unrequested"
msgstr "diofyn"
-#: ../urpm.pm:3113
+#: ../urpm.pm:3069
#, c-format
msgid "Invalid signature (%s)"
msgstr "Llofnod annilys (%s)"
-#: ../urpm.pm:3145
+#: ../urpm.pm:3101
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Enw Allwedd Annilys (%s)"
-#: ../urpm.pm:3147
+#: ../urpm.pm:3103
#, c-format
msgid "Missing signature (%s)"
msgstr "Llofnod coll (%s)"
+#: ../urpm.pm:3152
+#, c-format
+msgid "examining MD5SUM file"
+msgstr "archwilio ffeil MD5SUM"
+
+#: ../urpm.pm:3161
+#, c-format
+msgid "warning: md5sum for %s unavailable in MD5SUM file"
+msgstr ""
+
#: ../urpm/args.pm:88 ../urpm/args.pm:95
#, c-format
msgid "bad proxy declaration on command line\n"
@@ -909,12 +914,12 @@ msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
msgstr ""
"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu tynnu (%d MB)"
-#: ../urpme:108 ../urpmi:486 ../urpmi:651
+#: ../urpme:108 ../urpmi:510 ../urpmi:658
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:111 ../urpmi:694
+#: ../urpme:111 ../urpmi:701
#, c-format
msgid "removing %s"
msgstr "tynnu %s"
@@ -1517,12 +1522,12 @@ msgstr "Mae angen un o'r pecynnau canlynol:"
msgid "What is your choice? (1-%d) "
msgstr "Beth yw eich dewis? (1-%d)"
-#: ../urpmi:422 ../urpmi:549
+#: ../urpmi:422 ../urpmi:573
#, c-format
msgid "Package installation..."
msgstr "Gosod pecynnau..."
-#: ../urpmi:422 ../urpmi:549
+#: ../urpmi:422 ../urpmi:573
#, c-format
msgid "Initializing..."
msgstr "Cychwyn..."
@@ -1530,25 +1535,33 @@ msgstr "Cychwyn..."
#: ../urpmi:445
#, c-format
msgid ""
-"Some package requested cannot be installed:\n"
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
"%s"
msgstr ""
-"Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
-"%s"
-#: ../urpmi:450 ../urpmi:481
+#: ../urpmi:451 ../urpmi:474 ../urpmi:505
#, c-format
msgid "do you agree ?"
msgstr "cytuno?"
-#: ../urpmi:456
+#: ../urpmi:457 ../urpmi:480
#, c-format
msgid ""
"\n"
"Continue?"
msgstr ""
-#: ../urpmi:470
+#: ../urpmi:469
+#, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"Nid oes modd gosod rhai pecynnau gofynwyd amdanynt:\n"
+"%s"
+
+#: ../urpmi:494
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -1559,7 +1572,7 @@ msgstr ""
"gael eu tynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:476
+#: ../urpmi:500
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1568,7 +1581,7 @@ msgstr ""
"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:515 ../urpmi:526
+#: ../urpmi:539 ../urpmi:550
#, c-format
msgid ""
"To satisfy dependencies, the following %d packages are going to be installed "
@@ -1576,7 +1589,7 @@ msgid ""
msgstr ""
"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
-#: ../urpmi:516 ../urpmi:527
+#: ../urpmi:540 ../urpmi:551
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed (%d "
@@ -1584,7 +1597,7 @@ msgid ""
msgstr ""
"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
-#: ../urpmi:522
+#: ../urpmi:546
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1593,47 +1606,37 @@ msgstr ""
"Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
"%s\n"
-#: ../urpmi:545 ../urpmq:300
+#: ../urpmi:569 ../urpmq:300
#, c-format
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../urpmi:559
+#: ../urpmi:583
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
-#: ../urpmi:560
+#: ../urpmi:584
#, c-format
msgid "Press Enter when ready..."
msgstr "Pwyso Enter pan yn barod..."
-#: ../urpmi:604
+#: ../urpmi:628
#, c-format
msgid "Downloading package `%s'..."
msgstr "Llwytho pecyn '%s'..."
-#: ../urpmi:616
-#, c-format
-msgid " %s%% of %s completed, ETA = %s, speed = %s"
-msgstr " %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
-
-#: ../urpmi:619
-#, c-format
-msgid " %s%% completed, speed = %s"
-msgstr " %s%% wedi cwblhau, cyflymder = %s"
-
-#: ../urpmi:638
+#: ../urpmi:645
#, c-format
msgid "The following packages have bad signatures"
msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
-#: ../urpmi:639
+#: ../urpmi:646
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ydych chi am barhau gosod?"
-#: ../urpmi:659 ../urpmi:786
+#: ../urpmi:666 ../urpmi:793
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -1644,52 +1647,52 @@ msgstr ""
"%s\n"
"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-#: ../urpmi:669 ../urpmi:724 ../urpmi:745 ../urpmi:765
+#: ../urpmi:676 ../urpmi:731 ../urpmi:752 ../urpmi:772
#, c-format
msgid "Installation failed"
msgstr "Methodd y gosod"
-#: ../urpmi:684
+#: ../urpmi:691
#, c-format
msgid "distributing %s"
msgstr "dosbarthu %s"
-#: ../urpmi:692
+#: ../urpmi:699
#, c-format
msgid "installing %s"
msgstr "gosod %s"
-#: ../urpmi:707
+#: ../urpmi:714
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Gosod pecyn `%s' (%s/%s)..."
-#: ../urpmi:731
+#: ../urpmi:738
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
-#: ../urpmi:750
+#: ../urpmi:757
#, c-format
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
-#: ../urpmi:791
+#: ../urpmi:798
#, c-format
msgid "%d installation transactions failed"
msgstr "methodd trosglwyddiad gosod %d"
-#: ../urpmi:799
+#: ../urpmi:806
#, c-format
msgid "Installation is possible"
msgstr "Gosod yn bosibl"
-#: ../urpmi:802
+#: ../urpmi:809
#, c-format
msgid "The package(s) are already installed"
msgstr "Popeth wedi eu gosod eisoes"
-#: ../urpmi:816
+#: ../urpmi:823
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -2137,6 +2140,12 @@ msgstr "Heb ganfod filelist\n"
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
+#~ msgid " %s%% of %s completed, ETA = %s, speed = %s"
+#~ msgstr " %s%% o %s wedi cwblhau, Cyrraedd = %s, cyflymder = %s"
+
+#~ msgid " %s%% completed, speed = %s"
+#~ msgstr " %s%% wedi cwblhau, cyflymder = %s"
+
#~ msgid "relocated %s entries in depslist"
#~ msgstr "ailganfod cofnodion %s yn depslist"