* cmdline/apt-key:

[apt.git] / po / cy.po

diff --git a/po/cy.po b/po/cy.po
index d8360fc3f648c6fb5c0088df327eced73c1bfb15..078d897259624964696ad0dec161ab8c9f4454e7 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: 2004-04-29 21:56-0700\n"
+"POT-Creation-Date: 2007-12-17 05:49+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,145 +14,173 @@ 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:133
+#: cmdline/apt-cache.cc:143

 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 
 #, 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:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613
-#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1355
-#: cmdline/apt-cache.cc:1506
+#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
+#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
+#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570

 #, 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:230
-msgid "Total Package Names : "
+#: cmdline/apt-cache.cc:247
+#, fuzzy
+msgid "Total package names : "

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

-#: cmdline/apt-cache.cc:270
-msgid "  Normal Packages: "
+#: cmdline/apt-cache.cc:287
+#, fuzzy
+msgid "  Normal packages: "

 msgstr "  Pecynnau Normal: "
 
 msgstr "  Pecynnau Normal: "
 

-#: cmdline/apt-cache.cc:271
-msgid "  Pure Virtual Packages: "
+#: cmdline/apt-cache.cc:288
+#, fuzzy
+msgid "  Pure virtual packages: "

 msgstr "  Pecynnau Cwbl Rhithwir: "
 
 msgstr "  Pecynnau Cwbl Rhithwir: "
 

-#: cmdline/apt-cache.cc:272
-msgid "  Single Virtual Packages: "
+#: cmdline/apt-cache.cc:289
+#, fuzzy
+msgid "  Single virtual packages: "

 msgstr "  Pecynnau Rhithwir Sengl: "
 
 msgstr "  Pecynnau Rhithwir Sengl: "
 

-#: cmdline/apt-cache.cc:273
-msgid "  Mixed Virtual Packages: "
+#: cmdline/apt-cache.cc:290
+#, fuzzy
+msgid "  Mixed virtual packages: "

 msgstr "  Pecynnau Rhithwir Cymysg: "
 
 msgstr "  Pecynnau Rhithwir Cymysg: "
 

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

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

-#: cmdline/apt-cache.cc:276
-msgid "Total Distinct Versions: "
+#: cmdline/apt-cache.cc:293
+#, fuzzy
+msgid "Total distinct versions: "

 msgstr "Cyfanswm Fersiynau Gwahanol: "
 
 msgstr "Cyfanswm Fersiynau Gwahanol: "
 

-#: cmdline/apt-cache.cc:278
-msgid "Total Dependencies: "
+#: cmdline/apt-cache.cc:295
+#, fuzzy
+msgid "Total Distinct Descriptions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "
+
+#: cmdline/apt-cache.cc:297
+#, fuzzy
+msgid "Total dependencies: "

 msgstr "Cyfanswm Dibyniaethau: "
 
 msgstr "Cyfanswm Dibyniaethau: "
 

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

 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 

-#: cmdline/apt-cache.cc:283
-msgid "Total Provides Mappings: "
+#: cmdline/apt-cache.cc:304
+#, fuzzy
+msgid "Total Provides mappings: "

 msgstr "Cyfanswm Mapiau Darpariath: "
 
 msgstr "Cyfanswm Mapiau Darpariath: "
 

-#: cmdline/apt-cache.cc:295
-msgid "Total Globbed Strings: "
+#: cmdline/apt-cache.cc:316
+#, fuzzy
+msgid "Total globbed strings: "

 msgstr "Cyfanswm Llinynau Glob: "
 
 msgstr "Cyfanswm Llinynau Glob: "
 

-#: cmdline/apt-cache.cc:309
-msgid "Total Dependency Version space: "
+#: cmdline/apt-cache.cc:330
+#, fuzzy
+msgid "Total dependency version space: "

 msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
 msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 

-#: cmdline/apt-cache.cc:314
-msgid "Total Slack space: "
+#: cmdline/apt-cache.cc:335
+#, fuzzy
+msgid "Total slack space: "

 msgstr "Cyfanswm gofod Slac: "
 
 msgstr "Cyfanswm gofod Slac: "
 

-#: cmdline/apt-cache.cc:322
-msgid "Total Space Accounted for: "
+#: cmdline/apt-cache.cc:343
+#, fuzzy
+msgid "Total space accounted for: "

 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
 msgstr "Cyfanswm Gofod Cyfrifwyd: "
 

-#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218

 #, 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:1229
+#: cmdline/apt-cache.cc:1293

 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:1383
+#: cmdline/apt-cache.cc:1447

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

-#: cmdline/apt-cache.cc:1460
-msgid "Package Files:"
+#: cmdline/apt-cache.cc:1524
+#, fuzzy
+msgid "Package files:"

 msgstr "Ffeiliau Pecynnau:"
 
 msgstr "Ffeiliau Pecynnau:"
 

-#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 
 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:1468
+#: cmdline/apt-cache.cc:1532

 #, c-format
 msgid "%4i %s\n"
 msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins
 #, c-format
 msgid "%4i %s\n"
 msgstr "%4i %s\n"
 
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1480
-msgid "Pinned Packages:"
+#: cmdline/apt-cache.cc:1544
+#, fuzzy
+msgid "Pinned packages:"

 msgstr "Pecynnau wedi eu Pinio:"
 
 msgstr "Pecynnau wedi eu Pinio:"
 

