Change the package index Info methods to allow apt-cache policy to be

[apt.git] / po / cy.po

diff --git a/po/cy.po b/po/cy.po
index a0db79e084572fbb6dc16e5c6d5605dea6a735ad..8b8382a0cddb1de955defff5ca6e473c28996625 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-05-08 11:03+0200\n"
+"POT-Creation-Date: 2010-01-01 19:13+0100\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,162 +14,162 @@ 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"
 

-#: cmdline/apt-cache.cc:135
+#: cmdline/apt-cache.cc:141

 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 
 #, 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:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
-#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
-#: cmdline/apt-cache.cc:1508
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575

 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 

-#: cmdline/apt-cache.cc:232
+#: cmdline/apt-cache.cc:245

 #, fuzzy
 #, fuzzy

-msgid "Total package names : "
+msgid "Total package names: "

 msgstr "Cyfanswm Enwau Pecynnau : "
 
 msgstr "Cyfanswm Enwau Pecynnau : "
 

-#: cmdline/apt-cache.cc:272
+#: cmdline/apt-cache.cc:285

 #, fuzzy
 msgid "  Normal packages: "
 msgstr "  Pecynnau Normal: "
 
 #, fuzzy
 msgid "  Normal packages: "
 msgstr "  Pecynnau Normal: "
 

-#: cmdline/apt-cache.cc:273
+#: cmdline/apt-cache.cc:286

 #, fuzzy
 msgid "  Pure virtual packages: "
 msgstr "  Pecynnau Cwbl Rhithwir: "
 
 #, fuzzy
 msgid "  Pure virtual packages: "
 msgstr "  Pecynnau Cwbl Rhithwir: "
 

-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:287

 #, fuzzy
 msgid "  Single virtual packages: "
 msgstr "  Pecynnau Rhithwir Sengl: "
 
 #, fuzzy
 msgid "  Single virtual packages: "
 msgstr "  Pecynnau Rhithwir Sengl: "
 

-#: cmdline/apt-cache.cc:275
+#: cmdline/apt-cache.cc:288

 #, fuzzy
 msgid "  Mixed virtual packages: "
 msgstr "  Pecynnau Rhithwir Cymysg: "
 
 #, fuzzy
 msgid "  Mixed virtual packages: "
 msgstr "  Pecynnau Rhithwir Cymysg: "
 

-#: cmdline/apt-cache.cc:276
+#: cmdline/apt-cache.cc:289

 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 

-#: cmdline/apt-cache.cc:278
+#: cmdline/apt-cache.cc:291

 #, fuzzy
 msgid "Total distinct versions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
 #, fuzzy
 msgid "Total distinct versions: "
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 

-#: cmdline/apt-cache.cc:280
+#: cmdline/apt-cache.cc:293
+#, fuzzy
+msgid "Total distinct descriptions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "
+
+#: cmdline/apt-cache.cc:295

 #, fuzzy
 msgid "Total dependencies: "
 msgstr "Cyfanswm Dibyniaethau: "
 
 #, fuzzy
 msgid "Total dependencies: "
 msgstr "Cyfanswm Dibyniaethau: "
 

-#: cmdline/apt-cache.cc:283
+#: cmdline/apt-cache.cc:298

 #, fuzzy
 msgid "Total ver/file relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
 #, fuzzy
 msgid "Total ver/file relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 

-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:300
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+
+#: cmdline/apt-cache.cc:302

 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Cyfanswm Mapiau Darpariath: "
 
 #, fuzzy
 msgid "Total Provides mappings: "
 msgstr "Cyfanswm Mapiau Darpariath: "
 

-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:314

 #, fuzzy
 msgid "Total globbed strings: "
 msgstr "Cyfanswm Llinynau Glob: "
 
 #, fuzzy
 msgid "Total globbed strings: "
 msgstr "Cyfanswm Llinynau Glob: "
 

-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:328

 #, fuzzy
 msgid "Total dependency version space: "
 msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
 #, fuzzy
 msgid "Total dependency version space: "
 msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 

-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:333

 #, fuzzy
 msgid "Total slack space: "
 msgstr "Cyfanswm gofod Slac: "
 
 #, fuzzy
 msgid "Total slack space: "
 msgstr "Cyfanswm gofod Slac: "
 

-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:341

 #, fuzzy
 msgid "Total space accounted for: "
 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
 #, fuzzy
 msgid "Total space accounted for: "
 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 

-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221

 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
 

-#: cmdline/apt-cache.cc:1231
+#: cmdline/apt-cache.cc:1297

 msgid "You must give exactly one pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
 msgid "You must give exactly one pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 

-#: cmdline/apt-cache.cc:1385
+#: cmdline/apt-cache.cc:1451

 msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
 msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 

-#: cmdline/apt-cache.cc:1462
+#: cmdline/apt-cache.cc:1528

 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 
 #, fuzzy
 msgid "Package files:"
 msgstr "Ffeiliau Pecynnau:"
 

-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622

 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"
 
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 

-#: cmdline/apt-cache.cc:1470
-#, c-format
-msgid "%4i %s\n"
-msgstr "%4i %s\n"
-

 #. Show any packages have explicit pins
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1482
+#: cmdline/apt-cache.cc:1549

 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 
 #, fuzzy
 msgid "Pinned packages:"
 msgstr "Pecynnau wedi eu Pinio:"
 

-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602

 msgid "(not found)"
 msgstr "(heb ganfod)"
 
 #. Installed version
 msgid "(not found)"
 msgstr "(heb ganfod)"
 
 #. Installed version

-#: cmdline/apt-cache.cc:1515
+#: cmdline/apt-cache.cc:1582

 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 
 msgid "  Installed: "
 msgstr "  Wedi Sefydlu: "
 

-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592

 msgid "(none)"
 msgstr "(dim)"
 
 #. Candidate Version
 msgid "(none)"
 msgstr "(dim)"
 
 #. Candidate Version

-#: cmdline/apt-cache.cc:1522
+#: cmdline/apt-cache.cc:1589

 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 
 msgid "  Candidate: "
 msgstr "  Ymgeisydd: "
 

-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1599

 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
 #, fuzzy
 msgid "  Package pin: "
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1541
+#: cmdline/apt-cache.cc:1608

 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 
 #, fuzzy
 msgid "  Version table:"
 msgstr "  Tabl Fersiynnau:"
 

-#: cmdline/apt-cache.cc:1556
-#, c-format
-msgid "       %4i %s\n"
-msgstr "       %4i %s\n"
-
-#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2665 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"
 
 msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
 

-#: cmdline/apt-cache.cc:1659
+#: cmdline/apt-cache.cc:1725

 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"


@@ -193,8 +193,8 @@ msgid ""
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"

-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphVis\n"
+"   pkgnames - List the names of all packages in the system\n"
+"   dotty - Generate package graphs for GraphViz\n"

 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"
 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"


@@ -230,7 +230,7 @@ msgstr ""
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages\n"

-"   dotty - Generate package graphs for GraphVis\n"
+"   dotty - Generate package graphs for GraphViz\n"

 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"
 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"


@@ -241,14 +241,14 @@ msgstr ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\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"
+"  -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"
 
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 

-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+#: cmdline/apt-cdrom.cc:77
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:93
+#: cmdline/apt-cdrom.cc:92

 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""


@@ -256,7 +256,7 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 

-#: cmdline/apt-cdrom.cc:117
+#: cmdline/apt-cdrom.cc:114

 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 


@@ -324,7 +324,7 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad hwn\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
 "  -c=? Darllen y ffeil cyfluniad hwn\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 

-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830

 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni ellir ysgrifennu i %s"
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Ni ellir ysgrifennu i %s"


@@ -333,32 +333,32 @@ msgstr "Ni ellir ysgrifennu i %s"
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
 

-#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+#: 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."
 
 msgid "Package extension list is too long"
 msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
 

-#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
-#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
-#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#: 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"
 
 #, fuzzy, c-format
 msgid "Error processing directory %s"
 msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
 

-#: ftparchive/apt-ftparchive.cc:254
+#: ftparchive/apt-ftparchive.cc:251

 msgid "Source extension list is too long"
 msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
 
 msgid "Source extension list is too long"
 msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
 

-#: ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:368

 msgid "Error writing header to contents file"
 msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
 
 msgid "Error writing header to contents file"
 msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
 

-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:398

 #, fuzzy, c-format
 msgid "Error processing contents %s"
 msgstr "Gwall wrth Brosesu Cynnwys %s"
 
 # FIXME: full stops
 #, fuzzy, c-format
 msgid "Error processing contents %s"
 msgstr "Gwall wrth Brosesu Cynnwys %s"
 
 # FIXME: full stops

-#: ftparchive/apt-ftparchive.cc:556
+#: ftparchive/apt-ftparchive.cc:553

 #, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"


@@ -440,308 +440,308 @@ msgstr ""
 "  -c=?        Darllen y ffeil cyfluniad hwn\n"
 "  -o=?        Gosod opsiwn cyfluniad mympwyol"
 
 "  -c=?        Darllen y ffeil cyfluniad hwn\n"
 "  -o=?        Gosod opsiwn cyfluniad mympwyol"
 

-#: ftparchive/apt-ftparchive.cc:762
+#: ftparchive/apt-ftparchive.cc:759

 msgid "No selections matched"
 msgstr "Dim dewisiadau'n cyfateb"
 
 msgid "No selections matched"
 msgstr "Dim dewisiadau'n cyfateb"
 

-#: ftparchive/apt-ftparchive.cc:835
+#: ftparchive/apt-ftparchive.cc:832

 #, 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'"
 
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
 

-#: ftparchive/cachedb.cc:47
+#: ftparchive/cachedb.cc:43

 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
 
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
 

-#: ftparchive/cachedb.cc:65
+#: ftparchive/cachedb.cc:61

 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
 
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
 

