Release 1.3~rc4

[apt.git] / po / cy.po

diff --git a/po/cy.po b/po/cy.po
index a2209a2cd2e72e543c31bf52b48665464bd998c7..d98107c89a3a43e792a9524ab554d948f9782768 100644 (file)
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 1.0.5\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 msgstr ""
 "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-21 06:13-0400\n"
+"POT-Creation-Date: 2016-08-30 22:20+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,3241 +15,3120 @@ 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: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"
-
-#: cmdline/apt-cache.cc:319
-#, fuzzy
-msgid "apt-cache stats does not take any arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"

 
 

-#: cmdline/apt-cache.cc:325
-#, fuzzy
-msgid "Total package names: "
-msgstr "Cyfanswm Enwau Pecynnau : "
+#: apt-inst/contrib/arfile.cc
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"

 
 

-#: cmdline/apt-cache.cc:327
-#, fuzzy
-msgid "Total package structures: "
-msgstr "Cyfanswm Enwau Pecynnau : "
+#: apt-inst/contrib/arfile.cc
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"

 
 

-#: cmdline/apt-cache.cc:367
-#, fuzzy
-msgid "  Normal packages: "
-msgstr "  Pecynnau Normal: "
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"

 
 

-#: cmdline/apt-cache.cc:368
-#, fuzzy
-msgid "  Pure virtual packages: "
-msgstr "  Pecynnau Cwbl Rhithwir: "
+#: apt-inst/contrib/arfile.cc
+msgid "Archive is too short"
+msgstr "Mae'r archif yn rhy fyr"

 
 

-#: cmdline/apt-cache.cc:369
-#, fuzzy
-msgid "  Single virtual packages: "
-msgstr "  Pecynnau Rhithwir Sengl: "
+#: apt-inst/contrib/arfile.cc
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"

 
 

-#: cmdline/apt-cache.cc:370
-#, fuzzy
-msgid "  Mixed virtual packages: "
-msgstr "  Pecynnau Rhithwir Cymysg: "
+#: apt-inst/contrib/extracttar.cc
+#, fuzzy, c-format
+msgid "Cannot find a configured compressor for '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: cmdline/apt-cache.cc:371
-msgid "  Missing: "
-msgstr "  Ar Goll: "
+#: apt-inst/contrib/extracttar.cc
+msgid "Corrupted archive"
+msgstr "Archif llygredig"

 
 

-#: cmdline/apt-cache.cc:373
+#: apt-inst/contrib/extracttar.cc

 #, fuzzy
 #, fuzzy

-msgid "Total distinct versions: "
-msgstr "Cyfanswm Fersiynau Gwahanol: "
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"

 
 

-#: cmdline/apt-cache.cc:375
-#, fuzzy
-msgid "Total distinct descriptions: "
-msgstr "Cyfanswm Fersiynau Gwahanol: "
+#: apt-inst/contrib/extracttar.cc
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"

 
 

-#: cmdline/apt-cache.cc:377
-#, fuzzy
-msgid "Total dependencies: "
-msgstr "Cyfanswm Dibyniaethau: "
+#: apt-inst/deb/debfile.cc
+#, 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"

 
 

-#: cmdline/apt-cache.cc:380
-#, fuzzy
-msgid "Total ver/file relations: "
-msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+#: apt-inst/deb/debfile.cc
+#, fuzzy, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"

 
 

-#: cmdline/apt-cache.cc:382
+#: apt-inst/deb/debfile.cc

 #, fuzzy
 #, fuzzy

-msgid "Total Desc/File relations: "
-msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+msgid "Unparsable control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"

 
 

-#: cmdline/apt-cache.cc:384
-#, fuzzy
-msgid "Total Provides mappings: "
-msgstr "Cyfanswm Mapiau Darpariath: "
+#: apt-inst/dirstream.cc
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"

 
 

-#: cmdline/apt-cache.cc:440
-#, fuzzy
-msgid "Total globbed strings: "
-msgstr "Cyfanswm Llinynau Glob: "
+#: apt-inst/dirstream.cc
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"

 
 

-#: cmdline/apt-cache.cc:446
-#, fuzzy
-msgid "Total slack space: "
-msgstr "Cyfanswm gofod Slac: "
+#: apt-inst/extract.cc
+#, c-format
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"

 
 

-#: cmdline/apt-cache.cc:463
-#, fuzzy
-msgid "Total space accounted for: "
-msgstr "Cyfanswm Gofod Cyfrifwyd: "
+#: apt-inst/extract.cc
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"

 
 

-#: cmdline/apt-cache.cc:605 cmdline/apt-cache.cc:1256
-#: apt-private/private-show.cc:58
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "Package file %s is out of sync."
-msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"

 
 

-#: 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"
+#: apt-inst/extract.cc
+#, 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"

 
 

-#: 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"
+#: apt-inst/extract.cc
+msgid "The diversion path is too long"
+msgstr "Mae llwybr y dargyfeiriad yn rhy hir"

 
 

-#: cmdline/apt-cache.cc:1520
-msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+#: apt-inst/extract.cc apt-pkg/acquire-item.cc ftparchive/cachedb.cc
+#: methods/rred.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"

 
 

-#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762
+#: apt-inst/extract.cc ftparchive/multicompress.cc

 #, c-format
 #, c-format

-msgid "Unable to locate package %s"
-msgstr "Ni ellir lleoli'r pecyn %s"
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"

 
 

-#: cmdline/apt-cache.cc:1649
-#, fuzzy
-msgid "Package files:"
-msgstr "Ffeiliau Pecynnau:"
+#: apt-inst/extract.cc
+#, 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"

 
 

-#: 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"
+#: apt-inst/extract.cc
+msgid "Failed to locate node in its hash bucket"
+msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"

 
 

-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1672
-#, fuzzy
-msgid "Pinned packages:"
-msgstr "Pecynnau wedi eu Pinio:"
+#: apt-inst/extract.cc
+msgid "The path is too long"
+msgstr "Mae'r llwybr yn rhy hir"

 
 

-#: cmdline/apt-cache.cc:1686 cmdline/apt-cache.cc:1743
-msgid "(not found)"
-msgstr "(heb ganfod)"
+# FIXME: wtf?
+#: apt-inst/extract.cc
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"

 
 

-#. Print the package name and the version we are forcing to
-#: cmdline/apt-cache.cc:1700
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "%s -> %s with priority %d\n"
-msgstr ""
+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"

 
 

-#: cmdline/apt-cache.cc:1706
-msgid "  Installed: "
-msgstr "  Wedi Sefydlu: "
+#. Only warn if there are no sources.list.d.
+#. Only warn if there is no sources.list file.
+#: apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/deb/dpkgpm.cc
+#: apt-pkg/init.cc apt-pkg/policy.cc apt-pkg/sourcelist.cc methods/mirror.cc
+#, c-format
+msgid "Unable to read %s"
+msgstr "Ni ellir darllen %s"

 
 

-#: cmdline/apt-cache.cc:1707
-msgid "  Candidate: "
-msgstr "  Ymgeisydd: "
+#: apt-inst/extract.cc
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Ni ellir gwneud stat() o %s"

 
 

-#: cmdline/apt-cache.cc:1725 cmdline/apt-cache.cc:1733
-msgid "(none)"
-msgstr "(dim)"
+#: apt-inst/filelist.cc
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"

 
 

-#: cmdline/apt-cache.cc:1740
-#, fuzzy
-msgid "  Package pin: "
-msgstr "  Pin Pecyn: "
+#: apt-inst/filelist.cc
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"

 
 

-#. Show the priority tables
-#: cmdline/apt-cache.cc:1749
-#, fuzzy
-msgid "  Version table:"
-msgstr "  Tabl Fersiynnau:"
+#: apt-inst/filelist.cc
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"

 
 

-#: cmdline/apt-cache.cc:1871
+#: apt-inst/filelist.cc

 #, fuzzy
 #, fuzzy

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

 
 

-#: cmdline/apt-cdrom.cc:92
-#, fuzzy
-msgid "Please insert a Disc in the drive and press [Enter]"
-msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"

 
 

-#: cmdline/apt-cdrom.cc:140
-#, fuzzy, c-format
-msgid "Failed to mount '%s' to '%s'"
-msgstr "Methwyd ailenwi %s at %s"
+# FIXME: "the"
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"

 
 

-#: cmdline/apt-cdrom.cc:179
+#: apt-pkg/acquire-item.cc

 msgid ""
 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."
+"Updating from such a repository can't be done securely, and is therefore "
+"disabled by default."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:183
-msgid "Repeat this process for the rest of the CDs in your set."
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can't be authenticated and is therefore "
+"potentially dangerous to use."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-config.cc:48
-msgid "Arguments not in pairs"
-msgstr "Nid yw ymresymiadau mewn parau"
-
-#: cmdline/apt-config.cc:88
-#, fuzzy
+#: apt-pkg/acquire-item.cc

 msgid ""
 msgid ""

-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."

 msgstr ""
 msgstr ""

-"Defnydd: apt-config [opsiynnau] gorchymyn\n"
-"\n"
-"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
-"\n"
-"Gorchmynion:\n"
-"   shell - Modd plisgyn\n"
-"   dump - Dangod y cyfluniad\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -c=? Darllen y ffeil cyfluniad\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"

 
 

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

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

-msgid "Can not find a package for architecture '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgid "The repository '%s' is no longer signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"

 
 

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

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

-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgid "The repository '%s' does no longer have a Release file."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-pkg/acquire-item.cc
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""

 
 

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

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

-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgid "The repository '%s' is not signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"

 
 

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

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

-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+msgid "The repository '%s' does not have a Release file."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' provides only weak security information."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"

 
 

-#: cmdline/apt-get.cc:386
+#: apt-pkg/acquire-item.cc ftparchive/writer.cc

 #, c-format
 #, c-format

-msgid "Can not find version '%s' of package '%s'"
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
+
+#: apt-pkg/acquire-item.cc
+msgid "Insufficient information available to perform this download securely"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:417
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc

 #, c-format
 #, c-format

-msgid "Couldn't find package %s"
-msgstr "Methwyd canfod pecyn %s"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."

 
 

-#: cmdline/apt-get.cc:422 cmdline/apt-mark.cc:78
-#: apt-private/private-install.cc:839
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: 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"
+#: apt-pkg/acquire-item.cc
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"

 
 

-#: cmdline/apt-get.cc:432 cmdline/apt-mark.cc:124
-msgid ""
-"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
-"instead."
-msgstr ""
+#: apt-pkg/acquire-item.cc
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Gweithred annilys %s"

 
 

-#: cmdline/apt-get.cc:501 cmdline/apt-get.cc:509
+#: apt-pkg/acquire-item.cc

 #, fuzzy
 #, fuzzy

-msgid "Internal error, problem resolver broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgid "Signature error"
+msgstr "Gwall ysgrifennu"

 
 

-#: cmdline/apt-get.cc:570
-msgid "Unable to lock the download directory"
-msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: apt-pkg/acquire-item.cc methods/gpgv.cc
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""

 
 

-#: 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"
+#: apt-pkg/acquire-item.cc
+#, c-format
+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 ""

 
 

-#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Unable to find a source package for %s"
-msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
+msgid "GPG error: %s: %s"
+msgstr ""

 
 

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

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

-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
+"Skipping acquire of configured file '%s' as repository '%s' doesn't support "
+"architecture '%s'"

 msgstr ""
 
 msgstr ""
 

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

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

-"Please use:\n"
-"bzr branch %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"
+msgstr ""

 
 

-#. 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
+#. 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

 #, c-format
 #, c-format

-msgid "Need to get %sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-
-#: cmdline/apt-get.cc:839
-#, fuzzy, c-format
-msgid "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
-
-#: cmdline/apt-get.cc:864
-msgid "Failed to fetch some archives."
-msgstr "Methwyd cyrchu rhai archifau."
-
-#: 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"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

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

 
 

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

 #, c-format
 #, c-format

-msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgid "Can't find a source to download version '%s' of '%s'"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Build command '%s' failed.\n"
-msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-
-#: cmdline/apt-get.cc:955
-msgid "Child process failed"
-msgstr "Methodd proses plentyn"
-
-#: cmdline/apt-get.cc:976
-msgid "Must specify at least one package to check builddeps for"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."

 msgstr ""
 msgstr ""

-"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
+"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
+
+#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "Changelog unavailable for %s=%s"
+msgstr "Yn cysylltu i %s (%s)"

 
 

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

 #, c-format
 #, c-format

-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
+msgid "The method '%s' is explicitly disabled via configuration."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1012
+#: apt-pkg/acquire-worker.cc methods/connect.cc

 #, c-format
 #, c-format

-msgid "Note, using directory '%s' to get the build dependencies\n"
+msgid "If you meant to use Tor remember to use %s instead of %s."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1022
-#, fuzzy, c-format
-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
+#: apt-pkg/acquire-worker.cc
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."

 
 

-#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050
+#: apt-pkg/acquire-worker.cc

 #, c-format
 #, c-format

-msgid "Unable to get build-dependency information for %s"
-msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
+msgid "Is the package %s installed?"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "%s has no build depends.\n"
-msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"

 
 

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

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

-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."

 msgstr ""
 msgstr ""

-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"

 
 

-#: cmdline/apt-get.cc: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"
+#: apt-pkg/acquire.cc apt-pkg/cdrom.cc
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
+
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"

 
 

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

 #, c-format
 #, c-format

-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgid "No sandbox user '%s' on the system, can not drop privileges"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:1320
-#, fuzzy, c-format
+#: apt-pkg/acquire.cc
+#, c-format

 msgid ""
 msgid ""

-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."

 msgstr ""
 msgstr ""

-"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
-"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"

 
 

-#: cmdline/apt-get.cc:1326
+#: apt-pkg/acquire.cc apt-pkg/clean.cc

 #, fuzzy, c-format
 #, 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"
+msgid "Clean of %s is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"

 
 

-#: cmdline/apt-get.cc:1349
+#: apt-pkg/acquire.cc apt-pkg/clean.cc apt-pkg/contrib/cdromutl.cc
+#: methods/mirror.cc

 #, c-format
 #, c-format

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

 
 

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

 #, c-format
 #, c-format

-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1369
-msgid "Failed to process build dependencies"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
+#: apt-pkg/acquire.cc
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"

 
 

-#: cmdline/apt-get.cc:1554
-#, fuzzy
-msgid "Supported modules:"
-msgstr "Modylau a Gynhelir:"
+#: apt-pkg/algorithms.cc
+#, 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."

 
 

-# FIXME: split
-#: cmdline/apt-get.cc:1595
-#, fuzzy
+#: apt-pkg/algorithms.cc

 msgid ""
 msgid ""

-"Usage: apt-get [options] command\n"
-"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-"       apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-"   update - Retrieve new lists of packages\n"
-"   upgrade - Perform an upgrade\n"
-"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
-"   remove - Remove packages\n"
-"   autoremove - Remove 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"
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."

 msgstr ""
 msgstr ""

-"Defnydd: apt-get [opsiynnau] gorchymyn\n"
-"         apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
-"         apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
-"\n"
-"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
-"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
-"ddefnyddir amlaf.\n"
-"\n"
-"Gorchmynion:\n"
-"   update - Cyrchu rhestrau pecynnau newydd\n"
-"   update - Uwchraddio pecynnau wedi sefydlu\n"
-"   install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
-"   remove - Tynnu pecynnau\n"
-"   source - Lawrlwytho archifau ffynhonell\n"
-"   build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
-"   dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
-"   dselect-upgrade - Dilyn dewisiadau dselect\n"
-"   clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
-"   autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
-"   check - Gwirio fod dim dibyniaethau torredig\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn.\n"
-"  -q   Allbwn cofnodadwy - dim dangosydd cynydd\n"
-"  -qq  Dim allbwn ar wahan i wallau\n"
-"  -d   Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
-"  -s   Peidio gweithredu. Gwneir efelychiad trefn.\n"
-"  -y   Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
-"  -f   Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
-"  -m   Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
-"  -u   Dangos rhestr o archifau a uwchraddir hefyd\n"
-"  -b   Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
-"  -V   Dangos rhifau fersiwn cyflawn\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-"\n"
-"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
-"fwy o wybodaeth ac opsiynnau.\n"
-"\n"
-"                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
+"ei achosi gan pecynnau wedi eu dal."

 
 

-#: cmdline/apt-helper.cc:37
-msgid "Need one URL as argument"
+#: apt-pkg/algorithms.cc
+msgid "Unable to correct problems, you have held broken packages."

 msgstr ""
 msgstr ""

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

 
 

-#: 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"
+#: apt-pkg/cachefile.cc
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."

 
 

-#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80
-msgid "Download Failed"
-msgstr ""
+#: apt-pkg/cachefile.cc
+msgid "You may want to run apt-get update to correct these problems"
+msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."

 
 

-#: cmdline/apt-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"
+#: apt-pkg/cachefile.cc
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."

 
 

-#: cmdline/apt-helper.cc:95
+#: apt-pkg/cachefilter.cc apt-private/private-output.cc

 #, c-format
 #, c-format

-msgid "GetSrvRec failed for %s"
-msgstr ""
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"

 
 

-#: 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 ""
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"

 
 

-#: 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"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "

 
 

-#: cmdline/apt-mark.cc:71
+#: apt-pkg/cacheset.cc

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

-msgid "%s was already set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgid "Couldn't find task '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: cmdline/apt-mark.cc:73
+#: apt-pkg/cacheset.cc

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

-msgid "%s was already set to automatically installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: cmdline/apt-mark.cc:238
+#: apt-pkg/cacheset.cc

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

-msgid "%s was already set on hold.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: cmdline/apt-mark.cc:240
-#, fuzzy, c-format
-msgid "%s was already not hold.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+#: apt-pkg/cacheset.cc apt-private/private-show.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ni ellir lleoli'r pecyn %s"

 
 

-#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:207
-#: apt-pkg/deb/dpkgpm.cc:1302
-#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""

 
 

-#: 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"
-
-#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
-#, fuzzy, c-format
-msgid "Canceled hold on %s.\n"
-msgstr "Methwyd agor %s"
-
-#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
-msgid "Executing dpkg failed. Are you root?"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: 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."
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"

 msgstr ""
 
 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"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:203
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Unable to read the cdrom database %s"
-msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
-
-#: methods/cdrom.cc:212
-#, fuzzy

 msgid ""
 msgid ""

-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"

 msgstr ""
 msgstr ""

-"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
-"get update i ychwanegu CDau newydd."

 
 

-#: methods/cdrom.cc:222
+#: apt-pkg/cdrom.cc
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/cdrom.cc

 #, fuzzy
 #, fuzzy

-msgid "Wrong CD-ROM"
+msgid "Unmounting CD-ROM...\n"

 msgstr "CD Anghywir"
 
 msgstr "CD Anghywir"
 

-#: methods/cdrom.cc:249
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgid "Using CD-ROM mount point %s\n"

 msgstr ""
 msgstr ""

-"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."

 
 

-#: methods/cdrom.cc:254
+#: apt-pkg/cdrom.cc

 #, fuzzy
 #, 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"
-
-#: 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"
+msgid "Waiting for disc...\n"
+msgstr "Yn aros am benawdau"

 
 

-#: methods/ftp.cc:188
-msgid "Unable to determine the local name"
-msgstr "Ni ellir darganfod yr enw lleol"
+#: apt-pkg/cdrom.cc
+msgid "Mounting CD-ROM...\n"
+msgstr ""

 
 

-#: 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"
+#: apt-pkg/cdrom.cc
+msgid "Identifying... "
+msgstr ""

 
 

-#: methods/ftp.cc:225
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "USER failed, server said: %s"
-msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+msgid "Stored label: %s\n"
+msgstr ""

 
 

-#: methods/ftp.cc:232
-#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+#: apt-pkg/cdrom.cc
+msgid "Scanning disc for index files...\n"
+msgstr ""

 
 

-#: methods/ftp.cc:252
+#: apt-pkg/cdrom.cc
+#, c-format

 msgid ""
 msgid ""

-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"

 msgstr ""
 msgstr ""

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

 
 

-# 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"
+#: apt-pkg/cdrom.cc
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""

 
 

-#: methods/ftp.cc:308
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "TYPE failed, server said: %s"
-msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
-
-#: methods/ftp.cc:346 methods/ftp.cc:458 methods/rsh.cc:213 methods/rsh.cc:261
-msgid "Connection timeout"
-msgstr "Goramser cysylltu"
-
-#: methods/ftp.cc:352
-msgid "Server closed the connection"
-msgstr "Caeodd y gweinydd y cysylltiad"
+msgid "Found label '%s'\n"
+msgstr ""

 
 

-#: 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"
+#: apt-pkg/cdrom.cc
+msgid "That is not a valid name, try again.\n"
+msgstr ""

 
 

-#: methods/ftp.cc:362 methods/rsh.cc:227
-msgid "A response overflowed the buffer."
-msgstr "Gorlifodd ateb y byffer."
+#: apt-pkg/cdrom.cc
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""

 
 

-#: methods/ftp.cc:379 methods/ftp.cc:391
-msgid "Protocol corruption"
-msgstr "Llygr protocol"
+#: apt-pkg/cdrom.cc
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Yn Darllen Rhestrau Pecynnau"

 
 

-#: 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"
+#: apt-pkg/cdrom.cc
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."

 
 

-#: methods/ftp.cc:703 methods/ftp.cc:709 methods/ftp.cc:744
-msgid "Could not create a socket"
-msgstr "Methwyd creu soced"
+#: apt-pkg/cdrom.cc
+msgid "Source list entries for this disc are:\n"
+msgstr ""

 
 

-#: methods/ftp.cc:714
-msgid "Could not connect data socket, connection timed out"
-msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+#: apt-pkg/clean.cc
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."

 
 

-#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102
-msgid "Failed"
-msgstr "Methwyd"
+#: apt-pkg/contrib/cdromutl.cc
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"

 
 

-#: methods/ftp.cc:720
-#, fuzzy
-msgid "Could not connect passive socket."
-msgstr "Methwyd cysylltu soced goddefol"
+#: apt-pkg/contrib/cdromutl.cc
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"

 
 # FIXME
 
 # FIXME

-#: methods/ftp.cc:737
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Methodd getaddrinfo gael soced gwrando"
-
-#: methods/ftp.cc:751
-msgid "Could not bind a socket"
-msgstr "Methwyd rhwymo soced"
-
-#: methods/ftp.cc:755
-msgid "Could not listen on the socket"
-msgstr "Methwyd gwrando ar y soced"
+#: apt-pkg/contrib/cmndline.cc
+#, fuzzy, c-format
+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)."

 
 

-#: methods/ftp.cc:762
-msgid "Could not determine the socket's name"
-msgstr "Methwyd canfod enw'r soced"
+#: apt-pkg/contrib/cmndline.cc
+#, fuzzy, c-format
+msgid ""
+"Command line option %s is not understood in combination with the other "
+"options"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"

 
 

-#: methods/ftp.cc:794
-msgid "Unable to send PORT command"
-msgstr "Methwyd danfod gorchymyn PORT"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"

 
 

-#: methods/ftp.cc:804
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "Unknown address family %u (AF_*)"
-msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+msgid "Option %s requires an argument."
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."

 
 

-#: methods/ftp.cc:813
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "EPRT failed, server said: %s"
-msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."

 
 

-#: methods/ftp.cc:833
-msgid "Data socket connect timed out"
-msgstr "Goramserodd cysylltiad y soced data"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"

 
 

-#: methods/ftp.cc:840
-msgid "Unable to accept connection"
-msgstr "Methwyd derbyn cysylltiad"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"

 
 

-#: methods/ftp.cc:880 methods/server.cc:391 methods/rsh.cc:337
-msgid "Problem hashing file"
-msgstr "Problem wrth stwnshio ffeil"
+# FIXME: 'Sense'?
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."

 
 

-#: methods/ftp.cc:893
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "Unable to fetch file, server said '%s'"
-msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"

 
 

