X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b1471fb3f60fdb9f91a45723ca70649204df7bdb..2a8a592d574cf1db6c7c47623fd463bf6f651553:/po/cy.po diff --git a/po/cy.po b/po/cy.po index 05f8762cb..5682b2264 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,170 +6,174 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 15:17+0100\n" +"POT-Creation-Date: 2010-08-23 18:41-0400\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" +"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:141 +#: cmdline/apt-cache.cc:156 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644 -#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021 -#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575 -#, c-format -msgid "Unable to locate package %s" -msgstr "Ni ellir lleoli'r pecyn %s" - -#: cmdline/apt-cache.cc:245 +#: cmdline/apt-cache.cc:284 #, fuzzy msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:286 +#, fuzzy +msgid "Total package structures: " +msgstr "Cyfanswm Enwau Pecynnau : " + +#: cmdline/apt-cache.cc:326 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:286 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:287 +#: cmdline/apt-cache.cc:328 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:288 +#: cmdline/apt-cache.cc:329 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:289 +#: cmdline/apt-cache.cc:330 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:291 +#: cmdline/apt-cache.cc:332 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:293 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:295 +#: cmdline/apt-cache.cc:336 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:298 +#: cmdline/apt-cache.cc:339 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:300 +#: cmdline/apt-cache.cc:341 #, fuzzy msgid "Total Desc/File relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:302 +#: cmdline/apt-cache.cc:343 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:355 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:369 #, fuzzy msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:333 +#: cmdline/apt-cache.cc:374 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:382 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221 +#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1297 -msgid "You must give exactly one pattern" +#: cmdline/apt-cache.cc:1273 +#, fuzzy +msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1451 +#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431 +#: cmdline/apt-cache.cc:1508 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440 +#, c-format +msgid "Unable to locate package %s" +msgstr "Ni ellir lleoli'r pecyn %s" + +#: cmdline/apt-cache.cc:1533 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622 +#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1549 +#: cmdline/apt-cache.cc:1554 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602 +#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618 msgid "(not found)" msgstr "(heb ganfod)" -#. Installed version -#: cmdline/apt-cache.cc:1582 +#: cmdline/apt-cache.cc:1575 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592 -msgid "(none)" -msgstr "(dim)" - -#. Candidate Version -#: cmdline/apt-cache.cc:1589 +#: cmdline/apt-cache.cc:1576 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1599 +#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608 +msgid "(none)" +msgstr "(dim)" + +#: cmdline/apt-cache.cc:1615 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1608 +#: cmdline/apt-cache.cc:1624 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584 +#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1725 +#: cmdline/apt-cache.cc:1739 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -191,6 +195,7 @@ msgid "" " unmet - Show unmet dependencies\n" " search - Search the package list for a regex pattern\n" " show - Show a readable record for the package\n" +" showauto - Display a list of automatically installed packages\n" " depends - Show raw dependency information for a package\n" " rdepends - Show reverse dependency information for a package\n" " pkgnames - List the names of all packages in the system\n" @@ -256,7 +261,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:114 +#: cmdline/apt-cdrom.cc:127 +#, fuzzy, c-format +msgid "Failed to mount '%s' to '%s'" +msgstr "Methwyd ailenwi %s at %s" + +#: cmdline/apt-cdrom.cc:162 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -324,41 +334,41 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: cmdline/apt-extracttemplates.cc:310 +#: cmdline/apt-extracttemplates.cc:309 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 +#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345 msgid "Package extension list is too long" msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." -#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180 -#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253 -#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289 +#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187 +#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260 +#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296 #, fuzzy, c-format msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: ftparchive/apt-ftparchive.cc:251 +#: ftparchive/apt-ftparchive.cc:258 msgid "Source extension list is too long" msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -#: ftparchive/apt-ftparchive.cc:368 +#: ftparchive/apt-ftparchive.cc:375 msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: ftparchive/apt-ftparchive.cc:398 +#: ftparchive/apt-ftparchive.cc:405 #, fuzzy, c-format msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops -#: ftparchive/apt-ftparchive.cc:553 +#: ftparchive/apt-ftparchive.cc:590 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -440,11 +450,11 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol" -#: ftparchive/apt-ftparchive.cc:759 +#: ftparchive/apt-ftparchive.cc:796 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:832 +#: ftparchive/apt-ftparchive.cc:874 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" @@ -484,88 +494,88 @@ msgstr "Does dim cofnod rheoli gan yr archif" msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:76 +#: ftparchive/writer.cc:73 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: ftparchive/writer.cc:81 +#: ftparchive/writer.cc:78 #, c-format msgid "W: Unable to stat %s\n" msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: ftparchive/writer.cc:132 +#: ftparchive/writer.cc:134 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:136 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:143 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:170 +#: ftparchive/writer.cc:174 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:195 +#: ftparchive/writer.cc:201 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:254 +#: ftparchive/writer.cc:260 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:262 +#: ftparchive/writer.cc:268 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:266 +#: ftparchive/writer.cc:272 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:279 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:283 +#: ftparchive/writer.cc:289 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:389 +#: ftparchive/writer.cc:393 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 +#: ftparchive/writer.cc:401 ftparchive/writer.cc:688 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 +#: ftparchive/writer.cc:464 ftparchive/writer.cc:790 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:638 +#: ftparchive/writer.cc:698 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:642 +#: ftparchive/writer.cc:702 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -666,82 +676,82 @@ msgstr "Gwall wrth datgysylltu %s" msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-get.cc:127 +#: cmdline/apt-get.cc:134 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:156 apt-pkg/cachefilter.cc:29 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:251 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: cmdline/apt-get.cc:334 +#: cmdline/apt-get.cc:341 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:336 +#: cmdline/apt-get.cc:343 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:343 +#: cmdline/apt-get.cc:350 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:352 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:348 +#: cmdline/apt-get.cc:355 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:348 +#: cmdline/apt-get.cc:355 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:353 +#: cmdline/apt-get.cc:360 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:382 +#: cmdline/apt-get.cc:391 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:408 +#: cmdline/apt-get.cc:419 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:430 +#: cmdline/apt-get.cc:441 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: cmdline/apt-get.cc:451 +#: cmdline/apt-get.cc:464 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: cmdline/apt-get.cc:472 +#: cmdline/apt-get.cc:487 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: cmdline/apt-get.cc:492 +#: cmdline/apt-get.cc:507 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:560 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:553 +#: cmdline/apt-get.cc:568 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -751,148 +761,239 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: cmdline/apt-get.cc:584 +#: cmdline/apt-get.cc:602 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: cmdline/apt-get.cc:588 +#: cmdline/apt-get.cc:606 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:590 +#: cmdline/apt-get.cc:608 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:592 +#: cmdline/apt-get.cc:610 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: cmdline/apt-get.cc:596 +#: cmdline/apt-get.cc:614 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:669 +#: cmdline/apt-get.cc:634 +#, fuzzy, c-format +msgid "Note, selecting '%s' for task '%s'\n" +msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" + +#: cmdline/apt-get.cc:640 +#, fuzzy, c-format +msgid "Note, selecting '%s' for regex '%s'\n" +msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" + +#: cmdline/apt-get.cc:647 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" + +#: cmdline/apt-get.cc:657 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" + +#: cmdline/apt-get.cc:668 +msgid " [Installed]" +msgstr " [Sefydliwyd]" + +#: cmdline/apt-get.cc:677 +#, fuzzy +msgid " [Not candidate version]" +msgstr "Fersiynau Posib" + +#: cmdline/apt-get.cc:679 +msgid "You should explicitly select one to install." +msgstr "Dylech ddewis un yn benodol i'w sefydlu." + +# FIXME: punctuation +#: cmdline/apt-get.cc:682 +#, fuzzy, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" +"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" +"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n" +"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" +"ffeil sources.list.\n" + +#: cmdline/apt-get.cc:700 +msgid "However the following packages replace it:" +msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" + +#: cmdline/apt-get.cc:712 +#, fuzzy, c-format +msgid "Package '%s' has no installation candidate" +msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" + +#: cmdline/apt-get.cc:723 +#, c-format +msgid "Virtual packages like '%s' can't be removed\n" +msgstr "" + +#: cmdline/apt-get.cc:754 +#, fuzzy, c-format +msgid "Note, selecting '%s' instead of '%s'\n" +msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" + +#: cmdline/apt-get.cc:784 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" + +#: cmdline/apt-get.cc:788 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" + +#: cmdline/apt-get.cc:798 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" + +#: cmdline/apt-get.cc:803 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" + +#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979 +#, fuzzy, c-format +msgid "%s set to manually installed.\n" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: cmdline/apt-get.cc:859 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" + +#: cmdline/apt-get.cc:934 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:672 +#: cmdline/apt-get.cc:937 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:675 +#: cmdline/apt-get.cc:940 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:943 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:680 +#: cmdline/apt-get.cc:945 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:684 +#: cmdline/apt-get.cc:949 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." -#: cmdline/apt-get.cc:687 +#: cmdline/apt-get.cc:952 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:712 +#: cmdline/apt-get.cc:977 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:716 +#: cmdline/apt-get.cc:981 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:723 +#: cmdline/apt-get.cc:988 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:725 +#: cmdline/apt-get.cc:990 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:775 +#: cmdline/apt-get.cc:1040 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:1049 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: cmdline/apt-get.cc:795 +#: cmdline/apt-get.cc:1060 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 -msgid "Unable to lock the download directory" -msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" - -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 -#: apt-pkg/cachefile.cc:65 +#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481 +#: apt-pkg/cachefile.cc:106 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:836 +#: cmdline/apt-get.cc:1100 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:841 +#: cmdline/apt-get.cc:1105 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:844 +#: cmdline/apt-get.cc:1108 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:1113 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" -#: cmdline/apt-get.cc:852 +#: cmdline/apt-get.cc:1116 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319 +#: cmdline/apt-get.cc:2322 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:880 +#: cmdline/apt-get.cc:1144 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." -#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:898 +#: cmdline/apt-get.cc:1162 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:900 +#: cmdline/apt-get.cc:1164 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -903,29 +1004,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 +#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:1185 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1011 +#: cmdline/apt-get.cc:1275 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1282 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -933,139 +1034,80 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1022 +#: cmdline/apt-get.cc:1286 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1291 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1292 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1086 -#, c-format -msgid "Note, selecting %s instead of %s\n" -msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" - -#: cmdline/apt-get.cc:1097 -#, c-format -msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" - -#: cmdline/apt-get.cc:1115 -#, c-format -msgid "Package %s is not installed, so not removed\n" -msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" - -#: cmdline/apt-get.cc:1126 -#, c-format -msgid "Package %s is a virtual package provided by:\n" -msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" - -#: cmdline/apt-get.cc:1138 -msgid " [Installed]" -msgstr " [Sefydliwyd]" - -#: cmdline/apt-get.cc:1143 -msgid "You should explicitly select one to install." -msgstr "Dylech ddewis un yn benodol i'w sefydlu." - -# FIXME: punctuation -#: cmdline/apt-get.cc:1148 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1320 msgid "" -"Package %s is not available, but is referred to by another package.\n" -"This may mean that the package is missing, has been obsoleted, or\n" -"is only available from another source\n" -msgstr "" -"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" -"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n" -"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" -"ffeil sources.list.\n" - -#: cmdline/apt-get.cc:1167 -msgid "However the following packages replace it:" -msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" - -#: cmdline/apt-get.cc:1170 -#, c-format -msgid "Package %s has no installation candidate" -msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +msgstr[1] "" -#: cmdline/apt-get.cc:1190 -#, c-format -msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" - -#: cmdline/apt-get.cc:1198 -#, c-format -msgid "%s is already the newest version.\n" -msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" - -#: cmdline/apt-get.cc:1227 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" - -#: cmdline/apt-get.cc:1229 -#, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " - -#: cmdline/apt-get.cc:1235 -#, c-format -msgid "Selected version %s (%s) for %s\n" -msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" +#: cmdline/apt-get.cc:1324 +msgid "Note: This is done automatic and on purpose by dpkg." +msgstr "" -#: cmdline/apt-get.cc:1321 +#: cmdline/apt-get.cc:1454 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1486 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1524 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1540 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1418 -msgid "Unable to lock the list directory" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" - -#: cmdline/apt-get.cc:1474 +#: cmdline/apt-get.cc:1605 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1523 +#: cmdline/apt-get.cc:1653 #, fuzzy msgid "" +"The following package is automatically installed and is no longer required:" +msgid_plural "" "The following packages were automatically installed and are no longer " "required:" -msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1657 #, fuzzy, c-format -msgid "%lu packages were automatically installed and are no longer required.\n" -msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1659 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1531 +#: cmdline/apt-get.cc:1664 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1081,46 +1123,26 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1671 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1690 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1612 -#, fuzzy, c-format -msgid "Couldn't find task %s" -msgstr "Methwyd canfod pecyn %s" - -#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 -#, c-format -msgid "Couldn't find package %s" -msgstr "Methwyd canfod pecyn %s" - -#: cmdline/apt-get.cc:1750 -#, c-format -msgid "Note, selecting %s for regex '%s'\n" -msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" - -#: cmdline/apt-get.cc:1781 -#, fuzzy, c-format -msgid "%s set to manually installed.\n" -msgstr "ond mae %s yn mynd i gael ei sefydlu" - -#: cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1779 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: cmdline/apt-get.cc:1797 +#: cmdline/apt-get.cc:1782 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1129,7 +1151,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1809 +#: cmdline/apt-get.cc:1794 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1141,127 +1163,156 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1827 +#: cmdline/apt-get.cc:1812 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1841 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1945 +#: cmdline/apt-get.cc:1931 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1946 +#: cmdline/apt-get.cc:1932 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1974 +#, c-format +msgid "Couldn't find package %s" +msgstr "Methwyd canfod pecyn %s" + +#: cmdline/apt-get.cc:1981 +#, fuzzy, c-format +msgid "%s set to automatically installed.\n" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: cmdline/apt-get.cc:2002 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:2010 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142 +msgid "Unable to lock the download directory" +msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" + +#: cmdline/apt-get.cc:2185 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 +#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2241 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2246 +#, c-format +msgid "" +"Please use:\n" +"bzr get %s\n" +"to retrieve the latest (possibly unreleased) updates to the package.\n" +msgstr "" + +#: cmdline/apt-get.cc:2297 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2272 +#: cmdline/apt-get.cc:2332 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:2278 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2281 +#: cmdline/apt-get.cc:2341 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2287 +#: cmdline/apt-get.cc:2347 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2380 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2346 +#: cmdline/apt-get.cc:2410 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2358 +#: cmdline/apt-get.cc:2422 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2376 +#: cmdline/apt-get.cc:2440 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2395 +#: cmdline/apt-get.cc:2460 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2411 +#: cmdline/apt-get.cc:2476 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:2439 +#: cmdline/apt-get.cc:2506 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:2459 +#: cmdline/apt-get.cc:2526 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2511 +#: cmdline/apt-get.cc:2577 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" -"s" +"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " +"%s" -#: cmdline/apt-get.cc:2564 +#: cmdline/apt-get.cc:2630 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1270,34 +1321,34 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:2600 +#: cmdline/apt-get.cc:2666 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:2627 +#: cmdline/apt-get.cc:2693 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2643 +#: cmdline/apt-get.cc:2709 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2648 +#: cmdline/apt-get.cc:2714 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2680 +#: cmdline/apt-get.cc:2745 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2721 +#: cmdline/apt-get.cc:2786 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1322,6 +1373,8 @@ msgid "" " clean - Erase downloaded archive files\n" " autoclean - Erase old downloaded archive files\n" " check - Verify that there are no broken dependencies\n" +" markauto - Mark the given packages as automatically installed\n" +" unmarkauto - Mark the given packages as manually installed\n" "\n" "Options:\n" " -h This help text.\n" @@ -1382,7 +1435,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:2889 +#: cmdline/apt-get.cc:2958 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1636,10 +1689,11 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 -#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 -#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 -#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166 +#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98 +#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306 +#: methods/mirror.cc:87 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@ -1668,10 +1722,9 @@ msgstr "Methwyd stat() ar %sinfo" msgid "The info and temp directories need to be on the same filesystem" msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" -#. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 -#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 -#: apt-pkg/pkgcachegen.cc:1008 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070 +#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180 +#: apt-pkg/pkgcachegen.cc:1326 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" @@ -1784,12 +1837,33 @@ msgstr "Methwyd lleoli ffeil rheoli dilys" msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" -#: methods/cdrom.cc:200 +#: methods/bzip2.cc:68 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "Methwyd agor pibell ar gyfer %s" + +#: methods/bzip2.cc:113 +#, c-format +msgid "Read error from %s process" +msgstr "Gwall darllen o broses %s" + +#: methods/bzip2.cc:145 methods/bzip2.cc:154 methods/copy.cc:43 +#: methods/gzip.cc:96 methods/gzip.cc:105 methods/rred.cc:486 +#: methods/rred.cc:495 +msgid "Failed to stat" +msgstr "Methwyd stat()" + +#: methods/bzip2.cc:151 methods/copy.cc:80 methods/gzip.cc:102 +#: methods/rred.cc:492 +msgid "Failed to set modification time" +msgstr "Methwyd gosod amser newid" + +#: methods/cdrom.cc:199 #, c-format msgid "Unable to read the cdrom database %s" msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" -#: methods/cdrom.cc:209 +#: methods/cdrom.cc:208 #, fuzzy msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " @@ -1798,7 +1872,7 @@ msgstr "" "Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-" "get update i ychwanegu CDau newydd." -#: methods/cdrom.cc:219 +#: methods/cdrom.cc:218 #, fuzzy msgid "Wrong CD-ROM" msgstr "CD Anghywir" @@ -1818,15 +1892,6 @@ msgstr "Ffeil heb ei ganfod" msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:483 methods/rred.cc:492 -msgid "Failed to stat" -msgstr "Methwyd stat()" - -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 -msgid "Failed to set modification time" -msgstr "Methwyd gosod amser newid" - #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" @@ -1886,7 +1951,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190 msgid "Read error" msgstr "Gwall darllen" @@ -1898,200 +1963,181 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 +#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:704 +#: methods/ftp.cc:703 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:710 +#: methods/ftp.cc:709 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:728 +#: methods/ftp.cc:727 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:742 +#: methods/ftp.cc:741 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:746 +#: methods/ftp.cc:745 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:753 +#: methods/ftp.cc:752 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:785 +#: methods/ftp.cc:784 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:795 +#: methods/ftp.cc:794 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:804 +#: methods/ftp.cc:803 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:824 +#: methods/ftp.cc:823 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:831 +#: methods/ftp.cc:830 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:883 +#: methods/ftp.cc:882 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:898 methods/rsh.cc:322 +#: methods/ftp.cc:897 methods/rsh.cc:321 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:928 +#: methods/ftp.cc:927 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1005 +#: methods/ftp.cc:1004 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1117 +#: methods/ftp.cc:1116 msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:70 +#: methods/connect.cc:71 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:81 +#: methods/connect.cc:82 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:90 +#: methods/connect.cc:89 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)" -#: methods/connect.cc:96 +#: methods/connect.cc:95 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:104 +#: methods/connect.cc:103 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: methods/connect.cc:119 +#: methods/connect.cc:121 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:147 methods/rsh.cc:425 +#: methods/connect.cc:149 methods/rsh.cc:424 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:166 methods/connect.cc:185 +#: methods/connect.cc:168 methods/connect.cc:187 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:191 +#: methods/connect.cc:193 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:194 +#: methods/connect.cc:196 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:241 +#: methods/connect.cc:243 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" #. TRANSLATOR: %s is the trusted keyring parts directory -#: methods/gpgv.cc:78 +#: methods/gpgv.cc:71 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Yn Erthylu'r Sefydliad." -#: methods/gpgv.cc:104 -msgid "E: Too many keyrings should be passed to gpgv. Exiting." -msgstr "" - -#: methods/gpgv.cc:121 -msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" - -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:163 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:242 +#: methods/gpgv.cc:168 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:246 -#, c-format -msgid "Could not execute '%s' to verify signature (is gpgv installed?)" +#: methods/gpgv.cc:172 +msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:251 +#: methods/gpgv.cc:177 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:285 methods/gpgv.cc:292 +#: methods/gpgv.cc:211 methods/gpgv.cc:218 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:299 +#: methods/gpgv.cc:225 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:64 -#, c-format -msgid "Couldn't open pipe for %s" -msgstr "Methwyd agor pibell ar gyfer %s" - -#: methods/gzip.cc:109 -#, c-format -msgid "Read error from %s process" -msgstr "Gwall darllen o broses %s" - #: methods/http.cc:385 msgid "Waiting for headers" msgstr "Yn aros am benawdau" @@ -2129,101 +2175,122 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:791 +#: methods/http.cc:793 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:796 +#: methods/http.cc:798 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:819 +#: methods/http.cc:821 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:850 +#: methods/http.cc:852 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:878 +#: methods/http.cc:880 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:892 +#: methods/http.cc:894 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:894 +#: methods/http.cc:896 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281 #, fuzzy msgid "Failed to truncate file" msgstr "Methwyd ysgrifennu ffeil %s" -#: methods/http.cc:1150 +#: methods/http.cc:1154 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1167 methods/http.cc:1222 +#: methods/http.cc:1171 methods/http.cc:1226 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1314 +#: methods/http.cc:1318 msgid "Internal error" msgstr "Gwall mewnol" -#: apt-pkg/contrib/mmap.cc:76 +#: apt-pkg/contrib/mmap.cc:77 msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 +#: apt-pkg/contrib/mmap.cc:89 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "Methwyd agor pibell ar gyfer %s" + +#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/mmap.cc:252 +#: apt-pkg/contrib/mmap.cc:124 +#, fuzzy +msgid "Unable to close mmap" +msgstr "Ni ellir agor %s" + +# FIXME +#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Methwyd gweithredu " + +#: apt-pkg/contrib/mmap.cc:300 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:347 +#: apt-pkg/contrib/mmap.cc:399 #, c-format msgid "" -"The size of a MMap has already reached the defined limit of %lu bytes,abort " -"the try to grow the MMap." +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." +msgstr "" + +#: apt-pkg/contrib/mmap.cc:402 +msgid "" +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:346 +#: apt-pkg/contrib/strutl.cc:371 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:353 +#: apt-pkg/contrib/strutl.cc:378 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:360 +#: apt-pkg/contrib/strutl.cc:385 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:365 +#: apt-pkg/contrib/strutl.cc:390 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1040 +#: apt-pkg/contrib/strutl.cc:1119 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" @@ -2275,7 +2342,13 @@ msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:825 +#: apt-pkg/contrib/configuration.cc:777 +#, fuzzy, c-format +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgstr "" +"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" + +#: apt-pkg/contrib/configuration.cc:827 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" @@ -2307,33 +2380,33 @@ msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" msgid "Command line option %s is not boolean" msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 #, c-format msgid "Option %s requires an argument." msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 #, c-format msgid "Option %s: Configuration item specification must have an =." msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =." -#: apt-pkg/contrib/cmndline.cc:234 +#: apt-pkg/contrib/cmndline.cc:236 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" -#: apt-pkg/contrib/cmndline.cc:265 +#: apt-pkg/contrib/cmndline.cc:267 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" # FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:298 +#: apt-pkg/contrib/cmndline.cc:300 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." -#: apt-pkg/contrib/cmndline.cc:348 +#: apt-pkg/contrib/cmndline.cc:350 #, c-format msgid "Invalid operation %s" msgstr "Gweithred annilys %s" @@ -2343,198 +2416,221 @@ msgstr "Gweithred annilys %s" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187 -#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39 +#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196 +#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39 +#: methods/mirror.cc:93 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" -#: apt-pkg/contrib/cdromutl.cc:195 +#: apt-pkg/contrib/cdromutl.cc:204 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:151 +#: apt-pkg/contrib/fileutl.cc:154 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:156 +#: apt-pkg/contrib/fileutl.cc:159 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:174 +#: apt-pkg/contrib/fileutl.cc:177 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:178 +#: apt-pkg/contrib/fileutl.cc:181 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:568 +#: apt-pkg/contrib/fileutl.cc:621 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:580 +#: apt-pkg/contrib/fileutl.cc:633 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:582 +#: apt-pkg/contrib/fileutl.cc:635 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:586 +#: apt-pkg/contrib/fileutl.cc:639 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:588 +#: apt-pkg/contrib/fileutl.cc:641 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:632 +#: apt-pkg/contrib/fileutl.cc:697 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" +#: apt-pkg/contrib/fileutl.cc:714 +#, fuzzy, c-format +msgid "Could not open file descriptor %d" +msgstr "Methwyd agor pibell ar gyfer %s" + # FIXME -#: apt-pkg/contrib/fileutl.cc:688 +#: apt-pkg/contrib/fileutl.cc:774 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:718 +#: apt-pkg/contrib/fileutl.cc:807 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:793 -msgid "Problem closing the file" +#: apt-pkg/contrib/fileutl.cc:906 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Gwall wrth gau'r ffeil" + +#: apt-pkg/contrib/fileutl.cc:909 +#, fuzzy, c-format +msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:799 -msgid "Problem unlinking the file" +#: apt-pkg/contrib/fileutl.cc:914 +#, fuzzy, c-format +msgid "Problem renaming the file %s to %s" +msgstr "Gwall wrth gyfamseru'r ffeil" + +#: apt-pkg/contrib/fileutl.cc:925 +#, fuzzy, c-format +msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:810 +#: apt-pkg/contrib/fileutl.cc:938 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/pkgcache.cc:133 +#: apt-pkg/pkgcache.cc:142 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:139 +#: apt-pkg/pkgcache.cc:148 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:144 +#: apt-pkg/pkgcache.cc:153 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:149 +#: apt-pkg/pkgcache.cc:158 #, fuzzy, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:163 msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:290 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:290 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:290 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:291 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:291 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:291 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:292 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:292 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:227 +#: apt-pkg/pkgcache.cc:292 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:303 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:303 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:303 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:239 +#: apt-pkg/pkgcache.cc:304 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:239 +#: apt-pkg/pkgcache.cc:304 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152 +#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:124 +#: apt-pkg/depcache.cc:125 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:153 +#: apt-pkg/depcache.cc:154 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" -#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 +#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211 #, fuzzy msgid "Reading state information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-pkg/depcache.cc:223 +#: apt-pkg/depcache.cc:236 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Methwyd agor %s" -#: apt-pkg/depcache.cc:229 +#: apt-pkg/depcache.cc:242 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" +#: apt-pkg/depcache.cc:921 +#, c-format +msgid "Internal error, group '%s' has no installable pseudo package" +msgstr "" + # FIXME: number? #: apt-pkg/tagfile.cc:102 #, c-format @@ -2546,58 +2642,82 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:83 +#: apt-pkg/sourcelist.cc:92 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" + +#: apt-pkg/sourcelist.cc:95 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" + +#: apt-pkg/sourcelist.cc:106 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" + +#: apt-pkg/sourcelist.cc:112 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" + +#: apt-pkg/sourcelist.cc:115 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" + +#: apt-pkg/sourcelist.cc:128 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:85 +#: apt-pkg/sourcelist.cc:130 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:88 +#: apt-pkg/sourcelist.cc:133 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:94 +#: apt-pkg/sourcelist.cc:139 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:146 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:199 +#: apt-pkg/sourcelist.cc:244 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:236 +#: apt-pkg/sourcelist.cc:281 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:240 +#: apt-pkg/sourcelist.cc:285 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 -#, fuzzy, c-format -msgid "Malformed line %u in source list %s (vendor id)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" - -#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586 +#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616 #, c-format msgid "" "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " @@ -2605,7 +2725,7 @@ msgid "" msgstr "" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:440 +#: apt-pkg/packagemanager.cc:452 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2616,7 +2736,7 @@ msgstr "" "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." -#: apt-pkg/packagemanager.cc:478 +#: apt-pkg/packagemanager.cc:495 #, c-format msgid "" "Could not perform immediate configuration on already unpacked '%s'.Please " @@ -2628,7 +2748,7 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:248 +#: apt-pkg/algorithms.cc:292 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2636,7 +2756,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1138 +#: apt-pkg/algorithms.cc:1182 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2644,12 +2764,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1140 +#: apt-pkg/algorithms.cc:1184 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417 +#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2657,24 +2777,29 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: apt-pkg/acquire.cc:60 -#, c-format -msgid "Lists directory %spartial is missing." +#: apt-pkg/acquire.cc:79 +#, fuzzy, c-format +msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/acquire.cc:64 -#, c-format -msgid "Archive directory %spartial is missing." +#: apt-pkg/acquire.cc:83 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." msgstr "Mae'r cyfeiriadur archif %spartial ar goll." +#: apt-pkg/acquire.cc:91 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" + #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:826 +#: apt-pkg/acquire.cc:878 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:828 +#: apt-pkg/acquire.cc:880 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" @@ -2697,12 +2822,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:133 +#: apt-pkg/init.cc:141 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:149 +#: apt-pkg/init.cc:157 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" @@ -2717,146 +2842,168 @@ msgstr "Ni ellir gwneud stat() o %s." msgid "You must put some 'source' URIs in your sources.list" msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" -#: apt-pkg/cachefile.cc:71 +#: apt-pkg/cachefile.cc:84 msgid "The package lists or status file could not be parsed or opened." msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." -#: apt-pkg/cachefile.cc:75 +#: apt-pkg/cachefile.cc:88 msgid "You may want to run apt-get update to correct these problems" msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." # FIXME: literal -#: apt-pkg/policy.cc:316 +#: apt-pkg/policy.cc:343 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" # FIXME: tense -#: apt-pkg/policy.cc:338 +#: apt-pkg/policy.cc:365 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:346 +#: apt-pkg/policy.cc:373 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/pkgcachegen.cc:74 +#: apt-pkg/pkgcachegen.cc:80 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" -#: apt-pkg/pkgcachegen.cc:117 +#: apt-pkg/pkgcachegen.cc:198 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:132 +#: apt-pkg/pkgcachegen.cc:215 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:166 +#: apt-pkg/pkgcachegen.cc:253 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:191 +#: apt-pkg/pkgcachegen.cc:285 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:195 +#: apt-pkg/pkgcachegen.cc:289 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:226 +#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316 +#: apt-pkg/pkgcachegen.cc:324 #, fuzzy, c-format -msgid "Error occurred while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion%d)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:230 +#: apt-pkg/pkgcachegen.cc:320 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:234 -#, fuzzy, c-format -msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" - -#: apt-pkg/pkgcachegen.cc:258 +#: apt-pkg/pkgcachegen.cc:353 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:264 +#: apt-pkg/pkgcachegen.cc:360 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:267 +#: apt-pkg/pkgcachegen.cc:363 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:270 +#: apt-pkg/pkgcachegen.cc:366 #, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:273 +#: apt-pkg/pkgcachegen.cc:369 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:301 +#: apt-pkg/pkgcachegen.cc:398 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:314 +#: apt-pkg/pkgcachegen.cc:412 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:320 +#: apt-pkg/pkgcachegen.cc:418 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:706 +#: apt-pkg/pkgcachegen.cc:982 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:808 +#: apt-pkg/pkgcachegen.cc:1087 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 +#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:128 +#: apt-pkg/acquire-item.cc:136 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:432 +#: apt-pkg/acquire-item.cc:484 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 +#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570 +#: apt-pkg/acquire-item.cc:1713 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1150 +#: apt-pkg/acquire-item.cc:1240 msgid "There is no public key available for the following key IDs:\n" msgstr "" +#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is +#. the time since then the file is invalid - formated in the same way as in +#. the download progress display (e.g. 7d 3h 42min 1s) +#: apt-pkg/acquire-item.cc:1277 +#, c-format +msgid "Release file expired, ignoring %s (invalid since %s)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1298 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "" + +#: apt-pkg/acquire-item.cc:1324 +#, c-format +msgid "" +"A error occurred during the signature verification. The repository is not " +"updated and the previous index files will be used.GPG error: %s: %s\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:1333 +#, c-format +msgid "GPG error: %s: %s" +msgstr "" + # FIXME: case -#: apt-pkg/acquire-item.cc:1260 +#: apt-pkg/acquire-item.cc:1361 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2865,7 +3012,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1319 +#: apt-pkg/acquire-item.cc:1420 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2874,260 +3021,374 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1360 +#: apt-pkg/acquire-item.cc:1475 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1447 +#: apt-pkg/acquire-item.cc:1562 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" # FIXME: number? -#: apt-pkg/indexrecords.cc:40 +#: apt-pkg/indexrecords.cc:53 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/indexrecords.cc:47 +#: apt-pkg/indexrecords.cc:60 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: apt-pkg/indexrecords.cc:81 +#: apt-pkg/indexrecords.cc:94 #, c-format msgid "No Hash entry in Release file %s" msgstr "" +#: apt-pkg/indexrecords.cc:107 +#, fuzzy, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" + +# FIXME: number? +#: apt-pkg/indexrecords.cc:122 +#, fuzzy, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + #: apt-pkg/vendorlist.cc:66 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:525 +#: apt-pkg/cdrom.cc:518 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 +#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:559 +#: apt-pkg/cdrom.cc:552 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 +#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" -#: apt-pkg/cdrom.cc:585 +#: apt-pkg/cdrom.cc:578 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:603 +#: apt-pkg/cdrom.cc:596 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:607 +#: apt-pkg/cdrom.cc:600 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:608 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:633 +#: apt-pkg/cdrom.cc:626 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:673 +#: apt-pkg/cdrom.cc:666 #, c-format msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" -"zu signatures\n" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:684 +#: apt-pkg/cdrom.cc:677 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:703 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:739 +#: apt-pkg/cdrom.cc:732 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:748 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:759 +#: apt-pkg/cdrom.cc:752 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:785 +#: apt-pkg/cdrom.cc:778 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:794 +#: apt-pkg/cdrom.cc:787 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837 +#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840 +#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843 +#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:530 +#: apt-pkg/indexcopy.cc:532 #, fuzzy, c-format msgid "Skipping nonexistent file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/indexcopy.cc:536 +#: apt-pkg/indexcopy.cc:538 #, c-format msgid "Can't find authentication record for: %s" msgstr "" -#: apt-pkg/indexcopy.cc:542 +#: apt-pkg/indexcopy.cc:544 #, fuzzy, c-format msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/deb/dpkgpm.cc:49 +#: apt-pkg/cacheset.cc:337 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" + +#: apt-pkg/cacheset.cc:340 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " + +#: apt-pkg/cacheset.cc:447 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Methwyd canfod pecyn %s" + +#: apt-pkg/cacheset.cc:454 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Methwyd canfod pecyn %s" + +#: apt-pkg/cacheset.cc:467 +#, c-format +msgid "Can't select versions from package '%s' as it purely virtual" +msgstr "" + +#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" + +#: apt-pkg/cacheset.cc:491 +#, c-format +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" + +#: apt-pkg/cacheset.cc:499 +#, c-format +msgid "Can't select candidate version from package %s as it has no candidate" +msgstr "" + +#: apt-pkg/cacheset.cc:507 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:52 +#: apt-pkg/deb/dpkgpm.cc:55 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:53 +#: apt-pkg/deb/dpkgpm.cc:56 +#, c-format +msgid "Noting disappearance of %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:57 #, c-format msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:643 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Methwyd agor ffeil %s" + +#: apt-pkg/deb/dpkgpm.cc:812 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:655 +#: apt-pkg/deb/dpkgpm.cc:813 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:660 +#: apt-pkg/deb/dpkgpm.cc:818 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:662 +#: apt-pkg/deb/dpkgpm.cc:820 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:667 +#: apt-pkg/deb/dpkgpm.cc:825 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:669 +#: apt-pkg/deb/dpkgpm.cc:827 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:674 +#: apt-pkg/deb/dpkgpm.cc:832 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:675 +#: apt-pkg/deb/dpkgpm.cc:833 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:879 +#: apt-pkg/deb/dpkgpm.cc:1039 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:909 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/debsystem.cc:70 +#: apt-pkg/deb/dpkgpm.cc:1273 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1278 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1280 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1286 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1292 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1299 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:69 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:73 +#: apt-pkg/deb/debsystem.cc:72 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: apt-pkg/deb/debsystem.cc:82 +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:88 +#, c-format msgid "" -"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " -"the problem. " +"dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:100 +#: apt-pkg/deb/debsystem.cc:106 msgid "Not locked" msgstr "" +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:200 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + +#: methods/mirror.cc:343 +#, c-format +msgid "[Mirror: %s]" +msgstr "" + #: methods/rred.cc:465 #, c-format msgid "" @@ -3142,10 +3403,18 @@ msgid "" "to be corrupt." msgstr "" -#: methods/rsh.cc:330 +#: methods/rsh.cc:329 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +#, fuzzy +#~ msgid "Error occurred while processing %s (NewVersion2)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" + +#, fuzzy +#~ msgid "Malformed line %u in source list %s (vendor id)" +#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" + #, fuzzy #~ msgid "Couldn't access keyring: '%s'" #~ msgstr "Methwyd datrys '%s'"