-#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597

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

-#: cmdline/apt-cache.cc:1513
+#: cmdline/apt-cache.cc:1577

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

-#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587

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

-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1584

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

-#: cmdline/apt-cache.cc:1530
-msgid "  Package Pin: "
+#: cmdline/apt-cache.cc:1594
+#, fuzzy
+msgid "  Package pin: "

 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
 msgstr "  Pin Pecyn: "
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1539
-msgid "  Version Table:"
+#: cmdline/apt-cache.cc:1603
+#, fuzzy
+msgid "  Version table:"

 msgstr "  Tabl Fersiynnau:"
 
 msgstr "  Tabl Fersiynnau:"
 

-#: cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1618

 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 
 #, c-format
 msgid "       %4i %s\n"
 msgstr "       %4i %s\n"
 

-#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2299 cmdline/apt-sortpkgs.cc:144
-#, c-format
-msgid "%s %s for %s %s compiled on %s %s\n"
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2601 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:1588
+#: cmdline/apt-cache.cc:1721
+#, fuzzy

 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"


@@ -187,7 +215,7 @@ msgid ""
 "  -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"
 msgstr ""
 "Defnydd: apt-cache [opsiynnau] gorchymyn\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 "Defnydd: apt-cache [opsiynnau] gorchymyn\n"


@@ -226,11 +254,28 @@ msgstr ""
 "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 
 "  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 

+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+#, fuzzy
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+

 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 
 #: cmdline/apt-config.cc:76
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 
 #: cmdline/apt-config.cc:76

+#, fuzzy

 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"


@@ -243,8 +288,9 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-msgstr "Defnydd: apt-config [opsiynnau] gorchymyn\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-config [opsiynnau] gorchymyn\n"

 "\n"
 "Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
 "\n"
 "\n"
 "Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
 "\n"


@@ -264,6 +310,7 @@ msgstr "Nid yw %s yn becyn DEB dilys."
 
 # FIXME: "debian"
 #: cmdline/apt-extracttemplates.cc:232
 
 # FIXME: "debian"
 #: cmdline/apt-extracttemplates.cc:232

+#, fuzzy

 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"


@@ -274,7 +321,7 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -t   Set the temp dir\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"

 msgstr ""
 "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
 "\n"
 msgstr ""
 "Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
 "\n"


@@ -287,7 +334,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:815

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


@@ -296,32 +343,33 @@ 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:163 ftparchive/apt-ftparchive.cc:337
+#: 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:165 ftparchive/apt-ftparchive.cc:179
-#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
-#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
-#, c-format
-msgid "Error Processing directory %s"
+#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
+#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
+#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#, fuzzy, c-format
+msgid "Error processing directory %s"

 msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
 
 msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
 

-#: ftparchive/apt-ftparchive.cc:250
+#: 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:367
+#: 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:397
-#, c-format
-msgid "Error Processing Contents %s"
+#: ftparchive/apt-ftparchive.cc:398
+#, fuzzy, c-format
+msgid "Error processing contents %s"

 msgstr "Gwall wrth Brosesu Cynnwys %s"
 
 # FIXME: full stops
 msgstr "Gwall wrth Brosesu Cynnwys %s"
 
 # FIXME: full stops

-#: ftparchive/apt-ftparchive.cc:551
+#: ftparchive/apt-ftparchive.cc:553
+#, fuzzy

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -360,7 +408,7 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"

-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"

 msgstr ""
 "Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
 "Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
 msgstr ""
 "Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
 "Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"


@@ -372,8 +420,7 @@ msgstr ""
 "\n"
 "Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
 "Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
 "\n"
 "Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
 "Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"

-"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a "
-"dpkg-scansources.\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"

 "\n"
 "Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
 "Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
 "\n"
 "Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
 "Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"


@@ -403,411 +450,461 @@ 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:757
+#: 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:830
+#: 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:45
+#: 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:63
+#: 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:73
+#: 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 ""
+
+#: 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:114
+#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
+#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117

 #, c-format
 #, c-format

-msgid "File date has changed %s"
-msgstr "Dyddiad ffeil wedi newid %s"
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"

 
 

-#: ftparchive/cachedb.cc:155
+#: 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:267
+#: 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:126
+#: ftparchive/writer.cc:132

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

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

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

-#: ftparchive/writer.cc:135
+#: 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:152 ftparchive/writer.cc:182
+#: 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:164
+#: 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:189
+#: 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:246
+#: 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:254
+#: 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:258
+#: 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:265
+#: 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:275
+#: 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:352 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
-
-#: ftparchive/writer.cc:372
+#: ftparchive/writer.cc:387

 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:380 ftparchive/writer.cc:589
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610

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

-#: ftparchive/writer.cc:423 ftparchive/writer.cc:671
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698

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

-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/writer.cc:620
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/writer.cc:624
+#, fuzzy, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+
+#: ftparchive/contents.cc:321
+#, fuzzy, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389

 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Methwyd neilltuo cof"
 
 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
