travis: use -q mode to reduce the verbosity greatly

[apt.git] / po / cy.po

diff --git a/po/cy.po b/po/cy.po
index 4df1dc35fedc313409d6a0a6b851502287089e96..f5a2612a92b81a4c1961e0d6537328f710d7815e 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: APT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-15 06:09+0100\n"
+"Project-Id-Version: apt 1.0.5\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2015-08-27 17:55+0200\n"

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


@@ -15,165 +15,171 @@ 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:156
+#: cmdline/apt-cache.cc:149

 #, 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:284
+#: cmdline/apt-cache.cc:319
+#, fuzzy
+msgid "apt-cache stats does not take any arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: cmdline/apt-cache.cc:325

 #, fuzzy
 msgid "Total package names: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
 #, fuzzy
 msgid "Total package names: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 

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

 #, fuzzy
 msgid "Total package structures: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Cyfanswm Enwau Pecynnau : "
 

-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:367

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

-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:368

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

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

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

-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:370

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

-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:371

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

-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:373

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

-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:375

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

-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:377

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

-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:380

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

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

 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 

-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:384

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

-#: cmdline/apt-cache.cc:355
+#: cmdline/apt-cache.cc:440

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

-#: cmdline/apt-cache.cc:369
-#, fuzzy
-msgid "Total dependency version space: "
-msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:446

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

-#: cmdline/apt-cache.cc:382
+#: cmdline/apt-cache.cc:463

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

-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142
+#: cmdline/apt-cache.cc:605 cmdline/apt-cache.cc:1256
+#: apt-private/private-show.cc:58

 #, 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:591 cmdline/apt-cache.cc:1377
-#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456
+#: cmdline/apt-cache.cc:680 cmdline/apt-cache.cc:1541 cmdline/apt-cache.cc:1543
+#: cmdline/apt-cache.cc:1624 cmdline/apt-mark.cc:56 cmdline/apt-mark.cc:103
+#: cmdline/apt-mark.cc:229 apt-private/private-show.cc:173
+#: apt-private/private-show.cc:175

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

-#: cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:1356 apt-private/private-search.cc:41

 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Rhaid i chi ddarparu un patrwm yn union"
 

-#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1520
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+msgstr ""
+
+#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762

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

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

-#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1766

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 
 #. Show any packages have explicit pins
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1502
+#: cmdline/apt-cache.cc:1672

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

-#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1686 cmdline/apt-cache.cc:1743

 msgid "(not found)"
 msgstr "(heb ganfod)"
 
 msgid "(not found)"
 msgstr "(heb ganfod)"
 

-#: cmdline/apt-cache.cc:1523
+#. Print the package name and the version we are forcing to
+#: cmdline/apt-cache.cc:1700
+#, c-format
+msgid "%s -> %s with priority %d\n"
+msgstr ""
+
+#: cmdline/apt-cache.cc:1706

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

-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1707

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

-#: cmdline/apt-cache.cc:1548 cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1725 cmdline/apt-cache.cc:1733

 msgid "(none)"
 msgstr "(dim)"
 
 msgid "(none)"
 msgstr "(dim)"
 

-#: cmdline/apt-cache.cc:1563
+#: cmdline/apt-cache.cc:1740

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

-#: cmdline/apt-cache.cc:1572
+#: cmdline/apt-cache.cc:1749

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

-#: cmdline/apt-cache.cc:1686 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:3047 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"
-
-#: cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1871

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


@@ -193,7 +199,6 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"

-"   showauto - Display a list of automatically installed packages\n"

 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"


@@ -253,26 +258,34 @@ msgstr ""
 
 #: cmdline/apt-cdrom.cc:92
 #, fuzzy
 
 #: cmdline/apt-cdrom.cc:92
 #, fuzzy

-msgid "Please insert a Disc in the drive and press enter"
+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"
 
 msgstr ""
 "Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
 " '%s'\n"
 "yn y gyrriant '%s' a gwasgwch Enter\n"
 

-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:140

 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Methwyd ailenwi %s at %s"
 
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Methwyd ailenwi %s at %s"
 

-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:179
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:183

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

-#: cmdline/apt-config.cc:41
+#: cmdline/apt-config.cc:48

 msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 
 msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 

-#: cmdline/apt-config.cc:76
+#: cmdline/apt-config.cc:88

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


@@ -301,3177 +314,3709 @@ msgstr ""
 "  -c=? Darllen y ffeil cyfluniad\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
 "  -c=? Darllen y ffeil cyfluniad\n"
 "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 

-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "Nid yw %s yn becyn DEB dilys."
-
-# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:232
-#, fuzzy
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Dangos y testun cymorth hwn\n"
-"  -t   Gosod y cyfeiriadur dros dro\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1175
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
+#: cmdline/apt-get.cc:211
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: cmdline/apt-extracttemplates.cc:309
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+#: cmdline/apt-get.cc:287
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
-msgid "Package extension list is too long"
-msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
+#: cmdline/apt-get.cc:290
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: cmdline/apt-get.cc:327

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

-msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"

 
 

-#: ftparchive/apt-ftparchive.cc:260
-msgid "Source extension list is too long"
-msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+#: cmdline/apt-get.cc:386
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr ""

 
 

-#: ftparchive/apt-ftparchive.cc:377
-msgid "Error writing header to contents file"
-msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
+#: cmdline/apt-get.cc:417
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: ftparchive/apt-ftparchive.cc:407
+#: cmdline/apt-get.cc:422 cmdline/apt-mark.cc:78
+#: apt-private/private-install.cc:851

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

-msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:595
-#, fuzzy
+#: cmdline/apt-get.cc:424 cmdline/apt-mark.cc:80
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-get.cc:432 cmdline/apt-mark.cc:124

 msgid ""
 msgid ""

-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-"          sources srcpath [overridefile [pathprefix]]\n"
-"          contents path\n"
-"          release path\n"
-"          generate config [groups]\n"
-"          clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-"               dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-"  -h    This help text\n"
-"  --md5 Control MD5 generation\n"
-"  -s=?  Source override file\n"
-"  -q    Quiet\n"
-"  -d=?  Select the optional caching database\n"
-"  --no-delink Enable delinking debug mode\n"
-"  --contents  Control contents file generation\n"
-"  -c=?  Read this configuration file\n"
-"  -o=?  Set an arbitrary configuration option"
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."

 msgstr ""
 msgstr ""

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

 
 

-#: ftparchive/apt-ftparchive.cc:801
-msgid "No selections matched"
-msgstr "Dim dewisiadau'n cyfateb"
+#: cmdline/apt-get.cc:501 cmdline/apt-get.cc:509
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"

 
 

-#: ftparchive/apt-ftparchive.cc:879
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"
+#: cmdline/apt-get.cc:570
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"

 
 

-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+#: cmdline/apt-get.cc:688
+msgid "Must specify at least one package to fetch source for"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"

 
 

-#: ftparchive/cachedb.cc:61
+#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035

 #, c-format
 #, c-format

-msgid "DB is old, attempting to upgrade %s"
-msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"

 
 

-#: ftparchive/cachedb.cc:72
+#: cmdline/apt-get.cc:745
+#, c-format

 msgid ""
 msgid ""

-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:77
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#: cmdline/apt-get.cc:750

 #, c-format
 #, c-format

-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
-
-#: ftparchive/cachedb.cc:242
-msgid "Archive has no control record"
-msgstr "Does dim cofnod rheoli gan yr archif"
+msgid ""
+"Please use:\n"
+"bzr branch %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""

 
 

-#: ftparchive/cachedb.cc:448
-msgid "Unable to get a cursor"
-msgstr "Ni ellir cael cyrchydd"
+#: cmdline/apt-get.cc:798
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"

 
 

-#: ftparchive/writer.cc:73
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:828

 #, c-format
 #, c-format

-msgid "W: Unable to read directory %s\n"
-msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"

 
 

-#: ftparchive/writer.cc:78
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:833

 #, c-format
 #, c-format

-msgid "W: Unable to stat %s\n"
-msgstr "Rh: Ni ellir gwneud stat() o %s\n"
+msgid "Need to get %sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"

 
 

-#: ftparchive/writer.cc:134
-msgid "E: "
-msgstr "G: "
+#: cmdline/apt-get.cc:839
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
+msgstr "Cyrchu Ffynhonell %s\n"

 
 

-#: ftparchive/writer.cc:136
-msgid "W: "
-msgstr "Rh: "
+#: cmdline/apt-get.cc:864
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."

 
 

-#: ftparchive/writer.cc:143
-msgid "E: Errors apply to file "
-msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300
+msgid "Download complete and in download only mode"
+msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"

 
 

-#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
+#: cmdline/apt-get.cc:894

 #, c-format
 #, c-format

-msgid "Failed to resolve %s"
-msgstr "Methwyd datrys %s"
-
-#: ftparchive/writer.cc:174
-msgid "Tree walking failed"
-msgstr "Methwyd cerdded y goeden"
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"

 
 

-#: ftparchive/writer.cc:201
+#: cmdline/apt-get.cc:907

 #, c-format
 #, c-format

-msgid "Failed to open %s"
-msgstr "Methwyd agor %s"
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"

 
 

-# FIXME
-#: ftparchive/writer.cc:260
+#: cmdline/apt-get.cc:908

 #, c-format
 #, c-format

-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""

 
 

-#: ftparchive/writer.cc:268
+#: cmdline/apt-get.cc:936

 #, c-format
 #, c-format

-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
+msgid "Build command '%s' failed.\n"
+msgstr "Methodd y gorchymyn adeiladu '%s'.\n"

 
 

-#: ftparchive/writer.cc:272
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
+#: cmdline/apt-get.cc:955
+msgid "Child process failed"
+msgstr "Methodd proses plentyn"

 
 

-#: ftparchive/writer.cc:279
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
+#: cmdline/apt-get.cc:976
+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"

 
 

-#: ftparchive/writer.cc:289
+#: cmdline/apt-get.cc:994

 #, c-format
 #, c-format

-msgid " DeLink limit of %sB hit.\n"
-msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""

 
 

-#: ftparchive/writer.cc:393
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
+#: cmdline/apt-get.cc:1012
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""

 
 

-#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
+#: cmdline/apt-get.cc:1022
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
+
+#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050

 #, c-format
 #, c-format

-msgid "  %s has no override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"

 
 

-#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
+#: cmdline/apt-get.cc:1070

 #, c-format
 #, c-format

-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Cynaliwr %s yw %s nid %s\n"
+msgid "%s has no build depends.\n"
+msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"

 
 

-#: ftparchive/writer.cc:698
+#: cmdline/apt-get.cc:1240

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

-msgid "  %s has no source override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"

 
 

-#: ftparchive/writer.cc:702
-#, fuzzy, c-format
-msgid "  %s has no binary override entry either\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+#: cmdline/apt-get.cc:1258
+#, 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"

 
 

-#: ftparchive/contents.cc:321
+#: cmdline/apt-get.cc:1281
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
+"newydd"
+
+#: cmdline/apt-get.cc:1320

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

-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+msgstr ""
+"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
+"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"

 
 

-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
+#: cmdline/apt-get.cc:1326
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"

 
 

-#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#: cmdline/apt-get.cc:1349

 #, c-format
 #, c-format

-msgid "Unable to open %s"
-msgstr "Ni ellir agor %s"
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"

 
 

-#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#: cmdline/apt-get.cc:1364

 #, c-format
 #, c-format

-msgid "Malformed override %s line %lu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."

 
 

-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+#: cmdline/apt-get.cc:1369
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"

 
 

-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+#: cmdline/apt-get.cc:1551
+#, fuzzy
+msgid "Supported modules:"
+msgstr "Modylau a Gynhelir:"

 
 

-#: 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"
+# FIXME: split
+#: cmdline/apt-get.cc:1592
+#, fuzzy
+msgid ""
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+"   update - Retrieve new lists of packages\n"
+"   upgrade - Perform an upgrade\n"
+"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+"   remove - Remove packages\n"
+"   autoremove - Remove automatically all unused packages\n"
+"   purge - Remove packages and config files\n"
+"   source - Download source archives\n"
+"   build-dep - Configure build-dependencies for source packages\n"
+"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+"   dselect-upgrade - Follow dselect selections\n"
+"   clean - Erase downloaded archive files\n"
+"   autoclean - Erase old downloaded archive files\n"
+"   check - Verify that there are no broken dependencies\n"
+"   changelog - Download and display the changelog for the given package\n"
+"   download - Download the binary package into the current directory\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -d  Download only - do NOT install or unpack archives\n"
+"  -s  No-act. Perform ordering simulation\n"
+"  -y  Assume Yes to all queries and do not prompt\n"
+"  -f  Attempt to correct a system with broken dependencies in place\n"
+"  -m  Attempt to continue if archives are unlocatable\n"
+"  -u  Show a list of upgraded packages as well\n"
+"  -b  Build the source package after fetching it\n"
+"  -V  Show verbose version numbers\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+"Defnydd: apt-get [opsiynnau] gorchymyn\n"
+"         apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
+"         apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
+"\n"
+"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
+"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
+"ddefnyddir amlaf.\n"
+"\n"
+"Gorchmynion:\n"
+"   update - Cyrchu rhestrau pecynnau newydd\n"
+"   update - Uwchraddio pecynnau wedi sefydlu\n"
+"   install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
+"   remove - Tynnu pecynnau\n"
+"   source - Lawrlwytho archifau ffynhonell\n"
+"   build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
+"   dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
+"   dselect-upgrade - Dilyn dewisiadau dselect\n"
+"   clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
+"   autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
+"   check - Gwirio fod dim dibyniaethau torredig\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn.\n"
+"  -q   Allbwn cofnodadwy - dim dangosydd cynydd\n"
+"  -qq  Dim allbwn ar wahan i wallau\n"
+"  -d   Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
+"  -s   Peidio gweithredu. Gwneir efelychiad trefn.\n"
+"  -y   Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
+"  -f   Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
+"  -m   Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
+"  -u   Dangos rhestr o archifau a uwchraddir hefyd\n"
+"  -b   Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
+"  -V   Dangos rhifau fersiwn cyflawn\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+"\n"
+"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
+"fwy o wybodaeth ac opsiynnau.\n"
+"\n"
+"                   Mae gan yr APT hwn bŵerau buwch hudol.\n"

 
 

