From 2160cd12fa67d8f87e964bdd4d3eab104d4ba857 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Tue, 14 Feb 2006 13:46:32 +0000 Subject: Merge strings --- po/cy.po | 696 ++++++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 417 insertions(+), 279 deletions(-) (limited to 'po/cy.po') diff --git a/po/cy.po b/po/cy.po index 54845c57..36d78c17 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: 2006-02-02 19:45+0800\n" +"POT-Creation-Date: 2006-02-14 14:40+0100\n" "PO-Revision-Date: 2005-06-28 21:39-0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: Cymraeg/Welsh \n" @@ -140,7 +140,7 @@ msgstr "(gosod)" msgid "Package choice" msgstr "Dewis pecyn" -#: ../gurpmi2:124 ../urpmi:402 +#: ../gurpmi2:124 ../urpmi:414 msgid "One of the following packages is needed:" msgstr "Mae angen un o'r pecynnau canlynol:" @@ -173,11 +173,11 @@ msgstr "" msgid "Package installation..." msgstr "Gosod y pecyn..." -#: ../gurpmi2:190 ../urpmi:556 +#: ../gurpmi2:190 ../urpmi:569 msgid "unable to get source packages, aborting" msgstr "methu estyn pecynnau ffynhonnell, atal" -#: ../gurpmi2:203 ../urpmi:566 +#: ../gurpmi2:203 ../urpmi:579 #, c-format msgid "Please insert the medium named \"%s\" on device [%s]" msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]" @@ -201,7 +201,7 @@ msgstr "" "Hoffech chi barhau gyda'r gosod?" #. - Warning : the following message is parsed in urpm::parallel_* -#: ../gurpmi2:253 ../gurpmi2:302 ../urpmi:638 ../urpmi:764 +#: ../gurpmi2:253 ../gurpmi2:309 ../urpmi:651 ../urpmi:782 #, c-format msgid "" "Installation failed, some files are missing:\n" @@ -213,12 +213,12 @@ msgstr "" "Hoffech chi ddiweddaru eich cronfa ddata urpmi?" #. - Warning : the following message is parsed in urpm::parallel_* -#: ../gurpmi2:260 ../urpme:124 ../urpmi:682 +#: ../gurpmi2:260 ../urpme:129 ../urpmi:698 #, c-format msgid "removing %s" msgstr "tynnu %s" -#: ../gurpmi2:268 ../urpm.pm:2895 +#: ../gurpmi2:268 ../urpm.pm:2905 msgid "Preparing..." msgstr "Paratoi..." @@ -228,19 +228,19 @@ msgid "Installing package `%s' (%s/%s)..." msgstr "Gosod pecyn `%s' (%s/%s)..." #. - Warning : the following message is parsed in urpm::parallel_* -#: ../gurpmi2:288 ../urpmi:649 ../urpmi:703 ../urpmi:723 ../urpmi:741 +#: ../gurpmi2:295 ../urpmi:663 ../urpmi:721 ../urpmi:741 ../urpmi:759 msgid "Installation failed" msgstr "Methodd y gosod" -#: ../gurpmi2:297 +#: ../gurpmi2:304 msgid "_Done" msgstr "_Gorffen" -#: ../gurpmi2:305 ../urpmi:781 +#: ../gurpmi2:312 ../urpmi:799 msgid "The package(s) are already installed" msgstr "Popeth wedi eu gosod eisoes" -#: ../gurpmi2:307 +#: ../gurpmi2:314 msgid "Installation finished" msgstr "Cwblhawyd y gosod" @@ -271,7 +271,7 @@ msgid " defaults is %s.\n" msgstr " rhagosodedig yw %s.\n" #. - need to be root if binary rpms are to be installed -#: ../rurpmi:11 ../urpmi:239 +#: ../rurpmi:11 ../urpmi:242 msgid "Only superuser is allowed to install packages" msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau" @@ -279,51 +279,51 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau" msgid "Running urpmi in restricted mode..." msgstr "" -#: ../urpm.pm:68 +#: ../urpm.pm:73 #, c-format msgid "unknown protocol defined for %s" msgstr "protocol anhysbys ar gyfer %s" -#: ../urpm.pm:104 +#: ../urpm.pm:109 #, 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:120 +#: ../urpm.pm:125 #, c-format msgid "unable to handle protocol: %s" msgstr "methu trin protocol: %s" -#: ../urpm.pm:215 +#: ../urpm.pm:221 #, c-format msgid "medium \"%s\" trying to use an already used hdlist, medium ignored" msgstr "" "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng" -#: ../urpm.pm:216 +#: ../urpm.pm:222 #, c-format msgid "medium \"%s\" trying to use an already used list, medium ignored" msgstr "" "cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng" -#: ../urpm.pm:229 ../urpm.pm:1304 ../urpm.pm:1314 +#: ../urpm.pm:235 ../urpm.pm:1310 ../urpm.pm:1320 #, c-format msgid "unable to access hdlist file of \"%s\", medium ignored" msgstr "methu cael mynediad i ffeil hdlist\"%s\", anwybyddu'r cyfrwng" #. list file exists but isn't readable #. report error only if no result found, list files are only readable by root -#: ../urpm.pm:232 ../urpm.pm:2510 +#: ../urpm.pm:238 ../urpm.pm:2516 #, c-format msgid "unable to access list file of \"%s\", medium ignored" msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng" -#: ../urpm.pm:260 +#: ../urpm.pm:266 #, fuzzy, c-format msgid "trying to override existing medium \"%s\", skipping" msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi" -#: ../urpm.pm:271 +#: ../urpm.pm:277 #, c-format msgid "" "virtual medium \"%s\" should not have defined hdlist or list file, medium " @@ -332,103 +332,103 @@ msgstr "" "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y " "cyfrwng" -#: ../urpm.pm:276 +#: ../urpm.pm:282 #, c-format msgid "virtual medium \"%s\" should have a clear url, medium ignored" msgstr "dylai cyfrwng rhithiol \"%s\" gael url clir, anwybyddu'r cyfrwng" -#: ../urpm.pm:285 +#: ../urpm.pm:291 #, c-format msgid "unable to find hdlist file for \"%s\", medium ignored" msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu" -#: ../urpm.pm:292 +#: ../urpm.pm:298 #, c-format msgid "unable to find list file for \"%s\", medium ignored" msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu" -#: ../urpm.pm:316 +#: ../urpm.pm:322 #, c-format msgid "inconsistent list file for \"%s\", medium ignored" msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu" -#: ../urpm.pm:326 +#: ../urpm.pm:332 #, c-format msgid "unable to inspect list file for \"%s\", medium ignored" msgstr "methu archwilio rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu" #. - return value is suitable for an hash. -#: ../urpm.pm:366 +#: ../urpm.pm:372 #, c-format msgid "too many mount points for removable medium \"%s\"" msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\"" -#: ../urpm.pm:367 +#: ../urpm.pm:373 #, c-format msgid "taking removable device as \"%s\"" msgstr "cymryd dyfais symudol fel \"%s\"" -#: ../urpm.pm:370 +#: ../urpm.pm:376 #, c-format msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly" msgstr "" "Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio." -#: ../urpm.pm:373 +#: ../urpm.pm:379 #, c-format msgid "using different removable device [%s] for \"%s\"" msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\"" -#: ../urpm.pm:378 ../urpm.pm:381 +#: ../urpm.pm:384 ../urpm.pm:387 #, c-format msgid "unable to retrieve pathname for removable medium \"%s\"" msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\"" -#: ../urpm.pm:407 +#: ../urpm.pm:413 #, c-format msgid "unable to write config file [%s]" msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)" -#: ../urpm.pm:417 +#: ../urpm.pm:423 #, c-format msgid "wrote config file [%s]" msgstr "ysgrifennu ffeil ffurfweddu (%s)" -#: ../urpm.pm:445 +#: ../urpm.pm:451 msgid "Can't use parallel mode with use-distrib mode" msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib" -#: ../urpm.pm:455 +#: ../urpm.pm:461 #, c-format msgid "unable to parse \"%s\" in file [%s]" msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)" -#: ../urpm.pm:467 +#: ../urpm.pm:473 #, c-format msgid "examining parallel handler in file [%s]" msgstr "archwilio trinydd paralel mewn ffeil [%s]" -#: ../urpm.pm:478 +#: ../urpm.pm:484 #, c-format msgid "found parallel handler for nodes: %s" msgstr "canfod trinydd paralel ar gyfer nodau: %s" -#: ../urpm.pm:482 +#: ../urpm.pm:488 #, c-format msgid "using associated media for parallel mode: %s" msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s" -#: ../urpm.pm:486 +#: ../urpm.pm:492 #, c-format msgid "unable to use parallel option \"%s\"" msgstr "methu defnyddio dewis paralel \"%s\"" -#: ../urpm.pm:494 +#: ../urpm.pm:500 #, c-format msgid "there doesn't seem to be devices in the chroot in \"%s\"" msgstr "does dim dyfeisiau i'w gweld yn chroot yn \"%s\"" -#: ../urpm.pm:500 +#: ../urpm.pm:506 msgid "" "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --" "update or --parallel" @@ -445,144 +445,144 @@ msgstr "" #. - (However links need to be managed. see bug #12391.) #. - as previously done, just read synthesis file here, this is enough. #. - read default synthesis (we have to make sure nothing get out of depslist). -#: ../urpm.pm:564 ../urpm.pm:590 ../urpm.pm:1076 ../urpm.pm:1087 -#: ../urpm.pm:1159 ../urpm.pm:1176 ../urpm.pm:1231 ../urpm.pm:1287 -#: ../urpm.pm:1497 ../urpm.pm:1617 ../urpm.pm:1734 ../urpm.pm:1740 -#: ../urpm.pm:1843 ../urpm.pm:1929 ../urpm.pm:1933 +#: ../urpm.pm:570 ../urpm.pm:596 ../urpm.pm:1082 ../urpm.pm:1093 +#: ../urpm.pm:1165 ../urpm.pm:1182 ../urpm.pm:1237 ../urpm.pm:1293 +#: ../urpm.pm:1503 ../urpm.pm:1623 ../urpm.pm:1740 ../urpm.pm:1746 +#: ../urpm.pm:1849 ../urpm.pm:1935 ../urpm.pm:1939 #, c-format msgid "examining synthesis file [%s]" msgstr "archwilio ffeil synthesis [%s]" -#: ../urpm.pm:568 ../urpm.pm:583 ../urpm.pm:596 ../urpm.pm:1079 -#: ../urpm.pm:1090 ../urpm.pm:1165 ../urpm.pm:1171 ../urpm.pm:1236 -#: ../urpm.pm:1291 ../urpm.pm:1501 ../urpm.pm:1621 ../urpm.pm:1728 -#: ../urpm.pm:1746 ../urpm.pm:1939 +#: ../urpm.pm:574 ../urpm.pm:589 ../urpm.pm:602 ../urpm.pm:1085 +#: ../urpm.pm:1096 ../urpm.pm:1171 ../urpm.pm:1177 ../urpm.pm:1242 +#: ../urpm.pm:1297 ../urpm.pm:1507 ../urpm.pm:1627 ../urpm.pm:1734 +#: ../urpm.pm:1752 ../urpm.pm:1945 #, c-format msgid "examining hdlist file [%s]" msgstr "archwilio ffeil hdlist [%s]" -#: ../urpm.pm:578 ../urpm.pm:1083 +#: ../urpm.pm:584 ../urpm.pm:1089 #, c-format msgid "virtual medium \"%s\" is not local, medium ignored" msgstr "nid yw'r rhith gyfrwng \"%s\" yn lleol, anwybyddu'r cyfrwng" -#: ../urpm.pm:608 +#: ../urpm.pm:614 #, c-format msgid "Search start: %s end: %s" msgstr "Cychwyn chwilio: %s diwedd: %s" #. - this is almost a fatal error, ignore it by default? -#: ../urpm.pm:613 ../urpm.pm:1097 ../urpm.pm:1184 ../urpm.pm:1240 -#: ../urpm.pm:1625 +#: ../urpm.pm:619 ../urpm.pm:1103 ../urpm.pm:1190 ../urpm.pm:1246 +#: ../urpm.pm:1631 #, c-format msgid "problem reading hdlist or synthesis file of medium \"%s\"" msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\"" -#: ../urpm.pm:620 ../urpm.pm:1881 +#: ../urpm.pm:626 ../urpm.pm:1887 msgid "performing second pass to compute dependencies\n" msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n" -#: ../urpm.pm:636 +#: ../urpm.pm:642 #, c-format msgid "skipping package %s" msgstr "hepgor pecyn %s" -#: ../urpm.pm:649 +#: ../urpm.pm:655 #, c-format msgid "would install instead of upgrade package %s" msgstr "gosod yn lle uwchraddio pecyn %s" #. - beware this can be a child process or the main process now... #. - open in read/write mode unless testing installation. -#: ../urpm.pm:660 ../urpm.pm:2316 ../urpm.pm:2377 ../urpm.pm:2567 -#: ../urpm.pm:2960 ../urpm.pm:3084 +#: ../urpm.pm:666 ../urpm.pm:2324 ../urpm.pm:2385 ../urpm.pm:2573 +#: ../urpm.pm:2970 ../urpm.pm:3087 msgid "unable to open rpmdb" msgstr "methu agor rpmdb" -#: ../urpm.pm:700 +#: ../urpm.pm:706 #, c-format msgid "medium \"%s\" already exists" msgstr "cyfrwng \"%s\" yn bodoli eisoes" -#: ../urpm.pm:707 +#: ../urpm.pm:713 msgid "virtual medium needs to be local" msgstr "rhaid i'r rhith gyfrwng fod yn lleol" -#: ../urpm.pm:732 +#: ../urpm.pm:738 #, c-format msgid "added medium %s" msgstr "ychwanegwyd cyfrwng %s" -#: ../urpm.pm:777 +#: ../urpm.pm:783 msgid "unable to access first installation medium" msgstr "methu cael mynediad i gyfrwng gosod cyntaf" -#: ../urpm.pm:781 +#: ../urpm.pm:787 msgid "copying hdlists file..." msgstr "copïo ffeil hdlists..." -#: ../urpm.pm:783 ../urpm.pm:1200 ../urpm.pm:1257 +#: ../urpm.pm:789 ../urpm.pm:1206 ../urpm.pm:1263 msgid "...copying done" msgstr "...cwblhau'r copïo" -#: ../urpm.pm:784 ../urpm.pm:1201 ../urpm.pm:1332 ../urpm.pm:1395 -#: ../urpm.pm:1563 ../urpm.pm:1570 +#: ../urpm.pm:790 ../urpm.pm:1207 ../urpm.pm:1338 ../urpm.pm:1401 +#: ../urpm.pm:1569 ../urpm.pm:1576 msgid "...copying failed" msgstr "...methodd y copïo" -#: ../urpm.pm:787 ../urpm.pm:812 ../urpm.pm:851 +#: ../urpm.pm:793 ../urpm.pm:818 ../urpm.pm:857 msgid "unable to access first installation medium (no hdlists file found)" msgstr "" "methu cael mynediad i'r cyfrwng gosod cyntaf (heb ganfod ffeil hdlists)" -#: ../urpm.pm:794 +#: ../urpm.pm:800 msgid "retrieving hdlists file..." msgstr "adfer ffeil hdlists..." -#: ../urpm.pm:806 ../urpm.pm:1607 ../urpm.pm:2105 ../urpm.pm:2825 +#: ../urpm.pm:812 ../urpm.pm:1613 ../urpm.pm:2114 ../urpm.pm:2831 msgid "...retrieving done" msgstr ".cwblhau adfer" -#: ../urpm.pm:808 ../urpm.pm:1591 ../urpm.pm:2109 ../urpm.pm:2827 +#: ../urpm.pm:814 ../urpm.pm:1597 ../urpm.pm:2118 ../urpm.pm:2833 #, c-format msgid "...retrieving failed: %s" msgstr "... methodd ail-lwytho: %s" -#: ../urpm.pm:832 +#: ../urpm.pm:838 #, c-format msgid "invalid hdlist description \"%s\" in hdlists file" msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists" -#: ../urpm.pm:888 +#: ../urpm.pm:894 #, c-format msgid "trying to select nonexistent medium \"%s\"" msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\"" #. - several elements in found and/or foundi lists. -#: ../urpm.pm:890 +#: ../urpm.pm:896 #, c-format msgid "selecting multiple media: %s" msgstr "dewis aml-gyfrwng: %s" -#: ../urpm.pm:906 +#: ../urpm.pm:912 #, c-format msgid "removing medium \"%s\"" msgstr "dewis cyfrwng \"%s\":" -#: ../urpm.pm:957 +#: ../urpm.pm:963 #, c-format msgid "reconfiguring urpmi for media \"%s\"" msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\"" -#: ../urpm.pm:986 +#: ../urpm.pm:992 msgid "...reconfiguration failed" msgstr "...methodd ail-ffurfweddu" -#: ../urpm.pm:993 +#: ../urpm.pm:999 msgid "reconfiguration done" msgstr "cwblhau ail-ffurfweddu" -#: ../urpm.pm:1137 +#: ../urpm.pm:1143 #, c-format msgid "" "unable to access medium \"%s\",\n" @@ -592,7 +592,7 @@ msgstr "" "maethu cael mynediad i gyfrwng \"%s\",\n" "gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng." -#: ../urpm.pm:1188 +#: ../urpm.pm:1194 #, c-format msgid "" "virtual medium \"%s\" should have valid source hdlist or synthesis, medium " @@ -601,135 +601,135 @@ msgstr "" "dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, " "anwybyddu'r cyfrwng" -#: ../urpm.pm:1198 +#: ../urpm.pm:1204 #, c-format msgid "copying description file of \"%s\"..." msgstr "copïo ffeil disgrifiad o \"%s\"" -#: ../urpm.pm:1253 +#: ../urpm.pm:1259 #, c-format msgid "copying source hdlist (or synthesis) of \"%s\"..." msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..." -#: ../urpm.pm:1267 +#: ../urpm.pm:1273 #, c-format msgid "copy of [%s] failed (file is suspiciously small)" msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)" -#: ../urpm.pm:1272 +#: ../urpm.pm:1278 msgid "computing md5sum of copied source hdlist (or synthesis)" msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)" -#: ../urpm.pm:1274 +#: ../urpm.pm:1280 #, c-format msgid "copy of [%s] failed (md5sum mismatch)" msgstr "methodd copïo (%s) (md5sum gwallus)" -#: ../urpm.pm:1295 ../urpm.pm:1505 ../urpm.pm:1846 +#: ../urpm.pm:1301 ../urpm.pm:1511 ../urpm.pm:1852 #, c-format msgid "problem reading synthesis file of medium \"%s\"" msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\"" -#: ../urpm.pm:1353 +#: ../urpm.pm:1359 #, c-format msgid "reading rpm files from [%s]" msgstr "darllen ffeiliau rpm o [%s]" -#: ../urpm.pm:1368 +#: ../urpm.pm:1374 msgid "no rpms read" msgstr "heb ddarllen rpmau" -#: ../urpm.pm:1378 +#: ../urpm.pm:1384 #, c-format msgid "unable to read rpm files from [%s]: %s" msgstr "methu darllen ffeiliau rpm o (%s): %s" -#: ../urpm.pm:1383 +#: ../urpm.pm:1389 #, c-format msgid "no rpm files found from [%s]" msgstr "heb ganfod ffeiliau rpm o [%s]" #. - try to probe for possible with_hdlist parameter, unless #. - it is already defined (and valid). -#: ../urpm.pm:1520 +#: ../urpm.pm:1526 #, c-format msgid "retrieving source hdlist (or synthesis) of \"%s\"..." msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..." -#: ../urpm.pm:1548 +#: ../urpm.pm:1554 #, c-format msgid "found probed hdlist (or synthesis) as %s" msgstr "canfod hdlist (neu synthesis) holwyd fel %s" -#: ../urpm.pm:1598 +#: ../urpm.pm:1604 msgid "computing md5sum of retrieved source hdlist (or synthesis)" msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)" -#: ../urpm.pm:1600 +#: ../urpm.pm:1606 msgid "...retrieving failed: md5sum mismatch" msgstr "... methodd ail-lwytho: anghysondeb md5sum" -#: ../urpm.pm:1698 +#: ../urpm.pm:1704 msgid "retrieval of source hdlist (or synthesis) failed" msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)" -#: ../urpm.pm:1705 +#: ../urpm.pm:1711 #, c-format msgid "no hdlist file found for medium \"%s\"" msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\"" -#: ../urpm.pm:1716 ../urpm.pm:1770 +#: ../urpm.pm:1722 ../urpm.pm:1776 #, c-format msgid "file [%s] already used in the same medium \"%s\"" msgstr "file [%s] yn cael ei ddefnyddio eisoes yn yr un cyfrwng \"%s\"" -#: ../urpm.pm:1756 +#: ../urpm.pm:1762 #, c-format msgid "unable to parse hdlist file of \"%s\"" msgstr "methu didoli ffeil hdlist \"%s\"" -#: ../urpm.pm:1795 +#: ../urpm.pm:1801 #, c-format msgid "unable to write list file of \"%s\"" msgstr "methu ysgrifennu i ffeil rhestr \"%s\"" -#: ../urpm.pm:1803 +#: ../urpm.pm:1809 #, c-format msgid "writing list file for medium \"%s\"" msgstr "ysgrifennu rhestr ffeil ar gyfer cyfrwng \"%s\"" -#: ../urpm.pm:1805 +#: ../urpm.pm:1811 #, c-format msgid "nothing written in list file for \"%s\"" msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\"" -#: ../urpm.pm:1820 +#: ../urpm.pm:1826 #, c-format msgid "examining pubkey file of \"%s\"..." msgstr "archwilio ffeil pubkey \"%s\"" -#: ../urpm.pm:1827 +#: ../urpm.pm:1833 #, c-format msgid "...imported key %s from pubkey file of \"%s\"" msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\"" -#: ../urpm.pm:1830 +#: ../urpm.pm:1836 #, c-format msgid "unable to import pubkey file of \"%s\"" msgstr "methu mewnforio ffeil pubkey \"%s\"" -#: ../urpm.pm:1895 +#: ../urpm.pm:1901 #, c-format msgid "reading headers from medium \"%s\"" msgstr "darllen pennawd o'r cyfrwng \"%s\"" -#: ../urpm.pm:1900 +#: ../urpm.pm:1906 #, c-format msgid "building hdlist [%s]" msgstr "adeiladu hdlist [%s]" #. - XXX this happens when building a synthesis for a local media from RPMs... why ? -#: ../urpm.pm:1915 ../urpm.pm:1951 +#: ../urpm.pm:1921 ../urpm.pm:1957 #, c-format msgid "" "Unable to build synthesis file for medium \"%s\". Your hdlist file may be " @@ -738,95 +738,91 @@ msgstr "" "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich " "ffeil hdlist yn llygredig." -#: ../urpm.pm:1919 ../urpm.pm:1955 ../urpmi:359 +#: ../urpm.pm:1925 ../urpm.pm:1961 ../urpmi:370 #, c-format msgid "built hdlist synthesis file for medium \"%s\"" msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\"" -#: ../urpm.pm:1978 +#: ../urpm.pm:1984 #, c-format msgid "found %d headers in cache" msgstr "canfod %d pennawd mewn storfa" -#: ../urpm.pm:1982 +#: ../urpm.pm:1988 #, c-format msgid "removing %d obsolete headers in cache" msgstr "tynnu hen benawdau %d yn y storfa" -#: ../urpm.pm:2003 +#: ../urpm.pm:2009 #, c-format msgid "Error generating names file: dependency %d not found" msgstr "" -#: ../urpm.pm:2008 +#: ../urpm.pm:2014 #, c-format msgid "Error generating names file: Can't write to file (%s)" msgstr "" -#: ../urpm.pm:2044 +#: ../urpm.pm:2050 #, c-format msgid "mounting %s" msgstr "gosod %s" -#: ../urpm.pm:2066 +#: ../urpm.pm:2074 #, c-format msgid "unmounting %s" msgstr "dadosod %s" -#: ../urpm.pm:2090 +#: ../urpm.pm:2099 #, c-format msgid "invalid rpm file name [%s]" msgstr "enw ffeil rpm annilys [%s]" -#: ../urpm.pm:2096 +#: ../urpm.pm:2105 #, c-format msgid "retrieving rpm file [%s] ..." msgstr "adfer ffeil rpm (%s)..." -#: ../urpm.pm:2114 +#: ../urpm.pm:2123 #, c-format msgid "unable to access rpm file [%s]" msgstr "methu cael mynediad ffeil rpm (%s)" -#: ../urpm.pm:2119 +#: ../urpm.pm:2128 #, fuzzy, c-format msgid "unable to parse spec file %s [%s]" msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)" -#: ../urpm.pm:2129 +#: ../urpm.pm:2138 msgid "unable to register rpm file" msgstr "methu cofrestr ffeil rpm" -#: ../urpm.pm:2133 +#: ../urpm.pm:2142 msgid "error registering local packages" msgstr "gwall cofrestru pecynnau lleol" -#: ../urpm.pm:2157 -msgid "Search" -msgstr "Chwilio" - -#: ../urpm.pm:2244 +#: ../urpm.pm:2252 #, c-format msgid "no package named %s" msgstr "heb enwi pecyn %s" #. - Warning : the following message is parsed in urpm::parallel_* -#: ../urpm.pm:2246 ../urpme:97 +#: ../urpm.pm:2254 ../urpme:102 #, c-format msgid "The following packages contain %s: %s" msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:" -#: ../urpm.pm:2440 ../urpm.pm:2487 ../urpm.pm:2518 +#: ../urpm.pm:2447 ../urpm.pm:2493 ../urpm.pm:2524 #, 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:2501 +#: ../urpm.pm:2507 #, c-format msgid "unable to correctly parse [%s] on value \"%s\"" msgstr "methu didoli (%s) yn gywir ar werth \"%s\"" -#: ../urpm.pm:2534 +#: ../urpm.pm:2540 #, c-format msgid "" "medium \"%s\" uses an invalid list file:\n" @@ -835,181 +831,181 @@ msgstr "" "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n" " nid yw'r drych yn un diweddar, ceisiwch ddull arall" -#: ../urpm.pm:2538 +#: ../urpm.pm:2544 #, 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:2550 +#: ../urpm.pm:2556 #, c-format msgid "package %s is not found." msgstr "heb ganfod pecyn %s" -#: ../urpm.pm:2601 ../urpm.pm:2615 ../urpm.pm:2635 ../urpm.pm:2649 +#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655 msgid "urpmi database locked" msgstr "cronfa ddata urpmi wedi cloi" -#: ../urpm.pm:2701 ../urpm.pm:2706 ../urpm.pm:2732 +#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738 #, c-format msgid "medium \"%s\" is not selected" msgstr "heb ddewis cyfrwng \"%s\"" #. - fallback to use other method for retrieving the file later. -#: ../urpm.pm:2728 +#: ../urpm.pm:2734 #, c-format msgid "unable to read rpm file [%s] from medium \"%s\"" msgstr "methu darllen ffeil rpm (%s) o gyfrwng \"%s\"" #. - we have a removable device that is not removable, well... -#: ../urpm.pm:2736 +#: ../urpm.pm:2742 #, 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:2748 +#: ../urpm.pm:2754 #, c-format msgid "unable to access medium \"%s\"" msgstr "methu cael mynediad at gyfrwng. \"%s\"" -#: ../urpm.pm:2803 +#: ../urpm.pm:2809 #, fuzzy, c-format msgid "malformed URL: [%s]" msgstr "allbwn gwallus: [%s]" -#: ../urpm.pm:2810 +#: ../urpm.pm:2816 #, c-format msgid "retrieving rpm files from medium \"%s\"..." msgstr "adfer ffeiliau rpm o gyfrwng [%s]" -#: ../urpm.pm:2933 +#: ../urpm.pm:2943 #, c-format msgid "using process %d for executing transaction" msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad" -#: ../urpm.pm:2964 +#: ../urpm.pm:2975 #, 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:2967 +#: ../urpm.pm:2978 msgid "unable to create transaction" msgstr "methu creu trosglwyddiad." -#: ../urpm.pm:2975 +#: ../urpm.pm:2986 #, c-format msgid "removing package %s" msgstr "tynnu pecyn %s." -#: ../urpm.pm:2977 +#: ../urpm.pm:2988 #, c-format msgid "unable to remove package %s" msgstr "methu tynnu pecyn %s" -#: ../urpm.pm:2989 +#: ../urpm.pm:3000 #, c-format msgid "unable to extract rpm from delta-rpm package %s" msgstr "methu tynnu rpm o becyn delta-rpm %s" -#: ../urpm.pm:2995 +#: ../urpm.pm:3006 #, 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:2998 +#: ../urpm.pm:3009 #, c-format msgid "unable to install package %s" msgstr "methu gosod pecyn %s" -#: ../urpm.pm:3055 +#: ../urpm.pm:3058 #, c-format msgid "More information on package %s" msgstr "Rhagor o wybodaeth ar becyn %s" -#: ../urpm.pm:3227 ../urpm.pm:3265 +#: ../urpm.pm:3230 ../urpm.pm:3268 #, c-format msgid "due to missing %s" msgstr "oherwydd %s coll" -#: ../urpm.pm:3228 ../urpm.pm:3263 +#: ../urpm.pm:3231 ../urpm.pm:3266 #, c-format msgid "due to unsatisfied %s" msgstr "%s heb ei foddloni" -#: ../urpm.pm:3234 +#: ../urpm.pm:3237 #, c-format msgid "trying to promote %s" msgstr "ceisio hybu %s" -#: ../urpm.pm:3235 +#: ../urpm.pm:3238 #, c-format msgid "in order to keep %s" msgstr "fel modd i gadw %s" -#: ../urpm.pm:3258 +#: ../urpm.pm:3261 #, c-format msgid "in order to install %s" msgstr "er mwyn gosod %s" -#: ../urpm.pm:3269 +#: ../urpm.pm:3272 #, c-format msgid "due to conflicts with %s" msgstr "oherwydd gwrthdaro gyda %s" -#: ../urpm.pm:3270 +#: ../urpm.pm:3273 msgid "unrequested" msgstr "diofyn" -#: ../urpm.pm:3288 +#: ../urpm.pm:3291 #, c-format msgid "Invalid signature (%s)" msgstr "Llofnod annilys (%s)" -#: ../urpm.pm:3321 +#: ../urpm.pm:3324 #, c-format msgid "Invalid Key ID (%s)" msgstr "Enw Allwedd Annilys (%s)" -#: ../urpm.pm:3323 +#: ../urpm.pm:3326 #, c-format msgid "Missing signature (%s)" msgstr "Llofnod coll (%s)" -#: ../urpm.pm:3382 +#: ../urpm.pm:3385 msgid "examining MD5SUM file" msgstr "archwilio ffeil MD5SUM" -#: ../urpm.pm:3392 +#: ../urpm.pm:3395 #, 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:3403 +#: ../urpm.pm:3406 msgid "computing md5sum of existing source hdlist (or synthesis)" msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)" -#: ../urpm.pm:3433 +#: ../urpm.pm:3436 msgid "This operation is forbidden while running in restricted mode" msgstr "" -#: ../urpm/args.pm:105 ../urpm/args.pm:114 +#: ../urpm/args.pm:106 ../urpm/args.pm:115 msgid "bad proxy declaration on command line\n" msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n" -#: ../urpm/args.pm:224 +#: ../urpm/args.pm:229 #, fuzzy 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:256 +#: ../urpm/args.pm:261 #, c-format msgid "urpmq: cannot read rpm file \"%s\"\n" msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n" #. Translator: Add here the keys which might be pressed in the "No"-case. -#: ../urpm/msg.pm:46 ../urpme:33 ../urpmi:439 ../urpmi:457 ../urpmi:495 -#: ../urpmi:545 ../urpmi:628 ../urpmi:709 +#: ../urpm/msg.pm:46 ../urpme:32 ../urpmi:452 ../urpmi:470 ../urpmi:508 +#: ../urpmi:558 ../urpmi:641 ../urpmi:727 msgid "Nn" msgstr "Nn" @@ -1018,12 +1014,12 @@ msgstr "Nn" # can hit those keys in their keyboard to reply. # please keep the 'Yy' for compatibility reasons #. Translator: Add here the keys which might be pressed in the "Yes"-case. -#: ../urpm/msg.pm:47 ../urpme:35 ../urpmi:440 ../urpmi:458 ../urpmi:496 -#: ../urpmi:546 ../urpmi:629 ../urpmi:710 +#: ../urpm/msg.pm:47 ../urpme:34 ../urpmi:453 ../urpmi:471 ../urpmi:509 +#: ../urpmi:559 ../urpmi:642 ../urpmi:728 msgid "Yy" msgstr "Yy" -#: ../urpm/msg.pm:85 +#: ../urpm/msg.pm:92 msgid "Sorry, bad choice, try again\n" msgstr "Dewis gwael, ceisiwch eto\n" @@ -1071,7 +1067,7 @@ msgid "Installation failed on node %s" msgstr "Methodd y gosod" #. - Warning : the following message is parsed in urpm::parallel_* -#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:778 +#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:796 msgid "Installation is possible" msgstr "Gosod yn bosibl" @@ -1127,15 +1123,11 @@ msgstr "gosod %s o %s" msgid "Preparing install on %s..." msgstr "Gosod y pecyn..." -#: ../urpme:31 -msgid "Is this OK?" -msgstr "Mae'r model yn gywir" - -#: ../urpme:38 -#, c-format +#: ../urpme:37 +#, fuzzy, c-format msgid "" "urpme version %s\n" -"Copyright (C) 1999-2005 Mandriva.\n" +"Copyright (C) 1999-2006 Mandriva.\n" "This is free software and may be redistributed under the terms of the GNU " "GPL.\n" "\n" @@ -1147,50 +1139,56 @@ msgstr "" "\n" "defnydd:\n" -#: ../urpme:43 ../urpmf:34 ../urpmi:80 ../urpmi.addmedia:44 -#: ../urpmi.removemedia:50 ../urpmi.update:31 ../urpmq:44 +#: ../urpme:42 ../urpmf:34 ../urpmi:80 ../urpmi.addmedia:44 +#: ../urpmi.recover:31 ../urpmi.removemedia:54 ../urpmi.update:31 ../urpmq:44 msgid " --help - print this help message.\n" msgstr " --help - argraffu neges cymorth.\n" -#: ../urpme:44 +#: ../urpme:43 msgid " --auto - automatically select a package in choices.\n" msgstr " --auto - dewis pecyn ynn awtomatig o fewn dewisiadau.\n" -#: ../urpme:45 +#: ../urpme:44 msgid " --test - verify if the removal can be achieved correctly.\n" msgstr " --test - gwirio os oes modd tynnu'n iawn.\n" -#: ../urpme:46 ../urpmi:102 ../urpmq:63 +#: ../urpme:45 ../urpmi:102 ../urpmq:63 msgid "" " --force - force invocation even if some packages do not exist.\n" msgstr "" " --force - gorfodi galwad hyd yn oed os na yw rhai pecynnau'n " "bodoli.\n" -#: ../urpme:47 ../urpmi:107 ../urpmq:64 +#: ../urpme:46 ../urpmi:107 ../urpmq:65 msgid " --parallel - distributed urpmi across machines of alias.\n" msgstr "" " --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n" +#: ../urpme:47 ../urpmi:134 +#, fuzzy +msgid " --repackage - Re-package the files before erasing\n" +msgstr " --packager - argraffu pencynydd tag: pencynydd.\n" + #: ../urpme:48 msgid " --root - use another root for rpm removal.\n" msgstr " --root - defnyddio root arall ar gyfer tynnu rpm.\n" -#: ../urpme:49 ../urpmi:132 +#: ../urpme:49 #, fuzzy -msgid " --noscripts - do not execute package scriptlet(s)\n" +msgid " --noscripts - do not execute package scriptlet(s).\n" msgstr " --summary - argraffu disgrifiad tag: disgrifiad.\n" #: ../urpme:50 +#, fuzzy msgid "" -" --use-distrib - configure urpmi on the fly from a distrib tree, useful\n" +" --use-distrib - configure urpme on the fly from a distrib tree, useful\n" " to (un)install a chroot with --root option.\n" msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n" " wrth (ddad)osod chroot gyda dewis o --root.\n" -#: ../urpme:52 ../urpmi:143 ../urpmi.addmedia:70 ../urpmi.removemedia:55 -#: ../urpmi.update:49 ../urpmq:90 +#: ../urpme:52 ../urpmi:145 ../urpmi.addmedia:70 ../urpmi.removemedia:59 +#: ../urpmi.update:49 ../urpmq:91 msgid " -v - verbose mode.\n" msgstr " --verbose - modd llafar.\n" @@ -1198,47 +1196,52 @@ msgstr " --verbose - modd llafar.\n" msgid " -a - select all packages matching expression.\n" msgstr " -a - select all packages matching expression.\n" -#: ../urpme:69 +#: ../urpme:70 msgid "Only superuser is allowed to remove packages" msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau" -#: ../urpme:91 +#: ../urpme:96 msgid "unknown package" msgstr "pecyn anhysbys" #. - Warning : the following message is parsed in urpm::parallel_* -#: ../urpme:91 +#: ../urpme:96 msgid "unknown packages" msgstr "pecynnau anhysbys" #. - Warning : the following message is parsed in urpm::parallel_* -#: ../urpme:103 ../urpmi:475 +#: ../urpme:108 ../urpmi:488 #, c-format msgid "removing package %s will break your system" msgstr "bydd tynnu pecynnau %s yn torri'r system" -#: ../urpme:106 +#: ../urpme:111 msgid "Nothing to remove" msgstr "Dim i'w dynnu" #. - Warning : the following message is parsed in urpm::parallel_* -#: ../urpme:111 +#: ../urpme:116 msgid "Checking to remove the following packages" msgstr "Ticio i ddileu'r pecynnau canlynol" -#: ../urpme:118 +#: ../urpme:123 #, 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:120 ../urpmi:497 ../urpmi:630 +#: ../urpme:125 ../urpmi:510 ../urpmi:643 msgid " (y/N) " msgstr " (y/N) " +#: ../urpme:125 +#, fuzzy, c-format +msgid "Remove %d packages?" +msgstr "tynnu pecyn %s." + #. - Warning : the following message is parsed in urpm::parallel_* -#: ../urpme:142 +#: ../urpme:149 msgid "Removal failed" msgstr "Methodd y tynnu" @@ -1246,7 +1249,7 @@ msgstr "Methodd y tynnu" #, fuzzy, c-format msgid "" "urpmf version %s\n" -"Copyright (C) 2002-2005 Mandriva.\n" +"Copyright (C) 2002-2006 Mandriva.\n" "This is free software and may be redistributed under the terms of the GNU " "GPL.\n" "\n" @@ -1263,7 +1266,7 @@ msgstr "" msgid " --version - print this tool's version number.\n" msgstr " --help - argraffu neges cymorth.\n" -#: ../urpmf:36 ../urpmi:125 ../urpmq:73 +#: ../urpmf:36 ../urpmi:125 ../urpmq:74 msgid " --env - use specific environment (typically a bug report).\n" msgstr "" " --env - defnyddio amgylchedd penodol (adroddiad gwall fel " @@ -1471,7 +1474,7 @@ msgstr " --verbose - modd llafar.\n" msgid " -m - the media in which the package was found\n" msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n" -#: ../urpmf:79 ../urpmq:79 +#: ../urpmf:79 ../urpmq:80 msgid " -f - print version, release and arch with name.\n" msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n" @@ -1479,7 +1482,7 @@ msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n" msgid "Incorrect format: you may use only one multi-valued tag" msgstr "" -#: ../urpmf:173 ../urpmi:228 ../urpmq:125 +#: ../urpmf:173 ../urpmi:231 ../urpmq:126 #, c-format msgid "using specific environment on %s\n" msgstr "ddefnyddio amgylchedd penodol ar %s\n" @@ -1497,10 +1500,10 @@ msgid "You may want to use --name to search for package names.\n" msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n" #: ../urpmi:75 -#, c-format +#, fuzzy, c-format msgid "" "urpmi version %s\n" -"Copyright (C) 1999-2005 Mandriva.\n" +"Copyright (C) 1999-2006 Mandriva.\n" "This is free software and may be redistributed under the terms of the GNU " "GPL.\n" "\n" @@ -1619,11 +1622,11 @@ msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n" " wrth osod chroot gyda dewis o --root.\n" -#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:67 +#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:68 msgid " --wget - use wget to retrieve distant files.\n" msgstr " --wget - defnyddio wget i estyn ffeiliau pell.\n" -#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:68 +#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:69 msgid " --curl - use curl to retrieve distant files.\n" msgstr " --curl - defnyddio curl i estyn ffeiliau pell.\n" @@ -1651,7 +1654,7 @@ msgstr "" " --verify-rpm - gwirio llofnod rpm cyn gosod\n" " (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n" -#: ../urpmi:119 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:69 +#: ../urpmi:119 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:70 msgid "" " --proxy - use specified HTTP proxy, the port number is assumed\n" " to be 1080 by default (format is ).\n" @@ -1659,7 +1662,7 @@ msgstr "" " --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n" " rhagosodiad yw 1080 (fformat yw ).\n" -#: ../urpmi:121 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:71 +#: ../urpmi:121 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:72 msgid "" " --proxy-user - specify user and password to use for proxy\n" " authentication (format is ).\n" @@ -1704,11 +1707,21 @@ msgstr " --excludedocs - eithrio ffeiliau docs.\n" msgid " --ignoresize - don't verify disk space before installation.\n" msgstr " --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n" +#: ../urpmi:132 +#, fuzzy +msgid " --ignorearch - allow to install rpms for unmatched architectures.\n" +msgstr " --url - argraffu tag url: url.\n" + #: ../urpmi:133 +#, fuzzy +msgid " --noscripts - do not execute package scriptlet(s)\n" +msgstr " --summary - argraffu disgrifiad tag: disgrifiad.\n" + +#: ../urpmi:135 msgid " --skip - packages which installation should be skipped\n" msgstr " --skip - pecynnau dylid osgoi eu gosod.\n" -#: ../urpmi:134 +#: ../urpmi:136 msgid "" " --more-choices - when several packages are found, propose more choices\n" " than the default.\n" @@ -1717,52 +1730,52 @@ msgstr "" "ddewis\n" " na'r rhagosodiad.\n" -#: ../urpmi:136 ../urpmi.addmedia:64 ../urpmi.update:42 +#: ../urpmi:138 ../urpmi.addmedia:64 ../urpmi.update:42 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:137 +#: ../urpmi:139 #, fuzzy msgid " --nolock - don't lock rpm db.\n" msgstr " --noclean - peidio glanhau rpm o'r storfa.\n" -#: ../urpmi:138 +#: ../urpmi:140 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:139 ../urpmq:76 +#: ../urpmi:141 ../urpmq:77 msgid " -a - select all matches on command line.\n" msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n" -#: ../urpmi:140 +#: ../urpmi:142 msgid " -p - allow search in provides to find package.\n" msgstr " -p - caniatáu i chwilio canfod pecyn.\n" -#: ../urpmi:141 +#: ../urpmi:143 msgid " -P - do not search in provides to find package.\n" msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n" -#: ../urpmi:142 ../urpmi.addmedia:69 ../urpmi.removemedia:54 +#: ../urpmi:144 ../urpmi.addmedia:69 ../urpmi.removemedia:58 #: ../urpmi.update:48 msgid " -q - quiet mode.\n" msgstr " -q - modd distaw.\n" -#: ../urpmi:144 +#: ../urpmi:146 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:195 +#: ../urpmi:197 #, fuzzy msgid "You can't install binary rpm files when using --install-src" msgstr "" "Beth mae modd gwneud gyda ffeiliau deuaidd wrth ddefnyddio --install-src" -#: ../urpmi:218 +#: ../urpmi:220 #, c-format msgid "" "Directory [%s] already exists, please use another directory for bug report " @@ -1771,15 +1784,20 @@ msgstr "" "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am " "adroddiad gwall neu ei ddileu." -#: ../urpmi:219 +#: ../urpmi:221 #, c-format msgid "Unable to create directory [%s] for bug report" msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall" -#: ../urpmi:222 ../urpmi:369 +#: ../urpmi:224 ../urpmi:380 msgid "Copying failed" msgstr "Methodd y copïo" +#: ../urpmi:230 +#, c-format +msgid "Environment directory %s does not exist" +msgstr "" + #: ../urpmi:248 #, c-format msgid "" @@ -1790,16 +1808,16 @@ msgstr "" "Defnydd --allow-force gorfodaeth i orfodi gweithred." #. - For translators : there are several media here -#: ../urpmi:321 +#: ../urpmi:332 msgid "Updating media..." msgstr "" -#: ../urpmi:404 +#: ../urpmi:417 #, c-format msgid "What is your choice? (1-%d) " msgstr "Beth yw eich dewis? (1-%d)" -#: ../urpmi:434 +#: ../urpmi:447 #, c-format msgid "" "The following packages can't be installed because they depend on packages\n" @@ -1810,18 +1828,18 @@ msgstr "" "sy'n hyn na'r rhai sydd wedi eu gosod:\n" "%s" -#: ../urpmi:442 ../urpmi:460 +#: ../urpmi:455 ../urpmi:473 #, fuzzy msgid "" "\n" "Continue installation anyway?" msgstr "Parhau beth bynnag?" -#: ../urpmi:442 ../urpmi:460 ../urpmi:547 +#: ../urpmi:455 ../urpmi:473 ../urpmi:560 msgid " (Y/n) " msgstr " (Y/n) " -#: ../urpmi:453 +#: ../urpmi:466 #, c-format msgid "" "Some requested packages cannot be installed:\n" @@ -1830,7 +1848,7 @@ msgstr "" "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n" "%s" -#: ../urpmi:483 +#: ../urpmi:496 #, c-format msgid "" "The installation cannot continue because the following packages\n" @@ -1841,7 +1859,7 @@ msgstr "" "gael eu tynnu i eraill gael eu diweddaru.\n" "%s\n" -#: ../urpmi:488 +#: ../urpmi:501 #, c-format msgid "" "The following packages have to be removed for others to be upgraded:\n" @@ -1850,11 +1868,11 @@ msgstr "" "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n" "%s" -#: ../urpmi:490 +#: ../urpmi:503 msgid "(test only, removal will not be actually done)" msgstr "" -#: ../urpmi:526 ../urpmi:538 +#: ../urpmi:539 ../urpmi:551 #, fuzzy msgid "" "To satisfy dependencies, the following packages are going to be installed" @@ -1862,18 +1880,18 @@ msgstr "" "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n" "%s\n" -#: ../urpmi:527 ../urpmi:539 +#: ../urpmi:540 ../urpmi:552 #, fuzzy msgid "To satisfy dependencies, the following package is going to be installed" msgstr "" "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod (%d MB)" -#: ../urpmi:528 +#: ../urpmi:541 #, c-format msgid "(%d packages, %d MB)" msgstr "" -#: ../urpmi:534 +#: ../urpmi:547 #, c-format msgid "" "You need to be root to install the following dependencies:\n" @@ -1882,71 +1900,71 @@ msgstr "" "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n" "%s\n" -#: ../urpmi:541 +#: ../urpmi:554 msgid "(test only, installation will not be actually done)" msgstr "" -#: ../urpmi:543 +#: ../urpmi:556 #, c-format msgid "Proceed with the installation of the %d packages? (%d MB)" msgstr "" -#: ../urpmi:567 +#: ../urpmi:580 msgid "Press Enter when ready..." msgstr "Pwyso Enter pan yn barod..." -#: ../urpmi:573 +#: ../urpmi:586 msgid "Cancel" msgstr "Dileu" -#: ../urpmi:573 +#: ../urpmi:586 msgid "Ok" msgstr "Iawn" -#: ../urpmi:620 +#: ../urpmi:633 msgid "The following packages have bad signatures" msgstr "Mae gan y pecynnau canlynol lofnod gwallus" -#: ../urpmi:621 +#: ../urpmi:634 msgid "Do you want to continue installation ?" msgstr "Ydych chi am barhau gosod?" -#: ../urpmi:666 +#: ../urpmi:682 #, c-format msgid "distributing %s" msgstr "dosbarthu %s" #. - there's a common prefix, simplify message -#: ../urpmi:677 +#: ../urpmi:693 #, c-format msgid "installing %s from %s" msgstr "gosod %s o %s" -#: ../urpmi:679 +#: ../urpmi:695 #, c-format msgid "installing %s" msgstr "gosod %s" -#: ../urpmi:711 +#: ../urpmi:729 msgid "Try installation without checking dependencies? (y/N) " msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)" -#: ../urpmi:729 +#: ../urpmi:747 #, fuzzy msgid "Try harder to install (--force)? (y/N) " msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)" -#: ../urpmi:769 +#: ../urpmi:787 #, c-format msgid "%d installation transactions failed" msgstr "methodd trosglwyddiad gosod %d" -#: ../urpmi:785 +#: ../urpmi:803 #, fuzzy, c-format msgid "The following package names were assumed: %s" msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:" -#: ../urpmi:802 +#: ../urpmi:820 msgid "restarting urpmi" msgstr "ailgychwyn urpmi" @@ -2037,7 +2055,7 @@ msgid " --raw - add the media in config, but don't update it.\n" msgstr "" " --raw - ychwnaegu cyfrwng yn config, ond nid yn ei ddiweddaru.\n" -#: ../urpmi.addmedia:67 ../urpmi.removemedia:52 ../urpmi.update:46 +#: ../urpmi.addmedia:67 ../urpmi.removemedia:56 ../urpmi.update:46 msgid " -c - clean headers cache directory.\n" msgstr " -c - glanhau penawdau yng nghyfeiriadur y storfa.\n" @@ -2081,7 +2099,116 @@ msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n" msgid "unable to create medium \"%s\"\n" msgstr "methu creu cyfrwng \"%s\"\n" -#: ../urpmi.removemedia:48 +#: ../urpmi.recover:26 +#, fuzzy, c-format +msgid "" +"urpmi.recover version %s\n" +"Copyright (C) 2006 Mandriva.\n" +"This is free software and may be redistributed under the terms of the GNU " +"GPL.\n" +"\n" +"usage:\n" +msgstr "" +"urpmf fersiwn %s\n" +"Hawlfraint © 1999 - 2004 Mandriva.\n" +"Meddalwedd rhydd yw hwn a gall gael ei ddosbarthu o dan delerau GPL GNU..\n" +"\n" +"defnydd:\n" + +#: ../urpmi.recover:32 +msgid " --checkpoint - set repackaging start now\n" +msgstr "" + +#: ../urpmi.recover:33 +#, fuzzy +msgid " --noclean - don't clean repackage directory on checkpoint\n" +msgstr " --noclean - peidio glanhau rpm o'r storfa.\n" + +#: ../urpmi.recover:34 +msgid "" +" --list - list transactions since provided date/duration argument\n" +msgstr "" + +#: ../urpmi.recover:35 +#, fuzzy +msgid " --list-all - list all transactions in rpmdb (long)\n" +msgstr " --list-url - rhestru'r holl gyfrwng ar gael.\n" + +#: ../urpmi.recover:36 +msgid "" +" --rollback - rollback until specified date,\n" +" or rollback the specified number of transactions\n" +msgstr "" + +#: ../urpmi.recover:52 +#, c-format +msgid "Invalid date or duration [%s]\n" +msgstr "" + +#: ../urpmi.recover:62 +#, c-format +msgid "Spurious command-line arguments [%s]\n" +msgstr "" + +#: ../urpmi.recover:64 +msgid "You can't specify --checkpoint and --rollback at the same time\n" +msgstr "" + +#: ../urpmi.recover:66 +msgid "You can't specify --checkpoint and --list at the same time\n" +msgstr "" + +#: ../urpmi.recover:68 +msgid "You can't specify --rollback and --list at the same time\n" +msgstr "" + +#: ../urpmi.recover:90 +#, c-format +msgid "No transaction found since %s\n" +msgstr "" + +#. - check we're running as root +#: ../urpmi.recover:105 +msgid "You must be superuser to do this" +msgstr "" + +#: ../urpmi.recover:114 +#, fuzzy +msgid "Repackage directory not defined\n" +msgstr "heb ganfod pecyn %s" + +#: ../urpmi.recover:117 +#, c-format +msgid "Can't write to repackage directory [%s]\n" +msgstr "" + +#: ../urpmi.recover:122 +#, c-format +msgid "Cleaning up repackage directory [%s]...\n" +msgstr "" + +#: ../urpmi.recover:124 +#, c-format +msgid "%d files removed\n" +msgstr "" + +#. - write rpm config file +#: ../urpmi.recover:128 +#, fuzzy, c-format +msgid "Writing rpm macros file [%s]...\n" +msgstr "adfer ffeil rpm (%s)..." + +#: ../urpmi.recover:170 +#, fuzzy +msgid "No rollback date found\n" +msgstr "Heb ganfod filelist\n" + +#: ../urpmi.recover:173 +#, c-format +msgid "Rollback until %s...\n" +msgstr "" + +#: ../urpmi.removemedia:52 msgid "" "usage: urpmi.removemedia [-a] ...\n" "where is a medium name to remove.\n" @@ -2089,15 +2216,15 @@ msgstr "" "usage: urpmi.removemedia [-a] ...\n" "lle mai yw'r enw cyfrwng i'w dynnu.\n" -#: ../urpmi.removemedia:51 +#: ../urpmi.removemedia:55 msgid " -a - select all media.\n" msgstr " -a - dewis pob cyfrwng.\n" -#: ../urpmi.removemedia:53 +#: ../urpmi.removemedia:57 msgid " -y - fuzzy match on media names.\n" msgstr " -y - cydweddiad bras enwau cyfryngau\n" -#: ../urpmi.removemedia:56 +#: ../urpmi.removemedia:60 #, c-format msgid "" "\n" @@ -2106,15 +2233,15 @@ msgstr "" "\n" "dewisiadau anhysbys '%s'\n" -#: ../urpmi.removemedia:65 +#: ../urpmi.removemedia:70 msgid "Only superuser is allowed to remove media" msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu cyfrwng" -#: ../urpmi.removemedia:76 +#: ../urpmi.removemedia:81 msgid "nothing to remove (use urpmi.addmedia to add a media)\n" msgstr "dim i'w dynnu (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n" -#: ../urpmi.removemedia:78 +#: ../urpmi.removemedia:83 #, c-format msgid "" "the entry to remove is missing\n" @@ -2186,10 +2313,10 @@ msgid "ignoring media %s" msgstr "anwybyddu cyfrwng %s" #: ../urpmq:39 -#, c-format +#, fuzzy, c-format msgid "" "urpmq version %s\n" -"Copyright (C) 2000-2005 Mandriva.\n" +"Copyright (C) 2000-2006 Mandriva.\n" "This is free software and may be redistributed under the terms of the GNU " "GPL.\n" "\n" @@ -2252,7 +2379,12 @@ msgid "" msgstr "" " --sources - give all source packages before downloading (root only).\n" -#: ../urpmq:65 +#: ../urpmq:64 +#, fuzzy +msgid " --ignorearch - allow to query rpms for unmatched architectures.\n" +msgstr " --url - argraffu tag url: url.\n" + +#: ../urpmq:66 msgid "" " --use-distrib - configure urpmi on the fly from a distrib tree.\n" " This permit to querying a distro.\n" @@ -2260,67 +2392,67 @@ msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib.\n" " Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n" -#: ../urpmq:74 +#: ../urpmq:75 msgid " --changelog - print changelog.\n" msgstr " --changelog - cofnod argraffu.\n" -#: ../urpmq:75 +#: ../urpmq:76 msgid " --summary, -S - print summary.\n" msgstr " --summary, -S - crynodeb argraffu.\n" -#: ../urpmq:77 +#: ../urpmq:78 msgid " -c - complete output with package to be removed.\n" msgstr " -c - allbwn cyfan a phecyn i'w dynnu\n" -#: ../urpmq:78 +#: ../urpmq:79 msgid " -d - extend query to package dependencies.\n" msgstr " -d - ymestyn ymholiad i ddibyniaethau pecynnau.\n" -#: ../urpmq:80 +#: ../urpmq:81 msgid " -g - print groups with name also.\n" msgstr " -g - argraffu grwpiau gydag enw hefyd.\n" -#: ../urpmq:81 +#: ../urpmq:82 msgid " -i - print useful information in human readable form.\n" msgstr "" " -i - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy " "i bobl.\n" -#: ../urpmq:82 +#: ../urpmq:83 msgid " -l - list files in package.\n" msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n" -#: ../urpmq:83 +#: ../urpmq:84 msgid "" " -P - do not search in provides to find package (default).\n" msgstr "" " -P - peidio chwilio yn provides i ganfod pecyn " "(rhagosodedig).\n" -#: ../urpmq:84 +#: ../urpmq:85 msgid " -p - search in provides to find package.\n" msgstr " -p - caniatáu i chwilio canfod pecyn.\n" -#: ../urpmq:85 +#: ../urpmq:86 msgid " -r - print version and release with name also.\n" msgstr " -r - argraffu fersiwn a rhyddhad gydag enw hefyd.\n" -#: ../urpmq:86 +#: ../urpmq:87 msgid " -R - reverse search to what requires package.\n" msgstr " -R - chwilio nôl i'r hyn sydd angen ar becyn.\n" -#: ../urpmq:87 +#: ../urpmq:88 msgid "" " -RR - extended reverse search (includes virtual packages).\n" msgstr "" " -RR - chwilio nôl estyndig (yn cynnwys rhith becynnau) \n" -#: ../urpmq:88 +#: ../urpmq:89 msgid " -s - next package is a source package (same as --src).\n" msgstr "" " --s - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n" -#: ../urpmq:89 +#: ../urpmq:90 msgid "" " -u - remove package if a more recent version is already " "installed.\n" @@ -2328,39 +2460,45 @@ msgstr "" " -u - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei " "osod.\n" -#: ../urpmq:91 +#: ../urpmq:92 msgid " -y - impose fuzzy search (same as --fuzzy).\n" msgstr " -y - gosod chwilio fuzzy (fel --fuzzy).\n" -#: ../urpmq:92 +#: ../urpmq:93 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:93 +#: ../urpmq:94 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:166 +#: ../urpmq:170 msgid "--list-nodes can only be used with --parallel" msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes" -#: ../urpmq:323 +#: ../urpmq:327 #, c-format msgid "skipping media %s: no hdlist" msgstr "hepgor cyfrwng %s: dim hdliist" -#: ../urpmq:397 +#: ../urpmq:401 msgid "No filelist found\n" msgstr "Heb ganfod filelist\n" -#: ../urpmq:409 +#: ../urpmq:413 msgid "No changelog found\n" msgstr "Heb ganfod changelog\n" +#~ msgid "Search" +#~ msgstr "Chwilio" + +#~ msgid "Is this OK?" +#~ msgstr "Mae'r model yn gywir" + #~ msgid "" #~ " --version - use specified distribution version, the default is " #~ "taken\n" -- cgit v1.2.1