-#, c-format
-msgid "Unknown Compresison Algorithm '%s'"
+#: ftparchive/multicompress.cc:72
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"

 msgstr "Dull Cywasgu Anhysbys '%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
-msgid "Compress Child"
+#: ftparchive/multicompress.cc:212
+#, fuzzy
+msgid "Compress child"

 msgstr "Plentyn Cywasgu"
 
 msgstr "Plentyn Cywasgu"
 

-#: ftparchive/multicompress.cc:238
-#, c-format
-msgid "Internal Error, Failed to create %s"
+#: ftparchive/multicompress.cc:235
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"

 msgstr "Gwall Mewnol, Methwyd creu %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:118
+#: cmdline/apt-get.cc:124

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

-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1466
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1681

 #, 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:235
+#: cmdline/apt-get.cc:241

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

 #, 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:327
+#: cmdline/apt-get.cc:333

 #, 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:334
+#: cmdline/apt-get.cc:340

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

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

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

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

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

-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:379

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

 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:421
-msgid "The following packages have been kept back"
+#: cmdline/apt-get.cc:427
+#, fuzzy
+msgid "The following packages have been kept back:"

 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
 msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 

-#: cmdline/apt-get.cc:442
-msgid "The following packages will be upgraded"
+#: cmdline/apt-get.cc:448
+#, fuzzy
+msgid "The following packages will be upgraded:"

 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
 msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 

-#: cmdline/apt-get.cc:463
-msgid "The following packages will be DOWNGRADED"
+#: cmdline/apt-get.cc:469
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"

 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
 msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 

-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:489

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

 #, 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:544
+#: cmdline/apt-get.cc:550
+#, fuzzy

 msgid ""
 msgid ""

-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"

 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 "RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
 "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
 "ei wneud!"
 
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 "RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
 "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
 "ei wneud!"
 

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

 #, 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:579
+#: cmdline/apt-get.cc:585

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

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

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

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

 #, 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:587
+#: cmdline/apt-get.cc:593

 #, 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:647
+#: cmdline/apt-get.cc:667

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

-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:670

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

-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:673

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

-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:676

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

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

-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:682

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

 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:687
-msgid "WARNING: The following packages cannot be securely authenticated!"
+#: cmdline/apt-get.cc:707
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"

 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 

-#: cmdline/apt-get.cc:698
-msgid "Abort? [Y/n] "
-msgstr "Erthylu? [I/n] "
+#: cmdline/apt-get.cc:711
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:718
+msgid "Install these packages without verification [y/N]? "
+msgstr ""
+
+#: cmdline/apt-get.cc:720
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+
+#: cmdline/apt-get.cc:773
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:755
-msgid "Packages need to be removed but Remove is disabled."
+#: cmdline/apt-get.cc:782
+#, fuzzy
+msgid "Packages need to be removed but remove is disabled."

 msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 
 msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 

-#: cmdline/apt-get.cc:781 cmdline/apt-get.cc:1755 cmdline/apt-get.cc:1788
+#: cmdline/apt-get.cc:793
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:2020 cmdline/apt-get.cc:2053

 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:791 cmdline/apt-get.cc:1836 cmdline/apt-get.cc:2047
-#: apt-pkg/cachefile.cc:67
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2347
+#: apt-pkg/cachefile.cc:63

 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:811
+#: cmdline/apt-get.cc:834
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+
+#: cmdline/apt-get.cc:839

 #, 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:814
+#: cmdline/apt-get.cc:842

 #, 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:819
-#, c-format
-msgid "After unpacking %sB of additional disk space will be used.\n"
+#: cmdline/apt-get.cc:847
+#, 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:822
-#, c-format
-msgid "After unpacking %sB disk space will be freed.\n"
+#: cmdline/apt-get.cc:850
+#, 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:839
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2196
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"
+
+#: cmdline/apt-get.cc:871

 #, 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:848
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907

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

 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:858
-#, c-format
+#: cmdline/apt-get.cc:891
+#, fuzzy, c-format

 msgid ""
 msgid ""

-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"

 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""


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

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916

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

-#: cmdline/apt-get.cc:879
-msgid "Do you want to continue? [Y/n] "
+#: cmdline/apt-get.cc:912
+#, fuzzy
+msgid "Do you want to continue [Y/n]? "

 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 

-#: cmdline/apt-get.cc:954 cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:1391 cmdline/apt-get.cc:2244

 #, 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:972
+#: cmdline/apt-get.cc:1002

 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:973 cmdline/apt-get.cc:1954
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2253

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

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


@@ -844,103 +942,103 @@ 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:983
+#: cmdline/apt-get.cc:1013

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

 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:989
-msgid "Aborting Install."
+#: cmdline/apt-get.cc:1019
+#, fuzzy
+msgid "Aborting install."

 msgstr "Yn Erthylu'r Sefydliad."
 
 msgstr "Yn Erthylu'r Sefydliad."
 

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

 #, 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:1032
+#: cmdline/apt-get.cc:1063

 #, 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:1050
+#: cmdline/apt-get.cc:1081

 #, 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:1061
+#: cmdline/apt-get.cc:1092

 #, 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:1073
+#: cmdline/apt-get.cc:1104

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