-#: ftparchive/multicompress.cc:72
-#, fuzzy, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
+#: cmdline/apt-helper.cc:37
+msgid "Need one URL as argument"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:102
+#: cmdline/apt-helper.cc:50
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
+#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:88
+#, fuzzy
+msgid "Must specifc at least one srv record"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
+#: cmdline/apt-helper.cc:95

 #, c-format
 #, c-format

-msgid "Compressed output %s needs a compression set"
-msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+msgid "GetSrvRec failed for %s"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Methwyd creu pibell cyfathrebu at isbroses"
+#: cmdline/apt-helper.cc:118
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+"   download-file - download the given uri to the target-path\n"
+"   srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
+"\n"
+"                       This APT helper has Super Meep Powers.\n"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:195
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
+#: cmdline/apt-mark.cc:65
+#, fuzzy, c-format
+msgid "%s can not be marked as it is not installed.\n"
+msgstr "ond nid yw wedi ei sefydlu"

 
 

-#: ftparchive/multicompress.cc:198
-msgid "Failed to fork"
-msgstr "Methodd fork()"
+#: cmdline/apt-mark.cc:71
+#, fuzzy, c-format
+msgid "%s was already set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: ftparchive/multicompress.cc:212
-#, fuzzy
-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+#: cmdline/apt-mark.cc:73
+#, fuzzy, c-format
+msgid "%s was already set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: ftparchive/multicompress.cc:235
+#: cmdline/apt-mark.cc:238

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

-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+msgid "%s was already set on hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: ftparchive/multicompress.cc:286
-msgid "Failed to create subprocess IPC"
-msgstr "Methwyd creu isbroses IPC"
+#: cmdline/apt-mark.cc:240
+#, fuzzy, c-format
+msgid "%s was already not hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: ftparchive/multicompress.cc:321
-msgid "Failed to exec compressor "
-msgstr "Methwyd gweithredu cywasgydd "
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
+#: apt-pkg/deb/dpkgpm.cc:1302 apt-pkg/contrib/fileutl.cc:850
+#: apt-pkg/contrib/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"

 
 

-#: ftparchive/multicompress.cc:360
-msgid "decompressor"
-msgstr "datgywasgydd"
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
+#, fuzzy, c-format
+msgid "%s set on hold.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: ftparchive/multicompress.cc:403
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
+#, fuzzy, c-format
+msgid "Canceled hold on %s.\n"
+msgstr "Methwyd agor %s"

 
 

-#: ftparchive/multicompress.cc:455
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:472
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
+#: cmdline/apt-mark.cc:449
+msgid ""
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also list marks.\n"
+"\n"
+"Commands:\n"
+"   auto - Mark the given packages as automatically installed\n"
+"   manual - Mark the given packages as manually installed\n"
+"   hold - Mark a package as held back\n"
+"   unhold - Unset a package set as held back\n"
+"   showauto - Print the list of automatically installed packages\n"
+"   showmanual - Print the list of manually installed packages\n"
+"   showhold - Print the list of package on hold\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -s  No-act. Just prints what would be done.\n"
+"  -f  read/write auto/manual marking in the given file\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-mark(8) and apt.conf(5) manual pages for more information."
+msgstr ""
+
+#: cmdline/apt.cc:46
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"CLI for apt.\n"
+"Basic commands: \n"
+" list - list packages based on package names\n"
+" search - search in package descriptions\n"
+" show - show package details\n"
+"\n"
+" update - update list of available packages\n"
+"\n"
+" install - install packages\n"
+" remove  - remove packages\n"
+" autoremove - Remove automatically all unused packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+" full-upgrade - upgrade the system by removing/installing/upgrading "
+"packages\n"
+"\n"
+" edit-sources - edit the source information file\n"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
+#: methods/cdrom.cc:203

 #, c-format
 #, c-format

-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
+msgid "Unable to read the cdrom database %s"
+msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"

 
 

-#: cmdline/apt-get.cc:135
-msgid "Y"
-msgstr "I"
+#: methods/cdrom.cc:212
+#, fuzzy
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."

 
 

-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: methods/cdrom.cc:222
+#, fuzzy
+msgid "Wrong CD-ROM"
+msgstr "CD Anghywir"
+
+#: methods/cdrom.cc:249

 #, c-format
 #, c-format

-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr ""
+"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."

 
 

-#: cmdline/apt-get.cc:252
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+#: methods/cdrom.cc:254
+#, fuzzy
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/cdrom.cc:262 methods/file.cc:121 methods/rsh.cc:299
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654
+#: methods/rred.cc:664
+msgid "Failed to stat"
+msgstr "Methwyd stat()"
+
+#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"

 
 

-#: cmdline/apt-get.cc:342
+#: methods/file.cc:49
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
+
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:177
+msgid "Logging in"
+msgstr "Yn mewngofnodi"
+
+#: methods/ftp.cc:183
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"
+
+#: methods/ftp.cc:188
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"
+
+#: methods/ftp.cc:219 methods/ftp.cc:247
+#, fuzzy, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
+
+#: methods/ftp.cc:225

 #, c-format
 #, c-format

-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-get.cc:344
+#: methods/ftp.cc:232

 #, c-format
 #, c-format

-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-get.cc:351
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
+#: methods/ftp.cc:252
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
+"ProxyLogin yn wag.)"

 
 

-#: cmdline/apt-get.cc:353
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
+# FIXME
+#: methods/ftp.cc:282
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-get.cc:356
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
+#: methods/ftp.cc:308
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-get.cc:356
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
+#: methods/ftp.cc:346 methods/ftp.cc:458 methods/rsh.cc:213 methods/rsh.cc:261
+msgid "Connection timeout"
+msgstr "Goramser cysylltu"

 
 

-#: cmdline/apt-get.cc:361
-msgid " or"
-msgstr " neu"
+#: methods/ftp.cc:352
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"

 
 

-#: cmdline/apt-get.cc:392
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+#: methods/ftp.cc:355 methods/rsh.cc:220 apt-pkg/contrib/fileutl.cc:1569
+#: apt-pkg/contrib/fileutl.cc:1578 apt-pkg/contrib/fileutl.cc:1583
+#: apt-pkg/contrib/fileutl.cc:1585
+msgid "Read error"
+msgstr "Gwall darllen"

 
 

-#: cmdline/apt-get.cc:420
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+#: methods/ftp.cc:362 methods/rsh.cc:227
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."

 
 

-#: cmdline/apt-get.cc:442
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+#: methods/ftp.cc:379 methods/ftp.cc:391
+msgid "Protocol corruption"
+msgstr "Llygr protocol"

 
 

-#: cmdline/apt-get.cc:465
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+#: methods/ftp.cc:464 methods/rsh.cc:267 apt-pkg/contrib/fileutl.cc:946
+#: apt-pkg/contrib/fileutl.cc:1691 apt-pkg/contrib/fileutl.cc:1700
+#: apt-pkg/contrib/fileutl.cc:1705 apt-pkg/contrib/fileutl.cc:1707
+#: apt-pkg/contrib/fileutl.cc:1732
+msgid "Write error"
+msgstr "Gwall ysgrifennu"

 
 

-#: cmdline/apt-get.cc:488
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+#: methods/ftp.cc:703 methods/ftp.cc:709 methods/ftp.cc:744
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"

 
 

-#: cmdline/apt-get.cc:508
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+#: methods/ftp.cc:714
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"

 
 

-#: cmdline/apt-get.cc:563
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
+#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
+msgid "Failed"
+msgstr "Methwyd"

 
 

-#: cmdline/apt-get.cc:571
+#: methods/ftp.cc:720

 #, fuzzy
 #, fuzzy

-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
-"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
-"ei wneud!"
+msgid "Could not connect passive socket."
+msgstr "Methwyd cysylltu soced goddefol"
+
+# FIXME
+#: methods/ftp.cc:737
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"

 
 

-#: cmdline/apt-get.cc:605
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+#: methods/ftp.cc:751
+msgid "Could not bind a socket"
+msgstr "Methwyd rhwymo soced"

 
 

-#: cmdline/apt-get.cc:609
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
+#: methods/ftp.cc:755
+msgid "Could not listen on the socket"
+msgstr "Methwyd gwrando ar y soced"

 
 

-#: cmdline/apt-get.cc:611
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
+#: methods/ftp.cc:762
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"
+
+#: methods/ftp.cc:794
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"

 
 

-#: cmdline/apt-get.cc:613
+#: methods/ftp.cc:804

 #, c-format
 #, c-format

-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+msgid "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"

 
 

-#: cmdline/apt-get.cc:617
+#: methods/ftp.cc:813

 #, c-format
 #, c-format

-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"

 
 

-#: cmdline/apt-get.cc:639
-#, fuzzy, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+#: methods/ftp.cc:833
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"

 
 

-#: cmdline/apt-get.cc:645
-#, fuzzy, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+#: methods/ftp.cc:840
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"
+
+#: methods/ftp.cc:880 methods/server.cc:391 methods/rsh.cc:337
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"

 
 

-#: cmdline/apt-get.cc:662
+#: methods/ftp.cc:893

 #, c-format
 #, c-format

-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"

 
 

-#: cmdline/apt-get.cc:673
-msgid " [Installed]"
-msgstr " [Sefydliwyd]"
+#: methods/ftp.cc:908 methods/rsh.cc:356
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"

 
 

-#: cmdline/apt-get.cc:682
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Fersiynau Posib"
+#: methods/ftp.cc:945
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"

 
 

-#: cmdline/apt-get.cc:684
-msgid "You should explicitly select one to install."
-msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+#. Get the files information
+#: methods/ftp.cc:1028
+msgid "Query"
+msgstr "Ymholiad"

 
 

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

 
 

-#: cmdline/apt-get.cc:705
-msgid "However the following packages replace it:"
-msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+#: methods/connect.cc:80
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"

 
 

-#: cmdline/apt-get.cc:717
-#, fuzzy, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+#: methods/connect.cc:91
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"

 
 

-#: cmdline/apt-get.cc:728
+#: methods/connect.cc:98

 #, c-format
 #, c-format

-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"

 
 

-#: cmdline/apt-get.cc:759
-#, fuzzy, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+#: methods/connect.cc:104
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."

 
 

-#: cmdline/apt-get.cc:789
+#: methods/connect.cc:112

 #, c-format
 #, c-format

-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"

 
 

-#: cmdline/apt-get.cc:793
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+#: methods/connect.cc:130
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."

 
 

-#: cmdline/apt-get.cc:803
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:155 methods/rsh.cc:460

 #, c-format
 #, c-format

-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"

 
 

-#: cmdline/apt-get.cc:808
+#: methods/connect.cc:181 methods/connect.cc:200

 #, c-format
 #, c-format

-msgid "%s is already the newest version.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"

 
 

-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2024
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: methods/connect.cc:206
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"

 
 

-#: cmdline/apt-get.cc:853
+#: methods/connect.cc:210

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

-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+msgid "System error resolving '%s:%s'"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"

 
 

-#: cmdline/apt-get.cc:858
+#: methods/connect.cc:212

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

-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-
-#: cmdline/apt-get.cc:899
-#, 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:977
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"

 
 

-#: cmdline/apt-get.cc:980
-msgid " failed."
-msgstr " wedi methu."
+#: methods/connect.cc:259
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Methwyd cysylltu i %s %s:"

 
 

-#: cmdline/apt-get.cc:983
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
+#: methods/gpgv.cc:205 methods/gpgv.cc:215
+msgid "At least one invalid signature was encountered."
+msgstr ""

 
 

-#: cmdline/apt-get.cc:986
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
+#: methods/gpgv.cc:210
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:988
-msgid " Done"
-msgstr " Wedi Gorffen"
+#: methods/gpgv.cc:217
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:992
-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."
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:995
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+#: methods/gpgv.cc:227
+msgid "Unknown error executing apt-key"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1020
+#: methods/gpgv.cc:260 methods/gpgv.cc:267

 #, fuzzy
 #, fuzzy

-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"

 
 

-#: cmdline/apt-get.cc:1024
-msgid "Authentication warning overridden.\n"
+#: methods/gpgv.cc:274
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1031
-msgid "Install these packages without verification [y/N]? "
+#: methods/gzip.cc:79
+msgid "Empty files can't be valid archives"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1033
+#: methods/http.cc:515
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"
+
+#: methods/http.cc:529

 #, fuzzy
 #, fuzzy