-#: methods/ftp.cc:908 methods/rsh.cc:356
-msgid "Data socket timed out"
-msgstr "Goramserodd soced data"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"

 
 

-#: methods/ftp.cc:945
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "Data transfer failed, server said '%s'"
-msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#. Get the files information
-#: methods/ftp.cc:1028
-msgid "Query"
-msgstr "Ymholiad"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."

 
 # FIXME
 
 # FIXME

-#: methods/ftp.cc:1142
-msgid "Unable to invoke "
-msgstr "Methwyd gweithredu "
+#: apt-pkg/contrib/configuration.cc
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"

 
 

-#: methods/connect.cc:80
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"

 
 

-#: methods/connect.cc:91
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"

 
 

-#: methods/connect.cc:98
+#: apt-pkg/contrib/configuration.cc

 #, 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 "Syntax error %s:%u: Too many nested includes"
+msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"

 
 

-#: methods/connect.cc:104
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"

 
 

-#: methods/connect.cc:112
+#: apt-pkg/contrib/configuration.cc

 #, 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 "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"

 
 

-#: methods/connect.cc:130
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "Methwyd cysylltu i %s:%s (%s)."
+#: apt-pkg/contrib/configuration.cc
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"

 
 

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

 #, c-format
 #, c-format

-msgid "Connecting to %s"
-msgstr "Yn cysylltu i %s"
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"

 
 

-#: methods/connect.cc:181 methods/connect.cc:200
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Methwyd datrys '%s'"
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Gwall wrth dadgysylltu'r ffeil"

 
 

-#: methods/connect.cc:206
+#: apt-pkg/contrib/fileutl.cc

 #, c-format
 #, c-format

-msgid "Temporary failure resolving '%s'"
-msgstr "Methiant dros dro yn datrys '%s'"
+msgid "Not using locking for read only lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"

 
 

-#: methods/connect.cc:210
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open lock file %s"
+msgstr "Methwyd agor y ffeil clo %s"

 
 

-#: methods/connect.cc:212
-#, fuzzy, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"

 
 

-#: methods/connect.cc:259
-#, fuzzy, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "Methwyd cysylltu i %s %s:"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Methwyd cael y clo %s"

 
 

-#: methods/gpgv.cc:205 methods/gpgv.cc:215
-msgid "At least one invalid signature was encountered."
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:210
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:217
-msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604
+#: apt-pkg/contrib/fileutl.cc

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

-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
-msgstr ""
-
-#: methods/gpgv.cc:227
-msgid "Unknown error executing apt-key"
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:260 methods/gpgv.cc:267
-#, fuzzy
-msgid "The following signatures were invalid:\n"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#: cmdline/apt-dump-solver.cc
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"

 
 

-#: methods/gpgv.cc:274
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Derbyniodd is-broses %s wall segmentu."

 
 

-#: methods/gzip.cc:79
-msgid "Empty files can't be valid archives"
-msgstr ""
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Derbyniodd is-broses %s wall segmentu."

 
 

-#: methods/http.cc:515
-msgid "Error writing to the file"
-msgstr "Gwall wrth ysgrifennu at y ffeil"
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
+#, c-format
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Dychwelodd is-broses %s gôd gwall (%u)"

 
 

-#: methods/http.cc:529
-#, fuzzy
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Gorffenodd is-broses %s yn annisgwyl"

 
 

-#: methods/http.cc:531
-msgid "Error reading from server"
-msgstr "Gwall wrth ddarllen o'r gweinydd"
+#: apt-pkg/contrib/fileutl.cc methods/ftp.cc methods/rsh.cc
+msgid "Read error"
+msgstr "Gwall darllen"

 
 

-#: methods/http.cc:567
-msgid "Error writing to file"
-msgstr "Gwall wrth ysgrifennu at ffeil"
+#: apt-pkg/contrib/fileutl.cc methods/ftp.cc methods/rsh.cc
+msgid "Write error"
+msgstr "Gwall ysgrifennu"

 
 

-#: methods/http.cc:627
-msgid "Select failed"
-msgstr "Methwyd dewis"
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gwall wrth gau'r ffeil"

 
 

-#: methods/http.cc:632
-msgid "Connection timed out"
-msgstr "Goramserodd y cysylltiad"
+#: apt-pkg/contrib/fileutl.cc
+msgid "Unexpected end of file"
+msgstr ""

 
 

-#: methods/http.cc:655
-msgid "Error writing to output file"
-msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+#: apt-pkg/contrib/fileutl.cc
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"

 
 

-#: methods/server.cc:52
-msgid "Waiting for headers"
-msgstr "Yn aros am benawdau"
+#: apt-pkg/contrib/fileutl.cc
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "

 
 

-#: methods/server.cc:111
-msgid "Bad header line"
-msgstr "Llinell pennawd gwael"
+#: apt-pkg/contrib/fileutl.cc
+#, c-format
+msgid "Could not open file %s"
+msgstr "Methwyd agor ffeil %s"

 
 

-#: 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"
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Methwyd agor pibell ar gyfer %s"

 
 

-#: methods/server.cc:173
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+# FIXME
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
+msgstr "o hyd %lu i ddarllen ond dim ar ôl"

 
 

-#: methods/server.cc:200
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+# FIXME
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr "o hyd %lu i ysgrifennu ond methwyd"

 
 

-#: methods/server.cc:202
-#, fuzzy
-msgid "This HTTP server has broken range support"
-msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Gwall wrth gau'r ffeil"

 
 

-#: methods/server.cc:229
-msgid "Unknown date format"
-msgstr "Fformat dyddiad anhysbys"
+#: apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Gwall wrth gyfamseru'r ffeil"

 
 

-#: methods/server.cc:535
-#, fuzzy
-msgid "Bad header data"
-msgstr "Data pennawd gwael"
+#: apt-pkg/contrib/fileutl.cc
+msgid "Problem syncing the file"
+msgstr "Gwall wrth gyfamseru'r ffeil"

 
 

-#: methods/server.cc:552 methods/server.cc:646
-msgid "Connection failed"
-msgstr "Methodd y cysylltiad"
+#: apt-pkg/contrib/fileutl.cc cmdline/apt-extracttemplates.cc
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni ellir gwneud stat() o %s"

 
 

-#: methods/server.cc:618
+#: apt-pkg/contrib/fileutl.cc cmdline/apt-extracttemplates.cc

 #, c-format
 #, c-format

-msgid ""
-"Automatically disabled %s due to incorrect response from server/proxy. (man "
-"5 apt.conf)"
-msgstr ""
-
-#: methods/server.cc:741
-msgid "Internal error"
-msgstr "Gwall mewnol"
-
-#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65
-msgid "Sorting"
-msgstr ""
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %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"
+#: apt-pkg/contrib/mmap.cc
+msgid "Can't mmap an empty file"
+msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"

 
 

-#: apt-private/private-cacheset.cc:133
+#: apt-pkg/contrib/mmap.cc

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

-msgid "Note, selecting '%s' for glob '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"

 
 

-#: apt-private/private-cacheset.cc:139
+#: apt-pkg/contrib/mmap.cc

 #, fuzzy, c-format
 #, 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
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Methwyd agor pibell ar gyfer %s"

 
 

-#: apt-private/private-cacheset.cc:168
+#: apt-pkg/contrib/mmap.cc

 #, fuzzy
 #, fuzzy

-msgid " [Installed]"
-msgstr " [Sefydliwyd]"
+msgid "Unable to close mmap"
+msgstr "Ni ellir agor %s"

 
 

-#: apt-private/private-cacheset.cc:177
+# FIXME
+#: apt-pkg/contrib/mmap.cc

 #, fuzzy
 #, fuzzy

-msgid " [Not candidate version]"
-msgstr "Fersiynau Posib"
+msgid "Unable to synchronize mmap"
+msgstr "Methwyd gweithredu "

 
 

-#: apt-private/private-cacheset.cc:179
-msgid "You should explicitly select one to install."
-msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+#: apt-pkg/contrib/mmap.cc
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"

 
 

-# FIXME: punctuation
-#: apt-private/private-cacheset.cc:182
-#, fuzzy, c-format
+#: apt-pkg/contrib/mmap.cc
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: apt-pkg/contrib/mmap.cc
+#, c-format

 msgid ""
 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"
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"

 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"

 
 

-#: apt-private/private-cacheset.cc:200
-msgid "However the following packages replace it:"
-msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+#: apt-pkg/contrib/mmap.cc
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""

 
 

-#: 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"
+#: apt-pkg/contrib/mmap.cc
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""

 
 

-#: apt-private/private-cacheset.cc:226
+#: apt-pkg/contrib/progress.cc

 #, c-format
 #, c-format

-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"

 
 

-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-cacheset.cc:238 apt-private/private-install.cc:915
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
+#: apt-pkg/contrib/progress.cc
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"

 
 

-#: apt-private/private-cacheset.cc:244 apt-private/private-install.cc:921
-#, 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"
+#: apt-pkg/contrib/progress.cc
+msgid "..."
+msgstr ""

 
 

-#: apt-private/private-cacheset.cc:289
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc

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

-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"

 
 

-#: apt-private/private-install.cc:87
-msgid "Internal error, InstallPackages was called with broken packages!"
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "%lid %lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: 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."
-
-#: 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."
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "%lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: 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"
-
-#: 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"
-
-#: apt-private/private-install.cc:112
-msgid ""
-"Held packages were changed and -y was used without --allow-change-held-"
-"packages."
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "%limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:128
-#, fuzzy
-msgid "Internal error, Ordering didn't finish"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-
-#: apt-private/private-install.cc:166
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "%lis"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %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
-#: apt-private/private-install.cc:178
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; another identifier like Contents;
+#. filename and linenumber of the sources.list entry currently parsed
+#: apt-pkg/deb/debmetaindex.cc

 #, c-format
 #, c-format

-msgid "Need to get %sB of archives.\n"
-msgstr "Mae angen cyrchu %sB o archifau.\n"
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
+msgstr ""

 
 

-#. 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"
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""

 
 

-#. 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
+# FIXME: number?
+#: apt-pkg/deb/debmetaindex.cc

 #, fuzzy, c-format
 #, 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"
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"

 
 

-#: 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."
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\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!"
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""

 
 

-#: apt-private/private-install.cc:208
-#, fuzzy, c-format
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format

 msgid ""
 msgid ""

-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+"No Hash entry in Release file %s which is considered strong enough for "
+"security purposes"

 msgstr ""
 msgstr ""

-"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
-"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
-" ?]"
-
-#: apt-private/private-install.cc:214 apt-private/private-install.cc:232
-msgid "Abort."
-msgstr "Erthylu."

 
 

-#: 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"
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Invalid '%s' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"

 
 

-#: apt-private/private-install.cc:306
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
+#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s"

 msgstr ""
 msgstr ""

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

 
 

-#: 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"
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Invalid value set for option %s regarding source %s %s (%s)"
+msgstr ""

 
 

-#: apt-private/private-install.cc:315
-msgid "Unable to correct missing packages."
-msgstr "Ni ellir cywiro pecynnau ar goll."
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
+msgstr ""

 
 

-#: apt-private/private-install.cc:316
-#, fuzzy
-msgid "Aborting install."
-msgstr "Yn Erthylu'r Sefydliad."
+#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"

 
 

-#: apt-private/private-install.cc:341
+#: apt-pkg/deb/debsystem.cc
+#, c-format

 msgid ""
 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-install.cc:348
-msgid "Note: This is done automatically and on purpose by dpkg."
+"Unable to lock the administration directory (%s), is another process using "
+"it?"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:370
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
+#: apt-pkg/deb/debsystem.cc
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"

 
 

-#: apt-private/private-install.cc:463
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc
+#, c-format

 msgid ""
 msgid ""

-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "

 msgstr ""
 
 msgstr ""
 

-#.
-#. 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
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+#: apt-pkg/deb/debsystem.cc
+msgid "Not locked"
+msgstr ""

 
 

-#: apt-private/private-install.cc:479
-#, 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-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Wedi Sefydlu: "

 
 