-#: cmdline/apt-get.cc:1078
+#: cmdline/apt-get.cc:1109

 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:1083
-#, c-format
+#: cmdline/apt-get.cc:1114
+#, fuzzy, c-format

 msgid ""
 msgid ""

-"Package %s has no available version, but exists in the database.\n"
-"This typically means that the package was mentioned in a dependency and\n"
-"never uploaded, has been obsoleted or is not available with the contents\n"
-"of sources.list\n"
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"

 msgstr ""
 "Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
 "Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
 "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
 "ffeil sources.list.\n"
 
 msgstr ""
 "Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
 "Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
 "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
 "ffeil sources.list.\n"
 

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

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

 #, 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:1126
+#: cmdline/apt-get.cc:1156

 #, 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:1134
+#: cmdline/apt-get.cc:1164

 #, 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:1161
+#: cmdline/apt-get.cc:1193

 #, 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:1163
+#: cmdline/apt-get.cc:1195

 #, 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:1169
+#: cmdline/apt-get.cc:1201

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

-#: cmdline/apt-get.cc:1279
+#: cmdline/apt-get.cc:1338

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

 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:1344
+#: cmdline/apt-get.cc:1418 cmdline/apt-get.cc:1420

 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."


@@ -948,26 +1046,67 @@ msgstr ""
 "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
 "rai eu defnyddio yn lle."
 
 "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
 "rai eu defnyddio yn lle."
 

-#: cmdline/apt-get.cc:1363
-msgid "Internal Error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1441
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1473
+#, fuzzy
+msgid ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: cmdline/apt-get.cc:1475
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1480
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1483 cmdline/apt-get.cc:1763
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+
+#: cmdline/apt-get.cc:1487
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"

 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 

-#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1489
+#: cmdline/apt-get.cc:1506
+#, fuzzy
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc:1553
+#, fuzzy, c-format
+msgid "Couldn't find task %s"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:1668 cmdline/apt-get.cc:1704

 #, 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:1476
+#: cmdline/apt-get.cc:1691

 #, 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:1506
+#: cmdline/apt-get.cc:1722
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-get.cc:1735

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

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


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

-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1750

 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"


@@ -989,7 +1128,7 @@ msgstr ""
 "heb gael eu symud allan o Incoming."
 
 # FIXME: commas, wrapping
 "heb gael eu symud allan o Incoming."
 
 # FIXME: commas, wrapping

-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1758

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


@@ -998,147 +1137,164 @@ 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."
 
 "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:1534
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1766

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

-#: cmdline/apt-get.cc:1563
+#: cmdline/apt-get.cc:1795

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

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

-#: cmdline/apt-get.cc:1630
+#: cmdline/apt-get.cc:1885

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

-#: cmdline/apt-get.cc:1650
-msgid "Calculating Upgrade... "
+#: cmdline/apt-get.cc:1913
+#, fuzzy
+msgid "Calculating upgrade... "

 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 

-#: cmdline/apt-get.cc:1653 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1916 methods/ftp.cc:702 methods/connect.cc:101

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

-#: cmdline/apt-get.cc:1658
+#: cmdline/apt-get.cc:1921

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

-#: cmdline/apt-get.cc:1831
+#: cmdline/apt-get.cc:1988 cmdline/apt-get.cc:1996
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc:2096

 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:1858 cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:2126 cmdline/apt-get.cc:2365

 #, 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:1905
+#: cmdline/apt-get.cc:2175
+#, 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:2203

 #, 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:1910
+#: cmdline/apt-get.cc:2209

 #, 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:1913
+#: cmdline/apt-get.cc:2212

 #, 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:1919
-#, c-format
-msgid "Fetch Source %s\n"
+#: cmdline/apt-get.cc:2218
+#, fuzzy, c-format
+msgid "Fetch source %s\n"

 msgstr "Cyrchu Ffynhonell %s\n"
 
 msgstr "Cyrchu Ffynhonell %s\n"
 

-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:2249

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

 #, 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:1990
+#: cmdline/apt-get.cc:2289

 #, 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:2007
+#: cmdline/apt-get.cc:2290
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2307

 #, 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:2026
+#: cmdline/apt-get.cc:2326

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

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

 msgid "Must specify at least one package to check builddeps for"
 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"
+msgstr ""
+"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"

 
 

-#: cmdline/apt-get.cc:2070
+#: cmdline/apt-get.cc:2370

 #, 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:2090
+#: cmdline/apt-get.cc:2390

 #, 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:2142
+#: cmdline/apt-get.cc:2442

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

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

 
 

-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2495

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""

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

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

 
 

-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2556

 #, 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:2268
+#: cmdline/apt-get.cc:2570

 #, 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:2272
+#: cmdline/apt-get.cc:2574

 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:2304
-msgid "Supported Modules:"
+#: cmdline/apt-get.cc:2606
+#, fuzzy
+msgid "Supported modules:"

 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split

-#: cmdline/apt-get.cc:2345
+#: cmdline/apt-get.cc:2647
+#, fuzzy

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1153,6 +1309,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 all automatic unused packages\n"
+"   purge - Remove and purge packages\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1174,7 +1332,7 @@ msgid ""
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"