-msgid "Some packages could not be authenticated"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"

 
 

-#: cmdline/apt-get.cc:1042 cmdline/apt-get.cc:1203
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+#: methods/http.cc:531
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"

 
 

-#: cmdline/apt-get.cc:1083
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr ""
+#: methods/http.cc:567
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"

 
 

-#: cmdline/apt-get.cc:1092
-#, fuzzy
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
+#: methods/http.cc:627
+msgid "Select failed"
+msgstr "Methwyd dewis"

 
 

-#: cmdline/apt-get.cc:1103
-#, fuzzy
-msgid "Internal error, Ordering didn't finish"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+#: methods/http.cc:632
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"

 
 

-#: cmdline/apt-get.cc:1141
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+#: methods/http.cc:655
+msgid "Error writing to output file"
+msgstr "Gwall wrth ysgrifennu i ffeil allbwn"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1148
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
+#: methods/server.cc:52
+msgid "Waiting for headers"
+msgstr "Yn aros am benawdau"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1153
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Mae angen cyrchu %sB o archifau.\n"
+#: methods/server.cc:111
+msgid "Bad header line"
+msgstr "Llinell pennawd gwael"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1160
-#, 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"
+#: methods/server.cc:136 methods/server.cc:143
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1165
-#, 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"
+#: methods/server.cc:173
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"

 
 

-#: cmdline/apt-get.cc:1180 cmdline/apt-get.cc:1183 cmdline/apt-get.cc:2428
-#: cmdline/apt-get.cc:2431
-#, fuzzy, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
+#: methods/server.cc:200
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"

 
 

-#: cmdline/apt-get.cc:1193
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Does dim digon o le rhydd gennych yn %s."
+#: methods/server.cc:202
+#, fuzzy
+msgid "This HTTP server has broken range support"
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"

 
 

-#: cmdline/apt-get.cc:1209 cmdline/apt-get.cc:1229
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
+#: methods/server.cc:229
+msgid "Unknown date format"
+msgstr "Fformat dyddiad anhysbys"

 
 

-#: cmdline/apt-get.cc:1211
-msgid "Yes, do as I say!"
-msgstr "Ie, gwna fel rydw i'n dweud!"
+#: methods/server.cc:535
+#, fuzzy
+msgid "Bad header data"
+msgstr "Data pennawd gwael"

 
 

-#: cmdline/apt-get.cc:1213
-#, fuzzy, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+#: methods/server.cc:552 methods/server.cc:646
+msgid "Connection failed"
+msgstr "Methodd y cysylltiad"
+
+#: methods/server.cc:618
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"

 msgstr ""
 msgstr ""

-"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
-"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
-" ?]"

 
 

-#: cmdline/apt-get.cc:1219 cmdline/apt-get.cc:1238
-msgid "Abort."
-msgstr "Erthylu."
+#: methods/server.cc:741
+msgid "Internal error"
+msgstr "Gwall mewnol"

 
 

-#: cmdline/apt-get.cc:1234
-#, fuzzy
-msgid "Do you want to continue [Y/n]? "
-msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1306 cmdline/apt-get.cc:2488 apt-pkg/algorithms.cc:1491
+#: apt-private/private-list.cc:151

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
-msgstr "Methwyd cyrchu %s  %s\n"
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:1324
-msgid "Some files failed to download"
-msgstr "Methodd rhai ffeiliau lawrlwytho"
+#: apt-private/private-cachefile.cc:96
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."

 
 

-#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:2497
-msgid "Download complete and in download only mode"
-msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
+#: apt-private/private-cachefile.cc:99
+msgid " failed."
+msgstr " wedi methu."

 
 

-#: cmdline/apt-get.cc:1331
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
+#: apt-private/private-cachefile.cc:102
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:107
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:111
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
+
+#: apt-private/private-cachefile.cc:114
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: apt-private/private-output.cc:105 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"

 msgstr ""
 msgstr ""

-"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
-"geidio defnyddio --fix-missing?"

 
 

-#: cmdline/apt-get.cc:1335
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
+#: apt-private/private-output.cc:272
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"

 
 

-#: cmdline/apt-get.cc:1340
-msgid "Unable to correct missing packages."
-msgstr "Ni ellir cywiro pecynnau ar goll."
+#: apt-private/private-output.cc:275
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:277
+msgid "[installed,auto-removable]"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1341
+#: apt-private/private-output.cc:279

 #, fuzzy
 #, fuzzy

-msgid "Aborting install."
-msgstr "Yn Erthylu'r Sefydliad."
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"

 
 

-#: cmdline/apt-get.cc:1369
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-msgstr[1] ""
+#: apt-private/private-output.cc:281
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sefydliwyd]"

 
 

-#: cmdline/apt-get.cc:1373
-msgid "Note: This is done automatic and on purpose by dpkg."
+#: apt-private/private-output.cc:284
+#, c-format
+msgid "[upgradable from: %s]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1503
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
+#: apt-private/private-output.cc:288
+msgid "[residual-config]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1535
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+#: apt-private/private-output.cc:402
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"

 
 

-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1573
+#: apt-private/private-output.cc:404

 #, c-format
 #, c-format

-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: cmdline/apt-get.cc:1589
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+#: apt-private/private-output.cc:411
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"

 
 

-#: cmdline/apt-get.cc:1651
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
+#: apt-private/private-output.cc:413
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"

 
 

-#: cmdline/apt-get.cc:1703
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
+#: apt-private/private-output.cc:416
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"

 
 

-#.
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#.
-#: cmdline/apt-get.cc:1706 cmdline/apt-get.cc:1855
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+#: apt-private/private-output.cc:416
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"

 
 

-#: cmdline/apt-get.cc:1710
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+#: apt-private/private-output.cc:421
+msgid " or"
+msgstr " neu"

 
 

-#: cmdline/apt-get.cc:1717
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+#: apt-private/private-output.cc:435 apt-private/private-output.cc:445
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"

 
 

-#: cmdline/apt-get.cc:1721
-#, fuzzy, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+#: apt-private/private-output.cc:455
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"

 
 

-#: cmdline/apt-get.cc:1723
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
+#: apt-private/private-output.cc:465
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"

 
 

-#: cmdline/apt-get.cc:1742
+#: apt-private/private-output.cc:481

 #, fuzzy
 #, fuzzy

-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"

 
 

-#: cmdline/apt-get.cc:1825
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
+#: apt-private/private-output.cc:497
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"

 
 

-# FIXME
-#: cmdline/apt-get.cc:1828
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
-"pecyn (neu penodwch ddatrys)"
+#: apt-private/private-output.cc:512
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"

 
 

-# FIXME: needs commas
-#: cmdline/apt-get.cc:1840
+#: apt-private/private-output.cc:525
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: apt-private/private-output.cc:552
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (oherwydd %s)"
+
+#: apt-private/private-output.cc:602
+#, fuzzy

 msgid ""
 msgid ""

-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"

 msgstr ""
 msgstr ""

-"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
-"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
-"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
-"heb gael eu symud allan o Incoming."
+"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:1858
-msgid "Broken packages"
-msgstr "Pecynnau wedi torri"
+#: apt-private/private-output.cc:633
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "

 
 

-#: cmdline/apt-get.cc:1886
-msgid "The following extra packages will be installed:"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+#: apt-private/private-output.cc:637
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "

 
 

-#: cmdline/apt-get.cc:1976
-msgid "Suggested packages:"
-msgstr "Pecynnau a awgrymmir:"
+#: apt-private/private-output.cc:639
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "

 
 

-#: cmdline/apt-get.cc:1977
-msgid "Recommended packages:"
-msgstr "Pecynnau a argymhellir:"
+#: apt-private/private-output.cc:641
+#, 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:2019
+#: apt-private/private-output.cc:645

 #, c-format
 #, c-format

-msgid "Couldn't find package %s"
-msgstr "Methwyd canfod pecyn %s"
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"

 
 

-#: cmdline/apt-get.cc:2026
-#, fuzzy, c-format
-msgid "%s set to automatically installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:667
+msgid "[Y/n]"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2047
-#, fuzzy
-msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:673
+msgid "[y/N]"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2050 methods/ftp.cc:707 methods/connect.cc:111
-msgid "Failed"
-msgstr "Methwyd"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:684
+msgid "Y"
+msgstr "I"

 
 

-#: cmdline/apt-get.cc:2055
-msgid "Done"
-msgstr "Wedi Gorffen"
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:690
+msgid "N"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2130
-#, fuzzy
-msgid "Internal error, problem resolver broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"

 
 

-#: cmdline/apt-get.cc:2154 cmdline/apt-get.cc:2187
-msgid "Unable to lock the download directory"
-msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"

 
 

-#: cmdline/apt-get.cc:2238
+#: apt-private/private-update.cc:96

 #, c-format
 #, c-format

-msgid "Downloading %s %s"
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:100
+msgid "All packages are up to date."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2294
-msgid "Must specify at least one package to fetch source for"
-msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2334 cmdline/apt-get.cc:2615
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
+#: apt-private/private-cacheset.cc:127
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"

 
 

-#: cmdline/apt-get.cc:2350
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
+#: apt-private/private-cacheset.cc:133
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for glob '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"

 
 

-#: cmdline/apt-get.cc:2355
+#: apt-private/private-cacheset.cc:139
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+
+#: apt-private/private-cacheset.cc:157

 #, c-format
 #, c-format

+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
+
+#: apt-private/private-cacheset.cc:168
+#, fuzzy
+msgid " [Installed]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-cacheset.cc:177
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Fersiynau Posib"
+
+#: apt-private/private-cacheset.cc:179
+msgid "You should explicitly select one to install."
+msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+
+# FIXME: punctuation
+#: apt-private/private-cacheset.cc:182
+#, fuzzy, c-format

 msgid ""
 msgid ""

-"Please use:\n"
-"bzr get %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\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 ""
 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:2406
-#, 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:2441
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
+#: apt-private/private-cacheset.cc:200
+msgid "However the following packages replace it:"
+msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2449
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+#: apt-private/private-cacheset.cc:213
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2454
+#: apt-private/private-cacheset.cc:226

 #, c-format
 #, c-format

-msgid "Need to get %sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2460
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-cacheset.cc:238 apt-private/private-install.cc:927

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

-msgid "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"

 
 

-#: cmdline/apt-get.cc:2493
-msgid "Failed to fetch some archives."
-msgstr "Methwyd cyrchu rhai archifau."
+#: apt-private/private-cacheset.cc:244 apt-private/private-install.cc:933
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"

 
 

-#: cmdline/apt-get.cc:2523
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+#: apt-private/private-cacheset.cc:289
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"

 
 

-#: cmdline/apt-get.cc:2535
+#: apt-private/private-show.cc:158

 #, c-format
 #, c-format

-msgid "Unpack command '%s' failed.\n"
-msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:2536
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
+#: apt-private/private-show.cc:165
+msgid "not a real package (virtual)"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2553
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+#: apt-private/private-install.cc:87
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:2573
-msgid "Child process failed"
-msgstr "Methodd proses plentyn"
+#: apt-private/private-install.cc:96
+#, fuzzy
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."

 
 

-#: cmdline/apt-get.cc:2589
-msgid "Must specify at least one package to check builddeps for"
+#: apt-private/private-install.cc:103 apt-private/private-download.cc:118
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:2620
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
+#: apt-private/private-install.cc:108
+#, fuzzy
+msgid ""
+"Essential packages were removed and -y was used without --allow-remove-"
+"essential."
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#: cmdline/apt-get.cc:2640
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+#: apt-private/private-install.cc:110
+#, fuzzy
+msgid "Packages were downgraded and -y was used without --allow-downgrades."
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#: cmdline/apt-get.cc:2691
-#, c-format
+#: apt-private/private-install.cc:112

 msgid ""
 msgid ""

-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
+"Held packages were changed and -y was used without --allow-change-held-"
+"packages."

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:2744
-#, 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"
+#: apt-private/private-install.cc:128
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"

 
 

-#: cmdline/apt-get.cc:2780
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#: apt-private/private-install.cc:166
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:2807
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:173

 #, c-format
 #, c-format

-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"

 
 

-#: cmdline/apt-get.cc:2823
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:178

 #, c-format
 #, c-format

-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
+msgid "Need to get %sB of archives.\n"
+msgstr "Mae angen cyrchu %sB o archifau.\n"

 
 

-#: cmdline/apt-get.cc:2828
-msgid "Failed to process build dependencies"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:185
+#, 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"

 
 

-#: cmdline/apt-get.cc:2921 cmdline/apt-get.cc:2933
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:190

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

-msgid "Changelog for %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"

 
 

-#: cmdline/apt-get.cc:3052
-#, fuzzy
-msgid "Supported modules:"
-msgstr "Modylau a Gynhelir:"
+#: apt-private/private-install.cc:202 apt-private/private-install.cc:224
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."

 
 