-#: apt-private/private-install.cc:486
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 #, 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:"
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"

 
 

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

 
 

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

 
 

-# FIXME
-#: apt-private/private-install.cc:584
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Noting disappearance of %s"

 msgstr ""
 msgstr ""

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

 
 

-# 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."
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Running post-installation trigger %s"

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

 
 

-#: apt-private/private-install.cc:628
-msgid "Broken packages"
-msgstr "Pecynnau wedi torri"
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Wedi Sefydlu: "

 
 

-#: apt-private/private-install.cc:685
-#, fuzzy
-msgid "The following additional packages will be installed:"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."

 
 

-#: apt-private/private-install.cc:774
-msgid "Suggested packages:"
-msgstr "Pecynnau a awgrymmir:"
+#: apt-pkg/deb/dpkgpm.cc apt-pkg/edsp.cc
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Methwyd agor ffeil %s"

 
 

-#: apt-private/private-install.cc:776
-msgid "Recommended packages:"
-msgstr "Pecynnau a argymhellir:"
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Yn agor %s"

 
 

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

 
 

-#: apt-private/private-install.cc:802
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 #, 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"
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: apt-private/private-install.cc:814
+#: apt-pkg/deb/dpkgpm.cc

 #, 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 "Preparing for removal of %s"
+msgstr ""

 
 

-#. TRANSLATORS: First string is package name, second is version
-#: apt-private/private-install.cc:820
+#: apt-pkg/deb/dpkgpm.cc

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

-msgid "%s is already the newest version (%s).\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+msgid "Removed %s"
+msgstr "Argymell"

 
 

-#: apt-private/private-install.cc:868
+#: apt-pkg/deb/dpkgpm.cc

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

-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: apt-private/private-install.cc:873
+#: apt-pkg/deb/dpkgpm.cc

 #, 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"
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"

 
 

-#: apt-private/private-list.cc:121
-msgid "Listing"
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc
+msgid "Is /dev/pts mounted?"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-list.cc:151
-#, c-format
-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] ""
+#: apt-pkg/deb/dpkgpm.cc
+msgid "Operation was interrupted before it could finish"
+msgstr ""

 
 

-#: apt-private/private-cachefile.cc:96
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
+#: apt-pkg/deb/dpkgpm.cc
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""

 
 

-#: apt-private/private-cachefile.cc:99
-msgid " failed."
-msgstr " wedi methu."
-
-#: 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"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc
+msgid "dependency problems - leaving unconfigured"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:272
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:275
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:277
-msgid "[installed,auto-removable]"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:279
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:281
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:284
-#, c-format
-msgid "[upgradable from: %s]"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:288
-msgid "[residual-config]"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:402
-#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
-
-#: apt-private/private-output.cc:404
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:411
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
-
-#: apt-private/private-output.cc:413
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
-
-#: apt-private/private-output.cc:416
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
-
-#: 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"
-
-#: apt-private/private-output.cc:421
-msgid " or"
-msgstr " neu"
-
-#: 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:"
-
-#: apt-private/private-output.cc:455
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""

 
 

-#: apt-private/private-output.cc:465
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""

 
 

-#: apt-private/private-output.cc:481
+#: apt-pkg/depcache.cc

 #, fuzzy
 #, fuzzy

-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"

 
 

-#: apt-private/private-output.cc:497
+#: apt-pkg/depcache.cc

 #, fuzzy
 #, fuzzy

-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"

 
 

-#: apt-private/private-output.cc:512
+#: apt-pkg/depcache.cc

 #, fuzzy
 #, fuzzy

-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-
-#: 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)"
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"

 
 

-#: apt-private/private-output.cc:602
+#: apt-pkg/depcache.cc

 #, 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 "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"

 
 

-#: apt-private/private-output.cc:633
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+#: apt-pkg/depcache.cc
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"

 
 

-#: apt-private/private-output.cc:637
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
+#: apt-pkg/depcache.cc
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"

 
 

-#: apt-private/private-output.cc:639
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
+#: apt-pkg/edsp.cc
+msgid "Send scenario to solver"
+msgstr ""

 
 

-#: 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"
+#: apt-pkg/edsp.cc
+msgid "Send request to solver"
+msgstr ""

 
 

-#: apt-private/private-output.cc:645
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
+#: apt-pkg/edsp.cc
+msgid "Prepare for receiving solution"
+msgstr ""

 
 

-#. 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]"
+#: apt-pkg/edsp.cc
+msgid "External solver failed without a proper error message"

 msgstr ""
 
 msgstr ""
 

-#. 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]"
+#: apt-pkg/edsp.cc
+msgid "Execute external solver"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:684
-msgid "Y"
-msgstr "I"
+#: apt-pkg/edsp.cc
+msgid "Execute external planner"
+msgstr ""

 
 

-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:690
-msgid "N"
+#: apt-pkg/edsp.cc
+msgid "Send request to planner"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
+#: apt-pkg/edsp.cc
+msgid "Send scenario to planner"
+msgstr ""

 
 

-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+#: apt-pkg/edsp.cc
+msgid "External planner failed without a proper error message"
+msgstr ""

 
 

-#: apt-private/private-update.cc:96
+#: apt-pkg/indexcopy.cc

 #, c-format
 #, c-format

-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."
+msgid "Wrote %i records.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-show.cc:158
+#: apt-pkg/indexcopy.cc

 #, c-format
 #, c-format

-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] ""
-
-#: apt-private/private-show.cc:165
-msgid "not a real package (virtual)"
+msgid "Wrote %i records with %i missing files.\n"

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:62
+#: apt-pkg/indexcopy.cc

 #, c-format
 #, c-format

-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"

 msgstr ""
 
 msgstr ""
 

-#: 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-private/private-download.cc:101
-msgid "Authentication warning overridden.\n"
+#: apt-pkg/indexcopy.cc
+#, c-format
+msgid "Can't find authentication record for: %s"

 msgstr ""
 
 msgstr ""
 

-#: 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-pkg/indexcopy.cc
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: apt-private/private-download.cc:111
-msgid "Install these packages without verification?"
-msgstr ""
+#: apt-pkg/init.cc
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"

 
 

-#: apt-private/private-download.cc:122
+#: apt-pkg/init.cc

 #, fuzzy
 #, fuzzy

-msgid ""
-"There were unauthenticated packages and -y was used without --allow-"
-"unauthenticated"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni ellir canfod math system addas"

 
 

-#: apt-private/private-download.cc:154
+#: apt-pkg/install-progress.cc

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
-msgstr "Methwyd cyrchu %s  %s\n"
+msgid "Progress: [%3i%%]"
+msgstr ""

 
 

-#: 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"
+#. send status information that we are about to fork dpkg
+#: apt-pkg/install-progress.cc
+msgid "Running dpkg"
+msgstr ""

 
 

-#: apt-private/private-download.cc:193
+#: apt-pkg/packagemanager.cc

 #, c-format
 #, c-format

-msgid "You don't have enough free space in %s."
-msgstr "Does dim digon o le rhydd gennych yn %s."
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""

 
 

-#: apt-private/private-sources.cc:58
+#: apt-pkg/packagemanager.cc

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

-msgid "Failed to parse %s. Edit again? "
-msgstr "Methwyd ailenwi %s at %s"
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"

 
 

-#: apt-private/private-sources.cc:70
+# FIXME: %s may have an arbirrary length
+#: apt-pkg/packagemanager.cc

 #, c-format
 #, c-format

-msgid "Your '%s' file changed, please run 'apt-get update'."
+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 ""
 msgstr ""

+"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
+"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
+"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."

 
 

-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
-msgstr ""
+#: apt-pkg/pkgcache.cc
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"

 
 

-#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
-#: apt-private/acqprogress.cc:74
-#, c-format
-msgid "Hit:%lu %s"
-msgstr "Presennol:%lu %s"
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"

 
 

-#. 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
-msgid "Get:%lu %s"
-msgstr "Cyrchu:%lu %s"
-
-#. 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
-msgid "Ign:%lu %s"
-msgstr "Anwybyddu:%lu %s"
-
-#. 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
-msgid "Err:%lu %s"
-msgstr "Gwall:%lu %s"
-
-#: apt-private/acqprogress.cc:159
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
-
-#: 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.
-#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141
-#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412
-#: 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"
-
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
-#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
-#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
-#: apt-pkg/contrib/cdromutl.cc:235
-#, c-format
-msgid "Unable to change to %s"
-msgstr "Ni ellir newid i %s"
-
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:280
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
-
-#. 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"
-
-#: methods/mirror.cc:445
-#, c-format
-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"
-
-#: methods/rsh.cc:364
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
-
-#: dselect/install:33
-msgid "Bad default setting!"
-msgstr "Rhagosodiad gwael!"
-
-#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
-#: dselect/install:106 dselect/update:45
-#, fuzzy
-msgid "Press [Enter] to continue."
-msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
-
-#: dselect/install:92
-msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
-
-#: dselect/install:102
-#, fuzzy
-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
-
-#: dselect/install:103
-#, fuzzy
-msgid "will be configured. This may result in duplicate errors"
-msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
-
-#: dselect/install: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 ""
-"above this message are important. Please fix them and run [I]nstall again"
-msgstr ""
-"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
-"eto."
-
-#: dselect/update:30
-#, fuzzy
-msgid "Merging available information"
-msgstr "Yn cyfuno manylion Ar Gael"
-
-#: apt-pkg/install-progress.cc:58
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:177
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:176
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
-
-#: apt-pkg/init.cc:192
-#, fuzzy
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
-
-#: apt-pkg/indexcopy.cc:228 apt-pkg/indexcopy.cc:753
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:230 apt-pkg/indexcopy.cc:755
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:233 apt-pkg/indexcopy.cc:758
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
-
-#: 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-pkg/indexcopy.cc:498
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:504
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Camgyfatebiaeth swm MD5"
-
-#: apt-pkg/cachefile.cc:101
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
-
-#: apt-pkg/cachefile.cc:105
-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."
-
-#: apt-pkg/cachefile.cc:123
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
-
-#: apt-pkg/pkgcache.cc:163
-msgid "Empty package cache"
-msgstr "Storfa pecyn gwag"
-
-#: 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
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:177
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-

 # FIXME: capitalisation?
 # FIXME: capitalisation?

-#: apt-pkg/pkgcache.cc:184
+#: apt-pkg/pkgcache.cc

 #, fuzzy, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 
 #, fuzzy, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 

-#: apt-pkg/pkgcache.cc:194
+#: apt-pkg/pkgcache.cc

 #, fuzzy, c-format
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 
 #, fuzzy, c-format
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
 

-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc
+#, fuzzy
+msgid "The package cache file is corrupted, it has the wrong hash"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:320
-msgid "Recommends"
-msgstr "Argymell"
-
-#: apt-pkg/pkgcache.cc:320
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:320
+#: apt-pkg/pkgcache.cc
+msgid "Recommends"
+msgstr "Argymell"
+
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:321
-msgid "Obsoletes"
-msgstr "Darfodi"
-
-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc

 msgid "Breaks"
 msgstr ""
 
 msgid "Breaks"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:321
+#: apt-pkg/pkgcache.cc

 msgid "Enhances"
 msgstr ""
 
 msgid "Enhances"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:332
+#: apt-pkg/pkgcache.cc
+msgid "Obsoletes"
+msgstr "Darfodi"
+
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:332
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:332
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:333
+#: apt-pkg/pkgcache.cc
+msgid "extra"
+msgstr "ychwanegol"
+
+#: apt-pkg/pkgcache.cc

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

-#: apt-pkg/pkgcache.cc:333
-msgid "extra"
-msgstr "ychwanegol"
+#: apt-pkg/pkgcachegen.cc
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"

 
 

-#: apt-pkg/acquire-worker.cc:111
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"

 
 

-#: apt-pkg/acquire-worker.cc:113
-#, c-format
-msgid "Is the package %s installed?"
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of package names this APT is capable of."

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/acquire-worker.cc:164
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."

 
 

