Run "./prepare-release pre-export"

[apt.git] / po / cy.po

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

-"Project-Id-Version: APT\n"
+"Project-Id-Version: apt 1.0.5\n"

 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"

-"POT-Creation-Date: 2014-08-28 00:44+0000\n"
+"POT-Creation-Date: 2015-10-05 18:29+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,1782 +15,1873 @@ 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
+#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
+#: apt-private/acqprogress.cc

 #, c-format
 #, 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"
+msgid "Hit:%lu %s"
+msgstr "Presennol:%lu %s"

 
 

-#: cmdline/apt-cache.cc:277
-#, fuzzy
-msgid "Total package names: "
-msgstr "Cyfanswm Enwau Pecynnau : "
+#. 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
+msgid "Get:%lu %s"
+msgstr "Cyrchu:%lu %s"

 
 

-#: cmdline/apt-cache.cc:279
-#, fuzzy
-msgid "Total package structures: "
-msgstr "Cyfanswm Enwau Pecynnau : "
+#. 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
+msgid "Ign:%lu %s"
+msgstr "Anwybyddu:%lu %s"

 
 

-#: cmdline/apt-cache.cc:319
-#, fuzzy
-msgid "  Normal packages: "
-msgstr "  Pecynnau Normal: "
+#. 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
+msgid "Err:%lu %s"
+msgstr "Gwall:%lu %s"

 
 

-#: cmdline/apt-cache.cc:320
-#, fuzzy
-msgid "  Pure virtual packages: "
-msgstr "  Pecynnau Cwbl Rhithwir: "
+#: apt-private/acqprogress.cc
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"

 
 

-#: cmdline/apt-cache.cc:321
-#, fuzzy
-msgid "  Single virtual packages: "
-msgstr "  Pecynnau Rhithwir Sengl: "
+#: apt-private/acqprogress.cc
+msgid " [Working]"
+msgstr " [Gweithio]"

 
 

-#: cmdline/apt-cache.cc:322
-#, fuzzy
-msgid "  Mixed virtual packages: "
-msgstr "  Pecynnau Rhithwir Cymysg: "
+#: apt-private/acqprogress.cc
+#, 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"

 
 

-#: cmdline/apt-cache.cc:323
-msgid "  Missing: "
-msgstr "  Ar Goll: "
+#: apt-private/private-cachefile.cc
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."

 
 

-#: cmdline/apt-cache.cc:325
-#, fuzzy
-msgid "Total distinct versions: "
-msgstr "Cyfanswm Fersiynau Gwahanol: "
+#: apt-private/private-cachefile.cc
+msgid " failed."
+msgstr " wedi methu."

 
 

-#: cmdline/apt-cache.cc:327
-#, fuzzy
-msgid "Total distinct descriptions: "
-msgstr "Cyfanswm Fersiynau Gwahanol: "
+#: apt-private/private-cachefile.cc
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"

 
 

-#: cmdline/apt-cache.cc:329
-#, fuzzy
-msgid "Total dependencies: "
-msgstr "Cyfanswm Dibyniaethau: "
+#: apt-private/private-cachefile.cc
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"

 
 

-#: cmdline/apt-cache.cc:332
-#, fuzzy
-msgid "Total ver/file relations: "
-msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+#: apt-private/private-cachefile.cc
+msgid " Done"
+msgstr " Wedi Gorffen"

 
 

-#: cmdline/apt-cache.cc:334
-#, fuzzy
-msgid "Total Desc/File relations: "
-msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+#: 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."

 
 

-#: cmdline/apt-cache.cc:336
-#, fuzzy
-msgid "Total Provides mappings: "
-msgstr "Cyfanswm Mapiau Darpariath: "
+#: apt-private/private-cachefile.cc
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."

 
 

-#: cmdline/apt-cache.cc:348
-#, fuzzy
-msgid "Total globbed strings: "
-msgstr "Cyfanswm Llinynau Glob: "
+#: apt-private/private-cacheset.cc apt-private/private-search.cc
+msgid "Sorting"
+msgstr ""

 
 

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

 
 

-#: cmdline/apt-cache.cc:367
-#, fuzzy
-msgid "Total slack space: "
-msgstr "Cyfanswm gofod Slac: "
+#: 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"

 
 

-#: cmdline/apt-cache.cc:375
-#, fuzzy
-msgid "Total space accounted for: "
-msgstr "Cyfanswm Gofod Cyfrifwyd: "
+#: 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"

 
 

-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
-#: apt-private/private-show.cc:58
+#: apt-private/private-cacheset.cc

 #, c-format
 #, c-format

-msgid "Package file %s is out of sync."
-msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"

 
 

-#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
-#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
-#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
-msgid "No packages found"
-msgstr "Canfuwyd dim pecyn"
+#: apt-private/private-cacheset.cc
+#, fuzzy
+msgid " [Installed]"
+msgstr " [Sefydliwyd]"

 
 

-#: cmdline/apt-cache.cc:1254
+#: apt-private/private-cacheset.cc

 #, fuzzy
 #, fuzzy

-msgid "You must give at least one search pattern"
-msgstr "Rhaid i chi ddarparu un patrwm yn union"
+msgid " [Not candidate version]"
+msgstr "Fersiynau Posib"

 
 

-#: cmdline/apt-cache.cc:1420
-msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+#: apt-private/private-cacheset.cc
+msgid "You should explicitly select one to install."
+msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+
+# FIXME: punctuation
+#: apt-private/private-cacheset.cc
+#, fuzzy, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"

 msgstr ""
 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
+msgid "However the following packages replace it:"
+msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"

 
 

-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:596
+#: apt-private/private-cacheset.cc
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+
+#: apt-private/private-cacheset.cc

 #, c-format
 #, c-format

-msgid "Unable to locate package %s"
-msgstr "Ni ellir lleoli'r pecyn %s"
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""

 
 

-#: cmdline/apt-cache.cc:1545
-#, fuzzy
-msgid "Package files:"
-msgstr "Ffeiliau Pecynnau:"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-cacheset.cc apt-private/private-install.cc
+#, 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"

 
 

-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
-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-private/private-cacheset.cc apt-private/private-install.cc
+#, 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"

 
 

-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: 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"
+
+#: apt-private/private-download.cc

 #, fuzzy
 #, fuzzy

-msgid "Pinned packages:"
-msgstr "Pecynnau wedi eu Pinio:"
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"

 
 

-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
-msgid "(not found)"
-msgstr "(heb ganfod)"
+#: apt-private/private-download.cc
+msgid "Authentication warning overridden.\n"
+msgstr ""

 
 

-#: cmdline/apt-cache.cc:1586
-msgid "  Installed: "
-msgstr "  Wedi Sefydlu: "
+#: apt-private/private-download.cc
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"

 
 

-#: cmdline/apt-cache.cc:1587
-msgid "  Candidate: "
-msgstr "  Ymgeisydd: "
+#: apt-private/private-download.cc
+msgid "Install these packages without verification?"
+msgstr ""

 
 

-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
-msgid "(none)"
-msgstr "(dim)"
+#: apt-private/private-download.cc apt-private/private-install.cc
+msgid ""
+"--force-yes is deprecated, use one of the options starting with --allow "
+"instead."
+msgstr ""

 
 

-#: cmdline/apt-cache.cc:1620
+#: apt-private/private-download.cc

 #, fuzzy
 #, fuzzy

-msgid "  Package pin: "
-msgstr "  Pin Pecyn: "
+msgid ""
+"There were unauthenticated packages and -y was used without --allow-"
+"unauthenticated"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#. Show the priority tables
-#: cmdline/apt-cache.cc:1629
-#, fuzzy
-msgid "  Version table:"
-msgstr "  Tabl Fersiynnau:"
+#: apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Methwyd cyrchu %s  %s\n"

 
 

-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1587 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: apt-private/private-download.cc

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

-msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"

 
 

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

 
 

-#: cmdline/apt-cdrom.cc:76
-msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
+#: apt-private/private-install.cc
+msgid "Internal error, InstallPackages was called with broken packages!"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:91
+#: apt-private/private-install.cc

 #, fuzzy
 #, 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"
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."

 
 

-#: cmdline/apt-cdrom.cc:139
-#, fuzzy, c-format
-msgid "Failed to mount '%s' to '%s'"
-msgstr "Methwyd ailenwi %s at %s"
+#: apt-private/private-install.cc
+#, fuzzy
+msgid ""
+"Essential packages were removed and -y was used without --allow-remove-"
+"essential."
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

-#: cmdline/apt-cdrom.cc:178
+#: apt-private/private-install.cc
+#, 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

 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."
+"Held packages were changed and -y was used without --allow-change-held-"
+"packages."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:182
-msgid "Repeat this process for the rest of the CDs in your set."
-msgstr ""
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"

 
 

-#: cmdline/apt-config.cc:48
-msgid "Arguments not in pairs"
-msgstr "Nid yw ymresymiadau mewn parau"
-
-#: cmdline/apt-config.cc:89
-#, fuzzy
-msgid ""
-"Usage: apt-config [options] command\n"
-"\n"
-"apt-config is a simple tool to read the APT config file\n"
-"\n"
-"Commands:\n"
-"   shell - Shell mode\n"
-"   dump - Show the configuration\n"
-"\n"
-"Options:\n"
-"  -h   This help text.\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-private/private-install.cc
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"

 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:245
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#. 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
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\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-install.cc
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Mae angen cyrchu %sB o archifau.\n"

 
 

-#: cmdline/apt-get.cc:327
+#. 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 "Can not find a package '%s' with version '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"

 
 

-#: cmdline/apt-get.cc:330
+#. 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 "Can not find a package '%s' with release '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
+
+#: 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."
+
+#. 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!"

 
 

-#: cmdline/apt-get.cc:367
+#: apt-private/private-install.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 ""
+"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"
+" ?]"

 
 

-#: cmdline/apt-get.cc:423
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
+#: apt-private/private-install.cc
+msgid "Abort."
+msgstr "Erthylu."
+
+#: apt-private/private-install.cc
+msgid "Do you want to continue?"
+msgstr "Ydych chi eisiau mynd ymlaen?"
+
+#: apt-private/private-install.cc
+msgid "Some files failed to download"
+msgstr "Methodd rhai ffeiliau lawrlwytho"
+
+#: apt-private/private-install.cc cmdline/apt-get.cc
+msgid "Download complete and in download only mode"
+msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
+
+#: apt-private/private-install.cc
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:454
-#, c-format
-msgid "Couldn't find package %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"

 
 

-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:865
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: apt-private/private-install.cc
+msgid "Unable to correct missing packages."
+msgstr "Ni ellir cywiro pecynnau ar goll."

 
 

-#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
-#, fuzzy, c-format
-msgid "%s set to automatically installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "Aborting install."
+msgstr "Yn Erthylu'r Sefydliad."

 
 

-#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
+#: apt-private/private-install.cc

 msgid ""
 msgid ""

-"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
-"instead."
+"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 ""
+
+#: apt-private/private-install.cc
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: apt-private/private-install.cc
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#.
+#. 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-private/private-install.cc

 #, fuzzy
 #, fuzzy

-msgid "Internal error, problem resolver broke stuff"
+msgid "Internal Error, AutoRemover broke stuff"

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

