apt-pkg/contrib/fileutl.cc: Revert WriteEmpty to old behavior (LP: #613211)

[apt.git] / po / cy.po

diff --git a/po/cy.po b/po/cy.po
index aa1bb79f7d7ef0fdbd1e8a47ecb0a8468143a27c..ed60779d8f946ee0ede13e95ef307e147f4e345e 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-10-26 07:15+0200\n"
+"POT-Creation-Date: 2010-05-04 13:37+0200\n"

 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"


@@ -14,1246 +14,1507 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: methods/cdrom.cc:114
+#: cmdline/apt-cache.cc:141

 #, c-format
 #, c-format

-msgid "Unable to read the cdrom database %s"
-msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
+
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:646
+#: cmdline/apt-cache.cc:799 cmdline/apt-cache.cc:1023
+#: cmdline/apt-cache.cc:1428 cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1606
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ni ellir lleoli'r pecyn %s"

 
 

-#: methods/cdrom.cc:123
+#: cmdline/apt-cache.cc:245

 #, fuzzy
 #, 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."
+msgid "Total package names: "
+msgstr "Cyfanswm Enwau Pecynnau : "

 
 

-#: methods/cdrom.cc:131
+#: cmdline/apt-cache.cc:247

 #, fuzzy
 #, fuzzy

-msgid "Wrong CD-ROM"
-msgstr "CD Anghywir"
+msgid "Total package structures: "
+msgstr "Cyfanswm Enwau Pecynnau : "

 
 

-#: methods/cdrom.cc:166
-#, 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."
+#: cmdline/apt-cache.cc:287
+#, fuzzy
+msgid "  Normal packages: "
+msgstr "  Pecynnau Normal: "

 
 

-#: methods/cdrom.cc:171
+#: cmdline/apt-cache.cc:288

 #, fuzzy
 #, fuzzy

-msgid "Disk not found."
-msgstr "Ffeil heb ei ganfod"
+msgid "  Pure virtual packages: "
+msgstr "  Pecynnau Cwbl Rhithwir: "

 
 

-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
-msgstr "Ffeil heb ei ganfod"
+#: cmdline/apt-cache.cc:289
+#, fuzzy
+msgid "  Single virtual packages: "
+msgstr "  Pecynnau Rhithwir Sengl: "

 
 

-#: methods/copy.cc:43 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
-msgid "Failed to stat"
-msgstr "Methwyd stat()"
+#: cmdline/apt-cache.cc:290
+#, fuzzy
+msgid "  Mixed virtual packages: "
+msgstr "  Pecynnau Rhithwir Cymysg: "

 
 

-#: methods/copy.cc:80 methods/gpgv.cc:278 methods/gzip.cc:147
-#: methods/rred.cc:240
-msgid "Failed to set modification time"
-msgstr "Methwyd gosod amser newid"
+#: cmdline/apt-cache.cc:291
+msgid "  Missing: "
+msgstr "  Ar Goll: "

 
 

-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
+#: cmdline/apt-cache.cc:293
+#, fuzzy
+msgid "Total distinct versions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "

 
 

-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
-msgid "Logging in"
-msgstr "Yn mewngofnodi"
+#: cmdline/apt-cache.cc:295
+#, fuzzy
+msgid "Total distinct descriptions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "

 
 

-#: methods/ftp.cc:168
-msgid "Unable to determine the peer name"
-msgstr "Ni ellir darganfod enw'r cymar"
+#: cmdline/apt-cache.cc:297
+#, fuzzy
+msgid "Total dependencies: "
+msgstr "Cyfanswm Dibyniaethau: "

 
 

-#: methods/ftp.cc:173
-msgid "Unable to determine the local name"
-msgstr "Ni ellir darganfod yr enw lleol"
+#: cmdline/apt-cache.cc:300
+#, fuzzy
+msgid "Total ver/file relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "

 
 

-#: methods/ftp.cc:204 methods/ftp.cc:232
-#, fuzzy, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
+#: cmdline/apt-cache.cc:302
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "

 
 

-#: methods/ftp.cc:210
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+#: cmdline/apt-cache.cc:304
+#, fuzzy
+msgid "Total Provides mappings: "
+msgstr "Cyfanswm Mapiau Darpariath: "

 
 

-#: methods/ftp.cc:217
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+#: cmdline/apt-cache.cc:316
+#, fuzzy
+msgid "Total globbed strings: "
+msgstr "Cyfanswm Llinynau Glob: "

 
 

-#: methods/ftp.cc:237
-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.)"
+#: cmdline/apt-cache.cc:330
+#, fuzzy
+msgid "Total dependency version space: "
+msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "

 
 

-# FIXME
-#: methods/ftp.cc:265
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
+#: cmdline/apt-cache.cc:335
+#, fuzzy
+msgid "Total slack space: "
+msgstr "Cyfanswm gofod Slac: "
+
+#: cmdline/apt-cache.cc:343
+#, fuzzy
+msgid "Total space accounted for: "
+msgstr "Cyfanswm Gofod Cyfrifwyd: "

 
 

-#: methods/ftp.cc:291
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1223

 #, c-format
 #, c-format

-msgid "TYPE failed, server said: %s"
-msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+msgid "Package file %s is out of sync."
+msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."

 
 

-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr "Goramser cysylltu"
+#: cmdline/apt-cache.cc:1299
+msgid "You must give exactly one pattern"
+msgstr "Rhaid i chi ddarparu un patrwm yn union"

 
 

-#: methods/ftp.cc:335
-msgid "Server closed the connection"
-msgstr "Caeodd y gweinydd y cysylltiad"
+#: cmdline/apt-cache.cc:1457 cmdline/apt-cache.cc:1529
+msgid "No packages found"
+msgstr "Canfuwyd dim pecyn"

 
 

-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
-msgid "Read error"
-msgstr "Gwall darllen"
+#: cmdline/apt-cache.cc:1548
+#, fuzzy
+msgid "Package files:"
+msgstr "Ffeiliau Pecynnau:"

 
 

-#: methods/ftp.cc:345 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr "Gorlifodd ateb y byffer."
+#: cmdline/apt-cache.cc:1555 cmdline/apt-cache.cc:1657
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"

 
 

-#: methods/ftp.cc:362 methods/ftp.cc:374
-msgid "Protocol corruption"
-msgstr "Llygr protocol"
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc:1569
+#, fuzzy
+msgid "Pinned packages:"
+msgstr "Pecynnau wedi eu Pinio:"

 
 

-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
+#: cmdline/apt-cache.cc:1581 cmdline/apt-cache.cc:1637
+msgid "(not found)"
+msgstr "(heb ganfod)"

 
 

-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
-msgid "Could not create a socket"
-msgstr "Methwyd creu soced"
+#: cmdline/apt-cache.cc:1590
+msgid "  Installed: "
+msgstr "  Wedi Sefydlu: "

 
 

-#: methods/ftp.cc:698
-msgid "Could not connect data socket, connection timed out"
-msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+#: cmdline/apt-cache.cc:1591
+msgid "  Candidate: "
+msgstr "  Ymgeisydd: "

 
 

-#: methods/ftp.cc:702 methods/connect.cc:101
-msgid "Failed"
-msgstr "Methwyd"
+#: cmdline/apt-cache.cc:1619 cmdline/apt-cache.cc:1627
+msgid "(none)"
+msgstr "(dim)"

 
 

-#: methods/ftp.cc:704
+#: cmdline/apt-cache.cc:1634

 #, fuzzy
 #, fuzzy

-msgid "Could not connect passive socket."
-msgstr "Methwyd cysylltu soced goddefol"
+msgid "  Package pin: "
+msgstr "  Pin Pecyn: "

 
 

-# FIXME
-#: methods/ftp.cc:722
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Methodd getaddrinfo gael soced gwrando"
+#. Show the priority tables
+#: cmdline/apt-cache.cc:1643
+#, fuzzy
+msgid "  Version table:"
+msgstr "  Tabl Fersiynnau:"

 
 

-#: methods/ftp.cc:736
-msgid "Could not bind a socket"
-msgstr "Methwyd rhwymo soced"
+#: cmdline/apt-cache.cc:1754 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
+#: cmdline/apt-get.cc:2729 cmdline/apt-sortpkgs.cc:144
+#, fuzzy, c-format
+msgid "%s %s for %s compiled on %s %s\n"
+msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"

 
 

-#: methods/ftp.cc:740
-msgid "Could not listen on the socket"
-msgstr "Methwyd gwrando ar y soced"
+#: cmdline/apt-cache.cc:1761
+#, fuzzy
+msgid ""
+"Usage: apt-cache [options] command\n"
+"       apt-cache [options] add file1 [file2 ...]\n"
+"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
+"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache is a low-level tool used to manipulate APT's binary\n"
+"cache files, and query information from them\n"
+"\n"
+"Commands:\n"
+"   add - Add a package file to the source cache\n"
+"   gencaches - Build both the package and source cache\n"
+"   showpkg - Show some general information for a single package\n"
+"   showsrc - Show source records\n"
+"   stats - Show some basic statistics\n"
+"   dump - Show the entire file in a terse form\n"
+"   dumpavail - Print an available file to stdout\n"
+"   unmet - Show unmet dependencies\n"
+"   search - Search the package list for a regex pattern\n"
+"   show - Show a readable record for the package\n"
+"   depends - Show raw dependency information for a package\n"
+"   rdepends - Show reverse dependency information for a package\n"
+"   pkgnames - List the names of all packages in the system\n"
+"   dotty - Generate package graphs for GraphViz\n"
+"   xvcg - Generate package graphs for xvcg\n"
+"   policy - Show policy settings\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -p=? The package cache.\n"
+"  -s=? The source cache.\n"
+"  -q   Disable progress indicator.\n"
+"  -i   Show only important deps for the unmet command.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+msgstr ""
+"Defnydd: apt-cache [opsiynnau] gorchymyn\n"
+"         apt-cache [opsiynnau] add ffeil1 [ffeil2 ...]\n"
+"         apt-cache [opsiynnau] showpkg pecyn1 [pecyn2 ...]\n"
+"         apt-cache [opsiynnau] showsrc pecyn1 [pecyn2 ...]\n"
+"\n"
+"Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa "
+"deuol APT, ac ymholi gwybodaeth ohonynt\n"
+"\n"
+"Gorchmynion:\n"
+"   add - Ychwanegu ffeil pecyn i'r storfa ffynhonell\n"
+"   gencaches - Adeiladu'r storfeydd pecyn a ffynhonell\n"
+"   showpkg - Dangos gwybodaeth cyffredinol am becyn sengl\n"
+"   showsrc - Dangos cofnodion ffynhonell\n"
+"   stats - Dangos rhyw ystadegau sylfaenol\n"
+"   dump - Dangos y ffeil cyfan mewn ffurf syml\n"
+"   dumpavail - Dangos ffeil argaeledd\n"
+"   unmet - Dangos dibyniaethau heb eu darparu\n"
+"   search - Search the package list for a regex pattern\n"
+"   show - Show a readable record for the package\n"
+"   depends - Show raw dependency information for a package\n"
+"   rdepends - Show reverse dependency information for a package\n"
+"   pkgnames - List the names of all packages\n"
+"   dotty - Generate package graphs for GraphViz\n"
+"   xvcg - Generate package graphs for xvcg\n"
+"   policy - Show policy settings\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -p=? The package cache.\n"
+"  -s=? The source cache.\n"
+"  -q   Disable progress indicator.\n"
+"  -i   Show only important deps for the unmet command.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"

 
 

-#: methods/ftp.cc:747
-msgid "Could not determine the socket's name"
-msgstr "Methwyd canfod enw'r soced"
+#: cmdline/apt-cdrom.cc:77
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
+msgstr ""

 
 

-#: methods/ftp.cc:779
-msgid "Unable to send PORT command"
-msgstr "Methwyd danfod gorchymyn PORT"
+#: cmdline/apt-cdrom.cc:92
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+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-cdrom.cc:127
+#, fuzzy, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "Methwyd ailenwi %s at %s"
+
+#: cmdline/apt-cdrom.cc:162
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
+#: cmdline/apt-config.cc:41
+msgid "Arguments not in pairs"
+msgstr "Nid yw ymresymiadau mewn parau"
+
+#: cmdline/apt-config.cc:76
+#, fuzzy
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+"   shell - Shell mode\n"
+"   dump - Show the configuration\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-config [opsiynnau] gorchymyn\n"
+"\n"
+"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
+"\n"
+"Gorchmynion:\n"
+"   shell - Modd plisgyn\n"
+"   dump - Dangod y cyfluniad\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -c=? Darllen y ffeil cyfluniad\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"

 
 