-#: apt-pkg/acquire-worker.cc:536
-#, fuzzy, c-format
-msgid ""
-"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
+#: apt-pkg/pkgcachegen.cc
+#, 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
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."

 msgstr ""
 msgstr ""

-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
+"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+
+#: apt-pkg/pkgcachegen.cc
+#, fuzzy
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-pkg/pkgcachegen.cc
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"

 
 

-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/pkgrecords.cc

 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "Ni chynhelir y math ffeil mynegai '%s'"
 

-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+#: apt-pkg/policy.cc
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""

 
 

-#: apt-pkg/depcache.cc:140
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+# FIXME: literal
+#: apt-pkg/policy.cc
+#, fuzzy, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"

 
 

-#: apt-pkg/depcache.cc:168
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+# FIXME: tense
+#: apt-pkg/policy.cc
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"

 
 

-#: 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/policy.cc
+#, c-format
+msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"
+msgstr ""

 
 

-#: apt-pkg/depcache.cc:252
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: apt-pkg/policy.cc
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"

 
 

-#: apt-pkg/depcache.cc:257
+#. 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

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

-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"

 
 

-#: apt-pkg/acquire-item.cc:116
-msgid "Use --allow-insecure-repositories to force the update"
-msgstr ""
+#: apt-pkg/sourcelist.cc
+#, c-format
+msgid "Opening %s"
+msgstr "Yn agor %s"

 
 

-#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2161
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:585
-#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"

 
 

-#: apt-pkg/acquire-item.cc:590
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
+#: apt-pkg/sourcelist.cc
+#, 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/acquire-item.cc:595
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Gweithred annilys %s"
+#: apt-pkg/sourcelist.cc
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"

 
 

-#: apt-pkg/acquire-item.cc:600
-#, fuzzy
-msgid "Signature error"
-msgstr "Gwall ysgrifennu"
+#: apt-pkg/sourcelist.cc
+#, 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"

 
 

-#: apt-pkg/acquire-item.cc:789
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

-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"
+msgid "Unsupported file %s given on commandline"

 msgstr ""
 
 msgstr ""
 

-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc
+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/tagfile.cc

 #, c-format
 #, c-format

-msgid "GPG error: %s: %s"
+msgid "Cannot convert %s to integer: out of range"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:970
+#: apt-pkg/update.cc apt-private/private-download.cc

 #, c-format
 #, c-format

+msgid "Failed to fetch %s  %s"
+msgstr "Methwyd cyrchu %s  %s"
+
+#: apt-pkg/update.cc
+#, fuzzy

 msgid ""
 msgid ""

-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/acquire-item.cc:1026
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
+#: apt-pkg/upgrade.cc
+#, fuzzy
+msgid "Calculating upgrade"
+msgstr "Yn Cyfrifo'r Uwchraddiad"

 
 

-#. 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
+#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
+#: apt-private/acqprogress.cc

 #, c-format
 #, c-format

-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+msgid "Hit:%lu %s"
+msgstr "Presennol:%lu %s"

 
 

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

 #, c-format
 #, c-format

-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgid "Get:%lu %s"
+msgstr "Cyrchu:%lu %s"

 
 

-#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480
+#. 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

 #, c-format
 #, c-format

-msgid ""
-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
-msgstr ""
+msgid "Ign:%lu %s"
+msgstr "Anwybyddu:%lu %s"

 
 

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

 #, c-format
 #, c-format

-msgid ""
-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
-msgstr ""
+msgid "Err:%lu %s"
+msgstr "Gwall:%lu %s"

 
 

-#: 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-private/acqprogress.cc
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"

 
 

-#: apt-pkg/acquire-item.cc:1466
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
+#: apt-private/acqprogress.cc
+msgid " [Working]"
+msgstr " [Gweithio]"

 
 

-# FIXME: case
-#: apt-pkg/acquire-item.cc:2611
-#, c-format
+#: apt-private/acqprogress.cc
+#, fuzzy, c-format

 msgid ""
 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)"
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press [Enter]\n"

 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.)"
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"

 
 

-#: apt-pkg/acquire-item.cc:2677
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+#: apt-private/private-cachefile.cc
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."

 
 

-#: 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."
+#: apt-private/private-cachefile.cc
+msgid " failed."
+msgstr " wedi methu."

 
 

-#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3054
-#, fuzzy, c-format
-msgid "Changelog unavailable for %s=%s"
-msgstr "Yn cysylltu i %s (%s)"
+#: apt-private/private-cachefile.cc
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"

 
 

-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+#: apt-private/private-cachefile.cc
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"

 
 

-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
+#: apt-private/private-cachefile.cc
+msgid " Done"
+msgstr " Wedi Gorffen"

 
 

-#: apt-pkg/pkgcachegen.cc:112
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
+#: apt-private/private-cachefile.cc
+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."

 
 

-#. 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)"
+#: apt-private/private-cachefile.cc
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."

 
 

-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-private/private-cacheset.cc apt-private/private-search.cc
+msgid "Sorting"

 msgstr ""
 msgstr ""

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

 
 

-#: 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."
+#: apt-private/private-cacheset.cc
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"

 
 

-#: 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."
+#: apt-private/private-cacheset.cc
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for glob '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"

 
 

-#: 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."
+#: apt-private/private-cacheset.cc
+#, 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
+#, 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-pkg/pkgcachegen.cc:1400 apt-pkg/pkgcachegen.cc:1526
-#: apt-pkg/pkgcachegen.cc:1552 apt-pkg/pkgcachegen.cc:1671
+#: apt-private/private-cacheset.cc

 #, fuzzy
 #, fuzzy

-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
+msgid " [Installed]"
+msgstr " [Sefydliwyd]"

 
 

-#: apt-pkg/pkgcachegen.cc:1471 apt-pkg/pkgcachegen.cc:1478
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+#: apt-private/private-cacheset.cc
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Fersiynau Posib"

 
 

-#: apt-pkg/pkgcachegen.cc:1570 apt-pkg/pkgcachegen.cc:1572
-#: apt-pkg/contrib/fileutl.cc:2151 cmdline/apt-extracttemplates.cc:263
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
+#: apt-private/private-cacheset.cc
+msgid "You should explicitly select one to install."
+msgstr "Dylech ddewis un yn benodol i'w sefydlu."

 
 

-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833
+# FIXME: punctuation
+#: apt-private/private-cacheset.cc

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

-msgid "List directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
+"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
+"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
+"ffeil sources.list.\n"

 
 

-#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
-#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
+#: apt-private/private-cacheset.cc
+msgid "However the following packages replace it:"
+msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"

 
 

-#: apt-pkg/acquire.cc:162
+#: apt-private/private-cacheset.cc

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

-msgid "Unable to lock directory %s"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+msgid "Package '%s' has no installation candidate"
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"

 
 

-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:1081
+#: apt-private/private-cacheset.cc

 #, c-format
 #, c-format

-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "Virtual packages like '%s' can't be removed\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire.cc:1083
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-cacheset.cc apt-private/private-install.cc

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

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

 
 

-#: apt-pkg/update.cc:76
+#: apt-private/private-cacheset.cc apt-private/private-install.cc

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

-msgid "Failed to fetch %s  %s"
-msgstr "Methwyd cyrchu %s  %s\n"
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"

 
 

-#: apt-pkg/update.cc:102 apt-pkg/update.cc:104
-#, 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."
+#: apt-private/private-cacheset.cc
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"

 
 

-# 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-private/private-cmndline.cc
+msgid "Most used commands:"
+msgstr ""

 
 

-#: apt-pkg/policy.cc:77
+#: apt-private/private-cmndline.cc

 #, c-format
 #, c-format

+msgid "See %s for more information about the available commands."
+msgstr ""
+
+#: apt-private/private-cmndline.cc

 msgid ""
 msgid ""

-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Configuration options and syntax is detailed in apt.conf(5).\n"
+"Information about how to configure sources can be found in sources.list(5).\n"
+"Package and version choices can be expressed via apt_preferences(5).\n"
+"Security details are available in apt-secure(8).\n"

 msgstr ""
 
 msgstr ""
 

-# 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'"
+#: apt-private/private-cmndline.cc
+msgid "This APT has Super Cow Powers."
+msgstr "Mae gan yr APT hwn bŵerau buwch hudol."

 
 

-# FIXME: tense
-#: apt-pkg/policy.cc:475
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Methwyd daeall y math pin %s"
+#: apt-private/private-cmndline.cc
+msgid "This APT helper has Super Meep Powers."
+msgstr ""

 
 

-#: apt-pkg/policy.cc:484
-#, c-format
-msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Canfuwyd dim pecyn"
+
+#: apt-private/private-download.cc
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc
+msgid "Authentication warning overridden.\n"

 msgstr ""
 
 msgstr ""
 

-#: 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-private/private-download.cc
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"

 
 

-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:983
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+#: apt-private/private-download.cc
+msgid "Install these packages without verification?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:562 apt-pkg/packagemanager.cc:592
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Methwyd agor ffeil %s"
-
-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:642
-#, c-format
+#: apt-private/private-download.cc apt-private/private-install.cc

 msgid ""
 msgid ""

-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
-msgstr ""
-"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
-"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
-"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-
-#: apt-pkg/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."
-
-#: apt-pkg/cdrom.cc:572
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
-
-#: apt-pkg/cdrom.cc:587
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:600
+#: apt-private/private-download.cc

 #, fuzzy
 #, fuzzy

-msgid "Waiting for disc...\n"
-msgstr "Yn aros am benawdau"
-
-#: apt-pkg/cdrom.cc:610
-msgid "Mounting CD-ROM...\n"
-msgstr ""
+msgid ""
+"There were unauthenticated packages and -y was used without --allow-"
+"unauthenticated"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#: apt-pkg/cdrom.cc:621
-msgid "Identifying... "
-msgstr ""
+#: apt-private/private-download.cc
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"

 
 

-#: apt-pkg/cdrom.cc:663
+#: apt-private/private-download.cc

 #, c-format
 #, c-format

-msgid "Stored label: %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:681
-msgid "Scanning disc for index files...\n"
-msgstr ""
+msgid "You don't have enough free space in %s."
+msgstr "Does dim digon o le rhydd gennych yn %s."

 
 

-#: apt-pkg/cdrom.cc:735
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
-msgstr ""
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"

 
 

-#: apt-pkg/cdrom.cc:745
+# FIXME: needs commas
+#: apt-private/private-install.cc

 msgid ""
 msgid ""

-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+"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 ""
 msgstr ""

+"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
+"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
+"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
+"heb gael eu symud allan o Incoming."

 
 

-#: apt-pkg/cdrom.cc:772
-#, c-format
-msgid "Found label '%s'\n"
-msgstr ""
+#.
+#. 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
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"

 
 

-#: apt-pkg/cdrom.cc:801
-msgid "That is not a valid name, try again.\n"
-msgstr ""
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "Pecynnau wedi torri"

 
 

-#: apt-pkg/cdrom.cc:818
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
+#: apt-private/private-install.cc
+msgid "Internal error, InstallPackages was called with broken packages!"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:820
+#: apt-private/private-install.cc

 #, fuzzy
 #, fuzzy

-msgid "Copying package lists..."
-msgstr "Yn Darllen Rhestrau Pecynnau"
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."

 
 

-#: apt-pkg/cdrom.cc:867
+#: apt-private/private-install.cc

 #, fuzzy
 #, 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 ""
+msgid ""
+"Essential packages were removed and -y was used without --allow-remove-"
+"essential."
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+#: apt-private/private-install.cc

 #, fuzzy
 #, fuzzy

-msgid "Calculating upgrade"
-msgstr "Yn Cyfrifo'r Uwchraddiad"
-
-#: 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."
+msgid "Packages were downgraded and -y was used without --allow-downgrades."
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#: apt-pkg/algorithms.cc:1080
+#: apt-private/private-install.cc

 msgid ""
 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."
-
-#: 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."
-
-#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:232
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:311
-msgid "Prepare for receiving solution"
+"Held packages were changed and -y was used without --allow-change-held-"
+"packages."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:318
-msgid "External solver failed without a proper error message"
-msgstr ""
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"

 
 