-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
-msgid "Unable to lock the download directory"
-msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+#: 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:"

 
 

-#: cmdline/apt-get.cc:726
-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-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:"

 
 

-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1067
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
+#: apt-private/private-install.cc
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:786
-#, c-format
+#: 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:"
+
+# FIXME
+#: apt-private/private-install.cc

 msgid ""
 msgid ""

-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
+"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)"

 
 

-#: cmdline/apt-get.cc:791
-#, c-format
+# FIXME: needs commas
+#: apt-private/private-install.cc

 msgid ""
 msgid ""

-"Please use:\n"
-"bzr branch %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
+"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."

 
 

-#: cmdline/apt-get.cc:843
-#, fuzzy, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "Pecynnau wedi torri"

 
 

-#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
-#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
-#, fuzzy, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "The following additional packages will be installed:"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"

 
 

-#: cmdline/apt-get.cc:882
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
+#: apt-private/private-install.cc
+msgid "Suggested packages:"
+msgstr "Pecynnau a awgrymmir:"

 
 

-#. 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:891
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+#: apt-private/private-install.cc
+msgid "Recommended packages:"
+msgstr "Pecynnau a argymhellir:"

 
 

-#. 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:896
+#: apt-private/private-install.cc

 #, c-format
 #, c-format

-msgid "Need to get %sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"

 
 

-#: cmdline/apt-get.cc:902
+#: apt-private/private-install.cc

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

-msgid "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
-
-#: cmdline/apt-get.cc:920
-msgid "Failed to fetch some archives."
-msgstr "Methwyd cyrchu rhai archifau."
-
-#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
-msgid "Download complete and in download only mode"
-msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
+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"

 
 

-#: cmdline/apt-get.cc:950
+#: apt-private/private-install.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 "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"

 
 

-#: cmdline/apt-get.cc:963
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+#. TRANSLATORS: First string is package name, second is version
+#: apt-private/private-install.cc
+#, fuzzy, c-format
+msgid "%s is already the newest version (%s).\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: cmdline/apt-get.cc:964
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+#: apt-private/private-install.cc cmdline/apt-get.cc cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: cmdline/apt-get.cc:992
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+#: apt-private/private-install.cc
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"

 
 

-#: cmdline/apt-get.cc:1011
-msgid "Child process failed"
-msgstr "Methodd proses plentyn"
+#: apt-private/private-install.cc
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"

 
 

-#: cmdline/apt-get.cc:1030
-msgid "Must specify at least one package to check builddeps for"
+#: apt-private/private-list.cc
+msgid "Listing"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:1055
+#: apt-private/private-list.cc

 #, c-format
 #, c-format

-msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
-msgstr ""
-
-#: cmdline/apt-get.cc:1079 cmdline/apt-get.cc:1082
-#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-
-#: cmdline/apt-get.cc:1102
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:1272
-#, fuzzy, c-format
+#: apt-private/private-main.cc

 msgid ""
 msgid ""

-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:1290
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
+#: apt-private/private-output.cc apt-private/private-show.cc
+msgid "unknown"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:1313
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+#: apt-private/private-output.cc
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc
+msgid "[installed,auto-removable]"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-get.cc:1352
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because candidate version of "
-"package %s can't satisfy version requirements"
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc
+#, c-format
+msgid "[upgradable from: %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:1358
-#, fuzzy, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
+#: apt-private/private-output.cc
+msgid "[residual-config]"

 msgstr ""
 msgstr ""

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

 
 

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

 #, c-format
 #, c-format

-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"

 
 

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

 #, c-format
 #, c-format

-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: cmdline/apt-get.cc:1401
-msgid "Failed to process build dependencies"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
+#: apt-private/private-output.cc
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"

 
 

-#: cmdline/apt-get.cc:1494 cmdline/apt-get.cc:1506
-#, fuzzy, c-format
-msgid "Changelog for %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+#: apt-private/private-output.cc
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
+
+#: apt-private/private-output.cc
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
+
+#: 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-private/private-output.cc
+msgid " or"
+msgstr " neu"
+
+#: apt-private/private-output.cc
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"

 
 

-#: cmdline/apt-get.cc:1592
+#: apt-private/private-output.cc
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-output.cc
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+
+#: apt-private/private-output.cc

 #, fuzzy
 #, fuzzy

-msgid "Supported modules:"
-msgstr "Modylau a Gynhelir:"
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"

 
 

-# FIXME: split
-#: cmdline/apt-get.cc:1633
+#: apt-private/private-output.cc

 #, fuzzy
 #, fuzzy

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

 
 

-#: cmdline/apt-helper.cc:35
+#: apt-private/private-output.cc

 #, fuzzy
 #, fuzzy

-msgid "Must specify at least one pair url/filename"
-msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"

 
 

-#: cmdline/apt-helper.cc:53
-msgid "Download Failed"
-msgstr ""
+#: 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)"

 
 

-#: cmdline/apt-helper.cc:66
+#: apt-private/private-output.cc
+#, fuzzy

 msgid ""
 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"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"

 msgstr ""
 msgstr ""

+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"

 
 

-#: cmdline/apt-mark.cc:68
-#, fuzzy, c-format
-msgid "%s can not be marked as it is not installed.\n"
-msgstr "ond nid yw wedi ei sefydlu"
-
-#: cmdline/apt-mark.cc:74
-#, fuzzy, c-format
-msgid "%s was already set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: cmdline/apt-mark.cc:76
-#, fuzzy, c-format
-msgid "%s was already set to automatically installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "

 
 

-#: cmdline/apt-mark.cc:241
-#, fuzzy, c-format
-msgid "%s was already set on hold.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "

 
 

-#: cmdline/apt-mark.cc:243
-#, fuzzy, c-format
-msgid "%s was already not hold.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "

 
 

-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1202
-#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
+#: 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"

 
 

-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
-#, fuzzy, c-format
-msgid "%s set on hold.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: 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"

 
 

-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
-#, fuzzy, c-format
-msgid "Canceled hold on %s.\n"
-msgstr "Methwyd agor %s"
-
-#: cmdline/apt-mark.cc:345
-msgid "Executing dpkg failed. Are you root?"
-msgstr ""
-
-#: cmdline/apt-mark.cc:392
-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."
+#. 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 ""
 
 msgstr ""
 

-#: cmdline/apt.cc:47
-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"
-"\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"
+#. 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 ""
 
 msgstr ""
 

-#: methods/cdrom.cc:203
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc
+msgid "Y"
+msgstr "I"

 
 

-#: methods/cdrom.cc:212
-#, fuzzy
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc
+msgid "N"

 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
-#, fuzzy
-msgid "Wrong CD-ROM"
-msgstr "CD Anghywir"

 
 

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

 #, c-format
 #, c-format

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

 
 

-#: methods/cdrom.cc:254
+#: apt-private/private-search.cc cmdline/apt-cache.cc

 #, fuzzy
 #, fuzzy

-msgid "Disk not found."
-msgstr "Ffeil heb ei ganfod"
-
-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
-msgid "File not found"
-msgstr "Ffeil heb ei ganfod"
-
-#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
-#: methods/rred.cc:608
-msgid "Failed to stat"
-msgstr "Methwyd stat()"
+msgid "You must give at least one search pattern"
+msgstr "Rhaid i chi ddarparu un patrwm yn union"

 
 

-#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
-msgid "Failed to set modification time"
-msgstr "Methwyd gosod amser newid"
+#: apt-private/private-search.cc
+msgid "Full Text Search"
+msgstr ""

 
 

-#: methods/file.cc:48
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
+#: 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."

 
 

-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
-msgid "Logging in"
-msgstr "Yn mewngofnodi"
+#: 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] ""

 
 

-#: methods/ftp.cc:183
-msgid "Unable to determine the peer name"
-msgstr "Ni ellir darganfod enw'r cymar"
+#: apt-private/private-show.cc
+msgid "not a real package (virtual)"
+msgstr ""

 
 

-#: methods/ftp.cc:188
-msgid "Unable to determine the local name"
-msgstr "Ni ellir darganfod yr enw lleol"
+#: apt-private/private-show.cc cmdline/apt-cache.cc cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Canfuwyd dim pecyn"

 
 

-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: apt-private/private-sources.cc

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

-msgid "The server refused the connection and said: %s"
-msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
+msgid "Failed to parse %s. Edit again? "
+msgstr "Methwyd ailenwi %s at %s"

 
 

-#: methods/ftp.cc:225
+#: apt-private/private-sources.cc

 #, c-format
 #, c-format

-msgid "USER failed, server said: %s"
-msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-update.cc
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"

 
 

-#: methods/ftp.cc:232
+#: apt-private/private-update.cc

 #, c-format
 #, c-format

-msgid "PASS failed, server said: %s"
-msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: methods/ftp.cc:252
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+#: apt-private/private-update.cc
+msgid "All packages are up to date."

 msgstr ""
 msgstr ""

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

 
 

-# FIXME
-#: methods/ftp.cc:280
+#: cmdline/apt-cache.cc

 #, c-format
 #, c-format

-msgid "Login script command '%s' failed, server said: %s"
-msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"

 
 

-#: methods/ftp.cc:306
-#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "apt-cache stats does not take any arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"

 
 

-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
-msgid "Connection timeout"
-msgstr "Goramser cysylltu"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total package names: "
+msgstr "Cyfanswm Enwau Pecynnau : "

 
 

-#: methods/ftp.cc:350
-msgid "Server closed the connection"
-msgstr "Caeodd y gweinydd y cysylltiad"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total package structures: "
+msgstr "Cyfanswm Enwau Pecynnau : "

 
 

-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476
-#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490
-#: apt-pkg/contrib/fileutl.cc:1492
-msgid "Read error"
-msgstr "Gwall darllen"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Normal packages: "
+msgstr "  Pecynnau Normal: "

 
 

-#: methods/ftp.cc:360 methods/rsh.cc:209
-msgid "A response overflowed the buffer."
-msgstr "Gorlifodd ateb y byffer."
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Pure virtual packages: "
+msgstr "  Pecynnau Cwbl Rhithwir: "

 
 

-#: methods/ftp.cc:377 methods/ftp.cc:389
-msgid "Protocol corruption"
-msgstr "Llygr protocol"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Single virtual packages: "
+msgstr "  Pecynnau Rhithwir Sengl: "

 
 

-#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:872
-#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607
-#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614
-#: apt-pkg/contrib/fileutl.cc:1639
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Mixed virtual packages: "
+msgstr "  Pecynnau Rhithwir Cymysg: "

 
 

-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
-msgid "Could not create a socket"
-msgstr "Methwyd creu soced"
+#: cmdline/apt-cache.cc
+msgid "  Missing: "
+msgstr "  Ar Goll: "

 
 

-#: methods/ftp.cc:712
-msgid "Could not connect data socket, connection timed out"
-msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total distinct versions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "

 
 

-#: methods/ftp.cc:716 methods/connect.cc:116
-msgid "Failed"
-msgstr "Methwyd"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total distinct descriptions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "

 
 

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

 #, fuzzy
 #, fuzzy

-msgid "Could not connect passive socket."
-msgstr "Methwyd cysylltu soced goddefol"
+msgid "Total dependencies: "
+msgstr "Cyfanswm Dibyniaethau: "

 
 