@@ -1242,13 +1400,14 @@ msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
 
 #: cmdline/acqprogress.cc:225
 msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
 
 #: cmdline/acqprogress.cc:225

+#, c-format

 msgid " [Working]"
 msgstr " [Gweithio]"
 
 #: cmdline/acqprogress.cc:271
 msgid " [Working]"
 msgstr " [Gweithio]"
 
 #: cmdline/acqprogress.cc:271

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

 msgid ""
 msgid ""

-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"

 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""


@@ -1261,6 +1420,7 @@ msgid "Unknown package record!"
 msgstr "Cofnod pecyn anhysbys!"
 
 #: cmdline/apt-sortpkgs.cc:150
 msgstr "Cofnod pecyn anhysbys!"
 
 #: cmdline/apt-sortpkgs.cc:150

+#, fuzzy

 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"


@@ -1271,7 +1431,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -s   Use source file sorting\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"

 msgstr ""
 "Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
 "\n"
 msgstr ""
 "Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
 "\n"


@@ -1313,193 +1473,201 @@ msgstr ""
 "eto."
 
 #: dselect/update:30
 "eto."
 
 #: dselect/update:30

-msgid "Merging Available information"
+#, fuzzy
+msgid "Merging available information"

 msgstr "Yn cyfuno manylion Ar Gael"
 
 msgstr "Yn cyfuno manylion Ar Gael"
 

-#: apt-inst/contrib/extracttar.cc:115
+#: 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:140
+#: 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:177 apt-inst/contrib/extracttar.cc:203
+#: 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:192
-msgid "Tar Checksum failed, archive corrupted"
+#: apt-inst/contrib/extracttar.cc:193
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"

 msgstr "Methodd swm gwirio Tar, archif llygredig"
 
 msgstr "Methodd swm gwirio Tar, archif llygredig"
 

-#: apt-inst/contrib/extracttar.cc:295
+#: 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 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
-msgid "Internal Error in AddDiversion"
+#: apt-inst/filelist.cc:464
+#, fuzzy
+msgid "Internal error in AddDiversion"

 msgstr "Gwall Mewnol yn 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
-#, c-format
-msgid "Failed write file %s"
+#: 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"
 
 msgstr "Methwyd ysgrifennu ffeil %s"
 

-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: 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"
 #, 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"
+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:709
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:753
+#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34

 #, 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
-msgid "Reading Package Lists"
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
+#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
+#: apt-pkg/pkgcachegen.cc:945
+#, fuzzy
+msgid "Reading package lists"

 msgstr "Yn Darllen Rhestrau Pecynnau"
 
 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
-msgid "Internal Error getting a Package Name"
+#: 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"
 
 msgstr "Gwall mewnol wrth gyrchu enw pecyn"
 

-#: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#, fuzzy
+msgid "Reading file listing"

 msgstr "Yn Darllen Rhestr Ffeiliau"
 
 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 "


@@ -1510,121 +1678,130 @@ 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
-msgid "Internal Error getting a Node"
+#: apt-inst/deb/dpkgdb.cc:262
+#, fuzzy
+msgid "Internal error getting a node"

 msgstr "Gwall Mewnol wrth gael Nôd"
 
 # FIXME: literal
 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
-msgid "Internal Error adding a diversion"
+#: apt-inst/deb/dpkgdb.cc:358
+#, fuzzy
+msgid "Internal error adding a diversion"

 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 

-#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+#: 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"
 
 msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
 

-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
-msgstr "Yn Darllen Rhestr Ffeiliau"
-
-#: apt-inst/deb/dpkgdb.cc:443
-#, c-format
-msgid "Failed to find a Package: Header, offset %lu"
+#: 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"
 
 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:55
+#: 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:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+#: apt-inst/deb/debfile.cc:50
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"

 
 

-#: apt-inst/deb/debfile.cc:104
+#: 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:125
-msgid "Internal Error, could not locate member"
+#: apt-inst/deb/debfile.cc:140
+#, fuzzy
+msgid "Internal error, could not locate member"

 msgstr "Gwall Methwyd, methwyd lleoli aelod"
 
 msgstr "Gwall Methwyd, methwyd lleoli aelod"
 

-#: apt-inst/deb/debfile.cc:158
+#: 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:243
-msgid "Unparsible control file"
+#: apt-inst/deb/debfile.cc:258
+#, fuzzy
+msgid "Unparsable control file"

 msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
 msgstr "Ffeil rheoli ni ellir ei ramadegu"
 

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

 #, 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:122
+#: methods/cdrom.cc:123
+#, fuzzy

 msgid ""
 msgid ""

-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"

 msgstr ""
 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:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+#: methods/cdrom.cc:131
+#, fuzzy
+msgid "Wrong CD-ROM"

 msgstr "CD Anghywir"
 
 msgstr "CD Anghywir"
 

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

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

 
 

-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:171
+#, fuzzy
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/cdrom.cc:179 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/gzip.cc:133 methods/gzip.cc:142
+#: 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/gzip.cc:139
+#: 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"
 

-#: methods/file.cc:42
+#: methods/file.cc:44

 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
 
 msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
 


@@ -1642,8 +1819,8 @@ msgid "Unable to determine the local name"
 msgstr "Ni ellir darganfod yr enw lleol"
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 msgstr "Ni ellir darganfod yr enw lleol"
 
 #: methods/ftp.cc:204 methods/ftp.cc:232