-#: ftparchive/cachedb.cc:76
+#: 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 ""
 
 msgid ""
 "DB format is invalid. If you upgraded from a older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 

-#: ftparchive/cachedb.cc:81
+#: ftparchive/cachedb.cc:77

 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Ni ellir agor y ffeil DB2 %s: %s"
 
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Ni ellir agor y ffeil DB2 %s: %s"
 

-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
+#: 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
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
 
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
 

-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:238

 msgid "Archive has no control record"
 msgstr "Does dim cofnod rheoli gan yr archif"
 
 msgid "Archive has no control record"
 msgstr "Does dim cofnod rheoli gan yr archif"
 

-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:444

 msgid "Unable to get a cursor"
 msgstr "Ni ellir cael cyrchydd"
 
 msgid "Unable to get a cursor"
 msgstr "Ni ellir cael cyrchydd"
 

-#: ftparchive/writer.cc:79
+#: ftparchive/writer.cc:76

 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
 
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
 

-#: ftparchive/writer.cc:84
+#: ftparchive/writer.cc:81

 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Rh: Ni ellir gwneud stat() o %s\n"
 
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Rh: Ni ellir gwneud stat() o %s\n"
 

-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:132

 msgid "E: "
 msgstr "G: "
 
 msgid "E: "
 msgstr "G: "
 

-#: ftparchive/writer.cc:137
+#: ftparchive/writer.cc:134

 msgid "W: "
 msgstr "Rh: "
 
 msgid "W: "
 msgstr "Rh: "
 

-#: ftparchive/writer.cc:144
+#: ftparchive/writer.cc:141

 msgid "E: Errors apply to file "
 msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
 
 msgid "E: Errors apply to file "
 msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
 

-#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188

 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Methwyd datrys %s"
 
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Methwyd datrys %s"
 

-#: ftparchive/writer.cc:173
+#: ftparchive/writer.cc:170

 msgid "Tree walking failed"
 msgstr "Methwyd cerdded y goeden"
 
 msgid "Tree walking failed"
 msgstr "Methwyd cerdded y goeden"
 

-#: ftparchive/writer.cc:198
+#: ftparchive/writer.cc:195

 #, c-format
 msgid "Failed to open %s"
 msgstr "Methwyd agor %s"
 
 # FIXME
 #, c-format
 msgid "Failed to open %s"
 msgstr "Methwyd agor %s"
 
 # FIXME

-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:254

 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DatGysylltu %s [%s]\n"
 
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DatGysylltu %s [%s]\n"
 

-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:262

 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Methwyd darllen y cyswllt %s"
 
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Methwyd darllen y cyswllt %s"
 

-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:266

 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Methwyd datgysylltu %s"
 
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Methwyd datgysylltu %s"
 

-#: ftparchive/writer.cc:276
+#: ftparchive/writer.cc:273

 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Methwyd cysylltu %s at %s"
 
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Methwyd cysylltu %s at %s"
 

-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:283

 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
 
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
 

-#: ftparchive/writer.cc:390
+#: ftparchive/writer.cc:388

 msgid "Archive had no package field"
 msgstr "Doedd dim maes pecyn gan yr archif"
 
 msgid "Archive had no package field"
 msgstr "Doedd dim maes pecyn gan yr archif"
 

-#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627

 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 

-#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715

 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 

-#: ftparchive/writer.cc:623
+#: ftparchive/writer.cc:637

 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 

-#: ftparchive/writer.cc:627
+#: ftparchive/writer.cc:641

 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 

-#: ftparchive/contents.cc:317
+#: ftparchive/contents.cc:321

 #, fuzzy, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
 
 #, fuzzy, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
 

-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389

 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Methwyd neilltuo cof"
 
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Methwyd neilltuo cof"
 

-#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#: ftparchive/override.cc:34 ftparchive/override.cc:142

 #, c-format
 msgid "Unable to open %s"
 msgstr "Ni ellir agor %s"
 
 #, c-format
 msgid "Unable to open %s"
 msgstr "Ni ellir agor %s"
 

-#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#: ftparchive/override.cc:60 ftparchive/override.cc:166

 #, c-format
 msgid "Malformed override %s line %lu #1"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
 
 #, c-format
 msgid "Malformed override %s line %lu #1"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
 

-#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#: ftparchive/override.cc:74 ftparchive/override.cc:178

 #, c-format
 msgid "Malformed override %s line %lu #2"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
 
 #, c-format
 msgid "Malformed override %s line %lu #2"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
 

-#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#: ftparchive/override.cc:88 ftparchive/override.cc:191

 #, c-format
 msgid "Malformed override %s line %lu #3"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
 
 #, c-format
 msgid "Malformed override %s line %lu #3"
 msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
 

-#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#: 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"
 
 #, c-format
 msgid "Failed to read the override file %s"
 msgstr "Methwydd darllen y ffeil dargyfeirio %s"
 

-#: ftparchive/multicompress.cc:75
+#: ftparchive/multicompress.cc:72

 #, fuzzy, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Dull Cywasgu Anhysbys '%s'"
 
 #, fuzzy, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr "Dull Cywasgu Anhysbys '%s'"
 

-#: ftparchive/multicompress.cc:105
+#: ftparchive/multicompress.cc:102

 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
 
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
 

-#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:169 methods/rsh.cc:91

 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Methwyd creu pibell cyfathrebu at isbroses"
 
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Methwyd creu pibell cyfathrebu at isbroses"
 

-#: ftparchive/multicompress.cc:198
+#: ftparchive/multicompress.cc:195

 msgid "Failed to create FILE*"
 msgstr "Methwyd creu FILE*"
 
 msgid "Failed to create FILE*"
 msgstr "Methwyd creu FILE*"
 

-#: ftparchive/multicompress.cc:201
+#: ftparchive/multicompress.cc:198

 msgid "Failed to fork"
 msgstr "Methodd fork()"
 
 msgid "Failed to fork"
 msgstr "Methodd fork()"
 

-#: ftparchive/multicompress.cc:215
+#: ftparchive/multicompress.cc:212

 #, fuzzy
 msgid "Compress child"
 msgstr "Plentyn Cywasgu"
 
 #, fuzzy
 msgid "Compress child"
 msgstr "Plentyn Cywasgu"
 

-#: ftparchive/multicompress.cc:238
+#: ftparchive/multicompress.cc:235

 #, fuzzy, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Gwall Mewnol, Methwyd creu %s"
 
 #, fuzzy, c-format
 msgid "Internal error, failed to create %s"
 msgstr "Gwall Mewnol, Methwyd creu %s"
 

-#: ftparchive/multicompress.cc:289
+#: ftparchive/multicompress.cc:286

 msgid "Failed to create subprocess IPC"
 msgstr "Methwyd creu isbroses IPC"
 
 msgid "Failed to create subprocess IPC"
 msgstr "Methwyd creu isbroses IPC"
 

-#: ftparchive/multicompress.cc:324
+#: ftparchive/multicompress.cc:321

 msgid "Failed to exec compressor "
 msgstr "Methwyd gweithredu cywasgydd "
 
 msgid "Failed to exec compressor "
 msgstr "Methwyd gweithredu cywasgydd "
 

-#: ftparchive/multicompress.cc:363
+#: ftparchive/multicompress.cc:360

 msgid "decompressor"
 msgstr "datgywasgydd"
 
 msgid "decompressor"
 msgstr "datgywasgydd"
 

-#: ftparchive/multicompress.cc:406
+#: ftparchive/multicompress.cc:403

 msgid "IO to subprocess/file failed"
 msgstr "Methodd MA i isbroses/ffeil"
 
 msgid "IO to subprocess/file failed"
 msgstr "Methodd MA i isbroses/ffeil"
 

-#: ftparchive/multicompress.cc:458
+#: ftparchive/multicompress.cc:455

 msgid "Failed to read while computing MD5"
 msgstr "Methwyd darllen wrth gyfrifo MD5"
 
 msgid "Failed to read while computing MD5"
 msgstr "Methwyd darllen wrth gyfrifo MD5"
 

-#: ftparchive/multicompress.cc:475
+#: ftparchive/multicompress.cc:472

 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Gwall wrth datgysylltu %s"
 
 #, c-format
 msgid "Problem unlinking %s"
 msgstr "Gwall wrth datgysylltu %s"
 

-#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185

 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
 
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
 

-#: cmdline/apt-get.cc:120
+#: cmdline/apt-get.cc:127

 msgid "Y"
 msgstr "I"
 
 msgid "Y"
 msgstr "I"
 

-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
 
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
 

-#: cmdline/apt-get.cc:237
+#: cmdline/apt-get.cc:244

 msgid "The following packages have unmet dependencies:"
 msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
 
 msgid "The following packages have unmet dependencies:"
 msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
 

-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:334

 #, c-format
 msgid "but %s is installed"
 msgstr "ond mae %s wedi ei sefydlu"
 
 #, c-format
 msgid "but %s is installed"
 msgstr "ond mae %s wedi ei sefydlu"
 

-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:336

 #, c-format
 msgid "but %s is to be installed"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 

-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:343

 msgid "but it is not installable"
 msgstr "ond ni ellir ei sefydlu"
 
 msgid "but it is not installable"
 msgstr "ond ni ellir ei sefydlu"
 

-#: cmdline/apt-get.cc:338
+#: cmdline/apt-get.cc:345

 msgid "but it is a virtual package"
 msgstr "ond mae'n becyn rhithwir"
 
 msgid "but it is a virtual package"
 msgstr "ond mae'n becyn rhithwir"
 

-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:348

 msgid "but it is not installed"
 msgstr "ond nid yw wedi ei sefydlu"
 
 msgid "but it is not installed"
 msgstr "ond nid yw wedi ei sefydlu"
 

-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:348

 msgid "but it is not going to be installed"
 msgstr "ond nid yw'n mynd i gael ei sefydlu"
 
 msgid "but it is not going to be installed"
 msgstr "ond nid yw'n mynd i gael ei sefydlu"
 