-# FIXME
-#: methods/ftp.cc:735
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Methodd getaddrinfo gael soced gwrando"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total ver/file relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "

 
 

-#: methods/ftp.cc:749
-msgid "Could not bind a socket"
-msgstr "Methwyd rhwymo soced"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "

 
 

-#: methods/ftp.cc:753
-msgid "Could not listen on the socket"
-msgstr "Methwyd gwrando ar y soced"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total Provides mappings: "
+msgstr "Cyfanswm Mapiau Darpariath: "

 
 

-#: methods/ftp.cc:760
-msgid "Could not determine the socket's name"
-msgstr "Methwyd canfod enw'r soced"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total globbed strings: "
+msgstr "Cyfanswm Llinynau Glob: "

 
 

-#: methods/ftp.cc:792
-msgid "Unable to send PORT command"
-msgstr "Methwyd danfod gorchymyn PORT"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total slack space: "
+msgstr "Cyfanswm gofod Slac: "

 
 

-#: methods/ftp.cc:802
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+#: 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 ""

 
 

-#: methods/ftp.cc:811
+#: cmdline/apt-cache.cc apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "EPRT failed, server said: %s"
-msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+msgid "Unable to locate package %s"
+msgstr "Ni ellir lleoli'r pecyn %s"

 
 

-#: methods/ftp.cc:831
-msgid "Data socket connect timed out"
-msgstr "Goramserodd cysylltiad y soced data"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Package files:"
+msgstr "Ffeiliau Pecynnau:"

 
 

-#: methods/ftp.cc:838
-msgid "Unable to accept connection"
-msgstr "Methwyd derbyn cysylltiad"
+#: cmdline/apt-cache.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"

 
 

-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
-msgid "Problem hashing file"
-msgstr "Problem wrth stwnshio ffeil"
+#. Show any packages have explicit pins
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Pinned packages:"
+msgstr "Pecynnau wedi eu Pinio:"

 
 

-#: methods/ftp.cc:890
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
-
-#: methods/ftp.cc:905 methods/rsh.cc:335
-msgid "Data socket timed out"
-msgstr "Goramserodd soced data"
-
-#: methods/ftp.cc:935
-#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
-
-#. Get the files information
-#: methods/ftp.cc:1014
-msgid "Query"
-msgstr "Ymholiad"
-
-# FIXME
-#: methods/ftp.cc:1128
-msgid "Unable to invoke "
-msgstr "Methwyd gweithredu "
-
-#: methods/connect.cc:76
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
-
-#: methods/connect.cc:87
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
-
-#: methods/connect.cc:94
-#, 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:100
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
-
-#: methods/connect.cc:108
-#, 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:126
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "Methwyd cysylltu i %s:%s (%s)."
+#: cmdline/apt-cache.cc
+msgid "(not found)"
+msgstr "(heb ganfod)"

 
 

-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:439
+#. Print the package name and the version we are forcing to
+#: cmdline/apt-cache.cc

 #, c-format
 #, c-format

-msgid "Connecting to %s"
-msgstr "Yn cysylltu i %s"
+msgid "%s -> %s with priority %d\n"
+msgstr ""

 
 

-#: methods/connect.cc:180 methods/connect.cc:199
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Methwyd datrys '%s'"
+#: cmdline/apt-cache.cc
+msgid "  Installed: "
+msgstr "  Wedi Sefydlu: "

 
 

-#: methods/connect.cc:205
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr "Methiant dros dro yn datrys '%s'"
+#: cmdline/apt-cache.cc
+msgid "  Candidate: "
+msgstr "  Ymgeisydd: "

 
 

-#: methods/connect.cc:209
-#, fuzzy, c-format
-msgid "System error resolving '%s:%s'"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+#: cmdline/apt-cache.cc
+msgid "(none)"
+msgstr "(dim)"

 
 

-#: methods/connect.cc:211
-#, fuzzy, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Package pin: "
+msgstr "  Pin Pecyn: "

 
 

-#: methods/connect.cc:258
-#, fuzzy, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "Methwyd cysylltu i %s %s:"
+#. Show the priority tables
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Version table:"
+msgstr "  Tabl Fersiynnau:"

 
 

-#: methods/gpgv.cc:168
+#: cmdline/apt-cache.cc
+#, fuzzy

 msgid ""
 msgid ""

-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
-
-#: methods/gpgv.cc:172
-msgid "At least one invalid signature was encountered."
-msgstr ""
-
-#: methods/gpgv.cc:174
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+"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 ""
 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"

 
 

-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
-#, c-format
+#: cmdline/apt.cc

 msgid ""
 msgid ""

-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
+"Usage: apt [options] command\n"
+"\n"
+"CLI for apt.\n"
+"Basic commands: \n"
+" list - list packages based on package names\n"
+" search - search in package descriptions\n"
+" show - show package details\n"
+"\n"
+" update - update list of available packages\n"
+"\n"
+" install - install packages\n"
+" remove  - remove packages\n"
+" autoremove - Remove automatically all unused packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+" full-upgrade - upgrade the system by removing/installing/upgrading "
+"packages\n"
+"\n"
+" edit-sources - edit the source information file\n"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:184
-msgid "Unknown error executing gpgv"
+#: cmdline/apt-cdrom.cc
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: cmdline/apt-cdrom.cc

 #, fuzzy
 #, fuzzy

-msgid "The following signatures were invalid:\n"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+msgid "Please insert a Disc in the drive and press [Enter]"
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"

 
 

-#: methods/gpgv.cc:231
+#: 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 ""
 msgid ""

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

-#: methods/gzip.cc:69
-msgid "Empty files can't be valid archives"
+#: cmdline/apt-cdrom.cc
+msgid "Repeat this process for the rest of the CDs in your set."

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:509
-msgid "Error writing to the file"
-msgstr "Gwall wrth ysgrifennu at y ffeil"
+#: cmdline/apt-config.cc
+msgid "Arguments not in pairs"
+msgstr "Nid yw ymresymiadau mewn parau"

 
 

-#: methods/http.cc:523
+#: cmdline/apt-config.cc

 #, fuzzy
 #, fuzzy

-msgid "Error reading from server. Remote end closed connection"
-msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-
-#: methods/http.cc:525
-msgid "Error reading from server"
-msgstr "Gwall wrth ddarllen o'r gweinydd"
-
-#: methods/http.cc:561
-msgid "Error writing to file"
-msgstr "Gwall wrth ysgrifennu at ffeil"
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is a simple tool to read the APT config file\n"
+"\n"
+"Commands:\n"
+"   shell - Shell mode\n"
+"   dump - Show the configuration\n"
+"\n"
+"Options:\n"
+"  -h   This help text.\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-config [opsiynnau] gorchymyn\n"
+"\n"
+"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"
+"\n"
+"Gorchmynion:\n"
+"   shell - Modd plisgyn\n"
+"   dump - Dangod y cyfluniad\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -c=? Darllen y ffeil cyfluniad\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"

 
 

-#: methods/http.cc:621
-msgid "Select failed"
-msgstr "Methwyd dewis"
+#: cmdline/apt-get.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: methods/http.cc:626
-msgid "Connection timed out"
-msgstr "Goramserodd y cysylltiad"
+#: cmdline/apt-get.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: methods/http.cc:649
-msgid "Error writing to output file"
-msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+#: cmdline/apt-get.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: methods/server.cc:51
-msgid "Waiting for headers"
-msgstr "Yn aros am benawdau"
+#: cmdline/apt-get.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"

 
 

-#: methods/server.cc:109
-msgid "Bad header line"
-msgstr "Llinell pennawd gwael"
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr ""

 
 

-#: methods/server.cc:134 methods/server.cc:141
-#, fuzzy
-msgid "The HTTP server sent an invalid reply header"
-msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Methwyd canfod pecyn %s"

 
 

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

 
 

-#: methods/server.cc:194
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+msgstr ""

 
 

-#: methods/server.cc:196
+#: cmdline/apt-get.cc

 #, fuzzy
 #, fuzzy

-msgid "This HTTP server has broken range support"
-msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-
-#: methods/server.cc:220
-msgid "Unknown date format"
-msgstr "Fformat dyddiad anhysbys"
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"

 
 

-#: methods/server.cc:489
-#, fuzzy
-msgid "Bad header data"
-msgstr "Data pennawd gwael"
+#: cmdline/apt-get.cc
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"

 
 

-#: methods/server.cc:506 methods/server.cc:562
-msgid "Connection failed"
-msgstr "Methodd y cysylltiad"
+#: cmdline/apt-get.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"

 
 

-#: methods/server.cc:654
-msgid "Internal error"
-msgstr "Gwall mewnol"
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"

 
 

-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
-msgid "Sorting"
+#: cmdline/apt-get.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:82
-msgid "Internal error, InstallPackages was called with broken packages!"
+#: cmdline/apt-get.cc
+#, c-format
+msgid ""
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:91
-#, 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:110
-#, fuzzy
-msgid "Internal error, Ordering didn't finish"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-
-#: apt-private/private-install.cc:148
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
+#: cmdline/apt-get.cc
+#, 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
 
 #. 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:155
+#: cmdline/apt-get.cc

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
+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
 
 #. 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:160
+#: cmdline/apt-get.cc

 #, c-format
 #, c-format

-msgid "Need to get %sB of archives.\n"
-msgstr "Mae angen cyrchu %sB o archifau.\n"
+msgid "Need to get %sB of source archives.\n"
+msgstr "Rhaid cyrchu %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-install.cc:167
+#: cmdline/apt-get.cc

 #, fuzzy, c-format
 #, 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"
+msgid "Fetch source %s\n"
+msgstr "Cyrchu Ffynhonell %s\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-install.cc:172
+#: cmdline/apt-get.cc
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."
+
+#: cmdline/apt-get.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"
+
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Build command '%s' failed.\n"
+msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+
+#: cmdline/apt-get.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"
+
+#: cmdline/apt-get.cc
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.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 "Note, using file '%s' to get the build dependencies\n"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"

 
 

-#: apt-private/private-install.cc:200
+#: cmdline/apt-get.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 "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"

 
 

-#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+#: cmdline/apt-get.cc
+#, c-format
+msgid "%s has no build depends.\n"
+msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"

 
 

-#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
+#: cmdline/apt-get.cc
+#, fuzzy, c-format
+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"

 
 

-#. 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:220
-msgid "Yes, do as I say!"
-msgstr "Ie, gwna fel rydw i'n dweud!"
+#: cmdline/apt-get.cc
+#, 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"
+
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
+"newydd"
+
+#: cmdline/apt-get.cc
+#, fuzzy, c-format
+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-private/private-install.cc:222
+#: cmdline/apt-get.cc

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

-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"

 msgstr ""
 msgstr ""

-"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
-"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
-" ?]"
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"

 
 

-#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
-msgid "Abort."
-msgstr "Erthylu."
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"

 
 

-#: apt-private/private-install.cc:243
-msgid "Do you want to continue?"
-msgstr "Ydych chi eisiau mynd ymlaen?"
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."

 
 