-#: methods/ftp.cc:789
+#: cmdline/apt-extracttemplates.cc:98

 #, c-format
 #, c-format

-msgid "Unknown address family %u (AF_*)"
-msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+msgid "%s not a valid DEB package."
+msgstr "Nid yw %s yn becyn DEB dilys."
+
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc:232
+#, fuzzy
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+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"

 
 

-#: methods/ftp.cc:798
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1030

 #, c-format
 #, c-format

-msgid "EPRT failed, server said: %s"
-msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"

 
 

-#: methods/ftp.cc:818
-msgid "Data socket connect timed out"
-msgstr "Goramserodd cysylltiad y soced data"
+#: cmdline/apt-extracttemplates.cc:310
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"

 
 

-#: methods/ftp.cc:825
-msgid "Unable to accept connection"
-msgstr "Methwyd derbyn cysylltiad"
+#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
+msgid "Package extension list is too long"
+msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."

 
 

-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
-msgid "Problem hashing file"
-msgstr "Problem wrth stwnshio ffeil"
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
+#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
+#, fuzzy, c-format
+msgid "Error processing directory %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"

 
 

-#: methods/ftp.cc:877
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+#: ftparchive/apt-ftparchive.cc:258
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"

 
 

-#: methods/ftp.cc:892 methods/rsh.cc:322
-msgid "Data socket timed out"
-msgstr "Goramserodd soced data"
+#: ftparchive/apt-ftparchive.cc:375
+msgid "Error writing header to contents file"
+msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"

 
 

-#: methods/ftp.cc:922
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
+#: ftparchive/apt-ftparchive.cc:405
+#, fuzzy, c-format
+msgid "Error processing contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"

 
 

-#. Get the files information
-#: methods/ftp.cc:997
-msgid "Query"
-msgstr "Ymholiad"
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc:590
+#, 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"

 
 

-# FIXME
-#: methods/ftp.cc:1109
-msgid "Unable to invoke "
-msgstr "Methwyd gweithredu "
+#: ftparchive/apt-ftparchive.cc:796
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"

 
 

-#: methods/connect.cc:64
+#: ftparchive/apt-ftparchive.cc:874

 #, c-format
 #, c-format

-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%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'"

 
 

-#: methods/connect.cc:71
+#: ftparchive/cachedb.cc:43

 #, c-format
 #, c-format

-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"

 
 

-#: methods/connect.cc:80
+#: ftparchive/cachedb.cc:61

 #, c-format
 #, 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 "DB is old, attempting to upgrade %s"
+msgstr "Hen gronfa data, yn ceisio uwchraddio %s"

 
 

-#: methods/connect.cc:86
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+#: ftparchive/cachedb.cc:72
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""

 
 

-#: methods/connect.cc:93
+#: ftparchive/cachedb.cc:77

 #, c-format
 #, c-format

-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"

 
 

-#: methods/connect.cc:108
+#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
+#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117

 #, c-format
 #, c-format

-msgid "Could not connect to %s:%s (%s)."
-msgstr "Methwyd cysylltu i %s:%s (%s)."
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"

 
 

-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
-msgstr "Yn cysylltu i %s"
+#: ftparchive/cachedb.cc:242
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"

 
 

-#: methods/connect.cc:167
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Methwyd datrys '%s'"
+#: ftparchive/cachedb.cc:448
+msgid "Unable to get a cursor"
+msgstr "Ni ellir cael cyrchydd"

 
 

-#: methods/connect.cc:173
+#: ftparchive/writer.cc:73

 #, c-format
 #, c-format

-msgid "Temporary failure resolving '%s'"
-msgstr "Methiant dros dro yn datrys '%s'"
+msgid "W: Unable to read directory %s\n"
+msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"

 
 

-#: methods/connect.cc:176
+#: ftparchive/writer.cc:78

 #, c-format
 #, c-format

-msgid "Something wicked happened resolving '%s:%s' (%i)"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+msgid "W: Unable to stat %s\n"
+msgstr "Rh: Ni ellir gwneud stat() o %s\n"

 
 

-#: methods/connect.cc:223
-#, c-format
-msgid "Unable to connect to %s %s:"
-msgstr "Methwyd cysylltu i %s %s:"
+#: ftparchive/writer.cc:134
+msgid "E: "
+msgstr "G: "

 
 

-#: methods/gpgv.cc:65
-#, fuzzy, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Methwyd datrys '%s'"
+#: ftparchive/writer.cc:136
+msgid "W: "
+msgstr "Rh: "

 
 

-#: methods/gpgv.cc:100
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:204
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-
-#: methods/gpgv.cc:209
-msgid "At least one invalid signature was encountered."
-msgstr ""
+#: ftparchive/writer.cc:143
+msgid "E: Errors apply to file "
+msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "

 
 

-#: methods/gpgv.cc:213
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:193

 #, c-format
 #, c-format

-msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
-msgstr ""
-
-#: methods/gpgv.cc:218
-msgid "Unknown error executing gpgv"
-msgstr ""
-
-#: methods/gpgv.cc:249
-#, fuzzy
-msgid "The following signatures were invalid:\n"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+msgid "Failed to resolve %s"
+msgstr "Methwyd datrys %s"

 
 

-#: methods/gpgv.cc:256
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
+#: ftparchive/writer.cc:174
+msgid "Tree walking failed"
+msgstr "Methwyd cerdded y goeden"

 
 

-#: methods/gpgv.cc:272
+#: ftparchive/writer.cc:201

 #, c-format
 #, c-format

-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
+msgid "Failed to open %s"
+msgstr "Methwyd agor %s"

 
 

-#: methods/gzip.cc:64
+# FIXME
+#: ftparchive/writer.cc:260

 #, c-format
 #, c-format

-msgid "Couldn't open pipe for %s"
-msgstr "Methwyd agor pibell ar gyfer %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DatGysylltu %s [%s]\n"

 
 

-#: methods/gzip.cc:109
+#: ftparchive/writer.cc:268

 #, c-format
 #, c-format

-msgid "Read error from %s process"
-msgstr "Gwall darllen o broses %s"
-
-#: methods/http.cc:377
-msgid "Waiting for headers"
-msgstr "Yn aros am benawdau"
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"

 
 

-#: methods/http.cc:523
+#: ftparchive/writer.cc:272

 #, c-format
 #, c-format

-msgid "Got a single header line over %u chars"
-msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-
-#: methods/http.cc:531
-msgid "Bad header line"
-msgstr "Llinell pennawd gwael"
-
-#: methods/http.cc:550 methods/http.cc:557
-#, fuzzy
-msgid "The HTTP server sent an invalid reply header"
-msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-
-#: methods/http.cc:586
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-
-#: methods/http.cc:601
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-
-#: methods/http.cc:603
-#, fuzzy
-msgid "This HTTP server has broken range support"
-msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-
-#: methods/http.cc:627
-msgid "Unknown date format"
-msgstr "Fformat dyddiad anhysbys"
-
-#: methods/http.cc:774
-msgid "Select failed"
-msgstr "Methwyd dewis"
+msgid "Failed to unlink %s"
+msgstr "Methwyd datgysylltu %s"

 
 

-#: methods/http.cc:779
-msgid "Connection timed out"
-msgstr "Goramserodd y cysylltiad"
+#: ftparchive/writer.cc:279
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Methwyd cysylltu %s at %s"

 
 

-#: methods/http.cc:802
-msgid "Error writing to output file"
-msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+#: ftparchive/writer.cc:289
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "  Tarwyd y terfyn cyswllt %sB.\n"

 
 

-#: methods/http.cc:833
-msgid "Error writing to file"
-msgstr "Gwall wrth ysgrifennu at ffeil"
+#: ftparchive/writer.cc:393
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"

 
 

-#: methods/http.cc:861
-msgid "Error writing to the file"
-msgstr "Gwall wrth ysgrifennu at y ffeil"
+#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: methods/http.cc:875
-#, fuzzy
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Cynaliwr %s yw %s nid %s\n"

 
 

-#: methods/http.cc:877
-msgid "Error reading from server"
-msgstr "Gwall wrth ddarllen o'r gweinydd"
+#: ftparchive/writer.cc:698
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: methods/http.cc:1104
-#, fuzzy
-msgid "Bad header data"
-msgstr "Data pennawd gwael"
+#: ftparchive/writer.cc:702
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: methods/http.cc:1121 methods/http.cc:1176
-msgid "Connection failed"
-msgstr "Methodd y cysylltiad"
+#: ftparchive/contents.cc:321
+#, fuzzy, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"

 
 

-#: methods/http.cc:1228
-msgid "Internal error"
-msgstr "Gwall mewnol"
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"

 
 

-#: apt-pkg/contrib/mmap.cc:80
-msgid "Can't mmap an empty file"
-msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"

 
 

-#: apt-pkg/contrib/mmap.cc:85
+#: ftparchive/override.cc:60 ftparchive/override.cc:166

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
+msgid "Malformed override %s line %lu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"

 
 

-#: apt-pkg/contrib/strutl.cc:978
+#: ftparchive/override.cc:74 ftparchive/override.cc:178

 #, c-format
 #, c-format

-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
+msgid "Malformed override %s line %lu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"

 
 

-#: apt-pkg/contrib/configuration.cc:434
+#: ftparchive/override.cc:88 ftparchive/override.cc:191

 #, c-format
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
+msgid "Malformed override %s line %lu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"

 
 

-#: apt-pkg/contrib/configuration.cc:492
+#: ftparchive/override.cc:127 ftparchive/override.cc:201

 #, c-format
 #, c-format

-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"

 
 

-#: apt-pkg/contrib/configuration.cc:510
+#: ftparchive/multicompress.cc:72

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Line %d too long (max %u)"
-msgstr "Linell %d yn rhy hir (uchaf %d)"
+msgid "Unknown compression algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"

 
 

-#: apt-pkg/contrib/configuration.cc:606
+#: ftparchive/multicompress.cc:102

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
+msgid "Compressed output %s needs a compression set"
+msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"

 
 

-# FIXME
-#: apt-pkg/contrib/configuration.cc:625
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Methwyd creu pibell cyfathrebu at isbroses"

 
 

-#: apt-pkg/contrib/configuration.cc:642
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
+#: ftparchive/multicompress.cc:195
+msgid "Failed to create FILE*"
+msgstr "Methwyd creu FILE*"

 
 

-#: apt-pkg/contrib/configuration.cc:682
-#, 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"
+#: ftparchive/multicompress.cc:198
+msgid "Failed to fork"
+msgstr "Methodd fork()"

 
 

-#: apt-pkg/contrib/configuration.cc:689
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+#: ftparchive/multicompress.cc:212
+#, fuzzy
+msgid "Compress child"
+msgstr "Plentyn Cywasgu"

 
 

-#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+#: ftparchive/multicompress.cc:235
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"

 
 

-#: apt-pkg/contrib/configuration.cc:702
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+#: ftparchive/multicompress.cc:286
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"

 
 

-#: apt-pkg/contrib/configuration.cc:736
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
+#: ftparchive/multicompress.cc:321
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "

 
 

-#: apt-pkg/contrib/configuration.cc:748 apt-pkg/contrib/cdromutl.cc:150
-#: apt-pkg/sourcelist.cc:320 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
-#, c-format
-msgid "Unable to read %s"
-msgstr "Ni ellir darllen %s"
+#: ftparchive/multicompress.cc:360
+msgid "decompressor"
+msgstr "datgywasgydd"

 
 

-#: apt-pkg/contrib/progress.cc:153
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Gwall!"
+#: ftparchive/multicompress.cc:403
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"

 
 

-#: apt-pkg/contrib/progress.cc:155
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Wedi Gorffen"
+#: ftparchive/multicompress.cc:455
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"

 
 

-# FIXME
-#: apt-pkg/contrib/cmndline.cc:77
+#: ftparchive/multicompress.cc:472

 #, c-format
 #, c-format