-#, c-format
-msgid "Server refused our connection and said: %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
 msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
 
 #: methods/ftp.cc:210


@@ -1661,8 +1838,8 @@ msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""

-"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae "
-"Acquire::ftp::ProxyLogin yn wag.)"
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
+"ProxyLogin yn wag.)"

 
 # FIXME
 #: methods/ftp.cc:265
 
 # FIXME
 #: methods/ftp.cc:265


@@ -1683,7 +1860,7 @@ msgstr "Goramser cysylltu"
 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:452 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190

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


@@ -1695,9 +1872,9 @@ msgstr "Gorlifodd ateb y byffer."
 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 
 msgid "Protocol corruption"
 msgstr "Llygr protocol"
 

-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
-msgstr "Gwall Ysgrifennu"
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
+msgid "Write error"
+msgstr "Gwall ysgrifennu"

 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgid "Could not create a socket"


@@ -1708,7 +1885,8 @@ msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
 #: methods/ftp.cc:704
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
 #: methods/ftp.cc:704

-msgid "Could not connect passive socket"
+#, fuzzy
+msgid "Could not connect passive socket."

 msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME
 msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME


@@ -1750,7 +1928,7 @@ msgstr "Goramserodd cysylltiad y soced data"
 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:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303

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


@@ -1774,7 +1952,7 @@ msgid "Query"
 msgstr "Ymholiad"
 
 # FIXME
 msgstr "Ymholiad"
 
 # FIXME

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

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


@@ -1798,481 +1976,550 @@ msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
 
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
 

-#: methods/connect.cc:92
+#: methods/connect.cc:93

 #, 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:104
+#: methods/connect.cc:108

 #, 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:132 methods/rsh.cc:425
+#: methods/connect.cc:136 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:163
+#: methods/connect.cc:167

 #, 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:167
+#: methods/connect.cc:173

 #, 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:169
+#: methods/connect.cc:176

 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 

-#: methods/connect.cc:216
+#: methods/connect.cc:223

 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Methwyd cysylltu i %s %s:"
 
 #, c-format
 msgid "Unable to connect to %s %s:"
 msgstr "Methwyd cysylltu i %s %s:"
 

-#: methods/gzip.cc:57
+#: methods/gpgv.cc:65
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Methwyd datrys '%s'"
+
+#: methods/gpgv.cc:101
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:205
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+
+#: methods/gpgv.cc:210
+msgid "At least one invalid signature was encountered."
+msgstr ""
+
+#: methods/gpgv.cc:214
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr ""
+
+#: methods/gpgv.cc:219
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:250
+#, fuzzy
+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+
+#: methods/gpgv.cc:257
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+
+#: methods/gzip.cc:64

 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Methwyd agor pibell ar gyfer %s"
 
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Methwyd agor pibell ar gyfer %s"
 

-#: methods/gzip.cc:102
+#: methods/gzip.cc:109

 #, c-format
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 
 #, c-format
 msgid "Read error from %s process"
 msgstr "Gwall darllen o broses %s"
 

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

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

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

 #, 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:494
+#: methods/http.cc:531

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

-#: methods/http.cc:513 methods/http.cc:520
-msgid "The http server sent an invalid reply header"
+#: methods/http.cc:550 methods/http.cc:557
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"

 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
 msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 

-#: methods/http.cc:549
-msgid "The http server sent an invalid Content-Length header"
+#: methods/http.cc:586
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"

 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 

-#: methods/http.cc:564
-msgid "The http server sent an invalid Content-Range header"
+#: methods/http.cc:601
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"

 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
 msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 

-#: methods/http.cc:566
-msgid "This http server has broken range support"
+#: methods/http.cc:603
+#, fuzzy
+msgid "This HTTP server has broken range support"

 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
 msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 

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

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

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

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

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

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

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

 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:789
+#: methods/http.cc:833

 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:814
+#: methods/http.cc:861

 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:828
-msgid "Error reading from server Remote end closed connection"
+#: methods/http.cc:875
+#, fuzzy
+msgid "Error reading from server. Remote end closed connection"

 msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 
 msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 

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

 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:1061
-msgid "Bad header Data"
+#: methods/http.cc:1104
+#, fuzzy
+msgid "Bad header data"

 msgstr "Data pennawd gwael"
 
 msgstr "Data pennawd gwael"
 

-#: methods/http.cc:1078
+#: methods/http.cc:1121 methods/http.cc:1176

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

-#: methods/http.cc:1169
+#: methods/http.cc:1228

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

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

 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:85

 #, 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:941
+#: apt-pkg/contrib/strutl.cc:978

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

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

 #, 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:471
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:515
+#, fuzzy, c-format
+msgid "Line %d too long (max %u)"

 msgstr "Linell %d yn rhy hir (uchaf %d)"
 
 msgstr "Linell %d yn rhy hir (uchaf %d)"
 

-#: apt-pkg/contrib/configuration.cc:567
+#: apt-pkg/contrib/configuration.cc:611

 #, 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:586