-#: apt-private/private-install.cc:313
-msgid "Some files failed to download"
-msgstr "Methodd rhai ffeiliau lawrlwytho"
+#: cmdline/apt-get.cc
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
+
+#: cmdline/apt-get.cc
+#, fuzzy
+msgid "Supported modules:"
+msgstr "Modylau a Gynhelir:"

 
 

-#: apt-private/private-install.cc:320
+# FIXME: split
+#: cmdline/apt-get.cc
+#, fuzzy

 msgid ""
 msgid ""

-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+"   update - Retrieve new lists of packages\n"
+"   upgrade - Perform an upgrade\n"
+"   install - Install new packages (pkg is libc6 not libc6.deb)\n"
+"   remove - Remove packages\n"
+"   autoremove - Remove automatically all unused packages\n"
+"   purge - Remove packages and config files\n"
+"   source - Download source archives\n"
+"   build-dep - Configure build-dependencies for source packages\n"
+"   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+"   dselect-upgrade - Follow dselect selections\n"
+"   clean - Erase downloaded archive files\n"
+"   autoclean - Erase old downloaded archive files\n"
+"   check - Verify that there are no broken dependencies\n"
+"   changelog - Download and display the changelog for the given package\n"
+"   download - Download the binary package into the current directory\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -d  Download only - do NOT install or unpack archives\n"
+"  -s  No-act. Perform ordering simulation\n"
+"  -y  Assume Yes to all queries and do not prompt\n"
+"  -f  Attempt to correct a system with broken dependencies in place\n"
+"  -m  Attempt to continue if archives are unlocatable\n"
+"  -u  Show a list of upgraded packages as well\n"
+"  -b  Build the source package after fetching it\n"
+"  -V  Show verbose version numbers\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-private/private-install.cc:329
-msgid "Unable to correct missing packages."
-msgstr "Ni ellir cywiro pecynnau ar goll."
+#: cmdline/apt-helper.cc
+msgid "Need one URL as argument"
+msgstr ""

 
 

-#: apt-private/private-install.cc:330
+#: cmdline/apt-helper.cc

 #, fuzzy
 #, fuzzy

-msgid "Aborting install."
-msgstr "Yn Erthylu'r Sefydliad."
-
-#: apt-private/private-install.cc:366
-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] ""
+msgid "Must specify at least one pair url/filename"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"

 
 

-#: apt-private/private-install.cc:370
-msgid "Note: This is done automatically and on purpose by dpkg."
+#: cmdline/apt-helper.cc
+msgid "Download Failed"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:391
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
+#: cmdline/apt-helper.cc
+#, c-format
+msgid "GetSrvRec failed for %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:499
+#: cmdline/apt-helper.cc

 msgid ""
 msgid ""

-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"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 ""
 
 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:502 apt-private/private-install.cc:653
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+#: cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "%s can not be marked as it is not installed.\n"
+msgstr "ond nid yw wedi ei sefydlu"

 
 

-#: apt-private/private-install.cc:506
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+#: cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "%s was already set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-private/private-install.cc:513
-#, 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:"
+#: cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "%s was already set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-private/private-install.cc:517
+#: cmdline/apt-mark.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 "%s was already set on hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: apt-private/private-install.cc:519
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+#: cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "%s was already not hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"

 
 

-#: apt-private/private-install.cc:612
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
+#: cmdline/apt-mark.cc apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"

 
 

-# FIXME
-#: apt-private/private-install.cc:614
+#: cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "%s set on hold.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "Canceled hold on %s.\n"
+msgstr "Methwyd agor %s"
+
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+
+#: cmdline/apt-mark.cc

 msgid ""
 msgid ""

-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also list marks.\n"
+"\n"
+"Commands:\n"
+"   auto - Mark the given packages as automatically installed\n"
+"   manual - Mark the given packages as manually installed\n"
+"   hold - Mark a package as held back\n"
+"   unhold - Unset a package set as held back\n"
+"   showauto - Print the list of automatically installed packages\n"
+"   showmanual - Print the list of manually installed packages\n"
+"   showhold - Print the list of package on hold\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -s  No-act. Just prints what would be done.\n"
+"  -f  read/write auto/manual marking in the given file\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-mark(8) and apt.conf(5) manual pages for more information."

 msgstr ""
 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:638
+#: 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 ""
 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."
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"

 msgstr ""
 msgstr ""

-"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."
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."

 
 

-#: apt-private/private-install.cc:659
-msgid "Broken packages"
-msgstr "Pecynnau wedi torri"
+#: methods/cdrom.cc
+#, fuzzy
+msgid "Wrong CD-ROM"
+msgstr "CD Anghywir"

 
 

-#: apt-private/private-install.cc:712
-msgid "The following extra packages will be installed:"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+#: methods/cdrom.cc
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr ""
+"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."

 
 

-#: apt-private/private-install.cc:802
-msgid "Suggested packages:"
-msgstr "Pecynnau a awgrymmir:"
+#: methods/cdrom.cc
+#, fuzzy
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"

 
 

-#: apt-private/private-install.cc:803
-msgid "Recommended packages:"
-msgstr "Pecynnau a argymhellir:"
+#: methods/cdrom.cc methods/file.cc methods/rsh.cc
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"

 
 

-#: apt-private/private-install.cc:825
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-
-#: apt-private/private-install.cc:829
-#, 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 "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"

 
 

-#: apt-private/private-install.cc:841
+#: methods/connect.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 "[IP: %s %s]"
+msgstr "[IP: %s %s]"

 
 

-#: apt-private/private-install.cc:846
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "%s is already the newest version.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-
-#: apt-private/private-install.cc:894
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+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)"

 
 

-#: apt-private/private-install.cc:899
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+#: methods/connect.cc
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."

 
 

-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:941
-#, 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"
+#: 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"

 
 

-#: apt-private/private-install.cc:947
-#, 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"
+#: methods/connect.cc methods/ftp.cc methods/rsh.cc
+msgid "Failed"
+msgstr "Methwyd"

 
 

-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."

 
 

-#: apt-private/private-list.cc:164
+#. 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
 #, 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] ""
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"

 
 

-#: apt-private/private-cachefile.cc:93
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
+#: methods/connect.cc
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"

 
 

-#: apt-private/private-cachefile.cc:96
-msgid " failed."
-msgstr " wedi methu."
+#: methods/connect.cc
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"

 
 

-#: apt-private/private-cachefile.cc:99
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
+#: methods/connect.cc
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"

 
 

-#: apt-private/private-cachefile.cc:102
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
+#: methods/connect.cc
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"

 
 

-#: apt-private/private-cachefile.cc:104
-msgid " Done"
-msgstr " Wedi Gorffen"
+#: methods/connect.cc
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Methwyd cysylltu i %s %s:"

 
 

-#: apt-private/private-cachefile.cc:108
-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."
+#: methods/copy.cc methods/gzip.cc methods/rred.cc
+msgid "Failed to stat"
+msgstr "Methwyd stat()"

 
 

-#: apt-private/private-cachefile.cc:111
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+#: methods/copy.cc methods/gzip.cc methods/rred.cc
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"

 
 

-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
+#: methods/file.cc
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""

 
 

-#: apt-private/private-output.cc:234
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sefydliwyd]"
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc
+msgid "Logging in"
+msgstr "Yn mewngofnodi"

 
 

-#: apt-private/private-output.cc:238
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sefydliwyd]"
+#: methods/ftp.cc
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"

 
 

-#: apt-private/private-output.cc:241
-msgid "[installed,auto-removable]"
-msgstr ""
+#: methods/ftp.cc
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"

 
 

-#: apt-private/private-output.cc:243
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sefydliwyd]"
+#: methods/ftp.cc
+#, fuzzy, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"

 
 

-#: apt-private/private-output.cc:245
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sefydliwyd]"
+#: methods/ftp.cc
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"

 
 

-#: apt-private/private-output.cc:249
+#: methods/ftp.cc

 #, c-format
 #, c-format

-msgid "[upgradable from: %s]"
-msgstr ""
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"

 
 

-#: apt-private/private-output.cc:253
-msgid "[residual-config]"
+#: methods/ftp.cc
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."

 msgstr ""
 msgstr ""

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

 
 

-#: apt-private/private-output.cc:435
+# FIXME
+#: methods/ftp.cc

 #, c-format
 #, c-format

-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"

 
 

-#: apt-private/private-output.cc:437
+#: methods/ftp.cc

 #, c-format
 #, c-format

-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:444
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
-
-#: apt-private/private-output.cc:446
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"

 
 

-#: apt-private/private-output.cc:449
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
+#: methods/ftp.cc methods/rsh.cc
+msgid "Connection timeout"
+msgstr "Goramser cysylltu"

 
 

-#: apt-private/private-output.cc:449
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
+#: methods/ftp.cc
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"

 
 

-#: apt-private/private-output.cc:454
-msgid " or"
-msgstr " neu"
+#: methods/ftp.cc methods/rsh.cc apt-pkg/contrib/fileutl.cc
+msgid "Read error"
+msgstr "Gwall darllen"

 
 

-#: apt-private/private-output.cc:468 apt-private/private-output.cc:480
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+#: methods/ftp.cc methods/rsh.cc
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."

 
 

-#: apt-private/private-output.cc:503
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+#: methods/ftp.cc
+msgid "Protocol corruption"
+msgstr "Llygr protocol"

 
 

-#: apt-private/private-output.cc:529
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+#: methods/ftp.cc methods/rsh.cc apt-pkg/contrib/fileutl.cc
+msgid "Write error"
+msgstr "Gwall ysgrifennu"

 
 

-#: apt-private/private-output.cc:551
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+#: methods/ftp.cc
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"

 
 

-#: apt-private/private-output.cc:572
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+#: methods/ftp.cc
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"

 
 

-#: apt-private/private-output.cc:593
+#: methods/ftp.cc

 #, fuzzy
 #, fuzzy

-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-
-#: apt-private/private-output.cc:613
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-
-#: apt-private/private-output.cc:668
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
+msgid "Could not connect passive socket."
+msgstr "Methwyd cysylltu soced goddefol"

 
 

-#: apt-private/private-output.cc:676
-#, 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!"
+# FIXME
+#: methods/ftp.cc
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"

 
 

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

 
 

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

 
 

-#: apt-private/private-output.cc:713
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
+#: methods/ftp.cc
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"

 
 

-#: apt-private/private-output.cc:715
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+#: methods/ftp.cc
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"

 
 

-#: apt-private/private-output.cc:719
+#: methods/ftp.cc

 #, c-format
 #, 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:741
-msgid "[Y/n]"
-msgstr ""
+msgid "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"

 
 

-#. 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:747
-msgid "[y/N]"
-msgstr ""
+#: methods/ftp.cc
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"

 
 

-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:758
-msgid "Y"
-msgstr "I"
+#: methods/ftp.cc
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"

 
 

-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:764
-msgid "N"
-msgstr ""
+#: methods/ftp.cc
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"
+
+#: methods/ftp.cc methods/rsh.cc methods/server.cc
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"

 
 

-#: apt-private/private-output.cc:786 apt-pkg/cachefilter.cc:35
+#: methods/ftp.cc

 #, c-format
 #, c-format

-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"

 
 

-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+#: methods/ftp.cc methods/rsh.cc
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"

 
 