-#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618
-msgid "Execute external solver"
+#: apt-private/private-install.cc
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212
+#. 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

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (%d)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"

 
 

-#: apt-pkg/tagfile.cc:541 apt-pkg/tagfile.cc:544
+#. 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

 #, c-format
 #, c-format

-msgid "Cannot convert %s to integer"
-msgstr ""
+msgid "Need to get %sB of archives.\n"
+msgstr "Mae angen cyrchu %sB o archifau.\n"

 
 

-#. 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
+#. 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

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

-msgid "Malformed entry %u in %s file %s (%s)"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"

 
 

-#: apt-pkg/sourcelist.cc:355
-#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %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
+#: apt-private/private-install.cc
+#, fuzzy, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"

 
 

-#: apt-pkg/sourcelist.cc:389
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+#: apt-private/private-install.cc
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."

 
 

-#: apt-pkg/sourcelist.cc: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"
+#. 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
+msgid "Yes, do as I say!"
+msgstr "Ie, gwna fel rydw i'n dweud!"

 
 

-#: apt-pkg/sourcelist.cc:413 apt-pkg/sourcelist.cc:419
+#: apt-private/private-install.cc

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

-msgid "Malformed stanza %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
+"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
+" ?]"

 
 

-#: 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"
+#: apt-private/private-install.cc
+msgid "Abort."
+msgstr "Erthylu."

 
 

-#: apt-pkg/cacheset.cc:500
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+#: apt-private/private-install.cc
+msgid "Do you want to continue?"
+msgstr "Ydych chi eisiau mynd ymlaen?"

 
 

-#: apt-pkg/cacheset.cc:503
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+#: apt-private/private-install.cc
+msgid "Some files failed to download"
+msgstr "Methodd rhai ffeiliau lawrlwytho"

 
 

-#: apt-pkg/cacheset.cc:738
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#: apt-private/private-install.cc apt-private/private-source.cc
+msgid "Download complete and in download only mode"
+msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"

 
 

-#: apt-pkg/cacheset.cc:744
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#: apt-private/private-install.cc
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
+"geidio defnyddio --fix-missing?"

 
 

-#: apt-pkg/cacheset.cc:750
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#: apt-private/private-install.cc
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"

 
 

-#: apt-pkg/cacheset.cc:789
-#, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+#: apt-private/private-install.cc
+msgid "Unable to correct missing packages."
+msgstr "Ni ellir cywiro pecynnau ar goll."

 
 

-#: apt-pkg/cacheset.cc:828
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "Aborting install."
+msgstr "Yn Erthylu'r Sefydliad."

 
 

-#: apt-pkg/cacheset.cc:836
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+#: apt-private/private-install.cc
+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-install.cc
+msgid "Note: This is done automatically and on purpose by dpkg."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:844
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+#: apt-private/private-install.cc
+msgid "We are not supposed to delete stuff, can't start AutoRemover"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860
-#, c-format
+#: apt-private/private-install.cc

 msgid ""
 msgid ""

-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:430
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:435
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1279
-#, c-format
-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
-
-#: 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"
-
-#: apt-pkg/contrib/fileutl.cc:202
-#, c-format
-msgid "Could not open lock file %s"
-msgstr "Methwyd agor y ffeil clo %s"
-
-#: 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"
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"

 
 

-#: apt-pkg/contrib/fileutl.cc:230
-#, c-format
-msgid "Could not get lock %s"
-msgstr "Methwyd cael y clo %s"
+#: apt-private/private-install.cc
+#, 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-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 ""
+#: apt-private/private-install.cc
+#, 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-pkg/contrib/fileutl.cc:401
+#: apt-private/private-install.cc

 #, c-format
 #, c-format

-msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
-msgstr ""
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: apt-pkg/contrib/fileutl.cc:419
-#, c-format
-msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
-msgstr ""
+#: apt-private/private-install.cc
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"

 
 

-#: apt-pkg/contrib/fileutl.cc:428
-#, c-format
+# FIXME
+#: apt-private/private-install.cc

 msgid ""
 msgid ""

-"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/contrib/fileutl.cc:862
-#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Derbyniodd is-broses %s wall segmentu."
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "The following additional packages will be installed:"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"

 
 

-#: apt-pkg/contrib/fileutl.cc:864
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Derbyniodd is-broses %s wall segmentu."
+#: apt-private/private-install.cc
+msgid "Suggested packages:"
+msgstr "Pecynnau a awgrymmir:"

 
 

-#: 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)"
+#: apt-private/private-install.cc
+msgid "Recommended packages:"
+msgstr "Pecynnau a argymhellir:"

 
 

-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:220
+#: apt-private/private-install.cc

 #, c-format
 #, c-format

-msgid "Sub-process %s exited unexpectedly"
-msgstr "Gorffenodd is-broses %s yn annisgwyl"
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:987
+#: apt-private/private-install.cc

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

-msgid "Problem closing the gzip file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:1194
+#: apt-private/private-install.cc

 #, c-format
 #, c-format

-msgid "Could not open file %s"
-msgstr "Methwyd agor ffeil %s"
-
-#: 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"
-
-#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2176
-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
-#: 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"
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"

 
 

-# FIXME
-#: apt-pkg/contrib/fileutl.cc:1720 apt-pkg/contrib/fileutl.cc:1742
+#. TRANSLATORS: First string is package name, second is version
+#: apt-private/private-install.cc

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

-msgid "write, still have %llu to write but couldn't"
-msgstr "o hyd %lu i ysgrifennu ond methwyd"
+msgid "%s is already the newest version (%s).\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:2008
+#: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc

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

-msgid "Problem closing the file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-pkg/contrib/fileutl.cc:2019
+#: apt-private/private-install.cc

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

-msgid "Problem renaming the file %s to %s"
-msgstr "Gwall wrth gyfamseru'r ffeil"
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:2030
+#: apt-private/private-install.cc

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

-msgid "Problem unlinking the file %s"
-msgstr "Gwall wrth dadgysylltu'r ffeil"
-
-#: apt-pkg/contrib/fileutl.cc:2043
-msgid "Problem syncing the file"
-msgstr "Gwall wrth gyfamseru'r ffeil"
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"

 
 

-#: apt-pkg/contrib/fileutl.cc:2146 cmdline/apt-extracttemplates.cc:258
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Ni ellir gwneud stat() o %s"
+#: apt-private/private-list.cc
+msgid "Listing"
+msgstr ""

 
 

-#: apt-pkg/contrib/progress.cc:148
+#: apt-private/private-list.cc

 #, c-format
 #, c-format

-msgid "%c%s... Error!"
-msgstr "%c%s... Gwall!"
+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] ""

 
 

-#: apt-pkg/contrib/progress.cc:150
+#. TRANSLATORS: placeholder is a binary name like apt or apt-get
+#: apt-private/private-main.cc

 #, c-format
 #, c-format

-msgid "%c%s... Done"
-msgstr "%c%s... Wedi Gorffen"
-
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      %s 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!\n"

 msgstr ""
 
 msgstr ""
 

-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s... Wedi Gorffen"
-
-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
-
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Methwyd agor pibell ar gyfer %s"
+#: apt-private/private-output.cc apt-private/private-show.cc
+msgid "unknown"
+msgstr ""

 
 

-#: apt-pkg/contrib/mmap.cc:119
+#: apt-private/private-output.cc

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

-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
-
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Ni ellir agor %s"
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"

 
 

-# FIXME
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#: apt-private/private-output.cc

 #, fuzzy
 #, fuzzy

-msgid "Unable to synchronize mmap"
-msgstr "Methwyd gweithredu "
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"

 
 

-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
+#: apt-private/private-output.cc
+msgid "[installed,auto-removable]"
+msgstr ""

 
 

-#: apt-pkg/contrib/mmap.cc:322
+#: apt-private/private-output.cc

 #, fuzzy
 #, fuzzy

-msgid "Failed to truncate file"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"

 
 

-#: 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 ""
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sefydliwyd]"

 
 

-#: apt-pkg/contrib/mmap.cc:446
+#: apt-private/private-output.cc

 #, c-format
 #, c-format

-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+msgid "[upgradable from: %s]"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:449
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
+#: apt-private/private-output.cc
+msgid "[residual-config]"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:65
+#: apt-private/private-output.cc

 #, c-format
 #, c-format

-msgid "Unable to stat the mount point %s"
-msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-
-#: apt-pkg/contrib/cdromutl.cc:247
-msgid "Failed to stat the cdrom"
-msgstr "Methwyd gwneud stat() o'r CD-ROM"
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"

 
 

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

 #, c-format
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-pkg/contrib/configuration.cc:630
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#: apt-private/private-output.cc
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"

 
 

-#: 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-private/private-output.cc
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"

 
 

-# FIXME
-#: apt-pkg/contrib/configuration.cc:817
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+#: apt-private/private-output.cc
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"

 
 

-#: 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-private/private-output.cc
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"

 
 

-#: apt-pkg/contrib/configuration.cc:874
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr ""
-"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
+#: apt-private/private-output.cc
+msgid " or"
+msgstr " neu"

 
 

-#: apt-pkg/contrib/configuration.cc:881
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+#: apt-private/private-output.cc
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"

 
 

-#: 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-private/private-output.cc
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"

 
 

-#: apt-pkg/contrib/configuration.cc:894
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+#: apt-private/private-output.cc
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"

 
 

-#: apt-pkg/contrib/configuration.cc:897
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: apt-private/private-output.cc
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: apt-private/private-output.cc
+#, c-format
+msgid "%s (due to %s)"
+msgstr "%s (oherwydd %s)"
+
+#: apt-private/private-output.cc
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
+
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
+
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
+
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
+
+#. 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
+msgid "[Y/n]"
+msgstr ""
+
+#. 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
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc
+msgid "N"
+msgstr ""
+
+#: apt-private/private-search.cc
+#, fuzzy
+msgid "You must give at least one search pattern"
+msgstr "Rhaid i chi ddarparu un patrwm yn union"
+
+#: apt-private/private-search.cc
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/private-show.cc cmdline/apt-cache.cc
+#, c-format
+msgid "Package file %s is out of sync."
+msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
+
+#: apt-private/private-show.cc
+#, c-format
+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] ""
+
+#: apt-private/private-show.cc
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "Package files:"
+msgstr "Ffeiliau Pecynnau:"
+
+#: apt-private/private-show.cc
+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
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "Pinned packages:"
+msgstr "Pecynnau wedi eu Pinio:"
+
+#. Print the package name and the version we are forcing to
+#: apt-private/private-show.cc
+#, c-format
+msgid "%s -> %s with priority %d\n"
+msgstr ""
+
+#: apt-private/private-show.cc
+msgid "  Installed: "
+msgstr "  Wedi Sefydlu: "
+
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Ymgeisydd: "
+
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(dim)"
+
+#. Show the priority tables
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "  Version table:"
+msgstr "  Tabl Fersiynnau:"
+
+#: apt-private/private-source.cc

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

-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgid "Can not find a package for architecture '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-private/private-source.cc
+#, 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-source.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/contrib/configuration.cc:947
+#: apt-private/private-source.cc
+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-source.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"

 
 

-# FIXME
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: apt-private/private-source.cc

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

+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+
+#. 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-source.cc
+#, c-format
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
+msgstr "Cyrchu Ffynhonell %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."
+
+#: apt-private/private-source.cc
+#, 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-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
+
+#: apt-private/private-source.cc
+#, c-format

 msgid ""
 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)."
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+
+#: apt-private/private-source.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
-#: apt-pkg/contrib/cmndline.cc:169
+#: apt-private/private-source.cc

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