-#: cmdline/apt-get.cc:346
+#: cmdline/apt-get.cc:353

 msgid " or"
 msgstr " neu"
 
 msgid " or"
 msgstr " neu"
 

-#: cmdline/apt-get.cc:375
+#: cmdline/apt-get.cc:382

 msgid "The following NEW packages will be installed:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 msgid "The following NEW packages will be installed:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 

-#: cmdline/apt-get.cc:401
+#: cmdline/apt-get.cc:408

 msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 
 msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 

-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:430

 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
 #, fuzzy
 msgid "The following packages have been kept back:"
 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 

-#: cmdline/apt-get.cc:444
+#: cmdline/apt-get.cc:451

 #, fuzzy
 msgid "The following packages will be upgraded:"
 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
 #, fuzzy
 msgid "The following packages will be upgraded:"
 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 

-#: cmdline/apt-get.cc:465
+#: cmdline/apt-get.cc:472

 #, fuzzy
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
 #, fuzzy
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 

-#: cmdline/apt-get.cc:485
+#: cmdline/apt-get.cc:492

 msgid "The following held packages will be changed:"
 msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
 
 msgid "The following held packages will be changed:"
 msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
 

-#: cmdline/apt-get.cc:538
+#: cmdline/apt-get.cc:545

 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 

-#: cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:553

 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"


@@ -751,147 +751,148 @@ msgstr ""
 "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
 "ei wneud!"
 
 "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
 "ei wneud!"
 

-#: cmdline/apt-get.cc:577
+#: cmdline/apt-get.cc:584

 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
 
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
 

-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:588

 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu wedi ailsefydlu, "
 
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu wedi ailsefydlu, "
 

-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:590

 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu wedi eu israddio, "
 
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu wedi eu israddio, "
 

-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:592

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
 

-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:596

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 

-#: cmdline/apt-get.cc:649
+#: cmdline/apt-get.cc:669

 msgid "Correcting dependencies..."
 msgstr "Yn cywiro dibyniaethau..."
 
 msgid "Correcting dependencies..."
 msgstr "Yn cywiro dibyniaethau..."
 

-#: cmdline/apt-get.cc:652
+#: cmdline/apt-get.cc:672

 msgid " failed."
 msgstr " wedi methu."
 
 msgid " failed."
 msgstr " wedi methu."
 

-#: cmdline/apt-get.cc:655
+#: cmdline/apt-get.cc:675

 msgid "Unable to correct dependencies"
 msgstr "Ni ellir cywiro dibyniaethau"
 
 msgid "Unable to correct dependencies"
 msgstr "Ni ellir cywiro dibyniaethau"
 

-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:678

 msgid "Unable to minimize the upgrade set"
 msgstr "Ni ellir bychanu y set uwchraddio"
 
 msgid "Unable to minimize the upgrade set"
 msgstr "Ni ellir bychanu y set uwchraddio"
 

-#: cmdline/apt-get.cc:660
+#: cmdline/apt-get.cc:680

 msgid " Done"
 msgstr " Wedi Gorffen"
 
 msgid " Done"
 msgstr " Wedi Gorffen"
 

-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:684

 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."
 
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain."
 

-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:687

 msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
 msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 

-#: cmdline/apt-get.cc:689
+#: cmdline/apt-get.cc:712

 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
 #, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 

-#: cmdline/apt-get.cc:693
+#: cmdline/apt-get.cc:716

 msgid "Authentication warning overridden.\n"
 msgstr ""
 
 msgid "Authentication warning overridden.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:723

 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 

-#: cmdline/apt-get.cc:702
+#: cmdline/apt-get.cc:725

 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
 #, fuzzy
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 

-#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890

 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 

-#: cmdline/apt-get.cc:755
+#: cmdline/apt-get.cc:775

 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 

-#: cmdline/apt-get.cc:764
+#: cmdline/apt-get.cc:784

 #, fuzzy
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 
 #, fuzzy
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 

-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:795

 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 

-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105

 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 

-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
-#: apt-pkg/cachefile.cc:67
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
+#: apt-pkg/cachefile.cc:65

 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
 
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
 

-#: cmdline/apt-get.cc:816
+#: cmdline/apt-get.cc:836

 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 

-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:841

 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
 

-#: cmdline/apt-get.cc:824
+#: cmdline/apt-get.cc:844

 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Mae angen cyrchu %sB o archifau.\n"
 
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Mae angen cyrchu %sB o archifau.\n"
 

-#: cmdline/apt-get.cc:829
-#, c-format
-msgid "After unpacking %sB of additional disk space will be used.\n"
+#: cmdline/apt-get.cc:849
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"

 msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 
 msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 

-#: cmdline/apt-get.cc:832
-#, c-format
-msgid "After unpacking %sB disk space will be freed.\n"
+#: cmdline/apt-get.cc:852
+#, 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"
 
 msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 

-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252

 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 

-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:880

 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916

 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
 
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
 

-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:898

 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 

-#: cmdline/apt-get.cc:868
+#: cmdline/apt-get.cc:900

 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"


@@ -902,29 +903,29 @@ msgstr ""
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 

-#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925

 msgid "Abort."
 msgstr "Erthylu."
 
 msgid "Abort."
 msgstr "Erthylu."
 

-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:921

 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 

-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 

-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:1011

 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 

-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312

 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 

-#: cmdline/apt-get.cc:986
+#: cmdline/apt-get.cc:1018

 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"


@@ -932,49 +933,49 @@ msgstr ""
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 

-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:1022

 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
 
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
 

-#: cmdline/apt-get.cc:995
+#: cmdline/apt-get.cc:1027

 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 

-#: cmdline/apt-get.cc:996
+#: cmdline/apt-get.cc:1028

 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 
 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 

-#: cmdline/apt-get.cc:1030
+#: cmdline/apt-get.cc:1086

 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 

-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1097

 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 

-#: cmdline/apt-get.cc:1058
+#: cmdline/apt-get.cc:1115

 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 

-#: cmdline/apt-get.cc:1069
+#: cmdline/apt-get.cc:1126

 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
 
 #, 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:1081
+#: cmdline/apt-get.cc:1138

 msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 
 msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 

-#: cmdline/apt-get.cc:1086
+#: cmdline/apt-get.cc:1143

 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
 # FIXME: punctuation
 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
 # FIXME: punctuation

-#: cmdline/apt-get.cc:1091
+#: cmdline/apt-get.cc:1148

 #, fuzzy, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
 #, fuzzy, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"


@@ -986,77 +987,140 @@ msgstr ""
 "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
 "ffeil sources.list.\n"
 
 "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
 "ffeil sources.list.\n"
 

-#: cmdline/apt-get.cc:1110
+#: cmdline/apt-get.cc:1167

 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 
 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 

-#: cmdline/apt-get.cc:1113
+#: cmdline/apt-get.cc:1170

 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
 
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
 

-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1190

 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
 
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
 

-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1198

 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 

-#: cmdline/apt-get.cc:1168
+#: cmdline/apt-get.cc:1227

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 

-#: cmdline/apt-get.cc:1170
+#: cmdline/apt-get.cc:1229

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 

-#: cmdline/apt-get.cc:1176
+#: cmdline/apt-get.cc:1235

 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 

+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+

 #: cmdline/apt-get.cc:1313
 #: cmdline/apt-get.cc:1313

+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1342
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: cmdline/apt-get.cc:1395

 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 

-#: cmdline/apt-get.cc:1326
+#: cmdline/apt-get.cc:1408

 msgid "Unable to lock the list directory"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 msgid "Unable to lock the list directory"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 

-#: cmdline/apt-get.cc:1384
+#: cmdline/apt-get.cc:1464
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1513
+#, fuzzy

 msgid ""
 msgid ""

-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: cmdline/apt-get.cc:1515
+#, fuzzy, c-format
+msgid "%lu packages were automatically installed and are no longer required.\n"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: cmdline/apt-get.cc:1516
+msgid "Use 'apt-get autoremove' to remove them."

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1521
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+
+#: cmdline/apt-get.cc:1528
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc:1547

 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 

-#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1602
+#, fuzzy, c-format
+msgid "Couldn't find task %s"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753

 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 

-#: cmdline/apt-get.cc:1516
+#: cmdline/apt-get.cc:1740

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
 #, 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:1546
+#: cmdline/apt-get.cc:1771
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-get.cc:1784

 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
 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:1549
+#: cmdline/apt-get.cc:1787

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."


@@ -1065,7 +1129,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas

-#: cmdline/apt-get.cc:1561
+#: cmdline/apt-get.cc:1799

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


@@ -1077,132 +1141,118 @@ msgstr ""
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
 "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:1569
-msgid ""
-"Since you only requested a single operation it is extremely likely that\n"
-"the package is simply not installable and a bug report against\n"
-"that package should be filed."
-msgstr ""
-"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
-"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
-
-#: cmdline/apt-get.cc:1574
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-
-#: cmdline/apt-get.cc:1577
+#: cmdline/apt-get.cc:1817

 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 

-#: cmdline/apt-get.cc:1603
+#: cmdline/apt-get.cc:1846

 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1935

 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 

-#: cmdline/apt-get.cc:1693
+#: cmdline/apt-get.cc:1936

 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 

-#: cmdline/apt-get.cc:1713
+#: cmdline/apt-get.cc:1965

 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 

-#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112

 msgid "Failed"
 msgstr "Methwyd"
 
 msgid "Failed"
 msgstr "Methwyd"
 

-#: cmdline/apt-get.cc:1721
+#: cmdline/apt-get.cc:1973

 msgid "Done"
 msgstr "Wedi Gorffen"
 
 msgid "Done"
 msgstr "Wedi Gorffen"
 

-#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048

 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 

-#: cmdline/apt-get.cc:1894
+#: cmdline/apt-get.cc:2148

 msgid "Must specify at least one package to fetch source for"
 msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
 
 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:1924 cmdline/apt-get.cc:2153
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 