-#: apt-private/private-update.cc:90
+#: methods/ftp.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] ""
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"

 
 

-#: apt-private/private-update.cc:94
-msgid "All packages are up to date."
-msgstr ""
+#. Get the files information
+#: methods/ftp.cc
+msgid "Query"
+msgstr "Ymholiad"

 
 

-#: apt-private/private-show.cc:156
-#, 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] ""
+# FIXME
+#: methods/ftp.cc
+msgid "Unable to invoke "
+msgstr "Methwyd gweithredu "

 
 

-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
+#: methods/gpgv.cc
+msgid "At least one invalid signature was encountered."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-main.cc:32
+#: methods/gpgv.cc

 msgid ""
 msgid ""

-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
-msgstr ""
-
-#: apt-private/private-download.cc:36
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-
-#: apt-private/private-download.cc:40
-msgid "Authentication warning overridden.\n"
+"Internal error: Good signature, but could not determine key fingerprint?!"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:45 apt-private/private-download.cc:52
-#, fuzzy
-msgid "Some packages could not be authenticated"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-
-#: apt-private/private-download.cc:50
-msgid "Install these packages without verification?"
+#: methods/gpgv.cc
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:91 apt-pkg/update.cc:77
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Methwyd cyrchu %s  %s\n"
-
-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Methwyd ailenwi %s at %s"
-
-#: apt-private/private-sources.cc:70
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Your '%s' file changed, please run 'apt-get update'."
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
+#: methods/gpgv.cc
+msgid "Unknown error executing apt-key"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-upgrade.cc:25
+#: methods/gpgv.cc

 #, fuzzy
 #, fuzzy

-msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"

 
 

-#: apt-private/private-upgrade.cc:28
-msgid "Done"
-msgstr "Wedi Gorffen"
+#: methods/gpgv.cc
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""

 
 

-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Presennol "
+#: methods/gzip.cc
+msgid "Empty files can't be valid archives"
+msgstr ""

 
 

-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Cyrchu:"
+#: methods/http.cc
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"

 
 

-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Anwybyddu "
+#: methods/http.cc
+#, fuzzy
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"

 
 

-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Gwall "
+#: methods/http.cc
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"

 
 

-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
+#: methods/http.cc
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"

 
 

-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
-msgstr " [Gweithio]"
+#: methods/http.cc
+msgid "Select failed"
+msgstr "Methwyd dewis"

 
 

-#: 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"
+#: methods/http.cc
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"
+
+#: methods/http.cc
+msgid "Error writing to output file"
+msgstr "Gwall wrth ysgrifennu i ffeil allbwn"

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

-#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103
-#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481
-#: apt-pkg/contrib/cdromutl.cc:205
+#: methods/mirror.cc apt-inst/extract.cc apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/contrib/cdromutl.cc apt-pkg/contrib/fileutl.cc apt-pkg/init.cc
+#: apt-pkg/policy.cc apt-pkg/sourcelist.cc

 #, c-format
 msgid "Unable to read %s"
 msgstr "Ni ellir darllen %s"
 
 #, 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:500
-#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201
-#: apt-pkg/contrib/cdromutl.cc:235
+#: methods/mirror.cc apt-pkg/acquire.cc apt-pkg/clean.cc
+#: apt-pkg/contrib/cdromutl.cc

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

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

 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
 #, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
 msgstr "Methwyd agor ffeil %s"
 

-#: methods/mirror.cc:315
+#: methods/mirror.cc

 #, fuzzy, c-format
 msgid "No entry found in mirror file '%s'"
 msgstr "Methwyd agor ffeil %s"
 
 #, fuzzy, c-format
 msgid "No entry found in mirror file '%s'"
 msgstr "Methwyd agor ffeil %s"
 

-#: methods/mirror.cc:445
+#: methods/mirror.cc

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

-#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
+#: methods/rsh.cc ftparchive/multicompress.cc

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

-#: methods/rsh.cc:343
+#: methods/rsh.cc

 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 

+#: methods/server.cc
+msgid "Waiting for headers"
+msgstr "Yn aros am benawdau"
+
+#: methods/server.cc
+msgid "Bad header line"
+msgstr "Llinell pennawd gwael"
+
+#: methods/server.cc
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+
+#: methods/server.cc
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+
+#: methods/server.cc
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+
+#: methods/server.cc
+#, fuzzy
+msgid "This HTTP server has broken range support"
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+
+#: methods/server.cc
+msgid "Unknown date format"
+msgstr "Fformat dyddiad anhysbys"
+
+#: methods/server.cc
+#, fuzzy
+msgid "Bad header data"
+msgstr "Data pennawd gwael"
+
+#: methods/server.cc
+msgid "Connection failed"
+msgstr "Methodd y cysylltiad"
+
+#: methods/server.cc
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
+msgstr ""
+
+#: methods/server.cc
+msgid "Internal error"
+msgstr "Gwall mewnol"
+

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

-msgid "Press enter to continue."
+#, fuzzy
+msgid "Press [Enter] to continue."

 msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
 
 #: dselect/install:92
 msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
 
 #: dselect/install:92


@@ -1823,713 +1914,758 @@ msgstr ""
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
 msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
-
-#: apt-inst/filelist.cc:464
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc

 #, fuzzy
 #, fuzzy

-msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
-
-# FIXME: "the"
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
-
-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ffeil cyfluniad dyblyg %s/%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"
-
-#: apt-inst/extract.cc:132
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "Yn dadbacio %s mwy nag unwaith"
-
-#: apt-inst/extract.cc:142
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-
-#: 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"
-
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
-
-#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:182
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
-
-#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
-
-#: apt-inst/extract.cc:249
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -t   Set the temp dir\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 msgstr ""

-"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
-
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
-
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Mae'r llwybr yn rhy hir"
-
-# FIXME: wtf?
-#: apt-inst/extract.cc:421
-#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
-
-#: 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"
-
-#: apt-inst/extract.cc:498
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Ni ellir gwneud stat() o %s"
-
-#: 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"
+"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-inst/dirstream.cc:105
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
+#: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni ellir gwneud stat() o %s"

 
 

-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.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 "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"

 
 

-#: apt-inst/deb/debfile.cc:132
-#, fuzzy, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+#: cmdline/apt-extracttemplates.cc
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"

 
 

-#: apt-inst/deb/debfile.cc:227
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc

 #, fuzzy
 #, fuzzy

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

 
 

-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
+#: cmdline/apt-sortpkgs.cc
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"

 
 

-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
+#: cmdline/apt-sortpkgs.cc
+#, fuzzy
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+"  -h   This help text\n"
+"  -s   Use source file sorting\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
+"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -s   Defnyddio trefnu ffeil ffynhonell\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"

 
 

-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
+#: ftparchive/apt-ftparchive.cc
+msgid "Package extension list is too long"
+msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."

 
 

-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
+#: ftparchive/apt-ftparchive.cc
+#, fuzzy, c-format
+msgid "Error processing directory %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"

 
 

-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
+#: ftparchive/apt-ftparchive.cc
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"

 
 

-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
+#: ftparchive/apt-ftparchive.cc
+msgid "Error writing header to contents file"
+msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"

 
 

-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
+#: ftparchive/apt-ftparchive.cc
+#, fuzzy, c-format
+msgid "Error processing contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"

 
 

-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip"
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc
+#, fuzzy
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+"          sources srcpath [overridefile [pathprefix]]\n"
+"          contents path\n"
+"          release path\n"
+"          generate config [groups]\n"
+"          clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+"  -h    This help text\n"
+"  --md5 Control MD5 generation\n"
+"  -s=?  Source override file\n"
+"  -q    Quiet\n"
+"  -d=?  Select the optional caching database\n"
+"  --no-delink Enable delinking debug mode\n"
+"  --contents  Control contents file generation\n"
+"  -c=?  Read this configuration file\n"
+"  -o=?  Set an arbitrary configuration option"
+msgstr ""
+"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
+"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             contents llwybr\n"
+"             release llwybr\n"
+"             generate cyfluniad [grŵpiau]\n"
+"             clean cyfluniad\n"
+"\n"
+"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
+"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
+"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
+"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
+"gorfodi'r gwerthoedd Priority a Section.\n"
+"\n"
+"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
+".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
+"gwrthwneud ffynhonell.\n"
+"\n"
+"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
+"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
+"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
+"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
+"defnydd o'r archif Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opsiynnau:\n"
+"  -h          Y testun cymorth hwn\n"
+"  --md5       Rheoli cynhyrchiad stwnch MD5\n"
+"  -s=?        Ffeil gwrthwneud ffynhonell\n"
+"  -q          Tawel\n"
+"  -d=?        Dewis cronda data storfa opsiynnol\n"
+"  --no-delink Galluogi'r modd datgysylltu datnamu\n"
+"  --contents  Rheoli cynhyrchiad ffeil cynnwys\n"
+"  -c=?        Darllen y ffeil cyfluniad hwn\n"
+"  -o=?        Gosod opsiwn cyfluniad mympwyol"

 
 

-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
+#: ftparchive/apt-ftparchive.cc
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"

 
 

-#: apt-inst/contrib/extracttar.cc:203
-#, fuzzy
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Methodd swm gwirio Tar, archif llygredig"
+#: 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'"

 
 

-#: apt-inst/contrib/extracttar.cc:308
+#: ftparchive/cachedb.cc

 #, c-format
 #, c-format

-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"

 
 

-#: apt-pkg/install-progress.cc:57
+#: ftparchive/cachedb.cc

 #, c-format
 #, c-format

-msgid "Progress: [%3i%%]"
-msgstr ""
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Hen gronfa data, yn ceisio uwchraddio %s"

 
 

-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+#: 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 ""
 
 msgstr ""
 

-#: apt-pkg/init.cc:146
+#: ftparchive/cachedb.cc

 #, c-format
 #, c-format

-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"
+
+#: ftparchive/cachedb.cc apt-inst/extract.cc
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"

 
 

-#: apt-pkg/init.cc:162
+#: ftparchive/cachedb.cc

 #, fuzzy
 #, fuzzy

-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
+msgid "Failed to read .dsc"
+msgstr "Methwyd darllen y cyswllt %s"

 
 

-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
+#: ftparchive/cachedb.cc
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"

 
 

-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+#: ftparchive/cachedb.cc
+msgid "Unable to get a cursor"
+msgstr "Ni ellir cael cyrchydd"

 
 

-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+#: ftparchive/contents.cc
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"

 
 

-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
+#: ftparchive/multicompress.cc
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"

 
 

-#: apt-pkg/indexcopy.cc:515
+#: ftparchive/multicompress.cc

 #, c-format
 #, c-format

-msgid "Can't find authentication record for: %s"
-msgstr ""
+msgid "Compressed output %s needs a compression set"
+msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+
+#: ftparchive/multicompress.cc
+msgid "Failed to fork"
+msgstr "Methodd fork()"
+
+#: ftparchive/multicompress.cc
+#, fuzzy
+msgid "Compress child"
+msgstr "Plentyn Cywasgu"

 
 

-#: apt-pkg/indexcopy.cc:521
+#: ftparchive/multicompress.cc

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

-msgid "Hash mismatch for: %s"
-msgstr "Camgyfatebiaeth swm MD5"
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"

 
 