+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
+
+#: apt-private/private-sources.cc
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Methwyd ailenwi %s at %s"
+
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-unmet.cc
+#, 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"
+
+#: apt-private/private-update.cc
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-update.cc
+#, c-format
+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
+msgid "All packages are up to date."
+msgstr ""
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "apt-cache stats does not take any arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total package names: "
+msgstr "Cyfanswm Enwau Pecynnau : "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total package structures: "
+msgstr "Cyfanswm Enwau Pecynnau : "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Normal packages: "
+msgstr "  Pecynnau Normal: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Pure virtual packages: "
+msgstr "  Pecynnau Cwbl Rhithwir: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Single virtual packages: "
+msgstr "  Pecynnau Rhithwir Sengl: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Mixed virtual packages: "
+msgstr "  Pecynnau Rhithwir Cymysg: "
+
+#: cmdline/apt-cache.cc
+msgid "  Missing: "
+msgstr "  Ar Goll: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total distinct versions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total distinct descriptions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total dependencies: "
+msgstr "Cyfanswm Dibyniaethau: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total ver/file relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total Provides mappings: "
+msgstr "Cyfanswm Mapiau Darpariath: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total globbed strings: "
+msgstr "Cyfanswm Llinynau Glob: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total slack space: "
+msgstr "Cyfanswm gofod Slac: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total space accounted for: "
+msgstr "Cyfanswm Gofod Cyfrifwyd: "
+
+#: cmdline/apt-cache.cc
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+msgstr ""
+
+#: cmdline/apt-cache.cc

 msgid ""
 msgid ""

-"Command line option %s is not understood in combination with the other "
-"options"
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+"Usage: apt-cache [options] command\n"
+"       apt-cache [options] show pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache queries and displays available information about installed\n"
+"and installable packages. It works exclusively on the data acquired\n"
+"into the local cache via the 'update' command of e.g. apt-get. The\n"
+"displayed information may therefore be outdated if the last update was\n"
+"too long ago, but in exchange apt-cache works independently of the\n"
+"availability of the configured sources (e.g. offline).\n"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "Dangos cofnodion ffynhonell"
+
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:174
+#: cmdline/apt-cdrom.cc
+#, fuzzy
+msgid "Please insert a Disc in the drive and press [Enter]"
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
+#: cmdline/apt-cdrom.cc
+#, fuzzy, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "Methwyd ailenwi %s at %s"
+
+#: cmdline/apt-cdrom.cc
+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
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is used to add CDROM's, USB flashdrives and other removable\n"
+"media types as package sources to APT. The mount point and device\n"
+"information is taken from apt.conf(5), udev(7) and fstab(5).\n"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "Arguments not in pairs"
+msgstr "Nid yw ymresymiadau mewn parau"
+
+#: cmdline/apt-config.cc
+#, fuzzy
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is an interface to the configuration settings used by\n"
+"all APT tools, mainly intended for debugging and shell scripting.\n"
+msgstr ""
+"Defnydd: apt-config [opsiynnau] gorchymyn\n"
+"\n"
+"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
+
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""
+
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""
+
+#: cmdline/apt-dump-solver.cc
+msgid ""
+"Usage: apt-dump-solver\n"
+"\n"
+"apt-dump-solver is an interface to store an EDSP scenario in\n"
+"a file and optionally forwards it to another solver.\n"
+msgstr ""
+
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc
+#, fuzzy
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is used to extract config and template files\n"
+"from debian packages. It is used mainly by debconf(1) to prompt for\n"
+"configuration questions before installation of packages.\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
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+
+#: cmdline/apt-get.cc

 #, c-format
 #, c-format

-msgid "Command line option %s is not boolean"
-msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+msgid "Couldn't find package %s"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+msgstr ""
+
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Supported modules:"
+msgstr "Modylau a Gynhelir:"
+
+# FIXME: split
+#: cmdline/apt-get.cc
+#, 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 command line interface for retrieval of packages\n"
+"and information about them from authenticated sources and\n"
+"for installation, upgrade and removal of packages together\n"
+"with their dependencies.\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"
+
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "Cyrchu rhestrau pecynnau newydd"
+
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Uwchraddio pecynnau wedi sefydlu"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Tynnu pecynnau"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"
+msgstr ""

 
 

-#: 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."
+#: cmdline/apt-get.cc cmdline/apt.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: 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>."
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Uwchraddio dosraniad, gweler apt-get(8)"

 
 

-#: 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'"
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Dilyn dewisiadau dselect"

 
 

-#: apt-pkg/contrib/cmndline.cc:315
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell"

 
 

-# 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'."
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Dileu ffeiliau archif wedi eu lawrlwytho"

 
 

-#: apt-pkg/contrib/cmndline.cc:397
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Gweithred annilys %s"
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Dileu hen ffeiliau archif wedi eu lawrlwytho"

 
 

-# 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)"
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Gwirio fod dim dibyniaethau torredig"

 
 

-#: 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"
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Lawrlwytho archifau ffynhonell"

 
 

-#: apt-pkg/deb/debmetaindex.cc:278
-#, c-format
-msgid "No Hash entry in Release file %s"
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"

 msgstr ""
 
 msgstr ""
 

-# FIXME: number?
-#: apt-pkg/deb/debmetaindex.cc:286
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""

 
 

-#: 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"
+#: cmdline/apt-helper.cc
+msgid "Need one URL as argument"
+msgstr ""

 
 

-#. 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
-msgid "Conflicting values set for option %s concerning source %s %s"
+#: cmdline/apt-helper.cc
+#, 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
+msgid "Download Failed"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debmetaindex.cc:480
+#: cmdline/apt-helper.cc

 #, c-format
 #, c-format

-msgid "Invalid value set for option %s concerning source %s %s (%s)"
+msgid "GetSrvRec failed for %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:110
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr "  Wedi Sefydlu: "
+#: cmdline/apt-helper.cc
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] cat-file file ...\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper bundles a variety of commands for shell scripts to use\n"
+"e.g. the same proxy configuration or acquire system as APT would.\n"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1007
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Yn cysylltu i %s"
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1014
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:113
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Methwyd dileu %s"
+#: cmdline/apt-helper.cc
+msgid "concatenate files, with automatic decompression"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:114
-#, c-format
-msgid "Noting disappearance of %s"
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:115
-#, c-format
-msgid "Running post-installation trigger %s"
+# FIXME: "debian"
+#: cmdline/apt-internal-planner.cc
+#, fuzzy
+msgid ""
+"Usage: apt-internal-planner\n"
+"\n"
+"apt-internal-planner is an interface to use the current internal\n"
+"installation planner for the APT family like an external one,\n"
+"for debugging or the like.\n"

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

 
 

-#. 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."
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"resolver for the APT family like an external one, for debugging or\n"
+"the like.\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/deb/dpkgpm.cc:853 apt-pkg/deb/dpkgpm.cc:875
+#: cmdline/apt-mark.cc

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

-msgid "Could not open file '%s'"
-msgstr "Methwyd agor ffeil %s"
+msgid "%s can not be marked as it is not installed.\n"
+msgstr "ond nid yw wedi ei sefydlu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1000
+#: cmdline/apt-mark.cc

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

-msgid "Preparing %s"
-msgstr "Yn agor %s"
+msgid "%s was already set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1001
+#: cmdline/apt-mark.cc

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

-msgid "Unpacking %s"
-msgstr "Yn agor %s"
+msgid "%s was already set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1006
+#: cmdline/apt-mark.cc

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

-msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid "%s was already set on hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1008
+#: cmdline/apt-mark.cc

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

-msgid "Installed %s"
-msgstr "  Wedi Sefydlu: "
+msgid "%s was already not hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1013
-#, c-format
-msgid "Preparing for removal of %s"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1015
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Argymell"
-
-#: apt-pkg/deb/dpkgpm.cc:1020
+#: cmdline/apt-mark.cc

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

-msgid "Preparing to completely remove %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid "%s set on hold.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1021
+#: cmdline/apt-mark.cc

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

-msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
+msgid "Canceled hold on %s.\n"
+msgstr "Methwyd agor %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"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for purge.\n"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168
-msgid "Is /dev/pts mounted?"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for removal.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1656
-msgid "Operation was interrupted before it could finish"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1718
-msgid "No apport report written because MaxReports is reached already"
+#: cmdline/apt-mark.cc
+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 be used to\n"
+"manipulate the dpkg(1) selection states of packages, and to list\n"
+"all packages with or without a certain marking.\n"

 msgstr ""
 
 msgstr ""
 

-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1723
-msgid "dependency problems - leaving unconfigured"
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1725
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1731
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1738
+#: cmdline/apt-sortpkgs.cc
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"
+
+#: cmdline/apt-sortpkgs.cc

 msgid ""
 msgid ""

-"No apport report written because the error message indicates a out of memory "
-"error"
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package information files.\n"
+"By default it sorts by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+#: cmdline/apt.cc

 msgid ""
 msgid ""

-"No apport report written because the error message indicates an issue on the "
-"local system"
+"Usage: apt [options] command\n"
+"\n"
+"apt is a commandline package manager and provides commands for\n"
+"searching and managing as well as querying information about packages.\n"
+"It provides the same functionality as the specialized APT tools,\n"
+"like apt-get and apt-cache, but enables options more suitable for\n"
+"interactive use by default.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1773
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:88
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: cmdline/apt.cc
+msgid "show package details"

 msgstr ""
 
 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"
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pecynnau wedi eu Pinio:"

 
 

-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:107
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Pecynnau wedi torri"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:125
-msgid "Not locked"
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"

 msgstr ""
 
 msgstr ""
 

-# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:228
+#. misc
+#: cmdline/apt.cc
+#, fuzzy
+msgid "edit the source information file"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: dselect/install
+msgid "Bad default setting!"
+msgstr "Rhagosodiad gwael!"
+
+#: dselect/install dselect/update
+#, fuzzy
+msgid "Press [Enter] to continue."
+msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
+
+#: dselect/install
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr ""
+
+#: dselect/install
+#, fuzzy
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
+
+#: dselect/install

 #, fuzzy
 #, fuzzy

+msgid "will be configured. This may result in duplicate errors"
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+
+#: dselect/install
+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

 msgid ""
 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"
+"above this message are important. Please fix them and run [I]nstall again"

 msgstr ""
 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"
+"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
+"eto."

 
 

-#: cmdline/apt-extracttemplates.cc:304
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+#: dselect/update
+#, fuzzy
+msgid "Merging available information"
+msgstr "Yn cyfuno manylion Ar Gael"

 
 

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

 msgid "Package extension list is too long"
 msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
 
 msgid "Package extension list is too long"
 msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
 

-#: ftparchive/apt-ftparchive.cc: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
+#: ftparchive/apt-ftparchive.cc

 #, fuzzy, c-format
 msgid "Error processing directory %s"
 msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
 
 #, fuzzy, c-format
 msgid "Error processing directory %s"
 msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
 

-#: ftparchive/apt-ftparchive.cc:279
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:394
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:424
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:616
+#: ftparchive/apt-ftparchive.cc

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


@@ -3331,433 +3210,734 @@ msgstr ""
 "  -c=?        Darllen y ffeil cyfluniad hwn\n"
 "  -o=?        Gosod opsiwn cyfluniad mympwyol"
 
 "  -c=?        Darllen y ffeil cyfluniad hwn\n"
 "  -o=?        Gosod opsiwn cyfluniad mympwyol"
 

-#: ftparchive/apt-ftparchive.cc:812
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:892
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/cachedb.cc:68
+#: ftparchive/cachedb.cc

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

-#: ftparchive/cachedb.cc:86
+#: ftparchive/cachedb.cc

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

-#: ftparchive/cachedb.cc:97
+#: ftparchive/cachedb.cc

 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 

-#: ftparchive/cachedb.cc:102
+#: ftparchive/cachedb.cc

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

-#: ftparchive/cachedb.cc: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"
-
-#: ftparchive/cachedb.cc:327
+#: ftparchive/cachedb.cc

 #, fuzzy
 msgid "Failed to read .dsc"
 msgstr "Methwyd darllen y cyswllt %s"
 
 #, fuzzy
 msgid "Failed to read .dsc"
 msgstr "Methwyd darllen y cyswllt %s"
 

-#: ftparchive/cachedb.cc:360
+#: ftparchive/cachedb.cc

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

-#: ftparchive/cachedb.cc:527
+#: ftparchive/cachedb.cc

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

