X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/1f31762e69fd52fc67306d4b8af98c4e4519e2e4..fc81e8f2deff3b86738cad78aa491b1b514b3c59:/po/cy.po diff --git a/po/cy.po b/po/cy.po index 477b23909..ed60779d8 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-01-09 22:34+0000\n" +"POT-Creation-Date: 2010-05-04 13:37+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -14,21 +14,27 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:143 +#: cmdline/apt-cache.cc:141 #, 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:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640 -#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018 -#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646 +#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023 +#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523 +#: cmdline/apt-cache.cc:1606 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" +#: cmdline/apt-cache.cc:245 +#, fuzzy +msgid "Total package names: " +msgstr "Cyfanswm Enwau Pecynnau : " + #: cmdline/apt-cache.cc:247 #, fuzzy -msgid "Total package names : " +msgid "Total package structures: " msgstr "Cyfanswm Enwau Pecynnau : " #: cmdline/apt-cache.cc:287 @@ -62,7 +68,7 @@ msgstr "Cyfanswm Fersiynau Gwahanol: " #: cmdline/apt-cache.cc:295 #, fuzzy -msgid "Total Distinct Descriptions: " +msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " #: cmdline/apt-cache.cc:297 @@ -105,81 +111,69 @@ msgstr "Cyfanswm gofod Slac: " msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218 +#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1293 +#: cmdline/apt-cache.cc:1299 msgid "You must give exactly one pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1447 +#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1524 +#: cmdline/apt-cache.cc:1548 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617 +#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657 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" -#: cmdline/apt-cache.cc:1532 -#, c-format -msgid "%4i %s\n" -msgstr "%4i %s\n" - #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1544 +#: cmdline/apt-cache.cc:1569 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597 +#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637 msgid "(not found)" msgstr "(heb ganfod)" -#. Installed version -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1590 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587 -msgid "(none)" -msgstr "(dim)" - -#. Candidate Version -#: cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1591 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1594 +#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627 +msgid "(none)" +msgstr "(dim)" + +#: cmdline/apt-cache.cc:1634 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1603 +#: cmdline/apt-cache.cc:1643 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1618 -#, c-format -msgid " %4i %s\n" -msgstr " %4i %s\n" - -#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2589 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 +#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584 +#: cmdline/apt-get.cc:2729 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:1721 +#: cmdline/apt-cache.cc:1761 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -203,8 +197,8 @@ msgid "" " show - Show a readable record for the package\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\n" -" dotty - Generate package graphs for GraphVis\n" +" pkgnames - List the names of all packages in the system\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -240,7 +234,7 @@ msgstr "" " 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\n" -" dotty - Generate package graphs for GraphVis\n" +" dotty - Generate package graphs for GraphViz\n" " xvcg - Generate package graphs for xvcg\n" " policy - Show policy settings\n" "\n" @@ -251,14 +245,14 @@ msgstr "" " -q Disable progress indicator.\n" " -i Show only important deps for the unmet command.\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -#: cmdline/apt-cdrom.cc:78 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +#: cmdline/apt-cdrom.cc:77 +msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:93 +#: cmdline/apt-cdrom.cc:92 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -266,7 +260,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:117 +#: 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 "" @@ -334,7 +333,7 @@ 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:815 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -343,32 +342,32 @@ msgstr "Ni ellir ysgrifennu i %s" 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" @@ -450,11 +449,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'" @@ -471,7 +470,7 @@ msgstr "Hen gronfa data, yn ceisio uwchraddio %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -486,96 +485,96 @@ msgstr "Ni ellir agor y ffeil DB2 %s: %s" msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 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:387 +#: ftparchive/writer.cc:393 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: 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:440 ftparchive/writer.cc:698 +#: 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:620 +#: 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:624 +#: ftparchive/writer.cc:702 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -676,82 +675,82 @@ msgstr "Gwall wrth datgysylltu %s" msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-get.cc:124 +#: cmdline/apt-get.cc:127 msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1642 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-get.cc:241 +#: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: cmdline/apt-get.cc:331 +#: cmdline/apt-get.cc:334 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:333 +#: cmdline/apt-get.cc:336 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:340 +#: cmdline/apt-get.cc:343 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:342 +#: cmdline/apt-get.cc:345 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:345 +#: cmdline/apt-get.cc:348 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:350 +#: cmdline/apt-get.cc:353 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:379 +#: cmdline/apt-get.cc:384 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:405 +#: cmdline/apt-get.cc:412 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:427 +#: cmdline/apt-get.cc:434 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: cmdline/apt-get.cc:448 +#: cmdline/apt-get.cc:457 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: cmdline/apt-get.cc:469 +#: cmdline/apt-get.cc:480 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: cmdline/apt-get.cc:489 +#: cmdline/apt-get.cc:500 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: cmdline/apt-get.cc:542 +#: cmdline/apt-get.cc:553 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:550 +#: cmdline/apt-get.cc:561 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -761,147 +760,144 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: cmdline/apt-get.cc:581 +#: cmdline/apt-get.cc:595 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: cmdline/apt-get.cc:585 +#: cmdline/apt-get.cc:599 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:587 +#: cmdline/apt-get.cc:601 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:589 +#: cmdline/apt-get.cc:603 #, 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:593 +#: cmdline/apt-get.cc:607 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:667 +#: cmdline/apt-get.cc:680 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:670 +#: cmdline/apt-get.cc:683 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:673 +#: cmdline/apt-get.cc:686 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:689 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:691 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:682 -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:695 +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:685 +#: cmdline/apt-get.cc:698 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:707 +#: cmdline/apt-get.cc:723 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:727 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:718 +#: cmdline/apt-get.cc:734 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:720 +#: cmdline/apt-get.cc:736 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881 +#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:773 +#: cmdline/apt-get.cc:786 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:782 +#: cmdline/apt-get.cc:795 #, 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:793 +#: cmdline/apt-get.cc:806 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1981 cmdline/apt-get.cc:2014 -msgid "Unable to lock the download directory" -msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" - -#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2335 +#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: cmdline/apt-get.cc:834 +#: cmdline/apt-get.cc:846 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:851 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" -#: cmdline/apt-get.cc:842 +#: cmdline/apt-get.cc:854 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" -#: cmdline/apt-get.cc:847 +#: cmdline/apt-get.cc:859 #, 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:850 +#: cmdline/apt-get.cc:862 #, 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:864 cmdline/apt-get.cc:2184 +#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2311 #, 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:871 +#: cmdline/apt-get.cc:890 #, 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:887 cmdline/apt-get.cc:907 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926 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:889 +#: cmdline/apt-get.cc:908 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:891 +#: cmdline/apt-get.cc:910 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -912,29 +908,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916 +#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:931 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2232 apt-pkg/algorithms.cc:1343 +#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:1021 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2241 +#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:1028 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -942,49 +938,59 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1013 +#: cmdline/apt-get.cc:1032 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:1018 +#: cmdline/apt-get.cc:1037 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1019 +#: cmdline/apt-get.cc:1038 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1053 +#: cmdline/apt-get.cc:1096 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1063 +#: cmdline/apt-get.cc:1107 #, 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:1081 +#: cmdline/apt-get.cc:1117 +#, 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:1135 #, 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:1092 +#: cmdline/apt-get.cc:1146 #, 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:1104 +#: cmdline/apt-get.cc:1159 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1109 +#: cmdline/apt-get.cc:1168 +#, fuzzy +msgid " [Not candidate version]" +msgstr "Fersiynau Posib" + +#: cmdline/apt-get.cc:1170 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1175 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -996,109 +1002,142 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1133 +#: cmdline/apt-get.cc:1194 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1136 +#: cmdline/apt-get.cc:1197 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1217 #, 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:1164 +#: cmdline/apt-get.cc:1225 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1193 +#: cmdline/apt-get.cc:1254 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1195 +#: cmdline/apt-get.cc:1256 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1201 +#: cmdline/apt-get.cc:1262 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1363 +#, c-format +msgid "Ignore unavailable target release '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1395 +#, 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:1433 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1449 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1351 -msgid "Unable to lock the list directory" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" - -#: cmdline/apt-get.cc:1402 +#: cmdline/apt-get.cc:1514 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1434 +#: cmdline/apt-get.cc:1562 #, 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:1566 +#, fuzzy, c-format +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:1436 +#: cmdline/apt-get.cc:1568 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1441 +#: cmdline/apt-get.cc:1573 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -#: cmdline/apt-get.cc:1444 cmdline/apt-get.cc:1724 +#. +#. if (Packages == 1) +#. { +#. c1out << endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << endl; +#. } +#. +#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1448 +#: cmdline/apt-get.cc:1580 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1467 +#: cmdline/apt-get.cc:1599 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1514 +#: cmdline/apt-get.cc:1654 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1629 cmdline/apt-get.cc:1665 +#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1652 +#: cmdline/apt-get.cc:1795 #, 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:1683 +#: cmdline/apt-get.cc:1828 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:1696 -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:1841 +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:1699 +#: cmdline/apt-get.cc:1844 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1107,7 +1146,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1711 +#: cmdline/apt-get.cc:1856 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" @@ -1119,143 +1158,122 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -# FIXME: commas, wrapping -#: cmdline/apt-get.cc:1719 -msgid "" -"Since you only requested a single operation it is extremely likely that\n" -"the package is simply not installable and a bug report against\n" -"that package should be filed." -msgstr "" -"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" -"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." - -#: cmdline/apt-get.cc:1727 +#: cmdline/apt-get.cc:1874 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1756 +#: cmdline/apt-get.cc:1903 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1992 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1993 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1874 +#: cmdline/apt-get.cc:2022 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1877 methods/ftp.cc:702 methods/connect.cc:100 +#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1882 +#: cmdline/apt-get.cc:2030 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:1949 cmdline/apt-get.cc:1957 +#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2057 +#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162 +msgid "Unable to lock the download directory" +msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" + +#: cmdline/apt-get.cc:2205 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:2087 cmdline/apt-get.cc:2353 +#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2103 -#, c-format -msgid "" -"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" -"%s\n" -msgstr "" - -#: cmdline/apt-get.cc:2108 -#, c-format -msgid "" -"Please use:\n" -"bzr get %s\n" -"to retrieve the latest (possible unreleased) updates to the package.\n" -msgstr "" - -#: cmdline/apt-get.cc:2163 +#: cmdline/apt-get.cc:2286 #, 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:2191 +#: cmdline/apt-get.cc:2321 #, 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:2197 +#: cmdline/apt-get.cc:2327 #, 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:2200 +#: cmdline/apt-get.cc:2330 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2206 +#: cmdline/apt-get.cc:2336 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2369 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2265 +#: cmdline/apt-get.cc:2398 #, 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:2277 +#: cmdline/apt-get.cc:2410 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2278 +#: cmdline/apt-get.cc:2411 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2295 +#: cmdline/apt-get.cc:2428 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2314 +#: cmdline/apt-get.cc:2448 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2330 +#: cmdline/apt-get.cc:2464 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:2358 +#: cmdline/apt-get.cc:2494 #, 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:2378 +#: cmdline/apt-get.cc:2514 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2430 +#: cmdline/apt-get.cc:2566 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1264,7 +1282,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2483 +#: cmdline/apt-get.cc:2619 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1273,34 +1291,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:2519 +#: cmdline/apt-get.cc:2655 #, 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:2544 +#: cmdline/apt-get.cc:2682 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2558 +#: cmdline/apt-get.cc:2698 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2562 +#: cmdline/apt-get.cc:2703 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:2734 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2635 +#: cmdline/apt-get.cc:2775 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1316,8 +1334,8 @@ msgid "" " upgrade - Perform an upgrade\n" " install - Install new packages (pkg is libc6 not libc6.deb)\n" " remove - Remove packages\n" -" autoremove - Remove all automatic unused packages\n" -" purge - Remove and purge packages\n" +" autoremove - Remove automatically all unused packages\n" +" purge - Remove packages and config files\n" " source - Download source archives\n" " build-dep - Configure build-dependencies for source packages\n" " dist-upgrade - Distribution upgrade, see apt-get(8)\n" @@ -1333,7 +1351,7 @@ msgid "" " -d Download only - do NOT install or unpack archives\n" " -s No-act. Perform ordering simulation\n" " -y Assume Yes to all queries and do not prompt\n" -" -f Attempt to continue if the integrity check fails\n" +" -f Attempt to correct a system with broken dependencies in place\n" " -m Attempt to continue if archives are unlocatable\n" " -u Show a list of upgraded packages as well\n" " -b Build the source package after fetching it\n" @@ -1385,6 +1403,14 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" +#: cmdline/apt-get.cc:2944 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" + #: cmdline/acqprogress.cc:55 msgid "Hit " msgstr "Presennol " @@ -1455,24 +1481,30 @@ msgstr "" msgid "Bad default setting!" msgstr "Rhagosodiad gwael!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 -#: dselect/install:104 dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 +#: dselect/install:105 dselect/update:45 msgid "Press enter to continue." msgstr "Gwasgwch Enter er mwyn mynd ymlaen." -#: dselect/install:100 -msgid "Some errors occurred while unpacking. I'm going to configure the" -msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" +#: dselect/install:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" #: dselect/install:101 -msgid "packages that were installed. This may result in duplicate errors" -msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" +msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" #: dselect/install:102 +#, fuzzy +msgid "will be configured. This may result in duplicate errors" +msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" + +#: dselect/install:103 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y" -#: dselect/install:103 +#: dselect/install:104 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1514,7 +1546,12 @@ msgstr "Llofnod archif annilys" msgid "Error reading archive member header" msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +#: apt-inst/contrib/arfile.cc:90 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" + +#: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Pennawd aelod archif annilys" @@ -1618,9 +1655,12 @@ msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" msgid "File %s/%s overwrites the one in the package %s" msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753 -#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320 -#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:85 +#. 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:166 +#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204 +#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92 +#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@ -1650,9 +1690,9 @@ 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:748 -#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 -#: apt-pkg/pkgcachegen.cc:945 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947 +#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037 +#: apt-pkg/pkgcachegen.cc:1181 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" @@ -1765,12 +1805,12 @@ msgstr "Methwyd lleoli ffeil rheoli dilys" msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" -#: methods/cdrom.cc:114 +#: 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:123 +#: methods/cdrom.cc:208 #, fuzzy msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " @@ -1779,32 +1819,32 @@ 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:131 +#: methods/cdrom.cc:218 #, fuzzy msgid "Wrong CD-ROM" msgstr "CD Anghywir" -#: methods/cdrom.cc:166 +#: methods/cdrom.cc:245 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio." -#: methods/cdrom.cc:171 +#: methods/cdrom.cc:250 #, fuzzy msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264 +#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: 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:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1813,34 +1853,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:162 +#: methods/ftp.cc:168 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:168 +#: methods/ftp.cc:174 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:173 +#: methods/ftp.cc:179 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:204 methods/ftp.cc:232 +#: methods/ftp.cc:210 methods/ftp.cc:238 #, fuzzy, c-format msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" -#: methods/ftp.cc:210 +#: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:217 +#: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:237 +#: methods/ftp.cc:243 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -1849,210 +1889,215 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:265 +#: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" -#: methods/ftp.cc:291 +#: methods/ftp.cc:297 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:335 +#: methods/ftp.cc:341 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:345 methods/rsh.cc:197 +#: methods/ftp.cc:351 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:362 methods/ftp.cc:374 +#: methods/ftp.cc:368 methods/ftp.cc:380 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:698 +#: methods/ftp.cc:704 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:704 +#: methods/ftp.cc:710 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:722 +#: methods/ftp.cc:728 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:736 +#: methods/ftp.cc:742 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:740 +#: methods/ftp.cc:746 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:747 +#: methods/ftp.cc:753 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:779 +#: methods/ftp.cc:785 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:789 +#: methods/ftp.cc:795 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:798 +#: methods/ftp.cc:804 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:818 +#: methods/ftp.cc:824 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:825 +#: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:877 +#: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:892 methods/rsh.cc:322 +#: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:922 +#: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:997 +#: methods/ftp.cc:1005 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1109 +#: methods/ftp.cc:1117 msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:65 +#: methods/connect.cc:70 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:72 +#: methods/connect.cc:81 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:79 +#: methods/connect.cc:90 #, 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:85 +#: methods/connect.cc:96 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:92 +#: methods/connect.cc:104 #, 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:107 +#: methods/connect.cc:122 #, 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:135 methods/rsh.cc:425 +#: methods/connect.cc:150 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:167 +#: methods/connect.cc:169 methods/connect.cc:188 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:173 +#: methods/connect.cc:194 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:176 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#: methods/connect.cc:197 +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:223 -#, c-format -msgid "Unable to connect to %s %s:" +#: methods/connect.cc:244 +#, fuzzy, c-format +msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:65 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Methwyd datrys '%s'" +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:101 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:205 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:210 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:214 +#: methods/gpgv.cc:246 #, c-format -msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:219 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:250 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:257 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2068,152 +2113,212 @@ msgstr "Methwyd agor pibell ar gyfer %s" msgid "Read error from %s process" msgstr "Gwall darllen o broses %s" -#: methods/http.cc:376 +#: methods/http.cc:385 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:522 +#: methods/http.cc:531 #, c-format msgid "Got a single header line over %u chars" msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#: methods/http.cc:530 +#: methods/http.cc:539 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:558 methods/http.cc:565 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:585 +#: methods/http.cc:594 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:600 +#: methods/http.cc:609 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:602 +#: methods/http.cc:611 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:626 +#: methods/http.cc:635 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:773 +#: methods/http.cc:793 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:778 +#: methods/http.cc:798 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:801 +#: methods/http.cc:821 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:832 +#: methods/http.cc:852 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:860 +#: methods/http.cc:880 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:874 +#: 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:876 +#: methods/http.cc:896 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1106 +#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Methwyd ysgrifennu ffeil %s" + +#: methods/http.cc:1156 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1123 methods/http.cc:1178 +#: methods/http.cc:1173 methods/http.cc:1228 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1230 +#: methods/http.cc:1320 msgid "Internal error" msgstr "Gwall mewnol" -#: apt-pkg/contrib/mmap.cc:80 +#: 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:85 +#: 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/strutl.cc:978 +#: 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:395 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + +#. d means days, h means hours, min means minutes, s means seconds +#: 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:378 +#, c-format +msgid "%lih %limin %lis" +msgstr "" + +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:385 +#, c-format +msgid "%limin %lis" +msgstr "" + +#. s means seconds +#: apt-pkg/contrib/strutl.cc:390 +#, c-format +msgid "%lis" +msgstr "" + +#: apt-pkg/contrib/strutl.cc:1083 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:439 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:497 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:515 -#, fuzzy, c-format -msgid "Line %d too long (max %u)" -msgstr "Linell %d yn rhy hir (uchaf %d)" - -#: apt-pkg/contrib/configuration.cc:611 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:630 +#: apt-pkg/contrib/configuration.cc:697 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:647 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:687 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:694 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:707 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:741 +#: 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" @@ -2245,33 +2350,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" @@ -2281,189 +2386,203 @@ 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:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40 -#: methods/mirror.cc:91 +#: 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 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" -#: apt-pkg/contrib/cdromutl.cc:187 +#: 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:147 +#: apt-pkg/contrib/fileutl.cc:152 #, 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:152 +#: apt-pkg/contrib/fileutl.cc:157 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:170 +#: apt-pkg/contrib/fileutl.cc:175 #, 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:174 +#: apt-pkg/contrib/fileutl.cc:179 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:442 +#: apt-pkg/contrib/fileutl.cc:615 #, 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:452 +#: apt-pkg/contrib/fileutl.cc:627 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:629 +#, fuzzy, c-format +msgid "Sub-process %s received signal %u." +msgstr "Derbyniodd is-broses %s wall segmentu." + +#: apt-pkg/contrib/fileutl.cc:633 #, 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:457 +#: apt-pkg/contrib/fileutl.cc:635 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:501 +#: apt-pkg/contrib/fileutl.cc:679 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:557 +#: apt-pkg/contrib/fileutl.cc:735 #, 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:587 +#: apt-pkg/contrib/fileutl.cc:765 #, 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:662 +#: apt-pkg/contrib/fileutl.cc:840 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:668 +#: apt-pkg/contrib/fileutl.cc:846 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:857 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:139 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:138 +#: apt-pkg/pkgcache.cc:145 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:143 +#: apt-pkg/pkgcache.cc:150 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:148 +#: apt-pkg/pkgcache.cc:155 #, 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:153 +#: apt-pkg/pkgcache.cc:160 msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:287 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:287 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:224 +#: apt-pkg/pkgcache.cc:287 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:288 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:288 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:225 +#: apt-pkg/pkgcache.cc:288 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:289 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:226 +#: apt-pkg/pkgcache.cc:289 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:289 +msgid "Enhances" +msgstr "" + +#: apt-pkg/pkgcache.cc:300 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:300 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:237 +#: apt-pkg/pkgcache.cc:300 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:301 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:238 +#: apt-pkg/pkgcache.cc:301 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 +#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:122 +#: apt-pkg/depcache.cc:125 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:151 +#: apt-pkg/depcache.cc:154 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" -#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195 +#: 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:219 +#: apt-pkg/depcache.cc:236 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Methwyd agor %s" -#: apt-pkg/depcache.cc:225 +#: apt-pkg/depcache.cc:242 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" +#: apt-pkg/depcache.cc:851 +#, c-format +msgid "Internal error, group '%s' has no installable pseudo package" +msgstr "" + # FIXME: number? #: apt-pkg/tagfile.cc:102 #, c-format @@ -2475,59 +2594,90 @@ 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:90 +#: 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:92 +#: 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:95 +#: 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:101 +#: 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:108 +#: 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:448 +#: 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:331 apt-pkg/packagemanager.cc:615 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:428 +#: apt-pkg/packagemanager.cc:452 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2538,12 +2688,19 @@ 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:495 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:247 +#: apt-pkg/algorithms.cc:292 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2551,7 +2708,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1105 +#: apt-pkg/algorithms.cc:1182 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2559,12 +2716,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1107 +#: 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:1369 apt-pkg/algorithms.cc:1371 +#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463 msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." @@ -2572,24 +2729,29 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: apt-pkg/acquire.cc:59 -#, 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:63 -#, 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:827 +#: apt-pkg/acquire.cc:878 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:829 +#: apt-pkg/acquire.cc:880 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" @@ -2604,7 +2766,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s." msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:399 +#: apt-pkg/acquire-worker.cc:413 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2612,17 +2774,17 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:125 +#: apt-pkg/init.cc:135 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:141 +#: apt-pkg/init.cc:151 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" -#: apt-pkg/clean.cc:57 +#: apt-pkg/clean.cc:56 #, c-format msgid "Unable to stat %s." msgstr "Ni ellir gwneud stat() o %s." @@ -2641,126 +2803,127 @@ 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:267 -msgid "Invalid record in the preferences file, no Package header" +#: apt-pkg/policy.cc:333 +#, 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:289 +#: apt-pkg/policy.cc:355 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:297 +#: apt-pkg/policy.cc:363 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/pkgcachegen.cc:72 +#: apt-pkg/pkgcachegen.cc:75 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" -#: apt-pkg/pkgcachegen.cc:115 +#: apt-pkg/pkgcachegen.cc:131 #, fuzzy, c-format msgid "Error occurred while processing %s (NewPackage)" msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" -#: apt-pkg/pkgcachegen.cc:130 +#: apt-pkg/pkgcachegen.cc:146 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" -#: apt-pkg/pkgcachegen.cc:153 +#: apt-pkg/pkgcachegen.cc:180 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileDesc1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:178 +#: apt-pkg/pkgcachegen.cc:210 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" -#: apt-pkg/pkgcachegen.cc:182 +#: apt-pkg/pkgcachegen.cc:214 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:234 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" -#: apt-pkg/pkgcachegen.cc:217 +#: apt-pkg/pkgcachegen.cc:238 #, fuzzy, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" -#: apt-pkg/pkgcachegen.cc:221 +#: apt-pkg/pkgcachegen.cc:242 #, fuzzy, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)" -#: apt-pkg/pkgcachegen.cc:245 +#: apt-pkg/pkgcachegen.cc:266 #, fuzzy, c-format msgid "Error occurred while processing %s (NewFileDesc2)" msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" -#: apt-pkg/pkgcachegen.cc:251 +#: apt-pkg/pkgcachegen.cc:273 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:254 +#: apt-pkg/pkgcachegen.cc:276 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:257 +#: apt-pkg/pkgcachegen.cc:279 #, 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:260 +#: apt-pkg/pkgcachegen.cc:282 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:288 +#: apt-pkg/pkgcachegen.cc:310 #, fuzzy, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:301 +#: apt-pkg/pkgcachegen.cc:323 #, fuzzy, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" -#: apt-pkg/pkgcachegen.cc:307 +#: apt-pkg/pkgcachegen.cc:329 #, 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:678 +#: apt-pkg/pkgcachegen.cc:860 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:763 +#: apt-pkg/pkgcachegen.cc:962 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 +#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:134 +#: apt-pkg/acquire-item.cc:128 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:451 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:696 apt-pkg/acquire-item.cc:1459 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" @@ -2770,7 +2933,7 @@ msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1264 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2779,7 +2942,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:1323 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2788,204 +2951,318 @@ 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:1364 +#: apt-pkg/acquire-item.cc:1374 #, 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:1451 +#: apt-pkg/acquire-item.cc:1461 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" +# FIXME: number? +#: apt-pkg/indexrecords.cc:40 +#, fuzzy, c-format +msgid "Unable to parse Release file %s" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#: apt-pkg/indexrecords.cc:47 +#, 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 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + #: 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:529 +#: apt-pkg/cdrom.cc:518 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 +#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:563 +#: apt-pkg/cdrom.cc:552 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 +#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" -#: apt-pkg/cdrom.cc:590 +#: apt-pkg/cdrom.cc:578 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:608 +#: apt-pkg/cdrom.cc:596 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:612 +#: apt-pkg/cdrom.cc:600 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:620 +#: apt-pkg/cdrom.cc:608 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:638 +#: apt-pkg/cdrom.cc:626 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:678 +#: apt-pkg/cdrom.cc:666 #, c-format msgid "" -"Found %u package indexes, %u source indexes, %u translation indexes and %u " -"signatures\n" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and %" +"zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:715 +#: 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:703 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:732 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:760 +#: apt-pkg/cdrom.cc:748 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:764 +#: apt-pkg/cdrom.cc:752 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:790 +#: 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:799 +#: apt-pkg/cdrom.cc:787 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:454 +#: apt-pkg/indexcopy.cc:530 +#, fuzzy, c-format +msgid "Skipping nonexistent file %s" +msgstr "Yn agor y ffeil cyfluniad %s" + +#: apt-pkg/indexcopy.cc:536 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" + +#: apt-pkg/indexcopy.cc:542 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Camgyfatebiaeth swm MD5" + +#: apt-pkg/deb/dpkgpm.cc:49 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Wedi Sefydlu: " + +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Yn cysylltu i %s" + +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Yn agor %s" + +#: apt-pkg/deb/dpkgpm.cc:52 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Methwyd dileu %s" + +#: apt-pkg/deb/dpkgpm.cc:53 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:581 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:537 +#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Methwyd agor ffeil %s" + +#: apt-pkg/deb/dpkgpm.cc:730 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:538 +#: apt-pkg/deb/dpkgpm.cc:731 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:543 +#: apt-pkg/deb/dpkgpm.cc:736 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:544 -#, fuzzy, c-format -msgid "Configuring %s" -msgstr "Yn cysylltu i %s" - -#: apt-pkg/deb/dpkgpm.cc:546 apt-pkg/deb/dpkgpm.cc:547 -#, fuzzy, c-format -msgid "Processing triggers for %s" -msgstr "Gwall wrth brosesu'r cyfeiriadur %s" - -#: apt-pkg/deb/dpkgpm.cc:549 +#: apt-pkg/deb/dpkgpm.cc:738 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:554 apt-pkg/deb/dpkgpm.cc:556 -#: apt-pkg/deb/dpkgpm.cc:557 +#: apt-pkg/deb/dpkgpm.cc:743 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:559 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Yn agor %s" - -#: apt-pkg/deb/dpkgpm.cc:560 +#: apt-pkg/deb/dpkgpm.cc:745 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:565 +#: apt-pkg/deb/dpkgpm.cc:750 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:566 +#: apt-pkg/deb/dpkgpm.cc:751 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:716 +#: apt-pkg/deb/dpkgpm.cc:955 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:170 +#: apt-pkg/deb/dpkgpm.cc:986 +msgid "Running dpkg" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:70 #, c-format -msgid "No mirror file '%s' found " +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Methwyd agor ffeil %s" +#: apt-pkg/deb/debsystem.cc:73 +#, 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 +msgid "" +"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " +"the problem. " +msgstr "" + +#: apt-pkg/deb/debsystem.cc:100 +msgid "Not locked" +msgstr "" + +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +#, 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'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Methwyd agor ffeil %s" + +#~ msgid " %4i %s\n" +#~ msgstr " %4i %s\n" + +#~ msgid "%4i %s\n" +#~ msgstr "%4i %s\n" + +#, fuzzy +#~ msgid "Processing triggers for %s" +#~ msgstr "Gwall wrth brosesu'r cyfeiriadur %s" + +# FIXME: commas, wrapping +#~ msgid "" +#~ "Since you only requested a single operation it is extremely likely that\n" +#~ "the package is simply not installable and a bug report against\n" +#~ "that package should be filed." +#~ msgstr "" +#~ "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n" +#~ "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw." + +#, fuzzy +#~ msgid "Line %d too long (max %lu)" +#~ msgstr "Linell %d yn rhy hir (uchaf %d)" + #, fuzzy #~ msgid "Line %d too long (max %d)" #~ msgstr "Linell %d yn rhy hir (uchaf %d)"