-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
+#: ftparchive/multicompress.cc
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"

 
 

-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
-msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
+#: ftparchive/multicompress.cc
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"

 
 

-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
+#: ftparchive/multicompress.cc
+#, c-format
+msgid "Problem unlinking %s"
+msgstr "Gwall wrth datgysylltu %s"
+
+#: ftparchive/multicompress.cc apt-inst/extract.cc
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"

 
 

-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Storfa pecyn gwag"
+#: ftparchive/override.cc
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"

 
 

-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+#. 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"

 
 

-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+#: ftparchive/override.cc
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"

 
 

-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+#: ftparchive/override.cc
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"

 
 

-# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:174
+#: ftparchive/override.cc

 #, fuzzy, c-format
 #, 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'"
+msgid "Malformed override %s line %llu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"

 
 

-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
+#: ftparchive/override.cc
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"

 
 

-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Dibynnu"
+#: ftparchive/writer.cc
+#, c-format
+msgid "W: Unable to read directory %s\n"
+msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"

 
 

-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "CynDdibynnu"
+#: ftparchive/writer.cc
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "Rh: Ni ellir gwneud stat() o %s\n"

 
 

-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Awgrymu"
+#: ftparchive/writer.cc
+msgid "E: "
+msgstr "G: "

 
 

-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Argymell"
+#: ftparchive/writer.cc
+msgid "W: "
+msgstr "Rh: "

 
 

-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Gwrthdaro"
+#: ftparchive/writer.cc
+msgid "E: Errors apply to file "
+msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "

 
 

-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Amnewid"
+#: ftparchive/writer.cc
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Methwyd datrys %s"

 
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Darfodi"
+#: ftparchive/writer.cc
+msgid "Tree walking failed"
+msgstr "Methwyd cerdded y goeden"

 
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
+#: ftparchive/writer.cc
+#, c-format
+msgid "Failed to open %s"
+msgstr "Methwyd agor %s"

 
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
-msgstr ""
+# FIXME
+#: ftparchive/writer.cc
+#, c-format
+msgid " DeLink %s [%s]\n"
+msgstr " DatGysylltu %s [%s]\n"

 
 

-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "pwysig"
+#: ftparchive/writer.cc
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"

 
 

-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "angenrheidiol"
+#: ftparchive/writer.cc
+#, c-format
+msgid "Failed to unlink %s"
+msgstr "Methwyd datgysylltu %s"

 
 

-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "safonnol"
+#: ftparchive/writer.cc
+#, c-format
+msgid "*** Failed to link %s to %s"
+msgstr "*** Methwyd cysylltu %s at %s"

 
 

-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "opsiynnol"
+#: ftparchive/writer.cc
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr "  Tarwyd y terfyn cyswllt %sB.\n"

 
 

-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "ychwanegol"
+#: ftparchive/writer.cc
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"

 
 

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

 #, c-format
 #, c-format

-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
+msgid "  %s has no override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

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

 #, c-format
 #, c-format

-msgid "Is the package %s installed?"
-msgstr ""
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Cynaliwr %s yw %s nid %s\n"

 
 

-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
+#: ftparchive/writer.cc
+#, fuzzy, c-format
+msgid "  %s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

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

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

-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
+msgid "  %s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"

 
 

-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+#: apt-inst/contrib/arfile.cc
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"

 
 

-#: apt-pkg/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-inst/contrib/arfile.cc
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"

 
 

-#: apt-pkg/depcache.cc:168
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"

 
 

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

 
 

-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: apt-inst/contrib/arfile.cc
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"

 
 

-#: apt-pkg/depcache.cc:256
+#: apt-inst/contrib/extracttar.cc

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

-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "Cannot find a configured compressor for '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
+#: apt-inst/contrib/extracttar.cc
+msgid "Corrupted archive"
+msgstr "Archif llygredig"

 
 

-#: apt-pkg/acquire-item.cc:163
+#: apt-inst/contrib/extracttar.cc

 #, fuzzy
 #, fuzzy

-msgid "Hash Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
-
-#: apt-pkg/acquire-item.cc:168
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"

 
 

-#: apt-pkg/acquire-item.cc:173
-#, fuzzy
-msgid "Invalid file format"
-msgstr "Gweithred annilys %s"
+#: apt-inst/contrib/extracttar.cc
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"

 
 

-#: apt-pkg/acquire-item.cc:1573
+#: apt-inst/deb/debfile.cc

 #, c-format
 #, c-format

-msgid ""
-"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
-"or malformed file)"
-msgstr ""
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"

 
 

-# FIXME: number?
-#: apt-pkg/acquire-item.cc:1589
+#: apt-inst/deb/debfile.cc

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

-msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/acquire-item.cc:1631
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"

 
 

-#: apt-pkg/acquire-item.cc:1669
-#, c-format
-msgid ""
-"Release file for %s is expired (invalid since %s). Updates for this "
-"repository will not be applied."
-msgstr ""
+#: apt-inst/deb/debfile.cc
+#, fuzzy
+msgid "Unparsable control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"

 
 

-#: apt-pkg/acquire-item.cc:1691
-#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+#: apt-inst/dirstream.cc
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"

 
 

-#: apt-pkg/acquire-item.cc:1721
+#: apt-inst/dirstream.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\n"
-msgstr ""
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"

 
 

-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "GPG error: %s: %s"
-msgstr ""
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"

 
 

-# FIXME: case
-#: apt-pkg/acquire-item.cc:1859
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-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.)"
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"

 
 

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

 #, c-format
 #, c-format

-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"

 
 

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

 #, c-format
 #, c-format

-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
-msgstr ""
-"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"

 
 

-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
-#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+#: apt-inst/extract.cc
+msgid "The diversion path is too long"
+msgstr "Mae llwybr y dargyfeiriad yn rhy hir"

 
 

-#: apt-pkg/clean.cc:64
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgid "The directory %s is being replaced by a non-directory"

 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."
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"

 
 

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

 
 

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

 
 

-#: apt-pkg/pkgcachegen.cc:576
+# FIXME: wtf?
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+msgid "Overwrite package match with no version for %s"
+msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"

 
 

-#: apt-pkg/pkgcachegen.cc:1211
+#: apt-inst/extract.cc

 #, c-format
 #, c-format

-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"

 
 

-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-#, fuzzy
-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
+#: apt-inst/extract.cc
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Ni ellir gwneud stat() o %s"
+
+#: apt-inst/filelist.cc
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
+
+#: apt-inst/filelist.cc
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"

 
 

-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
+#: apt-inst/filelist.cc
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"
+
+#: apt-inst/filelist.cc
+#, fuzzy
+msgid "Internal error in AddDiversion"
+msgstr "Gwall Mewnol yn AddDiversion"

 
 

-#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
+#: apt-inst/filelist.cc

 #, c-format
 #, c-format

-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"

 
 

-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+# FIXME: "the"
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"

 
 

-#: apt-pkg/vendorlist.cc:85
+#: apt-inst/filelist.cc

 #, c-format
 #, c-format

-msgid "Vendor block %s contains no fingerprint"
-msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"

 
 

-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
+#: 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."
 
 #, fuzzy, c-format
 msgid "List directory %spartial is missing."
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 

-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc

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

-#: apt-pkg/acquire.cc:99
+#: apt-pkg/acquire.cc

 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 #, fuzzy, c-format
 msgid "Unable to lock directory %s"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 

+#: apt-pkg/acquire.cc
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-pkg/acquire.cc apt-pkg/clean.cc
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+

 #. only show the ETA if it makes sense
 #. two days
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:902
+#: apt-pkg/acquire.cc

 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 

-#: apt-pkg/acquire.cc:904
+#: apt-pkg/acquire.cc

 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Yn Darllen Rhestr Ffeiliau"
 

-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+#: apt-pkg/acquire-item.cc
+msgid "Use --allow-insecure-repositories to force the update"

 msgstr ""
 msgstr ""

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

 
 

-# FIXME: ...file
-#: apt-pkg/srcrecords.cc:52
-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/policy.cc:83
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc

 #, c-format
 #, c-format

-msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
-msgstr ""
-
-# FIXME: literal
-#: apt-pkg/policy.cc:422
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."

 
 

-# FIXME: tense
-#: apt-pkg/policy.cc:444
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Methwyd daeall y math pin %s"
+#: apt-pkg/acquire-item.cc
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
+#: apt-pkg/acquire-item.cc
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"

 
 

-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
+#: apt-pkg/acquire-item.cc
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Gweithred annilys %s"

 
 

-#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Methwyd agor ffeil %s"
+#: apt-pkg/acquire-item.cc
+#, fuzzy
+msgid "Signature error"
+msgstr "Gwall ysgrifennu"

 
 

-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:630
+#: apt-pkg/acquire-item.cc

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

-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+"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 ""
 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:497 apt-pkg/sourcelist.cc:347
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, 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:571
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
+msgid "GPG error: %s: %s"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "Using CD-ROM mount point %s\n"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:599
-#, fuzzy
-msgid "Waiting for disc...\n"
-msgstr "Yn aros am benawdau"
-
-#: apt-pkg/cdrom.cc:609
-msgid "Mounting CD-ROM...\n"
+#: apt-pkg/acquire-item.cc
+msgid "There is no public key available for the following key IDs:\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:620
-msgid "Identifying... "
+#. 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
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Stored label: %s\n"
+msgid "Conflicting distribution: %s (expected %s but got %s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:680
-msgid "Scanning disc for index files...\n"
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."

 msgstr ""
 
 msgstr ""
 

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

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

-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-pkg/acquire-item.cc

 msgid ""
 msgid ""

-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:771
+# FIXME: case
+#: apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Found label '%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 ""
 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.)"

 
 

-#: apt-pkg/cdrom.cc:800
-msgid "That is not a valid name, try again.\n"
+#: apt-pkg/acquire-item.cc
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"

 msgstr ""
 
 msgstr ""
 

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

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

-"This disc is called: \n"
-"'%s'\n"
+"The package index files are corrupted. No Filename: field for package %s."

 msgstr ""
 msgstr ""

+"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."

 
 

-#: apt-pkg/cdrom.cc:819
-#, fuzzy
-msgid "Copying package lists..."
-msgstr "Yn Darllen Rhestrau Pecynnau"
+#. 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)"

 
 

-#: apt-pkg/cdrom.cc:863
-#, fuzzy
-msgid "Writing new source list\n"
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+#: apt-pkg/acquire-worker.cc
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."

 
 

-#: apt-pkg/cdrom.cc:874
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/acquire-worker.cc
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
+
+#: apt-pkg/acquire-worker.cc
+#, fuzzy, c-format
+msgid ""
+"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."

 msgstr ""
 msgstr ""

+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"

 
 

-#: apt-pkg/algorithms.cc:265
+#: apt-pkg/algorithms.cc

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


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

-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc

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


@@ -2545,1155 +2681,1153 @@ msgstr ""
 "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
 "ei achosi gan pecynnau wedi eu dal."
 
 "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
 "ei achosi gan pecynnau wedi eu dal."
 

-#: apt-pkg/algorithms.cc:1088
+#: apt-pkg/algorithms.cc

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 

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

 
 

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

 
 