-#, c-format
-msgid "Syntax error %s:%u: Malformed Tag"
+#: apt-pkg/contrib/configuration.cc:630
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: Malformed tag"

 msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 
 msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 

-#: apt-pkg/contrib/configuration.cc:603
+#: apt-pkg/contrib/configuration.cc:647

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

 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 #, 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"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"

 
 

-#: apt-pkg/contrib/configuration.cc:650
+#: apt-pkg/contrib/configuration.cc:694

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

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

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

 #, 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:154
+#: 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:156
+#: 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:418 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40

 #, c-format
 msgid "Unable to change to %s"
 msgstr "Ni ellir newid i %s"
 
 #, 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:187

 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:80
+#: apt-pkg/contrib/fileutl.cc:82

 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
 
 #, 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:85
+#: apt-pkg/contrib/fileutl.cc:87

 #, 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:103
+#: apt-pkg/contrib/fileutl.cc:105

 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
 
 #, 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:107
+#: apt-pkg/contrib/fileutl.cc:109

 #, 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:358
-#, c-format
-msgid "Waited, for %s but it wasn't there"
+#: apt-pkg/contrib/fileutl.cc:377
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"

 msgstr "Arhoswyd am %s ond nid oedd e yna"
 
 msgstr "Arhoswyd am %s ond nid oedd e yna"
 

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

 #, 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:371
+#: apt-pkg/contrib/fileutl.cc:390

 #, 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:373
+#: apt-pkg/contrib/fileutl.cc:392

 #, 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:417
+#: apt-pkg/contrib/fileutl.cc:436

 #, 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:473
+#: apt-pkg/contrib/fileutl.cc:492

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

-#: apt-pkg/contrib/fileutl.cc:491
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
-

 # FIXME
 # FIXME

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

 #, 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:578
+#: apt-pkg/contrib/fileutl.cc:597

 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:584
+#: apt-pkg/contrib/fileutl.cc:603

 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:595
+#: apt-pkg/contrib/fileutl.cc:614

 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:132

 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:138

 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:143

 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
-#, c-format
-msgid "This APT does not support the Versioning System '%s'"
+#: apt-pkg/pkgcache.cc:148
+#, fuzzy, c-format
+msgid "This APT does not support the versioning system '%s'"

 msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 
 msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 

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

 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:224

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:237

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

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

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

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

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

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

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

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

 msgid "extra"
 msgstr "ychwanegol"
 
 msgid "extra"
 msgstr "ychwanegol"
 

-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#, fuzzy
+msgid "Building dependency tree"

 msgstr "Yn Aideladu Coeden Dibyniaeth"
 
 msgstr "Yn Aideladu Coeden Dibyniaeth"
 

-#: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+#: apt-pkg/depcache.cc:122
+#, fuzzy
+msgid "Candidate versions"

 msgstr "Fersiynau Posib"
 
 msgstr "Fersiynau Posib"
 

-#: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+#: apt-pkg/depcache.cc:151
+#, fuzzy
+msgid "Dependency generation"

 msgstr "Cynhyrchaid Dibyniaeth"
 
 msgstr "Cynhyrchaid Dibyniaeth"
 

+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: apt-pkg/depcache.cc:219
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
+
+#: apt-pkg/depcache.cc:225
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+

 # FIXME: number?
 # FIXME: number?

-#: apt-pkg/tagfile.cc:73
+#: 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:160
+#: 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:87
+#: 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:89
+#: 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:92
+#: 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:98
-#, c-format
-msgid "Malformed line %lu in source list %s (Absolute dist)"
+#: 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)"
 
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
 

-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:108

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"

-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: apt-pkg/sourcelist.cc:156
+#: apt-pkg/sourcelist.cc:199

 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 
 #, c-format
 msgid "Opening %s"
 msgstr "Yn agor %s"
 

-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
 #, 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:187
+#: apt-pkg/sourcelist.cc:236

 #, 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:191
-#, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+#: apt-pkg/sourcelist.cc:240
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"

 msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
 msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 

+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#, fuzzy, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+

 # FIXME: %s may have an arbirrary length
 # FIXME: %s may have an arbirrary length

-#: apt-pkg/packagemanager.cc:402
+#: apt-pkg/packagemanager.cc:399

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2280,187 +2527,234 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 "Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 "Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "

-"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych "
-"wir eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
+"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/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:238
+#: apt-pkg/algorithms.cc:247

 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""

-"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar ei "
-"gyfer."
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
+"ei gyfer."

 
 

-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1105

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""

-"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod "
-"wedi ei achosi gan pecynnau wedi eu dal."
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
+"ei achosi gan pecynnau wedi eu dal."

 
 

-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1107

 msgid "Unable to correct problems, you have held broken packages."
 msgid "Unable to correct problems, you have held broken packages."

-msgstr "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
+msgstr ""
+"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."

 
 

-#: apt-pkg/acquire.cc:61
+#: apt-pkg/acquire.cc:59

 #, 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:65
+#: apt-pkg/acquire.cc:63

 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 

-#: apt-pkg/acquire-worker.cc:112
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:827
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire.cc:829
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#: 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:161
+#: 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/init.cc:119
+#: apt-pkg/acquire-worker.cc:398
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
+#: apt-pkg/init.cc:124

 #, 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:135