-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+msgid "Problem unlinking %s"
+msgstr "Gwall wrth datgysylltu %s"

 
 

-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185

 #, c-format
 #, c-format

-msgid "Command line option %s is not understood"
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"

 
 

-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+#: cmdline/apt-get.cc:127
+msgid "Y"
+msgstr "I"

 
 

-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1782

 #, c-format
 #, c-format

-msgid "Option %s requires an argument."
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"

 
 

-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+#: cmdline/apt-get.cc:244
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"

 
 

-#: apt-pkg/contrib/cmndline.cc:234
+#: cmdline/apt-get.cc:334

 #, c-format
 #, c-format

-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"

 
 

-#: apt-pkg/contrib/cmndline.cc:265
+#: cmdline/apt-get.cc:336

 #, c-format
 #, c-format

-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:298
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
+#: cmdline/apt-get.cc:343
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"

 
 

-#: apt-pkg/contrib/cmndline.cc:348
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Gweithred annilys %s"
+#: cmdline/apt-get.cc:345
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"

 
 

-#: apt-pkg/contrib/cdromutl.cc:52
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
+#: cmdline/apt-get.cc:348
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"

 
 

-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
-#, c-format
-msgid "Unable to change to %s"
-msgstr "Ni ellir newid i %s"
+#: cmdline/apt-get.cc:348
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"

 
 

-#: apt-pkg/contrib/cdromutl.cc:187
-msgid "Failed to stat the cdrom"
-msgstr "Methwyd gwneud stat() o'r CD-ROM"
+#: cmdline/apt-get.cc:353
+msgid " or"
+msgstr " neu"

 
 

-#: apt-pkg/contrib/fileutl.cc:82
-#, c-format
-msgid "Not using locking for read only lock file %s"
-msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
+#: cmdline/apt-get.cc:384
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"

 
 

-#: apt-pkg/contrib/fileutl.cc:87
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Methwyd agor y ffeil clo %s"
+#: cmdline/apt-get.cc:412
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"

 
 

-#: apt-pkg/contrib/fileutl.cc:105
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
+#: cmdline/apt-get.cc:434
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"

 
 

-#: apt-pkg/contrib/fileutl.cc:109
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Methwyd cael y clo %s"
+#: cmdline/apt-get.cc:457
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"

 
 

-#: apt-pkg/contrib/fileutl.cc:377
-#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
+#: cmdline/apt-get.cc:480
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"

 
 

-#: apt-pkg/contrib/fileutl.cc:387
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Derbyniodd is-broses %s wall segmentu."
+#: cmdline/apt-get.cc:500
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"

 
 

-#: apt-pkg/contrib/fileutl.cc:390
+#: cmdline/apt-get.cc:553

 #, c-format
 #, c-format

-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
+msgid "%s (due to %s) "
+msgstr "%s (oherwydd %s) "

 
 

-#: apt-pkg/contrib/fileutl.cc:392
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Gorffenodd is-broses %s yn annisgwyl"
+#: cmdline/apt-get.cc:561
+#, 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!"

 
 

-#: apt-pkg/contrib/fileutl.cc:436
+#: cmdline/apt-get.cc:595

 #, c-format
 #, c-format

-msgid "Could not open file %s"
-msgstr "Methwyd agor ffeil %s"
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "

 
 

-# FIXME
-#: apt-pkg/contrib/fileutl.cc:492
+#: cmdline/apt-get.cc:599

 #, c-format
 #, c-format

-msgid "read, still have %lu to read but none left"
-msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "

 
 

-# FIXME
-#: apt-pkg/contrib/fileutl.cc:522
+#: cmdline/apt-get.cc:601

 #, c-format
 #, c-format

-msgid "write, still have %lu to write but couldn't"
-msgstr "o hyd %lu i ysgrifennu ond methwyd"
-
-#: apt-pkg/contrib/fileutl.cc:597
-msgid "Problem closing the file"
-msgstr "Gwall wrth gau'r ffeil"
-
-#: apt-pkg/contrib/fileutl.cc:603
-msgid "Problem unlinking the file"
-msgstr "Gwall wrth dadgysylltu'r ffeil"
-
-#: apt-pkg/contrib/fileutl.cc:614
-msgid "Problem syncing the file"
-msgstr "Gwall wrth gyfamseru'r ffeil"
-
-#: apt-pkg/pkgcache.cc:132
-msgid "Empty package cache"
-msgstr "Storfa pecyn gwag"
-
-#: apt-pkg/pkgcache.cc:138
-msgid "The package cache file is corrupted"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "

 
 

-#: apt-pkg/pkgcache.cc:143
-msgid "The package cache file is an incompatible version"
-msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+#: cmdline/apt-get.cc:603
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"

 
 

-# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:148
-#, fuzzy, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
+#: cmdline/apt-get.cc:607
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"

 
 

-#: apt-pkg/pkgcache.cc:153
-msgid "The package cache was built for a different architecture"
-msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
+#: cmdline/apt-get.cc:680
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."

 
 

-#: apt-pkg/pkgcache.cc:224
-msgid "Depends"
-msgstr "Dibynnu"
+#: cmdline/apt-get.cc:683
+msgid " failed."
+msgstr " wedi methu."

 
 

-#: apt-pkg/pkgcache.cc:224
-msgid "PreDepends"
-msgstr "CynDdibynnu"
+#: cmdline/apt-get.cc:686
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"

 
 

-#: apt-pkg/pkgcache.cc:224
-msgid "Suggests"
-msgstr "Awgrymu"
+#: cmdline/apt-get.cc:689
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"

 
 

-#: apt-pkg/pkgcache.cc:225
-msgid "Recommends"
-msgstr "Argymell"
+#: cmdline/apt-get.cc:691
+msgid " Done"
+msgstr " Wedi Gorffen"

 
 

-#: apt-pkg/pkgcache.cc:225
-msgid "Conflicts"
-msgstr "Gwrthdaro"
+#: cmdline/apt-get.cc:695
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."

 
 

-#: apt-pkg/pkgcache.cc:225
-msgid "Replaces"
-msgstr "Amnewid"
+#: cmdline/apt-get.cc:698
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."

 
 

-#: apt-pkg/pkgcache.cc:226
-msgid "Obsoletes"
-msgstr "Darfodi"
+#: cmdline/apt-get.cc:723
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"

 
 

-#: apt-pkg/pkgcache.cc:226
-msgid "Breaks"
+#: cmdline/apt-get.cc:727
+msgid "Authentication warning overridden.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:237
-msgid "important"
-msgstr "pwysig"
-
-#: apt-pkg/pkgcache.cc:237
-msgid "required"
-msgstr "angenrheidiol"
+#: cmdline/apt-get.cc:734
+msgid "Install these packages without verification [y/N]? "
+msgstr ""

 
 

-#: apt-pkg/pkgcache.cc:237
-msgid "standard"
-msgstr "safonnol"
+#: cmdline/apt-get.cc:736
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"

 
 

-#: apt-pkg/pkgcache.cc:238
-msgid "optional"
-msgstr "opsiynnol"
+#: cmdline/apt-get.cc:745 cmdline/apt-get.cc:900
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#: apt-pkg/pkgcache.cc:238
-msgid "extra"
-msgstr "ychwanegol"
+#: cmdline/apt-get.cc:786
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""

 
 

-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: cmdline/apt-get.cc:795

 #, fuzzy
 #, fuzzy

-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."

 
 

-#: apt-pkg/depcache.cc:122
+#: cmdline/apt-get.cc:806

 #, fuzzy
 #, fuzzy

-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"

 
 

-#: apt-pkg/depcache.cc:151
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: cmdline/apt-get.cc:831 cmdline/apt-get.cc:2210 cmdline/apt-get.cc:2469
+#: apt-pkg/cachefile.cc:65
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."

 
 

-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
-#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+#: cmdline/apt-get.cc:846
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""

 
 

-#: apt-pkg/depcache.cc:219
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: cmdline/apt-get.cc:851
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
+
+#: cmdline/apt-get.cc:854
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Mae angen cyrchu %sB o archifau.\n"

 
 

-#: apt-pkg/depcache.cc:225
+#: cmdline/apt-get.cc:859

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"

 
 

-# FIXME: number?
-#: apt-pkg/tagfile.cc:102
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+#: cmdline/apt-get.cc:862
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"

 
 

-#: apt-pkg/tagfile.cc:189
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
+#: cmdline/apt-get.cc:877 cmdline/apt-get.cc:880 cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2311
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"

 
 

-#: apt-pkg/sourcelist.cc:90
+#: cmdline/apt-get.cc:890

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+msgid "You don't have enough free space in %s."
+msgstr "Does dim digon o le rhydd gennych yn %s."

 
 

-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:926
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."

 
 

-#: apt-pkg/sourcelist.cc:95
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+#: cmdline/apt-get.cc:908
+msgid "Yes, do as I say!"
+msgstr "Ie, gwna fel rydw i'n dweud!"

 
 

-#: apt-pkg/sourcelist.cc:101
+#: cmdline/apt-get.cc:910

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-
-#: apt-pkg/sourcelist.cc:108
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "

 msgstr ""
 msgstr ""

-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
+"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
+" ?]"

 
 

-#: apt-pkg/sourcelist.cc:199
-#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
+#: cmdline/apt-get.cc:916 cmdline/apt-get.cc:935
+msgid "Abort."
+msgstr "Erthylu."

 
 

-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+#: cmdline/apt-get.cc:931
+#, fuzzy
+msgid "Do you want to continue [Y/n]? "
+msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "

 
 

-#: apt-pkg/sourcelist.cc:236
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2364 apt-pkg/algorithms.cc:1435

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+msgid "Failed to fetch %s  %s\n"
+msgstr "Methwyd cyrchu %s  %s\n"

 
 

-#: apt-pkg/sourcelist.cc:240
-#, fuzzy, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+#: cmdline/apt-get.cc:1021
+msgid "Some files failed to download"
+msgstr "Methodd rhai ffeiliau lawrlwytho"

 
 

-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
-#, fuzzy, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: cmdline/apt-get.cc:1022 cmdline/apt-get.cc:2373
+msgid "Download complete and in download only mode"
+msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"

 
 

-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:399
-#, c-format
+#: cmdline/apt-get.cc:1028

 msgid ""
 msgid ""

-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
-"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
-"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-
-#: apt-pkg/pkgrecords.cc:32
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-
-#: apt-pkg/algorithms.cc:247
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"

 msgstr ""
 msgstr ""

-"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
-"ei gyfer."
+"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
+"geidio defnyddio --fix-missing?"

 
 

-#: apt-pkg/algorithms.cc:1105
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
-"ei achosi gan pecynnau wedi eu dal."
+#: cmdline/apt-get.cc:1032
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"

 
 

-#: apt-pkg/algorithms.cc:1107
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
+#: cmdline/apt-get.cc:1037
+msgid "Unable to correct missing packages."
+msgstr "Ni ellir cywiro pecynnau ar goll."

 
 

-#: apt-pkg/acquire.cc:59
-#, c-format
-msgid "Lists directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+#: cmdline/apt-get.cc:1038
+#, fuzzy
+msgid "Aborting install."
+msgstr "Yn Erthylu'r Sefydliad."

 
 

-#: apt-pkg/acquire.cc:63
+#: cmdline/apt-get.cc:1096

 #, c-format
 #, c-format

-msgid "Archive directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
+msgid "Note, selecting %s instead of %s\n"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"

 
 

-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:827
+#: cmdline/apt-get.cc:1107

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+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"

 
 

-#: apt-pkg/acquire.cc:829
+#: cmdline/apt-get.cc:1117

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Retrieving file %li of %li"
-msgstr "Yn Darllen Rhestr Ffeiliau"
+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"

 
 

-#: apt-pkg/acquire-worker.cc:110
+#: cmdline/apt-get.cc:1135

 #, c-format
 #, c-format

-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
+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"

 
 

-#: apt-pkg/acquire-worker.cc:159
+#: cmdline/apt-get.cc:1146

 #, c-format
 #, c-format

-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
-
-#: apt-pkg/acquire-worker.cc:398
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"

 
 

-#: apt-pkg/init.cc:124
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
+#: cmdline/apt-get.cc:1159
+msgid " [Installed]"
+msgstr " [Sefydliwyd]"

 
 