-# FIXME: split
-#: cmdline/apt-get.cc:3093
-#, fuzzy
-msgid ""
-"Usage: apt-get [options] command\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove automatically all unused packages\n"
-"   purge - Remove packages and config files\n"
-"   source - Download source archives\n"
-"   build-dep - Configure build-dependencies for source packages\n"
-"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-"   dselect-upgrade - Follow dselect selections\n"
-"   clean - Erase downloaded archive files\n"
-"   autoclean - Erase old downloaded archive files\n"
-"   check - Verify that there are no broken dependencies\n"
-"   markauto - Mark the given packages as automatically installed\n"
-"   unmarkauto - Mark the given packages as manually installed\n"
-"   changelog - Download and display the changelog for the given package\n"
-"   download - Download the binary package into the current directory\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -qq No output except for errors\n"
-"  -d  Download only - do NOT install or unpack archives\n"
-"  -s  No-act. Perform ordering simulation\n"
-"  -y  Assume Yes to all queries and do not prompt\n"
-"  -f  Attempt to correct a system with broken dependencies in place\n"
-"  -m  Attempt to continue if archives are unlocatable\n"
-"  -u  Show a list of upgraded packages as well\n"
-"  -b  Build the source package after fetching it\n"
-"  -V  Show verbose version numbers\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-"                       This APT has Super Cow Powers.\n"
-msgstr ""
-"Defnydd: apt-get [opsiynnau] gorchymyn\n"
-"         apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
-"         apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
-"\n"
-"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
-"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
-"ddefnyddir amlaf.\n"
-"\n"
-"Gorchmynion:\n"
-"   update - Cyrchu rhestrau pecynnau newydd\n"
-"   update - Uwchraddio pecynnau wedi sefydlu\n"
-"   install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
-"   remove - Tynnu pecynnau\n"
-"   source - Lawrlwytho archifau ffynhonell\n"
-"   build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
-"   dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
-"   dselect-upgrade - Dilyn dewisiadau dselect\n"
-"   clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
-"   autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
-"   check - Gwirio fod dim dibyniaethau torredig\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn.\n"
-"  -q   Allbwn cofnodadwy - dim dangosydd cynydd\n"
-"  -qq  Dim allbwn ar wahan i wallau\n"
-"  -d   Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
-"  -s   Peidio gweithredu. Gwneir efelychiad trefn.\n"
-"  -y   Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
-"  -f   Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
-"  -m   Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
-"  -u   Dangos rhestr o archifau a uwchraddir hefyd\n"
-"  -b   Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
-"  -V   Dangos rhifau fersiwn cyflawn\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-"\n"
-"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
-"fwy o wybodaeth ac opsiynnau.\n"
-"\n"
-"                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc:206
+msgid "Yes, do as I say!"
+msgstr "Ie, gwna fel rydw i'n dweud!"

 
 

-#: cmdline/apt-get.cc:3254
+#: apt-private/private-install.cc:208
+#, fuzzy, c-format

 msgid ""
 msgid ""

-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "

 msgstr ""
 msgstr ""

+"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
+"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
+" ?]"

 
 

-#: cmdline/acqprogress.cc:57
-msgid "Hit "
-msgstr "Presennol "
+#: apt-private/private-install.cc:214 apt-private/private-install.cc:232
+msgid "Abort."
+msgstr "Erthylu."

 
 

-#: cmdline/acqprogress.cc:81
-msgid "Get:"
-msgstr "Cyrchu:"
+#: apt-private/private-install.cc:229
+msgid "Do you want to continue?"
+msgstr "Ydych chi eisiau mynd ymlaen?"
+
+#: apt-private/private-install.cc:299
+msgid "Some files failed to download"
+msgstr "Methodd rhai ffeiliau lawrlwytho"

 
 

-#: cmdline/acqprogress.cc:112
-msgid "Ign "
-msgstr "Anwybyddu "
+#: apt-private/private-install.cc:306
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
+"geidio defnyddio --fix-missing?"

 
 

-#: cmdline/acqprogress.cc:116
-msgid "Err "
-msgstr "Gwall "
+#: apt-private/private-install.cc:310
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"

 
 

-#: cmdline/acqprogress.cc:137
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
+#: apt-private/private-install.cc:315
+msgid "Unable to correct missing packages."
+msgstr "Ni ellir cywiro pecynnau ar goll."

 
 

-#: cmdline/acqprogress.cc:227
-#, c-format
-msgid " [Working]"
-msgstr " [Gweithio]"
+#: apt-private/private-install.cc:316
+#, fuzzy
+msgid "Aborting install."
+msgstr "Yn Erthylu'r Sefydliad."

 
 

-#: cmdline/acqprogress.cc:283
-#, fuzzy, c-format
+#: apt-private/private-install.cc:341

 msgid ""
 msgid ""

-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
-
-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr "Cofnod pecyn anhysbys!"
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-sortpkgs.cc:150
-#, fuzzy
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-private/private-install.cc:348
+msgid "Note: This is done automatically and on purpose by dpkg."

 msgstr ""
 msgstr ""

-"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
-"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -s   Defnyddio trefnu ffeil ffynhonell\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr "Rhagosodiad gwael!"

 
 

-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
-msgid "Press enter to continue."
-msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
+#: apt-private/private-install.cc:370
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""

 
 

-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
+#: apt-private/private-install.cc:463
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."

 msgstr ""
 
 msgstr ""
 

-#: dselect/install:101
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:466 apt-private/private-install.cc:622
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+
+#: apt-private/private-install.cc:470

 #, fuzzy
 #, fuzzy

-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"

 
 

-#: dselect/install:102
+#: apt-private/private-install.cc:479

 #, fuzzy
 #, fuzzy

-msgid "will be configured. This may result in duplicate errors"
-msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"

 
 

-#: dselect/install:103
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"
+#: apt-private/private-install.cc:486
+#, fuzzy, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"

 
 

-#: dselect/install:104
+#: apt-private/private-install.cc:488
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:582
+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
+#: apt-private/private-install.cc:584

 msgid ""
 msgid ""

-"above this message are important. Please fix them and run [I]nstall again"
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."

 msgstr ""
 msgstr ""

-"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
-"eto."
+"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
+"pecyn (neu penodwch ddatrys)"

 
 

-#: dselect/update:30
+# FIXME: needs commas
+#: apt-private/private-install.cc:607
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
+"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
+"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
+"heb gael eu symud allan o Incoming."
+
+#: apt-private/private-install.cc:628
+msgid "Broken packages"
+msgstr "Pecynnau wedi torri"
+
+#: apt-private/private-install.cc:697

 #, fuzzy
 #, fuzzy

-msgid "Merging available information"
-msgstr "Yn cyfuno manylion Ar Gael"
+msgid "The following additional packages will be installed:"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"

 
 

-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
+#: apt-private/private-install.cc:786
+msgid "Suggested packages:"
+msgstr "Pecynnau a awgrymmir:"

 
 

-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip"
+#: apt-private/private-install.cc:788
+msgid "Recommended packages:"
+msgstr "Pecynnau a argymhellir:"

 
 

-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
+#: apt-private/private-install.cc:810
+#, 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"

 
 

-#: apt-inst/contrib/extracttar.cc:193
-#, fuzzy
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Methodd swm gwirio Tar, archif llygredig"
+#: apt-private/private-install.cc:814
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"

 
 

-#: apt-inst/contrib/extracttar.cc:300
+#: apt-private/private-install.cc:826

 #, c-format
 #, c-format

-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+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"

 
 

-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
+#. TRANSLATORS: First string is package name, second is version
+#: apt-private/private-install.cc:832
+#, fuzzy, c-format
+msgid "%s is already the newest version (%s).\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
+#: apt-private/private-install.cc:880
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"

 
 

-#: apt-inst/contrib/arfile.cc:90
+#: apt-private/private-install.cc:885

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

-msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"

 
 

-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
+#: apt-private/private-main.cc:34
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""

 
 

-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
+#: apt-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""

 
 

-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
+#: apt-private/private-download.cc:94
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"

 
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
+#: apt-private/private-download.cc:101
+msgid "Authentication warning overridden.\n"
+msgstr ""

 
 

-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
+#: apt-private/private-download.cc:106 apt-private/private-download.cc:113
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"

 
 

-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
+#: apt-private/private-download.cc:111
+msgid "Install these packages without verification?"
+msgstr ""

 
 

-#: apt-inst/filelist.cc:464
+#: apt-private/private-download.cc:122

 #, fuzzy
 #, fuzzy

-msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
+msgid ""
+"There were unauthenticated packages and -y was used without --allow-"
+"unauthenticated"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#: apt-inst/filelist.cc:477
+#: apt-private/private-download.cc:154

 #, c-format
 #, c-format

-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
+msgid "Failed to fetch %s  %s\n"
+msgstr "Methwyd cyrchu %s  %s\n"

 
 

-# FIXME: "the"
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+#: apt-private/private-download.cc:176 apt-private/private-download.cc:179
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"

 
 

-#: apt-inst/filelist.cc:549
+#: apt-private/private-download.cc:193

 #, c-format
 #, c-format

-msgid "Duplicate conf file %s/%s"
-msgstr "Ffeil cyfluniad dyblyg %s/%s"
+msgid "You don't have enough free space in %s."
+msgstr "Does dim digon o le rhydd gennych yn %s."

 
 

-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#: apt-private/private-sources.cc:58

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

-msgid "Failed to write file %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "Failed to parse %s. Edit again? "
+msgstr "Methwyd ailenwi %s at %s"

 
 

-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#: apt-private/private-sources.cc:70

 #, c-format
 #, c-format

-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""

 
 

-#: 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"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""

 
 

-#: apt-inst/extract.cc:124
+#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
+#: apt-private/acqprogress.cc:74

 #, c-format
 #, c-format

-msgid "Unpacking %s more than once"
-msgstr "Yn dadbacio %s mwy nag unwaith"
+msgid "Hit:%lu %s"
+msgstr "Presennol:%lu %s"

 
 

-#: apt-inst/extract.cc:134
+#. TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update'
+#. Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens
+#: apt-private/acqprogress.cc:96

 #, c-format
 #, c-format

-msgid "The directory %s is diverted"
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+msgid "Get:%lu %s"
+msgstr "Cyrchu:%lu %s"

 
 

-#: apt-inst/extract.cc:144
+#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+#. which failed to download, but the error is ignored (compare "Err:")
+#: apt-private/acqprogress.cc:126

 #, c-format
 #, c-format

-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
-
-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
-msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
+msgid "Ign:%lu %s"
+msgstr "Anwybyddu:%lu %s"

 
 

-#: apt-inst/extract.cc:240
+#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
+#. which failed to download and the error is critical (compare "Ign:")
+#: apt-private/acqprogress.cc:136

 #, c-format
 #, c-format

-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
-
-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
-
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr "Mae'r llwybr yn rhy hir"
+msgid "Err:%lu %s"
+msgstr "Gwall:%lu %s"

 
 

-# FIXME: wtf?
-#: apt-inst/extract.cc:412
+#: apt-private/acqprogress.cc:159

 #, c-format
 #, c-format

-msgid "Overwrite package match with no version for %s"
-msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"

 
 

-#: apt-inst/extract.cc:429
-#, 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-private/acqprogress.cc:229
+msgid " [Working]"
+msgstr " [Gweithio]"
+
+#: apt-private/acqprogress.cc:297
+#, fuzzy, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press [Enter]\n"
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"

 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.

-#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:334 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:309
-#: methods/mirror.cc:87
+#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 apt-pkg/clean.cc:43
+#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312
+#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488
+#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471

 #, 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:489
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235

 #, c-format
 #, c-format

-msgid "Unable to stat %s"
-msgstr "Ni ellir gwneud stat() o %s"
+msgid "Unable to change to %s"
+msgstr "Ni ellir newid i %s"

 
 

-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:280

 #, c-format
 #, c-format

-msgid "Failed to remove %s"
-msgstr "Methwyd dileu %s"
+msgid "No mirror file '%s' found "
+msgstr ""
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:287
+#, fuzzy, c-format
+msgid "Can not read mirror file '%s'"
+msgstr "Methwyd agor ffeil %s"
+
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Methwyd agor ffeil %s"

 
 

-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: methods/mirror.cc:445

 #, c-format
 #, c-format

-msgid "Unable to create %s"
-msgstr "Ni ellir creu %s"
+msgid "[Mirror: %s]"
+msgstr ""
+
+#: methods/rsh.cc:109 ftparchive/multicompress.cc:170
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Methwyd creu pibell cyfathrebu at isbroses"

 
 

-#: apt-inst/deb/dpkgdb.cc:114
-#, c-format
-msgid "Failed to stat %sinfo"
-msgstr "Methwyd stat() ar %sinfo"
+#: methods/rsh.cc:364
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"

 
 

-#: 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"
+#: dselect/install:33
+msgid "Bad default setting!"
+msgstr "Rhagosodiad gwael!"

 
 

-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1074
-#: apt-pkg/pkgcachegen.cc:1178 apt-pkg/pkgcachegen.cc:1184
-#: apt-pkg/pkgcachegen.cc:1330
+#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
+#: dselect/install:106 dselect/update:45

 #, fuzzy
 #, fuzzy

-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
+msgid "Press [Enter] to continue."
+msgstr "Gwasgwch Enter er mwyn mynd ymlaen."

 
 

-#: 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"
+#: dselect/install:92
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr ""

 
 

-# FIXME
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: dselect/install:102

 #, fuzzy
 #, fuzzy