-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2227

 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 

-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2262

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 

-#: cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:2268

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 

-#: cmdline/apt-get.cc:2000
+#: cmdline/apt-get.cc:2271

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 

-#: cmdline/apt-get.cc:2006
+#: cmdline/apt-get.cc:2277

 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 

-#: cmdline/apt-get.cc:2037
+#: cmdline/apt-get.cc:2308

 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 

-#: cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:2336

 #, 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"
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 

-#: cmdline/apt-get.cc:2077
+#: cmdline/apt-get.cc:2348

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 

-#: cmdline/apt-get.cc:2078
+#: cmdline/apt-get.cc:2349

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:2366

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 

-#: cmdline/apt-get.cc:2114
+#: cmdline/apt-get.cc:2385

 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 

-#: cmdline/apt-get.cc:2130
+#: cmdline/apt-get.cc:2401

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 

-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2429

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 

-#: cmdline/apt-get.cc:2178
+#: cmdline/apt-get.cc:2449

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 

-#: cmdline/apt-get.cc:2230
+#: cmdline/apt-get.cc:2501

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "


@@ -1211,7 +1261,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
 "s"
 
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
 "s"
 

-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2554

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1220,34 +1270,34 @@ msgstr ""
 "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
 "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
 
 "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:2317
+#: cmdline/apt-get.cc:2590

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 

-#: cmdline/apt-get.cc:2342
+#: cmdline/apt-get.cc:2617

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 

-#: cmdline/apt-get.cc:2356
+#: cmdline/apt-get.cc:2633

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 

-#: cmdline/apt-get.cc:2360
+#: cmdline/apt-get.cc:2638

 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 

-#: cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:2670

 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split

-#: cmdline/apt-get.cc:2433
+#: cmdline/apt-get.cc:2711

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1263,6 +1313,8 @@ msgid ""
 "   upgrade - Perform an upgrade\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove 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"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1278,7 +1330,7 @@ msgid ""
 "  -d  Download only - do NOT install or unpack archives\n"
 "  -s  No-act. Perform ordering simulation\n"
 "  -y  Assume Yes to all queries and do not prompt\n"
 "  -d  Download only - do NOT install or unpack archives\n"
 "  -s  No-act. Perform ordering simulation\n"
 "  -y  Assume Yes to all queries and do not prompt\n"

-"  -f  Attempt to continue if the integrity check fails\n"
+"  -f  Attempt to correct a system with broken dependencies in place\n"

 "  -m  Attempt to continue if archives are unlocatable\n"
 "  -u  Show a list of upgraded packages as well\n"
 "  -b  Build the source package after fetching it\n"
 "  -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"


@@ -1330,6 +1382,14 @@ msgstr ""
 "\n"
 "                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
 "\n"
 "                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 

+#: cmdline/apt-get.cc:2879
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+

 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Presennol "
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr "Presennol "


@@ -1400,24 +1460,30 @@ msgstr ""
 msgid "Bad default setting!"
 msgstr "Rhagosodiad gwael!"
 
 msgid "Bad default setting!"
 msgstr "Rhagosodiad gwael!"
 

-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45

 msgid "Press enter to continue."
 msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
 
 msgid "Press enter to continue."
 msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
 

-#: dselect/install:100
-msgid "Some errors occurred while unpacking. I'm going to configure the"
-msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr ""

 
 #: dselect/install:101
 
 #: dselect/install:101

-msgid "packages that were installed. This may result in duplicate errors"
-msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+#, fuzzy
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"

 
 #: dselect/install:102
 
 #: dselect/install:102

+#, fuzzy
+msgid "will be configured. This may result in duplicate errors"
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+
+#: dselect/install:103

 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"
 
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"
 

-#: dselect/install:103
+#: dselect/install:104

 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""


@@ -1429,197 +1495,206 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 

-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:114

 msgid "Failed to create pipes"
 msgstr "Methwyd creu pibau"
 
 msgid "Failed to create pipes"
 msgstr "Methwyd creu pibau"
 

-#: apt-inst/contrib/extracttar.cc:144
+#: apt-inst/contrib/extracttar.cc:141

 msgid "Failed to exec gzip "
 msgstr "Methwyd gweithredu gzip"
 
 msgid "Failed to exec gzip "
 msgstr "Methwyd gweithredu gzip"
 

-#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204

 msgid "Corrupted archive"
 msgstr "Archif llygredig"
 
 msgid "Corrupted archive"
 msgstr "Archif llygredig"
 

-#: apt-inst/contrib/extracttar.cc:196
+#: apt-inst/contrib/extracttar.cc:193

 #, fuzzy
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Methodd swm gwirio Tar, archif llygredig"
 
 #, fuzzy
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Methodd swm gwirio Tar, archif llygredig"
 

-#: apt-inst/contrib/extracttar.cc:299
+#: apt-inst/contrib/extracttar.cc:296

 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Math pennawd TAR anhysbys %u, aelod %s"
 
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Math pennawd TAR anhysbys %u, aelod %s"
 

-#: apt-inst/contrib/arfile.cc:73
+#: apt-inst/contrib/arfile.cc:70

 msgid "Invalid archive signature"
 msgstr "Llofnod archif annilys"
 
 msgid "Invalid archive signature"
 msgstr "Llofnod archif annilys"
 

-#: apt-inst/contrib/arfile.cc:81
+#: apt-inst/contrib/arfile.cc:78

 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:93 apt-inst/contrib/arfile.cc:105
+#: 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"
 

-#: apt-inst/contrib/arfile.cc:131
+#: apt-inst/contrib/arfile.cc:128

 msgid "Archive is too short"
 msgstr "Mae'r archif yn rhy fyr"
 
 msgid "Archive is too short"
 msgstr "Mae'r archif yn rhy fyr"
 

-#: apt-inst/contrib/arfile.cc:135
+#: apt-inst/contrib/arfile.cc:132

 msgid "Failed to read the archive headers"
 msgstr "Methwyd darllen pennawdau'r archif"
 
 msgid "Failed to read the archive headers"
 msgstr "Methwyd darllen pennawdau'r archif"
 

-#: apt-inst/filelist.cc:384
+#: apt-inst/filelist.cc:380

 msgid "DropNode called on still linked node"
 msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
 
 msgid "DropNode called on still linked node"
 msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
 

-#: apt-inst/filelist.cc:416
+#: apt-inst/filelist.cc:412

 msgid "Failed to locate the hash element!"
 msgstr "Methyd lleoli yr elfen <hash>!"
 
 msgid "Failed to locate the hash element!"
 msgstr "Methyd lleoli yr elfen <hash>!"
 

-#: apt-inst/filelist.cc:463
+#: apt-inst/filelist.cc:459

 msgid "Failed to allocate diversion"
 msgstr "Methwyd neilltuo dargyfeiriad"
 
 msgid "Failed to allocate diversion"
 msgstr "Methwyd neilltuo dargyfeiriad"
 

-#: apt-inst/filelist.cc:468
+#: apt-inst/filelist.cc:464

 #, fuzzy
 msgid "Internal error in AddDiversion"
 msgstr "Gwall Mewnol yn AddDiversion"
 
 #, fuzzy
 msgid "Internal error in AddDiversion"
 msgstr "Gwall Mewnol yn AddDiversion"
 

-#: apt-inst/filelist.cc:481
+#: apt-inst/filelist.cc:477

 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
 
 # FIXME: "the"
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
 
 # FIXME: "the"

-#: apt-inst/filelist.cc:510
+#: apt-inst/filelist.cc:506

 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
 
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
 

-#: apt-inst/filelist.cc:553
+#: apt-inst/filelist.cc:549

 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Ffeil cyfluniad dyblyg %s/%s"
 
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "Ffeil cyfluniad dyblyg %s/%s"
 

-#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49

 #, fuzzy, c-format
 msgid "Failed to write file %s"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
 #, fuzzy, c-format
 msgid "Failed to write file %s"
 msgstr "Methwyd ysgrifennu ffeil %s"
 

-#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104
+#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100

 #, c-format
 msgid "Failed to close file %s"
 msgstr "Methwyd cau ffeil %s"
 
 #, c-format
 msgid "Failed to close file %s"
 msgstr "Methwyd cau ffeil %s"
 

-#: apt-inst/extract.cc:96 apt-inst/extract.cc:167
+#: apt-inst/extract.cc:93 apt-inst/extract.cc:164

 #, c-format
 msgid "The path %s is too long"
 msgstr "Mae'r llwybr %s yn rhy hir"
 
 #, c-format
 msgid "The path %s is too long"
 msgstr "Mae'r llwybr %s yn rhy hir"
 

-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:124

 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Yn dadbacio %s mwy nag unwaith"
 
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "Yn dadbacio %s mwy nag unwaith"
 

-#: apt-inst/extract.cc:137
+#: apt-inst/extract.cc:134

 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
 
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
 

-#: apt-inst/extract.cc:147
+#: apt-inst/extract.cc:144

 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
 
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
 

-#: apt-inst/extract.cc:157 apt-inst/extract.cc:300
+#: apt-inst/extract.cc:154 apt-inst/extract.cc:297

 msgid "The diversion path is too long"
 msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 
 msgid "The diversion path is too long"
 msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
 

-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:240

 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
 
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
 

-#: apt-inst/extract.cc:283
+#: apt-inst/extract.cc:280

 msgid "Failed to locate node in its hash bucket"
 msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
 
 msgid "Failed to locate node in its hash bucket"
 msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
 

-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:284

 msgid "The path is too long"
 msgstr "Mae'r llwybr yn rhy hir"
 
 # FIXME: wtf?
 msgid "The path is too long"
 msgstr "Mae'r llwybr yn rhy hir"
 
 # FIXME: wtf?

-#: apt-inst/extract.cc:417
+#: apt-inst/extract.cc:414

 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
 
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
 

-#: apt-inst/extract.cc:434
+#: apt-inst/extract.cc:431

 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
 