-#: apt-pkg/init.cc:140
+#: cmdline/apt-get.cc:1168

 #, fuzzy
 #, fuzzy

-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
-
-#: apt-pkg/clean.cc:57
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
+msgid " [Not candidate version]"
+msgstr "Fersiynau Posib"

 
 

-# FIXME: ...file
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
+#: cmdline/apt-get.cc:1170
+msgid "You should explicitly select one to install."
+msgstr "Dylech ddewis un yn benodol i'w sefydlu."

 
 

-#: apt-pkg/cachefile.cc:63
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
+# FIXME: punctuation
+#: cmdline/apt-get.cc:1175
+#, fuzzy, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
+"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
+"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
+"ffeil sources.list.\n"

 
 

-#: apt-pkg/cachefile.cc:69
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
+#: cmdline/apt-get.cc:1194
+msgid "However the following packages replace it:"
+msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"

 
 

-#: apt-pkg/cachefile.cc:73
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
+#: cmdline/apt-get.cc:1197
+#, c-format
+msgid "Package %s has no installation candidate"
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"

 
 

-# FIXME: literal
-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
-msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
+#: cmdline/apt-get.cc:1217
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"

 
 

-# FIXME: tense
-#: apt-pkg/policy.cc:289
+#: cmdline/apt-get.cc:1225

 #, c-format
 #, c-format

-msgid "Did not understand pin type %s"
-msgstr "Methwyd daeall y math pin %s"
+msgid "%s is already the newest version.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: apt-pkg/policy.cc:297
-msgid "No priority (or zero) specified for pin"
-msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
+#: cmdline/apt-get.cc:1254
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"

 
 

-#: apt-pkg/pkgcachegen.cc:72
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
+#: cmdline/apt-get.cc:1256
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "

 
 

-#: apt-pkg/pkgcachegen.cc:115
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
+#: cmdline/apt-get.cc:1262
+#, c-format
+msgid "Selected version %s (%s) for %s\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"

 
 

-#: apt-pkg/pkgcachegen.cc:130
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
+#: cmdline/apt-get.cc:1363
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""

 
 

-#: apt-pkg/pkgcachegen.cc:153
+#: cmdline/apt-get.cc:1395

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"

 
 

-#: apt-pkg/pkgcachegen.cc:178
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1433
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""

 
 

-#: apt-pkg/pkgcachegen.cc:182
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+#: cmdline/apt-get.cc:1449
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"

 
 

-#: apt-pkg/pkgcachegen.cc:213
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
+#: cmdline/apt-get.cc:1514
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""

 
 

-#: apt-pkg/pkgcachegen.cc:217
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+#: cmdline/apt-get.cc:1562
+#, fuzzy
+msgid ""
+"The following package is automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"

 
 

-#: apt-pkg/pkgcachegen.cc:221
+#: cmdline/apt-get.cc:1566

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
+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:"

 
 

-#: apt-pkg/pkgcachegen.cc:245
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+#: cmdline/apt-get.cc:1568
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""

 
 

-#: apt-pkg/pkgcachegen.cc:251
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: cmdline/apt-get.cc:1573
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."

 msgstr ""
 msgstr ""

-"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."

 
 

-#: apt-pkg/pkgcachegen.cc:254
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1576 cmdline/apt-get.cc:1871
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"

 
 

-#: apt-pkg/pkgcachegen.cc:257
+#: cmdline/apt-get.cc:1580

 #, fuzzy
 #, fuzzy

-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-
-#: apt-pkg/pkgcachegen.cc:260
-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."
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"

 
 

-#: apt-pkg/pkgcachegen.cc:288
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+#: cmdline/apt-get.cc:1599
+#, fuzzy
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"

 
 

-#: apt-pkg/pkgcachegen.cc:301
+#: cmdline/apt-get.cc:1654

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+msgid "Couldn't find task %s"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: apt-pkg/pkgcachegen.cc:307
+#: cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1808

 #, c-format
 #, c-format

-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+msgid "Couldn't find package %s"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: apt-pkg/pkgcachegen.cc:678
+#: cmdline/apt-get.cc:1795

 #, c-format
 #, c-format

-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+msgid "Note, selecting %s for regex '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"

 
 

-#. Build the status cache
-#: apt-pkg/pkgcachegen.cc:748 apt-pkg/pkgcachegen.cc:817
-#: apt-pkg/pkgcachegen.cc:822 apt-pkg/pkgcachegen.cc:945
-#, fuzzy
-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
+#: cmdline/apt-get.cc:1828
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-pkg/pkgcachegen.cc:763
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
+#: cmdline/apt-get.cc:1841
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"

 
 

-#: apt-pkg/pkgcachegen.cc:815
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
+# FIXME
+#: cmdline/apt-get.cc:1844
+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)"

 
 

-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+# FIXME: needs commas
+#: cmdline/apt-get.cc:1856
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"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."

 
 

-#: apt-pkg/acquire-item.cc:127
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
+#: cmdline/apt-get.cc:1874
+msgid "Broken packages"
+msgstr "Pecynnau wedi torri"

 
 

-#: apt-pkg/acquire-item.cc:401
-msgid "MD5Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
+#: cmdline/apt-get.cc:1903
+msgid "The following extra packages will be installed:"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"

 
 

-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1399
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
+#: cmdline/apt-get.cc:1992
+msgid "Suggested packages:"
+msgstr "Pecynnau a awgrymmir:"

 
 

-#: apt-pkg/acquire-item.cc:1091
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
+#: cmdline/apt-get.cc:1993
+msgid "Recommended packages:"
+msgstr "Pecynnau a argymhellir:"

 
 

-# FIXME: case
-#: apt-pkg/acquire-item.cc:1204
-#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-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.)"
+#: cmdline/apt-get.cc:2022
+#, fuzzy
+msgid "Calculating upgrade... "
+msgstr "Yn Cyfrifo'r Uwchraddiad... "
+
+#: cmdline/apt-get.cc:2025 methods/ftp.cc:708 methods/connect.cc:112
+msgid "Failed"
+msgstr "Methwyd"

 
 

-#: apt-pkg/acquire-item.cc:1263
+#: cmdline/apt-get.cc:2030
+msgid "Done"
+msgstr "Wedi Gorffen"
+
+#: cmdline/apt-get.cc:2097 cmdline/apt-get.cc:2105
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc:2129 cmdline/apt-get.cc:2162
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+
+#: cmdline/apt-get.cc:2205
+msgid "Must specify at least one package to fetch source for"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
+#: cmdline/apt-get.cc:2237 cmdline/apt-get.cc:2489

 #, c-format
 #, c-format

-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
-msgstr ""
-"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
-"drwsio'r pecyn hyn a law."
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
+
+#: cmdline/apt-get.cc:2286
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"

 
 

-#: apt-pkg/acquire-item.cc:1304
+#: cmdline/apt-get.cc:2321

 #, c-format
 #, 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."
+msgid "You don't have enough free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"

 
 

-#: apt-pkg/acquire-item.cc:1391
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
+#: cmdline/apt-get.cc:2327
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"

 
 

-#: apt-pkg/vendorlist.cc:66
+#: cmdline/apt-get.cc:2330

 #, c-format
 #, c-format

-msgid "Vendor block %s contains no fingerprint"
-msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+msgid "Need to get %sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+
+#: cmdline/apt-get.cc:2336
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
+msgstr "Cyrchu Ffynhonell %s\n"
+
+#: cmdline/apt-get.cc:2369
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."

 
 

-#: apt-pkg/cdrom.cc:529
+#: cmdline/apt-get.cc:2398

 #, c-format
 #, c-format

-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"

 
 

-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620
-msgid "Identifying.. "
-msgstr ""
+#: cmdline/apt-get.cc:2410
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"

 
 

-#: apt-pkg/cdrom.cc:563
+#: cmdline/apt-get.cc:2411

 #, c-format
 #, c-format

-msgid "Stored label: %s\n"
+msgid "Check if the 'dpkg-dev' package is installed.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:583
+#: cmdline/apt-get.cc:2428

 #, c-format
 #, c-format

-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
+msgid "Build command '%s' failed.\n"
+msgstr "Methodd y gorchymyn adeiladu '%s'.\n"

 
 

-#: apt-pkg/cdrom.cc:601
-msgid "Unmounting CD-ROM\n"
+#: cmdline/apt-get.cc:2448
+msgid "Child process failed"
+msgstr "Methodd proses plentyn"
+
+#: cmdline/apt-get.cc:2464
+msgid "Must specify at least one package to check builddeps for"

 msgstr ""
 msgstr ""

+"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"

 
 

-#: apt-pkg/cdrom.cc:605
-#, fuzzy
-msgid "Waiting for disc...\n"
-msgstr "Yn aros am benawdau"
+#: cmdline/apt-get.cc:2494
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"

 
 

-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:613
-msgid "Mounting CD-ROM...\n"
-msgstr ""
+#: cmdline/apt-get.cc:2514
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"

 
 

-#: apt-pkg/cdrom.cc:631
-msgid "Scanning disc for index files..\n"
+#: cmdline/apt-get.cc:2566
+#, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"

 msgstr ""
 msgstr ""

+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
+"s"

 
 

-#: apt-pkg/cdrom.cc:671
+#: cmdline/apt-get.cc:2619

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Found %u package indexes, %u source indexes, %u translation indexes and %u "
-"signatures\n"
+"%s dependency for %s cannot be satisfied because no available versions of "
+"package %s can satisfy version requirements"

 msgstr ""
 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"

 
 

-#: apt-pkg/cdrom.cc:708
+#: cmdline/apt-get.cc:2655

 #, c-format
 #, c-format

-msgid "Found label '%s'\n"
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"

 msgstr ""
 msgstr ""

+"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
+"newydd"

 
 

-#: apt-pkg/cdrom.cc:737
-msgid "That is not a valid name, try again.\n"
-msgstr ""
+#: cmdline/apt-get.cc:2682
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"

 
 

-#: apt-pkg/cdrom.cc:753
+#: cmdline/apt-get.cc:2698

 #, c-format
 #, c-format

-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
+
+#: cmdline/apt-get.cc:2703
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"

 
 

-#: apt-pkg/cdrom.cc:757
+#: cmdline/apt-get.cc:2734

 #, fuzzy
 #, fuzzy

-msgid "Copying package lists..."
-msgstr "Yn Darllen Rhestrau Pecynnau"
+msgid "Supported modules:"
+msgstr "Modylau a Gynhelir:"

 
 

-#: apt-pkg/cdrom.cc:783
+# FIXME: split
+#: cmdline/apt-get.cc:2775

 #, fuzzy
 #, fuzzy

-msgid "Writing new source list\n"
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+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"
+"\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"

 
 

-#: apt-pkg/cdrom.cc:792
-msgid "Source list entries for this disc are:\n"
+#: cmdline/apt-get.cc:2944
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:834
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
+#: cmdline/acqprogress.cc:55
+msgid "Hit "
+msgstr "Presennol "

 
 

-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
+#: cmdline/acqprogress.cc:79
+msgid "Get:"
+msgstr "Cyrchu:"

 
 

-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+#: cmdline/acqprogress.cc:110
+msgid "Ign "
+msgstr "Anwybyddu "

 
 

-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+#: cmdline/acqprogress.cc:114
+msgid "Err "
+msgstr "Gwall "

 
 

-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: cmdline/acqprogress.cc:135

 #, c-format
 #, c-format

-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"

 
 

-#: apt-pkg/deb/dpkgpm.cc:510
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+#: cmdline/acqprogress.cc:225
+#, c-format
+msgid " [Working]"
+msgstr " [Gweithio]"

 
 

-#: apt-pkg/deb/dpkgpm.cc:572
+#: cmdline/acqprogress.cc:271

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Preparing %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/deb/dpkgpm.cc:573
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Yn agor %s"
+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"

 
 

-#: apt-pkg/deb/dpkgpm.cc:578
-#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#: cmdline/apt-sortpkgs.cc:86
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"

 
 

-#: apt-pkg/deb/dpkgpm.cc:579
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Yn cysylltu i %s"
+#: cmdline/apt-sortpkgs.cc:150
+#, fuzzy
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
+"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -s   Defnyddio trefnu ffeil ffynhonell\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"

 
 