-msgid "Internal error getting a package name"
-msgstr "Gwall mewnol wrth gyrchu enw pecyn"
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"

 
 

-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: dselect/install:103

 #, fuzzy
 #, fuzzy

-msgid "Reading file listing"
-msgstr "Yn Darllen Rhestr Ffeiliau"
+msgid "will be configured. This may result in duplicate errors"
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"

 
 

-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
+#: dselect/install:104
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"
+
+#: dselect/install:105

 msgid ""
 msgid ""

-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
+"above this message are important. Please fix them and run [I]nstall again"

 msgstr ""
 msgstr ""

-"Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn yna "
-"gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
-
-# FIXME
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
+"eto."

 
 

-#: apt-inst/deb/dpkgdb.cc:262
+#: dselect/update:30

 #, fuzzy
 #, fuzzy

-msgid "Internal error getting a node"
-msgstr "Gwall Mewnol wrth gael Nôd"
+msgid "Merging available information"
+msgstr "Yn cyfuno manylion Ar Gael"

 
 

-# FIXME: literal
-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-pkg/install-progress.cc:58

 #, c-format
 #, c-format

-msgid "Failed to open the diversions file %sdiversions"
-msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
+msgid "Progress: [%3i%%]"
+msgstr ""

 
 

-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:177
+msgid "Running dpkg"
+msgstr ""

 
 

-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-pkg/init.cc:176

 #, c-format
 #, c-format

-msgid "Invalid line in the diversion file: %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-
-#: apt-inst/deb/dpkgdb.cc:358
-#, fuzzy
-msgid "Internal error adding a diversion"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"

 
 

-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-pkg/init.cc:192

 #, fuzzy
 #, fuzzy

-msgid "The pkg cache must be initialized first"
-msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
-
-#: apt-inst/deb/dpkgdb.cc:439
-#, fuzzy, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni ellir canfod math system addas"

 
 

-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-pkg/indexcopy.cc:228 apt-pkg/indexcopy.cc:753

 #, c-format
 #, c-format

-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+msgid "Wrote %i records.\n"
+msgstr ""

 
 

-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-pkg/indexcopy.cc:230 apt-pkg/indexcopy.cc:755

 #, c-format
 #, c-format

-msgid "Error parsing MD5. Offset %lu"
-msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""

 
 

-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#: apt-pkg/indexcopy.cc:233 apt-pkg/indexcopy.cc:758

 #, c-format
 #, 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"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""

 
 

-#: 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-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:761
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""

 
 

-#: apt-inst/deb/debfile.cc:110
+#: apt-pkg/indexcopy.cc:498

 #, c-format
 #, c-format

-msgid "Couldn't change to %s"
-msgstr "Methwyd newid i %s"
+msgid "Can't find authentication record for: %s"
+msgstr ""

 
 

-#: apt-inst/deb/debfile.cc:140
-#, fuzzy
-msgid "Internal error, could not locate member"
-msgstr "Gwall Methwyd, methwyd lleoli aelod"
+#: apt-pkg/indexcopy.cc:504
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: apt-inst/deb/debfile.cc:173
-msgid "Failed to locate a valid control file"
-msgstr "Methwyd lleoli ffeil rheoli dilys"
+#: apt-pkg/cachefile.cc:98
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."

 
 

-#: apt-inst/deb/debfile.cc:258
-#, fuzzy
-msgid "Unparsable control file"
-msgstr "Ffeil rheoli ni ellir ei ramadegu"
+#: apt-pkg/cachefile.cc:102
+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."

 
 

-#: methods/bzip2.cc:60 methods/gzip.cc:52
-msgid "Empty files can't be valid archives"
-msgstr ""
+#: apt-pkg/cachefile.cc:120
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."

 
 

-#: methods/bzip2.cc:64
+#: apt-pkg/acquire-worker.cc:111

 #, c-format
 #, c-format

-msgid "Couldn't open pipe for %s"
-msgstr "Methwyd agor pibell ar gyfer %s"
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."

 
 

-#: methods/bzip2.cc:108
+#: apt-pkg/acquire-worker.cc:113

 #, c-format
 #, c-format

-msgid "Read error from %s process"
-msgstr "Gwall darllen o broses %s"
-
-#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
-#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
-#: methods/rred.cc:533
-msgid "Failed to stat"
-msgstr "Methwyd stat()"
-
-#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
-#: methods/rred.cc:530
-msgid "Failed to set modification time"
-msgstr "Methwyd gosod amser newid"
+msgid "Is the package %s installed?"
+msgstr ""

 
 

-#: methods/cdrom.cc:199
+#: apt-pkg/acquire-worker.cc:164

 #, c-format
 #, c-format

-msgid "Unable to read the cdrom database %s"
-msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"

 
 

-#: methods/cdrom.cc:208
-#, fuzzy
+#: apt-pkg/acquire-worker.cc:537
+#, fuzzy, c-format

 msgid ""
 msgid ""

-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."

 msgstr ""
 msgstr ""

-"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
-"get update i ychwanegu CDau newydd."
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"

 
 

-#: methods/cdrom.cc:218
-#, fuzzy
-msgid "Wrong CD-ROM"
-msgstr "CD Anghywir"
+#: apt-pkg/pkgcache.cc:163
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"

 
 

-#: methods/cdrom.cc:245
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
+#: apt-pkg/pkgcache.cc:169 apt-pkg/pkgcache.cc:180
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
+#: apt-pkg/pkgcache.cc:174
+msgid "The package cache file is an incompatible version"
+msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"

 
 

-#: methods/cdrom.cc:250
+#: apt-pkg/pkgcache.cc:177

 #, fuzzy
 #, fuzzy

-msgid "Disk not found."
-msgstr "Ffeil heb ei ganfod"
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"

 
 

-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
-msgstr "Ffeil heb ei ganfod"
+# FIXME: capitalisation?
+#: apt-pkg/pkgcache.cc:184
+#, 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'"

 
 

-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
+#: apt-pkg/pkgcache.cc:194
+#, fuzzy, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
+msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"

 
 

-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
-msgid "Logging in"
-msgstr "Yn mewngofnodi"
+#: apt-pkg/pkgcache.cc:319
+msgid "Depends"
+msgstr "Dibynnu"

 
 

-#: methods/ftp.cc:174
-msgid "Unable to determine the peer name"
-msgstr "Ni ellir darganfod enw'r cymar"
+#: apt-pkg/pkgcache.cc:319
+msgid "PreDepends"
+msgstr "CynDdibynnu"

 
 

-#: methods/ftp.cc:179
-msgid "Unable to determine the local name"
-msgstr "Ni ellir darganfod yr enw lleol"
+#: apt-pkg/pkgcache.cc:319
+msgid "Suggests"
+msgstr "Awgrymu"

 
 

-#: methods/ftp.cc:210 methods/ftp.cc:238
-#, fuzzy, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
+#: apt-pkg/pkgcache.cc:320
+msgid "Recommends"
+msgstr "Argymell"

 
 

-#: methods/ftp.cc:216
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+#: apt-pkg/pkgcache.cc:320
+msgid "Conflicts"
+msgstr "Gwrthdaro"

 
 

-#: methods/ftp.cc:223
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+#: apt-pkg/pkgcache.cc:320
+msgid "Replaces"
+msgstr "Amnewid"

 
 

-#: methods/ftp.cc:243
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+#: apt-pkg/pkgcache.cc:321
+msgid "Obsoletes"
+msgstr "Darfodi"
+
+#: apt-pkg/pkgcache.cc:321
+msgid "Breaks"

 msgstr ""
 msgstr ""

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

 
 

-# FIXME
-#: methods/ftp.cc:271
-#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
+#: apt-pkg/pkgcache.cc:321
+msgid "Enhances"
+msgstr ""

 
 

-#: methods/ftp.cc:297
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+#: apt-pkg/pkgcache.cc:332
+msgid "important"
+msgstr "pwysig"

 
 

-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr "Goramser cysylltu"
+#: apt-pkg/pkgcache.cc:332
+msgid "required"
+msgstr "angenrheidiol"

 
 

-#: methods/ftp.cc:341
-msgid "Server closed the connection"
-msgstr "Caeodd y gweinydd y cysylltiad"
+#: apt-pkg/pkgcache.cc:332
+msgid "standard"
+msgstr "safonnol"

 
 

-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:811 methods/rsh.cc:190
-msgid "Read error"
-msgstr "Gwall darllen"
+#: apt-pkg/pkgcache.cc:333
+msgid "optional"
+msgstr "opsiynnol"

 
 

-#: methods/ftp.cc:351 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr "Gorlifodd ateb y byffer."
+#: apt-pkg/pkgcache.cc:333
+msgid "extra"
+msgstr "ychwanegol"

 
 

-#: methods/ftp.cc:368 methods/ftp.cc:380
-msgid "Protocol corruption"
-msgstr "Llygr protocol"
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+#, fuzzy
+msgid "Calculating upgrade"
+msgstr "Yn Cyfrifo'r Uwchraddiad"

 
 

-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:853 methods/rsh.cc:232
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"

 
 

-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
-msgid "Could not create a socket"
-msgstr "Methwyd creu soced"
+#: apt-pkg/pkgcachegen.cc:112
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"

 
 

-#: methods/ftp.cc:703
-msgid "Could not connect data socket, connection timed out"
-msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:237 apt-pkg/pkgcachegen.cc:299
+#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394
+#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402
+#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428
+#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"

 
 

-#: methods/ftp.cc:709
-#, fuzzy
-msgid "Could not connect passive socket."
-msgstr "Methwyd cysylltu soced goddefol"
+#: apt-pkg/pkgcachegen.cc:257
+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."

 
 

-# FIXME
-#: methods/ftp.cc:727
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Methodd getaddrinfo gael soced gwrando"
+#: apt-pkg/pkgcachegen.cc:260
+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."

 
 

-#: methods/ftp.cc:741
-msgid "Could not bind a socket"
-msgstr "Methwyd rhwymo soced"
+#: apt-pkg/pkgcachegen.cc:263
+#, 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."

 
 

-#: methods/ftp.cc:745
-msgid "Could not listen on the socket"
-msgstr "Methwyd gwrando ar y soced"
+#: apt-pkg/pkgcachegen.cc:266
+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."

 
 

-#: methods/ftp.cc:752
-msgid "Could not determine the socket's name"
-msgstr "Methwyd canfod enw'r soced"
+#: apt-pkg/pkgcachegen.cc:1419 apt-pkg/pkgcachegen.cc:1546
+#: apt-pkg/pkgcachegen.cc:1572 apt-pkg/pkgcachegen.cc:1681
+#, fuzzy
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"

 
 

-#: methods/ftp.cc:784
-msgid "Unable to send PORT command"
-msgstr "Methwyd danfod gorchymyn PORT"
+#: apt-pkg/pkgcachegen.cc:1490 apt-pkg/pkgcachegen.cc:1497
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"

 
 

-#: methods/ftp.cc:794
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
+msgid "Send scenario to solver"
+msgstr ""

 
 

-#: methods/ftp.cc:803
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+#: apt-pkg/edsp.cc:232
+msgid "Send request to solver"
+msgstr ""

 
 

-#: methods/ftp.cc:823
-msgid "Data socket connect timed out"
-msgstr "Goramserodd cysylltiad y soced data"
+#: apt-pkg/edsp.cc:311
+msgid "Prepare for receiving solution"
+msgstr ""

 
 

-#: methods/ftp.cc:830
-msgid "Unable to accept connection"
-msgstr "Methwyd derbyn cysylltiad"
+#: apt-pkg/edsp.cc:318
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
+msgid "Execute external solver"
+msgstr ""

 
 

-#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
-msgid "Problem hashing file"
-msgstr "Problem wrth stwnshio ffeil"
+#: apt-pkg/acquire-item.cc:116
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""

 
 

-#: methods/ftp.cc:882
+#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2162

 #, c-format
 #, c-format

-msgid "Unable to fetch file, server said '%s'"
-msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."

 
 

-#: methods/ftp.cc:897 methods/rsh.cc:321
-msgid "Data socket timed out"
-msgstr "Goramserodd soced data"
+#: apt-pkg/acquire-item.cc:585
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: methods/ftp.cc:927
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
+#: apt-pkg/acquire-item.cc:590
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"

 
 

-#. Get the files information
-#: methods/ftp.cc:1004
-msgid "Query"
-msgstr "Ymholiad"
+#: apt-pkg/acquire-item.cc:595
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Gweithred annilys %s"

 
 

-# FIXME
-#: methods/ftp.cc:1116
-msgid "Unable to invoke "
-msgstr "Methwyd gweithredu "
+#: apt-pkg/acquire-item.cc:600
+#, fuzzy
+msgid "Signature error"
+msgstr "Gwall ysgrifennu"

 
 

-#: methods/connect.cc:71
+#: apt-pkg/acquire-item.cc:789

 #, c-format
 #, c-format

-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s"
+msgstr ""

 
 

-#: methods/connect.cc:82
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805

 #, c-format
 #, c-format

-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+msgid "GPG error: %s: %s"
+msgstr ""

 
 

-#: methods/connect.cc:89
+#: apt-pkg/acquire-item.cc:970

 #, c-format
 #, c-format

-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1026
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""

 
 

-#: methods/connect.cc:95
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formatted in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1066

 #, c-format
 #, c-format