-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
-#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#. 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/configuration.cc:843
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287

 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
 
 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
 

-#: apt-inst/extract.cc:494
+#: apt-inst/extract.cc:491

 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ni ellir gwneud stat() o %s"
 
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Ni ellir gwneud stat() o %s"
 

-#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61
+#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57

 #, c-format
 msgid "Failed to remove %s"
 msgstr "Methwyd dileu %s"
 
 #, c-format
 msgid "Failed to remove %s"
 msgstr "Methwyd dileu %s"
 

-#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112
+#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108

 #, c-format
 msgid "Unable to create %s"
 msgstr "Ni ellir creu %s"
 
 #, c-format
 msgid "Unable to create %s"
 msgstr "Ni ellir creu %s"
 

-#: apt-inst/deb/dpkgdb.cc:118
+#: apt-inst/deb/dpkgdb.cc:114

 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Methwyd stat() ar %sinfo"
 
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr "Methwyd stat() ar %sinfo"
 

-#: apt-inst/deb/dpkgdb.cc:123
+#: apt-inst/deb/dpkgdb.cc:119

 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
 
 #. Build the status cache
 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:139 apt-pkg/pkgcachegen.cc:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
+#: apt-pkg/pkgcachegen.cc:961

 #, fuzzy
 msgid "Reading package lists"
 msgstr "Yn Darllen Rhestrau Pecynnau"
 
 #, fuzzy
 msgid "Reading package lists"
 msgstr "Yn Darllen Rhestrau Pecynnau"
 

-#: apt-inst/deb/dpkgdb.cc:180
+#: apt-inst/deb/dpkgdb.cc:176

 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
 
 # FIXME
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
 
 # FIXME

-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
-#: apt-inst/deb/dpkgdb.cc:448
+#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
+#: apt-inst/deb/dpkgdb.cc:444

 #, fuzzy
 msgid "Internal error getting a package name"
 msgstr "Gwall mewnol wrth gyrchu enw pecyn"
 
 #, fuzzy
 msgid "Internal error getting a package name"
 msgstr "Gwall mewnol wrth gyrchu enw pecyn"
 

-#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382

 #, fuzzy
 msgid "Reading file listing"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 
 #, fuzzy
 msgid "Reading file listing"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 

-#: apt-inst/deb/dpkgdb.cc:216
+#: apt-inst/deb/dpkgdb.cc:212

 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "


@@ -1630,92 +1705,92 @@ msgstr ""
 "gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
 
 # FIXME
 "gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
 
 # FIXME

-#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242
+#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238

 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
 
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
 

-#: apt-inst/deb/dpkgdb.cc:266
+#: apt-inst/deb/dpkgdb.cc:262

 #, fuzzy
 msgid "Internal error getting a node"
 msgstr "Gwall Mewnol wrth gael Nôd"
 
 # FIXME: literal
 #, fuzzy
 msgid "Internal error getting a node"
 msgstr "Gwall Mewnol wrth gael Nôd"
 
 # FIXME: literal

-#: apt-inst/deb/dpkgdb.cc:309
+#: apt-inst/deb/dpkgdb.cc:305

 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
 
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
 

-#: apt-inst/deb/dpkgdb.cc:324
+#: apt-inst/deb/dpkgdb.cc:320

 msgid "The diversion file is corrupted"
 msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
 
 msgid "The diversion file is corrupted"
 msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
 

-#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
-#: apt-inst/deb/dpkgdb.cc:341
+#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
+#: apt-inst/deb/dpkgdb.cc:337

 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
 
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
 

-#: apt-inst/deb/dpkgdb.cc:362
+#: apt-inst/deb/dpkgdb.cc:358

 #, fuzzy
 msgid "Internal error adding a diversion"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
 #, fuzzy
 msgid "Internal error adding a diversion"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 

-#: apt-inst/deb/dpkgdb.cc:383
+#: apt-inst/deb/dpkgdb.cc:379

 #, fuzzy
 msgid "The pkg cache must be initialized first"
 msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
 
 #, fuzzy
 msgid "The pkg cache must be initialized first"
 msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
 

-#: apt-inst/deb/dpkgdb.cc:443
+#: apt-inst/deb/dpkgdb.cc:439

 #, fuzzy, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
 
 #, fuzzy, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
 

-#: apt-inst/deb/dpkgdb.cc:465
+#: apt-inst/deb/dpkgdb.cc:461

 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
 
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
 

-#: apt-inst/deb/dpkgdb.cc:470
+#: apt-inst/deb/dpkgdb.cc:466

 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
 
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
 

-#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
+#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43

 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 

-#: apt-inst/deb/debfile.cc:52
+#: apt-inst/deb/debfile.cc:50

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

-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"

 msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
 msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 

-#: apt-inst/deb/debfile.cc:112
+#: apt-inst/deb/debfile.cc:110

 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Methwyd newid i %s"
 
 #, c-format
 msgid "Couldn't change to %s"
 msgstr "Methwyd newid i %s"
 

-#: apt-inst/deb/debfile.cc:138
+#: apt-inst/deb/debfile.cc:140

 #, fuzzy
 msgid "Internal error, could not locate member"
 msgstr "Gwall Methwyd, methwyd lleoli aelod"
 
 #, fuzzy
 msgid "Internal error, could not locate member"
 msgstr "Gwall Methwyd, methwyd lleoli aelod"
 

-#: apt-inst/deb/debfile.cc:171
+#: apt-inst/deb/debfile.cc:173

 msgid "Failed to locate a valid control file"
 msgstr "Methwyd lleoli ffeil rheoli dilys"
 
 msgid "Failed to locate a valid control file"
 msgstr "Methwyd lleoli ffeil rheoli dilys"
 

-#: apt-inst/deb/debfile.cc:256
+#: apt-inst/deb/debfile.cc:258

 #, fuzzy
 msgid "Unparsable control file"
 msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
 #, fuzzy
 msgid "Unparsable control file"
 msgstr "Ffeil rheoli ni ellir ei ramadegu"
 

-#: methods/cdrom.cc:114
+#: methods/cdrom.cc:200

 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
 
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
 

-#: methods/cdrom.cc:123
+#: methods/cdrom.cc:209

 #, fuzzy
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 #, fuzzy
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "


@@ -1724,32 +1799,32 @@ msgstr ""
 "Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
 "get update i ychwanegu CDau newydd."
 
 "Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
 "get update i ychwanegu CDau newydd."
 

-#: methods/cdrom.cc:131
+#: methods/cdrom.cc:219

 #, fuzzy
 msgid "Wrong CD-ROM"
 msgstr "CD Anghywir"
 
 #, fuzzy
 msgid "Wrong CD-ROM"
 msgstr "CD Anghywir"
 

-#: methods/cdrom.cc:166
+#: methods/cdrom.cc:245

 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
 
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
 

-#: methods/cdrom.cc:171
+#: methods/cdrom.cc:250

 #, fuzzy
 msgid "Disk not found."
 msgstr "Ffeil heb ei ganfod"
 
 #, fuzzy
 msgid "Disk not found."
 msgstr "Ffeil heb ei ganfod"
 

-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264

 msgid "File not found"
 msgstr "Ffeil heb ei ganfod"
 
 msgid "File not found"
 msgstr "Ffeil heb ei ganfod"
 

-#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
-#: methods/gzip.cc:150
+#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
+#: methods/rred.cc:234 methods/rred.cc:243

 msgid "Failed to stat"
 msgstr "Methwyd stat()"
 
 msgid "Failed to stat"
 msgstr "Methwyd stat()"
 

-#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240

 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
 
 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
 


@@ -1758,34 +1833,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
 
 #. Login must be before getpeername otherwise dante won't work.
 msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
 
 #. Login must be before getpeername otherwise dante won't work.

-#: methods/ftp.cc:162
+#: methods/ftp.cc:168

 msgid "Logging in"
 msgstr "Yn mewngofnodi"
 
 msgid "Logging in"
 msgstr "Yn mewngofnodi"
 

-#: methods/ftp.cc:168
+#: methods/ftp.cc:174

 msgid "Unable to determine the peer name"
 msgstr "Ni ellir darganfod enw'r cymar"
 
 msgid "Unable to determine the peer name"
 msgstr "Ni ellir darganfod enw'r cymar"
 

-#: methods/ftp.cc:173
+#: methods/ftp.cc:179

 msgid "Unable to determine the local name"
 msgstr "Ni ellir darganfod yr enw lleol"
 
 msgid "Unable to determine the local name"
 msgstr "Ni ellir darganfod yr enw lleol"
 

-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:210 methods/ftp.cc:238

 #, fuzzy, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
 
 #, fuzzy, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
 

-#: methods/ftp.cc:210
+#: methods/ftp.cc:216

 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
 
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
 

-#: methods/ftp.cc:217
+#: methods/ftp.cc:223

 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
 
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
 

-#: methods/ftp.cc:237
+#: methods/ftp.cc:243

 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."


@@ -1794,210 +1869,210 @@ msgstr ""
 "ProxyLogin yn wag.)"
 
 # FIXME
 "ProxyLogin yn wag.)"
 
 # FIXME

-#: methods/ftp.cc:265
+#: methods/ftp.cc:271

 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
 
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
 

-#: methods/ftp.cc:291
+#: methods/ftp.cc:297

 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
 
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
 

-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226

 msgid "Connection timeout"
 msgstr "Goramser cysylltu"
 
 msgid "Connection timeout"
 msgstr "Goramser cysylltu"
 

-#: methods/ftp.cc:335
+#: methods/ftp.cc:341

 msgid "Server closed the connection"
 msgstr "Caeodd y gweinydd y cysylltiad"
 
 msgid "Server closed the connection"
 msgstr "Caeodd y gweinydd y cysylltiad"
 

-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190

 msgid "Read error"
 msgstr "Gwall darllen"
 
 msgid "Read error"
 msgstr "Gwall darllen"
 

