X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/1fc07a44e8191e00fc1566bfc15e8b370da77330..90d1d54ef2a68bd443815f26e9e2b578a1d7c419:/po/cy.po diff --git a/po/cy.po b/po/cy.po index b6944bdeb..ec5d59a2b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-12 17:42+0100\n" +"Report-Msgid-Bugs-To: APT Development Team \n" +"POT-Creation-Date: 2012-06-27 11:17+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -15,177 +15,181 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:156 +#: cmdline/apt-cache.cc:158 #, 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:284 +#: cmdline/apt-cache.cc:286 #, fuzzy msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:286 +#: cmdline/apt-cache.cc:288 #, fuzzy msgid "Total package structures: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:326 +#: cmdline/apt-cache.cc:328 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:329 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:330 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:329 +#: cmdline/apt-cache.cc:331 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:332 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:336 #, fuzzy msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:336 +#: cmdline/apt-cache.cc:338 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:341 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:343 #, fuzzy msgid "Total Desc/File relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:343 +#: cmdline/apt-cache.cc:345 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:355 +#: cmdline/apt-cache.cc:357 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:369 +#: cmdline/apt-cache.cc:371 #, fuzzy msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:374 +#: cmdline/apt-cache.cc:376 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:382 +#: cmdline/apt-cache.cc:384 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:1273 +#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378 +#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46 +#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 +msgid "No packages found" +msgstr "Canfuwyd dim pecyn" + +#: cmdline/apt-cache.cc:1222 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: 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:1357 +msgid "This command is deprecated. Please use 'apt-mark showauto' instead." +msgstr "" -#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440 +#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:508 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1533 +#: cmdline/apt-cache.cc:1482 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638 +#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580 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:1554 +#: cmdline/apt-cache.cc:1503 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618 +#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1575 +#: cmdline/apt-cache.cc:1523 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1576 +#: cmdline/apt-cache.cc:1524 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608 +#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1615 +#: cmdline/apt-cache.cc:1557 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1566 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 -#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589 -#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3350 cmdline/apt-mark.cc:363 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, 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:1745 +#: cmdline/apt-cache.cc:1686 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" -" apt-cache [options] add file1 [file2 ...]\n" " apt-cache [options] showpkg pkg1 [pkg2 ...]\n" " apt-cache [options] showsrc pkg1 [pkg2 ...]\n" "\n" -"apt-cache is a low-level tool used to manipulate APT's binary\n" -"cache files, and query information from them\n" +"apt-cache is a low-level tool used to query information\n" +"from APT's binary cache files\n" "\n" "Commands:\n" -" add - Add a package file to the source cache\n" " gencaches - Build both the package and source cache\n" " showpkg - Show some general information for a single package\n" " showsrc - Show source records\n" @@ -195,7 +199,6 @@ 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" @@ -249,11 +252,11 @@ msgstr "" " -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:77 +#: cmdline/apt-cdrom.cc:79 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:92 +#: cmdline/apt-cdrom.cc:94 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -261,20 +264,20 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:127 +#: cmdline/apt-cdrom.cc:129 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:162 +#: cmdline/apt-cdrom.cc:163 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" -#: cmdline/apt-config.cc:41 +#: cmdline/apt-config.cc:46 msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" -#: cmdline/apt-config.cc:76 +#: cmdline/apt-config.cc:87 #, fuzzy msgid "" "Usage: apt-config [options] command\n" @@ -303,519 +306,150 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:98 -#, c-format -msgid "%s not a valid DEB package." -msgstr "Nid yw %s yn becyn DEB dilys." +#: cmdline/apt-get.cc:135 +msgid "Y" +msgstr "I" -# FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:232 -#, fuzzy -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +#: cmdline/apt-get.cc:140 +msgid "N" msgstr "" -"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" -"\n" -"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" -"templed o becynnau Debian.\n" -"\n" -"Opsiynnau:\n" -" -h Dangos y testun cymorth hwn\n" -" -t Gosod y cyfeiriadur dros dro\n" -" -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:1171 +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 #, c-format -msgid "Unable to write to %s" -msgstr "Ni ellir ysgrifennu i %s" +msgid "Regex compilation error - %s" +msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-extracttemplates.cc:309 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" +#: cmdline/apt-get.cc:260 +msgid "The following packages have unmet dependencies:" +msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347 -msgid "Package extension list is too long" -msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." +#: cmdline/apt-get.cc:350 +#, c-format +msgid "but %s is installed" +msgstr "ond mae %s wedi ei sefydlu" -#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189 -#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262 -#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298 -#, fuzzy, c-format -msgid "Error processing directory %s" -msgstr "Gwall wrth brosesu'r cyfeiriadur %s" +#: cmdline/apt-get.cc:352 +#, c-format +msgid "but %s is to be installed" +msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: ftparchive/apt-ftparchive.cc:260 -msgid "Source extension list is too long" -msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" +#: cmdline/apt-get.cc:359 +msgid "but it is not installable" +msgstr "ond ni ellir ei sefydlu" -#: ftparchive/apt-ftparchive.cc:377 -msgid "Error writing header to contents file" -msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" +#: cmdline/apt-get.cc:361 +msgid "but it is a virtual package" +msgstr "ond mae'n becyn rhithwir" -#: ftparchive/apt-ftparchive.cc:407 -#, fuzzy, c-format -msgid "Error processing contents %s" -msgstr "Gwall wrth Brosesu Cynnwys %s" +#: cmdline/apt-get.cc:364 +msgid "but it is not installed" +msgstr "ond nid yw wedi ei sefydlu" -# FIXME: full stops -#: ftparchive/apt-ftparchive.cc:595 +#: cmdline/apt-get.cc:364 +msgid "but it is not going to be installed" +msgstr "ond nid yw'n mynd i gael ei sefydlu" + +#: cmdline/apt-get.cc:369 +msgid " or" +msgstr " neu" + +#: cmdline/apt-get.cc:398 +msgid "The following NEW packages will be installed:" +msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: cmdline/apt-get.cc:424 +msgid "The following packages will be REMOVED:" +msgstr "Caiff y pecynnau canlynol eu TYNNU:" + +#: cmdline/apt-get.cc:446 #, fuzzy -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" -"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" -" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n" -" contents llwybr\n" -" release llwybr\n" -" generate cyfluniad [grŵpiau]\n" -" clean cyfluniad\n" -"\n" -"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" -"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" -"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" -"\n" -"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" -"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" -"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n" -"gorfodi'r gwerthoedd Priority a Section.\n" -"\n" -"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n" -".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n" -"gwrthwneud ffynhonell.\n" -"\n" -"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n" -"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n" -"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n" -"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n" -"defnydd o'r archif Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opsiynnau:\n" -" -h Y testun cymorth hwn\n" -" --md5 Rheoli cynhyrchiad stwnch MD5\n" -" -s=? Ffeil gwrthwneud ffynhonell\n" -" -q Tawel\n" -" -d=? Dewis cronda data storfa opsiynnol\n" -" --no-delink Galluogi'r modd datgysylltu datnamu\n" -" --contents Rheoli cynhyrchiad ffeil cynnwys\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol" +msgid "The following packages have been kept back:" +msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: ftparchive/apt-ftparchive.cc:801 -msgid "No selections matched" -msgstr "Dim dewisiadau'n cyfateb" +#: cmdline/apt-get.cc:467 +#, fuzzy +msgid "The following packages will be upgraded:" +msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: ftparchive/apt-ftparchive.cc:879 -#, 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'" +#: cmdline/apt-get.cc:488 +#, fuzzy +msgid "The following packages will be DOWNGRADED:" +msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: ftparchive/cachedb.cc:43 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" +#: cmdline/apt-get.cc:508 +msgid "The following held packages will be changed:" +msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: ftparchive/cachedb.cc:61 +#: cmdline/apt-get.cc:563 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Hen gronfa data, yn ceisio uwchraddio %s" +msgid "%s (due to %s) " +msgstr "%s (oherwydd %s) " -#: ftparchive/cachedb.cc:72 +#: cmdline/apt-get.cc:571 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" msgstr "" +"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" +"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" +"ei wneud!" -#: ftparchive/cachedb.cc:77 +#: cmdline/apt-get.cc:602 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Ni ellir agor y ffeil DB2 %s: %s" +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 -#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 +#: cmdline/apt-get.cc:606 #, c-format -msgid "Failed to stat %s" -msgstr "Methodd stat() o %s" - -#: ftparchive/cachedb.cc:242 -msgid "Archive has no control record" -msgstr "Does dim cofnod rheoli gan yr archif" - -#: ftparchive/cachedb.cc:448 -msgid "Unable to get a cursor" -msgstr "Ni ellir cael cyrchydd" +msgid "%lu reinstalled, " +msgstr "%lu wedi ailsefydlu, " -#: ftparchive/writer.cc:73 +#: cmdline/apt-get.cc:608 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" +msgid "%lu downgraded, " +msgstr "%lu wedi eu israddio, " -#: ftparchive/writer.cc:78 +#: cmdline/apt-get.cc:610 #, c-format -msgid "W: Unable to stat %s\n" -msgstr "Rh: Ni ellir gwneud stat() o %s\n" +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: ftparchive/writer.cc:134 -msgid "E: " -msgstr "G: " +#: 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" -#: ftparchive/writer.cc:136 -msgid "W: " -msgstr "Rh: " +#: cmdline/apt-get.cc:635 +#, fuzzy, c-format +msgid "Note, selecting '%s' for task '%s'\n" +msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: ftparchive/writer.cc:143 -msgid "E: Errors apply to file " -msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " +#: 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" -#: ftparchive/writer.cc:161 ftparchive/writer.cc:193 +#: cmdline/apt-get.cc:657 #, c-format -msgid "Failed to resolve %s" -msgstr "Methwyd datrys %s" +msgid "Package %s is a virtual package provided by:\n" +msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: ftparchive/writer.cc:174 -msgid "Tree walking failed" -msgstr "Methwyd cerdded y goeden" - -#: ftparchive/writer.cc:201 -#, c-format -msgid "Failed to open %s" -msgstr "Methwyd agor %s" - -# FIXME -#: ftparchive/writer.cc:260 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DatGysylltu %s [%s]\n" - -#: ftparchive/writer.cc:268 -#, c-format -msgid "Failed to readlink %s" -msgstr "Methwyd darllen y cyswllt %s" - -#: ftparchive/writer.cc:272 -#, c-format -msgid "Failed to unlink %s" -msgstr "Methwyd datgysylltu %s" - -#: ftparchive/writer.cc:279 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Methwyd cysylltu %s at %s" - -#: ftparchive/writer.cc:289 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Tarwyd y terfyn cyswllt %sB.\n" - -#: ftparchive/writer.cc:393 -msgid "Archive had no package field" -msgstr "Doedd dim maes pecyn gan yr archif" - -#: 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:464 ftparchive/writer.cc:793 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " Cynaliwr %s yw %s nid %s\n" - -#: 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:702 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" - -#: ftparchive/contents.cc:321 -#, fuzzy, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" - -#: ftparchive/contents.cc:358 ftparchive/contents.cc:389 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Methwyd neilltuo cof" - -#: ftparchive/override.cc:34 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Ni ellir agor %s" - -#: ftparchive/override.cc:60 ftparchive/override.cc:166 -#, c-format -msgid "Malformed override %s line %lu #1" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" - -#: ftparchive/override.cc:74 ftparchive/override.cc:178 -#, c-format -msgid "Malformed override %s line %lu #2" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" - -#: ftparchive/override.cc:88 ftparchive/override.cc:191 -#, c-format -msgid "Malformed override %s line %lu #3" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" - -#: ftparchive/override.cc:127 ftparchive/override.cc:201 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Methwydd darllen y ffeil dargyfeirio %s" - -#: ftparchive/multicompress.cc:72 -#, fuzzy, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Dull Cywasgu Anhysbys '%s'" - -#: ftparchive/multicompress.cc:102 -#, c-format -msgid "Compressed output %s needs a compression set" -msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" - -#: ftparchive/multicompress.cc:169 methods/rsh.cc:91 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Methwyd creu pibell cyfathrebu at isbroses" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to create FILE*" -msgstr "Methwyd creu FILE*" - -#: ftparchive/multicompress.cc:198 -msgid "Failed to fork" -msgstr "Methodd fork()" - -#: ftparchive/multicompress.cc:212 -#, fuzzy -msgid "Compress child" -msgstr "Plentyn Cywasgu" - -#: ftparchive/multicompress.cc:235 -#, fuzzy, c-format -msgid "Internal error, failed to create %s" -msgstr "Gwall Mewnol, Methwyd creu %s" - -#: ftparchive/multicompress.cc:286 -msgid "Failed to create subprocess IPC" -msgstr "Methwyd creu isbroses IPC" - -#: ftparchive/multicompress.cc:321 -msgid "Failed to exec compressor " -msgstr "Methwyd gweithredu cywasgydd " - -#: ftparchive/multicompress.cc:360 -msgid "decompressor" -msgstr "datgywasgydd" - -#: ftparchive/multicompress.cc:403 -msgid "IO to subprocess/file failed" -msgstr "Methodd MA i isbroses/ffeil" - -#: ftparchive/multicompress.cc:455 -msgid "Failed to read while computing MD5" -msgstr "Methwyd darllen wrth gyfrifo MD5" - -#: ftparchive/multicompress.cc:472 -#, c-format -msgid "Problem unlinking %s" -msgstr "Gwall wrth datgysylltu %s" - -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Methwyd ailenwi %s at %s" - -#: cmdline/apt-get.cc:135 -msgid "Y" -msgstr "I" - -#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Gwall crynhoi patrwm - %s" - -#: cmdline/apt-get.cc:252 -msgid "The following packages have unmet dependencies:" -msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" - -#: cmdline/apt-get.cc:342 -#, c-format -msgid "but %s is installed" -msgstr "ond mae %s wedi ei sefydlu" - -#: cmdline/apt-get.cc:344 -#, c-format -msgid "but %s is to be installed" -msgstr "ond mae %s yn mynd i gael ei sefydlu" - -#: cmdline/apt-get.cc:351 -msgid "but it is not installable" -msgstr "ond ni ellir ei sefydlu" - -#: cmdline/apt-get.cc:353 -msgid "but it is a virtual package" -msgstr "ond mae'n becyn rhithwir" - -#: cmdline/apt-get.cc:356 -msgid "but it is not installed" -msgstr "ond nid yw wedi ei sefydlu" - -#: cmdline/apt-get.cc:356 -msgid "but it is not going to be installed" -msgstr "ond nid yw'n mynd i gael ei sefydlu" - -#: cmdline/apt-get.cc:361 -msgid " or" -msgstr " neu" - -#: cmdline/apt-get.cc:392 -msgid "The following NEW packages will be installed:" -msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: cmdline/apt-get.cc:420 -msgid "The following packages will be REMOVED:" -msgstr "Caiff y pecynnau canlynol eu TYNNU:" - -#: cmdline/apt-get.cc:442 -#, fuzzy -msgid "The following packages have been kept back:" -msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" - -#: cmdline/apt-get.cc:465 -#, fuzzy -msgid "The following packages will be upgraded:" -msgstr "Caiff y pecynnau canlynol eu uwchraddio" - -#: cmdline/apt-get.cc:488 -#, fuzzy -msgid "The following packages will be DOWNGRADED:" -msgstr "Caiff y pecynnau canlynol eu ISRADDIO" - -#: cmdline/apt-get.cc:508 -msgid "The following held packages will be changed:" -msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" - -#: cmdline/apt-get.cc:563 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (oherwydd %s) " - -#: cmdline/apt-get.cc:571 -#, fuzzy -msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" -msgstr "" -"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" -"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" -"ei wneud!" - -#: cmdline/apt-get.cc:605 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " - -#: cmdline/apt-get.cc:609 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu wedi ailsefydlu, " - -#: cmdline/apt-get.cc:611 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu wedi eu israddio, " - -#: cmdline/apt-get.cc:613 -#, 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:617 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" - -#: cmdline/apt-get.cc:639 -#, 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:645 -#, 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:662 -#, 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:673 +#: cmdline/apt-get.cc:668 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:682 +#: cmdline/apt-get.cc:677 #, fuzzy msgid " [Not candidate version]" msgstr "Fersiynau Posib" -#: cmdline/apt-get.cc:684 +#: 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:687 +#: cmdline/apt-get.cc:682 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -827,181 +461,187 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:705 +#: 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:717 +#: 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:728 +#: cmdline/apt-get.cc:725 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" -#: cmdline/apt-get.cc:759 +#. TRANSLATORS: Note, this is not an interactive question +#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" + +#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946 +#, fuzzy, 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:788 #, 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:789 +#: cmdline/apt-get.cc:818 #, 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:793 +#: cmdline/apt-get.cc:822 #, 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:803 +#: cmdline/apt-get.cc:834 #, 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:808 +#: cmdline/apt-get.cc:839 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:853 +#: cmdline/apt-get.cc:884 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:889 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:898 -#, 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:973 +#: cmdline/apt-get.cc:1025 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:976 +#: cmdline/apt-get.cc:1028 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:979 +#: cmdline/apt-get.cc:1031 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:982 +#: cmdline/apt-get.cc:1034 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:984 +#: cmdline/apt-get.cc:1036 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:1040 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:991 +#: cmdline/apt-get.cc:1043 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:1016 +#: cmdline/apt-get.cc:1068 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1072 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1027 +#: cmdline/apt-get.cc:1079 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1029 +#: cmdline/apt-get.cc:1081 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199 +#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:1079 +#: cmdline/apt-get.cc:1131 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1088 +#: cmdline/apt-get.cc:1140 #, 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:1099 +#: cmdline/apt-get.cc:1151 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:1137 +#: cmdline/apt-get.cc:1189 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1144 +#: cmdline/apt-get.cc:1196 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1149 +#: cmdline/apt-get.cc:1201 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1156 +#: cmdline/apt-get.cc:1208 #, 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" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:1161 +#: cmdline/apt-get.cc:1213 #, 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:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367 -#: cmdline/apt-get.cc:2370 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 +#: cmdline/apt-get.cc:2592 #, 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:1189 +#: cmdline/apt-get.cc:1241 #, 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:1205 cmdline/apt-get.cc:1225 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 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:1207 +#: cmdline/apt-get.cc:1259 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:1209 +#: cmdline/apt-get.cc:1261 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1012,29 +652,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234 +#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:1230 +#: cmdline/apt-get.cc:1282 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470 +#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1320 +#: cmdline/apt-get.cc:1372 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436 +#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1327 +#: cmdline/apt-get.cc:1379 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1042,20 +682,20 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1331 +#: cmdline/apt-get.cc:1383 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:1336 +#: cmdline/apt-get.cc:1388 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1337 +#: cmdline/apt-get.cc:1389 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1365 +#: cmdline/apt-get.cc:1417 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1065,35 +705,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1369 -msgid "Note: This is done automatic and on purpose by dpkg." +#: cmdline/apt-get.cc:1421 +msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1499 +#: cmdline/apt-get.cc:1559 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1531 +#: cmdline/apt-get.cc:1591 #, 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:1569 +#: cmdline/apt-get.cc:1629 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1585 +#: cmdline/apt-get.cc:1645 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1647 +#: cmdline/apt-get.cc:1711 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1699 +#: cmdline/apt-get.cc:1815 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1109,16 +749,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858 +#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1706 +#: cmdline/apt-get.cc:1822 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1713 +#: cmdline/apt-get.cc:1829 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1128,7 +768,7 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1717 +#: cmdline/apt-get.cc:1833 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1136,21 +776,23 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1719 -msgid "Use 'apt-get autoremove' to remove them." -msgstr "" +#: cmdline/apt-get.cc:1835 +msgid "Use 'apt-get autoremove' to remove it." +msgid_plural "Use 'apt-get autoremove' to remove them." +msgstr[0] "" +msgstr[1] "" -#: cmdline/apt-get.cc:1738 +#: cmdline/apt-get.cc:1854 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1828 +#: cmdline/apt-get.cc:1953 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:1831 +#: cmdline/apt-get.cc:1957 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1159,7 +801,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1843 +#: cmdline/apt-get.cc:1972 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" @@ -1171,196 +813,242 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1861 +#: cmdline/apt-get.cc:1993 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1889 +#: cmdline/apt-get.cc:2019 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1979 +#: cmdline/apt-get.cc:2109 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1980 +#: cmdline/apt-get.cc:2110 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:2022 +#: cmdline/apt-get.cc:2152 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:2029 +#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:2050 +#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114 +msgid "" +"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " +"instead." +msgstr "" + +#: cmdline/apt-get.cc:2183 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111 +#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2191 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133 +#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190 +#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:2233 +#: cmdline/apt-get.cc:2386 +#, c-format +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "" + +#: cmdline/apt-get.cc:2391 +#, c-format +msgid "Downloading %s %s" +msgstr "" + +#: cmdline/apt-get.cc:2451 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:2273 cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2289 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2294 +#: cmdline/apt-get.cc:2513 #, c-format msgid "" "Please use:\n" -"bzr get %s\n" +"bzr branch %s\n" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2345 +#: cmdline/apt-get.cc:2566 #, 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:2380 +#: cmdline/apt-get.cc:2603 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2612 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2617 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2399 +#: cmdline/apt-get.cc:2623 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2432 +#: cmdline/apt-get.cc:2661 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2462 +#: cmdline/apt-get.cc:2692 #, 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:2474 +#: cmdline/apt-get.cc:2704 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2475 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2492 +#: cmdline/apt-get.cc:2727 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2512 +#: cmdline/apt-get.cc:2747 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2528 +#: cmdline/apt-get.cc:2766 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:2559 +#: cmdline/apt-get.cc:2791 +#, c-format +msgid "" +"No architecture information available for %s. See apt.conf(5) APT::" +"Architectures for setup" +msgstr "" + +#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 #, 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:2579 +#: cmdline/apt-get.cc:2838 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2630 -#, c-format +#: cmdline/apt-get.cc:2997 +#, fuzzy, c-format msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" +"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " +"packages" msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:2683 +#: cmdline/apt-get.cc:3015 #, c-format msgid "" -"%s dependency for %s cannot be satisfied because no available versions of " -"package %s can satisfy version requirements" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" 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" +"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " +"%s" -#: cmdline/apt-get.cc:2719 +#: cmdline/apt-get.cc:3038 #, 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:2746 +#: cmdline/apt-get.cc:3077 +#, fuzzy, c-format +msgid "" +"%s dependency for %s cannot be satisfied because candidate version of " +"package %s can't satisfy version requirements" +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:3083 +#, fuzzy, c-format +msgid "" +"%s dependency for %s cannot be satisfied because package %s has no candidate " +"version" +msgstr "" +"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " +"%s" + +#: cmdline/apt-get.cc:3106 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2762 +#: cmdline/apt-get.cc:3122 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2767 +#: cmdline/apt-get.cc:3127 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2798 +#: cmdline/apt-get.cc:3220 cmdline/apt-get.cc:3232 +#, fuzzy, c-format +msgid "Changelog for %s (%s)" +msgstr "Yn cysylltu i %s (%s)" + +#: cmdline/apt-get.cc:3355 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:3396 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1385,8 +1073,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" +" changelog - Download and display the changelog for the given package\n" +" download - Download the binary package into the current directory\n" "\n" "Options:\n" " -h This help text.\n" @@ -1447,7 +1135,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:2995 +#: cmdline/apt-get.cc:3561 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1455,33 +1143,33 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: cmdline/acqprogress.cc:57 +#: cmdline/acqprogress.cc:60 msgid "Hit " msgstr "Presennol " -#: cmdline/acqprogress.cc:81 +#: cmdline/acqprogress.cc:84 msgid "Get:" msgstr "Cyrchu:" -#: cmdline/acqprogress.cc:112 +#: cmdline/acqprogress.cc:115 msgid "Ign " msgstr "Anwybyddu " -#: cmdline/acqprogress.cc:116 +#: cmdline/acqprogress.cc:119 msgid "Err " msgstr "Gwall " -#: cmdline/acqprogress.cc:137 +#: cmdline/acqprogress.cc:140 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" -#: cmdline/acqprogress.cc:227 +#: cmdline/acqprogress.cc:230 #, c-format msgid " [Working]" msgstr " [Gweithio]" -#: cmdline/acqprogress.cc:283 +#: cmdline/acqprogress.cc:286 #, fuzzy, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1492,922 +1180,1292 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-sortpkgs.cc:86 -msgid "Unknown package record!" -msgstr "Cofnod pecyn anhysbys!" +#: cmdline/apt-mark.cc:55 +#, fuzzy, c-format +msgid "%s can not be marked as it is not installed.\n" +msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-sortpkgs.cc:150 -#, fuzzy +#: cmdline/apt-mark.cc:61 +#, fuzzy, c-format +msgid "%s was already set to manually installed.\n" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: cmdline/apt-mark.cc:63 +#, fuzzy, c-format +msgid "%s was already set to automatically installed.\n" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: cmdline/apt-mark.cc:228 +#, fuzzy, c-format +msgid "%s was already set on hold.\n" +msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" + +#: cmdline/apt-mark.cc:230 +#, fuzzy, c-format +msgid "%s was already not hold.\n" +msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" + +#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:314 +#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1002 +#, fuzzy, c-format +msgid "Waited for %s but it wasn't there" +msgstr "Arhoswyd am %s ond nid oedd e yna" + +#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:297 +#, fuzzy, c-format +msgid "%s set on hold.\n" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:302 +#, fuzzy, c-format +msgid "Canceled hold on %s.\n" +msgstr "Methwyd agor %s" + +#: cmdline/apt-mark.cc:320 +msgid "Executing dpkg failed. Are you root?" +msgstr "" + +#: cmdline/apt-mark.cc:367 msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" +"apt-mark is a simple command line interface for marking packages\n" +"as manually or automatically installed. It can also list marks.\n" +"\n" +"Commands:\n" +" auto - Mark the given packages as automatically installed\n" +" manual - Mark the given packages as manually installed\n" "\n" "Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -s No-act. Just prints what would be done.\n" +" -f read/write auto/manual marking in the given file\n" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" -"\n" -"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n" -"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n" -"\n" -"Opsiynnau:\n" -" -h Y testun cymorth hwn\n" -" -s Defnyddio trefnu ffeil ffynhonell\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" - -#: dselect/install:32 -msgid "Bad default setting!" -msgstr "Rhagosodiad gwael!" -#: 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." +#: methods/cdrom.cc:203 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" -#: dselect/install:91 -msgid "Do you want to erase any previously downloaded .deb files?" +#: methods/cdrom.cc:212 +#, fuzzy +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" msgstr "" +"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-" +"get update i ychwanegu CDau newydd." -#: dselect/install:101 +#: methods/cdrom.cc:222 #, fuzzy -msgid "Some errors occurred while unpacking. Packages that were installed" -msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" +msgid "Wrong CD-ROM" +msgstr "CD Anghywir" -#: dselect/install:102 +#: methods/cdrom.cc:249 +#, 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:254 #, fuzzy -msgid "will be configured. This may result in duplicate errors" -msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" +msgid "Disk not found." +msgstr "Ffeil heb ei ganfod" -#: 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" +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +msgid "File not found" +msgstr "Ffeil heb ei ganfod" -#: dselect/install:104 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu " -"eto." +#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 +#: methods/rred.cc:512 methods/rred.cc:521 +msgid "Failed to stat" +msgstr "Methwyd stat()" -#: dselect/update:30 -#, fuzzy -msgid "Merging available information" -msgstr "Yn cyfuno manylion Ar Gael" +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +msgid "Failed to set modification time" +msgstr "Methwyd gosod amser newid" -#: apt-inst/contrib/extracttar.cc:114 -msgid "Failed to create pipes" -msgstr "Methwyd creu pibau" +#: methods/file.cc:47 +msgid "Invalid URI, local URIS must not start with //" +msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" -#: apt-inst/contrib/extracttar.cc:141 -msgid "Failed to exec gzip " -msgstr "Methwyd gweithredu gzip" +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:173 +msgid "Logging in" +msgstr "Yn mewngofnodi" -#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204 -msgid "Corrupted archive" -msgstr "Archif llygredig" +#: methods/ftp.cc:179 +msgid "Unable to determine the peer name" +msgstr "Ni ellir darganfod enw'r cymar" -#: apt-inst/contrib/extracttar.cc:193 -#, fuzzy -msgid "Tar checksum failed, archive corrupted" -msgstr "Methodd swm gwirio Tar, archif llygredig" +#: methods/ftp.cc:184 +msgid "Unable to determine the local name" +msgstr "Ni ellir darganfod yr enw lleol" + +#: methods/ftp.cc:215 methods/ftp.cc:243 +#, fuzzy, c-format +msgid "The server refused the connection and said: %s" +msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" -#: apt-inst/contrib/extracttar.cc:296 +#: methods/ftp.cc:221 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Math pennawd TAR anhysbys %u, aelod %s" +msgid "USER failed, server said: %s" +msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: apt-inst/contrib/arfile.cc:70 -msgid "Invalid archive signature" -msgstr "Llofnod archif annilys" +#: methods/ftp.cc:228 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: apt-inst/contrib/arfile.cc:78 -msgid "Error reading archive member header" -msgstr "Gwall wrth ddarllen pennawd aelod archif" +#: methods/ftp.cc:248 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::" +"ProxyLogin yn wag.)" -#: apt-inst/contrib/arfile.cc:90 -#, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Pennawd aelod archif annilys" +# FIXME +#: methods/ftp.cc:276 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" -#: apt-inst/contrib/arfile.cc:102 -msgid "Invalid archive member header" -msgstr "Pennawd aelod archif annilys" +#: methods/ftp.cc:302 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: apt-inst/contrib/arfile.cc:128 -msgid "Archive is too short" -msgstr "Mae'r archif yn rhy fyr" +#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +msgid "Connection timeout" +msgstr "Goramser cysylltu" -#: apt-inst/contrib/arfile.cc:132 -msgid "Failed to read the archive headers" -msgstr "Methwyd darllen pennawdau'r archif" +#: methods/ftp.cc:346 +msgid "Server closed the connection" +msgstr "Caeodd y gweinydd y cysylltiad" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1254 +#: apt-pkg/contrib/fileutl.cc:1263 apt-pkg/contrib/fileutl.cc:1266 +msgid "Read error" +msgstr "Gwall darllen" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Methyd lleoli yr elfen !" +#: methods/ftp.cc:356 methods/rsh.cc:206 +msgid "A response overflowed the buffer." +msgstr "Gorlifodd ateb y byffer." -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Methwyd neilltuo dargyfeiriad" +#: methods/ftp.cc:373 methods/ftp.cc:385 +msgid "Protocol corruption" +msgstr "Llygr protocol" -#: apt-inst/filelist.cc:464 -#, fuzzy -msgid "Internal error in AddDiversion" -msgstr "Gwall Mewnol yn AddDiversion" +#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 +#: apt-pkg/contrib/fileutl.cc:1352 apt-pkg/contrib/fileutl.cc:1361 +#: apt-pkg/contrib/fileutl.cc:1364 apt-pkg/contrib/fileutl.cc:1390 +msgid "Write error" +msgstr "Gwall ysgrifennu" -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +msgid "Could not create a socket" +msgstr "Methwyd creu soced" -# FIXME: "the" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" +#: methods/ftp.cc:707 +msgid "Could not connect data socket, connection timed out" +msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: apt-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Ffeil cyfluniad dyblyg %s/%s" +#: methods/ftp.cc:713 +#, fuzzy +msgid "Could not connect passive socket." +msgstr "Methwyd cysylltu soced goddefol" -#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49 -#, fuzzy, c-format -msgid "Failed to write file %s" -msgstr "Methwyd ysgrifennu ffeil %s" +# FIXME +#: methods/ftp.cc:730 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "Methodd getaddrinfo gael soced gwrando" -#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100 -#, c-format -msgid "Failed to close file %s" -msgstr "Methwyd cau ffeil %s" +#: methods/ftp.cc:744 +msgid "Could not bind a socket" +msgstr "Methwyd rhwymo soced" -#: apt-inst/extract.cc:93 apt-inst/extract.cc:164 -#, c-format -msgid "The path %s is too long" -msgstr "Mae'r llwybr %s yn rhy hir" +#: methods/ftp.cc:748 +msgid "Could not listen on the socket" +msgstr "Methwyd gwrando ar y soced" -#: apt-inst/extract.cc:124 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Yn dadbacio %s mwy nag unwaith" +#: methods/ftp.cc:755 +msgid "Could not determine the socket's name" +msgstr "Methwyd canfod enw'r soced" -#: apt-inst/extract.cc:134 -#, c-format -msgid "The directory %s is diverted" -msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" +#: methods/ftp.cc:787 +msgid "Unable to send PORT command" +msgstr "Methwyd danfod gorchymyn PORT" -#: apt-inst/extract.cc:144 +#: methods/ftp.cc:797 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" - -#: apt-inst/extract.cc:154 apt-inst/extract.cc:297 -msgid "The diversion path is too long" -msgstr "Mae llwybr y dargyfeiriad yn rhy hir" +msgid "Unknown address family %u (AF_*)" +msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: apt-inst/extract.cc:240 +#: methods/ftp.cc:806 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "" -"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" +msgid "EPRT failed, server said: %s" +msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: apt-inst/extract.cc:280 -msgid "Failed to locate node in its hash bucket" -msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" - -#: apt-inst/extract.cc:284 -msgid "The path is too long" -msgstr "Mae'r llwybr yn rhy hir" - -# FIXME: wtf? -#: apt-inst/extract.cc:414 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" - -#: apt-inst/extract.cc:431 -#, c-format -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" - -#. 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:179 -#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204 -#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307 -#: methods/mirror.cc:87 -#, c-format -msgid "Unable to read %s" -msgstr "Ni ellir darllen %s" - -#: apt-inst/extract.cc:491 -#, c-format -msgid "Unable to stat %s" -msgstr "Ni ellir gwneud stat() o %s" - -#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57 -#, c-format -msgid "Failed to remove %s" -msgstr "Methwyd dileu %s" - -#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108 -#, c-format -msgid "Unable to create %s" -msgstr "Ni ellir creu %s" - -#: apt-inst/deb/dpkgdb.cc:114 -#, c-format -msgid "Failed to stat %sinfo" -msgstr "Methwyd stat() ar %sinfo" - -#: apt-inst/deb/dpkgdb.cc:119 -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" - -#: 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" - -#: apt-inst/deb/dpkgdb.cc:176 -#, c-format -msgid "Failed to change to the admin dir %sinfo" -msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" - -# FIXME -#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 -#: apt-inst/deb/dpkgdb.cc:444 -#, fuzzy -msgid "Internal error getting a package name" -msgstr "Gwall mewnol wrth gyrchu enw pecyn" - -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 -#, fuzzy -msgid "Reading file listing" -msgstr "Yn Darllen Rhestr Ffeiliau" - -#: apt-inst/deb/dpkgdb.cc:212 -#, c-format -msgid "" -"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " -"then make it empty and immediately re-install the same version of the " -"package!" -msgstr "" -"Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn yna " -"gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!" - -# FIXME -#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 -#, c-format -msgid "Failed reading the list file %sinfo/%s" -msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" - -#: apt-inst/deb/dpkgdb.cc:262 -#, fuzzy -msgid "Internal error getting a node" -msgstr "Gwall Mewnol wrth gael Nôd" - -# FIXME: literal -#: apt-inst/deb/dpkgdb.cc:305 -#, c-format -msgid "Failed to open the diversions file %sdiversions" -msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions" - -#: apt-inst/deb/dpkgdb.cc:320 -msgid "The diversion file is corrupted" -msgstr "Mae'r ffeil dargyfeirio wed ei lygru" - -#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332 -#: apt-inst/deb/dpkgdb.cc:337 -#, c-format -msgid "Invalid line in the diversion file: %s" -msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" - -#: apt-inst/deb/dpkgdb.cc:358 -#, fuzzy -msgid "Internal error adding a diversion" -msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" - -#: apt-inst/deb/dpkgdb.cc:379 -#, fuzzy -msgid "The pkg cache must be initialized first" -msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" - -#: apt-inst/deb/dpkgdb.cc:439 -#, fuzzy, c-format -msgid "Failed to find a Package: header, offset %lu" -msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" - -#: apt-inst/deb/dpkgdb.cc:461 -#, c-format -msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" - -#: apt-inst/deb/dpkgdb.cc:466 -#, c-format -msgid "Error parsing MD5. Offset %lu" -msgstr "Gwall wrth ramadegu MD5. Atred: %lu" - -#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" - -#: apt-inst/deb/debfile.cc:50 -#, fuzzy, c-format -msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" -msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" - -#: apt-inst/deb/debfile.cc:110 -#, c-format -msgid "Couldn't change to %s" -msgstr "Methwyd newid i %s" - -#: apt-inst/deb/debfile.cc:140 -#, fuzzy -msgid "Internal error, could not locate member" -msgstr "Gwall Methwyd, methwyd lleoli aelod" - -#: apt-inst/deb/debfile.cc:173 -msgid "Failed to locate a valid control file" -msgstr "Methwyd lleoli ffeil rheoli dilys" - -#: apt-inst/deb/debfile.cc:258 -#, fuzzy -msgid "Unparsable control file" -msgstr "Ffeil rheoli ni ellir ei ramadegu" - -#: methods/bzip2.cc:65 -#, c-format -msgid "Couldn't open pipe for %s" -msgstr "Methwyd agor pibell ar gyfer %s" - -#: methods/bzip2.cc:109 -#, c-format -msgid "Read error from %s process" -msgstr "Gwall darllen o broses %s" - -#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43 -#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486 -#: methods/rred.cc:495 -msgid "Failed to stat" -msgstr "Methwyd stat()" - -#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99 -#: 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:208 -#, fuzzy -msgid "" -"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " -"cannot be used to add new CD-ROMs" -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:218 -#, fuzzy -msgid "Wrong CD-ROM" -msgstr "CD Anghywir" - -#: 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:250 -#, fuzzy -msgid "Disk not found." -msgstr "Ffeil heb ei ganfod" - -#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 -msgid "File not found" -msgstr "Ffeil heb ei ganfod" - -#: methods/file.cc:44 -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:168 -msgid "Logging in" -msgstr "Yn mewngofnodi" - -#: methods/ftp.cc:174 -msgid "Unable to determine the peer name" -msgstr "Ni ellir darganfod enw'r cymar" - -#: methods/ftp.cc:179 -msgid "Unable to determine the local name" -msgstr "Ni ellir darganfod yr enw lleol" - -#: 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:216 -#, c-format -msgid "USER failed, server said: %s" -msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" - -#: methods/ftp.cc:223 -#, c-format -msgid "PASS failed, server said: %s" -msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" - -#: methods/ftp.cc:243 -msgid "" -"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " -"is empty." -msgstr "" -"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::" -"ProxyLogin yn wag.)" - -# FIXME -#: 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:297 -#, c-format -msgid "TYPE failed, server said: %s" -msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" - -#: 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:341 -msgid "Server closed the connection" -msgstr "Caeodd y gweinydd y cysylltiad" - -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190 -msgid "Read error" -msgstr "Gwall darllen" - -#: methods/ftp.cc:351 methods/rsh.cc:197 -msgid "A response overflowed the buffer." -msgstr "Gorlifodd ateb y byffer." - -#: methods/ftp.cc:368 methods/ftp.cc:380 -msgid "Protocol corruption" -msgstr "Llygr protocol" - -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232 -msgid "Write error" -msgstr "Gwall ysgrifennu" - -#: 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:703 -msgid "Could not connect data socket, connection timed out" -msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" - -#: methods/ftp.cc:709 -#, fuzzy -msgid "Could not connect passive socket." -msgstr "Methwyd cysylltu soced goddefol" - -# FIXME -#: methods/ftp.cc:727 -msgid "getaddrinfo was unable to get a listening socket" -msgstr "Methodd getaddrinfo gael soced gwrando" - -#: methods/ftp.cc:741 -msgid "Could not bind a socket" -msgstr "Methwyd rhwymo soced" - -#: methods/ftp.cc:745 -msgid "Could not listen on the socket" -msgstr "Methwyd gwrando ar y soced" - -#: methods/ftp.cc:752 -msgid "Could not determine the socket's name" -msgstr "Methwyd canfod enw'r soced" - -#: methods/ftp.cc:784 -msgid "Unable to send PORT command" -msgstr "Methwyd danfod gorchymyn PORT" - -#: methods/ftp.cc:794 -#, c-format -msgid "Unknown address family %u (AF_*)" -msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" - -#: methods/ftp.cc:803 -#, c-format -msgid "EPRT failed, server said: %s" -msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" - -#: methods/ftp.cc:823 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:830 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302 +#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:882 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:897 methods/rsh.cc:321 +#: methods/ftp.cc:900 methods/rsh.cc:330 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:927 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1004 +#: methods/ftp.cc:1007 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1116 +#: methods/ftp.cc:1119 msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:71 +#: methods/connect.cc:75 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:82 +#: methods/connect.cc:86 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:89 +#: methods/connect.cc:93 #, 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:95 +#: methods/connect.cc:99 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:103 +#: methods/connect.cc:107 #, 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:121 +#: methods/connect.cc:125 #, 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:149 methods/rsh.cc:424 +#: methods/connect.cc:153 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:168 methods/connect.cc:187 +#: methods/connect.cc:172 methods/connect.cc:191 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:197 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:196 +#: methods/connect.cc:200 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:243 +#: methods/connect.cc:247 #, 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:71 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Yn Erthylu'r Sefydliad." - -#: methods/gpgv.cc:163 +#: methods/gpgv.cc:180 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:168 +#: methods/gpgv.cc:185 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:189 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:194 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:211 methods/gpgv.cc:218 +#: methods/gpgv.cc:228 methods/gpgv.cc:235 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:225 +#: methods/gpgv.cc:242 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/http.cc:385 +#: methods/gzip.cc:65 +msgid "Empty files can't be valid archives" +msgstr "" + +#: methods/http.cc:394 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: 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:539 +#: methods/http.cc:544 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:564 methods/http.cc:571 +#: methods/http.cc:569 methods/http.cc:576 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:600 +#: methods/http.cc:606 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:615 +#: methods/http.cc:621 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:617 +#: methods/http.cc:623 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:641 +#: methods/http.cc:647 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:799 +#: methods/http.cc:818 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:804 +#: methods/http.cc:823 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:827 +#: methods/http.cc:846 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:858 +#: methods/http.cc:877 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:886 -msgid "Error writing to the file" -msgstr "Gwall wrth ysgrifennu at y ffeil" +#: methods/http.cc:905 +msgid "Error writing to the file" +msgstr "Gwall wrth ysgrifennu at y ffeil" + +#: methods/http.cc:919 +#, 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:921 +msgid "Error reading from server" +msgstr "Gwall wrth ddarllen o'r gweinydd" + +#: methods/http.cc:1194 +#, fuzzy +msgid "Bad header data" +msgstr "Data pennawd gwael" + +#: methods/http.cc:1211 methods/http.cc:1266 +msgid "Connection failed" +msgstr "Methodd y cysylltiad" + +#: methods/http.cc:1358 +msgid "Internal error" +msgstr "Gwall mewnol" + +#. Only warn if there are no sources.list.d. +#. Only warn if there is no sources.list file. +#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 +#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 +#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359 +#, c-format +msgid "Unable to read %s" +msgstr "Ni ellir darllen %s" + +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 +#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 +#: apt-pkg/clean.cc:122 +#, c-format +msgid "Unable to change to %s" +msgstr "Ni ellir newid i %s" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:280 +#, c-format +msgid "No mirror file '%s' found " +msgstr "" + +#. FIXME: fallback to a default mirror here instead +#. and provide a config option to define that default +#: methods/mirror.cc:287 +#, fuzzy, c-format +msgid "Can not read mirror file '%s'" +msgstr "Methwyd agor ffeil %s" + +#: methods/mirror.cc:442 +#, c-format +msgid "[Mirror: %s]" +msgstr "" + +#: methods/rred.cc:491 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:496 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Methwyd creu pibell cyfathrebu at isbroses" + +#: methods/rsh.cc:338 +msgid "Connection closed prematurely" +msgstr "Caewyd y cysylltiad yn gynnar" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Rhagosodiad gwael!" + +#: 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:91 +msgid "Do you want to erase any previously downloaded .deb files?" +msgstr "" + +#: dselect/install:101 +#, 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:104 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu " +"eto." + +#: dselect/update:30 +#, fuzzy +msgid "Merging available information" +msgstr "Yn cyfuno manylion Ar Gael" + +#: cmdline/apt-extracttemplates.cc:102 +#, c-format +msgid "%s not a valid DEB package." +msgstr "Nid yw %s yn becyn DEB dilys." + +# FIXME: "debian" +#: cmdline/apt-extracttemplates.cc:236 +#, fuzzy +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1277 +#, c-format +msgid "Unable to write to %s" +msgstr "Ni ellir ysgrifennu i %s" + +#: cmdline/apt-extracttemplates.cc:313 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" + +#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348 +msgid "Package extension list is too long" +msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." + +#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 +#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263 +#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299 +#, fuzzy, c-format +msgid "Error processing directory %s" +msgstr "Gwall wrth brosesu'r cyfeiriadur %s" + +#: ftparchive/apt-ftparchive.cc:261 +msgid "Source extension list is too long" +msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" + +#: ftparchive/apt-ftparchive.cc:378 +msgid "Error writing header to contents file" +msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" + +#: ftparchive/apt-ftparchive.cc:408 +#, fuzzy, c-format +msgid "Error processing contents %s" +msgstr "Gwall wrth Brosesu Cynnwys %s" + +# FIXME: full stops +#: ftparchive/apt-ftparchive.cc:596 +#, fuzzy +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" +"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" +" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n" +" contents llwybr\n" +" release llwybr\n" +" generate cyfluniad [grŵpiau]\n" +" clean cyfluniad\n" +"\n" +"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" +"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" +"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" +"\n" +"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" +"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" +"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n" +"gorfodi'r gwerthoedd Priority a Section.\n" +"\n" +"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n" +".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n" +"gwrthwneud ffynhonell.\n" +"\n" +"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n" +"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n" +"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n" +"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n" +"defnydd o'r archif Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" --md5 Rheoli cynhyrchiad stwnch MD5\n" +" -s=? Ffeil gwrthwneud ffynhonell\n" +" -q Tawel\n" +" -d=? Dewis cronda data storfa opsiynnol\n" +" --no-delink Galluogi'r modd datgysylltu datnamu\n" +" --contents Rheoli cynhyrchiad ffeil cynnwys\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol" + +#: ftparchive/apt-ftparchive.cc:802 +msgid "No selections matched" +msgstr "Dim dewisiadau'n cyfateb" + +#: ftparchive/apt-ftparchive.cc:880 +#, 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'" + +#: ftparchive/cachedb.cc:47 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" + +#: ftparchive/cachedb.cc:65 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Hen gronfa data, yn ceisio uwchraddio %s" + +#: ftparchive/cachedb.cc:76 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:81 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Ni ellir agor y ffeil DB2 %s: %s" + +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 +#, c-format +msgid "Failed to stat %s" +msgstr "Methodd stat() o %s" + +#: ftparchive/cachedb.cc:249 +msgid "Archive has no control record" +msgstr "Does dim cofnod rheoli gan yr archif" + +#: ftparchive/cachedb.cc:490 +msgid "Unable to get a cursor" +msgstr "Ni ellir cael cyrchydd" + +#: ftparchive/writer.cc:80 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" + +#: ftparchive/writer.cc:85 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "Rh: Ni ellir gwneud stat() o %s\n" + +#: ftparchive/writer.cc:141 +msgid "E: " +msgstr "G: " + +#: ftparchive/writer.cc:143 +msgid "W: " +msgstr "Rh: " + +#: ftparchive/writer.cc:150 +msgid "E: Errors apply to file " +msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " + +#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 +#, c-format +msgid "Failed to resolve %s" +msgstr "Methwyd datrys %s" + +#: ftparchive/writer.cc:181 +msgid "Tree walking failed" +msgstr "Methwyd cerdded y goeden" + +#: ftparchive/writer.cc:208 +#, c-format +msgid "Failed to open %s" +msgstr "Methwyd agor %s" + +# FIXME +#: ftparchive/writer.cc:267 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " DatGysylltu %s [%s]\n" + +#: ftparchive/writer.cc:275 +#, c-format +msgid "Failed to readlink %s" +msgstr "Methwyd darllen y cyswllt %s" + +#: ftparchive/writer.cc:279 +#, c-format +msgid "Failed to unlink %s" +msgstr "Methwyd datgysylltu %s" + +#: ftparchive/writer.cc:286 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** Methwyd cysylltu %s at %s" + +#: ftparchive/writer.cc:296 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " Tarwyd y terfyn cyswllt %sB.\n" + +#: ftparchive/writer.cc:401 +msgid "Archive had no package field" +msgstr "Doedd dim maes pecyn gan yr archif" + +#: ftparchive/writer.cc:409 ftparchive/writer.cc:711 +#, c-format +msgid " %s has no override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/writer.cc:477 ftparchive/writer.cc:827 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " Cynaliwr %s yw %s nid %s\n" + +#: ftparchive/writer.cc:721 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/writer.cc:725 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Methwyd neilltuo cof" + +#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#, c-format +msgid "Unable to open %s" +msgstr "Ni ellir agor %s" + +#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" + +#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" + +#: ftparchive/override.cc:128 ftparchive/override.cc:202 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" + +#: ftparchive/multicompress.cc:70 +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Dull Cywasgu Anhysbys '%s'" + +#: ftparchive/multicompress.cc:100 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" + +#: ftparchive/multicompress.cc:189 +msgid "Failed to create FILE*" +msgstr "Methwyd creu FILE*" + +#: ftparchive/multicompress.cc:192 +msgid "Failed to fork" +msgstr "Methodd fork()" + +#: ftparchive/multicompress.cc:206 +#, fuzzy +msgid "Compress child" +msgstr "Plentyn Cywasgu" + +#: ftparchive/multicompress.cc:229 +#, fuzzy, c-format +msgid "Internal error, failed to create %s" +msgstr "Gwall Mewnol, Methwyd creu %s" + +#: ftparchive/multicompress.cc:304 +msgid "IO to subprocess/file failed" +msgstr "Methodd MA i isbroses/ffeil" + +#: ftparchive/multicompress.cc:342 +msgid "Failed to read while computing MD5" +msgstr "Methwyd darllen wrth gyfrifo MD5" + +#: ftparchive/multicompress.cc:358 +#, c-format +msgid "Problem unlinking %s" +msgstr "Gwall wrth datgysylltu %s" + +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Methwyd ailenwi %s at %s" + +# FIXME: "debian" +#: cmdline/apt-internal-solver.cc:37 +#, fuzzy +msgid "" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Cofnod pecyn anhysbys!" + +#: cmdline/apt-sortpkgs.cc:153 +#, fuzzy +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n" +"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" -s Defnyddio trefnu ffeil ffynhonell\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" + +#: apt-inst/contrib/extracttar.cc:117 +msgid "Failed to create pipes" +msgstr "Methwyd creu pibau" + +#: apt-inst/contrib/extracttar.cc:144 +msgid "Failed to exec gzip " +msgstr "Methwyd gweithredu gzip" + +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +msgid "Corrupted archive" +msgstr "Archif llygredig" + +#: apt-inst/contrib/extracttar.cc:196 +#, fuzzy +msgid "Tar checksum failed, archive corrupted" +msgstr "Methodd swm gwirio Tar, archif llygredig" + +#: apt-inst/contrib/extracttar.cc:303 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Math pennawd TAR anhysbys %u, aelod %s" + +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "Llofnod archif annilys" + +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "Gwall wrth ddarllen pennawd aelod archif" + +#: apt-inst/contrib/arfile.cc:94 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" + +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "Pennawd aelod archif annilys" + +#: apt-inst/contrib/arfile.cc:132 +msgid "Archive is too short" +msgstr "Mae'r archif yn rhy fyr" + +#: apt-inst/contrib/arfile.cc:136 +msgid "Failed to read the archive headers" +msgstr "Methwyd darllen pennawdau'r archif" + +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" + +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "Methyd lleoli yr elfen !" + +#: apt-inst/filelist.cc:461 +msgid "Failed to allocate diversion" +msgstr "Methwyd neilltuo dargyfeiriad" + +#: apt-inst/filelist.cc:466 +#, fuzzy +msgid "Internal error in AddDiversion" +msgstr "Gwall Mewnol yn AddDiversion" + +#: apt-inst/filelist.cc:479 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" + +# FIXME: "the" +#: apt-inst/filelist.cc:508 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" + +#: apt-inst/filelist.cc:551 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Ffeil cyfluniad dyblyg %s/%s" + +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Methwyd ysgrifennu ffeil %s" + +#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#, c-format +msgid "Failed to close file %s" +msgstr "Methwyd cau ffeil %s" + +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#, c-format +msgid "The path %s is too long" +msgstr "Mae'r llwybr %s yn rhy hir" + +#: apt-inst/extract.cc:127 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Yn dadbacio %s mwy nag unwaith" + +#: apt-inst/extract.cc:137 +#, c-format +msgid "The directory %s is diverted" +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" + +#: apt-inst/extract.cc:147 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" + +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +msgid "The diversion path is too long" +msgstr "Mae llwybr y dargyfeiriad yn rhy hir" + +#: apt-inst/extract.cc:243 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "" +"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" + +#: apt-inst/extract.cc:283 +msgid "Failed to locate node in its hash bucket" +msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" + +#: apt-inst/extract.cc:287 +msgid "The path is too long" +msgstr "Mae'r llwybr yn rhy hir" + +# FIXME: wtf? +#: apt-inst/extract.cc:415 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: methods/http.cc:900 -#, fuzzy -msgid "Error reading from server. Remote end closed connection" -msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" +#: apt-inst/extract.cc:432 +#, c-format +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" -#: methods/http.cc:902 -msgid "Error reading from server" -msgstr "Gwall wrth ddarllen o'r gweinydd" +#: apt-inst/extract.cc:492 +#, c-format +msgid "Unable to stat %s" +msgstr "Ni ellir gwneud stat() o %s" -#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281 -#, fuzzy -msgid "Failed to truncate file" -msgstr "Methwyd ysgrifennu ffeil %s" +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: methods/http.cc:1160 -#, fuzzy -msgid "Bad header data" -msgstr "Data pennawd gwael" +#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain +#: apt-inst/deb/debfile.cc:55 +#, fuzzy, c-format +msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: methods/http.cc:1177 methods/http.cc:1232 -msgid "Connection failed" -msgstr "Methodd y cysylltiad" +#: apt-inst/deb/debfile.cc:120 +#, fuzzy, c-format +msgid "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: methods/http.cc:1324 -msgid "Internal error" -msgstr "Gwall mewnol" +#: apt-inst/deb/debfile.cc:214 +#, fuzzy +msgid "Unparsable control file" +msgstr "Ffeil rheoli ni ellir ei ramadegu" -#: apt-pkg/contrib/mmap.cc:77 +#: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/contrib/mmap.cc:89 +#: apt-pkg/contrib/mmap.cc:110 #, 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" +#: apt-pkg/contrib/mmap.cc:118 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/mmap.cc:124 +#: apt-pkg/contrib/mmap.cc:145 #, fuzzy msgid "Unable to close mmap" msgstr "Ni ellir agor %s" # FIXME -#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 +#: apt-pkg/contrib/mmap.cc:173 apt-pkg/contrib/mmap.cc:201 #, fuzzy msgid "Unable to synchronize mmap" msgstr "Methwyd gweithredu " -#: apt-pkg/contrib/mmap.cc:300 +#: apt-pkg/contrib/mmap.cc:279 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Methwyd gwneud mmap() efo %lu beit" + +#: apt-pkg/contrib/mmap.cc:311 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Methwyd ysgrifennu ffeil %s" + +#: apt-pkg/contrib/mmap.cc:330 #, 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:399 +#: apt-pkg/contrib/mmap.cc:429 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:402 +#: apt-pkg/contrib/mmap.cc:432 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:371 +#: apt-pkg/contrib/strutl.cc:372 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:378 +#: apt-pkg/contrib/strutl.cc:379 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:385 +#: apt-pkg/contrib/strutl.cc:386 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:390 +#: apt-pkg/contrib/strutl.cc:391 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1119 +#: apt-pkg/contrib/strutl.cc:1166 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:452 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:510 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:678 +#: apt-pkg/contrib/configuration.cc:773 #, 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:697 +#: apt-pkg/contrib/configuration.cc:792 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:714 +#: apt-pkg/contrib/configuration.cc:809 #, 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:754 +#: apt-pkg/contrib/configuration.cc:849 #, 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:761 +#: apt-pkg/contrib/configuration.cc:856 #, 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:765 apt-pkg/contrib/configuration.cc:770 +#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:774 +#: apt-pkg/contrib/configuration.cc:869 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:777 +#: apt-pkg/contrib/configuration.cc:872 #, 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 +#: apt-pkg/contrib/configuration.cc:922 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" -#: apt-pkg/contrib/progress.cc:153 +#: apt-pkg/contrib/progress.cc:146 #, c-format msgid "%c%s... Error!" msgstr "%c%s... Gwall!" -#: apt-pkg/contrib/progress.cc:155 +#: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Done" msgstr "%c%s... Wedi Gorffen" # FIXME -#: apt-pkg/contrib/cmndline.cc:77 +#: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111 -#: apt-pkg/contrib/cmndline.cc:119 +#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/contrib/cmndline.cc:124 +#: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 +#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189 #, c-format msgid "Option %s requires an argument." msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 +#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208 #, 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:236 +#: apt-pkg/contrib/cmndline.cc:237 #, 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:267 +#: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" @@ -2423,326 +2481,343 @@ msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." msgid "Invalid operation %s" msgstr "Gweithred annilys %s" -#: apt-pkg/contrib/cdromutl.cc:52 +#: apt-pkg/contrib/cdromutl.cc:56 #, c-format msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209 -#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 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:217 +#: apt-pkg/contrib/cdromutl.cc:224 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:93 +#, fuzzy, c-format +msgid "Problem closing the gzip file %s" +msgstr "Gwall wrth gau'r ffeil" + +#: apt-pkg/contrib/fileutl.cc:225 #, 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:159 +#: apt-pkg/contrib/fileutl.cc:230 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:177 +#: apt-pkg/contrib/fileutl.cc:248 #, 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:181 +#: apt-pkg/contrib/fileutl.cc:252 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:321 +#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:661 -#, 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:426 +#, c-format +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:444 +#, c-format +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" +msgstr "" + +#: apt-pkg/contrib/fileutl.cc:453 +#, c-format +msgid "" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:673 +#: apt-pkg/contrib/fileutl.cc:840 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:842 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:679 +#: apt-pkg/contrib/fileutl.cc:846 #, 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:681 +#: apt-pkg/contrib/fileutl.cc:848 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:746 +#: apt-pkg/contrib/fileutl.cc:984 apt-pkg/indexcopy.cc:655 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:763 +#: apt-pkg/contrib/fileutl.cc:1046 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" +#: apt-pkg/contrib/fileutl.cc:1136 +msgid "Failed to create subprocess IPC" +msgstr "Methwyd creu isbroses IPC" + +#: apt-pkg/contrib/fileutl.cc:1192 +msgid "Failed to exec compressor " +msgstr "Methwyd gweithredu cywasgydd " + # FIXME -#: apt-pkg/contrib/fileutl.cc:823 -#, c-format -msgid "read, still have %lu to read but none left" +#: apt-pkg/contrib/fileutl.cc:1289 +#, fuzzy, c-format +msgid "read, still have %llu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:856 -#, 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:985 +#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gwall wrth gau'r ffeil" +msgid "write, still have %llu to write but couldn't" +msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:988 +#: apt-pkg/contrib/fileutl.cc:1716 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:993 +#: apt-pkg/contrib/fileutl.cc:1728 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1004 +#: apt-pkg/contrib/fileutl.cc:1739 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1017 +#: apt-pkg/contrib/fileutl.cc:1755 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/pkgcache.cc:145 +#: apt-pkg/pkgcache.cc:148 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:151 +#: apt-pkg/pkgcache.cc:154 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:156 +#: apt-pkg/pkgcache.cc:159 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" +#: apt-pkg/pkgcache.cc:162 +#, fuzzy +msgid "The package cache file is corrupted, it is too small" +msgstr "Mae'r ffeil storfa pecyn yn llygredig" + # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:161 +#: apt-pkg/pkgcache.cc:167 #, 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:166 +#: apt-pkg/pkgcache.cc:172 msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:305 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:305 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:293 +#: apt-pkg/pkgcache.cc:305 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:306 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:306 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:294 +#: apt-pkg/pkgcache.cc:306 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:307 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:307 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:295 +#: apt-pkg/pkgcache.cc:307 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:318 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:318 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:318 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:319 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:319 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154 +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:126 +#: apt-pkg/depcache.cc:133 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:155 +#: apt-pkg/depcache.cc:162 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" -#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212 +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 #, fuzzy msgid "Reading state information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-pkg/depcache.cc:237 +#: apt-pkg/depcache.cc:244 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Methwyd agor %s" -#: apt-pkg/depcache.cc:243 +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/depcache.cc:922 -#, c-format -msgid "Internal error, group '%s' has no installable pseudo package" -msgstr "" - # FIXME: number? -#: apt-pkg/tagfile.cc:102 +#: apt-pkg/tagfile.cc:129 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:189 +#: apt-pkg/tagfile.cc:216 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:96 #, 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 +#: apt-pkg/sourcelist.cc:99 #, 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 +#: apt-pkg/sourcelist.cc:110 #, 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 +#: apt-pkg/sourcelist.cc:116 #, 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 +#: apt-pkg/sourcelist.cc:119 #, 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 +#: apt-pkg/sourcelist.cc:132 #, 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:130 +#: apt-pkg/sourcelist.cc:134 #, 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:133 +#: apt-pkg/sourcelist.cc:137 #, 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:139 +#: apt-pkg/sourcelist.cc:143 #, 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:146 +#: apt-pkg/sourcelist.cc:150 #, 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:244 +#: apt-pkg/sourcelist.cc:248 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438 +#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:469 #, 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:281 +#: apt-pkg/sourcelist.cc:285 #, 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:285 +#: apt-pkg/sourcelist.cc:289 #, 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/packagemanager.cc:331 apt-pkg/packagemanager.cc:616 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:891 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Methwyd agor ffeil %s" + # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:452 +#: apt-pkg/packagemanager.cc:545 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2753,19 +2828,12 @@ 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 +#: apt-pkg/pkgrecords.cc:34 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:292 +#: apt-pkg/algorithms.cc:261 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2773,7 +2841,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1218 +#: apt-pkg/algorithms.cc:1223 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2781,57 +2849,58 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1220 +#: apt-pkg/algorithms.cc:1225 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:1496 apt-pkg/algorithms.cc:1498 +#: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571 +#, fuzzy msgid "" -"Some index files failed to download, they have been ignored, or old ones " +"Some index files failed to download. They have been ignored, or old ones " "used instead." msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: apt-pkg/acquire.cc:79 +#: apt-pkg/acquire.cc:81 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/acquire.cc:83 +#: apt-pkg/acquire.cc:85 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Mae'r cyfeiriadur archif %spartial ar goll." -#: apt-pkg/acquire.cc:91 +#: apt-pkg/acquire.cc:93 #, 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:857 +#: apt-pkg/acquire.cc:893 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:859 +#: apt-pkg/acquire.cc:895 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/acquire-worker.cc:110 +#: apt-pkg/acquire-worker.cc:112 #, c-format msgid "The method driver %s could not be found." msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-pkg/acquire-worker.cc:159 +#: apt-pkg/acquire-worker.cc:161 #, c-format msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:413 +#: apt-pkg/acquire-worker.cc:440 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2839,192 +2908,181 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:143 +#: apt-pkg/init.cc:151 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:159 +#: apt-pkg/init.cc:167 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" -#: apt-pkg/clean.cc:56 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ni ellir gwneud stat() o %s." # FIXME: ...file -#: apt-pkg/srcrecords.cc:44 +#: apt-pkg/srcrecords.cc:47 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:84 +#: apt-pkg/cachefile.cc:87 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:88 +#: apt-pkg/cachefile.cc:91 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." -#: apt-pkg/cachefile.cc:106 +#: apt-pkg/cachefile.cc:109 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." +#: apt-pkg/policy.cc:74 +#, c-format +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" + # FIXME: literal -#: apt-pkg/policy.cc:344 +#: apt-pkg/policy.cc:396 #, 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:366 +#: apt-pkg/policy.cc:418 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:374 +#: apt-pkg/policy.cc:426 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/pkgcachegen.cc:80 +#: apt-pkg/pkgcachegen.cc:85 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" -#: 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:215 -#, fuzzy, c-format -msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" - -#: 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:285 -#, fuzzy, c-format -msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" - -#: 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:306 apt-pkg/pkgcachegen.cc:316 -#: apt-pkg/pkgcachegen.cc:324 -#, fuzzy, c-format -msgid "Error occurred while processing %s (NewVersion%d)" -msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" - -#: 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:353 -#, fuzzy, c-format -msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277 +#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316 +#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362 +#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389 +#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423 +#: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471 +#: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:360 +#: apt-pkg/pkgcachegen.cc:234 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:363 +#: apt-pkg/pkgcachegen.cc:237 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:366 +#: apt-pkg/pkgcachegen.cc:240 #, 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:369 +#: apt-pkg/pkgcachegen.cc:243 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:398 -#, fuzzy, c-format -msgid "Error occurred while processing %s (FindPkg)" -msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" - -#: 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:418 +#: apt-pkg/pkgcachegen.cc:523 #, 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:982 +#: apt-pkg/pkgcachegen.cc:1088 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1087 +#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280 +#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443 +#, fuzzy +msgid "Reading package lists" +msgstr "Yn Darllen Rhestrau Pecynnau" + +#: apt-pkg/pkgcachegen.cc:1193 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272 +#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/acquire-item.cc:136 +#: apt-pkg/acquire-item.cc:139 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:484 +#: apt-pkg/acquire-item.cc:599 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574 -#: apt-pkg/acquire-item.cc:1717 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1859 +#: apt-pkg/acquire-item.cc:2002 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1244 +#: apt-pkg/acquire-item.cc:1370 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" + +# FIXME: number? +#: apt-pkg/acquire-item.cc:1386 +#, fuzzy, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#: apt-pkg/acquire-item.cc:1428 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:1281 +#: apt-pkg/acquire-item.cc:1466 #, c-format -msgid "Release file expired, ignoring %s (invalid since %s)" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1302 +#: apt-pkg/acquire-item.cc:1488 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1328 +#: apt-pkg/acquire-item.cc:1521 #, 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:1337 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1531 apt-pkg/acquire-item.cc:1536 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1365 +#: apt-pkg/acquire-item.cc:1635 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3033,401 +3091,553 @@ 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:1424 +#: apt-pkg/acquire-item.cc:1694 #, c-format msgid "" -"I wasn't able to locate file for the %s package. This might mean you need to " -"manually fix this package." +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package." 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:1479 +#: apt-pkg/acquire-item.cc:1753 #, 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:1566 +#: apt-pkg/acquire-item.cc:1851 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" # FIXME: number? -#: apt-pkg/indexrecords.cc:53 +#: apt-pkg/indexrecords.cc:64 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/indexrecords.cc:60 +#: apt-pkg/indexrecords.cc:74 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: apt-pkg/indexrecords.cc:94 +#: apt-pkg/indexrecords.cc:108 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:107 +#: apt-pkg/indexrecords.cc:121 #, 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 +#: apt-pkg/indexrecords.cc:140 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/vendorlist.cc:66 +#: apt-pkg/vendorlist.cc:78 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:518 +#: apt-pkg/cdrom.cc:550 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:656 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:552 +#: apt-pkg/cdrom.cc:587 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827 +#: apt-pkg/cdrom.cc:596 apt-pkg/cdrom.cc:879 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" -#: apt-pkg/cdrom.cc:578 +#: apt-pkg/cdrom.cc:616 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:596 +#: apt-pkg/cdrom.cc:634 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:600 +#: apt-pkg/cdrom.cc:639 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" -#. Mount the new CDROM -#: apt-pkg/cdrom.cc:608 +#: apt-pkg/cdrom.cc:648 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:626 +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:666 +#: apt-pkg/cdrom.cc:716 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:677 +#: apt-pkg/cdrom.cc:727 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:703 +#: apt-pkg/cdrom.cc:754 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:732 +#: apt-pkg/cdrom.cc:783 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:748 +#: apt-pkg/cdrom.cc:800 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:752 +#: apt-pkg/cdrom.cc:802 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:778 +#: apt-pkg/cdrom.cc:829 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:787 +#: apt-pkg/cdrom.cc:837 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:537 +#: apt-pkg/indexcopy.cc:503 #, fuzzy, c-format msgid "Skipping nonexistent file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/indexcopy.cc:543 +#: apt-pkg/indexcopy.cc:509 #, c-format msgid "Can't find authentication record for: %s" msgstr "" -#: apt-pkg/indexcopy.cc:549 +#: apt-pkg/indexcopy.cc:515 #, fuzzy, c-format msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/cacheset.cc:337 +#: apt-pkg/indexcopy.cc:659 +#, c-format +msgid "File %s doesn't start with a clearsigned message" +msgstr "" + +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/indexcopy.cc:690 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Yn Erthylu'r Sefydliad." + +#: apt-pkg/cacheset.cc:401 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:340 +#: apt-pkg/cacheset.cc:404 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:447 +#: apt-pkg/cacheset.cc:515 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:454 +#: apt-pkg/cacheset.cc:521 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:532 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483 +#: apt-pkg/cacheset.cc:539 apt-pkg/cacheset.cc:546 #, 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 +#: apt-pkg/cacheset.cc:553 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:499 +#: apt-pkg/cacheset.cc:561 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:507 +#: apt-pkg/cacheset.cc:569 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:52 +#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 +msgid "Send scenario to solver" +msgstr "" + +#: apt-pkg/edsp.cc:209 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:277 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:284 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:73 #, fuzzy, c-format msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:55 +#: apt-pkg/deb/dpkgpm.cc:76 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:56 +#: apt-pkg/deb/dpkgpm.cc:77 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:57 +#: apt-pkg/deb/dpkgpm.cc:78 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:646 +#: apt-pkg/deb/dpkgpm.cc:705 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675 +#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:816 +#: apt-pkg/deb/dpkgpm.cc:945 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:817 +#: apt-pkg/deb/dpkgpm.cc:946 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:822 +#: apt-pkg/deb/dpkgpm.cc:951 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:824 +#: apt-pkg/deb/dpkgpm.cc:953 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:829 +#: apt-pkg/deb/dpkgpm.cc:958 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:831 +#: apt-pkg/deb/dpkgpm.cc:960 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:836 +#: apt-pkg/deb/dpkgpm.cc:965 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:837 +#: apt-pkg/deb/dpkgpm.cc:966 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1043 +#: apt-pkg/deb/dpkgpm.cc:1209 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1074 +#: apt-pkg/deb/dpkgpm.cc:1239 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1277 +#: apt-pkg/deb/dpkgpm.cc:1411 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1473 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1282 +#: apt-pkg/deb/dpkgpm.cc:1478 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1284 +#: apt-pkg/deb/dpkgpm.cc:1480 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1290 +#: apt-pkg/deb/dpkgpm.cc:1486 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1296 +#: apt-pkg/deb/dpkgpm.cc:1492 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1303 +#: apt-pkg/deb/dpkgpm.cc:1499 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:69 +#: apt-pkg/deb/debsystem.cc:84 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:72 +#: apt-pkg/deb/debsystem.cc:87 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:88 +#: apt-pkg/deb/debsystem.cc:103 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:106 +#: apt-pkg/deb/debsystem.cc:121 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 "" +#~ msgid "Failed to remove %s" +#~ msgstr "Methwyd dileu %s" -#: methods/mirror.cc:343 -#, c-format -msgid "[Mirror: %s]" -msgstr "" +#~ msgid "Unable to create %s" +#~ msgstr "Ni ellir creu %s" -#: 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 "" +#~ msgid "Failed to stat %sinfo" +#~ msgstr "Methwyd stat() ar %sinfo" -#: 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 "" +#~ 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" -#: methods/rsh.cc:329 -msgid "Connection closed prematurely" -msgstr "Caewyd y cysylltiad yn gynnar" +#~ msgid "Failed to change to the admin dir %sinfo" +#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" + +# FIXME +#, fuzzy +#~ msgid "Internal error getting a package name" +#~ msgstr "Gwall mewnol wrth gyrchu enw pecyn" + +#, fuzzy +#~ msgid "Reading file listing" +#~ msgstr "Yn Darllen Rhestr Ffeiliau" + +#~ msgid "" +#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +#~ "then make it empty and immediately re-install the same version of the " +#~ "package!" +#~ msgstr "" +#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn " +#~ "yna gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!" + +# FIXME +#~ msgid "Failed reading the list file %sinfo/%s" +#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" + +#, fuzzy +#~ msgid "Internal error getting a node" +#~ msgstr "Gwall Mewnol wrth gael Nôd" + +# FIXME: literal +#~ msgid "Failed to open the diversions file %sdiversions" +#~ msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions" + +#~ msgid "The diversion file is corrupted" +#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru" + +#~ msgid "Invalid line in the diversion file: %s" +#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" + +#, fuzzy +#~ msgid "Internal error adding a diversion" +#~ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" + +#, fuzzy +#~ msgid "The pkg cache must be initialized first" +#~ msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" + +#, fuzzy +#~ msgid "Failed to find a Package: header, offset %lu" +#~ msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" + +#~ msgid "Bad ConfFile section in the status file. Offset %lu" +#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" + +#~ msgid "Error parsing MD5. Offset %lu" +#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu" + +#~ msgid "Couldn't change to %s" +#~ msgstr "Methwyd newid i %s" + +#~ msgid "Failed to locate a valid control file" +#~ msgstr "Methwyd lleoli ffeil rheoli dilys" + +#~ msgid "Couldn't open pipe for %s" +#~ msgstr "Methwyd agor pibell ar gyfer %s" + +#~ msgid "Read error from %s process" +#~ msgstr "Gwall darllen o broses %s" + +#~ msgid "Got a single header line over %u chars" +#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" + +#~ msgid "Malformed override %s line %lu #1" +#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#~ msgid "Malformed override %s line %lu #2" +#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" + +#~ msgid "Malformed override %s line %lu #3" +#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" + +#~ msgid "decompressor" +#~ msgstr "datgywasgydd" + +# FIXME +#~ msgid "read, still have %lu to read but none left" +#~ msgstr "o hyd %lu i ddarllen ond dim ar ôl" + +# FIXME +#~ msgid "write, still have %lu to write but couldn't" +#~ msgstr "o hyd %lu i ysgrifennu ond methwyd" + +#, fuzzy +#~ msgid "Error occurred while processing %s (NewPackage)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (UsePackage1)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (NewFileDesc1)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (UsePackage2)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (NewFileVer1)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (NewVersion%d)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (UsePackage3)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (NewFileDesc2)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (FindPkg)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" + +#, fuzzy +#~ msgid "Error occurred while processing %s (CollectFileProvides)" +#~ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" + +#, fuzzy +#~ msgid "Internal error, could not locate member" +#~ msgstr "Gwall Methwyd, methwyd lleoli aelod" #, fuzzy #~ msgid "Error occurred while processing %s (NewVersion2)"