-#: apt-pkg/edsp.cc:320
-msgid "Prepare for receiving solution"
+#: apt-pkg/cachefile.cc
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."
+
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+
+#: apt-pkg/cacheset.cc
+#, fuzzy, c-format
+msgid "Couldn't find task '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc
+#, fuzzy, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:327
-msgid "External solver failed without a proper error message"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627
-msgid "Execute external solver"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"

 msgstr ""
 
 msgstr ""
 

-# FIXME: number?
-#: apt-pkg/tagfile.cc:140
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""

 
 

-#: apt-pkg/tagfile.cc:237
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""

 
 

-# FIXME: number?
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+#: 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/indexrecords.cc:86
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+#: apt-pkg/cdrom.cc
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"

 
 

-#: apt-pkg/indexrecords.cc:117
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "No Hash entry in Release file %s"
+msgid "Using CD-ROM mount point %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:130
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:149
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+#: apt-pkg/cdrom.cc
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Yn aros am benawdau"

 
 

-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+#: apt-pkg/cdrom.cc
+msgid "Mounting CD-ROM...\n"
+msgstr ""

 
 

-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#: apt-pkg/cdrom.cc
+msgid "Identifying... "

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: apt-pkg/cdrom.cc
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""

 
 

-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#: apt-pkg/cdrom.cc
+msgid "Scanning disc for index files...\n"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+#: apt-pkg/cdrom.cc
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/sourcelist.cc:193
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+#: apt-pkg/cdrom.cc
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/sourcelist.cc:206
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+msgid "Found label '%s'\n"
+msgstr ""

 
 

-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: apt-pkg/cdrom.cc
+msgid "That is not a valid name, try again.\n"
+msgstr ""

 
 

-#: apt-pkg/sourcelist.cc:211
+#: apt-pkg/cdrom.cc

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""

 
 

-#: apt-pkg/sourcelist.cc:217
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+#: apt-pkg/cdrom.cc
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Yn Darllen Rhestrau Pecynnau"

 
 

-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+#: apt-pkg/cdrom.cc
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/cdrom.cc
+msgid "Source list entries for this disc are:\n"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/clean.cc

 #, c-format
 #, c-format

-msgid "Opening %s"
-msgstr "Yn agor %s"
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."

 
 

-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/contrib/cdromutl.cc

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
+
+#: apt-pkg/contrib/cdromutl.cc
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"

 
 

-#: apt-pkg/sourcelist.cc:375
+# FIXME
+#: apt-pkg/contrib/cmndline.cc

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

-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+msgid ""
+"Command line option '%c' [from %s] is not understood in combination with the "
+"other options."
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."

 
 

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

 #, fuzzy, c-format
 #, 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"
+msgid ""
+"Command line option %s is not understood in combination with the other "
+"options"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"

 
 

-#: apt-pkg/cacheset.cc:489
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+msgid "Command line option %s is not boolean"
+msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"

 
 

-#: apt-pkg/cacheset.cc:492
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+msgid "Option %s requires an argument."
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."

 
 

-#: apt-pkg/cacheset.cc:603
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."

 
 

-#: apt-pkg/cacheset.cc:609
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#: 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'"

 
 

-#: apt-pkg/cacheset.cc:615
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#: apt-pkg/contrib/cmndline.cc
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"

 
 

-#: apt-pkg/cacheset.cc:626
+# FIXME: 'Sense'?
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Sense %s is not understood, try true or false."
+msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."

 
 

-#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
+#: apt-pkg/contrib/cmndline.cc

 #, c-format
 #, c-format

-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"

 
 

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

 #, c-format
 #, c-format

-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"

 
 

-#: apt-pkg/cacheset.cc:655
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: apt-pkg/cacheset.cc:663
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."

 
 

-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
+# FIXME
+#: apt-pkg/contrib/configuration.cc
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"

 
 

-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "%lih %limin %lis"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"

 msgstr ""
 msgstr ""

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

 
 

-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

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

 
 

-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "%lis"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+
+#: apt-pkg/contrib/configuration.cc
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/contrib/strutl.cc:1246
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"

 
 

-#: apt-pkg/contrib/fileutl.cc:190
+#: apt-pkg/contrib/fileutl.cc

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

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

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

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

-#: apt-pkg/contrib/fileutl.cc:223
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:394
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:412
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:421
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:824
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:826
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
+#: 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)"
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
 

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

-#: apt-pkg/contrib/fileutl.cc:913
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:1101
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:1315
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:1373
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:1514
+#: 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"
 
 # FIXME
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
 # FIXME

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

-#: apt-pkg/contrib/fileutl.cc:1915
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:1927
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:1938
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/fileutl.cc:1951
+#: apt-pkg/contrib/fileutl.cc

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

-#: apt-pkg/contrib/progress.cc:148
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Gwall!"
-
-#: apt-pkg/contrib/progress.cc:150
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Wedi Gorffen"
-
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
-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
+#: apt-pkg/contrib/mmap.cc

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

-#: apt-pkg/contrib/mmap.cc:111
+#: apt-pkg/contrib/mmap.cc

 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Methwyd agor pibell ar gyfer %s"
 
 #, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "Methwyd agor pibell ar gyfer %s"
 

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

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

-#: apt-pkg/contrib/mmap.cc:146
+#: apt-pkg/contrib/mmap.cc

 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Ni ellir agor %s"
 
 # FIXME
 #, fuzzy
 msgid "Unable to close mmap"
 msgstr "Ni ellir agor %s"
 
 # FIXME

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

 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Methwyd gweithredu "
 
 #, fuzzy
 msgid "Unable to synchronize mmap"
 msgstr "Methwyd gweithredu "
 

-#: apt-pkg/contrib/mmap.cc:290
+#: apt-pkg/contrib/mmap.cc

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

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

 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Methwyd ysgrifennu ffeil %s"
 

-#: apt-pkg/contrib/mmap.cc:341
+#: apt-pkg/contrib/mmap.cc

 #, 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 ""
 
 #, 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-pkg/contrib/mmap.cc:446
+#: 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 ""
 
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:449
+#: apt-pkg/contrib/mmap.cc

 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:65
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-
-#: apt-pkg/contrib/cdromutl.cc:246
-msgid "Failed to stat the cdrom"
-msgstr "Methwyd gwneud stat() o'r CD-ROM"
-
-#: apt-pkg/contrib/configuration.cc:519
+#: apt-pkg/contrib/progress.cc

 #, c-format
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"

 
 

-#: apt-pkg/contrib/configuration.cc:633
+#: apt-pkg/contrib/progress.cc

 #, c-format
 #, c-format

-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"

 
 

-#: apt-pkg/contrib/configuration.cc:801
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
+#: apt-pkg/contrib/progress.cc
+msgid "..."
+msgstr ""

 
 

-# FIXME
-#: apt-pkg/contrib/configuration.cc:820
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc

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

-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"

 
 

-#: apt-pkg/contrib/configuration.cc:837
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
+msgid "%lid %lih %limin %lis"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid "%lih %limin %lis"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/contrib/configuration.cc:884
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc

 #, c-format
 #, c-format

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

 
 

-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Included from here"
-msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+msgid "%lis"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"

 
 

-#: apt-pkg/contrib/configuration.cc:900
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#. 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
+msgid "Target %s wants to acquire the same file (%s) as %s from source %s"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/contrib/configuration.cc:950
+#. 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
 #, 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 "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""

 
 

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+# FIXME: number?
+#: apt-pkg/deb/debmetaindex.cc

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

-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"

 
 

-# FIXME
-#: apt-pkg/contrib/cmndline.cc:121
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"

 
 

-#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/deb/debmetaindex.cc

 #, c-format
 #, c-format

-msgid "Command line option %s is not understood"
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+msgid "No Hash entry in Release file %s"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+# FIXME: number?
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"

 
 

-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"

 
 

-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
+#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
+#: apt-pkg/deb/debmetaindex.cc

 #, c-format
 #, c-format

-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+msgid "Conflicting values set for option %s concerning source %s %s"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+msgid "Invalid value set for option %s concerning source %s %s (%s)"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:309
+#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc

 #, c-format
 #, c-format

-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"

 
 

-# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:341
+#: apt-pkg/deb/debsystem.cc

 #, c-format
 #, c-format

-msgid "Sense %s is not understood, try true or false."
-msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+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-pkg/contrib/cmndline.cc:391
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc

 #, c-format
 #, c-format

-msgid "Invalid operation %s"
-msgstr "Gweithred annilys %s"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc
+msgid "Not locked"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Wedi Sefydlu: "
 

-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Yn cysylltu i %s"
 
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Yn cysylltu i %s"
 

-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/deb/dpkgpm.cc

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

-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Methwyd dileu %s"
 
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Methwyd dileu %s"
 

-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze

-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 

-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/deb/dpkgpm.cc

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

-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/deb/dpkgpm.cc

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

-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc

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

-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 

-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Wedi Sefydlu: "
 

-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/deb/dpkgpm.cc

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Argymell"
 

-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Yn agor y ffeil cyfluniad %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Methwyd dileu %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1066
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
+#: apt-pkg/deb/dpkgpm.cc

 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ni ellir ysgrifennu i %s"
 
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Ni ellir ysgrifennu i %s"
 

-#: apt-pkg/deb/dpkgpm.cc:1069
+#: apt-pkg/deb/dpkgpm.cc

 msgid "Is /dev/pts mounted?"
 msgstr ""
 
 msgid "Is /dev/pts mounted?"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1090
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1569
+#: apt-pkg/deb/dpkgpm.cc

 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc

 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error

-#: apt-pkg/deb/dpkgpm.cc:1636
+#: apt-pkg/deb/dpkgpm.cc

 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1638
+#: apt-pkg/deb/dpkgpm.cc

 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc

 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1651
+#: apt-pkg/deb/dpkgpm.cc

 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
+#: apt-pkg/deb/dpkgpm.cc

 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1685
+#: apt-pkg/deb/dpkgpm.cc

 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/depcache.cc
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
+
+#: apt-pkg/depcache.cc
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
+
+#: apt-pkg/depcache.cc
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
+
+#: apt-pkg/depcache.cc
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: apt-pkg/depcache.cc
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
+
+#: apt-pkg/depcache.cc
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: apt-pkg/edsp.cc
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc

 #, c-format
 #, c-format

-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "Wrote %i records.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+#: apt-pkg/indexcopy.cc
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""

 
 

-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/indexcopy.cc

 #, c-format
 #, c-format

-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "Wrote %i records with %i mismatched files\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+#: apt-pkg/indexcopy.cc
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"

 msgstr ""
 
 msgstr ""
 

-# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:224
-#, fuzzy
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -t   Set the temp dir\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-pkg/indexcopy.cc
+#, c-format
+msgid "Can't find authentication record for: %s"

 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-extracttemplates.cc:254
+#: apt-pkg/indexcopy.cc

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

-msgid "Unable to mkstemp %s"
-msgstr "Ni ellir gwneud stat() o %s"
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: cmdline/apt-extracttemplates.cc:300
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+#: apt-pkg/init.cc
+#, c-format
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"

 
 

-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
-msgid "Package extension list is too long"
-msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
+#: apt-pkg/init.cc
+#, fuzzy
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni ellir canfod math system addas"

 
 