-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""

 
 

-#: methods/connect.cc:103
+#: apt-pkg/acquire-item.cc:1107

 #, c-format
 #, c-format

-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""

 
 

-#: methods/connect.cc:121
+#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480

 #, c-format
 #, c-format

-msgid "Could not connect to %s:%s (%s)."
-msgstr "Methwyd cysylltu i %s:%s (%s)."
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
+msgstr ""

 
 

-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:424
+#: apt-pkg/acquire-item.cc:1326

 #, c-format
 #, c-format

-msgid "Connecting to %s"
-msgstr "Yn cysylltu i %s"
+msgid ""
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
+msgstr ""

 
 

-#: methods/connect.cc:168 methods/connect.cc:187
+#: apt-pkg/acquire-item.cc:1459
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-pkg/acquire-item.cc:1466
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+# FIXME: case
+#: apt-pkg/acquire-item.cc:2611

 #, c-format
 #, c-format

-msgid "Could not resolve '%s'"
-msgstr "Methwyd datrys '%s'"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
+msgstr ""
+"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
+"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"

 
 

-#: methods/connect.cc:193
+#: apt-pkg/acquire-item.cc:2677

 #, c-format
 #, c-format

-msgid "Temporary failure resolving '%s'"
-msgstr "Methiant dros dro yn datrys '%s'"
+msgid "Can't find a source to download version '%s' of '%s'"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:2715
+#, 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."

 
 

-#: methods/connect.cc:196
+#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
+#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3058

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

-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+msgid "Changelog unavailable for %s=%s"
+msgstr "Yn cysylltu i %s (%s)"

 
 

-#: methods/connect.cc:243
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833

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

-msgid "Unable to connect to %s:%s:"
-msgstr "Methwyd cysylltu i %s %s:"
+msgid "List directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."

 
 

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:71
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151

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

-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
+msgid "Archives directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."

 
 

-#: methods/gpgv.cc:163
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+#: apt-pkg/acquire.cc:162
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"

 
 

-#: methods/gpgv.cc:168
-msgid "At least one invalid signature was encountered."
+#: apt-pkg/acquire.cc:553 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:1081
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:172
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: apt-pkg/acquire.cc:1083
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#: apt-pkg/policy.cc:77
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:177
-msgid "Unknown error executing gpgv"
+# FIXME: literal
+#: apt-pkg/policy.cc:453
+#, fuzzy, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
+
+# FIXME: tense
+#: apt-pkg/policy.cc:475
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"
+
+#: apt-pkg/policy.cc:484
+#, c-format
+msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:211 methods/gpgv.cc:218
+#: apt-pkg/policy.cc:491
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
+
+#: apt-pkg/update.cc:76
+#, fuzzy, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Methwyd cyrchu %s  %s\n"
+
+#: apt-pkg/update.cc:102 apt-pkg/update.cc:104

 #, fuzzy
 #, fuzzy

-msgid "The following signatures were invalid:\n"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."
+
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc:53
+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/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."

 
 

-#: methods/gpgv.cc:225
+#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
+#, c-format

 msgid ""
 msgid ""

-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:385
-msgid "Waiting for headers"
-msgstr "Yn aros am benawdau"
+#: apt-pkg/packagemanager.cc:589 apt-pkg/packagemanager.cc:627
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"

 
 

-#: methods/http.cc:531
+# FIXME: %s may have an arbirrary length
+#: apt-pkg/packagemanager.cc:677

 #, c-format
 #, c-format

-msgid "Got a single header line over %u chars"
-msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
+"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
+"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."

 
 

-#: methods/http.cc:539
-msgid "Bad header line"
-msgstr "Llinell pennawd gwael"
+#: apt-pkg/cdrom.cc:498
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."

 
 

-#: methods/http.cc:564 methods/http.cc:571
+#: apt-pkg/cdrom.cc:572

 #, fuzzy
 #, fuzzy

-msgid "The HTTP server sent an invalid reply header"
-msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"

 
 

-#: methods/http.cc:600
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+#: apt-pkg/cdrom.cc:587
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""

 
 

-#: methods/http.cc:615
+#: apt-pkg/cdrom.cc:600

 #, fuzzy
 #, fuzzy

-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+msgid "Waiting for disc...\n"
+msgstr "Yn aros am benawdau"

 
 

-#: methods/http.cc:617
-#, fuzzy
-msgid "This HTTP server has broken range support"
-msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+#: apt-pkg/cdrom.cc:610
+msgid "Mounting CD-ROM...\n"
+msgstr ""

 
 

-#: methods/http.cc:641
-msgid "Unknown date format"
-msgstr "Fformat dyddiad anhysbys"
+#: apt-pkg/cdrom.cc:621
+msgid "Identifying... "
+msgstr ""

 
 

-#: methods/http.cc:799
-msgid "Select failed"
-msgstr "Methwyd dewis"
+#: apt-pkg/cdrom.cc:663
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""

 
 

-#: methods/http.cc:804
-msgid "Connection timed out"
-msgstr "Goramserodd y cysylltiad"
+#: apt-pkg/cdrom.cc:681
+msgid "Scanning disc for index files...\n"
+msgstr ""

 
 

-#: methods/http.cc:827
-msgid "Error writing to output file"
-msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+#: apt-pkg/cdrom.cc:735
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
+msgstr ""

 
 

-#: methods/http.cc:858
-msgid "Error writing to file"
-msgstr "Gwall wrth ysgrifennu at ffeil"
+#: apt-pkg/cdrom.cc:745
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""

 
 

-#: methods/http.cc:886
-msgid "Error writing to the file"
-msgstr "Gwall wrth ysgrifennu at y ffeil"
+#: apt-pkg/cdrom.cc:772
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""

 
 

-#: methods/http.cc:900
+#: apt-pkg/cdrom.cc:801
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:818
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:820

 #, fuzzy
 #, fuzzy

-msgid "Error reading from server. Remote end closed connection"
-msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+msgid "Copying package lists..."
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-pkg/cdrom.cc:867
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/cdrom.cc:878
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/algorithms.cc:263
+#, 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."
+
+#: apt-pkg/algorithms.cc:1080
+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."

 
 

-#: methods/http.cc:902
-msgid "Error reading from server"
-msgstr "Gwall wrth ddarllen o'r gweinydd"
+#: apt-pkg/algorithms.cc:1082
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."

 
 

-#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283
+#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167

 #, fuzzy
 #, fuzzy

-msgid "Failed to truncate file"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"

 
 

-#: methods/http.cc:1160
+#: apt-pkg/depcache.cc:140

 #, fuzzy
 #, fuzzy

-msgid "Bad header data"
-msgstr "Data pennawd gwael"
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"

 
 

-#: methods/http.cc:1177 methods/http.cc:1232
-msgid "Connection failed"
-msgstr "Methodd y cysylltiad"
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"

 
 

-#: methods/http.cc:1324
-msgid "Internal error"
-msgstr "Gwall mewnol"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"

 
 

-#: apt-pkg/contrib/mmap.cc:77
-msgid "Can't mmap an empty file"
-msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+#: apt-pkg/depcache.cc:252
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"

 
 

-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/depcache.cc:257

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

-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Methwyd agor pibell ar gyfer %s"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"

 
 

-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
+#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
-
-#: apt-pkg/contrib/mmap.cc:124
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Ni ellir agor %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"

 
 

-# FIXME
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Methwyd gweithredu "
-
-#: apt-pkg/contrib/mmap.cc:302
+#: apt-pkg/tagfile.cc:541 apt-pkg/tagfile.cc:544

 #, c-format
 #, c-format

-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
+msgid "Cannot convert %s to integer"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:401
+#: apt-pkg/cacheset.cc:500

 #, c-format
 #, c-format

-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
-msgstr ""
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"

 
 

-#: apt-pkg/contrib/mmap.cc:404
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
-msgstr ""
+#: apt-pkg/cacheset.cc:503
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+
+#: apt-pkg/cacheset.cc:738
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc:744
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc:750
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
+#: apt-pkg/cacheset.cc:789

 #, c-format
 #, c-format

-msgid "%lid %lih %limin %lis"
+msgid "Can't select versions from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/cacheset.cc:828

 #, c-format
 #, c-format

-msgid "%lih %limin %lis"
+msgid "Can't select newest version from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/cacheset.cc:836

 #, c-format
 #, c-format

-msgid "%limin %lis"
+msgid "Can't select candidate version from package %s as it has no candidate"

 msgstr ""
 
 msgstr ""
 

-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
+#: apt-pkg/cacheset.cc:844

 #, c-format
 #, c-format

-msgid "%lis"
+msgid "Can't select installed version from package %s as it is not installed"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1136
+#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860

 #, c-format
 #, c-format

-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""

 
 

-#: apt-pkg/contrib/configuration.cc:452
+#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
+#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140
+#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151
+#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197
+#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211
+#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220
+#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244
+#: apt-pkg/sourcelist.cc:251
+#, fuzzy, c-format
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: apt-pkg/sourcelist.cc:355

 #, c-format
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
+msgid "Opening %s"
+msgstr "Yn agor %s"

 
 

-#: apt-pkg/contrib/configuration.cc:510
+#: apt-pkg/sourcelist.cc:389

 #, c-format
 #, c-format

-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+
+#: apt-pkg/sourcelist.cc:393
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
+#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+
+#: apt-pkg/sourcelist.cc:429
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
+# FIXME: number?
+#: apt-pkg/deb/debmetaindex.cc:229
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/deb/debmetaindex.cc:238
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"

 
 

-#: apt-pkg/contrib/configuration.cc:678
+#: apt-pkg/deb/debmetaindex.cc:278

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
+msgid "No Hash entry in Release file %s"
+msgstr ""

 
 

-# FIXME
-#: apt-pkg/contrib/configuration.cc:697
+# FIXME: number?
+#: apt-pkg/deb/debmetaindex.cc:286

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

-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: apt-pkg/deb/debmetaindex.cc:307
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"

 
 

-#: apt-pkg/contrib/configuration.cc:714
+#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
+#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446
+#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462
+#: apt-pkg/deb/debmetaindex.cc:485

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
+msgid "Conflicting values set for option %s concerning source %s %s"
+msgstr ""

 
 

-#: apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/deb/debmetaindex.cc:480

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "Invalid value set for option %s concerning source %s %s (%s)"

 msgstr ""
 msgstr ""

-"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"

 
 

-#: apt-pkg/contrib/configuration.cc:761
+#: apt-pkg/deb/dpkgpm.cc:110
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1007
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1014
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:113
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+msgid "Noting disappearance of %s"
+msgstr ""

 
 

-#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
+#: apt-pkg/deb/dpkgpm.cc:115

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Included from here"
-msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:838
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/deb/dpkgpm.cc:853 apt-pkg/deb/dpkgpm.cc:875
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Methwyd agor ffeil %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1000
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1006
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1008
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Wedi Sefydlu: "

 
 

-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/deb/dpkgpm.cc:1013

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+msgid "Preparing for removal of %s"
+msgstr ""

 
 

-#: apt-pkg/contrib/configuration.cc:777
+#: apt-pkg/deb/dpkgpm.cc:1015

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

-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Removed %s"
+msgstr "Argymell"
+
+#: apt-pkg/deb/dpkgpm.cc:1020
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
+msgid "Is /dev/pts mounted?"

 msgstr ""
 msgstr ""

-"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"

 
 

-#: apt-pkg/contrib/configuration.cc:827
-#, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""

 
 

-#: apt-pkg/contrib/progress.cc:153
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Gwall!"
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""

 
 

-#: apt-pkg/contrib/progress.cc:155
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Wedi Gorffen"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""

 
 

-# FIXME
-#: apt-pkg/contrib/cmndline.cc:77
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
+#: apt-pkg/deb/debsystem.cc:88

 #, c-format
 #, c-format

-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"

 
 

-#: apt-pkg/contrib/cmndline.cc:236
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:107

 #, c-format
 #, c-format

-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:267
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
+#: apt-pkg/deb/debsystem.cc:125
+msgid "Not locked"
+msgstr ""

 
 

-# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:300
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:420

 #, c-format
 #, c-format

-msgid "Sense %s is not understood, try true or false."
-msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
+msgid "%lid %lih %limin %lis"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:350
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425

 #, c-format
 #, c-format

-msgid "Invalid operation %s"
-msgstr "Gweithred annilys %s"
+msgid "%lih %limin %lis"
+msgstr ""

 
 

-#: apt-pkg/contrib/cdromutl.cc:52
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:430

 #, c-format
 #, c-format

-msgid "Unable to stat the mount point %s"
-msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
+msgid "%limin %lis"
+msgstr ""

 
 

-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:93
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc:435

 #, c-format
 #, c-format

-msgid "Unable to change to %s"
-msgstr "Ni ellir newid i %s"
+msgid "%lis"
+msgstr ""

 
 

-#: apt-pkg/contrib/cdromutl.cc:217
-msgid "Failed to stat the cdrom"
-msgstr "Methwyd gwneud stat() o'r CD-ROM"
+#: apt-pkg/contrib/strutl.cc:1279
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"

 
 

-#: apt-pkg/contrib/fileutl.cc:159
+#: apt-pkg/contrib/fileutl.cc:197

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

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

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

 #, 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:326