-#: methods/ftp.cc:345 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197

 msgid "A response overflowed the buffer."
 msgstr "Gorlifodd ateb y byffer."
 
 msgid "A response overflowed the buffer."
 msgstr "Gorlifodd ateb y byffer."
 

-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:368 methods/ftp.cc:380

 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 
 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 

-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232

 msgid "Write error"
 msgstr "Gwall ysgrifennu"
 
 msgid "Write error"
 msgstr "Gwall ysgrifennu"
 

-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735

 msgid "Could not create a socket"
 msgstr "Methwyd creu soced"
 
 msgid "Could not create a socket"
 msgstr "Methwyd creu soced"
 

-#: methods/ftp.cc:698
+#: methods/ftp.cc:704

 msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
 msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 

-#: methods/ftp.cc:704
+#: methods/ftp.cc:710

 #, fuzzy
 msgid "Could not connect passive socket."
 msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME
 #, fuzzy
 msgid "Could not connect passive socket."
 msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME

-#: methods/ftp.cc:722
+#: methods/ftp.cc:728

 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Methodd getaddrinfo gael soced gwrando"
 
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Methodd getaddrinfo gael soced gwrando"
 

-#: methods/ftp.cc:736
+#: methods/ftp.cc:742

 msgid "Could not bind a socket"
 msgstr "Methwyd rhwymo soced"
 
 msgid "Could not bind a socket"
 msgstr "Methwyd rhwymo soced"
 

-#: methods/ftp.cc:740
+#: methods/ftp.cc:746

 msgid "Could not listen on the socket"
 msgstr "Methwyd gwrando ar y soced"
 
 msgid "Could not listen on the socket"
 msgstr "Methwyd gwrando ar y soced"
 

-#: methods/ftp.cc:747
+#: methods/ftp.cc:753

 msgid "Could not determine the socket's name"
 msgstr "Methwyd canfod enw'r soced"
 
 msgid "Could not determine the socket's name"
 msgstr "Methwyd canfod enw'r soced"
 

-#: methods/ftp.cc:779
+#: methods/ftp.cc:785

 msgid "Unable to send PORT command"
 msgstr "Methwyd danfod gorchymyn PORT"
 
 msgid "Unable to send PORT command"
 msgstr "Methwyd danfod gorchymyn PORT"
 

-#: methods/ftp.cc:789
+#: methods/ftp.cc:795

 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
 
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
 

-#: methods/ftp.cc:798
+#: methods/ftp.cc:804

 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
 
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
 

-#: methods/ftp.cc:818
+#: methods/ftp.cc:824

 msgid "Data socket connect timed out"
 msgstr "Goramserodd cysylltiad y soced data"
 
 msgid "Data socket connect timed out"
 msgstr "Goramserodd cysylltiad y soced data"
 

-#: methods/ftp.cc:825
+#: methods/ftp.cc:831

 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 

-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 

-#: methods/ftp.cc:877
+#: methods/ftp.cc:883

 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
 
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
 

-#: methods/ftp.cc:892 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322

 msgid "Data socket timed out"
 msgstr "Goramserodd soced data"
 
 msgid "Data socket timed out"
 msgstr "Goramserodd soced data"
 

-#: methods/ftp.cc:922
+#: methods/ftp.cc:928

 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
 
 #. Get the files information
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
 
 #. Get the files information

-#: methods/ftp.cc:997
+#: methods/ftp.cc:1005

 msgid "Query"
 msgstr "Ymholiad"
 
 # FIXME
 msgid "Query"
 msgstr "Ymholiad"
 
 # FIXME

-#: methods/ftp.cc:1109
+#: methods/ftp.cc:1117

 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 
 msgid "Unable to invoke "
 msgstr "Methwyd gweithredu "
 

-#: methods/connect.cc:64
+#: methods/connect.cc:70

 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "Yn cysylltu i %s (%s)"
 

-#: methods/connect.cc:71
+#: methods/connect.cc:81

 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 
 #, c-format
 msgid "[IP: %s %s]"
 msgstr "[IP: %s %s]"
 

-#: methods/connect.cc:80
+#: 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)"
 
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
 

-#: methods/connect.cc:86
+#: 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)."
 
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
 

-#: methods/connect.cc:93
+#: 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"
 
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
 

-#: methods/connect.cc:108
+#: methods/connect.cc:119

 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Methwyd cysylltu i %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Methwyd cysylltu i %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going

-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:147 methods/rsh.cc:425

 #, c-format
 msgid "Connecting to %s"
 msgstr "Yn cysylltu i %s"
 
 #, c-format
 msgid "Connecting to %s"
 msgstr "Yn cysylltu i %s"
 

-#: methods/connect.cc:167
+#: methods/connect.cc:165 methods/connect.cc:184

 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Methwyd datrys '%s'"
 
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr "Methwyd datrys '%s'"
 

-#: methods/connect.cc:173
+#: methods/connect.cc:190

 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 

-#: methods/connect.cc:176
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#: methods/connect.cc:193
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"

 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 

-#: methods/connect.cc:223
-#, c-format
-msgid "Unable to connect to %s %s:"
+#: methods/connect.cc:240
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"

 msgstr "Methwyd cysylltu i %s %s:"
 
 msgstr "Methwyd cysylltu i %s %s:"
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Methwyd datrys '%s'"
 
 #, fuzzy, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr "Methwyd datrys '%s'"
 

-#: methods/gpgv.cc:100
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:204
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:209
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:213
+#: methods/gpgv.cc:232

 #, c-format
 #, c-format

-msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:218
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:249
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 

-#: methods/gpgv.cc:256
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -2013,446 +2088,513 @@ msgstr "Methwyd agor pibell ar gyfer %s"
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 

-#: methods/http.cc:377
+#: methods/http.cc:385

 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 
 msgid "Waiting for headers"
 msgstr "Yn aros am benawdau"
 

-#: methods/http.cc:523
+#: methods/http.cc:531

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
 

-#: methods/http.cc:531
+#: methods/http.cc:539

 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
 msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 

-#: methods/http.cc:550 methods/http.cc:557
+#: 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"
 
 #, fuzzy
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 

-#: methods/http.cc:586
+#: methods/http.cc:594

 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 

-#: methods/http.cc:601
+#: methods/http.cc:609

 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
 #, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 

-#: methods/http.cc:603
+#: methods/http.cc:611

 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
 #, fuzzy
 msgid "This HTTP server has broken range support"
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 

-#: methods/http.cc:627
+#: methods/http.cc:635

 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 

-#: methods/http.cc:774
+#: methods/http.cc:790

 msgid "Select failed"
 msgstr "Methwyd dewis"
 
 msgid "Select failed"
 msgstr "Methwyd dewis"
 

-#: methods/http.cc:779
+#: methods/http.cc:795

 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 

-#: methods/http.cc:802
+#: methods/http.cc:818

 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 

-#: methods/http.cc:833
+#: methods/http.cc:849

 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 

-#: methods/http.cc:861
+#: methods/http.cc:877

 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 

-#: methods/http.cc:875
+#: methods/http.cc:891

 #, fuzzy
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 
 #, 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:877
+#: methods/http.cc:893

 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 

-#: methods/http.cc:1108
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: methods/http.cc:1149

 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 

-#: methods/http.cc:1125
+#: methods/http.cc:1166 methods/http.cc:1221

 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 

-#: methods/http.cc:1216
+#: methods/http.cc:1313

 msgid "Internal error"
 msgstr "Gwall mewnol"
 
 msgid "Internal error"
 msgstr "Gwall mewnol"
 

-#: apt-pkg/contrib/mmap.cc:82
+#: apt-pkg/contrib/mmap.cc:76

 msgid "Can't mmap an empty file"
 msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
 
 msgid "Can't mmap an empty file"
 msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
 

-#: apt-pkg/contrib/mmap.cc:87
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187

 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Methwyd gwneud mmap() efo %lu beit"
 
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Methwyd gwneud mmap() efo %lu beit"
 

-#: apt-pkg/contrib/strutl.cc:938
+#: apt-pkg/contrib/mmap.cc:234
+#, 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 ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:346
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:353
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:360
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:365
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1040

 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
 
 #, c-format
 msgid "Selection %s not found"
 msgstr "Ni chanfuwyd y dewis %s"
 

-#: apt-pkg/contrib/configuration.cc:436
+#: apt-pkg/contrib/configuration.cc:458

 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Talgryniad math anhysbys: '%c'"
 
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Talgryniad math anhysbys: '%c'"
 

-#: apt-pkg/contrib/configuration.cc:494
+#: apt-pkg/contrib/configuration.cc:516

 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 

-#: apt-pkg/contrib/configuration.cc:512
-#, c-format
-msgid "Line %d too long (max %d)"
-msgstr "Linell %d yn rhy hir (uchaf %d)"
-
-#: apt-pkg/contrib/configuration.cc:608
+#: apt-pkg/contrib/configuration.cc:684

 #, 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
 #, 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:627
+#: apt-pkg/contrib/configuration.cc:703

 #, fuzzy, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 
 #, fuzzy, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 

-#: apt-pkg/contrib/configuration.cc:644
+#: apt-pkg/contrib/configuration.cc:720

 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
 
 #, 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:684
+#: apt-pkg/contrib/configuration.cc:760

 #, 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"
 
 #, 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:691
+#: apt-pkg/contrib/configuration.cc:767

 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
 
 #, 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:695 apt-pkg/contrib/configuration.cc:700
+#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776

 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
 
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
 

-#: apt-pkg/contrib/configuration.cc:704
+#: apt-pkg/contrib/configuration.cc:780

 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
 
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
 

-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:831

 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
 
 #, 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:155
+#: apt-pkg/contrib/progress.cc:153

 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Gwall!"
 
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... Gwall!"
 

-#: apt-pkg/contrib/progress.cc:157
+#: apt-pkg/contrib/progress.cc:155

 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Wedi Gorffen"
 
 # FIXME
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... Wedi Gorffen"
 
 # FIXME