-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
-#, fuzzy, c-format
-msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+#: apt-pkg/install-progress.cc
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""

 
 

-#: ftparchive/apt-ftparchive.cc:281
-msgid "Source extension list is too long"
-msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+#: apt-pkg/install-progress.cc
+msgid "Running dpkg"
+msgstr ""

 
 

-#: ftparchive/apt-ftparchive.cc:401
-msgid "Error writing header to contents file"
-msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
+#: apt-pkg/packagemanager.cc
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""

 
 

-#: ftparchive/apt-ftparchive.cc:431
+#: apt-pkg/packagemanager.cc

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

-msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"

 
 

-# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:626
-#, fuzzy
+# FIXME: %s may have an arbirrary length
+#: apt-pkg/packagemanager.cc
+#, c-format

 msgid ""
 msgid ""

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

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

 
 

-#: ftparchive/apt-ftparchive.cc:841
-msgid "No selections matched"
-msgstr "Dim dewisiadau'n cyfateb"
+#: apt-pkg/pkgcache.cc
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"

 
 

-#: ftparchive/apt-ftparchive.cc:919
-#, 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'"
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"

 
 

-#: ftparchive/cachedb.cc:65
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is an incompatible version"
+msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"

 
 

-#: ftparchive/cachedb.cc:83
-#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
+#: apt-pkg/pkgcache.cc
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
+# FIXME: capitalisation?
+#: 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'"
+
+#: 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"
+
+#: apt-pkg/pkgcache.cc
+msgid "Depends"
+msgstr "Dibynnu"
+
+#: apt-pkg/pkgcache.cc
+msgid "PreDepends"
+msgstr "CynDdibynnu"
+
+#: apt-pkg/pkgcache.cc
+msgid "Suggests"
+msgstr "Awgrymu"
+
+#: apt-pkg/pkgcache.cc
+msgid "Recommends"
+msgstr "Argymell"
+
+#: apt-pkg/pkgcache.cc
+msgid "Conflicts"
+msgstr "Gwrthdaro"
+
+#: apt-pkg/pkgcache.cc
+msgid "Replaces"
+msgstr "Amnewid"

 
 

-#: ftparchive/cachedb.cc:94
-msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
-msgstr ""
+#: apt-pkg/pkgcache.cc
+msgid "Obsoletes"
+msgstr "Darfodi"

 
 

-#: ftparchive/cachedb.cc:99
-#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni ellir agor y ffeil DB2 %s: %s"
+#: apt-pkg/pkgcache.cc
+msgid "Breaks"
+msgstr ""

 
 

-#: ftparchive/cachedb.cc:332
-#, fuzzy
-msgid "Failed to read .dsc"
-msgstr "Methwyd darllen y cyswllt %s"
+#: apt-pkg/pkgcache.cc
+msgid "Enhances"
+msgstr ""

 
 

-#: ftparchive/cachedb.cc:365
-msgid "Archive has no control record"
-msgstr "Does dim cofnod rheoli gan yr archif"
+#: apt-pkg/pkgcache.cc
+msgid "important"
+msgstr "pwysig"

 
 

-#: ftparchive/cachedb.cc:594
-msgid "Unable to get a cursor"
-msgstr "Ni ellir cael cyrchydd"
+#: apt-pkg/pkgcache.cc
+msgid "required"
+msgstr "angenrheidiol"

 
 

-#: ftparchive/writer.cc:91
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
+#: apt-pkg/pkgcache.cc
+msgid "standard"
+msgstr "safonnol"

 
 

-#: ftparchive/writer.cc:96
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Rh: Ni ellir gwneud stat() o %s\n"
+#: apt-pkg/pkgcache.cc
+msgid "optional"
+msgstr "opsiynnol"

 
 

-#: ftparchive/writer.cc:152
-msgid "E: "
-msgstr "G: "
+#: apt-pkg/pkgcache.cc
+msgid "extra"
+msgstr "ychwanegol"

 
 

-#: ftparchive/writer.cc:154
-msgid "W: "
-msgstr "Rh: "
+#: apt-pkg/pkgcachegen.cc
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"

 
 

-#: ftparchive/writer.cc:161
-msgid "E: Errors apply to file "
-msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+#. 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)"

 
 

-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Methwyd datrys %s"
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."

 
 

-#: ftparchive/writer.cc:192
-msgid "Tree walking failed"
-msgstr "Methwyd cerdded y goeden"
+#: 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."

 
 

-#: ftparchive/writer.cc:219
-#, c-format
-msgid "Failed to open %s"
-msgstr "Methwyd agor %s"
+#: 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."

 
 

-# FIXME
-#: ftparchive/writer.cc:278
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
+#: apt-pkg/pkgcachegen.cc
+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."

 
 

-#: ftparchive/writer.cc:286
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
+#: apt-pkg/pkgcachegen.cc
+#, fuzzy
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"

 
 

-#: ftparchive/writer.cc:290
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
+#: apt-pkg/pkgcachegen.cc
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"

 
 

-#: ftparchive/writer.cc:298
+#: apt-pkg/pkgrecords.cc

 #, c-format
 #, c-format

-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"

 
 

-#: ftparchive/writer.cc:308
+#: apt-pkg/policy.cc

 #, c-format
 #, c-format

-msgid " DeLink limit of %sB hit.\n"
-msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""

 
 

-#: ftparchive/writer.cc:417
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
+# 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'"

 
 

-#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
+# FIXME: tense
+#: apt-pkg/policy.cc

 #, c-format
 #, c-format

-msgid "  %s has no override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"

 
 

-#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
+#: apt-pkg/policy.cc

 #, c-format
 #, c-format

-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Cynaliwr %s yw %s nid %s\n"
+msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"
+msgstr ""

 
 

-#: ftparchive/writer.cc:706
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
+#: apt-pkg/policy.cc
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"

 
 

-#: ftparchive/writer.cc:710
+#. 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 "  %s has no binary override entry either\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
-
-#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"

 
 

-#: ftparchive/override.cc:38 ftparchive/override.cc:142
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

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

 
 

-#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"

 
 

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

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

-msgid "Malformed override %s line %llu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+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"

 
 

-#: ftparchive/override.cc:178
+#: apt-pkg/sourcelist.cc

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

-msgid "Malformed override %s line %llu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"

 
 

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

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

-msgid "Malformed override %s line %llu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+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"

 
 

-#: ftparchive/multicompress.cc:73
-#, fuzzy, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
+# 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"

 
 

-#: ftparchive/multicompress.cc:103
+#: apt-pkg/tagfile.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 "Cannot convert %s to integer"
+msgstr ""

 
 

-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
+#: apt-pkg/update.cc
+#, fuzzy, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Methwyd cyrchu %s  %s\n"

 
 

-#: ftparchive/multicompress.cc:195
-msgid "Failed to fork"
-msgstr "Methodd fork()"
+#: apt-pkg/update.cc
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."

 
 

-#: ftparchive/multicompress.cc:209
+#: apt-pkg/upgrade.cc

 #, fuzzy
 #, fuzzy

-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+msgid "Calculating upgrade"
+msgstr "Yn Cyfrifo'r Uwchraddiad"

 
 

-#: ftparchive/multicompress.cc:232
-#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+#~ msgid "Child process failed"
+#~ msgstr "Methodd proses plentyn"

 
 

-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"

 
 

-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
+#~ msgid "Failed to create pipes"
+#~ msgstr "Methwyd creu pibau"

 
 

-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
+#~ msgid "Failed to exec gzip "
+#~ msgstr "Methwyd gweithredu gzip"

 
 

-# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:49

 #, fuzzy
 #, fuzzy

-msgid ""
-"Usage: apt-internal-solver\n"
-"\n"
-"apt-internal-solver is an interface to use the current internal\n"
-"like an external resolver for the APT family for debugging or alike\n"
-"\n"
-"Options:\n"
-"  -h  This help text.\n"
-"  -q  Loggable output - no progress indicator\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Dangos y testun cymorth hwn\n"
-"  -t   Gosod y cyfeiriadur dros dro\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
+#~ msgid "%s %s for %s compiled on %s %s\n"
+#~ msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"

 
 

-#: cmdline/apt-sortpkgs.cc:89
-msgid "Unknown package record!"
-msgstr "Cofnod pecyn anhysbys!"
+#~ msgid "Failed to create FILE*"
+#~ msgstr "Methwyd creu FILE*"

 
 

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

 #, 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 "Malformed stanza %u in source list %s (URI parse)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"

 
 #, fuzzy
 
 #, fuzzy

-#~ msgid "Internal error, Upgrade broke stuff"
-#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-
-#~ msgid "%s not a valid DEB package."
-#~ msgstr "Nid yw %s yn becyn DEB dilys."
+#~ msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 #, fuzzy
 
 #, fuzzy

-#~ msgid "Note, selecting '%s' for task '%s'\n"
-#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+#~ msgid "Malformed line %lu in source list %s ([option] too short)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"

 
 #, fuzzy
 
 #, fuzzy

-#~ msgid "Note, selecting '%s' for regex '%s'\n"
-#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+#~ msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#~ msgid "Package %s is a virtual package provided by:\n"
-#~ msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
+#, fuzzy
+#~ msgid "Malformed line %lu in source list %s ([%s] has no key)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 #, fuzzy
 
 #, fuzzy

-#~ msgid " [Not candidate version]"
-#~ msgstr "Fersiynau Posib"
+#~ msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#~ msgid "You should explicitly select one to install."
-#~ msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+#~ msgid "Malformed line %lu in source list %s (URI)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+
+#~ msgid "Malformed line %lu in source list %s (dist)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#~ msgid "Malformed line %lu in source list %s (URI parse)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"

 
 

-# FIXME: punctuation

 #, fuzzy
 #, fuzzy

-#~ 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"
+#~ msgid "Malformed line %lu in source list %s (absolute dist)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+
+#~ msgid "Malformed line %lu in source list %s (dist parse)"

 #~ msgstr ""
 #~ 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"
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#~ msgid "Package %s %s was not found while processing file dependencies"
+#~ msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+
+#~ msgid "Couldn't stat source package list %s"
+#~ msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#~ msgid "Collecting File Provides"
+#~ msgstr "Yn Casglu Darpariaethau Ffeil"
+
+# FIXME: number?
+#, fuzzy
+#~ msgid "Unable to find hash sum for '%s' in Release file"
+#~ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#~ msgid "Vendor block %s contains no fingerprint"
+#~ msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"

 
 

-#~ msgid "However the following packages replace it:"
-#~ msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+#, fuzzy
+#~ msgid "Total dependency version space: "
+#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
+
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Does dim digon o le rhydd yn %s gennych"
+
+#~ msgid "Done"
+#~ msgstr "Wedi Gorffen"

 
 #, fuzzy
 
 #, fuzzy

-#~ msgid "Package '%s' has no installation candidate"
-#~ msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Yn Erthylu'r Sefydliad."

 
 #, fuzzy
 
 #, fuzzy

-#~ msgid "Note, selecting '%s' instead of '%s'\n"
-#~ msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "Nid yw %s yn becyn DEB dilys."

 
 #, fuzzy
 #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 
 #, fuzzy
 #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"