+#: apt-pkg/contrib/fileutl.cc:367 apt-pkg/contrib/fileutl.cc:481

 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:353
+#: apt-pkg/contrib/fileutl.cc:401

 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:419

 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:380
+#: apt-pkg/contrib/fileutl.cc:428

 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:670
-#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
-
-#: apt-pkg/contrib/fileutl.cc:682
+#: apt-pkg/contrib/fileutl.cc:862

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

 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 

-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:227

 #, 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:690
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:220

 #, 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:755
+#: apt-pkg/contrib/fileutl.cc:987
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gwall wrth gau'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1194

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

-#: apt-pkg/contrib/fileutl.cc:772
+#: apt-pkg/contrib/fileutl.cc:1253 apt-pkg/contrib/fileutl.cc:1300

 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Methwyd agor pibell ar gyfer %s"
 
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Methwyd agor pibell ar gyfer %s"
 

+#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2177
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1466
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "
+

 # FIXME
 # FIXME

-#: apt-pkg/contrib/fileutl.cc:832
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:1607
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"

 msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
 # FIXME
 msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
 # FIXME

-#: apt-pkg/contrib/fileutl.cc:865
-#, 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:1001
+#: apt-pkg/contrib/fileutl.cc:1720 apt-pkg/contrib/fileutl.cc:1742

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

-msgid "Problem closing the gzip file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgid "write, still have %llu to write but couldn't"
+msgstr "o hyd %lu i ysgrifennu ond methwyd"

 
 

-#: apt-pkg/contrib/fileutl.cc:1004
+#: apt-pkg/contrib/fileutl.cc:2008

 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Gwall wrth gau'r ffeil"
 
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Gwall wrth gau'r ffeil"
 

-#: apt-pkg/contrib/fileutl.cc:1009
+#: apt-pkg/contrib/fileutl.cc:2020

 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Gwall wrth gyfamseru'r ffeil"
 

-#: apt-pkg/contrib/fileutl.cc:1020
+#: apt-pkg/contrib/fileutl.cc:2031

 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Gwall wrth dadgysylltu'r ffeil"
 

-#: apt-pkg/contrib/fileutl.cc:1033
+#: apt-pkg/contrib/fileutl.cc:2044

 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:145
-msgid "Empty package cache"
-msgstr "Storfa pecyn gwag"
+#: apt-pkg/contrib/fileutl.cc:2147 cmdline/apt-extracttemplates.cc:258
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni ellir gwneud stat() o %s"

 
 

-#: apt-pkg/pkgcache.cc:151
-msgid "The package cache file is corrupted"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+#: apt-pkg/contrib/fileutl.cc:2152 cmdline/apt-extracttemplates.cc:263
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"

 
 

-#: apt-pkg/pkgcache.cc:156
-msgid "The package cache file is an incompatible version"
-msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"

 
 

-# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:161
-#, fuzzy, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"

 
 

-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache was built for a different architecture"
-msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""

 
 

-#: apt-pkg/pkgcache.cc:293
-msgid "Depends"
-msgstr "Dibynnu"
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"

 
 

-#: apt-pkg/pkgcache.cc:293
-msgid "PreDepends"
-msgstr "CynDdibynnu"
+#: apt-pkg/contrib/mmap.cc:79
+msgid "Can't mmap an empty file"
+msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"

 
 

-#: apt-pkg/pkgcache.cc:293
-msgid "Suggests"
-msgstr "Awgrymu"
+#: apt-pkg/contrib/mmap.cc:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Methwyd agor pibell ar gyfer %s"

 
 

-#: apt-pkg/pkgcache.cc:294
-msgid "Recommends"
-msgstr "Argymell"
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"

 
 

-#: apt-pkg/pkgcache.cc:294
-msgid "Conflicts"
-msgstr "Gwrthdaro"
+#: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ni ellir agor %s"

 
 

-#: apt-pkg/pkgcache.cc:294
-msgid "Replaces"
-msgstr "Amnewid"
+# FIXME
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Methwyd gweithredu "

 
 

-#: apt-pkg/pkgcache.cc:295
-msgid "Obsoletes"
-msgstr "Darfodi"
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"

 
 

-#: apt-pkg/pkgcache.cc:295
-msgid "Breaks"
-msgstr ""
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"

 
 

-#: apt-pkg/pkgcache.cc:295
-msgid "Enhances"
+#: apt-pkg/contrib/mmap.cc:341
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:306
-msgid "important"
-msgstr "pwysig"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "required"
-msgstr "angenrheidiol"
-
-#: apt-pkg/pkgcache.cc:306
-msgid "standard"
-msgstr "safonnol"
+#: apt-pkg/contrib/mmap.cc:446
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""

 
 

-#: apt-pkg/pkgcache.cc:307
-msgid "optional"
-msgstr "opsiynnol"
+#: apt-pkg/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""

 
 

-#: apt-pkg/pkgcache.cc:307
-msgid "extra"
-msgstr "ychwanegol"
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"

 
 

-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+#: apt-pkg/contrib/cdromutl.cc:247
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"

 
 

-#: apt-pkg/depcache.cc:126
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-pkg/contrib/configuration.cc:516
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"

 
 

-#: apt-pkg/depcache.cc:155
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-pkg/contrib/configuration.cc:630
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
-#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+#: apt-pkg/contrib/configuration.cc:798
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."

 
 

-#: apt-pkg/depcache.cc:237
+# FIXME
+#: apt-pkg/contrib/configuration.cc:817

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

-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"

 
 

-#: apt-pkg/depcache.cc:243
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: apt-pkg/contrib/configuration.cc:834
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"

 
 

-#: apt-pkg/depcache.cc:922
+#: apt-pkg/contrib/configuration.cc:874

 #, c-format
 #, c-format

-msgid "Internal error, group '%s' has no installable pseudo package"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"

 msgstr ""
 msgstr ""

+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"

 
 

-# FIXME: number?
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/contrib/configuration.cc:881

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+
+#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"

 
 

-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/contrib/configuration.cc:894

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"

 
 

-#: apt-pkg/sourcelist.cc:92
+#: apt-pkg/contrib/configuration.cc:897

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

-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"

 msgstr ""
 msgstr ""

-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"

 
 

-#: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: apt-pkg/contrib/configuration.cc:947
+#, 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/sourcelist.cc:106
+# FIXME
+#: apt-pkg/contrib/cmndline.cc:127

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

-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgid ""
+"Command line option '%c' [from %s] is not understood in combination with the "
+"other options."
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."

 
 

-#: apt-pkg/sourcelist.cc:112
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169

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

-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgid ""
+"Command line option %s is not understood in combination with the other "
+"options"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"

 
 

-#: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-pkg/contrib/cmndline.cc:174
+#, 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:215 apt-pkg/contrib/cmndline.cc:236
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
+#, 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:284
+#, 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:315
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"
+
+# FIXME: 'Sense'?
+#: apt-pkg/contrib/cmndline.cc:347
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."

 
 

-#: apt-pkg/sourcelist.cc:128
+#: apt-pkg/contrib/cmndline.cc:397

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"
+
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc:228
+#, fuzzy
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"

 
 

-#: apt-pkg/sourcelist.cc:130
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: cmdline/apt-extracttemplates.cc:304
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"

 
 

-#: apt-pkg/sourcelist.cc:133
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:368
+msgid "Package extension list is too long"
+msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."

 
 

-#: apt-pkg/sourcelist.cc:139
+#: ftparchive/apt-ftparchive.cc:190 ftparchive/apt-ftparchive.cc:202
+#: ftparchive/apt-ftparchive.cc:225 ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:291 ftparchive/apt-ftparchive.cc:313

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

-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-
-#: apt-pkg/sourcelist.cc:146
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:244
-#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
+msgid "Error processing directory %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"

 
 

-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+#: ftparchive/apt-ftparchive.cc:279
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"

 
 

-#: apt-pkg/sourcelist.cc:281
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+#: ftparchive/apt-ftparchive.cc:394
+msgid "Error writing header to contents file"
+msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"

 
 

-#: apt-pkg/sourcelist.cc:285
+#: ftparchive/apt-ftparchive.cc:424

 #, fuzzy, c-format
 #, 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"
+msgid "Error processing contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"

 
 

-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
-#, c-format
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc:616
+#, fuzzy

 msgid ""
 msgid ""

-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"

 msgstr ""
 msgstr ""

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

 
 

-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:452
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
-"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
-"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
+#: ftparchive/apt-ftparchive.cc:812
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"

 
 

-#: apt-pkg/packagemanager.cc:495
+#: ftparchive/apt-ftparchive.cc:892

 #, c-format
 #, c-format