-#: ftparchive/writer.cc:104
+#: ftparchive/contents.cc
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"
+
+#: ftparchive/multicompress.cc
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"
+
+#: ftparchive/multicompress.cc
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+
+#: ftparchive/multicompress.cc methods/rsh.cc
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Methwyd creu pibell cyfathrebu at isbroses"
+
+#: ftparchive/multicompress.cc
+msgid "Failed to fork"
+msgstr "Methodd fork()"
+
+#: ftparchive/multicompress.cc
+#, fuzzy
+msgid "Compress child"
+msgstr "Plentyn Cywasgu"
+
+#: ftparchive/multicompress.cc
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"
+
+#: ftparchive/multicompress.cc
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"
+
+#: ftparchive/multicompress.cc
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"
+
+#: ftparchive/override.cc
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+
+#: ftparchive/override.cc
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+
+#: ftparchive/override.cc
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:299
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
-
-#: ftparchive/writer.cc:303
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
-
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:426
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:434 ftparchive/writer.cc:698
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:501 ftparchive/writer.cc:855
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc

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

-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc

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

-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
+#: methods/cdrom.cc
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+
+#: methods/cdrom.cc
+#, fuzzy
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."
+
+#: methods/cdrom.cc
+#, fuzzy
+msgid "Wrong CD-ROM"
+msgstr "CD Anghywir"

 
 

-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: methods/cdrom.cc

 #, c-format
 #, c-format

-msgid "Unable to open %s"
-msgstr "Ni ellir agor %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."

 
 

-#. skip spaces
-#. find end of word
-#: ftparchive/override.cc:68
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu (%s)"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+#: methods/cdrom.cc
+#, fuzzy
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/cdrom.cc methods/file.cc methods/rsh.cc
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"

 
 

-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#. TRANSLATOR: %s is e.g. Tor's ".onion" which would likely fail or leak info (RFC7686)
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+msgid "Direct connection to %s domains is blocked by default."
+msgstr ""
+
+#: methods/connect.cc methods/http.cc
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
+
+#: methods/connect.cc
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
+
+#: methods/connect.cc
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
+
+#: methods/connect.cc
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+
+#: methods/connect.cc methods/ftp.cc methods/rsh.cc
+msgid "Failed"
+msgstr "Methwyd"

 
 

-#: ftparchive/override.cc:166
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc methods/rsh.cc
+#, c-format
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"
+
+#: methods/connect.cc
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"
+
+#: methods/connect.cc
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"
+
+#: methods/connect.cc

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

-msgid "Malformed override %s line %llu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgid "System error resolving '%s:%s'"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"

 
 

-#: ftparchive/override.cc:178
+#: methods/connect.cc

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

-msgid "Malformed override %s line %llu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+
+#: methods/connect.cc
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Methwyd cysylltu i %s %s:"
+
+#: methods/copy.cc
+msgid "Failed to stat"
+msgstr "Methwyd stat()"
+
+#: methods/file.cc
+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
+msgid "Logging in"
+msgstr "Yn mewngofnodi"
+
+#: methods/ftp.cc
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"
+
+#: methods/ftp.cc
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"
+
+#: methods/ftp.cc
+#, fuzzy, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
+
+#: methods/ftp.cc
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc
+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.)"
+
+# FIXME
+#: methods/ftp.cc
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc methods/rsh.cc
+msgid "Connection timeout"
+msgstr "Goramser cysylltu"
+
+#: methods/ftp.cc
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"
+
+#: methods/ftp.cc methods/rsh.cc
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."
+
+#: methods/ftp.cc
+msgid "Protocol corruption"
+msgstr "Llygr protocol"
+
+#: methods/ftp.cc
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"
+
+#: methods/ftp.cc
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+
+#: methods/ftp.cc
+#, fuzzy
+msgid "Could not connect passive socket."
+msgstr "Methwyd cysylltu soced goddefol"
+
+# FIXME
+#: methods/ftp.cc
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"
+
+#: methods/ftp.cc
+msgid "Could not bind a socket"
+msgstr "Methwyd rhwymo soced"
+
+#: methods/ftp.cc
+msgid "Could not listen on the socket"
+msgstr "Methwyd gwrando ar y soced"
+
+#: methods/ftp.cc
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"
+
+#: methods/ftp.cc
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"
+
+#: methods/ftp.cc
+#, c-format
+msgid "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+
+#: methods/ftp.cc
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"
+
+#: methods/ftp.cc
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"
+
+#: methods/ftp.cc methods/http.cc methods/rsh.cc
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"

 
 

-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+#: methods/ftp.cc
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"

 
 

-#: ftparchive/multicompress.cc:72
-#, fuzzy, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
+#: methods/ftp.cc methods/rsh.cc
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"

 
 

-#: ftparchive/multicompress.cc:102
+#: methods/ftp.cc

 #, c-format
 #, c-format

-msgid "Compressed output %s needs a compression set"
-msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"

 
 

-#: ftparchive/multicompress.cc:193
-msgid "Failed to fork"
-msgstr "Methodd fork()"
+#. Get the files information
+#: methods/ftp.cc
+msgid "Query"
+msgstr "Ymholiad"

 
 

-#: ftparchive/multicompress.cc:206
-#, fuzzy
-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+# FIXME
+#: methods/ftp.cc
+msgid "Unable to invoke "
+msgstr "Methwyd gweithredu "

 
 

-#: ftparchive/multicompress.cc:229
-#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc
+#, c-format
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:302
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
+#: methods/gpgv.cc
+msgid "At least one invalid signature was encountered."
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:340
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
+#: methods/gpgv.cc
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:356
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
+#: methods/gpgv.cc
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
+msgstr ""
+
+#: methods/gpgv.cc
+msgid "Unknown error executing apt-key"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:194
+#. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
+#: methods/gpgv.cc

 #, c-format
 #, c-format

-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
+msgid "Signature by key %s uses weak digest algorithm (%s)"
+msgstr ""

 
 

-# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:50
+#: methods/gpgv.cc

 #, fuzzy
 #, fuzzy

+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+
+#: methods/gpgv.cc

 msgid ""
 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"
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"

 msgstr ""
 msgstr ""

-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Dangos y testun cymorth hwn\n"
-"  -t   Gosod y cyfeiriadur dros dro\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"

 
 

-#: cmdline/apt-sortpkgs.cc:91
-msgid "Unknown package record!"
-msgstr "Cofnod pecyn anhysbys!"
+#: methods/http.cc
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"

 
 

-#: cmdline/apt-sortpkgs.cc:154
+#: methods/http.cc

 #, fuzzy
 #, fuzzy

-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
-"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -s   Defnyddio trefnu ffeil ffynhonell\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"

 
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
+#: methods/http.cc
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"

 
 

-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
+#: methods/http.cc
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"

 
 

-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
+#: methods/http.cc
+msgid "Select failed"
+msgstr "Methwyd dewis"

 
 

-#: apt-inst/filelist.cc:464
-#, fuzzy
-msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
+#: methods/http.cc
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"

 
 

-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
+#: methods/http.cc
+msgid "Error writing to output file"
+msgstr "Gwall wrth ysgrifennu i ffeil allbwn"

 
 

-# FIXME: "the"
-#: apt-inst/filelist.cc:506
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc

 #, c-format
 #, c-format

-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+msgid "No mirror file '%s' found "
+msgstr ""

 
 

-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ffeil cyfluniad dyblyg %s/%s"
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc
+#, fuzzy, c-format
+msgid "Can not read mirror file '%s'"
+msgstr "Methwyd agor ffeil %s"

 
 

-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
-#, c-format
-msgid "The path %s is too long"
-msgstr "Mae'r llwybr %s yn rhy hir"
+#: methods/mirror.cc
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Methwyd agor ffeil %s"

 
 

-#: apt-inst/extract.cc:132
+#: methods/mirror.cc

 #, c-format
 #, c-format

-msgid "Unpacking %s more than once"
-msgstr "Yn dadbacio %s mwy nag unwaith"
+msgid "[Mirror: %s]"
+msgstr ""

 
 

-#: apt-inst/extract.cc:142
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+#: methods/rred.cc
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"

 
 

-#: apt-inst/extract.cc:152
-#, 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"
+#: methods/rsh.cc
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"

 
 

-#: 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"
+#: methods/server.cc
+msgid "Waiting for headers"
+msgstr "Yn aros am benawdau"

 
 

-#: apt-inst/extract.cc:249
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr ""
-"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+#: methods/server.cc
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"

 
 

-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
+#: methods/server.cc
+msgid "Bad header line"
+msgstr "Llinell pennawd gwael"

 
 

-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Mae'r llwybr yn rhy hir"
+#: methods/server.cc
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"

 
 

-# FIXME: wtf?
-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
+#: methods/server.cc
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"

 
 

-#: apt-inst/extract.cc:438
-#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
+#: methods/server.cc
+#, fuzzy
+msgid "This HTTP server has broken range support"
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"

 
 

-#: apt-inst/extract.cc:498
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Ni ellir gwneud stat() o %s"
+#: methods/server.cc
+msgid "Unknown date format"
+msgstr "Fformat dyddiad anhysbys"

 
 

-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: methods/server.cc
+#, fuzzy
+msgid "Bad header data"
+msgstr "Data pennawd gwael"

 
 

-#: apt-inst/dirstream.cc:104
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
+#: methods/server.cc
+msgid "Connection failed"
+msgstr "Methodd y cysylltiad"

 
 

-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: methods/server.cc

 #, 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 ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
+msgstr ""

 
 

-#: apt-inst/deb/debfile.cc:132
-#, fuzzy, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+#: methods/server.cc
+msgid "Internal error"
+msgstr "Gwall mewnol"
+
+#: methods/store.cc
+msgid "Empty files can't be valid archives"
+msgstr ""
+
+#~ msgid "(not found)"
+#~ msgstr "(heb ganfod)"

 
 

-#: apt-inst/deb/debfile.cc:227

 #, fuzzy
 #, fuzzy

-msgid "Unparsable control file"
-msgstr "Ffeil rheoli ni ellir ei ramadegu"
+#~ msgid "  Package pin: "
+#~ msgstr "  Pin Pecyn: "

 
 

-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
+#, fuzzy
+#~ msgid "The repository is insufficiently signed by key %s (%s)"
+#~ msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"

 
 

-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
+#, fuzzy
+#~ 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"

 
 

-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
+#~ 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"

 
 

-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
+#~ 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"

 
 

-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
+#, fuzzy
+#~ 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"

 
 

-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
+#, fuzzy
+#~ 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"

 
 

-#: apt-inst/contrib/extracttar.cc:123
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
+#~ msgid "Failed to satisfy %s dependency for %s: %s"
+#~ msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"

 
 

-#: apt-inst/contrib/extracttar.cc:150
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip"
+#~ msgid "Build-dependencies for %s could not be satisfied."
+#~ msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."

 
 

-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
+#~ msgid "Problem unlinking %s"
+#~ msgstr "Gwall wrth datgysylltu %s"

 
 

-#: apt-inst/contrib/extracttar.cc:202
-#, fuzzy
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Methodd swm gwirio Tar, archif llygredig"
+#~ msgid "Failed to unlink %s"
+#~ msgstr "Methwyd datgysylltu %s"

 
 

-#: apt-inst/contrib/extracttar.cc:307
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Defnydd: apt-cache [opsiynnau] gorchymyn\n"
+#~ "         apt-cache [opsiynnau] show pecyn1 [pecyn2 ...]\n"
+#~ "\n"
+#~ "Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa "
+#~ "deuol APT, ac ymholi gwybodaeth ohonynt\n"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text.\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Opsiynnau:\n"
+#~ "  -h   Y testun cymorth hwn\n"
+#~ "  -c=? Darllen y ffeil cyfluniad\n"
+#~ "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+
+#, 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"
+
+#~ msgid "Child process failed"
+#~ msgstr "Methodd proses plentyn"
+
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
+#~ msgid "Failed to create pipes"
+#~ msgstr "Methwyd creu pibau"
+
+#~ msgid "Failed to exec gzip "
+#~ msgstr "Methwyd gweithredu gzip"

 
 #, fuzzy
 #~ msgid "%s %s for %s compiled on %s %s\n"
 
 #, fuzzy
 #~ msgid "%s %s for %s compiled on %s %s\n"