From 3f5a581ce1bbfa5522bd46a3436ad80ab6b0da89 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 25 Jun 2012 09:22:55 +0200 Subject: make update-po --- po/cy.po | 3453 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 1714 insertions(+), 1739 deletions(-) (limited to 'po/cy.po') diff --git a/po/cy.po b/po/cy.po index 1aa225968..b33ccba63 100644 --- a/po/cy.po +++ b/po/cy.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" -"Report-Msgid-Bugs-To: deity@lists.debian.org\n" -"POT-Creation-Date: 2012-04-11 17:55+0200\n" +"Report-Msgid-Bugs-To: APT Development Team \n" +"POT-Creation-Date: 2012-06-25 09:17+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -110,8 +110,8 @@ msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." #: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378 -#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:40 -#: cmdline/apt-mark.cc:87 cmdline/apt-mark.cc:163 +#: 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" @@ -124,7 +124,7 @@ msgstr "Rhaid i chi ddarparu un patrwm yn union" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459 +#: 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" @@ -171,10 +171,10 @@ msgstr " Pin Pecyn: " msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590 -#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32 -#: cmdline/apt-mark.cc:267 cmdline/apt-sortpkgs.cc:147 +#: 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" @@ -269,7 +269,7 @@ msgstr "" msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:164 +#: cmdline/apt-cdrom.cc:163 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -277,7 +277,7 @@ msgstr "" msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" -#: cmdline/apt-config.cc:81 +#: cmdline/apt-config.cc:87 #, fuzzy msgid "" "Usage: apt-config [options] command\n" @@ -306,506 +306,150 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:100 -#, 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:234 -#, 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:269 apt-pkg/pkgcachegen.cc:1271 +#: 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:311 -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:171 ftparchive/apt-ftparchive.cc:348 -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: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" +#: 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:261 -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:378 -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:408 -#, 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:596 +#: 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:802 -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: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'" +#: cmdline/apt-get.cc:488 +#, fuzzy +msgid "The following packages will be DOWNGRADED:" +msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: ftparchive/cachedb.cc:46 -#, 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:64 +#: 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:75 +#: 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:80 +#: 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:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 +#: cmdline/apt-get.cc:606 #, c-format -msgid "Failed to stat %s" -msgstr "Methodd stat() o %s" - -#: ftparchive/cachedb.cc:248 -msgid "Archive has no control record" -msgstr "Does dim cofnod rheoli gan yr archif" - -#: ftparchive/cachedb.cc:489 -msgid "Unable to get a cursor" -msgstr "Ni ellir cael cyrchydd" +msgid "%lu reinstalled, " +msgstr "%lu wedi ailsefydlu, " -#: ftparchive/writer.cc:80 +#: 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:85 +#: 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:141 -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:143 -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:150 -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:168 ftparchive/writer.cc:200 +#: 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:181 -msgid "Tree walking failed" -msgstr "Methwyd cerdded y goeden" +#: cmdline/apt-get.cc:668 +msgid " [Installed]" +msgstr " [Sefydliwyd]" -#: ftparchive/writer.cc:208 -#, c-format -msgid "Failed to open %s" -msgstr "Methwyd agor %s" +#: cmdline/apt-get.cc:677 +#, fuzzy +msgid " [Not candidate version]" +msgstr "Fersiynau Posib" -# 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:339 ftparchive/contents.cc:370 -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 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" - -#: ftparchive/override.cc:74 ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" - -#: ftparchive/override.cc:88 ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #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: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:168 methods/rsh.cc:97 -msgid "Failed to create IPC pipe to subprocess" -msgstr "Methwyd creu pibell cyfathrebu at isbroses" - -#: 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" - -#: cmdline/apt-get.cc:135 -msgid "Y" -msgstr "I" - -#: cmdline/apt-get.cc:140 -msgid "N" -msgstr "" - -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Gwall crynhoi patrwm - %s" - -#: cmdline/apt-get.cc:257 -msgid "The following packages have unmet dependencies:" -msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" - -#: cmdline/apt-get.cc:347 -#, c-format -msgid "but %s is installed" -msgstr "ond mae %s wedi ei sefydlu" - -#: cmdline/apt-get.cc:349 -#, c-format -msgid "but %s is to be installed" -msgstr "ond mae %s yn mynd i gael ei sefydlu" - -#: cmdline/apt-get.cc:356 -msgid "but it is not installable" -msgstr "ond ni ellir ei sefydlu" - -#: cmdline/apt-get.cc:358 -msgid "but it is a virtual package" -msgstr "ond mae'n becyn rhithwir" - -#: cmdline/apt-get.cc:361 -msgid "but it is not installed" -msgstr "ond nid yw wedi ei sefydlu" - -#: cmdline/apt-get.cc:361 -msgid "but it is not going to be installed" -msgstr "ond nid yw'n mynd i gael ei sefydlu" - -#: cmdline/apt-get.cc:366 -msgid " or" -msgstr " neu" - -#: cmdline/apt-get.cc:395 -msgid "The following NEW packages will be installed:" -msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: cmdline/apt-get.cc:421 -msgid "The following packages will be REMOVED:" -msgstr "Caiff y pecynnau canlynol eu TYNNU:" - -#: cmdline/apt-get.cc:443 -#, fuzzy -msgid "The following packages have been kept back:" -msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" - -#: cmdline/apt-get.cc:464 -#, fuzzy -msgid "The following packages will be upgraded:" -msgstr "Caiff y pecynnau canlynol eu uwchraddio" - -#: cmdline/apt-get.cc:485 -#, fuzzy -msgid "The following packages will be DOWNGRADED:" -msgstr "Caiff y pecynnau canlynol eu ISRADDIO" - -#: cmdline/apt-get.cc:505 -msgid "The following held packages will be changed:" -msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" - -#: cmdline/apt-get.cc:560 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (oherwydd %s) " - -#: cmdline/apt-get.cc:568 -#, 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:599 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " - -#: cmdline/apt-get.cc:603 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu wedi ailsefydlu, " - -#: cmdline/apt-get.cc:605 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu wedi eu israddio, " - -#: cmdline/apt-get.cc:607 -#, 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:611 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" - -#: cmdline/apt-get.cc:632 -#, 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:637 -#, 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:654 -#, 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:665 -msgid " [Installed]" -msgstr " [Sefydliwyd]" - -#: cmdline/apt-get.cc:674 -#, fuzzy -msgid " [Not candidate version]" -msgstr "Fersiynau Posib" - -#: cmdline/apt-get.cc:676 +#: 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:679 +#: cmdline/apt-get.cc:682 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -817,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:697 +#: 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:709 +#: 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:720 +#: cmdline/apt-get.cc:725 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" -#: cmdline/apt-get.cc:764 +#. 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:794 +#: 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:798 +#: 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:810 +#: 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:815 +#: 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:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:62 +#: 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:860 +#: 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:865 +#: 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:907 -#, 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:985 +#: cmdline/apt-get.cc:1025 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:988 +#: cmdline/apt-get.cc:1028 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:991 +#: cmdline/apt-get.cc:1031 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:994 +#: cmdline/apt-get.cc:1034 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:1036 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:1000 +#: 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:1003 +#: cmdline/apt-get.cc:1043 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:1028 +#: 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:1032 +#: cmdline/apt-get.cc:1072 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1039 +#: cmdline/apt-get.cc:1079 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1041 +#: 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:1050 cmdline/apt-get.cc:1211 +#: 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:1091 +#: cmdline/apt-get.cc:1131 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1100 +#: 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:1111 +#: cmdline/apt-get.cc:1151 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:1149 +#: 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:1156 +#: 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:1161 +#: 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:1168 +#: 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:1173 +#: 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:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534 -#: cmdline/apt-get.cc:2537 +#: 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:1201 +#: 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:1217 cmdline/apt-get.cc:1237 +#: 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:1219 +#: cmdline/apt-get.cc:1259 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:1221 +#: cmdline/apt-get.cc:1261 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1002,29 +652,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246 +#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:1242 +#: 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:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492 +#: 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:1332 +#: cmdline/apt-get.cc:1372 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611 +#: 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:1339 +#: cmdline/apt-get.cc:1379 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1032,20 +682,20 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1343 +#: 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:1348 +#: cmdline/apt-get.cc:1388 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1389 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1377 +#: cmdline/apt-get.cc:1417 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1055,579 +705,971 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1381 +#: cmdline/apt-get.cc:1421 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1519 +#: cmdline/apt-get.cc:1559 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1551 -#, fuzzy, c-format -msgid "Picking '%s' as source package instead of '%s'\n" -msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" +#: 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:1629 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: 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:1711 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: 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." +msgstr "" + +#. +#. if (Packages == 1) +#. { +#. c1out << endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << endl; +#. } +#. +#: cmdline/apt-get.cc: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:1822 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + +#: cmdline/apt-get.cc:1829 +#, fuzzy +msgid "" +"The following package was automatically installed and is no longer required:" +msgid_plural "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: cmdline/apt-get.cc:1833 +#, fuzzy, c-format +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: cmdline/apt-get.cc: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:1854 +#, fuzzy +msgid "Internal error, AllUpgrade broke stuff" +msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + +#: 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:1957 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim " +"pecyn (neu penodwch ddatrys)" + +# FIXME: needs commas +#: 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" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n" +"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n" +"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" +"heb gael eu symud allan o Incoming." + +#: cmdline/apt-get.cc:1993 +msgid "Broken packages" +msgstr "Pecynnau wedi torri" + +#: 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:2109 +msgid "Suggested packages:" +msgstr "Pecynnau a awgrymmir:" + +#: cmdline/apt-get.cc:2110 +msgid "Recommended packages:" +msgstr "Pecynnau a argymhellir:" + +#: cmdline/apt-get.cc:2152 +#, c-format +msgid "Couldn't find package %s" +msgstr "Methwyd canfod pecyn %s" + +#: 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: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:2186 methods/ftp.cc:711 methods/connect.cc:115 +msgid "Failed" +msgstr "Methwyd" + +#: cmdline/apt-get.cc:2191 +msgid "Done" +msgstr "Wedi Gorffen" + +#: 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:2294 cmdline/apt-get.cc:2330 +msgid "Unable to lock the download directory" +msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" + +#: 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: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:2508 +#, c-format +msgid "" +"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" +"%s\n" +msgstr "" + +#: cmdline/apt-get.cc:2513 +#, c-format +msgid "" +"Please use:\n" +"bzr branch %s\n" +"to retrieve the latest (possibly unreleased) updates to the package.\n" +msgstr "" + +#: 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: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: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:2617 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" + +#: cmdline/apt-get.cc:2623 +#, fuzzy, c-format +msgid "Fetch source %s\n" +msgstr "Cyrchu Ffynhonell %s\n" + +#: cmdline/apt-get.cc:2661 +msgid "Failed to fetch some archives." +msgstr "Methwyd cyrchu rhai archifau." + +#: 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:2704 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Methodd y gorchymyn dadbacio '%s'.\n" + +#: cmdline/apt-get.cc:2705 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "" + +#: cmdline/apt-get.cc:2727 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "Methodd y gorchymyn adeiladu '%s'.\n" + +#: cmdline/apt-get.cc:2747 +msgid "Child process failed" +msgstr "Methodd proses plentyn" + +#: 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: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:2838 +#, c-format +msgid "%s has no build depends.\n" +msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" + +#: cmdline/apt-get.cc:2997 +#, fuzzy, c-format +msgid "" +"%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:3015 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " +"%s" + +#: 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: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: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:3127 +msgid "Failed to process build dependencies" +msgstr "Methwyd prosesu dibyniaethau adeiladu" + +#: 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:3396 +#, fuzzy +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" autoremove - Remove automatically all unused packages\n" +" purge - Remove packages and config files\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\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" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to correct a system with broken dependencies in place\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" +"Defnydd: apt-get [opsiynnau] gorchymyn\n" +" apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n" +" apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n" +"\n" +"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n" +"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n" +"ddefnyddir amlaf.\n" +"\n" +"Gorchmynion:\n" +" update - Cyrchu rhestrau pecynnau newydd\n" +" update - Uwchraddio pecynnau wedi sefydlu\n" +" install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n" +" remove - Tynnu pecynnau\n" +" source - Lawrlwytho archifau ffynhonell\n" +" build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n" +" dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n" +" dselect-upgrade - Dilyn dewisiadau dselect\n" +" clean - Dileu ffeiliau archif wedi eu lawrlwytho\n" +" autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n" +" check - Gwirio fod dim dibyniaethau torredig\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn.\n" +" -q Allbwn cofnodadwy - dim dangosydd cynydd\n" +" -qq Dim allbwn ar wahan i wallau\n" +" -d Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n" +" -s Peidio gweithredu. Gwneir efelychiad trefn.\n" +" -y Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n" +" -f Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n" +" -m Ceisio mynd ymlaen os methir dod o hyd i archifau\n" +" -u Dangos rhestr o archifau a uwchraddir hefyd\n" +" -b Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n" +" -V Dangos rhifau fersiwn cyflawn\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" +"\n" +"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n" +"fwy o wybodaeth ac opsiynnau.\n" +"\n" +" Mae gan yr APT hwn bŵerau buwch hudol.\n" + +#: cmdline/apt-get.cc:3561 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" + +#: cmdline/acqprogress.cc:60 +msgid "Hit " +msgstr "Presennol " + +#: cmdline/acqprogress.cc:84 +msgid "Get:" +msgstr "Cyrchu:" + +#: cmdline/acqprogress.cc:115 +msgid "Ign " +msgstr "Anwybyddu " + +#: cmdline/acqprogress.cc:119 +msgid "Err " +msgstr "Gwall " + +#: 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:230 +#, c-format +msgid " [Working]" +msgstr " [Gweithio]" + +#: cmdline/acqprogress.cc:286 +#, fuzzy, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" +" '%s'\n" +"yn y gyrriant '%s' a gwasgwch Enter\n" + +#: 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-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-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" +"\n" +"apt-mark is a simple command line interface for marking packages\n" +"as manual or automatical 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" +" -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 "" + +#: methods/cdrom.cc:203 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" + +#: 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." + +#: methods/cdrom.cc:222 +#, fuzzy +msgid "Wrong CD-ROM" +msgstr "CD Anghywir" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1589 +#: methods/cdrom.cc:249 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +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." -#: cmdline/apt-get.cc:1605 -msgid "The update command takes no arguments" -msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" +#: methods/cdrom.cc:254 +#, fuzzy +msgid "Disk not found." +msgstr "Ffeil heb ei ganfod" -#: cmdline/apt-get.cc:1668 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +msgid "File not found" +msgstr "Ffeil heb ei ganfod" -#: cmdline/apt-get.cc:1772 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "" +#: 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()" -#. -#. if (Packages == 1) -#. { -#. c1out << endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" -#. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << endl; -#. } -#. -#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944 -msgid "The following information may help to resolve the situation:" -msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +msgid "Failed to set modification time" +msgstr "Methwyd gosod amser newid" -#: cmdline/apt-get.cc:1779 -#, fuzzy -msgid "Internal Error, AutoRemover broke stuff" -msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" +#: methods/file.cc:47 +msgid "Invalid URI, local URIS must not start with //" +msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" -#: cmdline/apt-get.cc:1786 -#, fuzzy -msgid "" -"The following package was automatically installed and is no longer required:" -msgid_plural "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:173 +msgid "Logging in" +msgstr "Yn mewngofnodi" -#: cmdline/apt-get.cc:1790 -#, fuzzy, c-format -msgid "%lu package was automatically installed and is no longer required.\n" -msgid_plural "" -"%lu packages were automatically installed and are no longer required.\n" -msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +#: methods/ftp.cc:179 +msgid "Unable to determine the peer name" +msgstr "Ni ellir darganfod enw'r cymar" -#: cmdline/apt-get.cc:1792 -msgid "Use 'apt-get autoremove' to remove them." -msgstr "" +#: methods/ftp.cc:184 +msgid "Unable to determine the local name" +msgstr "Ni ellir darganfod yr enw lleol" -#: cmdline/apt-get.cc:1811 -#, fuzzy -msgid "Internal error, AllUpgrade broke stuff" -msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" +#: 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" -#: cmdline/apt-get.cc:1910 -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:" +#: methods/ftp.cc:221 +#, c-format +msgid "USER failed, server said: %s" +msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -# FIXME -#: cmdline/apt-get.cc:1914 -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim " -"pecyn (neu penodwch ddatrys)" +#: methods/ftp.cc:228 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -# FIXME: needs commas -#: cmdline/apt-get.cc:1929 +#: methods/ftp.cc:248 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" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." msgstr "" -"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n" -"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n" -"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" -"heb gael eu symud allan o Incoming." +"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::" +"ProxyLogin yn wag.)" -#: cmdline/apt-get.cc:1950 -msgid "Broken packages" -msgstr "Pecynnau wedi torri" +# 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" -#: cmdline/apt-get.cc:1976 -msgid "The following extra packages will be installed:" -msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" +#: methods/ftp.cc:302 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: cmdline/apt-get.cc:2066 -msgid "Suggested packages:" -msgstr "Pecynnau a awgrymmir:" +#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +msgid "Connection timeout" +msgstr "Goramser cysylltu" -#: cmdline/apt-get.cc:2067 -msgid "Recommended packages:" -msgstr "Pecynnau a argymhellir:" +#: methods/ftp.cc:346 +msgid "Server closed the connection" +msgstr "Caeodd y gweinydd y cysylltiad" -#: cmdline/apt-get.cc:2109 -#, c-format -msgid "Couldn't find package %s" -msgstr "Methwyd canfod pecyn %s" +#: 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" -#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:64 -#, fuzzy, c-format -msgid "%s set to automatically installed.\n" -msgstr "ond mae %s yn mynd i gael ei sefydlu" +#: methods/ftp.cc:356 methods/rsh.cc:206 +msgid "A response overflowed the buffer." +msgstr "Gorlifodd ateb y byffer." -#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:108 -msgid "" -"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " -"instead." -msgstr "" +#: methods/ftp.cc:373 methods/ftp.cc:385 +msgid "Protocol corruption" +msgstr "Llygr protocol" -#: cmdline/apt-get.cc:2140 -#, fuzzy -msgid "Calculating upgrade... " -msgstr "Yn Cyfrifo'r Uwchraddiad... " +#: 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" -#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115 -msgid "Failed" -msgstr "Methwyd" +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +msgid "Could not create a socket" +msgstr "Methwyd creu soced" -#: cmdline/apt-get.cc:2148 -msgid "Done" -msgstr "Wedi Gorffen" +#: methods/ftp.cc:707 +msgid "Could not connect data socket, connection timed out" +msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223 +#: methods/ftp.cc:713 #, fuzzy -msgid "Internal error, problem resolver broke stuff" -msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" +msgid "Could not connect passive socket." +msgstr "Methwyd cysylltu soced goddefol" -#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287 -msgid "Unable to lock the download directory" -msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" +# FIXME +#: methods/ftp.cc:730 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "Methodd getaddrinfo gael soced gwrando" -#: cmdline/apt-get.cc:2338 -#, c-format -msgid "Downloading %s %s" -msgstr "" +#: methods/ftp.cc:744 +msgid "Could not bind a socket" +msgstr "Methwyd rhwymo soced" -#: cmdline/apt-get.cc:2396 -msgid "Must specify at least one package to fetch source for" -msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" +#: methods/ftp.cc:748 +msgid "Could not listen on the socket" +msgstr "Methwyd gwrando ar y soced" -#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748 -#, c-format -msgid "Unable to find a source package for %s" -msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" +#: methods/ftp.cc:755 +msgid "Could not determine the socket's name" +msgstr "Methwyd canfod enw'r soced" -#: cmdline/apt-get.cc:2453 +#: methods/ftp.cc:787 +msgid "Unable to send PORT command" +msgstr "Methwyd danfod gorchymyn PORT" + +#: methods/ftp.cc:797 #, c-format -msgid "" -"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" -"%s\n" -msgstr "" +msgid "Unknown address family %u (AF_*)" +msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: cmdline/apt-get.cc:2458 +#: methods/ftp.cc:806 #, c-format -msgid "" -"Please use:\n" -"bzr get %s\n" -"to retrieve the latest (possibly unreleased) updates to the package.\n" -msgstr "" +msgid "EPRT failed, server said: %s" +msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: cmdline/apt-get.cc:2511 -#, fuzzy, c-format -msgid "Skipping already downloaded file '%s'\n" -msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" +#: methods/ftp.cc:826 +msgid "Data socket connect timed out" +msgstr "Goramserodd cysylltiad y soced data" + +#: methods/ftp.cc:833 +msgid "Unable to accept connection" +msgstr "Methwyd derbyn cysylltiad" + +#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 +msgid "Problem hashing file" +msgstr "Problem wrth stwnshio ffeil" -#: cmdline/apt-get.cc:2548 +#: methods/ftp.cc:885 #, c-format -msgid "You don't have enough free space in %s" -msgstr "Does dim digon o le rhydd yn %s gennych" +msgid "Unable to fetch file, server said '%s'" +msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#. 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:2557 +#: methods/ftp.cc:900 methods/rsh.cc:330 +msgid "Data socket timed out" +msgstr "Goramserodd soced data" + +#: methods/ftp.cc:930 #, c-format -msgid "Need to get %sB/%sB of source archives.\n" -msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" +msgid "Data transfer failed, server said '%s'" +msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" -#. 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:2562 +#. Get the files information +#: methods/ftp.cc:1007 +msgid "Query" +msgstr "Ymholiad" + +# FIXME +#: methods/ftp.cc:1119 +msgid "Unable to invoke " +msgstr "Methwyd gweithredu " + +#: methods/connect.cc:75 #, c-format -msgid "Need to get %sB of source archives.\n" -msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" +msgid "Connecting to %s (%s)" +msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:2568 -#, fuzzy, c-format -msgid "Fetch source %s\n" -msgstr "Cyrchu Ffynhonell %s\n" +#: methods/connect.cc:86 +#, c-format +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" -#: cmdline/apt-get.cc:2606 -msgid "Failed to fetch some archives." -msgstr "Methwyd cyrchu rhai archifau." +#: 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)" -#: cmdline/apt-get.cc:2637 +#: methods/connect.cc:99 #, 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" +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: cmdline/apt-get.cc:2649 +#: methods/connect.cc:107 #, c-format -msgid "Unpack command '%s' failed.\n" -msgstr "Methodd y gorchymyn dadbacio '%s'.\n" +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: cmdline/apt-get.cc:2650 +#: methods/connect.cc:125 #, c-format -msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgid "Could not connect to %s:%s (%s)." +msgstr "Methwyd cysylltu i %s:%s (%s)." -#: cmdline/apt-get.cc:2672 +#. We say this mainly because the pause here is for the +#. ssh connection that is still going +#: methods/connect.cc:153 methods/rsh.cc:433 #, c-format -msgid "Build command '%s' failed.\n" -msgstr "Methodd y gorchymyn adeiladu '%s'.\n" - -#: cmdline/apt-get.cc:2692 -msgid "Child process failed" -msgstr "Methodd proses plentyn" - -#: cmdline/apt-get.cc:2711 -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" +msgid "Connecting to %s" +msgstr "Yn cysylltu i %s" -#: cmdline/apt-get.cc:2736 +#: methods/connect.cc:172 methods/connect.cc:191 #, c-format -msgid "" -"No architecture information available for %s. See apt.conf(5) APT::" -"Architectures for setup" -msgstr "" +msgid "Could not resolve '%s'" +msgstr "Methwyd datrys '%s'" -#: cmdline/apt-get.cc:2753 +#: methods/connect.cc:197 #, c-format -msgid "Unable to get build-dependency information for %s" -msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" +msgid "Temporary failure resolving '%s'" +msgstr "Methiant dros dro yn datrys '%s'" -#: cmdline/apt-get.cc:2773 -#, c-format -msgid "%s has no build depends.\n" -msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" +#: 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)" -#: cmdline/apt-get.cc:2903 +#: methods/connect.cc:247 #, fuzzy, c-format +msgid "Unable to connect to %s:%s:" +msgstr "Methwyd cysylltu i %s %s:" + +#: methods/gpgv.cc:180 msgid "" -"%s dependency for %s can't be satisfied because %s is not allowed on '%s' " -"packages" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " -"%s" -#: cmdline/apt-get.cc:2924 -#, c-format -msgid "" -"%s dependency for %s cannot be satisfied because the package %s cannot be " -"found" +#: methods/gpgv.cc:185 +msgid "At least one invalid signature was encountered." msgstr "" -"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " -"%s" -#: cmdline/apt-get.cc:2947 -#, c-format -msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +#: methods/gpgv.cc:189 +msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " -"newydd" -#: cmdline/apt-get.cc:2986 -#, fuzzy, c-format -msgid "" -"%s dependency for %s cannot be satisfied because candidate version of " -"package %s can't satisfy version requirements" +#: methods/gpgv.cc:194 +msgid "Unknown error executing gpgv" 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:2992 -#, fuzzy, c-format +#: 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:242 msgid "" -"%s dependency for %s cannot be satisfied because package %s has no candidate " -"version" +"The following signatures couldn't be verified because the public key is not " +"available:\n" msgstr "" -"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " -"%s" - -#: cmdline/apt-get.cc:3015 -#, c-format -msgid "Failed to satisfy %s dependency for %s: %s" -msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:3031 -#, c-format -msgid "Build-dependencies for %s could not be satisfied." -msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." +#: methods/gzip.cc:65 +msgid "Empty files can't be valid archives" +msgstr "" -#: cmdline/apt-get.cc:3036 -msgid "Failed to process build dependencies" -msgstr "Methwyd prosesu dibyniaethau adeiladu" +#: methods/http.cc:394 +msgid "Waiting for headers" +msgstr "Yn aros am benawdau" -#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141 -#, fuzzy, c-format -msgid "Changelog for %s (%s)" -msgstr "Yn cysylltu i %s (%s)" +#: methods/http.cc:544 +msgid "Bad header line" +msgstr "Llinell pennawd gwael" -#: cmdline/apt-get.cc:3260 +#: methods/http.cc:569 methods/http.cc:576 #, fuzzy -msgid "Supported modules:" -msgstr "Modylau a Gynhelir:" +msgid "The HTTP server sent an invalid reply header" +msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -# FIXME: split -#: cmdline/apt-get.cc:3301 +#: methods/http.cc:606 #, fuzzy -msgid "" -"Usage: apt-get [options] command\n" -" apt-get [options] install|remove pkg1 [pkg2 ...]\n" -" apt-get [options] source pkg1 [pkg2 ...]\n" -"\n" -"apt-get is a simple command line interface for downloading and\n" -"installing packages. The most frequently used commands are update\n" -"and install.\n" -"\n" -"Commands:\n" -" update - Retrieve new lists of packages\n" -" upgrade - Perform an upgrade\n" -" install - Install new packages (pkg is libc6 not libc6.deb)\n" -" remove - Remove packages\n" -" autoremove - Remove automatically all unused packages\n" -" purge - Remove packages and config files\n" -" source - Download source archives\n" -" build-dep - Configure build-dependencies for source packages\n" -" dist-upgrade - Distribution upgrade, see apt-get(8)\n" -" dselect-upgrade - Follow dselect selections\n" -" clean - Erase downloaded archive files\n" -" autoclean - Erase old downloaded archive files\n" -" check - Verify that there are no broken dependencies\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" -" -q Loggable output - no progress indicator\n" -" -qq No output except for errors\n" -" -d Download only - do NOT install or unpack archives\n" -" -s No-act. Perform ordering simulation\n" -" -y Assume Yes to all queries and do not prompt\n" -" -f Attempt to correct a system with broken dependencies in place\n" -" -m Attempt to continue if archives are unlocatable\n" -" -u Show a list of upgraded packages as well\n" -" -b Build the source package after fetching it\n" -" -V Show verbose version numbers\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" -"pages for more information and options.\n" -" This APT has Super Cow Powers.\n" -msgstr "" -"Defnydd: apt-get [opsiynnau] gorchymyn\n" -" apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n" -" apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n" -"\n" -"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n" -"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n" -"ddefnyddir amlaf.\n" -"\n" -"Gorchmynion:\n" -" update - Cyrchu rhestrau pecynnau newydd\n" -" update - Uwchraddio pecynnau wedi sefydlu\n" -" install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n" -" remove - Tynnu pecynnau\n" -" source - Lawrlwytho archifau ffynhonell\n" -" build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n" -" dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n" -" dselect-upgrade - Dilyn dewisiadau dselect\n" -" clean - Dileu ffeiliau archif wedi eu lawrlwytho\n" -" autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n" -" check - Gwirio fod dim dibyniaethau torredig\n" -"\n" -"Opsiynnau:\n" -" -h Y testun cymorth hwn.\n" -" -q Allbwn cofnodadwy - dim dangosydd cynydd\n" -" -qq Dim allbwn ar wahan i wallau\n" -" -d Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n" -" -s Peidio gweithredu. Gwneir efelychiad trefn.\n" -" -y Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n" -" -f Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n" -" -m Ceisio mynd ymlaen os methir dod o hyd i archifau\n" -" -u Dangos rhestr o archifau a uwchraddir hefyd\n" -" -b Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n" -" -V Dangos rhifau fersiwn cyflawn\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -"\n" -"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n" -"fwy o wybodaeth ac opsiynnau.\n" -"\n" -" Mae gan yr APT hwn bŵerau buwch hudol.\n" +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: cmdline/apt-get.cc:3466 -msgid "" -"NOTE: This is only a simulation!\n" -" apt-get needs root privileges for real execution.\n" -" Keep also in mind that locking is deactivated,\n" -" so don't depend on the relevance to the real current situation!" -msgstr "" +#: methods/http.cc:621 +#, fuzzy +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: cmdline/acqprogress.cc:59 -msgid "Hit " -msgstr "Presennol " +#: methods/http.cc:623 +#, fuzzy +msgid "This HTTP server has broken range support" +msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: cmdline/acqprogress.cc:83 -msgid "Get:" -msgstr "Cyrchu:" +#: methods/http.cc:647 +msgid "Unknown date format" +msgstr "Fformat dyddiad anhysbys" -#: cmdline/acqprogress.cc:114 -msgid "Ign " -msgstr "Anwybyddu " +#: methods/http.cc:818 +msgid "Select failed" +msgstr "Methwyd dewis" -#: cmdline/acqprogress.cc:118 -msgid "Err " -msgstr "Gwall " +#: methods/http.cc:823 +msgid "Connection timed out" +msgstr "Goramserodd y cysylltiad" -#: cmdline/acqprogress.cc:139 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" +#: methods/http.cc:846 +msgid "Error writing to output file" +msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: cmdline/acqprogress.cc:229 -#, c-format -msgid " [Working]" -msgstr " [Gweithio]" +#: methods/http.cc:877 +msgid "Error writing to file" +msgstr "Gwall wrth ysgrifennu at ffeil" -#: cmdline/acqprogress.cc:285 -#, fuzzy, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" -" '%s'\n" -"yn y gyrriant '%s' a gwasgwch Enter\n" +#: methods/http.cc:905 +msgid "Error writing to the file" +msgstr "Gwall wrth ysgrifennu at y ffeil" -#: cmdline/apt-internal-solver.cc:36 -msgid "" -"Usage: apt-internal-resolver\n" -"\n" -"apt-internal-resolver 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" -"apt.conf(5) manual pages for more information and options.\n" -" This APT has Super Cow Powers.\n" -msgstr "" +#: 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" -#: cmdline/apt-mark.cc:49 -#, fuzzy, c-format -msgid "%s can not be marked as it is not installed.\n" -msgstr "ond nid yw wedi ei sefydlu" +#: methods/http.cc:921 +msgid "Error reading from server" +msgstr "Gwall wrth ddarllen o'r gweinydd" -#: cmdline/apt-mark.cc:55 -#, fuzzy, c-format -msgid "%s was already set to manually installed.\n" -msgstr "ond mae %s yn mynd i gael ei sefydlu" +#: methods/http.cc:1194 +#, fuzzy +msgid "Bad header data" +msgstr "Data pennawd gwael" -#: cmdline/apt-mark.cc:57 -#, fuzzy, c-format -msgid "%s was already set to automatically installed.\n" -msgstr "ond mae %s yn mynd i gael ei sefydlu" +#: methods/http.cc:1211 methods/http.cc:1266 +msgid "Connection failed" +msgstr "Methodd y cysylltiad" -#: cmdline/apt-mark.cc:172 -#, fuzzy, c-format -msgid "%s was already set on hold.\n" -msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" +#: methods/http.cc:1358 +msgid "Internal error" +msgstr "Gwall mewnol" -#: cmdline/apt-mark.cc:174 -#, fuzzy, c-format -msgid "%s was already not hold.\n" -msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" +#. 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" -#: cmdline/apt-mark.cc:188 cmdline/apt-mark.cc:210 -#, fuzzy, c-format -msgid "%s set on hold.\n" -msgstr "ond mae %s yn mynd i gael ei sefydlu" +#: 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 "" -#: cmdline/apt-mark.cc:190 cmdline/apt-mark.cc:215 +#. 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 "Canceled hold on %s.\n" -msgstr "Methwyd agor %s" +msgid "Can not read mirror file '%s'" +msgstr "Methwyd agor ffeil %s" -#: cmdline/apt-mark.cc:223 -msgid "Executing dpkg failed. Are you root?" +#: methods/mirror.cc:442 +#, c-format +msgid "[Mirror: %s]" msgstr "" -#: cmdline/apt-mark.cc:271 +#: methods/rred.cc:491 +#, c-format msgid "" -"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" -"\n" -"apt-mark is a simple command line interface for marking packages\n" -"as manual or automatical 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" -" -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." +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." msgstr "" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Cofnod pecyn anhysbys!" - -#: cmdline/apt-sortpkgs.cc:153 -#, fuzzy +#: methods/rred.cc:496 +#, c-format 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" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." 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" + +#: 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!" @@ -1665,706 +1707,597 @@ msgstr "" #: dselect/update:30 #, fuzzy -msgid "Merging available information" -msgstr "Yn cyfuno manylion Ar Gael" - -#: 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:49 apt-inst/dirstream.cc:55 -#: apt-inst/dirstream.cc:50 -#, fuzzy, c-format -msgid "Failed to write file %s" -msgstr "Methwyd ysgrifennu ffeil %s" - -#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108 -#: 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" - -#: 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" - -#. Only warn if there are no sources.list.d. -#. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183 -#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108 -#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359 -#: methods/mirror.cc:95 -#, c-format -msgid "Unable to read %s" -msgstr "Ni ellir darllen %s" +msgid "Merging available information" +msgstr "Yn cyfuno manylion Ar Gael" -#: apt-inst/extract.cc:492 +#: cmdline/apt-extracttemplates.cc:102 #, c-format -msgid "Unable to stat %s" -msgstr "Ni ellir gwneud stat() o %s" +msgid "%s not a valid DEB package." +msgstr "Nid yw %s yn becyn DEB dilys." -#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 -#, c-format -msgid "Failed to remove %s" -msgstr "Methwyd dileu %s" +# 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" -#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1277 #, c-format -msgid "Unable to create %s" -msgstr "Ni ellir creu %s" +msgid "Unable to write to %s" +msgstr "Ni ellir ysgrifennu i %s" -#: apt-inst/deb/dpkgdb.cc:118 -#, c-format -msgid "Failed to stat %sinfo" -msgstr "Methwyd stat() ar %sinfo" +#: cmdline/apt-extracttemplates.cc:313 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: apt-inst/deb/dpkgdb.cc:123 -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" +#: 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." -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170 -#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280 -#: apt-pkg/pkgcachegen.cc:1436 -#, fuzzy -msgid "Reading package lists" -msgstr "Yn Darllen Rhestrau Pecynnau" +#: 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" -#: apt-inst/deb/dpkgdb.cc:180 -#, c-format -msgid "Failed to change to the admin dir %sinfo" -msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" +#: ftparchive/apt-ftparchive.cc:261 +msgid "Source extension list is too long" +msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -# FIXME -#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 -#: apt-inst/deb/dpkgdb.cc:448 -#, fuzzy -msgid "Internal error getting a package name" -msgstr "Gwall mewnol wrth gyrchu enw pecyn" +#: ftparchive/apt-ftparchive.cc:378 +msgid "Error writing header to contents file" +msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 -#, fuzzy -msgid "Reading file listing" -msgstr "Yn Darllen Rhestr Ffeiliau" +#: ftparchive/apt-ftparchive.cc:408 +#, fuzzy, c-format +msgid "Error processing contents %s" +msgstr "Gwall wrth Brosesu Cynnwys %s" -#: apt-inst/deb/dpkgdb.cc:216 -#, c-format +# FIXME: full stops +#: ftparchive/apt-ftparchive.cc:596 +#, fuzzy 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!" +"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 "" -"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!" +"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" -# FIXME -#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#: ftparchive/apt-ftparchive.cc:802 +msgid "No selections matched" +msgstr "Dim dewisiadau'n cyfateb" + +#: ftparchive/apt-ftparchive.cc:880 #, c-format -msgid "Failed reading the list file %sinfo/%s" -msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" +msgid "Some files are missing in the package file group `%s'" +msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: apt-inst/deb/dpkgdb.cc:266 -#, fuzzy -msgid "Internal error getting a node" -msgstr "Gwall Mewnol wrth gael Nôd" +#: 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" -# FIXME: literal -#: apt-inst/deb/dpkgdb.cc:309 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Failed to open the diversions file %sdiversions" -msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions" +msgid "DB is old, attempting to upgrade %s" +msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: apt-inst/deb/dpkgdb.cc:324 -msgid "The diversion file is corrupted" -msgstr "Mae'r ffeil dargyfeirio wed ei lygru" +#: 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 "" -#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 -#: apt-inst/deb/dpkgdb.cc:341 +#: ftparchive/cachedb.cc:81 #, c-format -msgid "Invalid line in the diversion file: %s" -msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" - -#: apt-inst/deb/dpkgdb.cc:362 -#, fuzzy -msgid "Internal error adding a diversion" -msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" +msgid "Unable to open DB file %s: %s" +msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: apt-inst/deb/dpkgdb.cc:383 -#, fuzzy -msgid "The pkg cache must be initialized first" -msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf" +#: 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" -#: apt-inst/deb/dpkgdb.cc:443 -#, fuzzy, c-format -msgid "Failed to find a Package: header, offset %lu" -msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu" +#: ftparchive/cachedb.cc:249 +msgid "Archive has no control record" +msgstr "Does dim cofnod rheoli gan yr archif" -#: apt-inst/deb/dpkgdb.cc:465 -#, c-format -msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" +#: ftparchive/cachedb.cc:490 +msgid "Unable to get a cursor" +msgstr "Ni ellir cael cyrchydd" -#: apt-inst/deb/dpkgdb.cc:470 +#: ftparchive/writer.cc:80 #, c-format -msgid "Error parsing MD5. Offset %lu" -msgstr "Gwall wrth ramadegu MD5. Atred: %lu" +msgid "W: Unable to read directory %s\n" +msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#: ftparchive/writer.cc:85 #, 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" - -#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain -#: apt-inst/deb/debfile.cc:56 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" +msgid "W: Unable to stat %s\n" +msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: apt-inst/deb/debfile.cc:116 -#, c-format -msgid "Couldn't change to %s" -msgstr "Methwyd newid i %s" +#: ftparchive/writer.cc:141 +msgid "E: " +msgstr "G: " -#: apt-inst/deb/debfile.cc:157 apt-inst/deb/debfile.cc:120 -#, fuzzy, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" +#: ftparchive/writer.cc:143 +msgid "W: " +msgstr "Rh: " -#: apt-inst/deb/debfile.cc:192 -msgid "Failed to locate a valid control file" -msgstr "Methwyd lleoli ffeil rheoli dilys" +#: ftparchive/writer.cc:150 +msgid "E: Errors apply to file " +msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: apt-inst/deb/debfile.cc:277 apt-inst/deb/debfile.cc:214 -#, fuzzy -msgid "Unparsable control file" -msgstr "Ffeil rheoli ni ellir ei ramadegu" +#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 +#, c-format +msgid "Failed to resolve %s" +msgstr "Methwyd datrys %s" -#: methods/bzip2.cc:63 methods/gzip.cc:54 -msgid "Empty files can't be valid archives" -msgstr "" +#: ftparchive/writer.cc:181 +msgid "Tree walking failed" +msgstr "Methwyd cerdded y goeden" -#: methods/bzip2.cc:67 +#: ftparchive/writer.cc:208 #, c-format -msgid "Couldn't open pipe for %s" -msgstr "Methwyd agor pibell ar gyfer %s" +msgid "Failed to open %s" +msgstr "Methwyd agor %s" -#: methods/bzip2.cc:111 +# FIXME +#: ftparchive/writer.cc:267 #, c-format -msgid "Read error from %s process" -msgstr "Gwall darllen o broses %s" +msgid " DeLink %s [%s]\n" +msgstr " DatGysylltu %s [%s]\n" -#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46 -#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:493 -#: methods/rred.cc:502 -msgid "Failed to stat" -msgstr "Methwyd stat()" +#: ftparchive/writer.cc:275 +#, c-format +msgid "Failed to readlink %s" +msgstr "Methwyd darllen y cyswllt %s" -#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100 -#: methods/rred.cc:499 -msgid "Failed to set modification time" -msgstr "Methwyd gosod amser newid" +#: ftparchive/writer.cc:279 +#, c-format +msgid "Failed to unlink %s" +msgstr "Methwyd datgysylltu %s" -#: methods/cdrom.cc:203 +#: ftparchive/writer.cc:286 #, c-format -msgid "Unable to read the cdrom database %s" -msgstr "Methwyd darllen y cronfa ddata CD-ROM %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Methwyd cysylltu %s at %s" -#: 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." +#: ftparchive/writer.cc:296 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: methods/cdrom.cc:222 -#, fuzzy -msgid "Wrong CD-ROM" -msgstr "CD Anghywir" +#: ftparchive/writer.cc:401 +msgid "Archive had no package field" +msgstr "Doedd dim maes pecyn gan yr archif" -#: methods/cdrom.cc:249 +#: ftparchive/writer.cc:409 ftparchive/writer.cc:711 #, 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." +msgid " %s has no override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: methods/cdrom.cc:254 -#, fuzzy -msgid "Disk not found." -msgstr "Ffeil heb ei ganfod" +#: 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" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271 -msgid "File not found" -msgstr "Ffeil heb ei ganfod" +#: ftparchive/writer.cc:721 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: methods/file.cc:47 -msgid "Invalid URI, local URIS must not start with //" -msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" +#: ftparchive/writer.cc:725 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:172 -msgid "Logging in" -msgstr "Yn mewngofnodi" +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Methwyd neilltuo cof" -#: methods/ftp.cc:178 -msgid "Unable to determine the peer name" -msgstr "Ni ellir darganfod enw'r cymar" +#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#, c-format +msgid "Unable to open %s" +msgstr "Ni ellir agor %s" -#: methods/ftp.cc:183 -msgid "Unable to determine the local name" -msgstr "Ni ellir darganfod yr enw lleol" +#: 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" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: ftparchive/override.cc:75 ftparchive/override.cc:179 #, fuzzy, c-format -msgid "The server refused the connection and said: %s" -msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" +msgid "Malformed override %s line %llu #2" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: methods/ftp.cc:220 -#, c-format -msgid "USER failed, server said: %s" -msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" +#: 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" -#: methods/ftp.cc:227 +#: ftparchive/override.cc:128 ftparchive/override.cc:202 #, c-format -msgid "PASS failed, server said: %s" -msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" -#: methods/ftp.cc:247 -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.)" +#: ftparchive/multicompress.cc:70 +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Dull Cywasgu Anhysbys '%s'" -# FIXME -#: methods/ftp.cc:275 +#: ftparchive/multicompress.cc:100 #, c-format -msgid "Login script command '%s' failed, server said: %s" -msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" +msgid "Compressed output %s needs a compression set" +msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: methods/ftp.cc:301 -#, c-format -msgid "TYPE failed, server said: %s" -msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" +#: ftparchive/multicompress.cc:189 +msgid "Failed to create FILE*" +msgstr "Methwyd creu FILE*" -#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233 -msgid "Connection timeout" -msgstr "Goramser cysylltu" +#: ftparchive/multicompress.cc:192 +msgid "Failed to fork" +msgstr "Methodd fork()" -#: methods/ftp.cc:345 -msgid "Server closed the connection" -msgstr "Caeodd y gweinydd y cysylltiad" +#: ftparchive/multicompress.cc:206 +#, fuzzy +msgid "Compress child" +msgstr "Plentyn Cywasgu" -#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197 -msgid "Read error" -msgstr "Gwall darllen" +#: ftparchive/multicompress.cc:229 +#, fuzzy, c-format +msgid "Internal error, failed to create %s" +msgstr "Gwall Mewnol, Methwyd creu %s" -#: methods/ftp.cc:355 methods/rsh.cc:204 -msgid "A response overflowed the buffer." -msgstr "Gorlifodd ateb y byffer." +#: ftparchive/multicompress.cc:304 +msgid "IO to subprocess/file failed" +msgstr "Methodd MA i isbroses/ffeil" -#: methods/ftp.cc:372 methods/ftp.cc:384 -msgid "Protocol corruption" -msgstr "Llygr protocol" +#: ftparchive/multicompress.cc:342 +msgid "Failed to read while computing MD5" +msgstr "Methwyd darllen wrth gyfrifo MD5" -#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239 -msgid "Write error" -msgstr "Gwall ysgrifennu" +#: ftparchive/multicompress.cc:358 +#, c-format +msgid "Problem unlinking %s" +msgstr "Gwall wrth datgysylltu %s" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738 -msgid "Could not create a socket" -msgstr "Methwyd creu soced" +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Methwyd ailenwi %s at %s" -#: methods/ftp.cc:707 -msgid "Could not connect data socket, connection timed out" -msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" +#: cmdline/apt-internal-solver.cc:37 +msgid "" +"Usage: apt-internal-resolver\n" +"\n" +"apt-internal-resolver 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" +"apt.conf(5) manual pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" -#: methods/ftp.cc:713 -#, fuzzy -msgid "Could not connect passive socket." -msgstr "Methwyd cysylltu soced goddefol" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Cofnod pecyn anhysbys!" -# FIXME -#: methods/ftp.cc:731 -msgid "getaddrinfo was unable to get a listening socket" -msgstr "Methodd getaddrinfo gael soced gwrando" +#: 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" -#: methods/ftp.cc:745 -msgid "Could not bind a socket" -msgstr "Methwyd rhwymo soced" +#: apt-inst/contrib/extracttar.cc:117 +msgid "Failed to create pipes" +msgstr "Methwyd creu pibau" -#: methods/ftp.cc:749 -msgid "Could not listen on the socket" -msgstr "Methwyd gwrando ar y soced" +#: apt-inst/contrib/extracttar.cc:144 +msgid "Failed to exec gzip " +msgstr "Methwyd gweithredu gzip" -#: methods/ftp.cc:756 -msgid "Could not determine the socket's name" -msgstr "Methwyd canfod enw'r soced" +#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +msgid "Corrupted archive" +msgstr "Archif llygredig" -#: methods/ftp.cc:788 -msgid "Unable to send PORT command" -msgstr "Methwyd danfod gorchymyn PORT" +#: apt-inst/contrib/extracttar.cc:196 +#, fuzzy +msgid "Tar checksum failed, archive corrupted" +msgstr "Methodd swm gwirio Tar, archif llygredig" -#: methods/ftp.cc:798 +#: apt-inst/contrib/extracttar.cc:303 #, c-format -msgid "Unknown address family %u (AF_*)" -msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" +msgid "Unknown TAR header type %u, member %s" +msgstr "Math pennawd TAR anhysbys %u, aelod %s" -#: methods/ftp.cc:807 -#, c-format -msgid "EPRT failed, server said: %s" -msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" +#: apt-inst/contrib/arfile.cc:74 +msgid "Invalid archive signature" +msgstr "Llofnod archif annilys" -#: methods/ftp.cc:827 -msgid "Data socket connect timed out" -msgstr "Goramserodd cysylltiad y soced data" +#: apt-inst/contrib/arfile.cc:82 +msgid "Error reading archive member header" +msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: methods/ftp.cc:834 -msgid "Unable to accept connection" -msgstr "Methwyd derbyn cysylltiad" +#: apt-inst/contrib/arfile.cc:94 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" -#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309 -msgid "Problem hashing file" -msgstr "Problem wrth stwnshio ffeil" +#: apt-inst/contrib/arfile.cc:106 +msgid "Invalid archive member header" +msgstr "Pennawd aelod archif annilys" -#: methods/ftp.cc:886 -#, c-format -msgid "Unable to fetch file, server said '%s'" -msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" +#: apt-inst/contrib/arfile.cc:132 +msgid "Archive is too short" +msgstr "Mae'r archif yn rhy fyr" -#: methods/ftp.cc:901 methods/rsh.cc:328 -msgid "Data socket timed out" -msgstr "Goramserodd soced data" +#: apt-inst/contrib/arfile.cc:136 +msgid "Failed to read the archive headers" +msgstr "Methwyd darllen pennawdau'r archif" -#: methods/ftp.cc:931 -#, c-format -msgid "Data transfer failed, server said '%s'" -msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" +#: apt-inst/filelist.cc:382 +msgid "DropNode called on still linked node" +msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" -#. Get the files information -#: methods/ftp.cc:1008 -msgid "Query" -msgstr "Ymholiad" +#: apt-inst/filelist.cc:414 +msgid "Failed to locate the hash element!" +msgstr "Methyd lleoli yr elfen !" -# FIXME -#: methods/ftp.cc:1120 -msgid "Unable to invoke " -msgstr "Methwyd gweithredu " +#: 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" -#: methods/connect.cc:75 +#: apt-inst/filelist.cc:479 #, c-format -msgid "Connecting to %s (%s)" -msgstr "Yn cysylltu i %s (%s)" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" -#: methods/connect.cc:86 +# FIXME: "the" +#: apt-inst/filelist.cc:508 #, c-format -msgid "[IP: %s %s]" -msgstr "[IP: %s %s]" +msgid "Double add of diversion %s -> %s" +msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" -#: methods/connect.cc:93 +#: apt-inst/filelist.cc:551 #, 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)" +msgid "Duplicate conf file %s/%s" +msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: 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)." +#: 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" -#: methods/connect.cc:107 +#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 #, c-format -msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" +msgid "Failed to close file %s" +msgstr "Methwyd cau ffeil %s" -#: methods/connect.cc:125 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format -msgid "Could not connect to %s:%s (%s)." -msgstr "Methwyd cysylltu i %s:%s (%s)." +msgid "The path %s is too long" +msgstr "Mae'r llwybr %s yn rhy hir" -#. We say this mainly because the pause here is for the -#. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:431 +#: apt-inst/extract.cc:127 #, c-format -msgid "Connecting to %s" -msgstr "Yn cysylltu i %s" +msgid "Unpacking %s more than once" +msgstr "Yn dadbacio %s mwy nag unwaith" -#: methods/connect.cc:172 methods/connect.cc:191 +#: apt-inst/extract.cc:137 #, c-format -msgid "Could not resolve '%s'" -msgstr "Methwyd datrys '%s'" +msgid "The directory %s is diverted" +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: methods/connect.cc:197 +#: apt-inst/extract.cc:147 #, c-format -msgid "Temporary failure resolving '%s'" -msgstr "Methiant dros dro yn datrys '%s'" - -#: 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:247 -#, fuzzy, c-format -msgid "Unable to connect to %s:%s:" -msgstr "Methwyd cysylltu i %s %s:" - -#: methods/gpgv.cc:172 -msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" - -#: methods/gpgv.cc:177 -msgid "At least one invalid signature was encountered." -msgstr "" +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" -#: methods/gpgv.cc:181 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" -msgstr "" +#: 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" -#: methods/gpgv.cc:186 -msgid "Unknown error executing gpgv" +#: 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" -#: methods/gpgv.cc:220 methods/gpgv.cc:227 -#, fuzzy -msgid "The following signatures were invalid:\n" -msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" - -#: methods/gpgv.cc:234 -msgid "" -"The following signatures couldn't be verified because the public key is not " -"available:\n" -msgstr "" +#: apt-inst/extract.cc:283 +msgid "Failed to locate node in its hash bucket" +msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" -#: methods/http.cc:393 -msgid "Waiting for headers" -msgstr "Yn aros am benawdau" +#: apt-inst/extract.cc:287 +msgid "The path is too long" +msgstr "Mae'r llwybr yn rhy hir" -#: methods/http.cc:539 +# FIXME: wtf? +#: apt-inst/extract.cc:415 #, c-format -msgid "Got a single header line over %u chars" -msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" - -#: methods/http.cc:547 -msgid "Bad header line" -msgstr "Llinell pennawd gwael" - -#: methods/http.cc:572 methods/http.cc:579 -#, fuzzy -msgid "The HTTP server sent an invalid reply header" -msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" - -#: methods/http.cc:608 -#, fuzzy -msgid "The HTTP server sent an invalid Content-Length header" -msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" - -#: methods/http.cc:623 -#, fuzzy -msgid "The HTTP server sent an invalid Content-Range header" -msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" - -#: methods/http.cc:625 -#, fuzzy -msgid "This HTTP server has broken range support" -msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" - -#: methods/http.cc:649 -msgid "Unknown date format" -msgstr "Fformat dyddiad anhysbys" - -#: methods/http.cc:808 -msgid "Select failed" -msgstr "Methwyd dewis" - -#: methods/http.cc:813 -msgid "Connection timed out" -msgstr "Goramserodd y cysylltiad" +msgid "Overwrite package match with no version for %s" +msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: methods/http.cc:836 -msgid "Error writing to output file" -msgstr "Gwall wrth ysgrifennu i ffeil allbwn" +#: 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:867 -msgid "Error writing to file" -msgstr "Gwall wrth ysgrifennu at ffeil" +#: apt-inst/extract.cc:492 +#, c-format +msgid "Unable to stat %s" +msgstr "Ni ellir gwneud stat() o %s" -#: methods/http.cc:895 -msgid "Error writing to the file" -msgstr "Gwall wrth ysgrifennu at y ffeil" +#: 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:909 -#, fuzzy -msgid "Error reading from server. Remote end closed connection" -msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" +#. 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:911 -msgid "Error reading from server" -msgstr "Gwall wrth ddarllen o'r gweinydd" +#: 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:1181 +#: apt-inst/deb/debfile.cc:214 #, fuzzy -msgid "Bad header data" -msgstr "Data pennawd gwael" - -#: methods/http.cc:1198 methods/http.cc:1253 -msgid "Connection failed" -msgstr "Methodd y cysylltiad" - -#: methods/http.cc:1345 -msgid "Internal error" -msgstr "Gwall mewnol" +msgid "Unparsable control file" +msgstr "Ffeil rheoli ni ellir ei ramadegu" #: 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:109 +#: 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:117 +#: 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:144 +#: apt-pkg/contrib/mmap.cc:145 #, fuzzy msgid "Unable to close mmap" msgstr "Ni ellir agor %s" # FIXME -#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200 +#: 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:278 +#: apt-pkg/contrib/mmap.cc:279 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" @@ -2394,88 +2327,88 @@ msgid "" 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:1165 +#: apt-pkg/contrib/strutl.cc:1166 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:468 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:526 +#: 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:694 +#: 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:713 +#: 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:730 +#: 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:770 +#: 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:777 +#: 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:781 apt-pkg/contrib/configuration.cc:786 +#: 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:790 +#: 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:793 +#: 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:843 +#: 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" @@ -2496,44 +2429,44 @@ msgstr "%c%s... Wedi Gorffen" 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:104 apt-pkg/contrib/cmndline.cc:112 -#: apt-pkg/contrib/cmndline.cc:120 +#: 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:125 +#: 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:166 apt-pkg/contrib/cmndline.cc:187 +#: 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:235 +#: 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:266 +#: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" # FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:298 +#: apt-pkg/contrib/cmndline.cc:300 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." -#: apt-pkg/contrib/cmndline.cc:348 +#: apt-pkg/contrib/cmndline.cc:350 #, c-format msgid "Invalid operation %s" msgstr "Gweithred annilys %s" @@ -2543,134 +2476,122 @@ msgstr "Gweithred annilys %s" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213 -#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42 -#: methods/mirror.cc:101 -#, c-format -msgid "Unable to change to %s" -msgstr "Ni ellir newid i %s" - #: 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:197 +#: 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:202 +#: 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:220 +#: 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:224 +#: 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:364 +#: 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:391 +#: 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:409 +#: 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:418 +#: 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:719 apt-pkg/deb/dpkgpm.cc:950 -#, 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:731 +#: 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:733 +#: 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:737 +#: 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:739 +#: 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:877 apt-pkg/indexcopy.cc:655 +#: 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:923 +#: 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:970 +#: apt-pkg/contrib/fileutl.cc:1136 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1019 +#: apt-pkg/contrib/fileutl.cc:1192 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1087 +#: 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:1152 +#: apt-pkg/contrib/fileutl.cc:1378 apt-pkg/contrib/fileutl.cc:1400 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:1410 -#, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gwall wrth gau'r ffeil" - -#: apt-pkg/contrib/fileutl.cc:1414 +#: 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:1419 +#: 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:1430 +#: 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:1450 +#: apt-pkg/contrib/fileutl.cc:1755 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2788,12 +2709,12 @@ msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" # FIXME: number? -#: apt-pkg/tagfile.cc:126 +#: 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:213 +#: apt-pkg/tagfile.cc:216 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -2858,7 +2779,7 @@ msgstr "" msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485 +#: 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." @@ -2873,20 +2794,20 @@ msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" 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:298 apt-pkg/packagemanager.cc:775 +#: 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:437 apt-pkg/packagemanager.cc:467 +#: 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:507 +#: apt-pkg/packagemanager.cc:545 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2902,7 +2823,7 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:255 +#: apt-pkg/algorithms.cc:261 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2910,7 +2831,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1191 +#: apt-pkg/algorithms.cc:1223 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2918,12 +2839,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1193 +#: 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:1518 apt-pkg/algorithms.cc:1520 +#: 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 " @@ -2949,12 +2870,12 @@ msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:864 +#: apt-pkg/acquire.cc:893 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:866 +#: apt-pkg/acquire.cc:895 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" @@ -2969,7 +2890,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s." msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:425 +#: apt-pkg/acquire-worker.cc:440 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2987,7 +2908,7 @@ msgstr "Ni chynhelir y system pecynnu '%s'" msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" -#: apt-pkg/clean.cc:59 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ni ellir gwneud stat() o %s." @@ -3039,12 +2960,13 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas" #. 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:313 apt-pkg/pkgcachegen.cc:355 -#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390 -#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415 -#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465 -#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510 +#: 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)" @@ -3068,21 +2990,27 @@ 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:517 +#: 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:1082 +#: 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:1187 +#: 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:1378 apt-pkg/pkgcachegen.cc:1385 +#: 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" @@ -3091,17 +3019,17 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:640 +#: apt-pkg/acquire-item.cc:599 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863 -#: apt-pkg/acquire-item.cc:2006 +#: 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:1399 +#: apt-pkg/acquire-item.cc:1370 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3109,28 +3037,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1415 +#: 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:1450 +#: apt-pkg/acquire-item.cc:1428 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1466 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1510 +#: apt-pkg/acquire-item.cc:1488 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1543 +#: apt-pkg/acquire-item.cc:1521 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -3138,13 +3066,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558 +#: 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:1650 +#: 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 " @@ -3153,7 +3081,7 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/acquire-item.cc:1694 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3162,40 +3090,40 @@ 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:1768 +#: 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:1855 +#: apt-pkg/acquire-item.cc:1851 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" # FIXME: number? -#: apt-pkg/indexrecords.cc:61 +#: 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:71 +#: 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:105 +#: apt-pkg/indexrecords.cc:108 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:118 +#: 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:137 +#: apt-pkg/indexrecords.cc:140 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" @@ -3205,89 +3133,89 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:566 +#: apt-pkg/cdrom.cc:550 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672 +#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:656 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:603 +#: apt-pkg/cdrom.cc:587 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894 +#: apt-pkg/cdrom.cc:596 apt-pkg/cdrom.cc:879 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" -#: apt-pkg/cdrom.cc:632 +#: apt-pkg/cdrom.cc:616 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:650 +#: apt-pkg/cdrom.cc:634 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:655 +#: apt-pkg/cdrom.cc:639 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" -#: apt-pkg/cdrom.cc:664 +#: apt-pkg/cdrom.cc:648 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:683 +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:731 +#: 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:742 +#: 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:769 +#: apt-pkg/cdrom.cc:754 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:798 +#: apt-pkg/cdrom.cc:783 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:815 +#: apt-pkg/cdrom.cc:800 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:817 +#: apt-pkg/cdrom.cc:802 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:844 +#: 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:852 +#: apt-pkg/cdrom.cc:837 msgid "Source list entries for this disc are:\n" msgstr "" @@ -3337,49 +3265,49 @@ msgstr "" msgid "No keyring installed in %s." msgstr "Yn Erthylu'r Sefydliad." -#: apt-pkg/cacheset.cc:352 +#: 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:355 +#: 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:466 +#: apt-pkg/cacheset.cc:515 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:472 +#: 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:483 +#: 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:490 apt-pkg/cacheset.cc:497 +#: 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:504 +#: 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:512 +#: 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:520 +#: apt-pkg/cacheset.cc:569 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3388,143 +3316,143 @@ msgstr "" msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:213 +#: apt-pkg/edsp.cc:209 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:281 +#: apt-pkg/edsp.cc:277 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:288 +#: apt-pkg/edsp.cc:284 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567 +#: 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:71 +#: apt-pkg/deb/dpkgpm.cc:73 #, fuzzy, c-format msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:900 +#: 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:73 apt-pkg/deb/dpkgpm.cc:907 +#: 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:74 +#: apt-pkg/deb/dpkgpm.cc:76 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:75 +#: apt-pkg/deb/dpkgpm.cc:77 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:76 +#: 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:672 +#: 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:687 apt-pkg/deb/dpkgpm.cc:707 +#: 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:893 +#: apt-pkg/deb/dpkgpm.cc:945 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:894 +#: apt-pkg/deb/dpkgpm.cc:946 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:899 +#: 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:901 +#: apt-pkg/deb/dpkgpm.cc:953 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:906 +#: apt-pkg/deb/dpkgpm.cc:958 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:908 +#: apt-pkg/deb/dpkgpm.cc:960 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:913 +#: 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:914 +#: apt-pkg/deb/dpkgpm.cc:966 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1142 +#: apt-pkg/deb/dpkgpm.cc:1209 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1172 +#: apt-pkg/deb/dpkgpm.cc:1239 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1351 +#: apt-pkg/deb/dpkgpm.cc:1411 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1408 +#: 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:1413 +#: apt-pkg/deb/dpkgpm.cc:1478 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1415 +#: 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:1421 +#: 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:1427 +#: 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:1434 +#: apt-pkg/deb/dpkgpm.cc:1499 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3553,42 +3481,89 @@ msgstr "" msgid "Not locked" msgstr "" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:279 -#, c-format -msgid "No mirror file '%s' found " -msgstr "" +#~ msgid "Failed to remove %s" +#~ msgstr "Methwyd dileu %s" -#. FIXME: fallback to a default mirror here instead -#. and provide a config option to define that default -#: methods/mirror.cc:286 -#, fuzzy, c-format -msgid "Can not read mirror file '%s'" -msgstr "Methwyd agor ffeil %s" +#~ msgid "Unable to create %s" +#~ msgstr "Ni ellir creu %s" -#: methods/mirror.cc:441 -#, c-format -msgid "[Mirror: %s]" -msgstr "" +#~ msgid "Failed to stat %sinfo" +#~ msgstr "Methwyd stat() ar %sinfo" -#: methods/rred.cc:472 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - 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/rred.cc:477 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" +#~ msgid "Failed to change to the admin dir %sinfo" +#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" -#: methods/rsh.cc:336 -msgid "Connection closed prematurely" -msgstr "Caewyd y cysylltiad yn gynnar" +# 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" -- cgit v1.2.3 From 3999d15854b1c2181c12bdd0b855a09b071531ba Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 27 Jun 2012 11:21:56 +0200 Subject: fix two simple spelling issues found by Christian Perrier, updating all po's, but as it is a simple transformation no re-call and instead deal with them on merge --- po/cy.po | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'po/cy.po') diff --git a/po/cy.po b/po/cy.po index b33ccba63..ec5d59a2b 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2012-06-25 09:17+0200\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" @@ -1230,7 +1230,7 @@ msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" "apt-mark is a simple command line interface for marking packages\n" -"as manual or automatical installed. It can also list marks.\n" +"as manually or automatically installed. It can also list marks.\n" "\n" "Commands:\n" " auto - Mark the given packages as automatically installed\n" @@ -2062,11 +2062,13 @@ msgstr "Gwall wrth datgysylltu %s" 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-resolver\n" +"Usage: apt-internal-solver\n" "\n" -"apt-internal-resolver is an interface to use the current internal\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" @@ -2074,9 +2076,17 @@ msgid "" " -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" -"apt.conf(5) manual pages for more information and options.\n" -" This APT has Super Cow Powers.\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!" -- cgit v1.2.3