-#: apt-pkg/deb/dpkgpm.cc:581 apt-pkg/deb/dpkgpm.cc:582
-#, fuzzy, c-format
-msgid "Processing triggers for %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+#: dselect/install:32
+msgid "Bad default setting!"
+msgstr "Rhagosodiad gwael!"

 
 

-#: apt-pkg/deb/dpkgpm.cc:584
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Wedi Sefydlu: "
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Gwasgwch Enter er mwyn mynd ymlaen."

 
 

-#: apt-pkg/deb/dpkgpm.cc:589 apt-pkg/deb/dpkgpm.cc:591
-#: apt-pkg/deb/dpkgpm.cc:592
-#, c-format
-msgid "Preparing for removal of %s"
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:594
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/deb/dpkgpm.cc:595
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Argymell"
+#: dselect/install:101
+#, fuzzy
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"

 
 

-#: apt-pkg/deb/dpkgpm.cc:600
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#: dselect/install:102
+#, fuzzy
+msgid "will be configured. This may result in duplicate errors"
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:601
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
+#: dselect/install:103
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"

 
 

-#: apt-pkg/deb/dpkgpm.cc:749
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: dselect/install:104
+msgid ""
+"above this message are important. Please fix them and run [I]nstall again"

 msgstr ""
 msgstr ""

+"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
+"eto."

 
 

-#: methods/rred.cc:219
+#: dselect/update:30

 #, fuzzy
 #, fuzzy

-msgid "Could not patch file"
-msgstr "Methwyd agor ffeil %s"
-
-#: methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Methwyd creu pibell cyfathrebu at isbroses"
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
+msgid "Merging available information"
+msgstr "Yn cyfuno manylion Ar Gael"

 
 #: apt-inst/contrib/extracttar.cc:114
 msgid "Failed to create pipes"
 
 #: apt-inst/contrib/extracttar.cc:114
 msgid "Failed to create pipes"


@@ -1285,7 +1546,12 @@ msgstr "Llofnod archif annilys"
 msgid "Error reading archive member header"
 msgstr "Gwall wrth ddarllen pennawd aelod archif"
 
 msgid "Error reading archive member header"
 msgstr "Gwall wrth ddarllen pennawd aelod archif"
 

-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:90
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:102

 msgid "Invalid archive member header"
 msgstr "Pennawd aelod archif annilys"
 
 msgid "Invalid archive member header"
 msgstr "Pennawd aelod archif annilys"
 


@@ -1364,11 +1630,6 @@ msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
 msgid "The diversion path is too long"
 msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 
 msgid "The diversion path is too long"
 msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 

-#: apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
-

 #: apt-inst/extract.cc:240
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 #: apt-inst/extract.cc:240
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"


@@ -1394,6 +1655,16 @@ msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 

+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
+#: apt-pkg/contrib/fileutl.cc:287 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:92
+#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:296
+#, c-format
+msgid "Unable to read %s"
+msgstr "Ni ellir darllen %s"
+

 #: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"
 #: apt-inst/extract.cc:491
 #, c-format
 msgid "Unable to stat %s"


@@ -1418,6 +1689,14 @@ msgstr "Methwyd stat() ar %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
 
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
 

+#. Build the status cache
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:947
+#: apt-pkg/pkgcachegen.cc:1032 apt-pkg/pkgcachegen.cc:1037
+#: apt-pkg/pkgcachegen.cc:1181
+#, fuzzy
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+

 #: apt-inst/deb/dpkgdb.cc:176
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 #: apt-inst/deb/dpkgdb.cc:176
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"


@@ -1526,1439 +1805,1475 @@ msgstr "Methwyd lleoli ffeil rheoli dilys"
 msgid "Unparsable control file"
 msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
 msgid "Unparsable control file"
 msgstr "Ffeil rheoli ni ellir ei ramadegu"
 

-#: cmdline/apt-cache.cc:143
-#, c-format
-msgid "Package %s version %s has an unmet dep:\n"
-msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
-
-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: methods/cdrom.cc:199

 #, c-format
 #, c-format

-msgid "Unable to locate package %s"
-msgstr "Ni ellir lleoli'r pecyn %s"
-
-#: cmdline/apt-cache.cc:247
-#, fuzzy
-msgid "Total package names : "
-msgstr "Cyfanswm Enwau Pecynnau : "
+msgid "Unable to read the cdrom database %s"
+msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"

 
 

-#: cmdline/apt-cache.cc:287
+#: methods/cdrom.cc:208

 #, fuzzy
 #, fuzzy

-msgid "  Normal packages: "
-msgstr "  Pecynnau Normal: "
+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."

 
 

-#: cmdline/apt-cache.cc:288
+#: methods/cdrom.cc:218

 #, fuzzy
 #, fuzzy

-msgid "  Pure virtual packages: "
-msgstr "  Pecynnau Cwbl Rhithwir: "
+msgid "Wrong CD-ROM"
+msgstr "CD Anghywir"

 
 

-#: cmdline/apt-cache.cc:289
-#, fuzzy
-msgid "  Single virtual packages: "
-msgstr "  Pecynnau Rhithwir Sengl: "
+#: methods/cdrom.cc:245
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr ""
+"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."

 
 

-#: cmdline/apt-cache.cc:290
+#: methods/cdrom.cc:250

 #, fuzzy
 #, fuzzy

-msgid "  Mixed virtual packages: "
-msgstr "  Pecynnau Rhithwir Cymysg: "
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"

 
 

-#: cmdline/apt-cache.cc:291
-msgid "  Missing: "
-msgstr "  Ar Goll: "
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"

 
 

-#: cmdline/apt-cache.cc:293
-#, fuzzy
-msgid "Total distinct versions: "
-msgstr "Cyfanswm Fersiynau Gwahanol: "
+#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
+#: methods/rred.cc:483 methods/rred.cc:492
+msgid "Failed to stat"
+msgstr "Methwyd stat()"

 
 

-#: cmdline/apt-cache.cc:295
-#, fuzzy
-msgid "Total Distinct Descriptions: "
-msgstr "Cyfanswm Fersiynau Gwahanol: "
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"

 
 

-#: cmdline/apt-cache.cc:297
-#, fuzzy
-msgid "Total dependencies: "
-msgstr "Cyfanswm Dibyniaethau: "
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""

 
 

-#: cmdline/apt-cache.cc:300
-#, fuzzy
-msgid "Total ver/file relations: "
-msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:168
+msgid "Logging in"
+msgstr "Yn mewngofnodi"

 
 

-#: cmdline/apt-cache.cc:302
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+#: methods/ftp.cc:174
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"

 
 

-#: cmdline/apt-cache.cc:304
-#, fuzzy
-msgid "Total Provides mappings: "
-msgstr "Cyfanswm Mapiau Darpariath: "
+#: methods/ftp.cc:179
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"

 
 

-#: cmdline/apt-cache.cc:316
-#, fuzzy
-msgid "Total globbed strings: "
-msgstr "Cyfanswm Llinynau Glob: "
+#: methods/ftp.cc:210 methods/ftp.cc:238
+#, fuzzy, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"

 
 

-#: cmdline/apt-cache.cc:330
-#, fuzzy
-msgid "Total dependency version space: "
-msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
+#: methods/ftp.cc:216
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-cache.cc:335
-#, fuzzy
-msgid "Total slack space: "
-msgstr "Cyfanswm gofod Slac: "
+#: methods/ftp.cc:223
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-cache.cc:343
-#, fuzzy
-msgid "Total space accounted for: "
-msgstr "Cyfanswm Gofod Cyfrifwyd: "
+#: methods/ftp.cc:243
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
+"ProxyLogin yn wag.)"

 
 

-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+# FIXME
+#: methods/ftp.cc:271

 #, c-format
 #, c-format

-msgid "Package file %s is out of sync."
-msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-cache.cc:1293
-msgid "You must give exactly one pattern"
-msgstr "Rhaid i chi ddarparu un patrwm yn union"
+#: methods/ftp.cc:297
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-cache.cc:1447
-msgid "No packages found"
-msgstr "Canfuwyd dim pecyn"
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
+msgstr "Goramser cysylltu"

 
 

-#: cmdline/apt-cache.cc:1524
-#, fuzzy
-msgid "Package files:"
-msgstr "Ffeiliau Pecynnau:"
+#: methods/ftp.cc:341
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"

 
 

-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
-msgid "Cache is out of sync, can't x-ref a package file"
-msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:714 methods/rsh.cc:190
+msgid "Read error"
+msgstr "Gwall darllen"

 
 

-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
+#: methods/ftp.cc:351 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."

 
 

-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1544
-#, fuzzy
-msgid "Pinned packages:"
-msgstr "Pecynnau wedi eu Pinio:"
+#: methods/ftp.cc:368 methods/ftp.cc:380
+msgid "Protocol corruption"
+msgstr "Llygr protocol"

 
 

-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
-msgid "(not found)"
-msgstr "(heb ganfod)"
-
-#. Installed version
-#: cmdline/apt-cache.cc:1577
-msgid "  Installed: "
-msgstr "  Wedi Sefydlu: "
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:232
+msgid "Write error"
+msgstr "Gwall ysgrifennu"

 
 

-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
-msgid "(none)"
-msgstr "(dim)"
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"

 
 

-#. Candidate Version
-#: cmdline/apt-cache.cc:1584
-msgid "  Candidate: "
-msgstr "  Ymgeisydd: "
+#: methods/ftp.cc:704
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"

 
 

-#: cmdline/apt-cache.cc:1594
+#: methods/ftp.cc:710

 #, fuzzy
 #, fuzzy

-msgid "  Package pin: "
-msgstr "  Pin Pecyn: "
+msgid "Could not connect passive socket."
+msgstr "Methwyd cysylltu soced goddefol"

 
 

-#. Show the priority tables
-#: cmdline/apt-cache.cc:1603
-#, fuzzy
-msgid "  Version table:"
-msgstr "  Tabl Fersiynnau:"
+# FIXME
+#: methods/ftp.cc:728
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"
+
+#: methods/ftp.cc:742
+msgid "Could not bind a socket"
+msgstr "Methwyd rhwymo soced"
+
+#: methods/ftp.cc:746
+msgid "Could not listen on the socket"
+msgstr "Methwyd gwrando ar y soced"
+
+#: methods/ftp.cc:753
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"

 
 

-#: cmdline/apt-cache.cc:1618
+#: methods/ftp.cc:785
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"
+
+#: methods/ftp.cc:795

 #, c-format
 #, c-format

-msgid "       %4i %s\n"
-msgstr "       %4i %s\n"
+msgid "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"

 
 

-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2588 cmdline/apt-sortpkgs.cc:144
-#, fuzzy, c-format
-msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
+#: methods/ftp.cc:804
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-cache.cc:1721
-#, fuzzy
-msgid ""
-"Usage: apt-cache [options] command\n"
-"       apt-cache [options] add file1 [file2 ...]\n"
-"       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
-"       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
-"\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
-"\n"
-"Commands:\n"
-"   add - Add a package file to the source cache\n"
-"   gencaches - Build both the package and source cache\n"
-"   showpkg - Show some general information for a single package\n"
-"   showsrc - Show source records\n"
-"   stats - Show some basic statistics\n"
-"   dump - Show the entire file in a terse form\n"
-"   dumpavail - Print an available file to stdout\n"
-"   unmet - Show unmet dependencies\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphVis\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -p=? The package cache.\n"
-"  -s=? The source cache.\n"
-"  -q   Disable progress indicator.\n"
-"  -i   Show only important deps for the unmet command.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-msgstr ""
-"Defnydd: apt-cache [opsiynnau] gorchymyn\n"
-"         apt-cache [opsiynnau] add ffeil1 [ffeil2 ...]\n"
-"         apt-cache [opsiynnau] showpkg pecyn1 [pecyn2 ...]\n"
-"         apt-cache [opsiynnau] showsrc pecyn1 [pecyn2 ...]\n"
-"\n"
-"Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa "
-"deuol APT, ac ymholi gwybodaeth ohonynt\n"
-"\n"
-"Gorchmynion:\n"
-"   add - Ychwanegu ffeil pecyn i'r storfa ffynhonell\n"
-"   gencaches - Adeiladu'r storfeydd pecyn a ffynhonell\n"
-"   showpkg - Dangos gwybodaeth cyffredinol am becyn sengl\n"
-"   showsrc - Dangos cofnodion ffynhonell\n"
-"   stats - Dangos rhyw ystadegau sylfaenol\n"
-"   dump - Dangos y ffeil cyfan mewn ffurf syml\n"
-"   dumpavail - Dangos ffeil argaeledd\n"
-"   unmet - Dangos dibyniaethau heb eu darparu\n"
-"   search - Search the package list for a regex pattern\n"
-"   show - Show a readable record for the package\n"
-"   depends - Show raw dependency information for a package\n"
-"   rdepends - Show reverse dependency information for a package\n"
-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphVis\n"
-"   xvcg - Generate package graphs for xvcg\n"
-"   policy - Show policy settings\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -p=? The package cache.\n"
-"  -s=? The source cache.\n"
-"  -q   Disable progress indicator.\n"
-"  -i   Show only important deps for the unmet command.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
+#: methods/ftp.cc:824
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"

 
 

