diff options
Diffstat (limited to 'po/cy.po')
-rw-r--r-- | po/cy.po | 926 |
1 files changed, 481 insertions, 445 deletions
@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: urpmi 3.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-16 22:47+0800\n" +"POT-Creation-Date: 2005-12-04 13:39+0800\n" "PO-Revision-Date: 2005-06-28 21:39-0000\n" "Last-Translator: Rhoslyn Prys <post@meddal.com>\n" "Language-Team: Cymraeg/Welsh <post@meddal.com>\n" @@ -18,42 +18,20 @@ msgstr "" "X-Poedit-Language: Welsh\n" "X-Poedit-Country: UK\n" -# This is a list of chars acceptable as a 'yes' answer to a Yes/No question; -# you can put here the letters for 'yes' for your language, so people -# can hit those keys in their keyboard to reply. -# please keep the 'Yy' for compatibility reasons -#. This is a list of chars acceptable as a 'yes' answer to a Yes/No question; -#. you can put here the letters for 'yes' for your language, so people -#. can hit those keys in their keyboard to reply. -#. please keep the 'Yy' for compatibility reasons -#. -#: placeholder.h:11 -msgid "Yy" -msgstr "Yy" - -#. This is a list of chars acceptable as a 'no' answer to a Yes/No question; -#. you can put here the letters for 'no' for your language, so people -#. can hit those keys in their keyboard to reply. -#. please keep the 'Nn' for compatibility reasons -#. -#: placeholder.h:17 -msgid "Nn" -msgstr "Nn" - -#: ../gurpmi:29 ../gurpmi2:55 +#: ../gurpmi:30 ../gurpmi2:56 msgid "RPM installation" msgstr "Gosodiad RPM" -#: ../gurpmi:42 +#: ../gurpmi:43 #, c-format msgid "Error: unable to find file %s, will cancel operation" msgstr "" -#: ../gurpmi:43 ../gurpmi2:122 ../gurpmi2:145 +#: ../gurpmi:44 ../gurpmi2:123 ../gurpmi2:146 msgid "_Ok" msgstr "_Iawn" -#: ../gurpmi:57 +#: ../gurpmi:58 #, c-format msgid "" "You have selected a source package:\n" @@ -75,7 +53,7 @@ msgstr "" "\n" "Beth hoffech chi ei wneud?" -#: ../gurpmi:65 ../gurpmi:76 +#: ../gurpmi:66 ../gurpmi:77 #, c-format msgid "" "You are about to install the following software packages on your computer:\n" @@ -90,7 +68,7 @@ msgstr "" "\n" "Parhau?" -#: ../gurpmi:71 +#: ../gurpmi:72 #, c-format msgid "" "You are about to install the following software package on your computer:\n" @@ -106,40 +84,40 @@ msgstr "" "Efallai byddai'n well gennych ei gadw. Beth yw eich dewis?" #. - buttons -#: ../gurpmi:86 +#: ../gurpmi:87 msgid "_Install" msgstr "_Gosod" -#: ../gurpmi:87 +#: ../gurpmi:88 msgid "_Save" msgstr "_Cadw" -#: ../gurpmi:88 ../gurpmi2:122 +#: ../gurpmi:89 ../gurpmi2:123 msgid "_Cancel" msgstr "_Dileu" -#: ../gurpmi:98 +#: ../gurpmi:99 msgid "Choose location to save file" msgstr "Dewiswch leoliad i gadw'r ffeil" -#: ../gurpmi.pm:62 +#: ../gurpmi.pm:65 #, c-format msgid "Unknown option %s" msgstr "Dewis anhysbys %s" -#: ../gurpmi.pm:70 +#: ../gurpmi.pm:73 msgid "No packages specified" msgstr "Heb enwi pecyn" -#: ../gurpmi2:36 +#: ../gurpmi2:37 msgid "Please wait..." msgstr "Arhoswch..." -#: ../gurpmi2:45 +#: ../gurpmi2:46 msgid "Must be root" msgstr "Rhaid bod yn root" -#: ../gurpmi2:78 +#: ../gurpmi2:79 #, fuzzy, c-format msgid "" "Some requested packages cannot be installed:\n" @@ -150,27 +128,27 @@ msgstr "" "%s\n" "Parhau?" -#: ../gurpmi2:118 +#: ../gurpmi2:119 msgid " (to upgrade)" msgstr "(uwchraddio)" -#: ../gurpmi2:119 +#: ../gurpmi2:120 msgid " (to install)" msgstr "(gosod)" -#: ../gurpmi2:122 +#: ../gurpmi2:123 msgid "Package choice" msgstr "Dewis pecyn" -#: ../gurpmi2:123 ../urpmi:366 +#: ../gurpmi2:124 ../urpmi:372 msgid "One of the following packages is needed:" msgstr "Mae angen un o'r pecynnau canlynol:" -#: ../gurpmi2:146 +#: ../gurpmi2:147 msgid "_Abort" msgstr "_Atal" -#: ../gurpmi2:166 +#: ../gurpmi2:167 #, fuzzy, c-format msgid "" "The following packages have to be removed for others to be upgraded:\n" @@ -181,7 +159,7 @@ msgstr "" "%s\n" "Parhau?" -#: ../gurpmi2:180 +#: ../gurpmi2:181 #, c-format msgid "" "To satisfy dependencies, the following %d packages are going to be " @@ -191,25 +169,25 @@ msgstr "" "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n" "%s\n" -#: ../gurpmi2:187 +#: ../gurpmi2:188 msgid "Package installation..." msgstr "Gosod y pecyn..." -#: ../gurpmi2:189 ../urpmi:513 ../urpmq:308 +#: ../gurpmi2:190 ../urpmi:520 ../urpmq:309 msgid "unable to get source packages, aborting" msgstr "methu estyn pecynnau ffynhonnell, atal" -#: ../gurpmi2:203 ../urpmi:524 +#: ../gurpmi2:204 ../urpmi:531 #, c-format msgid "Please insert the medium named \"%s\" on device [%s]" msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]" -#: ../gurpmi2:232 +#: ../gurpmi2:233 #, c-format msgid "Downloading package `%s'..." msgstr "Llwytho pecynnau i lawr ' %s'..." -#: ../gurpmi2:247 +#: ../gurpmi2:248 #, c-format msgid "" "The following packages have bad signatures:\n" @@ -222,7 +200,8 @@ msgstr "" "\n" "Hoffech chi barhau gyda'r gosod?" -#: ../gurpmi2:254 ../gurpmi2:303 ../urpmi:595 ../urpmi:713 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../gurpmi2:255 ../gurpmi2:304 ../urpmi:603 ../urpmi:726 #, c-format msgid "" "Installation failed, some files are missing:\n" @@ -233,33 +212,35 @@ msgstr "" "%s\n" "Hoffech chi ddiweddaru eich cronfa ddata urpmi?" -#: ../gurpmi2:261 ../urpme:118 ../urpmi:638 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../gurpmi2:262 ../urpme:123 ../urpmi:647 #, c-format msgid "removing %s" msgstr "tynnu %s" -#: ../gurpmi2:269 ../urpm.pm:2903 +#: ../gurpmi2:270 ../urpm.pm:2913 msgid "Preparing..." msgstr "Paratoi..." -#: ../gurpmi2:271 +#: ../gurpmi2:272 #, c-format msgid "Installing package `%s' (%s/%s)..." msgstr "Gosod pecyn `%s' (%s/%s)..." -#: ../gurpmi2:289 ../urpmi:605 ../urpmi:658 ../urpmi:676 ../urpmi:692 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../gurpmi2:290 ../urpmi:614 ../urpmi:668 ../urpmi:687 ../urpmi:704 msgid "Installation failed" msgstr "Methodd y gosod" -#: ../gurpmi2:298 +#: ../gurpmi2:299 msgid "_Done" msgstr "_Gorffen" -#: ../gurpmi2:306 ../urpmi:729 +#: ../gurpmi2:307 ../urpmi:743 msgid "The package(s) are already installed" msgstr "Popeth wedi eu gosod eisoes" -#: ../gurpmi2:308 +#: ../gurpmi2:309 msgid "Installation finished" msgstr "Cwblhawyd y gosod" @@ -290,59 +271,59 @@ msgid " defaults is %s.\n" msgstr " rhagosodedig yw %s.\n" #. - need to be root if binary rpms are to be installed -#: ../rurpmi:8 ../urpmi:229 +#: ../rurpmi:11 ../urpmi:235 msgid "Only superuser is allowed to install packages" msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau" -#: ../rurpmi:15 +#: ../rurpmi:18 msgid "Running urpmi in restricted mode..." msgstr "" -#: ../urpm.pm:70 +#: ../urpm.pm:68 #, c-format msgid "unknown protocol defined for %s" msgstr "protocol anhysbys ar gyfer %s" -#: ../urpm.pm:103 +#: ../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:119 +#: ../urpm.pm:120 #, c-format msgid "unable to handle protocol: %s" msgstr "methu trin protocol: %s" -#: ../urpm.pm:210 +#: ../urpm.pm:215 #, 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:211 +#: ../urpm.pm:216 #, 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:224 ../urpm.pm:1314 ../urpm.pm:1324 +#: ../urpm.pm:229 ../urpm.pm:1322 ../urpm.pm:1332 #, 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:227 ../urpm.pm:2509 +#: ../urpm.pm:232 ../urpm.pm:2519 #, c-format msgid "unable to access list file of \"%s\", medium ignored" msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng" -#: ../urpm.pm:255 +#: ../urpm.pm:260 #, fuzzy, c-format msgid "trying to override existing medium \"%s\", skipping" msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", osgoi" -#: ../urpm.pm:266 +#: ../urpm.pm:271 #, c-format msgid "" "virtual medium \"%s\" should not have defined hdlist or list file, medium " @@ -351,103 +332,103 @@ msgstr "" "dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y " "cyfrwng" -#: ../urpm.pm:271 +#: ../urpm.pm:276 #, 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:280 +#: ../urpm.pm:285 #, c-format msgid "unable to find hdlist file for \"%s\", medium ignored" msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu" -#: ../urpm.pm:287 +#: ../urpm.pm:292 #, c-format msgid "unable to find list file for \"%s\", medium ignored" msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu" -#: ../urpm.pm:311 +#: ../urpm.pm:316 #, c-format msgid "inconsistent list file for \"%s\", medium ignored" msgstr "rhestr ffeil annealladwy \"%s\", cyfrwng wedi ei anwybyddu" -#: ../urpm.pm:321 +#: ../urpm.pm:326 #, 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:361 +#: ../urpm.pm:366 #, c-format msgid "too many mount points for removable medium \"%s\"" msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\"" -#: ../urpm.pm:362 +#: ../urpm.pm:367 #, c-format msgid "taking removable device as \"%s\"" msgstr "cymryd dyfais symudol fel \"%s\"" -#: ../urpm.pm:365 +#: ../urpm.pm:370 #, 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:368 +#: ../urpm.pm:373 #, c-format msgid "using different removable device [%s] for \"%s\"" msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\"" -#: ../urpm.pm:373 ../urpm.pm:376 +#: ../urpm.pm:378 ../urpm.pm:381 #, c-format msgid "unable to retrieve pathname for removable medium \"%s\"" msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\"" -#: ../urpm.pm:402 +#: ../urpm.pm:407 #, c-format msgid "unable to write config file [%s]" msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)" -#: ../urpm.pm:412 +#: ../urpm.pm:417 #, c-format msgid "wrote config file [%s]" msgstr "ysgrifennu ffeil ffurfweddu (%s)" -#: ../urpm.pm:440 +#: ../urpm.pm:445 msgid "Can't use parallel mode with use-distrib mode" msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib" -#: ../urpm.pm:450 +#: ../urpm.pm:455 #, c-format msgid "unable to parse \"%s\" in file [%s]" msgstr "methu didoli ffeil hdlist \"%s\" yn ffeil (%s)" -#: ../urpm.pm:462 +#: ../urpm.pm:467 #, c-format msgid "examining parallel handler in file [%s]" msgstr "archwilio trinydd paralel mewn ffeil [%s]" -#: ../urpm.pm:473 +#: ../urpm.pm:478 #, c-format msgid "found parallel handler for nodes: %s" msgstr "canfod trinydd paralel ar gyfer nodau: %s" -#: ../urpm.pm:477 +#: ../urpm.pm:482 #, c-format msgid "using associated media for parallel mode: %s" msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s" -#: ../urpm.pm:481 +#: ../urpm.pm:486 #, c-format msgid "unable to use parallel option \"%s\"" msgstr "methu defnyddio dewis paralel \"%s\"" -#: ../urpm.pm:489 +#: ../urpm.pm:494 #, 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:495 +#: ../urpm.pm:500 msgid "" "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --" "update or --parallel" @@ -464,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:556 ../urpm.pm:582 ../urpm.pm:1068 ../urpm.pm:1079 -#: ../urpm.pm:1151 ../urpm.pm:1168 ../urpm.pm:1238 ../urpm.pm:1297 -#: ../urpm.pm:1512 ../urpm.pm:1635 ../urpm.pm:1752 ../urpm.pm:1758 -#: ../urpm.pm:1861 ../urpm.pm:1946 ../urpm.pm:1950 +#: ../urpm.pm:564 ../urpm.pm:590 ../urpm.pm:1076 ../urpm.pm:1087 +#: ../urpm.pm:1159 ../urpm.pm:1176 ../urpm.pm:1246 ../urpm.pm:1305 +#: ../urpm.pm:1520 ../urpm.pm:1643 ../urpm.pm:1760 ../urpm.pm:1766 +#: ../urpm.pm:1869 ../urpm.pm:1955 ../urpm.pm:1959 #, c-format msgid "examining synthesis file [%s]" msgstr "archwilio ffeil synthesis [%s]" -#: ../urpm.pm:560 ../urpm.pm:575 ../urpm.pm:588 ../urpm.pm:1071 -#: ../urpm.pm:1082 ../urpm.pm:1157 ../urpm.pm:1163 ../urpm.pm:1243 -#: ../urpm.pm:1301 ../urpm.pm:1516 ../urpm.pm:1639 ../urpm.pm:1746 -#: ../urpm.pm:1764 ../urpm.pm:1956 +#: ../urpm.pm:568 ../urpm.pm:583 ../urpm.pm:596 ../urpm.pm:1079 +#: ../urpm.pm:1090 ../urpm.pm:1165 ../urpm.pm:1171 ../urpm.pm:1251 +#: ../urpm.pm:1309 ../urpm.pm:1524 ../urpm.pm:1647 ../urpm.pm:1754 +#: ../urpm.pm:1772 ../urpm.pm:1965 #, c-format msgid "examining hdlist file [%s]" msgstr "archwilio ffeil hdlist [%s]" -#: ../urpm.pm:570 ../urpm.pm:1075 +#: ../urpm.pm:578 ../urpm.pm:1083 #, 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:600 +#: ../urpm.pm:608 #, 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:605 ../urpm.pm:1089 ../urpm.pm:1176 ../urpm.pm:1247 -#: ../urpm.pm:1643 +#: ../urpm.pm:613 ../urpm.pm:1097 ../urpm.pm:1184 ../urpm.pm:1255 +#: ../urpm.pm:1651 #, c-format msgid "problem reading hdlist or synthesis file of medium \"%s\"" msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\"" -#: ../urpm.pm:612 ../urpm.pm:1899 +#: ../urpm.pm:620 ../urpm.pm:1907 msgid "performing second pass to compute dependencies\n" msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n" -#: ../urpm.pm:628 +#: ../urpm.pm:636 #, c-format msgid "skipping package %s" msgstr "hepgor pecyn %s" -#: ../urpm.pm:641 +#: ../urpm.pm:649 #, 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:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2566 -#: ../urpm.pm:2968 ../urpm.pm:3092 +#: ../urpm.pm:660 ../urpm.pm:2325 ../urpm.pm:2386 ../urpm.pm:2576 +#: ../urpm.pm:2978 ../urpm.pm:3102 msgid "unable to open rpmdb" msgstr "methu agor rpmdb" -#: ../urpm.pm:692 +#: ../urpm.pm:700 #, c-format msgid "medium \"%s\" already exists" msgstr "cyfrwng \"%s\" yn bodoli eisoes" -#: ../urpm.pm:699 +#: ../urpm.pm:707 msgid "virtual medium needs to be local" msgstr "rhaid i'r rhith gyfrwng fod yn lleol" -#: ../urpm.pm:724 +#: ../urpm.pm:732 #, c-format msgid "added medium %s" msgstr "ychwanegwyd cyfrwng %s" -#: ../urpm.pm:769 +#: ../urpm.pm:777 msgid "unable to access first installation medium" msgstr "methu cael mynediad i gyfrwng gosod cyntaf" -#: ../urpm.pm:773 +#: ../urpm.pm:781 msgid "copying hdlists file..." msgstr "copïo ffeil hdlists..." -#: ../urpm.pm:775 ../urpm.pm:1192 ../urpm.pm:1267 +#: ../urpm.pm:783 ../urpm.pm:1200 ../urpm.pm:1275 msgid "...copying done" msgstr "...cwblhau'r copïo" -#: ../urpm.pm:776 ../urpm.pm:1193 ../urpm.pm:1342 ../urpm.pm:1401 -#: ../urpm.pm:1581 ../urpm.pm:1588 +#: ../urpm.pm:784 ../urpm.pm:1201 ../urpm.pm:1350 ../urpm.pm:1409 +#: ../urpm.pm:1589 ../urpm.pm:1596 msgid "...copying failed" msgstr "...methodd y copïo" -#: ../urpm.pm:779 ../urpm.pm:804 ../urpm.pm:843 +#: ../urpm.pm:787 ../urpm.pm:812 ../urpm.pm:851 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:786 +#: ../urpm.pm:794 msgid "retrieving hdlists file..." msgstr "adfer ffeil hdlists..." -#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2835 +#: ../urpm.pm:806 ../urpm.pm:1633 ../urpm.pm:2125 ../urpm.pm:2845 msgid "...retrieving done" msgstr ".cwblhau adfer" -#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2837 +#: ../urpm.pm:808 ../urpm.pm:1617 ../urpm.pm:2129 ../urpm.pm:2847 #, c-format msgid "...retrieving failed: %s" msgstr "... methodd ail-lwytho: %s" -#: ../urpm.pm:824 +#: ../urpm.pm:832 #, c-format msgid "invalid hdlist description \"%s\" in hdlists file" msgstr "disgrifiad hdlist annilys \"%s\" yn rhestr ffeilio hdlists" -#: ../urpm.pm:880 +#: ../urpm.pm:888 #, 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:882 +#: ../urpm.pm:890 #, c-format msgid "selecting multiple media: %s" msgstr "dewis aml-gyfrwng: %s" -#: ../urpm.pm:898 +#: ../urpm.pm:906 #, c-format msgid "removing medium \"%s\"" msgstr "dewis cyfrwng \"%s\":" -#: ../urpm.pm:949 +#: ../urpm.pm:957 #, c-format msgid "reconfiguring urpmi for media \"%s\"" msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\"" -#: ../urpm.pm:978 +#: ../urpm.pm:986 msgid "...reconfiguration failed" msgstr "...methodd ail-ffurfweddu" -#: ../urpm.pm:985 +#: ../urpm.pm:993 msgid "reconfiguration done" msgstr "cwblhau ail-ffurfweddu" -#: ../urpm.pm:1129 +#: ../urpm.pm:1137 #, c-format msgid "" "unable to access medium \"%s\",\n" @@ -611,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:1180 +#: ../urpm.pm:1188 #, c-format msgid "" "virtual medium \"%s\" should have valid source hdlist or synthesis, medium " @@ -620,139 +601,139 @@ msgstr "" "dylai'r rhith gyfrwng \"%s\" gael hdlist ffynhonnell ddilys neu synthesis, " "anwybyddu'r cyfrwng" -#: ../urpm.pm:1190 +#: ../urpm.pm:1198 #, c-format msgid "copying description file of \"%s\"..." msgstr "copïo ffeil disgrifiad o \"%s\"" -#: ../urpm.pm:1214 ../urpm.pm:1488 +#: ../urpm.pm:1222 ../urpm.pm:1496 msgid "computing md5sum of existing source hdlist (or synthesis)" msgstr "cyfrifo md5sum ffynhonnell hdlist presennol (neu synthesis)" -#: ../urpm.pm:1263 +#: ../urpm.pm:1271 #, c-format msgid "copying source hdlist (or synthesis) of \"%s\"..." msgstr "copïo ffynhonnell hdlist (neu synthesis) \"%s\"..." -#: ../urpm.pm:1277 +#: ../urpm.pm:1285 #, c-format msgid "copy of [%s] failed (file is suspiciously small)" msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)" -#: ../urpm.pm:1282 +#: ../urpm.pm:1290 msgid "computing md5sum of copied source hdlist (or synthesis)" msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)" -#: ../urpm.pm:1284 +#: ../urpm.pm:1292 #, c-format msgid "copy of [%s] failed (md5sum mismatch)" msgstr "methodd copïo (%s) (md5sum gwallus)" -#: ../urpm.pm:1305 ../urpm.pm:1520 ../urpm.pm:1864 +#: ../urpm.pm:1313 ../urpm.pm:1528 ../urpm.pm:1872 #, c-format msgid "problem reading synthesis file of medium \"%s\"" msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\"" -#: ../urpm.pm:1359 +#: ../urpm.pm:1367 #, c-format msgid "reading rpm files from [%s]" msgstr "darllen ffeiliau rpm o [%s]" -#: ../urpm.pm:1374 +#: ../urpm.pm:1382 msgid "no rpms read" msgstr "heb ddarllen rpmau" -#: ../urpm.pm:1384 +#: ../urpm.pm:1392 #, c-format msgid "unable to read rpm files from [%s]: %s" msgstr "methu darllen ffeiliau rpm o (%s): %s" -#: ../urpm.pm:1389 +#: ../urpm.pm:1397 #, 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:1538 +#: ../urpm.pm:1546 #, c-format msgid "retrieving source hdlist (or synthesis) of \"%s\"..." msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..." -#: ../urpm.pm:1566 +#: ../urpm.pm:1574 #, c-format msgid "found probed hdlist (or synthesis) as %s" msgstr "canfod hdlist (neu synthesis) holwyd fel %s" -#: ../urpm.pm:1616 +#: ../urpm.pm:1624 msgid "computing md5sum of retrieved source hdlist (or synthesis)" msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)" -#: ../urpm.pm:1618 +#: ../urpm.pm:1626 msgid "...retrieving failed: md5sum mismatch" msgstr "... methodd ail-lwytho: anghysondeb md5sum" -#: ../urpm.pm:1716 +#: ../urpm.pm:1724 msgid "retrieval of source hdlist (or synthesis) failed" msgstr "methodd adfer ffynhonnell hdlist (neu synthesis)" -#: ../urpm.pm:1723 +#: ../urpm.pm:1731 #, c-format msgid "no hdlist file found for medium \"%s\"" msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\"" -#: ../urpm.pm:1734 ../urpm.pm:1788 +#: ../urpm.pm:1742 ../urpm.pm:1796 #, 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:1774 +#: ../urpm.pm:1782 #, c-format msgid "unable to parse hdlist file of \"%s\"" msgstr "methu didoli ffeil hdlist \"%s\"" -#: ../urpm.pm:1813 +#: ../urpm.pm:1821 #, c-format msgid "unable to write list file of \"%s\"" msgstr "methu ysgrifennu i ffeil rhestr \"%s\"" -#: ../urpm.pm:1821 +#: ../urpm.pm:1829 #, c-format msgid "writing list file for medium \"%s\"" msgstr "ysgrifennu rhestr ffeil ar gyfer cyfrwng \"%s\"" -#: ../urpm.pm:1823 +#: ../urpm.pm:1831 #, c-format msgid "nothing written in list file for \"%s\"" msgstr "dim wedi ei ysgrifennu yn ffei rhestr ar gyfer \"%s\"" -#: ../urpm.pm:1838 +#: ../urpm.pm:1846 #, c-format msgid "examining pubkey file of \"%s\"..." msgstr "archwilio ffeil pubkey \"%s\"" -#: ../urpm.pm:1845 +#: ../urpm.pm:1853 #, c-format msgid "...imported key %s from pubkey file of \"%s\"" msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\"" -#: ../urpm.pm:1848 +#: ../urpm.pm:1856 #, c-format msgid "unable to import pubkey file of \"%s\"" msgstr "methu mewnforio ffeil pubkey \"%s\"" -#: ../urpm.pm:1913 +#: ../urpm.pm:1921 #, c-format msgid "reading headers from medium \"%s\"" msgstr "darllen pennawd o'r cyfrwng \"%s\"" -#: ../urpm.pm:1918 +#: ../urpm.pm:1926 #, 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:1933 ../urpm.pm:1968 +#: ../urpm.pm:1941 ../urpm.pm:1977 #, c-format msgid "" "Unable to build synthesis file for medium \"%s\". Your hdlist file may be " @@ -761,79 +742,80 @@ msgstr "" "Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich " "ffeil hdlist yn llygredig." -#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:323 +#: ../urpm.pm:1945 ../urpm.pm:1981 ../urpmi:329 #, c-format msgid "built hdlist synthesis file for medium \"%s\"" msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\"" -#: ../urpm.pm:1994 +#: ../urpm.pm:2004 #, c-format msgid "found %d headers in cache" msgstr "canfod %d pennawd mewn storfa" -#: ../urpm.pm:1998 +#: ../urpm.pm:2008 #, c-format msgid "removing %d obsolete headers in cache" msgstr "tynnu hen benawdau %d yn y storfa" -#: ../urpm.pm:2054 +#: ../urpm.pm:2064 #, c-format msgid "mounting %s" msgstr "gosod %s" -#: ../urpm.pm:2076 +#: ../urpm.pm:2086 #, c-format msgid "unmounting %s" msgstr "dadosod %s" -#: ../urpm.pm:2100 +#: ../urpm.pm:2110 #, c-format msgid "invalid rpm file name [%s]" msgstr "enw ffeil rpm annilys [%s]" -#: ../urpm.pm:2106 +#: ../urpm.pm:2116 #, c-format msgid "retrieving rpm file [%s] ..." msgstr "adfer ffeil rpm (%s)..." -#: ../urpm.pm:2124 +#: ../urpm.pm:2134 #, c-format msgid "unable to access rpm file [%s]" msgstr "methu cael mynediad ffeil rpm (%s)" -#: ../urpm.pm:2129 +#: ../urpm.pm:2139 msgid "unable to register rpm file" msgstr "methu cofrestr ffeil rpm" -#: ../urpm.pm:2132 +#: ../urpm.pm:2142 msgid "error registering local packages" msgstr "gwall cofrestru pecynnau lleol" -#: ../urpm.pm:2156 +#: ../urpm.pm:2166 msgid "Search" msgstr "Chwilio" -#: ../urpm.pm:2243 +#: ../urpm.pm:2253 #, c-format msgid "no package named %s" msgstr "heb enwi pecyn %s" -#: ../urpm.pm:2245 ../urpme:94 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../urpm.pm:2255 ../urpme:96 #, c-format msgid "The following packages contain %s: %s" msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:" -#: ../urpm.pm:2439 ../urpm.pm:2486 ../urpm.pm:2517 +#: ../urpm.pm:2449 ../urpm.pm:2496 ../urpm.pm:2527 #, 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:2500 +#: ../urpm.pm:2510 #, c-format msgid "unable to correctly parse [%s] on value \"%s\"" msgstr "methu didoli (%s) yn gywir ar werth \"%s\"" -#: ../urpm.pm:2533 +#: ../urpm.pm:2543 #, c-format msgid "" "medium \"%s\" uses an invalid list file:\n" @@ -842,273 +824,295 @@ msgstr "" "cyfrwng \"%s\" yn defnyddio rhestr ffeiliau annilys:\n" " nid yw'r drych yn un diweddar, ceisiwch ddull arall" -#: ../urpm.pm:2537 +#: ../urpm.pm:2547 #, 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:2549 +#: ../urpm.pm:2559 #, c-format msgid "package %s is not found." msgstr "heb ganfod pecyn %s" -#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655 +#: ../urpm.pm:2617 ../urpm.pm:2631 ../urpm.pm:2651 ../urpm.pm:2665 msgid "urpmi database locked" msgstr "cronfa ddata urpmi wedi cloi" -#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738 +#: ../urpm.pm:2717 ../urpm.pm:2722 ../urpm.pm:2748 #, 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:2734 +#: ../urpm.pm:2744 #, 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:2742 +#: ../urpm.pm:2752 #, 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:2754 +#: ../urpm.pm:2764 #, c-format msgid "unable to access medium \"%s\"" msgstr "methu cael mynediad at gyfrwng. \"%s\"" -#: ../urpm.pm:2813 +#: ../urpm.pm:2823 #, c-format msgid "malformed input: [%s]" msgstr "allbwn gwallus: [%s]" -#: ../urpm.pm:2820 +#: ../urpm.pm:2830 #, c-format msgid "retrieving rpm files from medium \"%s\"..." msgstr "adfer ffeiliau rpm o gyfrwng [%s]" -#: ../urpm.pm:2941 +#: ../urpm.pm:2951 #, c-format msgid "using process %d for executing transaction" msgstr "defnyddio proses %d ar gyfer gweithredu trosglwyddiad" -#: ../urpm.pm:2972 +#: ../urpm.pm:2982 #, 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:2975 +#: ../urpm.pm:2985 msgid "unable to create transaction" msgstr "methu creu trosglwyddiad." -#: ../urpm.pm:2983 +#: ../urpm.pm:2993 #, c-format msgid "removing package %s" msgstr "tynnu pecyn %s." -#: ../urpm.pm:2985 +#: ../urpm.pm:2995 #, c-format msgid "unable to remove package %s" msgstr "methu tynnu pecyn %s" -#: ../urpm.pm:2997 +#: ../urpm.pm:3007 #, c-format msgid "unable to extract rpm from delta-rpm package %s" msgstr "methu tynnu rpm o becyn delta-rpm %s" -#: ../urpm.pm:3003 +#: ../urpm.pm:3013 #, 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:3006 +#: ../urpm.pm:3016 #, c-format msgid "unable to install package %s" msgstr "methu gosod pecyn %s" -#: ../urpm.pm:3063 +#: ../urpm.pm:3073 #, c-format msgid "More information on package %s" msgstr "Rhagor o wybodaeth ar becyn %s" -#: ../urpm.pm:3234 ../urpm.pm:3267 +#: ../urpm.pm:3244 ../urpm.pm:3277 #, c-format msgid "due to missing %s" msgstr "oherwydd %s coll" -#: ../urpm.pm:3235 ../urpm.pm:3265 +#: ../urpm.pm:3245 ../urpm.pm:3275 #, c-format msgid "due to unsatisfied %s" msgstr "%s heb ei foddloni" -#: ../urpm.pm:3236 +#: ../urpm.pm:3246 #, c-format msgid "trying to promote %s" msgstr "ceisio hybu %s" -#: ../urpm.pm:3237 +#: ../urpm.pm:3247 #, c-format msgid "in order to keep %s" msgstr "fel modd i gadw %s" -#: ../urpm.pm:3260 +#: ../urpm.pm:3270 #, c-format msgid "in order to install %s" msgstr "er mwyn gosod %s" -#: ../urpm.pm:3271 +#: ../urpm.pm:3281 #, c-format msgid "due to conflicts with %s" msgstr "oherwydd gwrthdaro gyda %s" -#: ../urpm.pm:3272 +#: ../urpm.pm:3282 msgid "unrequested" msgstr "diofyn" -#: ../urpm.pm:3288 +#: ../urpm.pm:3298 #, c-format msgid "Invalid signature (%s)" msgstr "Llofnod annilys (%s)" -#: ../urpm.pm:3320 +#: ../urpm.pm:3330 #, c-format msgid "Invalid Key ID (%s)" msgstr "Enw Allwedd Annilys (%s)" -#: ../urpm.pm:3322 +#: ../urpm.pm:3332 #, c-format msgid "Missing signature (%s)" msgstr "Llofnod coll (%s)" -#: ../urpm.pm:3382 +#: ../urpm.pm:3392 msgid "examining MD5SUM file" msgstr "archwilio ffeil MD5SUM" -#: ../urpm.pm:3393 +#: ../urpm.pm:3403 #, 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:3415 +#: ../urpm.pm:3425 msgid "This operation is forbidden while running in restricted mode" msgstr "" -#: ../urpm/args.pm:99 ../urpm/args.pm:108 +#: ../urpm/args.pm:104 ../urpm/args.pm:113 msgid "bad proxy declaration on command line\n" msgstr "datganiad dirprwy gwallus ar y llinell orchymyn\n" -#: ../urpm/args.pm:218 +#: ../urpm/args.pm:223 #, 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:250 +#: ../urpm/args.pm:255 #, c-format msgid "urpmq: cannot read rpm file \"%s\"\n" msgstr "urpmq: methu darllen ffeil rpm \"%s\"\n" -#: ../urpm/msg.pm:82 +#. Translator: Add here the keys which might be pressed in the "No"-case. +#: ../urpm/msg.pm:46 ../urpme:33 ../urpmi:409 ../urpmi:427 ../urpmi:462 +#: ../urpmi:509 ../urpmi:593 ../urpmi:673 +msgid "Nn" +msgstr "Nn" + +# This is a list of chars acceptable as a 'yes' answer to a Yes/No question; +# you can put here the letters for 'yes' for your language, so people +# 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:410 ../urpmi:428 ../urpmi:463 +#: ../urpmi:510 ../urpmi:594 ../urpmi:674 +msgid "Yy" +msgstr "Yy" + +#: ../urpm/msg.pm:85 msgid "Sorry, bad choice, try again\n" msgstr "Dewis gwael, ceisiwch eto\n" -#: ../urpm/parallel_ka_run.pm:9 ../urpm/parallel_ka_run.pm:103 -#: ../urpm/parallel_ka_run.pm:197 +#: ../urpm/parallel_ka_run.pm:27 ../urpm/parallel_ka_run.pm:121 +#: ../urpm/parallel_ka_run.pm:215 msgid "mput failed, maybe a node is unreacheable" msgstr "" -#: ../urpm/parallel_ka_run.pm:70 ../urpm/parallel_ka_run.pm:182 -#: ../urpm/parallel_ka_run.pm:211 +#: ../urpm/parallel_ka_run.pm:64 +#, c-format +msgid "node %s has an old version of urpme, please upgrade" +msgstr "" + +#: ../urpm/parallel_ka_run.pm:88 ../urpm/parallel_ka_run.pm:200 +#: ../urpm/parallel_ka_run.pm:230 msgid "rshp failed, maybe a node is unreacheable" msgstr "" -#: ../urpm/parallel_ka_run.pm:79 ../urpm/parallel_ssh.pm:96 +#: ../urpm/parallel_ka_run.pm:97 ../urpm/parallel_ssh.pm:102 #, c-format msgid "on node %s" msgstr "" #. - first propagate the synthesis file to all machine. -#: ../urpm/parallel_ka_run.pm:101 +#: ../urpm/parallel_ka_run.pm:119 msgid "Propagating synthesis to nodes..." msgstr "" #. - now try an iteration of urpmq. -#: ../urpm/parallel_ka_run.pm:152 +#: ../urpm/parallel_ka_run.pm:170 msgid "Resolving dependencies on nodes..." msgstr "" -#: ../urpm/parallel_ka_run.pm:195 +#: ../urpm/parallel_ka_run.pm:213 msgid "Distributing files to nodes..." msgstr "" -#: ../urpm/parallel_ka_run.pm:201 +#: ../urpm/parallel_ka_run.pm:220 msgid "Verifying if install is possible on nodes..." msgstr "" -#: ../urpm/parallel_ka_run.pm:215 ../urpm/parallel_ssh.pm:243 +#: ../urpm/parallel_ka_run.pm:234 ../urpm/parallel_ssh.pm:249 #, fuzzy, c-format msgid "Installation failed on node %s" msgstr "Methodd y gosod" -#: ../urpm/parallel_ka_run.pm:220 ../urpm/parallel_ssh.pm:248 ../urpmi:726 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:740 msgid "Installation is possible" msgstr "Gosod yn bosibl" #. - continue installation. -#: ../urpm/parallel_ka_run.pm:225 +#: ../urpm/parallel_ka_run.pm:244 #, fuzzy msgid "Installing packages on nodes..." msgstr "Gosod pecyn `%s' (%s/%s)..." -#: ../urpm/parallel_ssh.pm:22 ../urpm/parallel_ssh.pm:120 -#: ../urpm/parallel_ssh.pm:224 +#: ../urpm/parallel_ssh.pm:28 ../urpm/parallel_ssh.pm:126 +#: ../urpm/parallel_ssh.pm:230 #, c-format msgid "scp failed on host %s (%d)" msgstr "" -#: ../urpm/parallel_ssh.pm:118 +#: ../urpm/parallel_ssh.pm:124 #, fuzzy, c-format msgid "Propagating synthesis to %s..." msgstr "archwilio ffeil synthesis [%s]" -#: ../urpm/parallel_ssh.pm:171 +#: ../urpm/parallel_ssh.pm:177 #, c-format msgid "Resolving dependencies on %s..." msgstr "" -#: ../urpm/parallel_ssh.pm:201 +#: ../urpm/parallel_ssh.pm:207 #, c-format msgid "host %s does not have a good version of urpmi (%d)" msgstr "" -#: ../urpm/parallel_ssh.pm:217 +#: ../urpm/parallel_ssh.pm:223 #, fuzzy, c-format msgid "Distributing files to %s..." msgstr "dosbarthu %s" -#: ../urpm/parallel_ssh.pm:231 +#: ../urpm/parallel_ssh.pm:237 #, c-format msgid "Verifying if install is possible on %s..." msgstr "" -#: ../urpm/parallel_ssh.pm:255 +#: ../urpm/parallel_ssh.pm:261 #, fuzzy, c-format msgid "Performing install on %s..." msgstr "Gosod y pecyn..." -#: ../urpm/parallel_ssh.pm:268 +#: ../urpm/parallel_ssh.pm:274 #, fuzzy, c-format msgid "Installing %s on %s..." msgstr "gosod %s o %s" -#: ../urpm/parallel_ssh.pm:269 +#: ../urpm/parallel_ssh.pm:275 #, fuzzy, c-format msgid "Preparing install on %s..." msgstr "Gosod y pecyn..." -#: ../urpme:31 ../urpmi:500 +#: ../urpme:31 msgid "Is this OK?" msgstr "Mae'r model yn gywir" @@ -1128,12 +1132,12 @@ msgstr "" "\n" "defnydd:\n" -#: ../urpme:43 ../urpmf:33 ../urpmi:78 ../urpmi.addmedia:43 -#: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43 +#: ../urpme:43 ../urpmf:34 ../urpmi:79 ../urpmi.addmedia:44 +#: ../urpmi.removemedia:49 ../urpmi.update:31 ../urpmq:44 msgid " --help - print this help message.\n" msgstr " --help - argraffu neges cymorth.\n" -#: ../urpme:44 ../urpmi:85 +#: ../urpme:44 ../urpmi:86 msgid " --auto - automatically select a package in choices.\n" msgstr " --auto - dewis pecyn ynn awtomatig o fewn dewisiadau.\n" @@ -1141,14 +1145,14 @@ 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:46 ../urpmi:100 ../urpmq:64 +#: ../urpme:46 ../urpmi:101 ../urpmq:65 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:105 ../urpmq:65 +#: ../urpme:47 ../urpmi:106 ../urpmq:66 msgid " --parallel - distributed urpmi across machines of alias.\n" msgstr "" " --parallel - urpmi wedi ei ddosbarthu ar draws beiriannau eraill.\n" @@ -1165,8 +1169,8 @@ msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n" " wrth (ddad)osod chroot gyda dewis o --root.\n" -#: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53 -#: ../urpmi.update:48 ../urpmq:91 +#: ../urpme:51 ../urpmi:143 ../urpmi.addmedia:75 ../urpmi.removemedia:54 +#: ../urpmi.update:49 ../urpmq:92 msgid " -v - verbose mode.\n" msgstr " --verbose - modd llafar.\n" @@ -1178,43 +1182,47 @@ msgstr " -a - select all packages matching expression.\n" msgid "Only superuser is allowed to remove packages" msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu pecynnau" -#: ../urpme:89 +#: ../urpme:90 msgid "unknown package" msgstr "pecyn anhysbys" -#: ../urpme:89 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../urpme:90 msgid "unknown packages" msgstr "pecynnau anhysbys" -#: ../urpme:99 ../urpmi:439 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../urpme:102 ../urpmi:445 #, c-format msgid "removing package %s will break your system" msgstr "bydd tynnu pecynnau %s yn torri'r system" -#: ../urpme:102 +#: ../urpme:105 msgid "Nothing to remove" msgstr "Dim i'w dynnu" -#: ../urpme:106 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../urpme:110 msgid "Checking to remove the following packages" msgstr "Ticio i ddileu'r pecynnau canlynol" -#: ../urpme:113 +#: ../urpme:117 #, 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:115 ../urpmi:458 ../urpmi:588 +#: ../urpme:119 ../urpmi:464 ../urpmi:595 msgid " (y/N) " msgstr " (y/N) " -#: ../urpme:122 +#. - Warning : the following message is parsed in urpm::parallel_* +#: ../urpme:129 msgid "Removal failed" msgstr "Methodd y tynnu" -#: ../urpmf:27 +#: ../urpmf:28 #, fuzzy, c-format msgid "" "urpmf version %s\n" @@ -1230,233 +1238,233 @@ msgstr "" "\n" "defnydd:\n" -#: ../urpmf:34 +#: ../urpmf:35 #, fuzzy msgid " --version - print this tool's version number.\n" msgstr " --help - argraffu neges cymorth.\n" -#: ../urpmf:35 ../urpmi:120 ../urpmq:74 +#: ../urpmf:36 ../urpmi:124 ../urpmq:75 msgid " --env - use specific environment (typically a bug report).\n" msgstr "" " --env - defnyddio amgylchedd penodol (adroddiad gwall fel " "rheol).\n" -#: ../urpmf:36 ../urpmi:82 ../urpmq:47 +#: ../urpmf:37 ../urpmi:83 ../urpmq:48 msgid " --excludemedia - do not use the given media, separated by comma.\n" msgstr "" " --excludemedia - peidio defnyddio'r cyfrwng hwn, rhannwyd gyda choma.\n" -#: ../urpmf:37 +#: ../urpmf:38 msgid "" " --literal, -l - don't match patterns, use argument as a literal string.\n" msgstr "" -#: ../urpmf:38 ../urpmi:80 ../urpmq:45 +#: ../urpmf:39 ../urpmi:81 ../urpmq:46 msgid " --media - use only the given media, separated by comma.\n" msgstr " --media - defnyddio'r cyfrwng, wedi ei ran gan gollnod.\n" -#: ../urpmf:39 ../urpmi:83 ../urpmq:48 +#: ../urpmf:40 ../urpmi:84 ../urpmq:49 msgid "" " --sortmedia - sort media according to substrings separated by comma.\n" msgstr "" " --sortmedia - didoli'r cyfrwng yn ôl llinynnau wedi eu rhannu gyda " "choma.\n" -#: ../urpmf:40 ../urpmi:84 ../urpmq:49 +#: ../urpmf:41 ../urpmi:85 ../urpmq:50 msgid " --synthesis - use the given synthesis instead of urpmi db.\n" msgstr " --synthesis - defnyddio'r synthesis yn lle urpmi db.\n" -#: ../urpmf:41 +#: ../urpmf:42 msgid " --uniq - do not print identical lines twice.\n" msgstr " --uniq - peidio argraffu llinellau'r un fath.\n" -#: ../urpmf:42 ../urpmi:79 ../urpmq:44 +#: ../urpmf:43 ../urpmi:80 ../urpmq:45 msgid " --update - use only update media.\n" msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n" -#: ../urpmf:43 +#: ../urpmf:44 msgid " --verbose - verbose mode.\n" msgstr " --verbose - modd llafar.\n" -#: ../urpmf:44 +#: ../urpmf:45 msgid " -i - ignore case distinctions in patterns.\n" msgstr "" " -i - anwybyddu gwahaniaeth maint llythrennau ym mhob patrwm.\n" -#: ../urpmf:45 +#: ../urpmf:46 msgid " -F<str> - change field separator (defaults to ':').\n" msgstr "" -#: ../urpmf:46 +#: ../urpmf:47 msgid "Pattern expressions:\n" msgstr "" -#: ../urpmf:47 +#: ../urpmf:48 msgid " text - any text is parsed as a regexp, unless -l is used.\n" msgstr "" -#: ../urpmf:48 +#: ../urpmf:49 msgid " -e - include perl code directly as perl -e.\n" msgstr " -e - cynnwys perl cod yn union fel perl -e.\n" -#: ../urpmf:49 +#: ../urpmf:50 msgid " -a - binary AND operator.\n" msgstr " -a - gweithredwr deuaidd AND.\n" -#: ../urpmf:50 +#: ../urpmf:51 msgid " -o - binary OR operator.\n" msgstr " -o - gweithredwr deuaidd OR.\n" -#: ../urpmf:51 +#: ../urpmf:52 msgid " ! - unary NOT.\n" msgstr " ! - unaidd NOT.\n" -#: ../urpmf:52 +#: ../urpmf:53 #, fuzzy msgid " ( ) - left and right parentheses.\n" msgstr " ) - parenthesis de i gau mynegiad grŵp.\n" -#: ../urpmf:53 +#: ../urpmf:54 #, fuzzy msgid "List of tags:\n" msgstr "" "Rhestr o ddata i'w adfer:\n" "\n" -#: ../urpmf:54 +#: ../urpmf:55 #, fuzzy msgid " --qf - specify a printf-like output format\n" msgstr " --X - defnyddio rhyngwyneb X.\n" -#: ../urpmf:55 +#: ../urpmf:56 #, fuzzy, c-format msgid " example: '%%name:%%files'\n" msgstr " rhagosodedig yw %s.\n" -#: ../urpmf:56 +#: ../urpmf:57 #, fuzzy msgid " --arch - architecture\n" msgstr " --url - argraffu tag url: url.\n" -#: ../urpmf:57 +#: ../urpmf:58 #, fuzzy msgid " --buildhost - build host\n" msgstr " --buildhost - argraffu buildhost tag: build host.\n" -#: ../urpmf:58 +#: ../urpmf:59 msgid " --buildtime - build time\n" msgstr "" -#: ../urpmf:59 +#: ../urpmf:60 #, fuzzy msgid " --conffiles - configuration files\n" msgstr "Modiwl ffurfweddu Konsole" -#: ../urpmf:60 +#: ../urpmf:61 #, fuzzy msgid " --conflicts - conflict tags\n" msgstr " --conflicts - tag argraffu'n gwrthdaro: pob gwrthdaro\n" -#: ../urpmf:61 +#: ../urpmf:62 #, fuzzy msgid " --description - package description\n" msgstr " --summary - argraffu disgrifiad tag: disgrifiad.\n" -#: ../urpmf:62 +#: ../urpmf:63 msgid " --distribution - distribution\n" msgstr "" -#: ../urpmf:63 +#: ../urpmf:64 #, fuzzy msgid " --epoch - epoch\n" msgstr " --epoch - argraffu cyfnod tag: cyfnod.\n" -#: ../urpmf:64 +#: ../urpmf:65 #, fuzzy msgid " --filename - filename of the package\n" msgstr " --name - argraffu enwau pecyn yn unig \n" -#: ../urpmf:65 +#: ../urpmf:66 #, fuzzy msgid " --files - list of files contained in the package\n" msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n" -#: ../urpmf:66 +#: ../urpmf:67 #, fuzzy msgid " --group - group\n" msgstr " --group - argraffu grŵp tag: grŵp.\n" -#: ../urpmf:67 +#: ../urpmf:68 #, fuzzy msgid " --name - package name\n" msgstr " --name - argraffu enwau pecyn yn unig \n" -#: ../urpmf:68 +#: ../urpmf:69 #, fuzzy msgid " --obsoletes - obsoletes tags\n" msgstr "" " --obsoletes - argraffu hen dagiau: yr holl hen rai (llinellau " "niferus).\n" -#: ../urpmf:69 +#: ../urpmf:70 #, fuzzy msgid " --packager - packager\n" msgstr " --packager - argraffu pencynydd tag: pencynydd.\n" -#: ../urpmf:70 +#: ../urpmf:71 #, fuzzy msgid " --provides - provides tags\n" msgstr " --provides - tag argraffu'n darparu: pob darpariaeth. \n" -#: ../urpmf:71 +#: ../urpmf:72 #, fuzzy msgid " --requires - requires tags\n" msgstr " --requires - argraffu tagiau angenrheidiol: pob anghenraid\n" -#: ../urpmf:72 +#: ../urpmf:73 #, fuzzy msgid " --size - installed size\n" msgstr " --size - argraffu maint tag: maint.\n" -#: ../urpmf:73 +#: ../urpmf:74 #, fuzzy msgid " --sourcerpm - source rpm name\n" msgstr " --sourcerpm - argraffu ourcerpm tag: ffynhonnell rpm.\n" -#: ../urpmf:74 +#: ../urpmf:75 #, fuzzy msgid " --summary - summary\n" msgstr " --summary, -S - crynodeb argraffu.\n" -#: ../urpmf:75 +#: ../urpmf:76 #, fuzzy msgid " --url - url\n" msgstr " --url - argraffu tag url: url.\n" -#: ../urpmf:76 +#: ../urpmf:77 #, fuzzy msgid " --vendor - vendor\n" msgstr " --verbose - modd llafar.\n" -#: ../urpmf:77 +#: ../urpmf:78 #, fuzzy msgid " -m - the media in which the package was found\n" msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n" -#: ../urpmf:78 ../urpmq:80 +#: ../urpmf:79 ../urpmq:81 msgid " -f - print version, release and arch with name.\n" msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n" -#: ../urpmf:130 +#: ../urpmf:131 msgid "Incorrect format: you may use only one multi-valued tag" msgstr "" -#: ../urpmf:172 ../urpmi:218 ../urpmq:116 +#: ../urpmf:173 ../urpmi:224 ../urpmq:117 #, c-format msgid "using specific environment on %s\n" msgstr "ddefnyddio amgylchedd penodol ar %s\n" -#: ../urpmf:218 +#: ../urpmf:219 msgid "" "Note: since no media searched uses hdlists, urpmf was unable to return any " "result\n" @@ -1464,11 +1472,11 @@ msgstr "" "Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd " "urpmf â chynnig canlyniad\n" -#: ../urpmf:219 +#: ../urpmf:220 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:73 +#: ../urpmi:74 #, c-format msgid "" "urpmi version %s\n" @@ -1484,7 +1492,7 @@ msgstr "" "\n" "defnydd:\n" -#: ../urpmi:81 ../urpmq:46 +#: ../urpmi:82 ../urpmq:47 msgid "" " --searchmedia - use only the given media to search requested (or updated) " "packages.\n" @@ -1492,23 +1500,23 @@ msgstr "" " --searchmedia - defnyddio'r cyfrwng darparwyd i chwilio'r pecynnau " "gofynnwyd (neu diweddarwyd).\n" -#: ../urpmi:86 ../urpmq:50 +#: ../urpmi:87 ../urpmq:51 msgid "" " --auto-select - automatically select packages to upgrade the system.\n" msgstr " --auto-select - dewis pecynnau'n awtomatig i uwchraddio'r system.\n" -#: ../urpmi:87 +#: ../urpmi:88 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:88 +#: ../urpmi:89 #, fuzzy msgid " --no-install - don't install packages (only download)\n" msgstr " --install-src - peidio gosod pecynnau (llawyth i lawr yn unig).\n" -#: ../urpmi:89 ../urpmq:52 +#: ../urpmi:90 ../urpmq:53 msgid "" " --keep - keep existing packages if possible, reject requested\n" " packages that lead to removals.\n" @@ -1516,7 +1524,7 @@ msgstr "" " --keep - cadw'r pecynnau presennol os yn bosibl, gwrthod\n" " pecynnau sy'n arwain at dynnu.\n" -#: ../urpmi:91 +#: ../urpmi:92 #, c-format msgid "" " --split-level - split in small transaction if more than given packages\n" @@ -1528,34 +1536,34 @@ msgstr "" " eu gosod neu eu uwchraddio\n" " rhagosodiad yw %d.\n" -#: ../urpmi:94 +#: ../urpmi:95 #, c-format msgid " --split-length - small transaction length, default is %d.\n" msgstr " --split-length - hyd drosglwyddiad byr, rhagosodiad yw %d.\n" -#: ../urpmi:95 ../urpmq:51 +#: ../urpmi:96 ../urpmq:52 msgid " --fuzzy - impose fuzzy search (same as -y).\n" msgstr " --fuzzy - mynnu chwiliad fuzzy (fel -y).\n" -#: ../urpmi:96 ../urpmq:60 +#: ../urpmi:97 ../urpmq:61 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:97 +#: ../urpmi:98 msgid " --install-src - install only source package (no binaries).\n" msgstr "" " --install-src - gosod pecynnau ffynhonnell yn unig (dim binaries).\n" -#: ../urpmi:98 +#: ../urpmi:99 msgid " --clean - remove rpm from cache before anything else.\n" msgstr " --clean - tynnu rpm o'r storfa cyn unrhyw beth arall.\n" -#: ../urpmi:99 +#: ../urpmi:100 msgid " --noclean - don't clean rpms from cache.\n" msgstr " --noclean - peidio glanhau rpm o'r storfa.\n" -#: ../urpmi:101 +#: ../urpmi:102 msgid "" " --allow-nodeps - allow asking user to install packages without\n" " dependencies checking.\n" @@ -1563,7 +1571,7 @@ msgstr "" " --allow-nodeps - caniatáu gofyn i ddefnyddiwr i osod pecynnau heb\n" " wirio dibyniaethau.\n" -#: ../urpmi:103 +#: ../urpmi:104 msgid "" " --allow-force - allow asking user to install packages without\n" " dependencies checking and integrity.\n" @@ -1571,11 +1579,11 @@ msgstr "" " --allow-force - caniatáu gofyn i ddefnyddiwr osod pecyn heb\n" " wirio dibyniaethau na'u cyfanrwydd.\n" -#: ../urpmi:106 +#: ../urpmi:107 msgid " --root - use another root for rpm installation.\n" msgstr " --root - defnyddio root arall ar gyfer gosod rpm.\n" -#: ../urpmi:107 +#: ../urpmi:108 msgid "" " --use-distrib - configure urpmi on the fly from a distrib tree, useful\n" " to install a chroot with --root option.\n" @@ -1583,19 +1591,31 @@ msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib, defnyddiol\n" " wrth osod chroot gyda dewis o --root.\n" -#: ../urpmi:109 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68 +#: ../urpmi:110 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69 msgid " --wget - use wget to retrieve distant files.\n" msgstr " --wget - defnyddio wget i estyn ffeiliau pell.\n" -#: ../urpmi:110 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69 +#: ../urpmi:111 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:70 msgid " --curl - use curl to retrieve distant files.\n" msgstr " --curl - defnyddio curl i estyn ffeiliau pell.\n" -#: ../urpmi:111 ../urpmi.addmedia:46 ../urpmi.update:33 +#: ../urpmi:112 +msgid " --curl-options - additional options to pass to curl\n" +msgstr "" + +#: ../urpmi:113 +msgid " --rsync-options- additional options to pass to rsync\n" +msgstr "" + +#: ../urpmi:114 +msgid " --wget-options - additional options to pass to wget\n" +msgstr "" + +#: ../urpmi:115 ../urpmi.addmedia:47 ../urpmi.update:34 msgid " --limit-rate - limit the download speed.\n" msgstr " --limit-rate - cyfyngu cyflymder y llwytho i lawr.\n" -#: ../urpmi:112 +#: ../urpmi:116 msgid "" " --resume - resume transfer of partially-downloaded files\n" " (--no-resume disables it, default is disabled).\n" @@ -1603,7 +1623,7 @@ msgstr "" " --verify-rpm - gwirio llofnod rpm cyn gosod\n" " (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n" -#: ../urpmi:114 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70 +#: ../urpmi:118 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:71 msgid "" " --proxy - use specified HTTP proxy, the port number is assumed\n" " to be 1080 by default (format is <proxyhost[:port]>).\n" @@ -1611,7 +1631,7 @@ msgstr "" " --proxy - defnyddio'r dirprwy HTTP enwyd, rhif y porth trwy\n" " rhagosodiad yw 1080 (fformat yw <proxyhost[:port]>).\n" -#: ../urpmi:116 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72 +#: ../urpmi:120 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:73 msgid "" " --proxy-user - specify user and password to use for proxy\n" " authentication (format is <user:password>).\n" @@ -1619,7 +1639,7 @@ msgstr "" " --proxy-user - enwi defnyddiwr a chyfrinair i'w ddefnyddio fel y\n" " dilysiad dirprwy (fformat yw <user:password>).\n" -#: ../urpmi:118 +#: ../urpmi:122 msgid "" " --bug - output a bug report in directory indicated by\n" " next arg.\n" @@ -1627,7 +1647,7 @@ msgstr "" " --bug - cynhyrchu adroddiad gwall i'r cyfeiriadur nodir gan\n" " yr arg. nesaf\n" -#: ../urpmi:121 +#: ../urpmi:125 msgid "" " --verify-rpm - verify rpm signature before installation\n" " (--no-verify-rpm disable it, default is enabled).\n" @@ -1635,34 +1655,34 @@ msgstr "" " --verify-rpm - gwirio llofnod rpm cyn gosod\n" " (--no-verify-rpm analluogi, galluogi yw'r rhagosodedig)\n" -#: ../urpmi:123 +#: ../urpmi:127 msgid "" " --test - verify if the installation can be achieved correctly.\n" msgstr " --test - gwirio os oes modd gosod yn iawn.\n" -#: ../urpmi:124 +#: ../urpmi:128 msgid " --excludepath - exclude path separated by comma.\n" msgstr " --excludepath - eithrio llwybr wedi ei wahanu a chollnod.\n" -#: ../urpmi:125 +#: ../urpmi:129 msgid " --excludedocs - exclude doc files.\n" msgstr " --excludedocs - eithrio ffeiliau docs.\n" -#: ../urpmi:126 +#: ../urpmi:130 #, fuzzy msgid " --ignoresize - don't verify disk space before installation.\n" msgstr " --no-uninstall - peidio gofyn i ddadosod pecyn, atal gosod.\n" -#: ../urpmi:127 +#: ../urpmi:131 #, fuzzy msgid " --noscripts - do not execute package scriptlet(s)\n" msgstr " --summary - argraffu disgrifiad tag: disgrifiad.\n" -#: ../urpmi:128 +#: ../urpmi:132 msgid " --skip - packages which installation should be skipped\n" msgstr " --skip - pecynnau dylid osgoi eu gosod.\n" -#: ../urpmi:129 +#: ../urpmi:133 msgid "" " --more-choices - when several packages are found, propose more choices\n" " than the default.\n" @@ -1671,55 +1691,55 @@ msgstr "" "ddewis\n" " na'r rhagosodiad.\n" -#: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41 +#: ../urpmi:135 ../urpmi.addmedia:69 ../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:132 +#: ../urpmi:136 msgid " --strict-arch - upgrade only packages with the same architecture.\n" msgstr "" " --strict-arch - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n" -#: ../urpmi:133 ../urpmq:77 +#: ../urpmi:137 ../urpmq:78 msgid " -a - select all matches on command line.\n" msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n" -#: ../urpmi:134 +#: ../urpmi:138 msgid " -p - allow search in provides to find package.\n" msgstr " -p - caniatáu i chwilio canfod pecyn.\n" -#: ../urpmi:135 +#: ../urpmi:139 msgid " -P - do not search in provides to find package.\n" msgstr " -P - peidio chwilio yn provides i ganfod pecyn.\n" -#: ../urpmi:136 ../urpmq:92 +#: ../urpmi:140 ../urpmq:93 msgid " -y - impose fuzzy search (same as --fuzzy).\n" msgstr " -y - gosod chwilio fuzzy (fel --fuzzy).\n" -#: ../urpmi:137 ../urpmq:89 +#: ../urpmi:141 ../urpmq:90 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:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52 -#: ../urpmi.update:47 +#: ../urpmi:142 ../urpmi.addmedia:74 ../urpmi.removemedia:53 +#: ../urpmi.update:48 msgid " -q - quiet mode.\n" msgstr " -q - modd distaw.\n" -#: ../urpmi:140 +#: ../urpmi:144 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:189 +#: ../urpmi:193 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:208 +#: ../urpmi:214 #, c-format msgid "" "Directory [%s] already exists, please use another directory for bug report " @@ -1728,16 +1748,16 @@ msgstr "" "Mae cyfeiriadur (%s) yn bodoli eisoes, defnyddiwch gyfeiriadur arall am " "adroddiad gwall neu ei ddileu." -#: ../urpmi:209 +#: ../urpmi:215 #, c-format msgid "Unable to create directory [%s] for bug report" msgstr "Methu creu cyfeiriadur (%s) ar gyfer adroddiad gwall" -#: ../urpmi:212 ../urpmi:333 +#: ../urpmi:218 ../urpmi:339 msgid "Copying failed" msgstr "Methodd y copïo" -#: ../urpmi:238 +#: ../urpmi:244 #, c-format msgid "" "Error: %s appears to be mounted read-only.\n" @@ -1746,12 +1766,12 @@ msgstr "" "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n" "Defnydd --allow-force gorfodaeth i orfodi gweithred." -#: ../urpmi:368 +#: ../urpmi:374 #, c-format msgid "What is your choice? (1-%d) " msgstr "Beth yw eich dewis? (1-%d)" -#: ../urpmi:398 +#: ../urpmi:404 #, c-format msgid "" "The following packages can't be installed because they depend on packages\n" @@ -1762,18 +1782,18 @@ msgstr "" "sy'n hyn na'r rhai sydd wedi eu gosod:\n" "%s" -#: ../urpmi:406 ../urpmi:424 +#: ../urpmi:412 ../urpmi:430 #, fuzzy msgid "" "\n" "Continue installation anyway?" msgstr "Parhau beth bynnag?" -#: ../urpmi:406 ../urpmi:424 ../urpmi:504 +#: ../urpmi:412 ../urpmi:430 ../urpmi:511 msgid " (Y/n) " msgstr " (Y/n) " -#: ../urpmi:417 +#: ../urpmi:423 #, c-format msgid "" "Some requested packages cannot be installed:\n" @@ -1782,7 +1802,7 @@ msgstr "" "Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n" "%s" -#: ../urpmi:447 +#: ../urpmi:453 #, c-format msgid "" "The installation cannot continue because the following packages\n" @@ -1793,7 +1813,7 @@ msgstr "" "gael eu tynnu i eraill gael eu diweddaru.\n" "%s\n" -#: ../urpmi:452 +#: ../urpmi:458 #, c-format msgid "" "The following packages have to be removed for others to be upgraded:\n" @@ -1802,23 +1822,26 @@ msgstr "" "Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n" "%s" -#: ../urpmi:487 ../urpmi:498 -#, c-format +#: ../urpmi:493 ../urpmi:505 +#, fuzzy msgid "" -"To satisfy dependencies, the following %d packages are going to be installed " -"(%d MB)" +"To satisfy dependencies, the following packages are going to be installed" +msgstr "" +"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod:\n" +"%s\n" + +#: ../urpmi:494 ../urpmi:506 +#, fuzzy +msgid "To satisfy dependencies, the following package is going to be installed" msgstr "" -"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)" +"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod (%d MB)" -#: ../urpmi:488 ../urpmi:499 +#: ../urpmi:495 #, c-format -msgid "" -"To satisfy dependencies, the following package is going to be installed (%d " -"MB)" +msgid "(%d packages, %d MB)" msgstr "" -"I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod (%d MB)" -#: ../urpmi:494 +#: ../urpmi:501 #, c-format msgid "" "You need to be root to install the following dependencies:\n" @@ -1827,61 +1850,67 @@ msgstr "" "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n" "%s\n" -#: ../urpmi:525 +#: ../urpmi:507 +#, c-format +msgid "Proceed with the installation of the %d packages? (%d MB)" +msgstr "" + +#: ../urpmi:532 msgid "Press Enter when ready..." msgstr "Pwyso Enter pan yn barod..." -#: ../urpmi:531 +#: ../urpmi:538 msgid "Cancel" msgstr "Dileu" -#: ../urpmi:531 +#: ../urpmi:538 msgid "Ok" msgstr "Iawn" -#: ../urpmi:579 +#: ../urpmi:586 msgid "The following packages have bad signatures" msgstr "Mae gan y pecynnau canlynol lofnod gwallus" -#: ../urpmi:580 +#: ../urpmi:587 msgid "Do you want to continue installation ?" msgstr "Ydych chi am barhau gosod?" -#: ../urpmi:622 +#: ../urpmi:631 #, c-format msgid "distributing %s" msgstr "dosbarthu %s" #. - there's a common prefix, simplify message -#: ../urpmi:633 +#: ../urpmi:642 #, c-format msgid "installing %s from %s" msgstr "gosod %s o %s" -#: ../urpmi:635 +#: ../urpmi:644 #, c-format msgid "installing %s" msgstr "gosod %s" -#: ../urpmi:665 +#: ../urpmi:675 msgid "Try installation without checking dependencies? (y/N) " msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)" -#: ../urpmi:681 -msgid "Try installation even more strongly (--force)? (y/N) " +#: ../urpmi:692 +#, fuzzy +msgid "Try harder to install (--force)? (y/N) " msgstr "Gwneud y gosod gyda mwy o orfodaeth (--force)? (i/N)" -#: ../urpmi:718 +#: ../urpmi:731 #, c-format msgid "%d installation transactions failed" msgstr "methodd trosglwyddiad gosod %d" -#: ../urpmi:733 +#: ../urpmi:747 #, fuzzy, c-format msgid "The following package names were assumed: %s" msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:" -#: ../urpmi:750 +#: ../urpmi:764 msgid "restarting urpmi" msgstr "ailgychwyn urpmi" @@ -1889,7 +1918,7 @@ msgstr "ailgychwyn urpmi" #. Translator: and 'removable:' must not be translated! #. Translator: neither the ``with''. #. Translator: only what is between <brackets> can be translated. -#: ../urpmi.addmedia:34 +#: ../urpmi.addmedia:35 msgid "" "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n" "where <url> is one of\n" @@ -1913,19 +1942,19 @@ msgstr "" "\n" "and [options] are from\n" -#: ../urpmi.addmedia:51 +#: ../urpmi.addmedia:52 msgid " --update - create an update medium.\n" msgstr " --update - defnyddio cyfrwng diweddaru.\n" -#: ../urpmi.addmedia:52 +#: ../urpmi.addmedia:53 msgid " --probe-synthesis - try to find and use synthesis file.\n" msgstr " --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n" -#: ../urpmi.addmedia:53 +#: ../urpmi.addmedia:54 msgid " --probe-hdlist - try to find and use hdlist file.\n" msgstr " --probe-hdlist - ceisio canfod a defnyddio ffeil hdlist.\n" -#: ../urpmi.addmedia:54 +#: ../urpmi.addmedia:55 msgid "" " --no-probe - do not try to find any synthesis or\n" " hdlist file.\n" @@ -1933,7 +1962,7 @@ msgstr "" " --no-probe - peidio ceisio canfod unrhyw synthesis neu\n" " ffeil hdlist.\n" -#: ../urpmi.addmedia:56 +#: ../urpmi.addmedia:57 msgid "" " --distrib - automatically create all media from an installation\n" " medium.\n" @@ -1941,7 +1970,7 @@ msgstr "" " --distrib - creu yn awtomatig yr holl gyfrwng o gyfrwng\n" " gosod\n" -#: ../urpmi.addmedia:58 +#: ../urpmi.addmedia:59 #, c-format msgid "" " --from - use specified url for list of mirrors, the default is\n" @@ -1951,7 +1980,7 @@ msgstr "" "rhagosodedig yw\n" " %s\n" -#: ../urpmi.addmedia:60 +#: ../urpmi.addmedia:61 msgid "" " --version - use specified distribution version, the default is taken\n" " from the version of the distribution told by the\n" @@ -1963,7 +1992,7 @@ msgstr "" "pecynnau\n" " ryddhawyd gan Mandriva Linux.\n" -#: ../urpmi.addmedia:63 +#: ../urpmi.addmedia:64 msgid "" " --arch - use specified architecture, the default is arch of\n" " mandriva-release package installed.\n" @@ -1971,7 +2000,7 @@ msgstr "" " --arch - defnyddio pensaernïaeth benodol, y rhagosodiad yw arch o\n" " osod pecynnau Mandriva Linux.\n" -#: ../urpmi.addmedia:65 +#: ../urpmi.addmedia:66 msgid "" " --virtual - create virtual media wich are always up-to-date,\n" " only file:// protocol is allowed.\n" @@ -1979,64 +2008,64 @@ msgstr "" " --virtual - creu cyfrwng rhithiol sydd wedi ei ddiweddaru,\n" " dom ond protocol file:// sy'n cael ei ganiatáu.\n" -#: ../urpmi.addmedia:67 ../urpmi.update:39 +#: ../urpmi.addmedia:68 ../urpmi.update:40 msgid " --no-md5sum - disable MD5SUM file checking.\n" msgstr " --no-md5sum - analluogi gwirio ffeil MD5SUM.\n" -#: ../urpmi.addmedia:69 +#: ../urpmi.addmedia:70 msgid " --nopubkey - don't import pubkey of added media\n" msgstr " --nopubkey - peidio mewnforio pubkey y cyfrwng ychwanegwyd\n" -#: ../urpmi.addmedia:70 +#: ../urpmi.addmedia:71 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:71 ../urpmi.removemedia:50 ../urpmi.update:45 +#: ../urpmi.addmedia:72 ../urpmi.removemedia:51 ../urpmi.update:46 msgid " -c - clean headers cache directory.\n" msgstr " -c - glanhau penawdau yng nghyfeiriadur y storfa.\n" -#: ../urpmi.addmedia:72 ../urpmi.update:46 +#: ../urpmi.addmedia:73 ../urpmi.update:47 msgid " -f - force generation of hdlist files.\n" msgstr " -f - gorfodi cynhyrchu ffeiliau hdlist\n" -#: ../urpmi.addmedia:84 +#: ../urpmi.addmedia:85 #, c-format msgid "unable to update medium \"%s\"\n" msgstr "methu diweddaru cyfrwng \"%s\"\n" -#: ../urpmi.addmedia:117 +#: ../urpmi.addmedia:118 msgid "Only superuser is allowed to add media" msgstr "Dim ond uwch ddefnyddiwr sy'n cael ychwanegu cyfrwng" -#: ../urpmi.addmedia:120 +#: ../urpmi.addmedia:121 #, c-format msgid "Will create config file [%s]" msgstr "Yn creu ffeil config (%s)" -#: ../urpmi.addmedia:121 +#: ../urpmi.addmedia:122 #, c-format msgid "Can't create config file [%s]" msgstr "Methu creu ffeil Config (%s)" -#: ../urpmi.addmedia:128 +#: ../urpmi.addmedia:129 msgid "no need to give <relative path of hdlist> with --distrib" msgstr "dim angen rhoi <llwybr perthynnol hdlist> gyda --distrib" -#: ../urpmi.addmedia:138 +#: ../urpmi.addmedia:139 msgid "<relative path of hdlist> missing\n" msgstr "<llwybr perthynnol hdlist> ar goll\n" -#: ../urpmi.addmedia:140 +#: ../urpmi.addmedia:141 msgid "`with' missing for network media\n" msgstr "`with' ar goll ar gyfer cyfrwng rhwydwaith\n" -#: ../urpmi.addmedia:157 +#: ../urpmi.addmedia:158 #, c-format msgid "unable to create medium \"%s\"\n" msgstr "methu creu cyfrwng \"%s\"\n" -#: ../urpmi.removemedia:46 +#: ../urpmi.removemedia:47 msgid "" "usage: urpmi.removemedia [-a] <name> ...\n" "where <name> is a medium name to remove.\n" @@ -2044,15 +2073,15 @@ msgstr "" "usage: urpmi.removemedia [-a] <name> ...\n" "lle mai <name> yw'r enw cyfrwng i'w dynnu.\n" -#: ../urpmi.removemedia:49 +#: ../urpmi.removemedia:50 msgid " -a - select all media.\n" msgstr " -a - dewis pob cyfrwng.\n" -#: ../urpmi.removemedia:51 +#: ../urpmi.removemedia:52 msgid " -y - fuzzy match on media names.\n" msgstr " -y - cydweddiad bras enwau cyfryngau\n" -#: ../urpmi.removemedia:54 +#: ../urpmi.removemedia:55 #, c-format msgid "" "\n" @@ -2061,15 +2090,15 @@ msgstr "" "\n" "dewisiadau anhysbys '%s'\n" -#: ../urpmi.removemedia:63 +#: ../urpmi.removemedia:64 msgid "Only superuser is allowed to remove media" msgstr "Dim ond uwch ddefnyddiwr sy'n cael tynnu cyfrwng" -#: ../urpmi.removemedia:73 +#: ../urpmi.removemedia:74 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:75 +#: ../urpmi.removemedia:76 #, c-format msgid "" "the entry to remove is missing\n" @@ -2078,7 +2107,7 @@ msgstr "" "mae'r cofnod i'w dynnu ar goll\n" "(un o %s)\n" -#: ../urpmi.update:28 +#: ../urpmi.update:29 msgid "" "usage: urpmi.update [options] <name> ...\n" "where <name> is a medium name to update.\n" @@ -2086,37 +2115,37 @@ msgstr "" "usage: urpmi.update [options] <name> ...\n" "lle mai <name> yw'r enw cyfrwng i'w dynnu.\n" -#: ../urpmi.update:38 +#: ../urpmi.update:39 msgid " --update - update only update media.\n" msgstr " --update - defnyddio cyfrwng diweddaru'n unig.\n" -#: ../urpmi.update:40 +#: ../urpmi.update:41 msgid " --force-key - force update of gpg key.\n" msgstr " --force-key - gorfodi diweddaru allwedd gpg.\n" -#: ../urpmi.update:42 +#: ../urpmi.update:43 msgid " --ignore - don't update, mark the media as ignored.\n" msgstr "" " --norebuild - peidio diweddaru, marcio'r cyfrwng wedi ei anwybyddu.\n" -#: ../urpmi.update:43 +#: ../urpmi.update:44 msgid " --no-ignore - don't update, mark the media as enabled.\n" msgstr "" " --no-ignore - peidiwch diweddaru, marciwch y cyfrwng wedi ei alluogi.\n" -#: ../urpmi.update:44 +#: ../urpmi.update:45 msgid " -a - select all non-removable media.\n" msgstr " -a - dewis pob cyfrwng ansymudadwy.\n" -#: ../urpmi.update:67 +#: ../urpmi.update:68 msgid "Only superuser is allowed to update media" msgstr "Dim ond uwch ddefnyddiwr sy'n cael diweddaru cyfrwng" -#: ../urpmi.update:75 +#: ../urpmi.update:76 msgid "nothing to update (use urpmi.addmedia to add a media)\n" msgstr "dim i'w ddiweddaru (defnyddio urpmi.addmedia i ychwanegu cyfrwng)\n" -#: ../urpmi.update:93 +#: ../urpmi.update:94 #, c-format msgid "" "the entry to update is missing\n" @@ -2125,22 +2154,22 @@ msgstr "" "mae'r cofnod i ddiweddaru ar goll\n" "(un o %s)\n" -#: ../urpmi.update:97 +#: ../urpmi.update:98 #, c-format msgid "\"%s\"" msgstr "\"%s\"" -#: ../urpmi.update:98 +#: ../urpmi.update:99 #, c-format msgid "enabling media %s" msgstr "galluogi cyfrwng %s" -#: ../urpmi.update:98 +#: ../urpmi.update:99 #, c-format msgid "ignoring media %s" msgstr "anwybyddu cyfrwng %s" -#: ../urpmq:38 +#: ../urpmq:39 #, c-format msgid "" "urpmq version %s\n" @@ -2156,35 +2185,35 @@ msgstr "" "\n" "defnydd:\n" -#: ../urpmq:54 +#: ../urpmq:55 msgid " --list - list available packages.\n" msgstr " --list - rhestri'r holl gyfrwng ar gael.\n" -#: ../urpmq:55 +#: ../urpmq:56 msgid " --list-media - list available media.\n" msgstr " --list-media - rhestri'r holl gyfrwng ar gael.\n" -#: ../urpmq:56 +#: ../urpmq:57 msgid " --list-url - list available media and their url.\n" msgstr " --list-url - rhestru'r holl gyfrwng ar gael.\n" -#: ../urpmq:57 +#: ../urpmq:58 msgid " --list-nodes - list available nodes when using --parallel.\n" msgstr "" " --list-nodes - rhestri'r nodau sydd ar gael wrth ddefnyddio --parallel.\n" -#: ../urpmq:58 +#: ../urpmq:59 msgid " --list-aliases - list available parallel aliases.\n" msgstr " --list-aliases - rhestr ar gael ar gyfer enwau paralel.\n" -#: ../urpmq:59 +#: ../urpmq:60 msgid "" " --dump-config - dump the config in form of urpmi.addmedia argument.\n" msgstr "" " --dump-config - dympio'r ffurfweddiad mewn ffurf ymresymiad urpmi." "addmedia.\n" -#: ../urpmq:61 +#: ../urpmq:62 msgid "" " --headers - extract headers for package listed from urpmi db to\n" " stdout (root only).\n" @@ -2192,13 +2221,13 @@ msgstr "" " --headers - tynnu penawdau o becyn yn urpmi db i\n" " stdout (gwraidd yn unig).\n" -#: ../urpmq:63 +#: ../urpmq:64 msgid "" " --sources - give all source packages before downloading (root only).\n" msgstr "" " --sources - give all source packages before downloading (root only).\n" -#: ../urpmq:66 +#: ../urpmq:67 msgid "" " --use-distrib - configure urpmi on the fly from a distrib tree.\n" " This permit to querying a distro.\n" @@ -2206,62 +2235,62 @@ msgstr "" " --use-distrib - ffurfweddu urpmi wrth fynd o goeden distrib.\n" " Mae hyn yn caniatáu ymholi mewn dosbarthiad.\n" -#: ../urpmq:75 +#: ../urpmq:76 msgid " --changelog - print changelog.\n" msgstr " --changelog - cofnod argraffu.\n" -#: ../urpmq:76 +#: ../urpmq:77 msgid " --summary, -S - print summary.\n" msgstr " --summary, -S - crynodeb argraffu.\n" -#: ../urpmq:78 +#: ../urpmq:79 msgid " -c - complete output with package to be removed.\n" msgstr " -c - allbwn cyfan a phecyn i'w dynnu\n" -#: ../urpmq:79 +#: ../urpmq:80 msgid " -d - extend query to package dependencies.\n" msgstr " -d - ymestyn ymholiad i ddibyniaethau pecynnau.\n" -#: ../urpmq:81 +#: ../urpmq:82 msgid " -g - print groups with name also.\n" msgstr " -g - argraffu grwpiau gydag enw hefyd.\n" -#: ../urpmq:82 +#: ../urpmq:83 msgid " -i - print useful information in human readable form.\n" msgstr "" " -i - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy " "i bobl.\n" -#: ../urpmq:83 +#: ../urpmq:84 msgid " -l - list files in package.\n" msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n" -#: ../urpmq:84 +#: ../urpmq:85 msgid "" " -P - do not search in provides to find package (default).\n" msgstr "" " -P - peidio chwilio yn provides i ganfod pecyn " "(rhagosodedig).\n" -#: ../urpmq:85 +#: ../urpmq:86 msgid " -p - search in provides to find package.\n" msgstr " -p - caniatáu i chwilio canfod pecyn.\n" -#: ../urpmq:86 +#: ../urpmq:87 msgid " -r - print version and release with name also.\n" msgstr " -r - argraffu fersiwn a rhyddhad gydag enw hefyd.\n" -#: ../urpmq:87 +#: ../urpmq:88 msgid " -R - reverse search to what requires package.\n" msgstr " -R - chwilio nôl i'r hyn sydd angen ar becyn.\n" -#: ../urpmq:88 +#: ../urpmq:89 msgid "" " -RR - extended reverse search (includes virtual packages).\n" msgstr "" " -RR - chwilio nôl estyndig (yn cynnwys rhith becynnau) \n" -#: ../urpmq:90 +#: ../urpmq:91 msgid "" " -u - remove package if a more recent version is already " "installed.\n" @@ -2269,40 +2298,47 @@ msgstr "" " -u - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei " "osod.\n" -#: ../urpmq:93 +#: ../urpmq:94 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:94 +#: ../urpmq:95 msgid " names or rpm files given on command line are queried.\n" msgstr "" " bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael " "eu holi.\n" -#: ../urpmq:157 +#: ../urpmq:158 msgid "--list-nodes can only be used with --parallel" msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes" #. TODO rewrite rpm2header in perl -#: ../urpmq:313 +#: ../urpmq:314 msgid "rpm2header utility not found, impossible to use the --header option" msgstr "" -#: ../urpmq:362 +#: ../urpmq:363 #, c-format msgid "skipping media %s: no hdlist" msgstr "hepgor cyfrwng %s: dim hdliist" -#: ../urpmq:437 +#: ../urpmq:438 msgid "No filelist found\n" msgstr "Heb ganfod filelist\n" -#: ../urpmq:449 +#: ../urpmq:450 msgid "No changelog found\n" msgstr "Heb ganfod changelog\n" +#~ msgid "" +#~ "To satisfy dependencies, the following %d packages are going to be " +#~ "installed (%d MB)" +#~ msgstr "" +#~ "I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d " +#~ "MB)" + #~ msgid "installing %s\n" #~ msgstr "gosod %s\n" |