summaryrefslogtreecommitdiffstats
path: root/po/cy.po
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-21 13:03:15 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-04-21 13:03:15 +0000
commitc41ad1ceefc5b024bdeb8be247d1e5c7e9e1ed8a (patch)
treed6c4d15dbfa5616457de8e6389cf3c68db9bb0c5 /po/cy.po
parent1dbc05906e45974a12d29519b5a00f3c1ac4ac30 (diff)
downloadurpmi-c41ad1ceefc5b024bdeb8be247d1e5c7e9e1ed8a.tar
urpmi-c41ad1ceefc5b024bdeb8be247d1e5c7e9e1ed8a.tar.gz
urpmi-c41ad1ceefc5b024bdeb8be247d1e5c7e9e1ed8a.tar.bz2
urpmi-c41ad1ceefc5b024bdeb8be247d1e5c7e9e1ed8a.tar.xz
urpmi-c41ad1ceefc5b024bdeb8be247d1e5c7e9e1ed8a.zip
merge new strings
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po620
1 files changed, 317 insertions, 303 deletions
diff --git a/po/cy.po b/po/cy.po
index 1c4b70fa..83a8fd37 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-02-03 14:02+0100\n"
+"POT-Creation-Date: 2005-04-21 14:52+0200\n"
"PO-Revision-Date: 2005-02-01 20:27-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -54,7 +54,7 @@ msgstr ""
"Gosodiad pecynnau awtomatig...\n"
"Roeddech wedi gofyn i gael gosod pecyn %s\n"
-#: ../_irpm:33 ../urpme:29 ../urpmi:465
+#: ../_irpm:33 ../urpme:29 ../urpmi:477
#, c-format
msgid "Is this OK?"
msgstr "Mae'r model yn gywir"
@@ -69,7 +69,7 @@ msgstr "Iawn"
msgid "Cancel"
msgstr "Dileu"
-#: ../_irpm:44 ../urpmi:381 ../urpmi:399 ../urpmi:469
+#: ../_irpm:44 ../urpmi:383 ../urpmi:401 ../urpmi:481
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -187,7 +187,7 @@ msgstr "(uwchraddio)"
msgid " (to install)"
msgstr "(gosod)"
-#: ../gurpmi2:120 ../urpmi:346
+#: ../gurpmi2:120 ../urpmi:348
#, c-format
msgid "One of the following packages is needed:"
msgstr "Mae angen un o'r pecynnau canlynol:"
@@ -228,12 +228,12 @@ msgstr ""
msgid "Package installation..."
msgstr "Gosod y pecyn..."
-#: ../gurpmi2:185 ../urpmi:477 ../urpmq:305
+#: ../gurpmi2:185 ../urpmi:488 ../urpmq:306
#, c-format
msgid "unable to get source packages, aborting"
msgstr "methu estyn pecynnau ffynhonnell, atal"
-#: ../gurpmi2:199 ../urpmi:488
+#: ../gurpmi2:199 ../urpmi:499
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
@@ -256,7 +256,7 @@ msgstr ""
"\n"
"Hoffech chi barhau gyda'r gosod?"
-#: ../gurpmi2:249 ../gurpmi2:298 ../urpmi:559 ../urpmi:675
+#: ../gurpmi2:249 ../gurpmi2:298 ../urpmi:570 ../urpmi:688
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -267,12 +267,12 @@ msgstr ""
"%s\n"
"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-#: ../gurpmi2:256 ../urpme:115 ../urpmi:600
+#: ../gurpmi2:256 ../urpme:116 ../urpmi:613
#, c-format
msgid "removing %s"
msgstr "tynnu %s"
-#: ../gurpmi2:264 ../urpm.pm:2779
+#: ../gurpmi2:264 ../urpm.pm:2847
#, c-format
msgid "Preparing..."
msgstr "Paratoi..."
@@ -282,7 +282,7 @@ msgstr "Paratoi..."
msgid "Installing package `%s' (%s/%s)..."
msgstr "Gosod pecyn `%s' (%s/%s)..."
-#: ../gurpmi2:284 ../urpmi:569 ../urpmi:613 ../urpmi:634 ../urpmi:654
+#: ../gurpmi2:284 ../urpmi:580 ../urpmi:626 ../urpmi:647 ../urpmi:667
#, c-format
msgid "Installation failed"
msgstr "Methodd y gosod"
@@ -292,7 +292,7 @@ msgstr "Methodd y gosod"
msgid "_Done"
msgstr "_Gorffen"
-#: ../gurpmi2:301 ../urpmi:691
+#: ../gurpmi2:301 ../urpmi:704
#, c-format
msgid "The package(s) are already installed"
msgstr "Popeth wedi eu gosod eisoes"
@@ -331,49 +331,49 @@ msgstr " -g [group] - cyfyngu canlyniadau i'r grŵp.\n"
msgid " defaults is %s.\n"
msgstr " rhagosodedig yw %s.\n"
-#: ../urpm.pm:68
+#: ../urpm.pm:71
#, c-format
msgid "unknown protocol defined for %s"
msgstr "protocol anhysbys ar gyfer %s"
-#: ../urpm.pm:101
+#: ../urpm.pm:104
#, 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:117
+#: ../urpm.pm:120
#, c-format
msgid "unable to handle protocol: %s"
msgstr "methu trin protocol: %s"
-#: ../urpm.pm:200
+#: ../urpm.pm:207
#, 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:201
+#: ../urpm.pm:208
#, 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:214 ../urpm.pm:1240 ../urpm.pm:1250
+#: ../urpm.pm:221 ../urpm.pm:1285 ../urpm.pm:1295
#, 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:217 ../urpm.pm:2398
+#: ../urpm.pm:224 ../urpm.pm:2469
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
-#: ../urpm.pm:245
+#: ../urpm.pm:254
#, c-format
msgid "trying to bypass existing medium \"%s\", avoiding"
msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi"
-#: ../urpm.pm:253
+#: ../urpm.pm:262
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -382,103 +382,103 @@ msgstr ""
"dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
"cyfrwng"
-#: ../urpm.pm:258
+#: ../urpm.pm:267
#, 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:267
+#: ../urpm.pm:276
#, c-format
msgid "unable to find hdlist file for \"%s\", medium ignored"
msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
-#: ../urpm.pm:274
+#: ../urpm.pm:283
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
-#: ../urpm.pm:296
+#: ../urpm.pm:307
#, c-format
msgid "inconsistent list file for \"%s\", medium ignored"
msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu"
-#: ../urpm.pm:304
+#: ../urpm.pm:315
#, c-format
msgid "unable to inspect list file for \"%s\", medium ignored"
msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
-#: ../urpm.pm:344
+#: ../urpm.pm:355
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
-#: ../urpm.pm:345
+#: ../urpm.pm:356
#, c-format
msgid "taking removable device as \"%s\""
msgstr "cymryd dyfais symudol fel \"%s\""
-#: ../urpm.pm:349
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
-
-#: ../urpm.pm:354
+#: ../urpm.pm:359
#, 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:356 ../urpm.pm:359
+#: ../urpm.pm:362
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
+
+#: ../urpm.pm:367 ../urpm.pm:370
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
-#: ../urpm.pm:384
+#: ../urpm.pm:396
#, c-format
msgid "unable to write config file [%s]"
msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
-#: ../urpm.pm:388
-#, c-format
-msgid "unable to write file [%s]"
-msgstr "methu ysgrifennu ffeil (%s)"
-
-#: ../urpm.pm:395
+#: ../urpm.pm:406
#, c-format
msgid "wrote config file [%s]"
msgstr "ysgrifennu ffeil ffurfweddu (%s)"
-#: ../urpm.pm:407
+#: ../urpm.pm:418
#, 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:416
+#: ../urpm.pm:428
#, c-format
msgid "unable to parse \"%s\" in file [%s]"
msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)"
-#: ../urpm.pm:426
+#: ../urpm.pm:440
#, c-format
msgid "examining parallel handler in file [%s]"
msgstr "archwilio trinydd paralel mewn ffeil [%s]"
-#: ../urpm.pm:436
+#: ../urpm.pm:451
#, c-format
msgid "found parallel handler for nodes: %s"
msgstr "canfod trinydd paralel ar gyfer nodau: %s"
-#: ../urpm.pm:440
+#: ../urpm.pm:455
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
-#: ../urpm.pm:444
+#: ../urpm.pm:459
#, c-format
msgid "unable to use parallel option \"%s\""
msgstr "methu defnyddio dewis paralel \"%s\""
-#: ../urpm.pm:455
+#: ../urpm.pm:467
+#, c-format
+msgid "there doesn't seem to be devices in the chroot in \"%s\""
+msgstr ""
+
+#: ../urpm.pm:473
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -487,159 +487,158 @@ msgstr ""
"-nid oes modd defnyddio synthesis gyda --media, --excludemedia, --sortmedia, "
"--update neu --paralel"
-#: ../urpm.pm:516 ../urpm.pm:542 ../urpm.pm:994 ../urpm.pm:1005
-#: ../urpm.pm:1077 ../urpm.pm:1094 ../urpm.pm:1164 ../urpm.pm:1223
-#: ../urpm.pm:1435 ../urpm.pm:1556 ../urpm.pm:1671 ../urpm.pm:1677
-#: ../urpm.pm:1777 ../urpm.pm:1862 ../urpm.pm:1866
+#: ../urpm.pm:534 ../urpm.pm:560 ../urpm.pm:1039 ../urpm.pm:1050
+#: ../urpm.pm:1122 ../urpm.pm:1139 ../urpm.pm:1209 ../urpm.pm:1268
+#: ../urpm.pm:1483 ../urpm.pm:1606 ../urpm.pm:1723 ../urpm.pm:1729
+#: ../urpm.pm:1832 ../urpm.pm:1917 ../urpm.pm:1921
#, c-format
msgid "examining synthesis file [%s]"
msgstr "archwilio ffeil synthesis [%s]"
-#: ../urpm.pm:520 ../urpm.pm:535 ../urpm.pm:548 ../urpm.pm:997 ../urpm.pm:1008
-#: ../urpm.pm:1083 ../urpm.pm:1089 ../urpm.pm:1169 ../urpm.pm:1227
-#: ../urpm.pm:1439 ../urpm.pm:1560 ../urpm.pm:1665 ../urpm.pm:1683
-#: ../urpm.pm:1872
+#: ../urpm.pm:538 ../urpm.pm:553 ../urpm.pm:566 ../urpm.pm:1042
+#: ../urpm.pm:1053 ../urpm.pm:1128 ../urpm.pm:1134 ../urpm.pm:1214
+#: ../urpm.pm:1272 ../urpm.pm:1487 ../urpm.pm:1610 ../urpm.pm:1717
+#: ../urpm.pm:1735 ../urpm.pm:1927
#, c-format
msgid "examining hdlist file [%s]"
msgstr "archwilio ffeil hdlist [%s]"
-#: ../urpm.pm:530 ../urpm.pm:1001
+#: ../urpm.pm:548 ../urpm.pm:1046
#, 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:560
+#: ../urpm.pm:578
#, c-format
msgid "Search start: %s end: %s"
msgstr "Cychwyn chwilio: %s diwedd: %s"
-#: ../urpm.pm:565 ../urpm.pm:1015 ../urpm.pm:1102 ../urpm.pm:1173
-#: ../urpm.pm:1564
+#: ../urpm.pm:583 ../urpm.pm:1060 ../urpm.pm:1147 ../urpm.pm:1218
+#: ../urpm.pm:1614
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
-#: ../urpm.pm:571 ../urpm.pm:1815
+#: ../urpm.pm:589 ../urpm.pm:1870
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
-#: ../urpm.pm:586
+#: ../urpm.pm:604
#, c-format
msgid "skipping package %s"
msgstr "hepgor pecyn %s"
-#: ../urpm.pm:599
+#: ../urpm.pm:617
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "gosod yn lle uwchraddio pecyn %s"
-#: ../urpm.pm:610 ../urpm.pm:2211 ../urpm.pm:2275 ../urpm.pm:2844
-#: ../urpm.pm:2958
+#: ../urpm.pm:628 ../urpm.pm:2277 ../urpm.pm:2341 ../urpm.pm:2912
+#: ../urpm.pm:3025
#, c-format
msgid "unable to open rpmdb"
msgstr "methu agor rpmdb"
-#: ../urpm.pm:649
+#: ../urpm.pm:668
#, c-format
msgid "medium \"%s\" already exists"
msgstr "cyfrwng \"%s\" yn bodoli eisoes"
-#: ../urpm.pm:656
+#: ../urpm.pm:675
#, c-format
msgid "virtual medium needs to be local"
msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
-#: ../urpm.pm:682
+#: ../urpm.pm:702
#, c-format
msgid "added medium %s"
msgstr "ychwanegwyd cyfrwng %s"
-#: ../urpm.pm:709
+#: ../urpm.pm:744
#, c-format
msgid "unable to access first installation medium"
msgstr "methu cael mynediad i gyfrwng gosod cyntaf"
-#: ../urpm.pm:713
+#: ../urpm.pm:748
#, c-format
msgid "copying hdlists file..."
msgstr "copïo ffeil hdlists..."
-#: ../urpm.pm:715 ../urpm.pm:1118 ../urpm.pm:1193
+#: ../urpm.pm:750 ../urpm.pm:1163 ../urpm.pm:1238
#, c-format
msgid "...copying done"
msgstr "...cwblhau'r copïo"
-#: ../urpm.pm:716 ../urpm.pm:1119 ../urpm.pm:1268 ../urpm.pm:1327
-#: ../urpm.pm:1503 ../urpm.pm:1510
+#: ../urpm.pm:751 ../urpm.pm:1164 ../urpm.pm:1313 ../urpm.pm:1372
+#: ../urpm.pm:1552 ../urpm.pm:1559
#, c-format
msgid "...copying failed"
msgstr "...methodd y copïo"
-#: ../urpm.pm:719 ../urpm.pm:743 ../urpm.pm:778
+#: ../urpm.pm:754 ../urpm.pm:779 ../urpm.pm:818
#, 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:726
+#: ../urpm.pm:761
#, c-format
msgid "retrieving hdlists file..."
msgstr "adfer ffeil hdlists..."
-#: ../urpm.pm:737 ../urpm.pm:1546 ../urpm.pm:2020 ../urpm.pm:2712
-#: ../urpmi.addmedia:167
+#: ../urpm.pm:773 ../urpm.pm:1596 ../urpm.pm:2086 ../urpm.pm:2780
#, c-format
msgid "...retrieving done"
msgstr ".cwblhau adfer"
-#: ../urpm.pm:739 ../urpm.pm:1530 ../urpm.pm:1539 ../urpm.pm:2023
-#: ../urpm.pm:2714 ../urpmi.addmedia:169
+#: ../urpm.pm:775 ../urpm.pm:1580 ../urpm.pm:1589 ../urpm.pm:2089
+#: ../urpm.pm:2782
#, c-format
msgid "...retrieving failed: %s"
msgstr "... methodd ail-lwytho: %s"
-#: ../urpm.pm:761
+#: ../urpm.pm:799
#, c-format
msgid "invalid hdlist description \"%s\" in hdlists file"
msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists"
-#: ../urpm.pm:815
+#: ../urpm.pm:855
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
-#: ../urpm.pm:817
+#: ../urpm.pm:857
#, c-format
msgid "selecting multiple media: %s"
msgstr "dewis aml-gyfrwng: %s"
-#: ../urpm.pm:817 ../urpmi.update:94
+#: ../urpm.pm:857 ../urpmi.update:94
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpm.pm:833
+#: ../urpm.pm:873
#, c-format
msgid "removing medium \"%s\""
msgstr "dewis cyfrwng \"%s\":"
-#: ../urpm.pm:884
+#: ../urpm.pm:924
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
-#: ../urpm.pm:913
+#: ../urpm.pm:953
#, c-format
msgid "...reconfiguration failed"
msgstr "...methodd ail-ffurfweddu"
-#: ../urpm.pm:920
+#: ../urpm.pm:960
#, c-format
msgid "reconfiguration done"
msgstr "cwblhau ail-ffurfweddu"
-#: ../urpm.pm:1055
+#: ../urpm.pm:1100
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -649,7 +648,7 @@ msgstr ""
"maethu cael mynediad i gyfrwng \"%s\",\n"
"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
-#: ../urpm.pm:1106
+#: ../urpm.pm:1151
#, c-format
msgid ""
"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -658,142 +657,142 @@ msgstr ""
"dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, "
"anwybyddu'r cyfrwng"
-#: ../urpm.pm:1116
+#: ../urpm.pm:1161
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copïo ffeil disgrifiad o \"%s\""
-#: ../urpm.pm:1140 ../urpm.pm:1411
+#: ../urpm.pm:1185 ../urpm.pm:1459
#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis)"
msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)"
-#: ../urpm.pm:1189
+#: ../urpm.pm:1234
#, c-format
msgid "copying source hdlist (or synthesis) of \"%s\"..."
msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..."
-#: ../urpm.pm:1203
+#: ../urpm.pm:1248
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
-#: ../urpm.pm:1208
+#: ../urpm.pm:1253
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
-#: ../urpm.pm:1210
+#: ../urpm.pm:1255
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "methodd copïo (%s) (md5sum gwallus)"
-#: ../urpm.pm:1231 ../urpm.pm:1443 ../urpm.pm:1780
+#: ../urpm.pm:1276 ../urpm.pm:1491 ../urpm.pm:1835
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
-#: ../urpm.pm:1285
+#: ../urpm.pm:1330
#, c-format
msgid "reading rpm files from [%s]"
msgstr "darllen ffeiliau rpm o [%s]"
-#: ../urpm.pm:1300
+#: ../urpm.pm:1345
#, c-format
msgid "no rpms read"
msgstr "heb ddarllen rpmau"
-#: ../urpm.pm:1310
+#: ../urpm.pm:1355
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "methu darllen ffeiliau rpm o (%s): %s"
-#: ../urpm.pm:1315
+#: ../urpm.pm:1360
#, c-format
msgid "no rpm files found from [%s]"
msgstr "heb ganfod ffeiliau rpm o [%s]"
-#: ../urpm.pm:1461
+#: ../urpm.pm:1509
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
-#: ../urpm.pm:1488
+#: ../urpm.pm:1537
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
-#: ../urpm.pm:1537
+#: ../urpm.pm:1587
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
-#: ../urpm.pm:1539
+#: ../urpm.pm:1589
#, c-format
msgid "md5sum mismatch"
msgstr "anghysondeb md5sum"
-#: ../urpm.pm:1635
+#: ../urpm.pm:1687
#, c-format
msgid "retrieval of source hdlist (or synthesis) failed"
msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)"
-#: ../urpm.pm:1642
+#: ../urpm.pm:1694
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpm.pm:1653 ../urpm.pm:1707
+#: ../urpm.pm:1705 ../urpm.pm:1759
#, 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:1693
+#: ../urpm.pm:1745
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "methu didoli ffeil hdlist \"%s\""
-#: ../urpm.pm:1730
+#: ../urpm.pm:1784
#, c-format
msgid "unable to write list file of \"%s\""
msgstr "methu ysgrifennu i ffeil rhestr \"%s\""
-#: ../urpm.pm:1737
+#: ../urpm.pm:1792
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "ysgrifennu rhestr ffeil ar gyfer cyfrwng \"%s\""
-#: ../urpm.pm:1739
+#: ../urpm.pm:1794
#, c-format
msgid "nothing written in list file for \"%s\""
msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\""
-#: ../urpm.pm:1754
+#: ../urpm.pm:1809
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "archwilio ffeil pubkey \"%s\""
-#: ../urpm.pm:1761
+#: ../urpm.pm:1816
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
-#: ../urpm.pm:1764
+#: ../urpm.pm:1819
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "methu mewnforio ffeil pubkey \"%s\""
-#: ../urpm.pm:1829
+#: ../urpm.pm:1884
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "darllen pennawd o'r cyfrwng \"%s\""
-#: ../urpm.pm:1834
+#: ../urpm.pm:1889
#, c-format
msgid "building hdlist [%s]"
msgstr "adeiladu hdlist [%s]"
-#: ../urpm.pm:1849 ../urpm.pm:1884
+#: ../urpm.pm:1904 ../urpm.pm:1939
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -802,82 +801,82 @@ msgstr ""
"Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
"ffeil hdlist yn llygredig."
-#: ../urpm.pm:1852 ../urpm.pm:1887 ../urpmi:303
+#: ../urpm.pm:1907 ../urpm.pm:1942 ../urpmi:305
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpm.pm:1908
+#: ../urpm.pm:1965
#, c-format
msgid "found %d headers in cache"
msgstr "canfod %d pennawd mewn storfa"
-#: ../urpm.pm:1912
+#: ../urpm.pm:1969
#, c-format
msgid "removing %d obsolete headers in cache"
msgstr "tynnu hen benawdau %d yn y storfa"
-#: ../urpm.pm:1966
+#: ../urpm.pm:2025
#, c-format
msgid "mounting %s"
msgstr "gosod %s"
-#: ../urpm.pm:1988
+#: ../urpm.pm:2047
#, c-format
msgid "unmounting %s"
msgstr "dadosod %s"
-#: ../urpm.pm:2012
+#: ../urpm.pm:2071
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "enw ffeil rpm annilys [%s]"
-#: ../urpm.pm:2018
+#: ../urpm.pm:2077
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "adfer ffeil rpm (%s)..."
-#: ../urpm.pm:2025 ../urpm.pm:2886
+#: ../urpm.pm:2091
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "methu cael mynediad ffeil rpm (%s)"
-#: ../urpm.pm:2030
+#: ../urpm.pm:2096
#, c-format
msgid "unable to register rpm file"
msgstr "methu cofrestr ffeil rpm"
-#: ../urpm.pm:2033
+#: ../urpm.pm:2099
#, c-format
msgid "error registering local packages"
msgstr "gwall cofrestru pecynnau lleol"
-#: ../urpm.pm:2057
+#: ../urpm.pm:2123
#, c-format
msgid "Search"
msgstr "Chwilio"
-#: ../urpm.pm:2148
+#: ../urpm.pm:2214
#, c-format
msgid "no package named %s"
msgstr "heb enwi pecyn %s"
-#: ../urpm.pm:2151 ../urpme:92
+#: ../urpm.pm:2216 ../urpme:92
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-#: ../urpm.pm:2335 ../urpm.pm:2379 ../urpm.pm:2405
+#: ../urpm.pm:2404 ../urpm.pm:2449 ../urpm.pm:2476
#, 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:2390
+#: ../urpm.pm:2460
#, c-format
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
-#: ../urpm.pm:2417
+#: ../urpm.pm:2488
#, c-format
msgid ""
"medium \"%s\" uses an invalid list file:\n"
@@ -886,164 +885,164 @@ msgstr ""
"cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n"
" nid yw'r drych yn un diweddar, ceisiwch ddull arall"
-#: ../urpm.pm:2421
+#: ../urpm.pm:2492
#, 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:2433
+#: ../urpm.pm:2504
#, c-format
msgid "package %s is not found."
msgstr "heb ganfod pecyn %s"
-#: ../urpm.pm:2473 ../urpm.pm:2488 ../urpm.pm:2512 ../urpm.pm:2527
+#: ../urpm.pm:2544 ../urpm.pm:2559 ../urpm.pm:2583 ../urpm.pm:2598
#, c-format
msgid "urpmi database locked"
msgstr "cronfa ddata urpmi wedi cloi"
-#: ../urpm.pm:2579 ../urpm.pm:2582 ../urpm.pm:2612
+#: ../urpm.pm:2651 ../urpm.pm:2656 ../urpm.pm:2682
#, c-format
msgid "medium \"%s\" is not selected"
msgstr "heb ddewis cyfrwng \"%s\""
-#: ../urpm.pm:2608
+#: ../urpm.pm:2678
#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\""
-#: ../urpm.pm:2616
+#: ../urpm.pm:2686
#, 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:2628
+#: ../urpm.pm:2698
#, c-format
msgid "unable to access medium \"%s\""
msgstr "methu cael mynediad at gyfrwng. \"%s\""
-#: ../urpm.pm:2690
+#: ../urpm.pm:2757
#, c-format
msgid "malformed input: [%s]"
msgstr "allbwn gwallus: [%s]"
-#: ../urpm.pm:2697
+#: ../urpm.pm:2764
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
-#: ../urpm.pm:2817
+#: ../urpm.pm:2885
#, c-format
msgid "using process %d for executing transaction"
msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad"
-#: ../urpm.pm:2848
+#: ../urpm.pm:2916
#, 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:2851
+#: ../urpm.pm:2919
#, c-format
msgid "unable to create transaction"
msgstr "methu creu trosglwyddiad."
-#: ../urpm.pm:2858
+#: ../urpm.pm:2926
#, c-format
msgid "removing package %s"
msgstr "tynnu pecyn %s."
-#: ../urpm.pm:2860
+#: ../urpm.pm:2928
#, c-format
msgid "unable to remove package %s"
msgstr "methu tynnu pecyn %s"
-#: ../urpm.pm:2870
+#: ../urpm.pm:2938
#, 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:2873
+#: ../urpm.pm:2941
#, c-format
msgid "unable to install package %s"
msgstr "methu gosod pecyn %s"
-#: ../urpm.pm:2933
+#: ../urpm.pm:3000
#, c-format
msgid "More information on package %s"
msgstr "Rhagor o wybodaeth ar becyn %s"
-#: ../urpm.pm:3090 ../urpm.pm:3123
+#: ../urpm.pm:3162 ../urpm.pm:3195
#, c-format
msgid "due to missing %s"
msgstr "oherwydd %s coll"
-#: ../urpm.pm:3091 ../urpm.pm:3121
+#: ../urpm.pm:3163 ../urpm.pm:3193
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s heb ei foddloni"
-#: ../urpm.pm:3092
+#: ../urpm.pm:3164
#, c-format
msgid "trying to promote %s"
msgstr "ceisio hybu %s"
-#: ../urpm.pm:3093
+#: ../urpm.pm:3165
#, c-format
msgid "in order to keep %s"
msgstr "fel modd i gadw %s"
-#: ../urpm.pm:3116
+#: ../urpm.pm:3188
#, c-format
msgid "in order to install %s"
msgstr "er mwyn gosod %s"
-#: ../urpm.pm:3128
+#: ../urpm.pm:3200
#, c-format
msgid "due to conflicts with %s"
msgstr "oherwydd gwrthdaro gyda %s"
-#: ../urpm.pm:3130
+#: ../urpm.pm:3202
#, c-format
msgid "unrequested"
msgstr "diofyn"
-#: ../urpm.pm:3146
+#: ../urpm.pm:3218
#, c-format
msgid "Invalid signature (%s)"
msgstr "Llofnod annilys (%s)"
-#: ../urpm.pm:3178
+#: ../urpm.pm:3250
#, c-format
msgid "Invalid Key ID (%s)"
msgstr "Enw Allwedd Annilys (%s)"
-#: ../urpm.pm:3180
+#: ../urpm.pm:3252
#, c-format
msgid "Missing signature (%s)"
msgstr "Llofnod coll (%s)"
-#: ../urpm.pm:3229
+#: ../urpm.pm:3301
#, c-format
msgid "examining MD5SUM file"
msgstr "archwilio ffeil MD5SUM"
-#: ../urpm.pm:3238
+#: ../urpm.pm:3312
#, 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/args.pm:91 ../urpm/args.pm:98
+#: ../urpm/args.pm:93 ../urpm/args.pm:100
#, c-format
msgid "bad proxy declaration on command line\n"
msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n"
-#: ../urpm/args.pm:230
+#: ../urpm/args.pm:233
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n"
-#: ../urpm/msg.pm:63
+#: ../urpm/msg.pm:77
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Dewis gwael, ceisiwch eto\n"
@@ -1064,13 +1063,13 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpme:41 ../urpmf:32 ../urpmi:76 ../urpmi.addmedia:47
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:43
#: ../urpmi.removemedia:45 ../urpmi.update:30 ../urpmq:43
#, c-format
msgid " --help - print this help message.\n"
msgstr " --help - argraffu neges cymorth.\n"
-#: ../urpme:42 ../urpmi:83
+#: ../urpme:42 ../urpmi:84
#, c-format
msgid " --auto - automatically select a package in choices.\n"
msgstr " --auto - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
@@ -1080,7 +1079,7 @@ msgstr " --auto - dewis pecyn ynn awtomatig o fewn dewisiadau.\n"
msgid " --test - verify if the removal can be achieved correctly.\n"
msgstr " --test - gwirio os oes modd tynnu'n iawn.\n"
-#: ../urpme:44 ../urpmi:97 ../urpmq:64
+#: ../urpme:44 ../urpmi:99 ../urpmq:64
#, c-format
msgid ""
" --force - force invocation even if some packages do not exist.\n"
@@ -1088,7 +1087,7 @@ msgstr ""
" --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n "
"bodoli.\n"
-#: ../urpme:45 ../urpmi:102 ../urpmq:65
+#: ../urpme:45 ../urpmi:104 ../urpmq:65
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
@@ -1108,7 +1107,7 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth (ddad)osod chroot gyda dewis o --root.\n"
-#: ../urpme:49 ../urpmi:135 ../urpmi.addmedia:79 ../urpmi.removemedia:50
+#: ../urpme:49 ../urpmi:137 ../urpmi.addmedia:73 ../urpmi.removemedia:50
#: ../urpmi.update:48 ../urpmq:90
#, c-format
msgid " -v - verbose mode.\n"
@@ -1134,34 +1133,34 @@ msgstr "pecynnau anhysbys"
msgid "unknown package"
msgstr "pecyn anhysbys"
-#: ../urpme:97
+#: ../urpme:97 ../urpmi:416
#, c-format
msgid "removing package %s will break your system"
msgstr "bydd tynnu pecynnau %s yn torri'r system"
-#: ../urpme:99
+#: ../urpme:100
#, c-format
msgid "Nothing to remove"
msgstr "Dim i'w dynnu"
-#: ../urpme:103
+#: ../urpme:104
#, c-format
msgid "Checking to remove the following packages"
msgstr "Ticio i ddileu'r pecynnau canlynol"
-#: ../urpme:110
+#: ../urpme:111
#, 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:112 ../urpmi:423 ../urpmi:552
+#: ../urpme:113 ../urpmi:435 ../urpmi:563
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:119
+#: ../urpme:120
#, c-format
msgid "Removing failed"
msgstr "Methodd y tynnu"
@@ -1182,23 +1181,23 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpmf:33 ../urpmi:77 ../urpmq:44
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
#, c-format
msgid " --update - use only update media.\n"
msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n"
-#: ../urpmf:34 ../urpmi:78 ../urpmq:45
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr " --media - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n"
-#: ../urpmf:35 ../urpmi:80 ../urpmq:47
+#: ../urpmf:35 ../urpmi:81 ../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:81 ../urpmq:48
+#: ../urpmf:36 ../urpmi:82 ../urpmq:48
#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
@@ -1315,7 +1314,7 @@ msgstr ""
" --obsoletes - argraffu hen dagiau: yr holl hen rai (llinellau "
"niferus).\n"
-#: ../urpmf:58 ../urpmi:117 ../urpmq:74
+#: ../urpmf:58 ../urpmi:119 ../urpmq:74
#, c-format
msgid ""
" --env - use specific environment (typically a bug\n"
@@ -1380,7 +1379,7 @@ msgstr ""
"galw nôl yw: \n"
"%s\n"
-#: ../urpmf:124 ../urpmi:198 ../urpmq:114
+#: ../urpmf:124 ../urpmi:200 ../urpmq:114
#, c-format
msgid "using specific environment on %s\n"
msgstr "ddefnyddio amgylchedd penodol ar %s\n"
@@ -1399,7 +1398,7 @@ msgstr ""
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:71
+#: ../urpmi:72
#, c-format
msgid ""
"urpmi version %s\n"
@@ -1415,7 +1414,7 @@ msgstr ""
"\n"
"defnydd:\n"
-#: ../urpmi:79 ../urpmq:46
+#: ../urpmi:80 ../urpmq:46
#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
@@ -1424,25 +1423,31 @@ msgstr ""
" --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau "
"gofynnwyd (neu diweddarwyd).\n"
-#: ../urpmi:82
+#: ../urpmi:83
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n"
-#: ../urpmi:84 ../urpmq:50
+#: ../urpmi:85 ../urpmq:50
#, c-format
msgid ""
" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - dewis pecynnau'n awtomatig i uwchraddio'r system.\n"
-#: ../urpmi:85
+#: ../urpmi:86
#, c-format
msgid ""
" --no-uninstall - never ask to uninstall a package, abort the "
"installation.\n"
msgstr " --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n"
-#: ../urpmi:86 ../urpmq:52
+#: ../urpmi:87
+#, fuzzy, c-format
+msgid " --no-install - don't install packages (only download)\n"
+msgstr ""
+" --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
+
+#: ../urpmi:88
#, c-format
msgid ""
" --keep - keep existing packages if possible, reject requested\n"
@@ -1451,7 +1456,7 @@ msgstr ""
" --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
" pecynnau sy'n arwain at dynnu.\n"
-#: ../urpmi:88
+#: ../urpmi:90
#, c-format
msgid ""
" --split-level - split in small transaction if more than given packages\n"
@@ -1463,39 +1468,39 @@ msgstr ""
" eu gosod neu eu uwchraddio\n"
" rhagosodiad yw %d.\n"
-#: ../urpmi:91
+#: ../urpmi:93
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n"
-#: ../urpmi:92 ../urpmq:51
+#: ../urpmi:94 ../urpmq:51
#, c-format
msgid " --fuzzy - impose fuzzy search (same as -y).\n"
msgstr " --fuzzy - mynnu chwiliad fuzzy (fel -y).\n"
-#: ../urpmi:93 ../urpmq:60
+#: ../urpmi:95 ../urpmq:60
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
msgstr ""
" --src - pecyn nesaf yn becyn ffynhonnell (yr un peth â -s).\n"
-#: ../urpmi:94
+#: ../urpmi:96
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
msgstr ""
" --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
-#: ../urpmi:95
+#: ../urpmi:97
#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
msgstr " --clean - tynnu rpm o'r storfa cyn unrhyw beth arall.\n"
-#: ../urpmi:96
-#, c-format
+#: ../urpmi:98
+#, fuzzy, c-format
msgid " --noclean - don't clean rpms from cache.\n"
msgstr " --noclean - cadw'r rpm sydd heb ei ddefnyddio yn y storfa.\n"
-#: ../urpmi:98
+#: ../urpmi:100
#, c-format
msgid ""
" --allow-nodeps - allow asking user to install packages without\n"
@@ -1504,7 +1509,7 @@ msgstr ""
" --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n"
" wirio dibyniaethau.\n"
-#: ../urpmi:100
+#: ../urpmi:102
#, c-format
msgid ""
" --allow-force - allow asking user to install packages without\n"
@@ -1513,12 +1518,12 @@ msgstr ""
" --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n"
" wirio dibyniaethau na'u cyfanrwydd.\n"
-#: ../urpmi:103
+#: ../urpmi:105
#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n"
-#: ../urpmi:104
+#: ../urpmi:106
#, c-format
msgid ""
" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1527,22 +1532,22 @@ msgstr ""
" --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n"
" wrth osod chroot gyda dewis o --root.\n"
-#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:68
+#: ../urpmi:108 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr " --wget - defnyddio wget i estyn ffeiliau pell.\n"
-#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:69
+#: ../urpmi:109 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - defnyddio curl i estyn ffeiliau pell.\n"
-#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#: ../urpmi:110 ../urpmi.addmedia:46 ../urpmi.update:33
#, c-format
msgid " --limit-rate - limit the download speed.\n"
msgstr " --limit-rate - cyfyngu cyflymder y llwytho i lawr.\n"
-#: ../urpmi:109
+#: ../urpmi:111
#, c-format
msgid ""
" --resume - resume transfer of partially-downloaded files\n"
@@ -1551,7 +1556,7 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
-#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:70
+#: ../urpmi:113 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
#, c-format
msgid ""
" --proxy - use specified HTTP proxy, the port number is assumed\n"
@@ -1560,7 +1565,7 @@ msgstr ""
" --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n"
" rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n"
-#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:72
+#: ../urpmi:115 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
#, c-format
msgid ""
" --proxy-user - specify user and password to use for proxy\n"
@@ -1569,7 +1574,7 @@ msgstr ""
" --proxy-user - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n"
" dilysiad dirprwy (fformat yw <user:password>).\n"
-#: ../urpmi:115
+#: ../urpmi:117
#, c-format
msgid ""
" --bug - output a bug report in directory indicated by\n"
@@ -1578,7 +1583,7 @@ msgstr ""
" --bug - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n"
" yr arg. nesaf\n"
-#: ../urpmi:119
+#: ../urpmi:121
#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
@@ -1587,28 +1592,28 @@ msgstr ""
" --verify-rpm - gwirio llofnod rpm cyn gosod\n"
" (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n"
-#: ../urpmi:121
+#: ../urpmi:123
#, c-format
msgid ""
" --test - verify if the installation can be achieved correctly.\n"
msgstr " --test - gwirio os oes modd gosod yn iawn.\n"
-#: ../urpmi:122
+#: ../urpmi:124
#, c-format
msgid " --excludepath - exclude path separated by comma.\n"
msgstr " --excludepath - eithrio llwybr wedi ei wahanu a chollnod.\n"
-#: ../urpmi:123
+#: ../urpmi:125
#, c-format
msgid " --excludedocs - exclude doc files.\n"
msgstr " --excludedocs - eithrio ffeiliau docs.\n"
-#: ../urpmi:124
+#: ../urpmi:126
#, c-format
msgid " --skip - packages which installation should be skipped\n"
msgstr " --skip - pecynnau dylid osgoi eu gosod.\n"
-#: ../urpmi:125
+#: ../urpmi:127
#, c-format
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
@@ -1618,65 +1623,65 @@ msgstr ""
"ddewis\n"
" na'r rhagosodiad.\n"
-#: ../urpmi:127 ../urpmi.addmedia:75 ../urpmi.update:41
+#: ../urpmi:129 ../urpmi.addmedia:68 ../urpmi.update:41
#, c-format
msgid " --norebuild - don't try to rebuild hdlist if not readable.\n"
msgstr ""
" --norebuild - peidiwch ceisio adeiladu buildhost os nad yw'n "
"ddarllenadwy.\n"
-#: ../urpmi:128
+#: ../urpmi:130
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
-#: ../urpmi:129 ../urpmq:77
+#: ../urpmi:131 ../urpmq:77
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
-#: ../urpmi:130
+#: ../urpmi:132
#, c-format
msgid " -p - allow search in provides to find package.\n"
msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-#: ../urpmi:131
+#: ../urpmi:133
#, c-format
msgid " -P - do not search in provides to find package.\n"
msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n"
-#: ../urpmi:132 ../urpmq:91
+#: ../urpmi:134 ../urpmq:91
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - gosod chwilio fuzzy (fel --fuzzy).\n"
-#: ../urpmi:133 ../urpmq:88
+#: ../urpmi:135 ../urpmq:88
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" --s - pecyn nesaf yn becyn ffynhonnell (yr un peth â -src).\n"
-#: ../urpmi:134 ../urpmi.addmedia:78 ../urpmi.removemedia:49
+#: ../urpmi:136 ../urpmi.addmedia:72 ../urpmi.removemedia:49
#: ../urpmi.update:47
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modd distaw.\n"
-#: ../urpmi:136
+#: ../urpmi:138
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
msgstr ""
" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
"eu gosod.\n"
-#: ../urpmi:179
+#: ../urpmi:181
#, 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:188
+#: ../urpmi:190
#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
@@ -1685,22 +1690,22 @@ msgstr ""
"Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am "
"adroddiad gwall neu ei ddileu."
-#: ../urpmi:189
+#: ../urpmi:191
#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall"
-#: ../urpmi:192 ../urpmi:313
+#: ../urpmi:194 ../urpmi:315
#, c-format
msgid "Copying failed"
msgstr "Methodd y copïo"
-#: ../urpmi:209
+#: ../urpmi:211
#, c-format
msgid "Only superuser is allowed to install packages"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
-#: ../urpmi:218
+#: ../urpmi:220
#, c-format
msgid ""
"Error: %s appears to be mounted read-only.\n"
@@ -1709,12 +1714,12 @@ msgstr ""
"Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
"Defnydd --caniatáu gorfodaeth i orfodi gweithred."
-#: ../urpmi:348
+#: ../urpmi:350
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Beth yw eich dewis? (1-%d)"
-#: ../urpmi:373
+#: ../urpmi:375
#, c-format
msgid ""
"The following packages can't be installed because they depend on packages\n"
@@ -1725,7 +1730,7 @@ msgstr ""
"sy'n hyn na'r rhai sydd wedi eu gosod:\n"
"%s"
-#: ../urpmi:381 ../urpmi:399
+#: ../urpmi:383 ../urpmi:401
#, c-format
msgid ""
"\n"
@@ -1734,7 +1739,7 @@ msgstr ""
"\n"
"Parhau?"
-#: ../urpmi:392
+#: ../urpmi:394
#, c-format
msgid ""
"Some package requested cannot be installed:\n"
@@ -1743,7 +1748,7 @@ msgstr ""
"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
"%s"
-#: ../urpmi:412
+#: ../urpmi:424
#, c-format
msgid ""
"The installation cannot continue because the following packages\n"
@@ -1754,7 +1759,7 @@ msgstr ""
"gael eu tynnu i eraill gael eu diweddaru.\n"
"%s\n"
-#: ../urpmi:417
+#: ../urpmi:429
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -1763,7 +1768,7 @@ msgstr ""
"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
"%s"
-#: ../urpmi:452 ../urpmi:463
+#: ../urpmi:464 ../urpmi:475
#, c-format
msgid ""
"To satisfy dependencies, the following %d packages are going to be installed "
@@ -1771,7 +1776,7 @@ msgid ""
msgstr ""
"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
-#: ../urpmi:453 ../urpmi:464
+#: ../urpmi:465 ../urpmi:476
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed (%d "
@@ -1779,7 +1784,7 @@ msgid ""
msgstr ""
"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod (%d MB)"
-#: ../urpmi:459
+#: ../urpmi:471
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -1788,62 +1793,62 @@ msgstr ""
"Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
"%s\n"
-#: ../urpmi:489
+#: ../urpmi:500
#, c-format
msgid "Press Enter when ready..."
msgstr "Pwyso Enter pan yn barod..."
-#: ../urpmi:543
+#: ../urpmi:554
#, c-format
msgid "The following packages have bad signatures"
msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
-#: ../urpmi:544
+#: ../urpmi:555
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ydych chi am barhau gosod?"
-#: ../urpmi:584
+#: ../urpmi:597
#, c-format
msgid "distributing %s"
msgstr "dosbarthu %s"
-#: ../urpmi:595
+#: ../urpmi:608
#, c-format
msgid "installing %s from %s"
msgstr "gosod %s o %s"
-#: ../urpmi:597
+#: ../urpmi:610
#, c-format
msgid "installing %s"
msgstr "gosod %s"
-#: ../urpmi:620
+#: ../urpmi:633
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
-#: ../urpmi:639
+#: ../urpmi:652
#, c-format
msgid "Try installation even more strongly (--force)? (y/N) "
msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)"
-#: ../urpmi:680
+#: ../urpmi:693
#, c-format
msgid "%d installation transactions failed"
msgstr "methodd trosglwyddiad gosod %d"
-#: ../urpmi:688
+#: ../urpmi:701
#, c-format
msgid "Installation is possible"
msgstr "Gosod yn bosibl"
-#: ../urpmi:707
+#: ../urpmi:720
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
-#: ../urpmi.addmedia:38
+#: ../urpmi.addmedia:34
#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1868,22 +1873,22 @@ msgstr ""
"\n"
"and [options] are from\n"
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:51
#, c-format
msgid " --update - create an update medium.\n"
msgstr " --update - defnyddio cyfrwng diweddaru.\n"
-#: ../urpmi.addmedia:56
+#: ../urpmi.addmedia:52
#, c-format
msgid " --probe-synthesis - try to find and use synthesis file.\n"
msgstr " --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:53
#, c-format
msgid " --probe-hdlist - try to find and use hdlist file.\n"
msgstr " --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n"
-#: ../urpmi.addmedia:58
+#: ../urpmi.addmedia:54
#, c-format
msgid ""
" --no-probe - do not try to find any synthesis or\n"
@@ -1892,7 +1897,7 @@ msgstr ""
" --no-probe - peidio ceisio canfod unrhyw synthesis neu\n"
" ffeil hdlist.\n"
-#: ../urpmi.addmedia:60
+#: ../urpmi.addmedia:56
#, c-format
msgid ""
" --distrib - automatically create all media from an installation\n"
@@ -1901,19 +1906,7 @@ msgstr ""
" --distrib - creu yn awtomatig yr holl gyfrwng o gyfrwng\n"
" gosod\n"
-#: ../urpmi.addmedia:62
-#, c-format
-msgid ""
-" --distrib-XXX - automatically create a medium for XXX part of a\n"
-" distribution, XXX may be main, contrib, updates or\n"
-" anything else that has been configured ;-)\n"
-msgstr ""
-" --distrib-XXX - creu cyfrwng yn awtomatig ar gyfer rhan XXX o'r\n"
-" dosbarthiad, gall XXX fod yn main, contrib, diweddariad "
-"neu\n"
-" unrhyw beth arall sydd wedi ei ffurfweddu ;-)\n"
-
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:58
#, c-format
msgid ""
" --from - use specified url for list of mirrors, the default is\n"
@@ -1923,7 +1916,7 @@ msgstr ""
"rhagosodedig yw\n"
" %s\n"
-#: ../urpmi.addmedia:67
+#: ../urpmi.addmedia:60
#, c-format
msgid ""
" --version - use specified distribution version, the default is taken\n"
@@ -1936,7 +1929,7 @@ msgstr ""
"pecynnau\n"
" ryddhawyd gan Mandrakelinux.\n"
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:63
#, c-format
msgid ""
" --arch - use specified architecture, the default is arch of\n"
@@ -1945,7 +1938,7 @@ msgstr ""
" --arch - defnyddio pensaernïaeth benodol, y rhagosodiad yw arch o\n"
" osod pecynnau Mandrakelinux.\n"
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:65
#, c-format
msgid ""
" --virtual - create virtual media wich are always up-to-date,\n"
@@ -1954,72 +1947,62 @@ msgstr ""
" --virtual - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n"
" dom ond protocol file:// sy'n cael ei ganiatáu.\n"
-#: ../urpmi.addmedia:74 ../urpmi.update:39
+#: ../urpmi.addmedia:67 ../urpmi.update:39
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n"
-#: ../urpmi.addmedia:76 ../urpmi.removemedia:47 ../urpmi.update:45
+#: ../urpmi.addmedia:69
+#, c-format
+msgid " --raw - add the media in config, but don't update it.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:70 ../urpmi.removemedia:47 ../urpmi.update:45
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - glanhau penawdau yng nghyfeiriadur y storfa.\n"
-#: ../urpmi.addmedia:77 ../urpmi.update:46
+#: ../urpmi.addmedia:71 ../urpmi.update:46
#, c-format
msgid " -f - force generation of hdlist files.\n"
msgstr " -f - gorfodi cynhyrchu ffeiliau hdlist\n"
-#: ../urpmi.addmedia:116
+#: ../urpmi.addmedia:83
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "methu diweddaru cyfrwng \"%s\"\n"
+
+#: ../urpmi.addmedia:113
#, c-format
msgid "Only superuser is allowed to add media"
msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng"
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:116
#, c-format
msgid "Will create config file [%s]"
msgstr "Yn creu ffeil config (%s)"
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:117
#, c-format
msgid "Can't create config file [%s]"
msgstr "Methu creu ffeil Config (%s)"
-#: ../urpmi.addmedia:149
-#, c-format
-msgid "found version %s and arch %s ..."
-msgstr "wedi canfod fersiwn %s ac arch %s ..."
-
-#: ../urpmi.addmedia:153
-#, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
-
-#: ../urpmi.addmedia:158
-#, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "adfer drychau yn %s..."
-
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:124
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib"
-#: ../urpmi.addmedia:218 ../urpmi.addmedia:242
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "methu diweddaru cyfrwng \"%s\"\n"
-
-#: ../urpmi.addmedia:229
+#: ../urpmi.addmedia:134
#, c-format
msgid "<relative path of hdlist> missing\n"
msgstr "<llwybr perthynnol hdlist> ar goll\n"
-#: ../urpmi.addmedia:231
+#: ../urpmi.addmedia:136
#, c-format
msgid "`with' missing for network media\n"
msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n"
-#: ../urpmi.addmedia:240
+#: ../urpmi.addmedia:152
#, c-format
msgid "unable to create medium \"%s\"\n"
msgstr "methu creu cyfrwng \"%s\"\n"
@@ -2152,6 +2135,15 @@ msgstr ""
"\n"
"defnydd:\n"
+#: ../urpmq:52
+#, fuzzy, c-format
+msgid ""
+" --keep - keep existing packages if possible, reject requested\n"
+" packages that leads to remove.\n"
+msgstr ""
+" --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
+" pecynnau sy'n arwain at dynnu.\n"
+
#: ../urpmq:54
#, c-format
msgid " --list - list available packages.\n"
@@ -2294,21 +2286,43 @@ msgstr ""
msgid "--list-nodes can only be used with --parallel"
msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
-#: ../urpmq:340
+#: ../urpmq:342
#, c-format
msgid "skipping media %s: no hdlist\n"
msgstr "hepgor cyfrwng %s: dim hdliist\n"
-#: ../urpmq:402
+#: ../urpmq:412
#, c-format
msgid "No filelist found\n"
msgstr "Heb ganfod filelist\n"
-#: ../urpmq:412
+#: ../urpmq:422
#, c-format
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
+#~ msgid "unable to write file [%s]"
+#~ msgstr "methu ysgrifennu ffeil (%s)"
+
+#~ msgid ""
+#~ " --distrib-XXX - automatically create a medium for XXX part of a\n"
+#~ " distribution, XXX may be main, contrib, updates or\n"
+#~ " anything else that has been configured ;-)\n"
+#~ msgstr ""
+#~ " --distrib-XXX - creu cyfrwng yn awtomatig ar gyfer rhan XXX o'r\n"
+#~ " dosbarthiad, gall XXX fod yn main, contrib, "
+#~ "diweddariad neu\n"
+#~ " unrhyw beth arall sydd wedi ei ffurfweddu ;-)\n"
+
+#~ msgid "found version %s and arch %s ..."
+#~ msgstr "wedi canfod fersiwn %s ac arch %s ..."
+
+#~ msgid "cannot add updates of a cooker distribution\n"
+#~ msgstr "methu ychwanegu diweddariadau o ddosbarthiad cookies\n"
+
+#~ msgid "retrieving mirrors at %s ..."
+#~ msgstr "adfer drychau yn %s..."
+
#~ msgid "Unknown option %s"
#~ msgstr "Dewis anhysbys %s"