-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
-msgstr ""
+#: methods/ftp.cc:831
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"

 
 

-#: cmdline/apt-cdrom.cc:93
-#, fuzzy
-msgid "Please insert a Disc in the drive and press enter"
-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/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"

 
 

-#: cmdline/apt-cdrom.cc:117
-msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+#: methods/ftp.cc:883
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"

 
 

-#: cmdline/apt-config.cc:41
-msgid "Arguments not in pairs"
-msgstr "Nid yw ymresymiadau mewn parau"
+#: methods/ftp.cc:898 methods/rsh.cc:322
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"

 
 

-#: cmdline/apt-config.cc:76
-#, fuzzy
-msgid ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-config [opsiynnau] gorchymyn\n"
-"\n"
-"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
-"\n"
-"Gorchmynion:\n"
-"   shell - Modd plisgyn\n"
-"   dump - Dangod y cyfluniad\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -c=? Darllen y ffeil cyfluniad\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+#: methods/ftp.cc:928
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"

 
 

-#: cmdline/apt-extracttemplates.cc:98
+#. Get the files information
+#: methods/ftp.cc:1005
+msgid "Query"
+msgstr "Ymholiad"
+
+# FIXME
+#: methods/ftp.cc:1117
+msgid "Unable to invoke "
+msgstr "Methwyd gweithredu "
+
+#: methods/connect.cc:70

 #, c-format
 #, c-format

-msgid "%s not a valid DEB package."
-msgstr "Nid yw %s yn becyn DEB dilys."
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"

 
 

-# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:232
-#, fuzzy
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-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"
+#: methods/connect.cc:81
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"

 
 

-#: cmdline/apt-extracttemplates.cc:310
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+#: methods/connect.cc:90
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"

 
 

-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
-msgid "Package extension list is too long"
-msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
+#: methods/connect.cc:96
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."

 
 

-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
-#, fuzzy, c-format
-msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+#: methods/connect.cc:104
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"

 
 

-#: ftparchive/apt-ftparchive.cc:251
-msgid "Source extension list is too long"
-msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+#: methods/connect.cc:122
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."

 
 

-#: ftparchive/apt-ftparchive.cc:368
-msgid "Error writing header to contents file"
-msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:150 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"
+
+#: methods/connect.cc:169 methods/connect.cc:188
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"
+
+#: methods/connect.cc:194
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"

 
 

-#: ftparchive/apt-ftparchive.cc:398
+#: methods/connect.cc:197

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"

 
 

-# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:553
-#, 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"
+#: methods/connect.cc:244
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Methwyd cysylltu i %s %s:"
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."

 msgstr ""
 msgstr ""

-"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
-"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
-"             sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
-"             contents llwybr\n"
-"             release llwybr\n"
-"             generate cyfluniad [grŵpiau]\n"
-"             clean cyfluniad\n"
-"\n"
-"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
-"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
-"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
-"\n"
-"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
-"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
-"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
-"gorfodi'r gwerthoedd Priority a Section.\n"
-"\n"
-"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
-".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
-"gwrthwneud ffynhonell.\n"
-"\n"
-"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
-"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
-"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
-"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
-"defnydd o'r archif Debian:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opsiynnau:\n"
-"  -h          Y testun cymorth hwn\n"
-"  --md5       Rheoli cynhyrchiad stwnch MD5\n"
-"  -s=?        Ffeil gwrthwneud ffynhonell\n"
-"  -q          Tawel\n"
-"  -d=?        Dewis cronda data storfa opsiynnol\n"
-"  --no-delink Galluogi'r modd datgysylltu datnamu\n"
-"  --contents  Rheoli cynhyrchiad ffeil cynnwys\n"
-"  -c=?        Darllen y ffeil cyfluniad hwn\n"
-"  -o=?        Gosod opsiwn cyfluniad mympwyol"

 
 

-#: ftparchive/apt-ftparchive.cc:759
-msgid "No selections matched"
-msgstr "Dim dewisiadau'n cyfateb"
+#: methods/gpgv.cc:121
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""

 
 

-#: ftparchive/apt-ftparchive.cc:832
+#: methods/gpgv.cc:237
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+
+#: methods/gpgv.cc:242
+msgid "At least one invalid signature was encountered."
+msgstr ""
+
+#: methods/gpgv.cc:246

 #, c-format
 #, 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'"
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr ""

 
 

-#: ftparchive/cachedb.cc:43
+#: methods/gpgv.cc:251
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#, fuzzy
+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+
+#: methods/gpgv.cc:299
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+
+#: methods/gzip.cc:64

 #, c-format
 #, c-format

-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+msgid "Couldn't open pipe for %s"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: methods/gzip.cc:109
+#, c-format
+msgid "Read error from %s process"
+msgstr "Gwall darllen o broses %s"
+
+#: methods/http.cc:385
+msgid "Waiting for headers"
+msgstr "Yn aros am benawdau"
+
+#: methods/http.cc:531
+#, c-format
+msgid "Got a single header line over %u chars"
+msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+
+#: methods/http.cc:539
+msgid "Bad header line"
+msgstr "Llinell pennawd gwael"
+
+#: methods/http.cc:558 methods/http.cc:565
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+
+#: methods/http.cc:594
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+
+#: methods/http.cc:609
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+
+#: methods/http.cc:611
+#, fuzzy
+msgid "This HTTP server has broken range support"
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+
+#: methods/http.cc:635
+msgid "Unknown date format"
+msgstr "Fformat dyddiad anhysbys"
+
+#: methods/http.cc:793
+msgid "Select failed"
+msgstr "Methwyd dewis"
+
+#: methods/http.cc:798
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"
+
+#: methods/http.cc:821
+msgid "Error writing to output file"
+msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+
+#: methods/http.cc:852
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"
+
+#: methods/http.cc:880
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"
+
+#: methods/http.cc:894
+#, fuzzy
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+
+#: methods/http.cc:896
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"
+
+#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: methods/http.cc:1156
+#, fuzzy
+msgid "Bad header data"
+msgstr "Data pennawd gwael"
+
+#: methods/http.cc:1173 methods/http.cc:1228
+msgid "Connection failed"
+msgstr "Methodd y cysylltiad"
+
+#: methods/http.cc:1320
+msgid "Internal error"
+msgstr "Gwall mewnol"
+
+#: apt-pkg/contrib/mmap.cc:77
+msgid "Can't mmap an empty file"
+msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+
+#: apt-pkg/contrib/mmap.cc:89
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/mmap.cc:124
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ni ellir agor %s"
+
+# FIXME
+#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Methwyd gweithredu "
+
+#: apt-pkg/contrib/mmap.cc:300
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:395
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:371
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:378
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:385
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:390
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1083
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
+
+#: apt-pkg/contrib/configuration.cc:452
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"
+
+#: apt-pkg/contrib/configuration.cc:510
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/contrib/configuration.cc:678
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
+
+# FIXME
+#: apt-pkg/contrib/configuration.cc:697
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+
+#: apt-pkg/contrib/configuration.cc:714
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
+
+#: apt-pkg/contrib/configuration.cc:754
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
+
+#: apt-pkg/contrib/configuration.cc:761
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+
+#: apt-pkg/contrib/configuration.cc:774
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+
+#: apt-pkg/contrib/configuration.cc:777
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
+
+#: apt-pkg/contrib/configuration.cc:827
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
+
+#: apt-pkg/contrib/progress.cc:153
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"
+
+#: apt-pkg/contrib/progress.cc:155
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"
+
+# FIXME
+#: apt-pkg/contrib/cmndline.cc:77
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+
+#: apt-pkg/contrib/cmndline.cc:124
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+
+#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#, 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
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+
+#: apt-pkg/contrib/cmndline.cc:236
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+
+#: apt-pkg/contrib/cmndline.cc:267
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"
+
+# FIXME: 'Sense'?
+#: 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:350
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"
+
+#: apt-pkg/contrib/cdromutl.cc:52
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"

 
 

-#: ftparchive/cachedb.cc:61
+#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
+#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39

 #, c-format
 #, c-format

-msgid "DB is old, attempting to upgrade %s"
-msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
+msgid "Unable to change to %s"
+msgstr "Ni ellir newid i %s"

 
 

-#: ftparchive/cachedb.cc:72
-msgid ""
-"DB format is invalid. If you upgraded from a older version of apt, please "
-"remove and re-create the database."
-msgstr ""
+#: apt-pkg/contrib/cdromutl.cc:204
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"

 
 

-#: ftparchive/cachedb.cc:77
+#: apt-pkg/contrib/fileutl.cc:152

 #, c-format
 #, c-format

-msgid "Unable to open DB file %s: %s"
-msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-
-#: ftparchive/cachedb.cc:238
-msgid "Archive has no control record"
-msgstr "Does dim cofnod rheoli gan yr archif"
+msgid "Not using locking for read only lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"

 
 

-#: ftparchive/cachedb.cc:444
-msgid "Unable to get a cursor"
-msgstr "Ni ellir cael cyrchydd"
+#: apt-pkg/contrib/fileutl.cc:157
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Methwyd agor y ffeil clo %s"

 
 

-#: ftparchive/writer.cc:76
+#: apt-pkg/contrib/fileutl.cc:175

 #, c-format
 #, c-format

-msgid "W: Unable to read directory %s\n"
-msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"

 
 

-#: ftparchive/writer.cc:81
+#: apt-pkg/contrib/fileutl.cc:179

 #, c-format
 #, c-format

-msgid "W: Unable to stat %s\n"
-msgstr "Rh: Ni ellir gwneud stat() o %s\n"
+msgid "Could not get lock %s"
+msgstr "Methwyd cael y clo %s"

 
 

-#: ftparchive/writer.cc:132
-msgid "E: "
-msgstr "G: "
+#: apt-pkg/contrib/fileutl.cc:615
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"

 
 

-#: ftparchive/writer.cc:134
-msgid "W: "
-msgstr "Rh: "
+#: apt-pkg/contrib/fileutl.cc:627
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Derbyniodd is-broses %s wall segmentu."

 
 

-#: ftparchive/writer.cc:141
-msgid "E: Errors apply to file "
-msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+#: apt-pkg/contrib/fileutl.cc:629
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Derbyniodd is-broses %s wall segmentu."

 
 

-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: apt-pkg/contrib/fileutl.cc:633

 #, c-format
 #, c-format

-msgid "Failed to resolve %s"
-msgstr "Methwyd datrys %s"
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Dychwelodd is-broses %s gôd gwall (%u)"

 
 

-#: ftparchive/writer.cc:170
-msgid "Tree walking failed"
-msgstr "Methwyd cerdded y goeden"
+#: apt-pkg/contrib/fileutl.cc:635
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Gorffenodd is-broses %s yn annisgwyl"

 
 

-#: ftparchive/writer.cc:195
+#: apt-pkg/contrib/fileutl.cc:679

 #, c-format
 #, c-format

-msgid "Failed to open %s"
-msgstr "Methwyd agor %s"
+msgid "Could not open file %s"
+msgstr "Methwyd agor ffeil %s"

 
 # FIXME
 
 # FIXME

-#: ftparchive/writer.cc:254
+#: apt-pkg/contrib/fileutl.cc:735

 #, c-format
 #, c-format

-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
+msgid "read, still have %lu to read but none left"
+msgstr "o hyd %lu i ddarllen ond dim ar ôl"

 
 