-msgid "Unable to determine a suitable system type"
+#: apt-pkg/init.cc:140
+#, fuzzy
+msgid "Unable to determine a suitable packaging system type"

 msgstr "Ni ellir canfod math system addas"
 
 msgstr "Ni ellir canfod math system addas"
 

-#: apt-pkg/clean.cc:61
+#: apt-pkg/clean.cc:57

 #, 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:69

 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:73

 msgid "You may want to run apt-get update to correct these problems"
 msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
 
 # 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:269
+#: apt-pkg/policy.cc:267

 msgid "Invalid record in the preferences file, no Package header"
 msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense
 msgid "Invalid record in the preferences file, no Package header"
 msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense

-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:289

 #, 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:299
+#: apt-pkg/policy.cc:297

 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"
 

-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:72

 msgid "Cache has an incompatible versioning system"
 msgstr "Mae can y storfa system fersiwn anghyfaddas"
 
 msgid "Cache has an incompatible versioning system"
 msgstr "Mae can y storfa system fersiwn anghyfaddas"
 

-#: apt-pkg/pkgcachegen.cc:117
-#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+#: apt-pkg/pkgcachegen.cc:115
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewPackage)"

 msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
 

-#: apt-pkg/pkgcachegen.cc:129
-#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+#: apt-pkg/pkgcachegen.cc:130
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage1)"

 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
 

-#: apt-pkg/pkgcachegen.cc:150
-#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+#: apt-pkg/pkgcachegen.cc:153
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc1)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:178
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage2)"

 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
 

-#: apt-pkg/pkgcachegen.cc:154
-#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+#: apt-pkg/pkgcachegen.cc:182
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"

 msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 

-#: apt-pkg/pkgcachegen.cc:184
-#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:213
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion1)"

 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
 

-#: apt-pkg/pkgcachegen.cc:188
-#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+#: apt-pkg/pkgcachegen.cc:217
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage3)"

 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
 

-#: apt-pkg/pkgcachegen.cc:192
-#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+#: apt-pkg/pkgcachegen.cc:221
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion2)"

 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
 

-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:245
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#: apt-pkg/pkgcachegen.cc:251

 msgid "Wow, you exceeded the number of package names this APT is capable of."
 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."
+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:254

 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
 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:257
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc:260

 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 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."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."

 
 

-#: apt-pkg/pkgcachegen.cc:241
-#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+#: apt-pkg/pkgcachegen.cc:288
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (FindPkg)"

 msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 

-#: apt-pkg/pkgcachegen.cc:254
-#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+#: apt-pkg/pkgcachegen.cc:301
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"

 msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
 
 msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
 

-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:307

 #, 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:678

 #, 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:763

 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:890 apt-pkg/pkgcachegen.cc:897

 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:127

 #, 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:205 apt-pkg/acquire-item.cc:817
+#: apt-pkg/acquire-item.cc:401

 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:1408
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
+
+#: apt-pkg/acquire-item.cc:1100
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+

 # FIXME: case
 # FIXME: case

-#: apt-pkg/acquire-item.cc:654
+#: apt-pkg/acquire-item.cc:1213

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


@@ -2469,7 +2763,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:689
+#: apt-pkg/acquire-item.cc:1272

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


@@ -2478,14 +2772,14 @@ 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:720
+#: apt-pkg/acquire-item.cc:1313

 #, 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:807
+#: apt-pkg/acquire-item.cc:1400

 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 


@@ -2494,10 +2788,213 @@ msgstr "Camgyfatebiaeth maint"
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
 
 msgid "Vendor block %s contains no fingerprint"
 msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
 

-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Ni Chanfuwyd Y Ffeil"
+#: apt-pkg/cdrom.cc:529
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
+
+#: apt-pkg/cdrom.cc:590
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:608
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:612
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Yn aros am benawdau"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:620
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:638
+msgid "Scanning disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:678
+#, c-format
+msgid ""
+"Found %u package indexes, %u source indexes, %u translation indexes and %u "
+"signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:715
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:744
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:760
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:764
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-pkg/cdrom.cc:790
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/cdrom.cc:799
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:513
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/deb/dpkgpm.cc:596
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:597
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:602
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:603
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
+#, fuzzy, c-format
+msgid "Processing triggers for %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
+#: apt-pkg/deb/dpkgpm.cc:608
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615
+#: apt-pkg/deb/dpkgpm.cc:616
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:618
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:619
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Argymell"
+
+#: apt-pkg/deb/dpkgpm.cc:624
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:625
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:775
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+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"

+
+#, 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
+#~ msgid "openpty failed\n"
+#~ msgstr "Methwyd dewis"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Dyddiad ffeil wedi newid %s"
+
+#, fuzzy
+#~ msgid "Reading file list"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Methwyd cael y clo %s"
+
+#~ msgid "Abort? [Y/n] "
+#~ msgstr "Erthylu? [I/n] "
+
+#~ msgid "Write Error"
+#~ msgstr "Gwall Ysgrifennu"
+
+#~ msgid "File Not Found"
+#~ msgstr "Ni Chanfuwyd Y Ffeil"