-#: apt-pkg/contrib/cmndline.cc:80
+#: 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)."
 
 #, 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:106 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: 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"
 
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
 

-#: apt-pkg/contrib/cmndline.cc:127
+#: 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"
 
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
 

-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184

 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
 
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
 

-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#: 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>."
 
 #, 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:237
+#: apt-pkg/contrib/cmndline.cc:234

 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
 
 #, 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:268
+#: apt-pkg/contrib/cmndline.cc:265

 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opsiwn '%s' yn rhy hir"
 
 # FIXME: 'Sense'?
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Opsiwn '%s' yn rhy hir"
 
 # FIXME: 'Sense'?

-#: apt-pkg/contrib/cmndline.cc:301
+#: 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'."
 
 #, 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:351
+#: apt-pkg/contrib/cmndline.cc:348

 #, c-format
 msgid "Invalid operation %s"
 msgstr "Gweithred annilys %s"
 
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Gweithred annilys %s"
 

-#: apt-pkg/contrib/cdromutl.cc:55
+#: 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"
 
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
 

-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39

 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni ellir newid i %s"
 
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni ellir newid i %s"
 

-#: apt-pkg/contrib/cdromutl.cc:190
+#: apt-pkg/contrib/cdromutl.cc:195

 msgid "Failed to stat the cdrom"
 msgstr "Methwyd gwneud stat() o'r CD-ROM"
 
 msgid "Failed to stat the cdrom"
 msgstr "Methwyd gwneud stat() o'r CD-ROM"
 

-#: apt-pkg/contrib/fileutl.cc:82
+#: apt-pkg/contrib/fileutl.cc:149

 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
 
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
 

-#: apt-pkg/contrib/fileutl.cc:87
+#: apt-pkg/contrib/fileutl.cc:154

 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Methwyd agor y ffeil clo %s"
 
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Methwyd agor y ffeil clo %s"
 

-#: apt-pkg/contrib/fileutl.cc:105
+#: apt-pkg/contrib/fileutl.cc:172

 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
 
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
 

-#: apt-pkg/contrib/fileutl.cc:109
+#: apt-pkg/contrib/fileutl.cc:176

 #, c-format
 msgid "Could not get lock %s"
 msgstr "Methwyd cael y clo %s"
 
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Methwyd cael y clo %s"
 

-#: apt-pkg/contrib/fileutl.cc:377
+#: apt-pkg/contrib/fileutl.cc:444

 #, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
 
 #, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Arhoswyd am %s ond nid oedd e yna"
 

-#: apt-pkg/contrib/fileutl.cc:387
+#: apt-pkg/contrib/fileutl.cc:456

 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 

-#: apt-pkg/contrib/fileutl.cc:390
+#: apt-pkg/contrib/fileutl.cc:458
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Derbyniodd is-broses %s wall segmentu."
+
+#: apt-pkg/contrib/fileutl.cc:462

 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
 

-#: apt-pkg/contrib/fileutl.cc:392
+#: apt-pkg/contrib/fileutl.cc:464

 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Gorffenodd is-broses %s yn annisgwyl"
 
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Gorffenodd is-broses %s yn annisgwyl"
 

-#: apt-pkg/contrib/fileutl.cc:436
+#: apt-pkg/contrib/fileutl.cc:508

 #, c-format
 msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
 # FIXME
 #, c-format
 msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
 # FIXME

-#: apt-pkg/contrib/fileutl.cc:492
+#: apt-pkg/contrib/fileutl.cc:564

 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
 # FIXME
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
 # FIXME

-#: apt-pkg/contrib/fileutl.cc:522
+#: apt-pkg/contrib/fileutl.cc:594

 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "o hyd %lu i ysgrifennu ond methwyd"
 
 #, 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
+#: apt-pkg/contrib/fileutl.cc:669

 msgid "Problem closing the file"
 msgstr "Gwall wrth gau'r ffeil"
 
 msgid "Problem closing the file"
 msgstr "Gwall wrth gau'r ffeil"
 

-#: apt-pkg/contrib/fileutl.cc:603
+#: apt-pkg/contrib/fileutl.cc:675

 msgid "Problem unlinking the file"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 
 msgid "Problem unlinking the file"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 

-#: apt-pkg/contrib/fileutl.cc:614
+#: apt-pkg/contrib/fileutl.cc:686

 msgid "Problem syncing the file"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
 msgid "Problem syncing the file"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 

-#: apt-pkg/pkgcache.cc:126
+#: apt-pkg/pkgcache.cc:133

 msgid "Empty package cache"
 msgstr "Storfa pecyn gwag"
 
 msgid "Empty package cache"
 msgstr "Storfa pecyn gwag"
 

-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:139

 msgid "The package cache file is corrupted"
 msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 
 msgid "The package cache file is corrupted"
 msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 

-#: apt-pkg/pkgcache.cc:137
+#: apt-pkg/pkgcache.cc:144

 msgid "The package cache file is an incompatible version"
 msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
 
 # FIXME: capitalisation?
 msgid "The package cache file is an incompatible version"
 msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
 
 # FIXME: capitalisation?

-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:149

 #, 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'"
 
 #, fuzzy, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 

-#: apt-pkg/pkgcache.cc:147
+#: apt-pkg/pkgcache.cc:154

 msgid "The package cache was built for a different architecture"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 
 msgid "The package cache was built for a different architecture"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 

-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:225

 msgid "Depends"
 msgstr "Dibynnu"
 
 msgid "Depends"
 msgstr "Dibynnu"
 

-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:225

 msgid "PreDepends"
 msgstr "CynDdibynnu"
 
 msgid "PreDepends"
 msgstr "CynDdibynnu"
 

-#: apt-pkg/pkgcache.cc:218
+#: apt-pkg/pkgcache.cc:225

 msgid "Suggests"
 msgstr "Awgrymu"
 
 msgid "Suggests"
 msgstr "Awgrymu"
 

-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:226

 msgid "Recommends"
 msgstr "Argymell"
 
 msgid "Recommends"
 msgstr "Argymell"
 

-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:226

 msgid "Conflicts"
 msgstr "Gwrthdaro"
 
 msgid "Conflicts"
 msgstr "Gwrthdaro"
 

-#: apt-pkg/pkgcache.cc:219
+#: apt-pkg/pkgcache.cc:226

 msgid "Replaces"
 msgstr "Amnewid"
 
 msgid "Replaces"
 msgstr "Amnewid"
 

-#: apt-pkg/pkgcache.cc:220
+#: apt-pkg/pkgcache.cc:227

 msgid "Obsoletes"
 msgstr "Darfodi"
 
 msgid "Obsoletes"
 msgstr "Darfodi"
 

-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:227
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238

 msgid "important"
 msgstr "pwysig"
 
 msgid "important"
 msgstr "pwysig"
 

-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:238

 msgid "required"
 msgstr "angenrheidiol"
 
 msgid "required"
 msgstr "angenrheidiol"
 

-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:238

 msgid "standard"
 msgstr "safonnol"
 
 msgid "standard"
 msgstr "safonnol"
 

-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:239

 msgid "optional"
 msgstr "opsiynnol"
 
 msgid "optional"
 msgstr "opsiynnol"
 

-#: apt-pkg/pkgcache.cc:232
+#: apt-pkg/pkgcache.cc:239

 msgid "extra"
 msgstr "ychwanegol"
 
 msgid "extra"
 msgstr "ychwanegol"
 

-#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152

 #, fuzzy
 msgid "Building dependency tree"
 msgstr "Yn Aideladu Coeden Dibyniaeth"
 
 #, fuzzy
 msgid "Building dependency tree"
 msgstr "Yn Aideladu Coeden Dibyniaeth"
 

-#: apt-pkg/depcache.cc:62
+#: apt-pkg/depcache.cc:124

 #, fuzzy
 msgid "Candidate versions"
 msgstr "Fersiynau Posib"
 
 #, fuzzy
 msgid "Candidate versions"
 msgstr "Fersiynau Posib"
 

-#: apt-pkg/depcache.cc:91
+#: apt-pkg/depcache.cc:153

 #, fuzzy
 msgid "Dependency generation"
 msgstr "Cynhyrchaid Dibyniaeth"
 
 #, fuzzy
 msgid "Dependency generation"
 msgstr "Cynhyrchaid Dibyniaeth"
 

+#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: apt-pkg/depcache.cc:223
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
+
+#: apt-pkg/depcache.cc:229
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+

 # FIXME: number?
 # FIXME: number?

-#: apt-pkg/tagfile.cc:106
+#: apt-pkg/tagfile.cc:102

 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 

-#: apt-pkg/tagfile.cc:193
+#: apt-pkg/tagfile.cc:189

 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 

-#: apt-pkg/sourcelist.cc:94
+#: apt-pkg/sourcelist.cc:90

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
 

-#: apt-pkg/sourcelist.cc:96
+#: 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)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 

-#: apt-pkg/sourcelist.cc:99
+#: 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)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
 

-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:101

 #, fuzzy, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
 
 #, 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:112
+#: apt-pkg/sourcelist.cc:108

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 

-#: apt-pkg/sourcelist.cc:203
+#: apt-pkg/sourcelist.cc:206

 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 

-#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 

-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:243

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 

-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:247

 #, 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"
 
 #, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 

-#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258

 #, fuzzy, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
 #, fuzzy, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 

+#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+

 # FIXME: %s may have an arbirrary length
 # FIXME: %s may have an arbirrary length

-#: apt-pkg/packagemanager.cc:402
+#: apt-pkg/packagemanager.cc:440

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2463,12 +2605,19 @@ msgstr ""
 "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
 "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
 
 "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:37
+#: apt-pkg/packagemanager.cc:478
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
+#: apt-pkg/pkgrecords.cc:32

 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 

-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:248

 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."