-#: ftparchive/writer.cc:262
+# FIXME
+#: apt-pkg/contrib/fileutl.cc:765

 #, c-format
 #, c-format

-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
+msgid "write, still have %lu to write but couldn't"
+msgstr "o hyd %lu i ysgrifennu ond methwyd"

 
 

-#: ftparchive/writer.cc:266
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
+#: apt-pkg/contrib/fileutl.cc:840
+msgid "Problem closing the file"
+msgstr "Gwall wrth gau'r ffeil"

 
 

-#: ftparchive/writer.cc:273
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
+#: apt-pkg/contrib/fileutl.cc:846
+msgid "Problem unlinking the file"
+msgstr "Gwall wrth dadgysylltu'r ffeil"

 
 

-#: ftparchive/writer.cc:283
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
+#: apt-pkg/contrib/fileutl.cc:857
+msgid "Problem syncing the file"
+msgstr "Gwall wrth gyfamseru'r ffeil"

 
 

-#: ftparchive/writer.cc:387
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
+#: apt-pkg/pkgcache.cc:139
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"

 
 

-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+#: apt-pkg/pkgcache.cc:145
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"

 
 

-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Cynaliwr %s yw %s nid %s\n"
+#: apt-pkg/pkgcache.cc:150
+msgid "The package cache file is an incompatible version"
+msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"

 
 

-#: ftparchive/writer.cc:620
+# FIXME: capitalisation?
+#: apt-pkg/pkgcache.cc:155

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "  %s has no source override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"

 
 

-#: ftparchive/writer.cc:624
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+#: apt-pkg/pkgcache.cc:160
+msgid "The package cache was built for a different architecture"
+msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"

 
 

-#: ftparchive/contents.cc:317
-#, fuzzy, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+#: apt-pkg/pkgcache.cc:287
+msgid "Depends"
+msgstr "Dibynnu"

 
 

-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
+#: apt-pkg/pkgcache.cc:287
+msgid "PreDepends"
+msgstr "CynDdibynnu"

 
 

-#: ftparchive/override.cc:34 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "Ni ellir agor %s"
+#: apt-pkg/pkgcache.cc:287
+msgid "Suggests"
+msgstr "Awgrymu"

 
 

-#: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+#: apt-pkg/pkgcache.cc:288
+msgid "Recommends"
+msgstr "Argymell"

 
 

-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+#: apt-pkg/pkgcache.cc:288
+msgid "Conflicts"
+msgstr "Gwrthdaro"

 
 

-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+#: apt-pkg/pkgcache.cc:288
+msgid "Replaces"
+msgstr "Amnewid"

 
 

-#: 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"
+#: apt-pkg/pkgcache.cc:289
+msgid "Obsoletes"
+msgstr "Darfodi"

 
 

-#: ftparchive/multicompress.cc:71
-#, fuzzy, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
+#: apt-pkg/pkgcache.cc:289
+msgid "Breaks"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:101
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+#: apt-pkg/pkgcache.cc:289
+msgid "Enhances"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:194
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
+#: apt-pkg/pkgcache.cc:300
+msgid "important"
+msgstr "pwysig"

 
 

-#: ftparchive/multicompress.cc:197
-msgid "Failed to fork"
-msgstr "Methodd fork()"
+#: apt-pkg/pkgcache.cc:300
+msgid "required"
+msgstr "angenrheidiol"

 
 

-#: ftparchive/multicompress.cc:211
-#, fuzzy
-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+#: apt-pkg/pkgcache.cc:300
+msgid "standard"
+msgstr "safonnol"

 
 

-#: ftparchive/multicompress.cc:234
-#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+#: apt-pkg/pkgcache.cc:301
+msgid "optional"
+msgstr "opsiynnol"

 
 

-#: ftparchive/multicompress.cc:285
-msgid "Failed to create subprocess IPC"
-msgstr "Methwyd creu isbroses IPC"
+#: apt-pkg/pkgcache.cc:301
+msgid "extra"
+msgstr "ychwanegol"

 
 

-#: ftparchive/multicompress.cc:320
-msgid "Failed to exec compressor "
-msgstr "Methwyd gweithredu cywasgydd "
+#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"

 
 

-#: ftparchive/multicompress.cc:359
-msgid "decompressor"
-msgstr "datgywasgydd"
+#: apt-pkg/depcache.cc:125
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"

 
 

-#: ftparchive/multicompress.cc:402
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
+#: apt-pkg/depcache.cc:154
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"

 
 

-#: ftparchive/multicompress.cc:454
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"

 
 

-#: ftparchive/multicompress.cc:471
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
+#: apt-pkg/depcache.cc:236
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"

 
 

-#: cmdline/apt-get.cc:121
-msgid "Y"
-msgstr "I"
+#: apt-pkg/depcache.cc:242
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"

 
 

-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1673
+#: apt-pkg/depcache.cc:851

 #, c-format
 #, c-format

-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
-
-#: cmdline/apt-get.cc:238
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+msgid "Internal error, group '%s' has no installable pseudo package"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:328
+# FIXME: number?
+#: apt-pkg/tagfile.cc:102

 #, c-format
 #, c-format

-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
+msgid "Unable to parse package file %s (1)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"

 
 

-#: cmdline/apt-get.cc:330
+#: apt-pkg/tagfile.cc:189

 #, c-format
 #, c-format

-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgid "Unable to parse package file %s (2)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"

 
 

-#: cmdline/apt-get.cc:337
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
+#: apt-pkg/sourcelist.cc:92
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: cmdline/apt-get.cc:339
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
+#: apt-pkg/sourcelist.cc:95
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"

 
 

-#: cmdline/apt-get.cc:342
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
+#: apt-pkg/sourcelist.cc:106
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: cmdline/apt-get.cc:342
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: cmdline/apt-get.cc:347
-msgid " or"
-msgstr " neu"
+#: apt-pkg/sourcelist.cc:115
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:128
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"

 
 

-#: cmdline/apt-get.cc:376
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+#: apt-pkg/sourcelist.cc:130
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"

 
 

-#: cmdline/apt-get.cc:402
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+#: apt-pkg/sourcelist.cc:133
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"

 
 

-#: cmdline/apt-get.cc:424
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+#: apt-pkg/sourcelist.cc:139
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"

 
 

-#: cmdline/apt-get.cc:445
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+#: apt-pkg/sourcelist.cc:146
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: cmdline/apt-get.cc:466
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Opening %s"
+msgstr "Yn agor %s"

 
 

-#: cmdline/apt-get.cc:486
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."

 
 

-#: cmdline/apt-get.cc:539
+#: apt-pkg/sourcelist.cc:281

 #, c-format
 #, c-format

-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"

 
 

-#: cmdline/apt-get.cc:547
-#, fuzzy
+#: apt-pkg/sourcelist.cc:285
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:615
+#, c-format

 msgid ""
 msgid ""

-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"

 msgstr ""
 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:578
+# FIXME: %s may have an arbirrary length
+#: apt-pkg/packagemanager.cc:452

 #, c-format
 #, c-format

-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
+"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
+"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."

 
 

-#: cmdline/apt-get.cc:582
+#: apt-pkg/packagemanager.cc:495

 #, c-format
 #, c-format

-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""

 
 

-#: cmdline/apt-get.cc:584
+#: apt-pkg/pkgrecords.cc:32

 #, c-format
 #, c-format

-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"

 
 

-#: cmdline/apt-get.cc:586
+#: apt-pkg/algorithms.cc:292

 #, c-format
 #, c-format

-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
+"ei gyfer."

 
 

-#: cmdline/apt-get.cc:590
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
+#: apt-pkg/algorithms.cc:1182
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
+"ei achosi gan pecynnau wedi eu dal."

 
 

-#: cmdline/apt-get.cc:664
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
+#: apt-pkg/algorithms.cc:1184
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."

 
 

-#: cmdline/apt-get.cc:667
-msgid " failed."
-msgstr " wedi methu."
+#: apt-pkg/algorithms.cc:1461 apt-pkg/algorithms.cc:1463
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."

 
 

-#: cmdline/apt-get.cc:670
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
+#: apt-pkg/acquire.cc:79
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."

 
 

-#: cmdline/apt-get.cc:673
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
+#: apt-pkg/acquire.cc:83
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."

 
 

-#: cmdline/apt-get.cc:675
-msgid " Done"
-msgstr " Wedi Gorffen"
+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"

 
 

-#: cmdline/apt-get.cc:679
-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."
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:878
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:682
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+#: apt-pkg/acquire.cc:880
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"

 
 

-#: cmdline/apt-get.cc:704
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+#: apt-pkg/acquire-worker.cc:110
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."

 
 

-#: cmdline/apt-get.cc:708
-msgid "Authentication warning overridden.\n"
-msgstr ""
+#: apt-pkg/acquire-worker.cc:159
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"

 
 

-#: cmdline/apt-get.cc:715
-msgid "Install these packages without verification [y/N]? "
+#: apt-pkg/acquire-worker.cc:413
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."

 msgstr ""
 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-get.cc:717
-#, fuzzy
-msgid "Some packages could not be authenticated"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+#: apt-pkg/init.cc:135
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"

 
 

-#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+#: apt-pkg/init.cc:151
+#, fuzzy
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni ellir canfod math system addas"

 
 

-#: cmdline/apt-get.cc:770
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+#: apt-pkg/clean.cc:56
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."

 
 

-#: cmdline/apt-get.cc:779
-#, fuzzy
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc:44
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"

 
 

-#: cmdline/apt-get.cc:790
-#, fuzzy
-msgid "Internal error, Ordering didn't finish"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+#: apt-pkg/cachefile.cc:71
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."

 
 

-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2012 cmdline/apt-get.cc:2045
-msgid "Unable to lock the download directory"
-msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+#: apt-pkg/cachefile.cc:75
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."

 
 

-#: cmdline/apt-get.cc:831
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+# FIXME: literal
+#: apt-pkg/policy.cc:333
+#, fuzzy, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"

 
 

-#: cmdline/apt-get.cc:836
+# FIXME: tense
+#: apt-pkg/policy.cc:355

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"

 
 

-#: cmdline/apt-get.cc:839
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Mae angen cyrchu %sB o archifau.\n"
+#: apt-pkg/policy.cc:363
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"

 
 

-#: cmdline/apt-get.cc:844
-#, c-format
-msgid "After unpacking %sB of additional disk space will be used.\n"
-msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
+#: apt-pkg/pkgcachegen.cc:75
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"

 
 

-#: cmdline/apt-get.cc:847
-#, c-format
-msgid "After unpacking %sB disk space will be freed.\n"
-msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
+#: apt-pkg/pkgcachegen.cc:131
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewPackage)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"

 
 

-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2188
+#: apt-pkg/pkgcachegen.cc:146

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Couldn't determine free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
+msgid "Error occurred while processing %s (UsePackage1)"
+msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"

 
 

-#: cmdline/apt-get.cc:864
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Does dim digon o le rhydd gennych yn %s."
+#: apt-pkg/pkgcachegen.cc:180
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"

 
 

-#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
+#: apt-pkg/pkgcachegen.cc:210
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
+msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"

 
 

-#: cmdline/apt-get.cc:881
-msgid "Yes, do as I say!"
-msgstr "Ie, gwna fel rydw i'n dweud!"
+#: apt-pkg/pkgcachegen.cc:214
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"

 
 

-#: cmdline/apt-get.cc:883
+#: apt-pkg/pkgcachegen.cc:234

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+msgid "Error occurred while processing %s (NewVersion1)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
+
+#: apt-pkg/pkgcachegen.cc:238
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
+msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+
+#: apt-pkg/pkgcachegen.cc:242
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
+
+#: apt-pkg/pkgcachegen.cc:266
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."

 msgstr ""
 msgstr ""

-"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
-"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
-" ?]"
+"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."

 
 

-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
-msgid "Abort."
-msgstr "Erthylu."
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."

 
 

-#: cmdline/apt-get.cc:904
+#: apt-pkg/pkgcachegen.cc:279

 #, fuzzy
 #, fuzzy

-msgid "Do you want to continue [Y/n]? "
-msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:310
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (FindPkg)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:323
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
+msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"

 
 