-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn  `%s'"

 
 

-#: apt-pkg/pkgrecords.cc:32
+#: ftparchive/cachedb.cc:68

 #, c-format
 #, c-format

-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"

 
 

-#: apt-pkg/algorithms.cc:313
+#: ftparchive/cachedb.cc:86

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

 
 

-#: apt-pkg/algorithms.cc:1239
+#: ftparchive/cachedb.cc:97

 msgid ""
 msgid ""

-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/algorithms.cc:1241
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
+#: ftparchive/cachedb.cc:102
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"

 
 

-#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
-"rai eu defnyddio yn lle."
+#: ftparchive/cachedb.cc:185 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"

 
 

-#: apt-pkg/acquire.cc:79
-#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+#: ftparchive/cachedb.cc:327
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Methwyd darllen y cyswllt %s"

 
 

-#: apt-pkg/acquire.cc:83
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
+#: ftparchive/cachedb.cc:360
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"

 
 

-#: apt-pkg/acquire.cc:91
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+#: ftparchive/cachedb.cc:527
+msgid "Unable to get a cursor"
+msgstr "Ni ellir cael cyrchydd"

 
 

-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:857
+#: ftparchive/writer.cc:104

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
-
-#: apt-pkg/acquire.cc:859
-#, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Yn Darllen Rhestr Ffeiliau"
+msgid "W: Unable to read directory %s\n"
+msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"

 
 

-#: apt-pkg/acquire-worker.cc:110
+#: ftparchive/writer.cc:109

 #, c-format
 #, c-format

-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
+msgid "W: Unable to stat %s\n"
+msgstr "Rh: Ni ellir gwneud stat() o %s\n"

 
 

-#: apt-pkg/acquire-worker.cc:159
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "G: "

 
 

-#: apt-pkg/acquire-worker.cc:413
-#, 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"
+#: ftparchive/writer.cc:167
+msgid "W: "
+msgstr "Rh: "
+
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "

 
 

-#: apt-pkg/init.cc:146
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224

 #, c-format
 #, c-format

-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
+msgid "Failed to resolve %s"
+msgstr "Methwyd datrys %s"

 
 

-#: apt-pkg/init.cc:162
-#, fuzzy
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Methwyd cerdded y goeden"

 
 

-#: apt-pkg/clean.cc:56
+#: ftparchive/writer.cc:232

 #, c-format
 #, c-format

-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
-# FIXME: ...file
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
+msgid "Failed to open %s"
+msgstr "Methwyd agor %s"

 
 

-#: apt-pkg/cachefile.cc:84
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
+# FIXME
+#: ftparchive/writer.cc:291
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DatGysylltu %s [%s]\n"

 
 

-#: apt-pkg/cachefile.cc:88
-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."
+#: ftparchive/writer.cc:299
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"

 
 

-#: apt-pkg/cachefile.cc:106
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
+#: ftparchive/writer.cc:303
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Methwyd datgysylltu %s"

 
 

-# FIXME: literal
-#: apt-pkg/policy.cc:346
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
+#: ftparchive/writer.cc:311
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Methwyd cysylltu %s at %s"

 
 

-# FIXME: tense
-#: apt-pkg/policy.cc:368
+#: ftparchive/writer.cc:321

 #, c-format
 #, c-format

-msgid "Did not understand pin type %s"
-msgstr "Methwyd daeall y math pin %s"
+msgid " DeLink limit of %sB hit.\n"
+msgstr "  Tarwyd y terfyn cyswllt %sB.\n"

 
 

-#: apt-pkg/policy.cc:376
-msgid "No priority (or zero) specified for pin"
-msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
+#: ftparchive/writer.cc:426
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"
+
+#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#, c-format
+msgid "  %s has no override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: apt-pkg/pkgcachegen.cc:80
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
+#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Cynaliwr %s yw %s nid %s\n"

 
 

-#: apt-pkg/pkgcachegen.cc:198
+#: ftparchive/writer.cc:712

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

-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
+msgid "  %s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: apt-pkg/pkgcachegen.cc:215
+#: ftparchive/writer.cc:716

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

-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
+msgid "  %s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: apt-pkg/pkgcachegen.cc:253
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"
+
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"

 
 

-#: apt-pkg/pkgcachegen.cc:285
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68

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

-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"

 
 

-#: apt-pkg/pkgcachegen.cc:289
+#: ftparchive/override.cc:166

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

-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+msgid "Malformed override %s line %llu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"

 
 

-#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:324
+#: ftparchive/override.cc:178

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

-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
+msgid "Malformed override %s line %llu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"

 
 

-#: apt-pkg/pkgcachegen.cc:320
+#: ftparchive/override.cc:191

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

-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+msgid "Malformed override %s line %llu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"

 
 

-#: apt-pkg/pkgcachegen.cc:353
+#: ftparchive/multicompress.cc:72

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

-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+msgid "Unknown compression algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"

 
 

-#: apt-pkg/pkgcachegen.cc:360
-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."
+#: 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"

 
 

-#: apt-pkg/pkgcachegen.cc:363
-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."
+#: ftparchive/multicompress.cc:193
+msgid "Failed to fork"
+msgstr "Methodd fork()"

 
 

-#: apt-pkg/pkgcachegen.cc:366
+#: ftparchive/multicompress.cc:206

 #, fuzzy
 #, fuzzy

-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-
-#: apt-pkg/pkgcachegen.cc:369
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+msgid "Compress child"
+msgstr "Plentyn Cywasgu"

 
 

-#: apt-pkg/pkgcachegen.cc:398
+#: ftparchive/multicompress.cc:229

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

-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"

 
 

-#: apt-pkg/pkgcachegen.cc:412
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+#: ftparchive/multicompress.cc:302
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"

 
 

-#: apt-pkg/pkgcachegen.cc:418
+#: ftparchive/multicompress.cc:340
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"
+
+#: ftparchive/multicompress.cc:356

 #, c-format
 #, c-format

-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+msgid "Problem unlinking %s"
+msgstr "Gwall wrth datgysylltu %s"

 
 

-#: apt-pkg/pkgcachegen.cc:986
+#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:194

 #, c-format
 #, c-format

-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"

 
 

-#: apt-pkg/pkgcachegen.cc:1091
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc:50
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"

 
 

-#: apt-pkg/pkgcachegen.cc:1269 apt-pkg/pkgcachegen.cc:1276
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+#: cmdline/apt-sortpkgs.cc:91
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"

 
 

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

 
 

-#: apt-pkg/acquire-item.cc:629
-msgid "MD5Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
+
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"

 
 

-#: apt-pkg/acquire-item.cc:887 apt-pkg/acquire-item.cc:1781
-#: apt-pkg/acquire-item.cc:1924
+#: apt-inst/filelist.cc:464

 #, fuzzy
 #, fuzzy

-msgid "Hash Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
+msgid "Internal error in AddDiversion"
+msgstr "Gwall Mewnol yn AddDiversion"

 
 

-#: apt-pkg/acquire-item.cc:1341
+#: apt-inst/filelist.cc:477

 #, c-format
 #, c-format

-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"

 
 

-# FIXME: number?
-#: apt-pkg/acquire-item.cc:1356
-#, fuzzy, c-format
-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+# FIXME: "the"
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"

 
 

-#: apt-pkg/acquire-item.cc:1415
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"

 
 

-#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
-#. the time since then the file is invalid - formated in the same way as in
-#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1452
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172

 #, c-format
 #, c-format

-msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"

 
 

-#: apt-pkg/acquire-item.cc:1473
+#: apt-inst/extract.cc:132

 #, c-format
 #, c-format

-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"

 
 

-#: apt-pkg/acquire-item.cc:1506
+#: apt-inst/extract.cc:142

 #, c-format
 #, c-format

-msgid ""
-"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
-msgstr ""
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"

 
 

-#: apt-pkg/acquire-item.cc:1515
+#: apt-inst/extract.cc:152

 #, c-format
 #, c-format

-msgid "GPG error: %s: %s"
-msgstr ""
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"

 
 

-# FIXME: case
-#: apt-pkg/acquire-item.cc:1572
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
+
+#: apt-inst/extract.cc:249

 #, c-format
 #, c-format

-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
+msgid "The directory %s is being replaced by a non-directory"

 msgstr ""
 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.)"
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"

 
 

-#: apt-pkg/acquire-item.cc:1631
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Mae'r llwybr yn rhy hir"
+
+# FIXME: wtf?
+#: apt-inst/extract.cc:421

 #, c-format
 #, c-format

-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package."
-msgstr ""
-"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
-"drwsio'r pecyn hyn a law."
+msgid "Overwrite package match with no version for %s"
+msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"

 
 

-#: apt-pkg/acquire-item.cc:1686
+#: apt-inst/extract.cc:438

 #, c-format
 #, c-format

-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
+msgid "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-pkg/acquire-item.cc:1773
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Ni ellir gwneud stat() o %s"

 
 

-# FIXME: number?
-#: apt-pkg/indexrecords.cc:53
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54

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

-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Failed to write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"

 
 

-#: apt-pkg/indexrecords.cc:63
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+#: apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"

 
 

-#: apt-pkg/indexrecords.cc:97
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63

 #, c-format
 #, c-format

-msgid "No Hash entry in Release file %s"
-msgstr ""
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"

 
 

-#: apt-pkg/indexrecords.cc:110
+#: apt-inst/deb/debfile.cc:132

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

-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"

 
 

-# FIXME: number?
-#: apt-pkg/indexrecords.cc:125
+#: apt-inst/deb/debfile.cc:227
+#, fuzzy
+msgid "Unparsable control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"
+
+#: apt-inst/contrib/arfile.cc:96

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

-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"

 
 

-#: apt-pkg/vendorlist.cc:66
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Mae'r archif yn rhy fyr"
+
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"
+
+#: apt-inst/contrib/extracttar.cc:110
+#, fuzzy, c-format
+msgid "Cannot find a configured compressor for '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-inst/contrib/extracttar.cc:142 apt-inst/contrib/extracttar.cc:172
+msgid "Corrupted archive"
+msgstr "Archif llygredig"
+
+#: apt-inst/contrib/extracttar.cc:157
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"

 
 

-#: apt-pkg/cdrom.cc:518
+#: apt-inst/contrib/extracttar.cc:262

 #, c-format
 #, c-format

-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"

 
 

-#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
-msgid "Identifying.. "
-msgstr ""
+#~ msgid "Failed to create pipes"
+#~ msgstr "Methwyd creu pibau"

 
 

-#: apt-pkg/cdrom.cc:552
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
+#~ msgid "Failed to exec gzip "
+#~ msgstr "Methwyd gweithredu gzip"

 
 

-#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827

 #, fuzzy
 #, fuzzy

-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
+#~ msgid "%s %s for %s compiled on %s %s\n"
+#~ msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"

 
 

-#: apt-pkg/cdrom.cc:578
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
+#~ msgid "Failed to create FILE*"
+#~ msgstr "Methwyd creu FILE*"

 
 

-#: apt-pkg/cdrom.cc:596
-msgid "Unmounting CD-ROM\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Malformed stanza %u in source list %s (URI parse)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"

 
 

-#: apt-pkg/cdrom.cc:600

 #, fuzzy
 #, fuzzy

-msgid "Waiting for disc...\n"
-msgstr "Yn aros am benawdau"
+#~ msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:608
-msgid "Mounting CD-ROM...\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Malformed line %lu in source list %s ([option] too short)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"

 
 

-#: apt-pkg/cdrom.cc:626
-msgid "Scanning disc for index files..\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: apt-pkg/cdrom.cc:666
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Malformed line %lu in source list %s ([%s] has no key)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: apt-pkg/cdrom.cc:677
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
-msgstr ""
+#, fuzzy
+#~ msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: apt-pkg/cdrom.cc:703
-#, c-format
-msgid "Found label '%s'\n"
-msgstr ""
+#~ msgid "Malformed line %lu in source list %s (URI)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"

 
 

-#: apt-pkg/cdrom.cc:732
-msgid "That is not a valid name, try again.\n"
-msgstr ""
+#~ msgid "Malformed line %lu in source list %s (dist)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"

 
 

-#: apt-pkg/cdrom.cc:748
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
+#~ msgid "Malformed line %lu in source list %s (URI parse)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"

 
 

-#: apt-pkg/cdrom.cc:752

 #, fuzzy
 #, fuzzy

-msgid "Copying package lists..."
-msgstr "Yn Darllen Rhestrau Pecynnau"
+#~ msgid "Malformed line %lu in source list %s (absolute dist)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+
+#~ msgid "Malformed line %lu in source list %s (dist parse)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#~ msgid "Package %s %s was not found while processing file dependencies"
+#~ msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+
+#~ msgid "Couldn't stat source package list %s"
+#~ msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#~ msgid "Collecting File Provides"
+#~ msgstr "Yn Casglu Darpariaethau Ffeil"

 
 

-#: apt-pkg/cdrom.cc:778
+# FIXME: number?

 #, fuzzy
 #, fuzzy

-msgid "Writing new source list\n"
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+#~ msgid "Unable to find hash sum for '%s' in Release file"
+#~ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"

 
 

-#: apt-pkg/cdrom.cc:787
-msgid "Source list entries for this disc are:\n"
-msgstr ""
+#~ msgid "Vendor block %s contains no fingerprint"
+#~ msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"

 
 

-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Total dependency version space: "
+#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "

 
 

-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Does dim digon o le rhydd yn %s gennych"

 
 

-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+#~ msgid "Done"
+#~ msgstr "Wedi Gorffen"

 
 

-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Yn Erthylu'r Sefydliad."

 
 

-#: apt-pkg/indexcopy.cc:537
-#, fuzzy, c-format
-msgid "Skipping nonexistent file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"

 
 

-#: apt-pkg/indexcopy.cc:543
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "Nid yw %s yn becyn DEB dilys."

 
 

-#: apt-pkg/indexcopy.cc:549
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Camgyfatebiaeth swm MD5"
+#, fuzzy
+#~ 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-pkg/cacheset.cc:337
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+#~ msgid "MD5Sum mismatch"
+#~ msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: apt-pkg/cacheset.cc:340
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+#~ msgid ""
+#~ "I wasn't able to locate a file for the %s package. This might mean you "
+#~ "need to manually fix this package."
+#~ msgstr ""
+#~ "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i "
+#~ "chi drwsio'r pecyn hyn a law."

 
 

-#: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Methwyd dileu %s"

 
 

-#: apt-pkg/cacheset.cc:467
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+#~ msgid "Unable to create %s"
+#~ msgstr "Ni ellir creu %s"

 
 

-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Methwyd stat() ar %sinfo"

 
 

-#: apt-pkg/cacheset.cc:491
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"

 
 

-#: apt-pkg/cacheset.cc:499
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"

 
 

-#: apt-pkg/cacheset.cc:507
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+# FIXME
+#, fuzzy
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Gwall mewnol wrth gyrchu enw pecyn"

 
 

-#: apt-pkg/deb/dpkgpm.cc:52
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Wedi Sefydlu: "
+#, fuzzy
+#~ msgid "Reading file listing"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"

 
 

-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Yn cysylltu i %s"
+#~ msgid ""
+#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+#~ "then make it empty and immediately re-install the same version of the "
+#~ "package!"
+#~ msgstr ""
+#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn "
+#~ "yna gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"

 
 

-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
+# FIXME
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"

 
 

-#: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Methwyd dileu %s"
+#, fuzzy
+#~ msgid "Internal error getting a node"
+#~ msgstr "Gwall Mewnol wrth gael Nôd"

 
 

-#: apt-pkg/deb/dpkgpm.cc:56
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+# FIXME: literal
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"

 
 

-#: apt-pkg/deb/dpkgpm.cc:57
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru"

 
 

-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:642
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"

 
 

-#: apt-pkg/deb/dpkgpm.cc:657 apt-pkg/deb/dpkgpm.cc:671
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Methwyd agor ffeil %s"
+#, fuzzy
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"

 
 

-#: apt-pkg/deb/dpkgpm.cc:812
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Yn agor %s"
+#, fuzzy
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"

 
 

-#: apt-pkg/deb/dpkgpm.cc:813
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Yn agor %s"
+#, fuzzy
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:818
-#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:820
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Wedi Sefydlu: "
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:825
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Methwyd newid i %s"

 
 

-#: apt-pkg/deb/dpkgpm.cc:827
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Argymell"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Methwyd lleoli ffeil rheoli dilys"

 
 

-#: apt-pkg/deb/dpkgpm.cc:832
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Methwyd agor pibell ar gyfer %s"

 
 

-#: apt-pkg/deb/dpkgpm.cc:833
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
+#~ msgid "Read error from %s process"
+#~ msgstr "Gwall darllen o broses %s"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1039
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1070
-msgid "Running dpkg"
-msgstr ""
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1273
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"

 
 

-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1278
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1280
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+#~ msgid "decompressor"
+#~ msgstr "datgywasgydd"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1286
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+# FIXME
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "o hyd %lu i ddarllen ond dim ar ôl"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1292
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+# FIXME
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "o hyd %lu i ysgrifennu ond methwyd"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1299
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"

 
 

-#: apt-pkg/deb/debsystem.cc:69
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"

 
 

-#: apt-pkg/deb/debsystem.cc:72
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"

 
 

-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"

 
 

-#: apt-pkg/deb/debsystem.cc:106
-msgid "Not locked"
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"

 
 

-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:200
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"

 
 

-#: methods/mirror.cc:343
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"

 
 

-#: methods/rred.cc:503
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"

 
 

-#: methods/rred.cc:508
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"

 
 

-#: methods/rsh.cc:329
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
+#, fuzzy
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+
+#, fuzzy
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Gwall Methwyd, methwyd lleoli aelod"

 
 #, fuzzy
 #~ msgid "Error occurred while processing %s (NewVersion2)"
 
 #, fuzzy
 #~ msgid "Error occurred while processing %s (NewVersion2)"