@@ -2476,7 +2625,7 @@ msgstr ""
 "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
 "ei gyfer."
 
 "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
 "ei gyfer."
 

-#: apt-pkg/algorithms.cc:1066
+#: apt-pkg/algorithms.cc:1138

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."


@@ -2484,44 +2633,52 @@ msgstr ""
 "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
 "ei achosi gan pecynnau wedi eu dal."
 
 "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
 "ei achosi gan pecynnau wedi eu dal."
 

-#: apt-pkg/algorithms.cc:1068
+#: apt-pkg/algorithms.cc:1140

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 

-#: apt-pkg/acquire.cc:62
+#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+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."
+
+#: apt-pkg/acquire.cc:60

 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 

-#: apt-pkg/acquire.cc:66
+#: apt-pkg/acquire.cc:64

 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
 #. only show the ETA if it makes sense
 #. two days
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:830
+#: apt-pkg/acquire.cc:826

 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 

-#: apt-pkg/acquire.cc:832
+#: apt-pkg/acquire.cc:828

 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 

-#: apt-pkg/acquire-worker.cc:113
+#: apt-pkg/acquire-worker.cc:110

 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Methwyd canfod y gyrrydd dull %s."
 
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "Methwyd canfod y gyrrydd dull %s."
 

-#: apt-pkg/acquire-worker.cc:162
+#: apt-pkg/acquire-worker.cc:159

 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 

-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/acquire-worker.cc:413

 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 #, fuzzy, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""


@@ -2529,46 +2686,47 @@ msgstr ""
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 

-#: apt-pkg/init.cc:120
+#: apt-pkg/init.cc:133

 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Ni chynhelir y system pecynnu '%s'"
 
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Ni chynhelir y system pecynnu '%s'"
 

-#: apt-pkg/init.cc:136
+#: apt-pkg/init.cc:149

 #, fuzzy
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni ellir canfod math system addas"
 
 #, fuzzy
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Ni ellir canfod math system addas"
 

-#: apt-pkg/clean.cc:61
+#: apt-pkg/clean.cc:56

 #, c-format
 msgid "Unable to stat %s."
 msgstr "Ni ellir gwneud stat() o %s."
 
 # FIXME: ...file
 #, c-format
 msgid "Unable to stat %s."
 msgstr "Ni ellir gwneud stat() o %s."
 
 # FIXME: ...file

-#: apt-pkg/srcrecords.cc:48
+#: 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"
 
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
 

-#: apt-pkg/cachefile.cc:73
+#: 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."
 
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
 

-#: apt-pkg/cachefile.cc:77
+#: 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."
 
 # FIXME: literal
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
 
 # FIXME: literal

-#: apt-pkg/policy.cc:270
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:347
+#, fuzzy, c-format
+msgid "Invalid record in the preferences file %s, no Package header"

 msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense
 msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense

-#: apt-pkg/policy.cc:292
+#: apt-pkg/policy.cc:369

 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Methwyd daeall y math pin %s"
 
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Methwyd daeall y math pin %s"
 

-#: apt-pkg/policy.cc:300
+#: apt-pkg/policy.cc:377

 msgid "No priority (or zero) specified for pin"
 msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
 
 msgid "No priority (or zero) specified for pin"
 msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
 


@@ -2581,93 +2739,113 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas"
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
 
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
 

-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:132

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
 
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
 

-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:166
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:191

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
 
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
 

-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:195

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 

-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:226

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
 
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
 

-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:230

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
 
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
 

-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:234

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
 
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
 

-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:258
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:264

 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
 
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
 

-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:267

 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."
 
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 

-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:270
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:273

 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 "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:241
+#: apt-pkg/pkgcachegen.cc:301

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 

-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:314

 #, fuzzy, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
 
 #, fuzzy, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
 

-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:320

 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
 
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
 

-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:693

 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 

-#: apt-pkg/pkgcachegen.cc:658
+#: apt-pkg/pkgcachegen.cc:778

 msgid "Collecting File Provides"
 msgstr "Yn Casglu Darpariaethau Ffeil"
 
 msgid "Collecting File Provides"
 msgstr "Yn Casglu Darpariaethau Ffeil"
 

-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914

 msgid "IO Error saving source cache"
 msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
 
 msgid "IO Error saving source cache"
 msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
 

-#: apt-pkg/acquire-item.cc:126
+#: apt-pkg/acquire-item.cc:128

 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 

-#: apt-pkg/acquire-item.cc:243 apt-pkg/acquire-item.cc:952
+#: apt-pkg/acquire-item.cc:395

 msgid "MD5Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
 msgid "MD5Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 

-#: apt-pkg/acquire-item.cc:647
+#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
+
+#: apt-pkg/acquire-item.cc:1106

 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 # FIXME: case
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 # FIXME: case

-#: apt-pkg/acquire-item.cc:760
+#: apt-pkg/acquire-item.cc:1216

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "


@@ -2676,7 +2854,7 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 

-#: apt-pkg/acquire-item.cc:819
+#: apt-pkg/acquire-item.cc:1275

 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "


@@ -2685,181 +2863,311 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law."
 
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law."
 

-#: apt-pkg/acquire-item.cc:855
+#: apt-pkg/acquire-item.cc:1316

 #, 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."
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 

-#: apt-pkg/acquire-item.cc:942
+#: apt-pkg/acquire-item.cc:1403

 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 

+# FIXME: number?
+#: apt-pkg/indexrecords.cc:40
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/indexrecords.cc:47
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+

 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
 

-#: apt-pkg/cdrom.cc:507
+#: apt-pkg/cdrom.cc:525

 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622

 msgid "Identifying.. "
 msgstr ""
 
 msgid "Identifying.. "
 msgstr ""
 

-#: apt-pkg/cdrom.cc:541
+#: apt-pkg/cdrom.cc:559

 #, c-format
 #, c-format

-msgid "Stored label: %s \n"
+msgid "Stored label: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:561
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
+
+#: apt-pkg/cdrom.cc:585

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:579
+#: apt-pkg/cdrom.cc:603

 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:583
+#: apt-pkg/cdrom.cc:607

 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Yn aros am benawdau"
 
 #. Mount the new CDROM
 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Yn aros am benawdau"
 
 #. Mount the new CDROM

-#: apt-pkg/cdrom.cc:591
+#: apt-pkg/cdrom.cc:615

 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc:633

 msgid "Scanning disc for index files..\n"
 msgstr ""
 
 msgid "Scanning disc for index files..\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:647
+#: apt-pkg/cdrom.cc:673

 #, c-format
 #, c-format

-msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:684
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:683
+#: apt-pkg/cdrom.cc:710

 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:712
+#: apt-pkg/cdrom.cc:739

 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:728
+#: apt-pkg/cdrom.cc:755

 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:732
+#: apt-pkg/cdrom.cc:759

 #, fuzzy
 msgid "Copying package lists..."
 msgstr "Yn Darllen Rhestrau Pecynnau"
 
 #, fuzzy
 msgid "Copying package lists..."
 msgstr "Yn Darllen Rhestrau Pecynnau"
 

-#: apt-pkg/cdrom.cc:756
+#: apt-pkg/cdrom.cc:785

 #, fuzzy
 msgid "Writing new source list\n"
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
 #, fuzzy
 msgid "Writing new source list\n"
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 

-#: apt-pkg/cdrom.cc:765
+#: apt-pkg/cdrom.cc:794

 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:807
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
-
-#: apt-pkg/indexcopy.cc:261
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835

 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:263
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837

 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:266
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840

 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:269
+#: 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 ""
 
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:358
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+msgid "Skipping nonexistent file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"
+
+#: apt-pkg/deb/dpkgpm.cc:49
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:558
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/deb/dpkgpm.cc:654

 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Yn agor %s"
 

-#: apt-pkg/deb/dpkgpm.cc:359
+#: apt-pkg/deb/dpkgpm.cc:655

 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Yn agor %s"
 

-#: apt-pkg/deb/dpkgpm.cc:364
+#: apt-pkg/deb/dpkgpm.cc:660

 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 

-#: apt-pkg/deb/dpkgpm.cc:365
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Yn cysylltu i %s"
-
-#: apt-pkg/deb/dpkgpm.cc:366
+#: apt-pkg/deb/dpkgpm.cc:662

 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 

-#: apt-pkg/deb/dpkgpm.cc:371
+#: apt-pkg/deb/dpkgpm.cc:667

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:372
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/deb/dpkgpm.cc:373
+#: apt-pkg/deb/dpkgpm.cc:669

 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 

-#: apt-pkg/deb/dpkgpm.cc:378
+#: apt-pkg/deb/dpkgpm.cc:674

 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 

-#: apt-pkg/deb/dpkgpm.cc:379
+#: apt-pkg/deb/dpkgpm.cc:675

 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 

+#: apt-pkg/deb/dpkgpm.cc:879
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:909
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:73
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"
+msgstr ""
+
+#: methods/rred.cc:219
+#, fuzzy
+msgid "Could not patch file"
+msgstr "Methwyd agor ffeil %s"
+

 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 

-#~ msgid "File date has changed %s"
-#~ msgstr "Dyddiad ffeil wedi newid %s"
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
+# FIXME: commas, wrapping
+#~ msgid ""
+#~ "Since you only requested a single operation it is extremely likely that\n"
+#~ "the package is simply not installable and a bug report against\n"
+#~ "that package should be filed."
+#~ msgstr ""
+#~ "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
+#~ "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
+
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linell %d yn rhy hir (uchaf %d)"
+
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linell %d yn rhy hir (uchaf %d)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"

 
 #, fuzzy
 
 #, fuzzy

-#~ msgid "Could not patch file"
-#~ msgstr "Methwyd agor ffeil %s"
+#~ msgid "openpty failed\n"
+#~ msgstr "Methwyd dewis"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Dyddiad ffeil wedi newid %s"

 
 #, fuzzy
 #~ msgid "Reading file list"
 
 #, fuzzy
 #~ msgid "Reading file list"