-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2231
+#: apt-pkg/pkgcachegen.cc:329

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
-msgstr "Methwyd cyrchu %s  %s\n"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"

 
 

-#: cmdline/apt-get.cc:994
-msgid "Some files failed to download"
-msgstr "Methodd rhai ffeiliau lawrlwytho"
+#: apt-pkg/pkgcachegen.cc:860
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"

 
 

-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2240
-msgid "Download complete and in download only mode"
-msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
+#: apt-pkg/pkgcachegen.cc:962
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"

 
 

-#: cmdline/apt-get.cc:1001
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
-"geidio defnyddio --fix-missing?"
+#: apt-pkg/pkgcachegen.cc:1122 apt-pkg/pkgcachegen.cc:1129
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"

 
 

-#: cmdline/apt-get.cc:1005
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
+#: apt-pkg/acquire-item.cc:128
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."

 
 

-#: cmdline/apt-get.cc:1010
-msgid "Unable to correct missing packages."
-msgstr "Ni ellir cywiro pecynnau ar goll."
+#: apt-pkg/acquire-item.cc:432
+msgid "MD5Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: cmdline/apt-get.cc:1011
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1469

 #, fuzzy
 #, fuzzy

-msgid "Aborting install."
-msgstr "Yn Erthylu'r Sefydliad."
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: cmdline/apt-get.cc:1045
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+#: apt-pkg/acquire-item.cc:1150
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1055
+# FIXME: case
+#: apt-pkg/acquire-item.cc:1260

 #, c-format
 #, 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"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+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.)"

 
 

-#: cmdline/apt-get.cc:1073
+#: apt-pkg/acquire-item.cc:1319

 #, c-format
 #, 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"
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
+msgstr ""
+"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
+"drwsio'r pecyn hyn a law."

 
 

-#: cmdline/apt-get.cc:1084
+#: apt-pkg/acquire-item.cc:1374

 #, c-format
 #, 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:1096
-msgid " [Installed]"
-msgstr " [Sefydliwyd]"
+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."

 
 

-#: cmdline/apt-get.cc:1101
-msgid "You should explicitly select one to install."
-msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+#: apt-pkg/acquire-item.cc:1461
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"

 
 

-# FIXME: punctuation
-#: cmdline/apt-get.cc:1106
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:40

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
-"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
-"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
-"ffeil sources.list.\n"
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"

 
 

-#: cmdline/apt-get.cc:1125
-msgid "However the following packages replace it:"
-msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"

 
 

-#: cmdline/apt-get.cc:1128
+#: apt-pkg/indexrecords.cc:81

 #, c-format
 #, c-format

-msgid "Package %s has no installation candidate"
-msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+msgid "No Hash entry in Release file %s"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1148
+#: apt-pkg/vendorlist.cc:66

 #, c-format
 #, 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"
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"

 
 

-#: cmdline/apt-get.cc:1156
+#: apt-pkg/cdrom.cc:518

 #, c-format
 #, c-format

-msgid "%s is already the newest version.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1185
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
+msgid "Identifying.. "
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1187
+#: apt-pkg/cdrom.cc:552

 #, c-format
 #, c-format

-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+msgid "Stored label: %s\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1193
+#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
+
+#: apt-pkg/cdrom.cc:578

 #, c-format
 #, c-format

-msgid "Selected version %s (%s) for %s\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1330
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+#: apt-pkg/cdrom.cc:596
+msgid "Unmounting CD-ROM\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1343
-msgid "Unable to lock the list directory"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+#: apt-pkg/cdrom.cc:600
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Yn aros am benawdau"

 
 

-#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:608
+msgid "Mounting CD-ROM...\n"

 msgstr ""
 msgstr ""

-"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
-"rai eu defnyddio yn lle."

 
 

-#: cmdline/apt-get.cc:1433
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
+#: apt-pkg/cdrom.cc:626
+msgid "Scanning disc for index files..\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1465
-#, fuzzy
+#: apt-pkg/cdrom.cc:666
+#, c-format

 msgid ""
 msgid ""

-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: cmdline/apt-get.cc:1467
-msgid "Use 'apt-get autoremove' to remove them."
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1472
+#: apt-pkg/cdrom.cc:677

 msgid ""
 msgid ""

-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1755
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+#: apt-pkg/cdrom.cc:703
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:732
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:748
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1479
+#: apt-pkg/cdrom.cc:752

 #, fuzzy
 #, fuzzy

-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgid "Copying package lists..."
+msgstr "Yn Darllen Rhestrau Pecynnau"

 
 

-#: cmdline/apt-get.cc:1498
+#: apt-pkg/cdrom.cc:778

 #, fuzzy
 #, fuzzy

-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgid "Writing new source list\n"
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."

 
 

-#: cmdline/apt-get.cc:1545
-#, fuzzy, c-format
-msgid "Couldn't find task %s"
-msgstr "Methwyd canfod pecyn %s"
+#: apt-pkg/cdrom.cc:787
+msgid "Source list entries for this disc are:\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1660 cmdline/apt-get.cc:1696
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835

 #, c-format
 #, c-format

-msgid "Couldn't find package %s"
-msgstr "Methwyd canfod pecyn %s"
+msgid "Wrote %i records.\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1683
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837

 #, c-format
 #, 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:1714
-#, fuzzy, c-format
-msgid "%s set to manual installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: cmdline/apt-get.cc:1727
-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:1730
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
+msgid "Wrote %i records with %i missing files.\n"

 msgstr ""
 msgstr ""

-"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
-"pecyn (neu penodwch ddatrys)"

 
 

-# FIXME: needs commas
-#: cmdline/apt-get.cc:1742
-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."
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"

 msgstr ""
 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."

 
 

-# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1750
-msgid ""
-"Since you only requested a single operation it is extremely likely that\n"
-"the package is simply not installable and a bug report against\n"
-"that package should be filed."
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"

 msgstr ""
 msgstr ""

-"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
-"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."

 
 

-#: cmdline/apt-get.cc:1758
-msgid "Broken packages"
-msgstr "Pecynnau wedi torri"
-
-#: cmdline/apt-get.cc:1787
-msgid "The following extra packages will be installed:"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-
-#: cmdline/apt-get.cc:1876
-msgid "Suggested packages:"
-msgstr "Pecynnau a awgrymmir:"
-
-#: cmdline/apt-get.cc:1877
-msgid "Recommended packages:"
-msgstr "Pecynnau a argymhellir:"
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: cmdline/apt-get.cc:1905
-#, fuzzy
-msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1913
-msgid "Done"
-msgstr "Wedi Gorffen"
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: cmdline/apt-get.cc:1980 cmdline/apt-get.cc:1988
-#, fuzzy
-msgid "Internal error, problem resolver broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+#: apt-pkg/deb/dpkgpm.cc:49
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Wedi Sefydlu: "

 
 

-#: cmdline/apt-get.cc:2088
-msgid "Must specify at least one package to fetch source for"
-msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:737
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"

 
 

-#: cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2352
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:744
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"

 
 

-#: cmdline/apt-get.cc:2167
+#: apt-pkg/deb/dpkgpm.cc:52

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"

 
 

-#: cmdline/apt-get.cc:2191
+#: apt-pkg/deb/dpkgpm.cc:53

 #, c-format
 #, c-format

-msgid "You don't have enough free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
+msgid "Running post-installation trigger %s"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2196
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+#: apt-pkg/deb/dpkgpm.cc:581
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."

 
 

-#: cmdline/apt-get.cc:2199
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:609
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Methwyd agor ffeil %s"

 
 

-#: cmdline/apt-get.cc:2205
+#: apt-pkg/deb/dpkgpm.cc:730

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
+msgid "Preparing %s"
+msgstr "Yn agor %s"

 
 

-#: cmdline/apt-get.cc:2236
-msgid "Failed to fetch some archives."
-msgstr "Methwyd cyrchu rhai archifau."
+#: apt-pkg/deb/dpkgpm.cc:731
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"

 
 

-#: cmdline/apt-get.cc:2264
-#, 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"
+#: apt-pkg/deb/dpkgpm.cc:736
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: cmdline/apt-get.cc:2276
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+#: apt-pkg/deb/dpkgpm.cc:738
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Wedi Sefydlu: "

 
 

-#: cmdline/apt-get.cc:2277
+#: apt-pkg/deb/dpkgpm.cc:743

 #, c-format
 #, c-format

-msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2294
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+#: apt-pkg/deb/dpkgpm.cc:745
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Argymell"

 
 

-#: cmdline/apt-get.cc:2313
-msgid "Child process failed"
-msgstr "Methodd proses plentyn"
+#: apt-pkg/deb/dpkgpm.cc:750
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: cmdline/apt-get.cc:2329
-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"
+#: apt-pkg/deb/dpkgpm.cc:751
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"

 
 

-#: cmdline/apt-get.cc:2357
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
+#: apt-pkg/deb/dpkgpm.cc:955
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2377
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+#: apt-pkg/deb/dpkgpm.cc:986
+msgid "Running dpkg"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2429
+#: apt-pkg/deb/debsystem.cc:70

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
+"Unable to lock the administration directory (%s), is another process using "
+"it?"

 msgstr ""
 msgstr ""

-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
-"s"

 
 

-#: cmdline/apt-get.cc:2482
-#, c-format
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+
+#: apt-pkg/deb/debsystem.cc:82

 msgid ""
 msgid ""

-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "

 msgstr ""
 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:2518
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"

 msgstr ""
 msgstr ""

-"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
-"newydd"

 
 

-#: cmdline/apt-get.cc:2543
+#: methods/rred.cc:465

 #, c-format
 #, c-format

-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2557
+#: methods/rred.cc:470

 #, c-format
 #, c-format

-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-
-#: cmdline/apt-get.cc:2561
-msgid "Failed to process build dependencies"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
-
-#: cmdline/apt-get.cc:2593
-#, fuzzy
-msgid "Supported modules:"
-msgstr "Modylau a Gynhelir:"
-
-# FIXME: split
-#: cmdline/apt-get.cc:2634
-#, fuzzy

 msgid ""
 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 all automatic unused packages\n"
-"   purge - Remove and purge packages\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"
-"\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 continue if the integrity check fails\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"
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."

 msgstr ""
 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/acqprogress.cc:55
-msgid "Hit "
-msgstr "Presennol "
-
-#: cmdline/acqprogress.cc:79
-msgid "Get:"
-msgstr "Cyrchu:"

 
 

-#: cmdline/acqprogress.cc:110
-msgid "Ign "
-msgstr "Anwybyddu "
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"

 
 

-#: cmdline/acqprogress.cc:114
-msgid "Err "
-msgstr "Gwall "
+#, fuzzy
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"

 
 

-#: cmdline/acqprogress.cc:135
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
+#, fuzzy
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Methwyd datrys '%s'"

 
 

-#: cmdline/acqprogress.cc:225
-#, c-format
-msgid " [Working]"
-msgstr " [Gweithio]"
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Methwyd agor ffeil %s"

 
 

-#: cmdline/acqprogress.cc:271
-#, 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"
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"

 
 

-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr "Cofnod pecyn anhysbys!"
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"

 
 

-#: cmdline/apt-sortpkgs.cc:150

 #, fuzzy
 #, 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"
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr "Rhagosodiad gwael!"
-
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
-msgid "Press enter to continue."
-msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Gwall wrth brosesu'r cyfeiriadur %s"

 
 

-#: dselect/install:100
-msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
+# FIXME: commas, wrapping
+#~ msgid ""
+#~ "Since you only requested a single operation it is extremely likely that\n"
+#~ "the package is simply not installable and a bug report against\n"
+#~ "that package should be filed."
+#~ msgstr ""
+#~ "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
+#~ "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."

 
 

-#: dselect/install:101
-msgid "packages that were installed. This may result in duplicate errors"
-msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linell %d yn rhy hir (uchaf %d)"

 
 

-#: dselect/install:102
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linell %d yn rhy hir (uchaf %d)"

 
 

-#: dselect/install:103
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
-"eto."
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"

 
 

-#: dselect/update:30

 #, fuzzy
 #, fuzzy

-msgid "Merging available information"
-msgstr "Yn cyfuno manylion Ar Gael"
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"

 
 #, fuzzy
 #~ msgid "openpty failed\n"
 
 #, fuzzy
 #~ msgid "openpty failed\n"