FileFd: Add a buffered writing mode

[apt.git] / po / cy.po

diff --git a/po/cy.po b/po/cy.po
index db9ec0bbc3cb2ee501a4519d0e0b8254fd8006db..185e74a7dbacad7679f52bc892a4954ef57c968b 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: 2015-03-09 02:17+0100\n"
+"POT-Creation-Date: 2015-12-24 17:02+0100\n"

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


@@ -15,1787 +15,1916 @@ 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:320
-#, 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:322
-#, 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:362
-#, 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:363
-#, 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:364
-#, fuzzy
-msgid "  Single virtual packages: "
-msgstr "  Pecynnau Rhithwir Sengl: "
+#: apt-private/acqprogress.cc
+msgid " [Working]"
+msgstr " [Gweithio]"

 
 

-#: cmdline/apt-cache.cc:365
-#, 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:366
-msgid "  Missing: "
-msgstr "  Ar Goll: "
+#: apt-private/private-cachefile.cc
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."

 
 

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

 
 

-#: cmdline/apt-cache.cc:370
-#, 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:372
-#, 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:375
-#, 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:377
-#, 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:379
-#, 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:433
-#, 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:439
-#, fuzzy
-msgid "Total slack space: "
-msgstr "Cyfanswm gofod Slac: "
+#: 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:454
-#, fuzzy
-msgid "Total space accounted for: "
-msgstr "Cyfanswm Gofod Cyfrifwyd: "
+#: apt-private/private-cacheset.cc
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for glob '%s'\n"
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+
+#: apt-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:590 cmdline/apt-cache.cc:1239
-#: 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:668 cmdline/apt-cache.cc:1526
-#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
-#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
-#: 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:1338 apt-private/private-search.cc:41
+#: 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:1505
-msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr ""
+#: apt-private/private-cacheset.cc
+msgid "You should explicitly select one to install."
+msgstr "Dylech ddewis un yn benodol i'w sefydlu."

 
 

-#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
-#, c-format
-msgid "Unable to locate package %s"
-msgstr "Ni ellir lleoli'r pecyn %s"
+# 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 ""
+"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
+"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
+"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
+"ffeil sources.list.\n"

 
 

-#: cmdline/apt-cache.cc:1630
-#, fuzzy
-msgid "Package files:"
-msgstr "Ffeiliau Pecynnau:"
+#: 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:1637 cmdline/apt-cache.cc:1728
-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
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"

 
 

-#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1651
-#, fuzzy
-msgid "Pinned packages:"
-msgstr "Pecynnau wedi eu Pinio:"
+#: apt-private/private-cacheset.cc
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""

 
 

-#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
-msgid "(not found)"
-msgstr "(heb ganfod)"
+#. 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:1671
-msgid "  Installed: "
-msgstr "  Wedi Sefydlu: "
+#: 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"

 
 

-#: cmdline/apt-cache.cc:1672
-msgid "  Candidate: "
-msgstr "  Ymgeisydd: "
+#: 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"

 
 

-#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
-msgid "(none)"
-msgstr "(dim)"
+#: apt-private/private-cmndline.cc
+msgid "Most used commands:"
+msgstr ""

 
 

-#: cmdline/apt-cache.cc:1705
-#, fuzzy
-msgid "  Package pin: "
-msgstr "  Pin Pecyn: "
+#: apt-private/private-cmndline.cc
+#, c-format
+msgid "See %s for more information about the available commands."
+msgstr ""

 
 

-#. Show the priority tables
-#: cmdline/apt-cache.cc:1714
-#, fuzzy
-msgid "  Version table:"
-msgstr "  Tabl Fersiynnau:"
+#: apt-private/private-cmndline.cc
+msgid ""
+"Configuration options and syntax is detailed in apt.conf(5).\n"
+"Information about how to configure sources can be found in sources.list(5).\n"
+"Package and version choices can be expressed via apt_preferences(5).\n"
+"Security details are available in apt-secure(8).\n"
+msgstr ""

 
 

-#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
-#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
-#: cmdline/apt-sortpkgs.cc:149
-#, 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"
+#: apt-private/private-cmndline.cc
+msgid "This APT has Super Cow Powers."
+msgstr "Mae gan yr APT hwn bŵerau buwch hudol."

 
 

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

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:92
+#: apt-private/private-depends.cc apt-private/private-show.cc
+#: cmdline/apt-mark.cc
+msgid "No packages found"
+msgstr "Canfuwyd dim pecyn"
+
+#: apt-private/private-download.cc

 #, fuzzy
 #, fuzzy

-msgid "Please insert a Disc in the drive and press enter"
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc
+msgid "Authentication warning overridden.\n"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-cdrom.cc:140
-#, fuzzy, c-format
-msgid "Failed to mount '%s' to '%s'"
-msgstr "Methwyd ailenwi %s at %s"
+#: 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-cdrom.cc:179
-msgid ""
-"No CD-ROM could be auto-detected or found using the default mount point.\n"
-"You may try the --cdrom option to set the CD-ROM mount point.\n"
-"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
-"mount point."
+#: apt-private/private-download.cc
+msgid "Install these packages without verification?"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:183
-msgid "Repeat this process for the rest of the CDs in your set."
+#: 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 ""
 
 msgstr ""
 

-#: cmdline/apt-config.cc:48
-msgid "Arguments not in pairs"
-msgstr "Nid yw ymresymiadau mewn parau"
-
-#: cmdline/apt-config.cc:89
+#: apt-private/private-download.cc

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

 
 

-#: cmdline/apt-get.cc:224
-#, fuzzy, c-format
-msgid "Can not find a package for architecture '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#: apt-private/private-download.cc
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Methwyd cyrchu %s  %s\n"

 
 

-#: cmdline/apt-get.cc:311
+#: apt-private/private-download.cc

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

-msgid "Can not find a package '%s' with version '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"

 
 

-#: cmdline/apt-get.cc:314
-#, fuzzy, c-format
-msgid "Can not find a package '%s' with release '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#: 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-get.cc:358
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+#: apt-private/private-download.cc
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"

 
 

-#: cmdline/apt-get.cc:414
-#, c-format
-msgid "Can not find version '%s' of package '%s'"
+#: apt-private/private-install.cc
+msgid "Internal error, InstallPackages was called with broken packages!"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:445
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Methwyd canfod pecyn %s"
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."

 
 

-#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
-#: apt-private/private-install.cc:863
-#, 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
+#, fuzzy
+msgid ""
+"Essential packages were removed and -y was used without --allow-remove-"
+"essential."
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"

 
 

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

 
 

-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
+#: apt-private/private-install.cc

 msgid ""
 msgid ""

-"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
-"instead."
+"Held packages were changed and -y was used without --allow-change-held-"
+"packages."

 msgstr ""
 
 msgstr ""
 

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

 #, fuzzy
 #, fuzzy

-msgid "Internal error, problem resolver broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-
-#: cmdline/apt-get.cc:598
-msgid "Unable to lock the download directory"
-msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"

 
 

-#: cmdline/apt-get.cc:716
-msgid "Must specify at least one package to fetch source for"
-msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-
-#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-
-#: cmdline/apt-get.cc:780
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:785
-#, c-format
-msgid ""
-"Please use:\n"
-"bzr branch %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
+#: apt-private/private-install.cc
+msgid "How odd... The sizes didn't match, email apt@packages.debian.org"

 msgstr ""
 
 msgstr ""
 

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

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

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+msgid "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
 
 #. 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:868
+#: 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 "Need to get %sB of archives.\n"
+msgstr "Mae angen cyrchu %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
+#, fuzzy, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"

 
 

-#: cmdline/apt-get.cc:874
+#. 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 "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"

 
 

-#: cmdline/apt-get.cc:899
-msgid "Failed to fetch some archives."
-msgstr "Methwyd cyrchu rhai archifau."
+#: 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!"
+
+#: apt-private/private-install.cc
+#, fuzzy, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n"
+"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
+" ?]"
+
+#: apt-private/private-install.cc
+msgid "Abort."
+msgstr "Erthylu."

 
 

-#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
+#: 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 apt-private/private-source.cc

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

-#: cmdline/apt-get.cc:929
-#, c-format
-msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+#: apt-private/private-install.cc
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
+"geidio defnyddio --fix-missing?"

 
 

-#: cmdline/apt-get.cc:942
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+#: 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:943
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+#: apt-private/private-install.cc
+msgid "Unable to correct missing packages."
+msgstr "Ni ellir cywiro pecynnau ar goll."

 
 

-#: cmdline/apt-get.cc:971
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "Aborting install."
+msgstr "Yn Erthylu'r Sefydliad."
+
+#: apt-private/private-install.cc
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:990
-msgid "Child process failed"
-msgstr "Methodd proses plentyn"
+#: apt-private/private-install.cc
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1009
-msgid "Must specify at least one package to check builddeps for"
+#: apt-private/private-install.cc
+msgid "We are not supposed to delete stuff, can't start AutoRemover"

 msgstr ""
 msgstr ""

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

 
 

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

 msgid ""
 msgid ""

-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
+"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:1047
-#, c-format
-msgid "Note, using directory '%s' to get the build dependencies\n"
-msgstr ""
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc
+msgid "The following information may help to resolve the situation:"
+msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: 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:1057
+#: apt-private/private-install.cc

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

-msgid "Note, using file '%s' to get the build dependencies\n"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
+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:1086 cmdline/apt-get.cc:1089
+#: apt-private/private-install.cc

 #, c-format
 #, c-format

-msgid "Unable to get build-dependency information for %s"
-msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
+msgid "Use '%s' to remove it."
+msgid_plural "Use '%s' to remove them."
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:1109
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+#: 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:"

 
 

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

 msgid ""
 msgid ""

-"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
-"packages"
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."

 msgstr ""
 msgstr ""

-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
+"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
+"pecyn (neu penodwch ddatrys)"

 
 

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

 msgid ""
 msgid ""

-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
+"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 ""

-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
+"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
+"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
+"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
+"heb gael eu symud allan o Incoming."
+
+#: apt-private/private-install.cc
+msgid "Broken packages"
+msgstr "Pecynnau wedi torri"
+
+#: apt-private/private-install.cc
+#, fuzzy
+msgid "The following additional packages will be installed:"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+
+#: apt-private/private-install.cc
+msgid "Suggested packages:"
+msgstr "Pecynnau a awgrymmir:"
+
+#: apt-private/private-install.cc
+msgid "Recommended packages:"
+msgstr "Pecynnau a argymhellir:"

 
 

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

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

 #, fuzzy, c-format
 #, 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"
+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:1365
+#: apt-private/private-install.cc
+#, 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"
+
+#. TRANSLATORS: First string is package name, second is version
+#: apt-private/private-install.cc

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

-msgid ""
-"%s dependency for %s cannot be satisfied because package %s has no candidate "
-"version"
+msgid "%s is already the newest version (%s).\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+
+#: 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"
+
+#: 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"
+
+#: 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"
+
+#: apt-private/private-list.cc
+msgid "Listing"

 msgstr ""
 msgstr ""

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

 
 

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

 #, c-format
 #, c-format

-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
+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:1403
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
+#: apt-private/private-main.cc
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""

 
 

-#: cmdline/apt-get.cc:1408
-msgid "Failed to process build dependencies"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
+#: apt-private/private-output.cc apt-private/private-show.cc
+msgid "unknown"
+msgstr ""

 
 

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

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

-msgid "Changelog for %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"

 
 

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

 #, fuzzy
 #, fuzzy

-msgid "Supported modules:"
-msgstr "Modylau a Gynhelir:"
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"

 
 

-# FIXME: split
-#: cmdline/apt-get.cc:1656
-#, 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"
+#: apt-private/private-output.cc
+msgid "[installed,auto-removable]"

 msgstr ""
 msgstr ""

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

 
 

-#: cmdline/apt-helper.cc:36
-msgid "Need one URL as argument"
-msgstr ""
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"

 
 

-#: cmdline/apt-helper.cc:49
+#: 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 "[installed]"
+msgstr " [Sefydliwyd]"

 
 

-#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
-msgid "Download Failed"
+#: apt-private/private-output.cc
+#, c-format
+msgid "[upgradable from: %s]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-helper.cc:93
-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"
-"   auto-detect-proxy - detect proxy using apt.conf\n"
-"\n"
-"                       This APT helper has Super Meep Powers.\n"
+#: apt-private/private-output.cc
+msgid "[residual-config]"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-mark.cc:65
-#, fuzzy, c-format
-msgid "%s can not be marked as it is not installed.\n"
-msgstr "ond nid yw wedi ei sefydlu"
-
-#: cmdline/apt-mark.cc:71
-#, fuzzy, c-format
-msgid "%s was already set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: apt-private/private-output.cc
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"

 
 

-#: cmdline/apt-mark.cc:73
-#, fuzzy, c-format
-msgid "%s was already set to automatically installed.\n"
+#: apt-private/private-output.cc
+#, c-format
+msgid "but %s is to be installed"

 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 

-#: cmdline/apt-mark.cc:238
-#, 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
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"

 
 

-#: cmdline/apt-mark.cc:240
-#, fuzzy, c-format
-msgid "%s was already not hold.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+#: apt-private/private-output.cc
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"

 
 

-#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
-#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
-#: apt-pkg/deb/dpkgpm.cc:1303
-#, 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
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"

 
 

-#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
-#, fuzzy, c-format
-msgid "%s set on hold.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: apt-private/private-output.cc
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"

 
 

-#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
-#, fuzzy, c-format
-msgid "Canceled hold on %s.\n"
-msgstr "Methwyd agor %s"
+#: apt-private/private-output.cc
+msgid " or"
+msgstr " neu"

 
 

-#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
-msgid "Executing dpkg failed. Are you root?"
-msgstr ""
+#: apt-private/private-output.cc
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"

 
 

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

 
 

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

 
 

-#: methods/cdrom.cc:203
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+#: apt-private/private-output.cc
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"

 
 

-#: methods/cdrom.cc:212
+#: apt-private/private-output.cc

 #, fuzzy
 #, fuzzy

-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
-"get update i ychwanegu CDau newydd."
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"

 
 

-#: methods/cdrom.cc:222
+#: apt-private/private-output.cc

 #, fuzzy
 #, fuzzy

-msgid "Wrong CD-ROM"
-msgstr "CD Anghywir"
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: apt-private/private-output.cc
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"

 
 

-#: methods/cdrom.cc:249
+#: apt-private/private-output.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 "%s (due to %s)"
+msgstr "%s (oherwydd %s)"

 
 

-#: methods/cdrom.cc:254
+#: apt-private/private-output.cc

 #, fuzzy
 #, fuzzy

-msgid "Disk not found."
-msgstr "Ffeil heb ei ganfod"
+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!"

 
 

-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281
-msgid "File not found"
-msgstr "Ffeil heb ei ganfod"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "

 
 

-#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
-#: methods/rred.cc:608
-msgid "Failed to stat"
-msgstr "Methwyd stat()"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "

 
 

-#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
-msgid "Failed to set modification time"
-msgstr "Methwyd gosod amser newid"
+#: apt-private/private-output.cc
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "

 
 

-#: 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-output.cc
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"

 
 

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

 
 

-#: methods/ftp.cc:184
-msgid "Unable to determine the peer name"
-msgstr "Ni ellir darganfod enw'r cymar"
+#. 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 ""

 
 

-#: methods/ftp.cc:189
-msgid "Unable to determine the local name"
-msgstr "Ni ellir darganfod yr enw lleol"
+#. 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 ""

 
 

-#: methods/ftp.cc:220 methods/ftp.cc:248
-#, fuzzy, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %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/ftp.cc:226
-#, c-format
-msgid "USER failed, server said: %s"
-msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc
+msgid "N"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "PASS failed, server said: %s"
-msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"

 
 

-#: methods/ftp.cc:253
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+#: apt-private/private-search.cc
+#, fuzzy
+msgid "You must give at least one search pattern"
+msgstr "Rhaid i chi ddarparu un patrwm yn union"
+
+#: apt-private/private-search.cc
+msgid "Full Text Search"

 msgstr ""
 msgstr ""

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

 
 

-# FIXME
-#: methods/ftp.cc:281
+#: apt-private/private-show.cc 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 file %s is out of sync."
+msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."

 
 

-#: methods/ftp.cc:307
+#: apt-private/private-show.cc

 #, c-format
 #, c-format

-msgid "TYPE failed, server said: %s"
-msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+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:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
-msgid "Connection timeout"
-msgstr "Goramser cysylltu"
+#: apt-private/private-show.cc
+msgid "not a real package (virtual)"
+msgstr ""

 
 

-#: methods/ftp.cc:351
-msgid "Server closed the connection"
-msgstr "Caeodd y gweinydd y cysylltiad"
+#: apt-private/private-show.cc apt-pkg/cacheset.cc
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Ni ellir lleoli'r pecyn %s"

 
 

-#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
-#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
-#: apt-pkg/contrib/fileutl.cc:1531
-msgid "Read error"
-msgstr "Gwall darllen"
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "Package files:"
+msgstr "Ffeiliau Pecynnau:"

 
 

-#: methods/ftp.cc:361 methods/rsh.cc:209
-msgid "A response overflowed the buffer."
-msgstr "Gorlifodd ateb y byffer."
+#: apt-private/private-show.cc
+msgid "Cache is out of sync, can't x-ref a package file"
+msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"

 
 

-#: methods/ftp.cc:378 methods/ftp.cc:390
-msgid "Protocol corruption"
-msgstr "Llygr protocol"
+#. Show any packages have explicit pins
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "Pinned packages:"
+msgstr "Pecynnau wedi eu Pinio:"

 
 

-#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
-#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
-#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
-#: apt-pkg/contrib/fileutl.cc:1678
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
+#: apt-private/private-show.cc
+msgid "(not found)"
+msgstr "(heb ganfod)"

 
 

-#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
-msgid "Could not create a socket"
-msgstr "Methwyd creu soced"
+#. Print the package name and the version we are forcing to
+#: apt-private/private-show.cc
+#, c-format
+msgid "%s -> %s with priority %d\n"
+msgstr ""

 
 

-#: methods/ftp.cc:713
-msgid "Could not connect data socket, connection timed out"
-msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+#: apt-private/private-show.cc
+msgid "  Installed: "
+msgstr "  Wedi Sefydlu: "

 
 

-#: methods/ftp.cc:717 methods/connect.cc:116
-msgid "Failed"
-msgstr "Methwyd"
+#: apt-private/private-show.cc
+msgid "  Candidate: "
+msgstr "  Ymgeisydd: "

 
 

-#: methods/ftp.cc:719
+#: apt-private/private-show.cc
+msgid "(none)"
+msgstr "(dim)"
+
+#: apt-private/private-show.cc

 #, fuzzy
 #, fuzzy

-msgid "Could not connect passive socket."
-msgstr "Methwyd cysylltu soced goddefol"
+msgid "  Package pin: "
+msgstr "  Pin Pecyn: "

 
 

-# FIXME
-#: methods/ftp.cc:736
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Methodd getaddrinfo gael soced gwrando"
+#. Show the priority tables
+#: apt-private/private-show.cc
+#, fuzzy
+msgid "  Version table:"
+msgstr "  Tabl Fersiynnau:"

 
 

-#: methods/ftp.cc:750
-msgid "Could not bind a socket"
-msgstr "Methwyd rhwymo soced"
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: methods/ftp.cc:754
-msgid "Could not listen on the socket"
-msgstr "Methwyd gwrando ar y soced"
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: methods/ftp.cc:761
-msgid "Could not determine the socket's name"
-msgstr "Methwyd canfod enw'r soced"
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: methods/ftp.cc:793
-msgid "Unable to send PORT command"
-msgstr "Methwyd danfod gorchymyn PORT"
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"

 
 

-#: methods/ftp.cc:803
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Unknown address family %u (AF_*)"
-msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+msgid "Can not find version '%s' of package '%s'"
+msgstr ""

 
 

-#: methods/ftp.cc:812
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to fetch source for"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
+
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "EPRT failed, server said: %s"
-msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"

 
 

-#: methods/ftp.cc:832
-msgid "Data socket connect timed out"
-msgstr "Goramserodd cysylltiad y soced data"
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""

 
 

-#: methods/ftp.cc:839
-msgid "Unable to accept connection"
-msgstr "Methwyd derbyn cysylltiad"
+#: apt-private/private-source.cc
+#, c-format
+msgid ""
+"Please use:\n"
+"%s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""

 
 

-#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
-msgid "Problem hashing file"
-msgstr "Problem wrth stwnshio ffeil"
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"

 
 

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

 #, c-format
 #, c-format

-msgid "Unable to fetch file, server said '%s'"
-msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"

 
 

-#: methods/ftp.cc:907 methods/rsh.cc:338
-msgid "Data socket timed out"
-msgstr "Goramserodd soced data"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-source.cc
+#, c-format
+msgid "Need to get %sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
+msgstr "Cyrchu Ffynhonell %s\n"
+
+#: apt-private/private-source.cc
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."

 
 

-#: methods/ftp.cc:944
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Data transfer failed, server said '%s'"
-msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"

 
 

-#. Get the files information
-#: methods/ftp.cc:1027
-msgid "Query"
-msgstr "Ymholiad"
+#: apt-private/private-source.cc
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"

 
 

-# FIXME
-#: methods/ftp.cc:1141
-msgid "Unable to invoke "
-msgstr "Methwyd gweithredu "
+#: apt-private/private-source.cc
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""

 
 

-#: methods/connect.cc:76
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+msgid "Build command '%s' failed.\n"
+msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+
+#: apt-private/private-source.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"

 
 

-#: methods/connect.cc:87
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+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"

 
 

-#: methods/connect.cc:94
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
+"newydd"
+
+#: apt-private/private-source.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"

 
 

-#: methods/connect.cc:100
+#: apt-private/private-source.cc
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
+
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"

 
 

-#: methods/connect.cc:108
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."

 
 

-#: methods/connect.cc:126
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Could not connect to %s:%s (%s)."
-msgstr "Methwyd cysylltu i %s:%s (%s)."
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"

 
 

-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:442
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Connecting to %s"
-msgstr "Yn cysylltu i %s"
+msgid "%s has no build depends.\n"
+msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+
+#: apt-private/private-source.cc
+msgid "Must specify at least one package to check builddeps for"
+msgstr ""
+"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"

 
 

-#: methods/connect.cc:180 methods/connect.cc:199
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Could not resolve '%s'"
-msgstr "Methwyd datrys '%s'"
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""

 
 

-#: methods/connect.cc:205
+#: apt-private/private-source.cc

 #, c-format
 #, c-format

-msgid "Temporary failure resolving '%s'"
-msgstr "Methiant dros dro yn datrys '%s'"
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""

 
 

-#: methods/connect.cc:209
+#: apt-private/private-source.cc

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

-msgid "System error resolving '%s:%s'"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
+
+#: apt-private/private-source.cc
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"

 
 

-#: methods/connect.cc:211
+#: apt-private/private-sources.cc

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

-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+msgid "Failed to parse %s. Edit again? "
+msgstr "Methwyd ailenwi %s at %s"
+
+#: apt-private/private-sources.cc
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-unmet.cc
+#, c-format
+msgid "Package %s version %s has an unmet dep:\n"
+msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
+
+#: apt-private/private-update.cc
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-update.cc
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc
+msgid "All packages are up to date."
+msgstr ""
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "apt-cache stats does not take any arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total package names: "
+msgstr "Cyfanswm Enwau Pecynnau : "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total package structures: "
+msgstr "Cyfanswm Enwau Pecynnau : "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Normal packages: "
+msgstr "  Pecynnau Normal: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Pure virtual packages: "
+msgstr "  Pecynnau Cwbl Rhithwir: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Single virtual packages: "
+msgstr "  Pecynnau Rhithwir Sengl: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "  Mixed virtual packages: "
+msgstr "  Pecynnau Rhithwir Cymysg: "
+
+#: cmdline/apt-cache.cc
+msgid "  Missing: "
+msgstr "  Ar Goll: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total distinct versions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total distinct descriptions: "
+msgstr "Cyfanswm Fersiynau Gwahanol: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total dependencies: "
+msgstr "Cyfanswm Dibyniaethau: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total ver/file relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total Desc/File relations: "
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total Provides mappings: "
+msgstr "Cyfanswm Mapiau Darpariath: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total globbed strings: "
+msgstr "Cyfanswm Llinynau Glob: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total slack space: "
+msgstr "Cyfanswm gofod Slac: "
+
+#: cmdline/apt-cache.cc
+#, fuzzy
+msgid "Total space accounted for: "
+msgstr "Cyfanswm Gofod Cyfrifwyd: "
+
+#: cmdline/apt-cache.cc
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+msgstr ""
+
+#: cmdline/apt-cache.cc
+msgid ""
+"Usage: apt-cache [options] command\n"
+"       apt-cache [options] show pkg1 [pkg2 ...]\n"
+"\n"
+"apt-cache queries and displays available information about installed\n"
+"and installable packages. It works exclusively on the data acquired\n"
+"into the local cache via the 'update' command of e.g. apt-get. The\n"
+"displayed information may therefore be outdated if the last update was\n"
+"too long ago, but in exchange apt-cache works independently of the\n"
+"availability of the configured sources (e.g. offline).\n"
+msgstr ""

 
 

-#: methods/connect.cc:258
-#, fuzzy, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "Methwyd cysylltu i %s %s:"
+#: cmdline/apt-cache.cc
+msgid "Show source records"
+msgstr "Dangos cofnodion ffynhonell"

 
 

-#: methods/gpgv.cc:158
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+#: cmdline/apt-cache.cc
+msgid "Search the package list for a regex pattern"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:162
-msgid "At least one invalid signature was encountered."
+#: cmdline/apt-cache.cc
+msgid "Show raw dependency information for a package"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:164
-msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
+#: cmdline/apt-cache.cc
+msgid "Show reverse dependency information for a package"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:170
-#, c-format
-msgid ""
-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
+#: cmdline/apt-cache.cc
+msgid "Show a readable record for the package"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:174
-msgid "Unknown error executing apt-key"
+#: cmdline/apt-cache.cc
+msgid "List the names of all packages in the system"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:207 methods/gpgv.cc:214
-#, fuzzy
-msgid "The following signatures were invalid:\n"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+#: cmdline/apt-cache.cc
+msgid "Show policy settings"
+msgstr ""

 
 

-#: methods/gpgv.cc:221
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
+#: cmdline/apt-cdrom.cc
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"

 msgstr ""
 
 msgstr ""
 

-#: methods/gzip.cc:79
-msgid "Empty files can't be valid archives"
+#: cmdline/apt-cdrom.cc
+#, fuzzy
+msgid "Please insert a Disc in the drive 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"

 
 

-#: methods/http.cc:517
-msgid "Error writing to the file"
-msgstr "Gwall wrth ysgrifennu at y ffeil"
+#: cmdline/apt-cdrom.cc
+#, fuzzy, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "Methwyd ailenwi %s at %s"

 
 

-#: methods/http.cc:531
-#, fuzzy
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+#: cmdline/apt-cdrom.cc
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""

 
 

-#: methods/http.cc:533
-msgid "Error reading from server"
-msgstr "Gwall wrth ddarllen o'r gweinydd"
+#: cmdline/apt-cdrom.cc
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""

 
 

-#: methods/http.cc:569
-msgid "Error writing to file"
-msgstr "Gwall wrth ysgrifennu at ffeil"
+#: cmdline/apt-cdrom.cc
+msgid ""
+"Usage: apt-cdrom [options] command\n"
+"\n"
+"apt-cdrom is used to add CDROM's, USB flashdrives and other removable\n"
+"media types as package sources to APT. The mount point and device\n"
+"information is taken from apt.conf(5), udev(7) and fstab(5).\n"
+msgstr ""

 
 

-#: methods/http.cc:629
-msgid "Select failed"
-msgstr "Methwyd dewis"
+#: cmdline/apt-config.cc
+msgid "Arguments not in pairs"
+msgstr "Nid yw ymresymiadau mewn parau"

 
 

-#: methods/http.cc:634
-msgid "Connection timed out"
-msgstr "Goramserodd y cysylltiad"
+#: cmdline/apt-config.cc
+#, fuzzy
+msgid ""
+"Usage: apt-config [options] command\n"
+"\n"
+"apt-config is an interface to the configuration settings used by\n"
+"all APT tools, mainly intended for debugging and shell scripting.\n"
+msgstr ""
+"Defnydd: apt-config [opsiynnau] gorchymyn\n"
+"\n"
+"Mae apt-config yn erfyn syml sy'n darllen ffeil cyfluniad APT\n"

 
 

-#: methods/http.cc:657
-msgid "Error writing to output file"
-msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+#: cmdline/apt-config.cc
+msgid "get configuration values via shell evaluation"
+msgstr ""

 
 

-#: methods/server.cc:52
-msgid "Waiting for headers"
-msgstr "Yn aros am benawdau"
+#: cmdline/apt-config.cc
+msgid "show the active configuration setting"
+msgstr ""

 
 

-#: methods/server.cc:111
-msgid "Bad header line"
-msgstr "Llinell pennawd gwael"
+#: cmdline/apt-get.cc
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: methods/server.cc:136 methods/server.cc:143
-#, fuzzy
-msgid "The HTTP server sent an invalid reply header"
-msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+#: 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:173
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+#: cmdline/apt-get.cc cmdline/apt-mark.cc
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+msgstr ""

 
 

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

 #, fuzzy
 #, fuzzy

-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"

 
 

-#: methods/server.cc:195
+#: 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:219
-msgid "Unknown date format"
-msgstr "Fformat dyddiad anhysbys"
+msgid "Supported modules:"
+msgstr "Modylau a Gynhelir:"

 
 

-#: methods/server.cc:506
+# FIXME: split
+#: cmdline/apt-get.cc

 #, fuzzy
 #, fuzzy

-msgid "Bad header data"
-msgstr "Data pennawd gwael"
-
-#: methods/server.cc:523 methods/server.cc:617
-msgid "Connection failed"
-msgstr "Methodd y cysylltiad"
-
-#: methods/server.cc:589
-#, c-format

 msgid ""
 msgid ""

-"Automatically disabled %s due to incorrect response from server/proxy. (man "
-"5 apt.conf)"
+"Usage: apt-get [options] command\n"
+"       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+"       apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a command line interface for retrieval of packages\n"
+"and information about them from authenticated sources and\n"
+"for installation, upgrade and removal of packages together\n"
+"with their dependencies.\n"

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

 
 

-#: methods/server.cc:712
-msgid "Internal error"
-msgstr "Gwall mewnol"
+#: cmdline/apt-get.cc
+msgid "Retrieve new lists of packages"
+msgstr "Cyrchu rhestrau pecynnau newydd"

 
 

-#: apt-private/private-list.cc:121
-msgid "Listing"
+#: cmdline/apt-get.cc
+msgid "Perform an upgrade"
+msgstr "Uwchraddio pecynnau wedi sefydlu"
+
+#: cmdline/apt-get.cc
+msgid "Install new packages (pkg is libc6 not libc6.deb)"
+msgstr "Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages"
+msgstr "Tynnu pecynnau"
+
+#: cmdline/apt-get.cc
+msgid "Remove packages and config files"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
+#: cmdline/apt-get.cc cmdline/apt.cc
+#, fuzzy
+msgid "Remove automatically all unused packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
+#: cmdline/apt-get.cc
+msgid "Distribution upgrade, see apt-get(8)"
+msgstr "Uwchraddio dosraniad, gweler apt-get(8)"

 
 

-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " wedi methu."
+#: cmdline/apt-get.cc
+msgid "Follow dselect selections"
+msgstr "Dilyn dewisiadau dselect"

 
 

-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
+#: cmdline/apt-get.cc
+msgid "Configure build-dependencies for source packages"
+msgstr "Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell"

 
 

-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
+#: cmdline/apt-get.cc
+msgid "Erase downloaded archive files"
+msgstr "Dileu ffeiliau archif wedi eu lawrlwytho"

 
 

-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Wedi Gorffen"
+#: cmdline/apt-get.cc
+msgid "Erase old downloaded archive files"
+msgstr "Dileu hen ffeiliau archif wedi eu lawrlwytho"

 
 

-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
+#: cmdline/apt-get.cc
+msgid "Verify that there are no broken dependencies"
+msgstr "Gwirio fod dim dibyniaethau torredig"

 
 

-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+#: cmdline/apt-get.cc
+msgid "Download source archives"
+msgstr "Lawrlwytho archifau ffynhonell"

 
 

-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
+#: cmdline/apt-get.cc
+msgid "Download the binary package into the current directory"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sefydliwyd]"
+#: cmdline/apt-get.cc
+msgid "Download and display the changelog for the given package"
+msgstr ""

 
 

-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
+#: cmdline/apt-helper.cc
+msgid "Need one URL as argument"

 msgstr ""
 
 msgstr ""
 

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

 #, fuzzy
 #, fuzzy

-msgid "[installed,automatic]"
-msgstr " [Sefydliwyd]"
+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-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sefydliwyd]"
+#: cmdline/apt-helper.cc
+msgid "Download Failed"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "[upgradable from: %s]"
+msgid "GetSrvRec failed for %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
+#: cmdline/apt-helper.cc
+msgid ""
+"Usage: apt-helper [options] command\n"
+"       apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper bundles a variety of commands for shell scripts to use\n"
+"e.g. the same proxy configuration or acquire system as APT would.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: cmdline/apt-helper.cc
+msgid "download the given uri to the target-path"
+msgstr ""

 
 

-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
+#: cmdline/apt-helper.cc
+msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
+msgstr ""

 
 

-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
+#: cmdline/apt-helper.cc
+msgid "detect proxy using apt.conf"
+msgstr ""

 
 

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

-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " neu"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-
-#: apt-private/private-output.cc:571
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-
-#: apt-private/private-output.cc:592
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+#: 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-output.cc:613
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+#: 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-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+#: cmdline/apt-mark.cc
+#, 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:688
-#, c-format
-msgid "%s (due to %s)"
-msgstr "%s (oherwydd %s)"
+#: 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-output.cc:696
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+#: cmdline/apt-mark.cc
+msgid "Executing dpkg failed. Are you root?"

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

 
 

-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
+#: cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "%s set on hold.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
+#: cmdline/apt-mark.cc
+#, fuzzy, c-format
+msgid "Canceled hold on %s.\n"
+msgstr "Methwyd agor %s"

 
 

-#: apt-private/private-output.cc:735
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+msgid "Selected %s for purge.\n"
+msgstr ""

 
 

-#: apt-private/private-output.cc:739
+#: cmdline/apt-mark.cc

 #, c-format
 #, c-format

-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
+msgid "Selected %s for removal.\n"
+msgstr ""

 
 

-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
+#: cmdline/apt-mark.cc
+#, c-format
+msgid "Selected %s for installation.\n"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
+#: cmdline/apt-mark.cc
+msgid ""
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also be used to\n"
+"manipulate the dpkg(1) selection states of packages, and to list\n"
+"all packages with or without a certain marking.\n"

 msgstr ""
 
 msgstr ""
 

-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "I"
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as automatically installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Mark the given packages as manually installed"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: cmdline/apt-mark.cc
+msgid "Mark a package as held back"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
+#: cmdline/apt-mark.cc
+msgid "Unset a package set as held back"
+msgstr ""

 
 

-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of automatically installed packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-private/private-update.cc:95
-#, 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] ""
+#: cmdline/apt-mark.cc
+#, fuzzy
+msgid "Print the list of manually installed packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"

 
 

-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
+#: cmdline/apt-mark.cc
+msgid "Print the list of package on hold"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
-msgid "Sorting"
+#: cmdline/apt.cc
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"apt is a commandline package manager and provides commands for\n"
+"searching and managing as well as querying information about packages.\n"
+"It provides the same functionality as the specialized APT tools,\n"
+"like apt-get and apt-cache, but enables options more suitable for\n"
+"interactive use by default.\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-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] ""
+#. query
+#: cmdline/apt.cc
+msgid "list packages based on package names"
+msgstr ""

 
 

-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
+#: cmdline/apt.cc
+#, fuzzy
+msgid "search in package descriptions"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: cmdline/apt.cc
+msgid "show package details"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-main.cc:32
-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!"
+#. package stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "install packages"
+msgstr "Pecynnau wedi eu Pinio:"
+
+#: cmdline/apt.cc
+#, fuzzy
+msgid "remove packages"
+msgstr "Pecynnau wedi torri"
+
+#. system wide stuff
+#: cmdline/apt.cc
+#, fuzzy
+msgid "update list of available packages"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt.cc
+msgid "upgrade the system by installing/upgrading packages"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:81
-msgid "Internal error, InstallPackages was called with broken packages!"
+#: cmdline/apt.cc
+msgid "upgrade the system by removing/installing/upgrading packages"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-install.cc:90
+#. misc
+#: cmdline/apt.cc

 #, fuzzy
 #, fuzzy

-msgid "Packages need to be removed but remove is disabled."
-msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
+msgid "edit the source information file"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: methods/cdrom.cc
+#, c-format
+msgid "Unable to read the cdrom database %s"
+msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"

 
 

-#: apt-private/private-install.cc:109
+#: methods/cdrom.cc

 #, fuzzy
 #, fuzzy

-msgid "Internal error, Ordering didn't finish"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."

 
 

-#: apt-private/private-install.cc:147
-msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
+#: methods/cdrom.cc
+#, fuzzy
+msgid "Wrong CD-ROM"
+msgstr "CD Anghywir"
+
+#: methods/cdrom.cc
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."

 msgstr ""
 msgstr ""

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

 
 

-#. 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:154
+#: methods/cdrom.cc
+#, fuzzy
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/cdrom.cc methods/file.cc methods/rsh.cc
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/connect.cc

 #, c-format
 #, c-format

-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"

 
 

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

 #, c-format
 #, c-format

-msgid "Need to get %sB of archives.\n"
-msgstr "Mae angen cyrchu %sB o archifau.\n"
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"

 
 

-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:166
-#, fuzzy, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
+#: methods/connect.cc
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"

 
 

-#. 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:171
-#, fuzzy, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
+#: methods/connect.cc
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."

 
 

-#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+#: 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:191 apt-private/private-install.cc:213
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
+#: methods/connect.cc methods/ftp.cc methods/rsh.cc
+msgid "Failed"
+msgstr "Methwyd"

 
 

-#. 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:195
-msgid "Yes, do as I say!"
-msgstr "Ie, gwna fel rydw i'n dweud!"
+#: methods/connect.cc
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."
+
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc methods/rsh.cc
+#, c-format
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"
+
+#: methods/connect.cc
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"
+
+#: methods/connect.cc
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"

 
 

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

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

-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"
-" ?]"
+msgid "System error resolving '%s:%s'"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"

 
 

-#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
-msgid "Abort."
-msgstr "Erthylu."
+#: 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-install.cc:218
-msgid "Do you want to continue?"
-msgstr "Ydych chi eisiau mynd ymlaen?"
+#: methods/connect.cc
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Methwyd cysylltu i %s %s:"

 
 

-#: apt-private/private-install.cc:288
-msgid "Some files failed to download"
-msgstr "Methodd rhai ffeiliau lawrlwytho"
+#: methods/copy.cc methods/gzip.cc methods/rred.cc
+msgid "Failed to stat"
+msgstr "Methwyd stat()"

 
 

-#: apt-private/private-install.cc:295
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
-"geidio defnyddio --fix-missing?"
+#: methods/copy.cc methods/gzip.cc methods/rred.cc
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"

 
 

-#: apt-private/private-install.cc:299
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
+#: 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-install.cc:304
-msgid "Unable to correct missing packages."
-msgstr "Ni ellir cywiro pecynnau ar goll."
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc
+msgid "Logging in"
+msgstr "Yn mewngofnodi"

 
 

-#: apt-private/private-install.cc:305
-#, fuzzy
-msgid "Aborting install."
-msgstr "Yn Erthylu'r Sefydliad."
+#: methods/ftp.cc
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"

 
 

-#: apt-private/private-install.cc:341
-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] ""
+#: methods/ftp.cc
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"

 
 

-#: apt-private/private-install.cc:345
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr ""
+#: 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-install.cc:366
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr ""
+#: methods/ftp.cc
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc
+#, c-format
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"

 
 

-#: apt-private/private-install.cc:474
+#: methods/ftp.cc

 msgid ""
 msgid ""

-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
+"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.)"

 
 

-#.
-#. 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:477 apt-private/private-install.cc:627
-msgid "The following information may help to resolve the situation:"
-msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
+# FIXME
+#: methods/ftp.cc
+#, c-format
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"

 
 

-#: apt-private/private-install.cc:481
-#, fuzzy
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+#: methods/ftp.cc
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"

 
 

-#: apt-private/private-install.cc:488
-#, 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:"
+#: methods/ftp.cc methods/rsh.cc
+msgid "Connection timeout"
+msgstr "Goramser cysylltu"

 
 

-#: apt-private/private-install.cc:492
-#, 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:"
+#: methods/ftp.cc
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"

 
 

-#: apt-private/private-install.cc:494
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] ""
-msgstr[1] ""
+#: methods/ftp.cc methods/rsh.cc apt-pkg/contrib/fileutl.cc
+msgid "Read error"
+msgstr "Gwall darllen"

 
 

-#: apt-private/private-install.cc:587
-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/ftp.cc methods/rsh.cc
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."

 
 

-# FIXME
-#: apt-private/private-install.cc:589
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim "
-"pecyn (neu penodwch ddatrys)"
+#: methods/ftp.cc
+msgid "Protocol corruption"
+msgstr "Llygr protocol"

 
 

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

 
 

-#: apt-private/private-install.cc:633
-msgid "Broken packages"
-msgstr "Pecynnau wedi torri"
+#: methods/ftp.cc
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"

 
 

-#: apt-private/private-install.cc:710
-msgid "The following extra packages will be installed:"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+#: methods/ftp.cc
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"

 
 

-#: apt-private/private-install.cc:800
-msgid "Suggested packages:"
-msgstr "Pecynnau a awgrymmir:"
+#: methods/ftp.cc
+#, fuzzy
+msgid "Could not connect passive socket."
+msgstr "Methwyd cysylltu soced goddefol"

 
 

-#: apt-private/private-install.cc:801
-msgid "Recommended packages:"
-msgstr "Pecynnau a argymhellir:"
+# FIXME
+#: methods/ftp.cc
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"

 
 

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

 
 

-#: apt-private/private-install.cc:827
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+#: methods/ftp.cc
+msgid "Could not listen on the socket"
+msgstr "Methwyd gwrando ar y soced"
+
+#: methods/ftp.cc
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"
+
+#: methods/ftp.cc
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"

 
 

-#: apt-private/private-install.cc:839
+#: methods/ftp.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 "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"

 
 

-#: apt-private/private-install.cc:844
+#: methods/ftp.cc

 #, c-format
 #, c-format

-msgid "%s is already the newest version.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"

 
 

-#: apt-private/private-install.cc:892
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+#: methods/ftp.cc
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"

 
 

-#: apt-private/private-install.cc:897
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+#: methods/ftp.cc
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"

 
 

-#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:939
-#, 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/ftp.cc methods/rsh.cc methods/server.cc
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"

 
 

-#: apt-private/private-install.cc:945
-#, 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/ftp.cc
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+
+#: methods/ftp.cc methods/rsh.cc
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"

 
 

-#: apt-private/private-download.cc:62
+#: methods/ftp.cc

 #, c-format
 #, c-format

-msgid ""
-"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
-"user '%s'."
-msgstr ""
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"

 
 

-#: apt-private/private-download.cc:94
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+#. Get the files information
+#: methods/ftp.cc
+msgid "Query"
+msgstr "Ymholiad"

 
 

-#: apt-private/private-download.cc:98
-msgid "Authentication warning overridden.\n"
+# FIXME
+#: methods/ftp.cc
+msgid "Unable to invoke "
+msgstr "Methwyd gweithredu "
+
+#: methods/gpgv.cc
+msgid "At least one invalid signature was encountered."

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
-#, fuzzy
-msgid "Some packages could not be authenticated"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+#: methods/gpgv.cc
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""

 
 

-#: apt-private/private-download.cc:108
-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:149 apt-pkg/update.cc:77
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc

 #, c-format
 #, c-format

-msgid "Failed to fetch %s  %s\n"
-msgstr "Methwyd cyrchu %s  %s\n"
-
-#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
-#, fuzzy, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""

 
 

-#: apt-private/private-download.cc:188
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Does dim digon o le rhydd gennych yn %s."
+#: methods/gpgv.cc
+msgid "Unknown error executing apt-key"
+msgstr ""

 
 

-#: apt-private/private-sources.cc:58
-#, fuzzy, c-format
-msgid "Failed to parse %s. Edit again? "
-msgstr "Methwyd ailenwi %s at %s"
+#: methods/gpgv.cc
+#, fuzzy
+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"

 
 

-#: apt-private/private-sources.cc:70
-#, c-format
-msgid "Your '%s' file changed, please run 'apt-get update'."
+#: methods/gpgv.cc
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/private-search.cc:69
-msgid "Full Text Search"
+#: methods/gzip.cc
+msgid "Empty files can't be valid archives"

 msgstr ""
 
 msgstr ""
 

-#: apt-private/acqprogress.cc:66
-#, c-format
-msgid "Hit:%lu %s"
-msgstr "Presennol:%lu %s"
+#: methods/http.cc
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"

 
 

-#: apt-private/acqprogress.cc:88
-#, c-format
-msgid "Get:%lu %s"
-msgstr "Cyrchu:%lu %s"
+#: 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:119
-#, c-format
-msgid "Ign:%lu %s"
-msgstr "Anwybyddu:%lu %s"
+#: methods/http.cc
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"

 
 

-#: apt-private/acqprogress.cc:126
-#, c-format
-msgid "Err:%lu %s"
-msgstr "Gwall:%lu %s"
+#: methods/http.cc
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"

 
 

-#: apt-private/acqprogress.cc:150
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
+#: methods/http.cc
+msgid "Select failed"
+msgstr "Methwyd dewis"

 
 

-#: apt-private/acqprogress.cc:240
-#, c-format
-msgid " [Working]"
-msgstr " [Gweithio]"
+#: methods/http.cc
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"

 
 

-#: apt-private/acqprogress.cc:301
-#, 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 "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-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
-#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
-#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
-#: apt-inst/extract.cc:471
+#: 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:563
-#: apt-pkg/acquire.cc:588 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
-#, fuzzy, c-format
-msgid "No entry found in mirror file '%s'"
-msgstr "Methwyd agor ffeil %s"
+#: methods/mirror.cc
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Methwyd agor ffeil %s"
+
+#: methods/mirror.cc
+#, c-format
+msgid "[Mirror: %s]"
+msgstr ""
+
+#: methods/rsh.cc ftparchive/multicompress.cc
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Methwyd creu pibell cyfathrebu at isbroses"
+
+#: methods/rsh.cc
+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/mirror.cc:445
+#: methods/server.cc

 #, c-format
 #, c-format

-msgid "[Mirror: %s]"
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"

 msgstr ""
 
 msgstr ""
 

-#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Methwyd creu pibell cyfathrebu at isbroses"
-
-#: methods/rsh.cc:346
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
+#: methods/server.cc
+msgid "Internal error"
+msgstr "Gwall mewnol"

 
 #: dselect/install:33
 msgid "Bad default setting!"
 
 #: dselect/install:33
 msgid "Bad default setting!"


@@ -1803,7 +1932,8 @@ msgstr "Rhagosodiad gwael!"
 
 #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
 #: dselect/install:106 dselect/update:45
 
 #: 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


@@ -1837,19 +1967,14 @@ msgid "Merging available information"
 msgstr "Yn cyfuno manylion Ar Gael"
 
 # FIXME: "debian"
 msgstr "Yn cyfuno manylion Ar Gael"
 
 # FIXME: "debian"

-#: cmdline/apt-extracttemplates.cc:229
+#: cmdline/apt-extracttemplates.cc

 #, fuzzy
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 #, 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-extracttemplates is used to extract config and template files\n"
+"from debian packages. It is used mainly by debconf(1) to prompt for\n"
+"configuration questions before installation of packages.\n"

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


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

-#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc

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

-#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
-#: apt-pkg/contrib/fileutl.cc:2097
+#: cmdline/apt-extracttemplates.cc apt-pkg/contrib/fileutl.cc

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

-#: cmdline/apt-extracttemplates.cc:305
+#: cmdline/apt-extracttemplates.cc

 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
 

-#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"resolver for the APT family like an external one, for debugging or\n"
+"the like.\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
+
+#: cmdline/apt-sortpkgs.cc
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"
+
+#: cmdline/apt-sortpkgs.cc
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package information files.\n"
+"By default it sorts by binary package information, but the -s option\n"
+"can be used to switch to source package ordering instead.\n"
+msgstr ""
+
+#: ftparchive/apt-ftparchive.cc

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

-#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
-#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
-#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
+#: ftparchive/apt-ftparchive.cc

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

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

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

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

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

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

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

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

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


@@ -1984,733 +2140,488 @@ msgstr ""
 "  -c=?        Darllen y ffeil cyfluniad hwn\n"
 "  -o=?        Gosod opsiwn cyfluniad mympwyol"
 
 "  -c=?        Darllen y ffeil cyfluniad hwn\n"
 "  -o=?        Gosod opsiwn cyfluniad mympwyol"
 

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

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

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

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

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

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

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

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

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

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

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

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

-#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
-#: apt-inst/extract.cc:216
+#: ftparchive/cachedb.cc apt-inst/extract.cc

 #, c-format
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
 
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Methodd stat() o %s"
 

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

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

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

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

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

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

-#: ftparchive/writer.cc:104
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-
-#: ftparchive/writer.cc:109
-#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-
-#: ftparchive/writer.cc:165
-msgid "E: "
-msgstr "G: "
-
-#: ftparchive/writer.cc:167
-msgid "W: "
-msgstr "Rh: "
-
-#: ftparchive/writer.cc:174
-msgid "E: Errors apply to file "
-msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
-#, c-format
-msgid "Failed to resolve %s"
-msgstr "Methwyd datrys %s"
-
-#: ftparchive/writer.cc:205
-msgid "Tree walking failed"
-msgstr "Methwyd cerdded y goeden"
-
-#: ftparchive/writer.cc:232
-#, c-format
-msgid "Failed to open %s"
-msgstr "Methwyd agor %s"
-
-# FIXME
-#: ftparchive/writer.cc:291
-#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
-
-#: ftparchive/writer.cc:299
-#, c-format
-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
-
-#: ftparchive/writer.cc:303
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
-
-#: ftparchive/writer.cc:311
-#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
-
-#: ftparchive/writer.cc:321
-#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
-
-#: ftparchive/writer.cc:427
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
-
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
-#, c-format
-msgid "  %s has no override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
-
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
-#, c-format
-msgid "  %s maintainer is %s not %s\n"
-msgstr "  Cynaliwr %s yw %s nid %s\n"
-
-#: ftparchive/writer.cc:712
-#, fuzzy, c-format
-msgid "  %s has no source override entry\n"
-msgstr "  Does dim cofnod gwrthwneud gan %s\n"
-
-#: ftparchive/writer.cc:716
-#, 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
+#: ftparchive/contents.cc

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

-#: ftparchive/override.cc:38 ftparchive/override.cc:142
-#, 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"
-
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
-
-#: ftparchive/override.cc:166
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-
-#: ftparchive/override.cc:178
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
-
-#: ftparchive/override.cc:191
-#, fuzzy, c-format
-msgid "Malformed override %s line %llu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
-
-#: ftparchive/multicompress.cc:73
+#: ftparchive/multicompress.cc

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

-#: ftparchive/multicompress.cc:103
+#: ftparchive/multicompress.cc

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

-#: ftparchive/multicompress.cc:192
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
-
-#: ftparchive/multicompress.cc:195
+#: ftparchive/multicompress.cc

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

-#: ftparchive/multicompress.cc:209
+#: ftparchive/multicompress.cc

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

-#: ftparchive/multicompress.cc:232
-#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
-
-#: ftparchive/multicompress.cc:305
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
-
-#: ftparchive/multicompress.cc:343
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
-
-#: ftparchive/multicompress.cc:359
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
-
-#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
-
-# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:51
-#, 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"
-
-#: cmdline/apt-sortpkgs.cc:91
-msgid "Unknown package record!"
-msgstr "Cofnod pecyn anhysbys!"
-
-#: cmdline/apt-sortpkgs.cc:155
-#, fuzzy
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-"  -h   This help text\n"
-"  -s   Use source file sorting\n"
-"  -c=? Read this configuration file\n"
-"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
-"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
-"\n"
-"Opsiynnau:\n"
-"  -h   Y testun cymorth hwn\n"
-"  -s   Defnyddio trefnu ffeil ffynhonell\n"
-"  -c=? Darllen y ffeil cyfluniad hwn\n"
-"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-
-#: apt-pkg/install-progress.cc:59
-#, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
-msgid "Running dpkg"
-msgstr ""
-
-#: apt-pkg/init.cc:156
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
-
-#: apt-pkg/init.cc:172
-#, fuzzy
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:515
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Camgyfatebiaeth swm MD5"
-
-#: apt-pkg/acquire-worker.cc:133
-#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
-
-#: apt-pkg/acquire-worker.cc:135
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
-
-#: apt-pkg/acquire-worker.cc:186
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
-
-#: apt-pkg/acquire-worker.cc:485
+#: ftparchive/multicompress.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"
-
-#: 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."
-
-#: 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."
-
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"

 
 

-#: apt-pkg/pkgcache.cc:154
-msgid "Empty package cache"
-msgstr "Storfa pecyn gwag"
+#: ftparchive/multicompress.cc
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"

 
 

-#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
-msgid "The package cache file is corrupted"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+#: ftparchive/multicompress.cc
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"

 
 

-#: apt-pkg/pkgcache.cc:165
-msgid "The package cache file is an incompatible version"
-msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+#: 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:168
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+#: ftparchive/override.cc
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"

 
 

-# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:175
+#. skip spaces
+#. find end of word
+#: 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 (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"

 
 

-#: apt-pkg/pkgcache.cc:185
+#: ftparchive/override.cc

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

-msgid "The package cache was built for different architectures: %s vs %s"
-msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
+msgid "Malformed override %s line %llu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"

 
 

-#: apt-pkg/pkgcache.cc:322
-msgid "Depends"
-msgstr "Dibynnu"
+#: ftparchive/override.cc
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"

 
 

-#: apt-pkg/pkgcache.cc:322
-msgid "PreDepends"
-msgstr "CynDdibynnu"
+#: ftparchive/override.cc
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"

 
 

-#: apt-pkg/pkgcache.cc:322
-msgid "Suggests"
-msgstr "Awgrymu"
+#: 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:323
-msgid "Recommends"
-msgstr "Argymell"
+#: 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:323
-msgid "Conflicts"
-msgstr "Gwrthdaro"
+#: ftparchive/writer.cc
+msgid "E: "
+msgstr "G: "

 
 

-#: apt-pkg/pkgcache.cc:323
-msgid "Replaces"
-msgstr "Amnewid"
+#: ftparchive/writer.cc
+msgid "W: "
+msgstr "Rh: "

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

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

 
 

-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
-#, fuzzy
-msgid "Calculating upgrade"
-msgstr "Yn Cyfrifo'r Uwchraddiad"
+#: ftparchive/writer.cc
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"

 
 

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

 #, c-format
 #, c-format

-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+msgid "  %s has no override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: 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)"
+#: ftparchive/writer.cc
+#, c-format
+msgid "  %s maintainer is %s not %s\n"
+msgstr "  Cynaliwr %s yw %s nid %s\n"

 
 

-#: apt-pkg/sourcelist.cc:170
+#: ftparchive/writer.cc

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

-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgid "  %s has no source override entry\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: apt-pkg/sourcelist.cc:173
+#: ftparchive/writer.cc

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

-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+msgid "  %s has no binary override entry either\n"
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"

 
 

-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"

 
 

-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-inst/contrib/arfile.cc
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"

 
 

-#: apt-pkg/sourcelist.cc:193
+#: apt-inst/contrib/arfile.cc

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

-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"

 
 

-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+#: apt-inst/contrib/arfile.cc
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"

 
 

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

 
 

-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+#: apt-inst/contrib/arfile.cc
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"

 
 

-#: apt-pkg/sourcelist.cc:217
+#: apt-inst/contrib/extracttar.cc

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

-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+msgid "Cannot find a configured compressor for '%s'"
+msgstr "Methwyd canfod pecyn %s"

 
 

-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-inst/contrib/extracttar.cc
+msgid "Corrupted archive"
+msgstr "Archif llygredig"

 
 

-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
+#: apt-inst/contrib/extracttar.cc
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"

 
 

-#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#: apt-inst/contrib/extracttar.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."
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"

 
 

-#: apt-pkg/sourcelist.cc:371
+#: apt-inst/deb/debfile.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 "This is not a valid DEB archive, missing '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"

 
 

-#: apt-pkg/sourcelist.cc:375
+#: apt-inst/deb/debfile.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 "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"

 
 

-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+#: apt-inst/deb/debfile.cc
+#, fuzzy
+msgid "Unparsable control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"

 
 

-#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#: apt-inst/dirstream.cc

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

-msgid "Clean of %s is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+msgid "Failed to write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"

 
 

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

 #, c-format
 #, c-format

-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"

 
 

-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
+#: apt-inst/extract.cc
+#, c-format
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"

 
 

-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 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:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+#: apt-inst/extract.cc
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"

 
 

-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei  drin."
+#: apt-inst/extract.cc
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"

 
 

-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
+#: apt-inst/extract.cc
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"

 
 

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

 
 

-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-inst/extract.cc
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"

 msgstr ""
 msgstr ""

-"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+
+#: apt-inst/extract.cc
+msgid "Failed to locate node in its hash bucket"
+msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
+
+#: apt-inst/extract.cc
+msgid "The path is too long"
+msgstr "Mae'r llwybr yn rhy hir"

 
 

-#: apt-pkg/pkgcachegen.cc:591
+# 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:1196
+#: 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:1284 apt-pkg/pkgcachegen.cc:1388
-#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
-#, 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-pkg/pkgcachegen.cc:1301
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
+#: apt-inst/filelist.cc
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"

 
 

-#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+#: apt-inst/filelist.cc
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"

 
 

-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
+#: apt-inst/filelist.cc
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"

 
 

-#: apt-pkg/edsp.cc:244
-msgid "Send request to solver"
-msgstr ""
+#: apt-inst/filelist.cc
+#, fuzzy
+msgid "Internal error in AddDiversion"
+msgstr "Gwall Mewnol yn AddDiversion"

 
 

-#: apt-pkg/edsp.cc:323
-msgid "Prepare for receiving solution"
-msgstr ""
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
+
+# FIXME: "the"
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+
+#: apt-inst/filelist.cc
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"

 
 

-#: apt-pkg/edsp.cc:330
-msgid "External solver failed without a proper error message"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Updating from such a repository can't be done securely, and is therefore "
+"disabled by default."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
-msgid "Execute external solver"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"Data from such a repository can't be authenticated and is therefore "
+"potentially dangerous to use."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:98
-msgid "Use --allow-insecure-repositories to force the update"
+#: apt-pkg/acquire-item.cc
+msgid ""
+"See apt-secure(8) manpage for repository creation and user configuration "
+"details."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc

 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 

-#: apt-pkg/acquire-item.cc:240
+#: apt-pkg/acquire-item.cc

 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 

-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc

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

-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc

 #, fuzzy
 msgid "Invalid file format"
 msgstr "Gweithred annilys %s"
 
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Gweithred annilys %s"
 

-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc

 #, fuzzy
 msgid "Signature error"
 msgstr "Gwall ysgrifennu"
 
 #, fuzzy
 msgid "Signature error"
 msgstr "Gwall ysgrifennu"
 

-#: apt-pkg/acquire-item.cc:259
-msgid "Does not start with a cleartext signature"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1584
+#: apt-pkg/acquire-item.cc

 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
 #, 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"
+"updated and the previous index files will be used. GPG error: %s: %s"

 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)

-#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#: apt-pkg/acquire-item.cc

 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1707
-#, fuzzy, c-format
-msgid "The repository '%s' is no longer signed."
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-
-#: apt-pkg/acquire-item.cc:1714
-msgid ""
-"This is normally not allowed, but the option Acquire::"
-"AllowDowngradeToInsecureRepositories was given to override it."
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
+#: apt-pkg/acquire-item.cc

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

-"The data from '%s' is not signed. Packages from that repository can not be "
-"authenticated."
+"Skipping acquire of configured file '%s' as repository '%s' doesn't support "
+"architecture '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1956
+#: apt-pkg/acquire-item.cc

 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 

-# FIXME: number?
-#: apt-pkg/acquire-item.cc:1975
-#, 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
+#, c-format
+msgid ""
+"Skipping acquire of configured file '%s' as repository '%s' provides only "
+"weak security information for it"
+msgstr ""

 
 

-#: apt-pkg/acquire-item.cc:1999
+#: apt-pkg/acquire-item.cc

 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:2037
+#. 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 ""
 
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:2059
+#: apt-pkg/acquire-item.cc

 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:2078
-#, c-format
+#. No Release file was present, or verification failed, so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the user explicitly wants it
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is not signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#. No Release file was present so fall
+#. back to queueing Packages files without verification
+#. only allow going further if the user explicitly wants it
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' does not have a Release file."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-pkg/acquire-item.cc
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+
+#: apt-pkg/acquire-item.cc

 msgid ""
 msgid ""

-"The repository '%s' does not have a Release file. This is deprecated, please "
-"contact the owner of the repository."
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."

 msgstr ""
 
 # FIXME: case
 msgstr ""
 
 # FIXME: case

-#: apt-pkg/acquire-item.cc:2249
+#: apt-pkg/acquire-item.cc

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "


@@ -2719,969 +2630,1307 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 

-#: apt-pkg/acquire-item.cc:2315
+#: apt-pkg/acquire-item.cc

 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:2351
+#: apt-pkg/acquire-item.cc

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 

-#: apt-pkg/vendorlist.cc:83
+#. 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/acquire-worker.cc
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
+
+#: apt-pkg/acquire-worker.cc
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc

 #, c-format
 #, c-format

-msgid "Vendor block %s contains no fingerprint"
-msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+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 ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"

 
 

-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
+#: 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:129 apt-pkg/acquire.cc:151
+#: 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:162
+#: 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 "No sandbox user '%s' on the system, can not drop privileges"
+msgstr ""
+
+#: 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:981
+#: 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:983
+#: 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"
 

-# FIXME: ...file
-#: apt-pkg/srcrecords.cc:53
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/algorithms.cc

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

-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr ""
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
+"ei gyfer."
+
+#: apt-pkg/algorithms.cc
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."

 msgstr ""
 msgstr ""

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

 
 

-# 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'"
+#: 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."

 
 

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

 #, c-format
 #, c-format

-msgid "Did not understand pin type %s"
-msgstr "Methwyd daeall y math pin %s"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"

 
 

-#: 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/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/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
+#: apt-pkg/cacheset.cc

 #, c-format
 #, c-format

-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select versions from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Methwyd agor ffeil %s"
+#: apt-pkg/cacheset.cc
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""

 
 

-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:643
+#: apt-pkg/cacheset.cc

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

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

 msgid ""
 msgid ""

-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"

 msgstr ""
 msgstr ""

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

 
 

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

 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD Anghywir"
 
 #, fuzzy
 msgid "Unmounting CD-ROM...\n"
 msgstr "CD Anghywir"
 

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

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:599
+#: apt-pkg/cdrom.cc

 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Yn aros am benawdau"
 
 #, fuzzy
 msgid "Waiting for disc...\n"
 msgstr "Yn aros am benawdau"
 

-#: apt-pkg/cdrom.cc:609
+#: apt-pkg/cdrom.cc

 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:620
+#: apt-pkg/cdrom.cc

 msgid "Identifying... "
 msgstr ""
 
 msgid "Identifying... "
 msgstr ""
 

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

 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:680
+#: apt-pkg/cdrom.cc

 msgid "Scanning disc for index files...\n"
 msgstr ""
 
 msgid "Scanning disc for index files...\n"
 msgstr ""
 

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

 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc

 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:771
+#: apt-pkg/cdrom.cc

 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:800
+#: apt-pkg/cdrom.cc

 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 

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

 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:819
+#: apt-pkg/cdrom.cc

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

-#: apt-pkg/cdrom.cc:866
+#: apt-pkg/cdrom.cc

 #, fuzzy
 msgid "Writing new source list\n"
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
 #, fuzzy
 msgid "Writing new source list\n"
 msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 

-#: apt-pkg/cdrom.cc:877
+#: apt-pkg/cdrom.cc

 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
-"ei gyfer."
-
-#: apt-pkg/algorithms.cc:1090
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
-"ei achosi gan pecynnau wedi eu dal."
-
-#: apt-pkg/algorithms.cc:1092
-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/depcache.cc:138 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
-
-#: apt-pkg/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."

 
 

-#: apt-pkg/depcache.cc:168
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-pkg/contrib/cdromutl.cc
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"

 
 

-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+#: apt-pkg/contrib/cdromutl.cc
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"

 
 

-#: apt-pkg/depcache.cc:252
+# FIXME
+#: apt-pkg/contrib/cmndline.cc

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

-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %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/depcache.cc:258
+#: apt-pkg/contrib/cmndline.cc

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

-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
-
-#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
-#, c-format
-msgid "Unable to parse package file %s (%d)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
+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:501
+#: 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:504
+#: 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' "
-
-#: apt-pkg/cacheset.cc:629
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: apt-pkg/cacheset.cc:635
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Methwyd canfod pecyn %s"
-
-#: apt-pkg/cacheset.cc:641
-#, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgid "Option %s requires an argument."
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."

 
 

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

 #, c-format
 #, c-format

-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."

 
 

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

 #, c-format
 #, c-format

-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"

 
 

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

 #, c-format
 #, c-format

-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"

 
 

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

 #, c-format
 #, c-format

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

 
 

-#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
+#: 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 ""
-
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"

 
 

-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"

 
 

-#: apt-pkg/indexrecords.cc:132
+#: apt-pkg/contrib/configuration.cc

 #, c-format
 #, c-format

-msgid "No Hash entry in Release file %s"
-msgstr ""
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

-#: apt-pkg/indexrecords.cc:145
-#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+#: apt-pkg/contrib/configuration.cc
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."

 
 

-# FIXME: number?
-#: apt-pkg/indexrecords.cc:164
+# FIXME
+#: apt-pkg/contrib/configuration.cc

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

-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"

 
 

-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#: 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:432
+#: 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:439
+#: 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:444
+#: 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:1290
+#: 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
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Gwall wrth dadgysylltu'r ffeil"

 
 

-#: apt-pkg/contrib/fileutl.cc:196
+#: 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:201
+#: 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:224
+#: 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:229
+#: 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:366 apt-pkg/contrib/fileutl.cc:480
+#: 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:400
+#: 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:418
+#: 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:427
+#: 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:846
+#: apt-pkg/contrib/fileutl.cc apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"
+
+#: apt-pkg/contrib/fileutl.cc

 #, 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:848
+#: 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:852 apt-pkg/contrib/gpgv.cc:212
+#: 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:854 apt-pkg/contrib/gpgv.cc:205
+#: 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:952
+#: 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:1140
+#: apt-pkg/contrib/fileutl.cc
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"
+
+#: apt-pkg/contrib/fileutl.cc
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "
+
+#: 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:1199 apt-pkg/contrib/fileutl.cc:1246
+#: 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:1354 apt-pkg/contrib/fileutl.cc:2123
-msgid "Failed to create subprocess IPC"
-msgstr "Methwyd creu isbroses IPC"
-
-#: apt-pkg/contrib/fileutl.cc:1412
-msgid "Failed to exec compressor "
-msgstr "Methwyd gweithredu cywasgydd "
-

 # FIXME
 # FIXME

-#: apt-pkg/contrib/fileutl.cc:1553
+#: 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:1666 apt-pkg/contrib/fileutl.cc:1688
+#: 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:1954
+#: 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:1965
+#: 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:1976
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Gwall wrth dadgysylltu'r ffeil"
-
-#: apt-pkg/contrib/fileutl.cc:1989
+#: 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
+#: apt-pkg/contrib/mmap.cc
+msgid "Can't mmap an empty file"
+msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+
+#: apt-pkg/contrib/mmap.cc
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/mmap.cc
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: apt-pkg/contrib/mmap.cc
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ni ellir agor %s"
+
+# FIXME
+#: apt-pkg/contrib/mmap.cc
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Methwyd gweithredu "
+
+#: apt-pkg/contrib/mmap.cc
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/mmap.cc
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: 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 ""
+
+#: apt-pkg/contrib/mmap.cc
+#, c-format
+msgid ""
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
+
+#: apt-pkg/contrib/progress.cc

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

-#: apt-pkg/contrib/progress.cc:150
+#: apt-pkg/contrib/progress.cc

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

-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
+#: apt-pkg/contrib/progress.cc
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"
+
+#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. TRANSLATOR: min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. TRANSLATOR: s means seconds
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
+
+#. 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 ""
+
+#. TRANSLATOR: an identifier like Packages; Releasefile key indicating
+#. a file like main/binary-amd64/Packages; filename and linenumber of
+#. two sources.list entries
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Target %s (%s) is configured multiple times in %s and %s"
+msgstr ""
+
+# FIXME: number?
+#: apt-pkg/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+
+#: 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/deb/debmetaindex.cc
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid ""
+"No Hash entry in Release file %s, which is considered strong enough for "
+"security purposes"
+msgstr ""
+
+# 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/deb/debmetaindex.cc
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+
+#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Conflicting values set for option %s regarding source %s %s"
+msgstr ""
+
+#: apt-pkg/deb/debmetaindex.cc
+#, c-format
+msgid "Invalid value set for option %s regarding source %s %s (%s)"
+msgstr ""
+
+#: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
+#, c-format
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
+
+#: apt-pkg/deb/debsystem.cc
+#, c-format
+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"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc
+#, c-format
+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
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr "  Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Methwyd agor ffeil %s"
+
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr "  Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc
+#, c-format
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
+#: apt-pkg/deb/dpkgpm.cc

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

-msgid "%c%s... %u%%"
-msgstr "%c%s... Wedi Gorffen"
+msgid "Removed %s"
+msgstr "Argymell"

 
 

-#: apt-pkg/contrib/mmap.cc:79
-msgid "Can't mmap an empty file"
-msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+#: apt-pkg/deb/dpkgpm.cc
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"

 
 

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

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

-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Methwyd agor pibell ar gyfer %s"
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"

 
 

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

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

-msgid "Couldn't make mmap of %llu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
+msgid "Can not write log (%s)"
+msgstr "Ni ellir ysgrifennu i %s"

 
 

-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Ni ellir agor %s"
+#: apt-pkg/deb/dpkgpm.cc
+msgid "Is /dev/pts mounted?"
+msgstr ""

 
 

-# FIXME
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Methwyd gweithredu "
+#: apt-pkg/deb/dpkgpm.cc
+msgid "Operation was interrupted before it could finish"
+msgstr ""

 
 

-#: apt-pkg/contrib/mmap.cc:290
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
+#: apt-pkg/deb/dpkgpm.cc
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""

 
 

-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc
+msgid "dependency problems - leaving unconfigured"
+msgstr ""

 
 

-#: apt-pkg/contrib/mmap.cc:341
-#, c-format
+#: apt-pkg/deb/dpkgpm.cc

 msgid ""
 msgid ""

-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
-"Current value: %lu. (man 5 apt.conf)"
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:446
-#, c-format
+#: apt-pkg/deb/dpkgpm.cc

 msgid ""
 msgid ""

-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+"No apport report written because the error message indicates a disk full "
+"error"

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 msgid ""

-"Unable to increase size of the MMap as automatic growing is disabled by user."
+"No apport report written because the error message indicates a out of memory "
+"error"

 msgstr ""
 
 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/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""

 
 

-#: apt-pkg/contrib/cdromutl.cc:246
-msgid "Failed to stat the cdrom"
-msgstr "Methwyd gwneud stat() o'r CD-ROM"
+#: apt-pkg/deb/dpkgpm.cc
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""

 
 

-#: apt-pkg/contrib/configuration.cc:522
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
+#: apt-pkg/depcache.cc
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"

 
 

-#: apt-pkg/contrib/configuration.cc:636
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#: apt-pkg/depcache.cc
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"

 
 

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

 
 

-# FIXME
-#: apt-pkg/contrib/configuration.cc:823
+#: apt-pkg/depcache.cc
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
+
+#: apt-pkg/depcache.cc

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

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

 
 

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

 
 

-#: apt-pkg/contrib/configuration.cc:880
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+#: apt-pkg/edsp.cc
+msgid "Send scenario to solver"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/contrib/configuration.cc:887
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+#: apt-pkg/edsp.cc
+msgid "Send request to solver"
+msgstr ""

 
 

-#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+#: apt-pkg/edsp.cc
+msgid "Prepare for receiving solution"
+msgstr ""

 
 

-#: apt-pkg/contrib/configuration.cc:900
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+#: apt-pkg/edsp.cc
+msgid "External solver failed without a proper error message"
+msgstr ""

 
 

-#: apt-pkg/contrib/configuration.cc:903
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/edsp.cc
+msgid "Execute external solver"

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/contrib/configuration.cc:953
+#: apt-pkg/indexcopy.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 "Wrote %i records.\n"
+msgstr ""

 
 

-# FIXME
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/indexcopy.cc

 #, c-format
 #, c-format

-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "Command line option %s is not understood"
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:174
+#: apt-pkg/indexcopy.cc

 #, c-format
 #, c-format

-msgid "Command line option %s is not boolean"
-msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/indexcopy.cc

 #, c-format
 #, c-format

-msgid "Option %s requires an argument."
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+msgid "Can't find authentication record for: %s"
+msgstr ""

 
 

-#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+#: apt-pkg/indexcopy.cc
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"

 
 

-#: apt-pkg/contrib/cmndline.cc:284
+#: apt-pkg/init.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 "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"

 
 

-#: apt-pkg/contrib/cmndline.cc:315
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
+#: apt-pkg/init.cc
+#, fuzzy
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni ellir canfod math system addas"

 
 

-# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:347
+#: apt-pkg/install-progress.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 "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc
+msgid "Running dpkg"
+msgstr ""

 
 

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

 #, c-format
 #, c-format

-msgid "Invalid operation %s"
-msgstr "Gweithred annilys %s"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""

 
 

-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/packagemanager.cc

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

-msgid "Installing %s"
-msgstr "  Wedi Sefydlu: "
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"

 
 

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

 
 

-#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
+#: apt-pkg/pkgcache.cc
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"

 
 

-#: apt-pkg/deb/dpkgpm.cc:115
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Methwyd dileu %s"
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"

 
 

-#: apt-pkg/deb/dpkgpm.cc:116
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+#: apt-pkg/pkgcache.cc
+msgid "The package cache file is an incompatible version"
+msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"

 
 

-#: apt-pkg/deb/dpkgpm.cc:117
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
+#: 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: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:839
+# FIXME: capitalisation?
+#: apt-pkg/pkgcache.cc

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

-msgid "Directory '%s' missing"
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"

 
 

-#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#: apt-pkg/pkgcache.cc

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

-msgid "Could not open file '%s'"
-msgstr "Methwyd agor ffeil %s"
+msgid "The package cache was built for different architectures: %s vs %s"
+msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1001
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Yn agor %s"
+#: apt-pkg/pkgcache.cc
+msgid "Depends"
+msgstr "Dibynnu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1002
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Yn agor %s"
+#: apt-pkg/pkgcache.cc
+msgid "PreDepends"
+msgstr "CynDdibynnu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1007
-#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#: apt-pkg/pkgcache.cc
+msgid "Suggests"
+msgstr "Awgrymu"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1009
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr "  Wedi Sefydlu: "
+#: apt-pkg/pkgcache.cc
+msgid "Recommends"
+msgstr "Argymell"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1014
-#, c-format
-msgid "Preparing for removal of %s"
+#: apt-pkg/pkgcache.cc
+msgid "Conflicts"
+msgstr "Gwrthdaro"
+
+#: apt-pkg/pkgcache.cc
+msgid "Replaces"
+msgstr "Amnewid"
+
+#: apt-pkg/pkgcache.cc
+msgid "Obsoletes"
+msgstr "Darfodi"
+
+#: apt-pkg/pkgcache.cc
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc
+msgid "Enhances"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1016
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Argymell"
+#: apt-pkg/pkgcache.cc
+msgid "required"
+msgstr "angenrheidiol"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1021
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#: apt-pkg/pkgcache.cc
+msgid "important"
+msgstr "pwysig"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1022
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
+#: apt-pkg/pkgcache.cc
+msgid "standard"
+msgstr "safonnol"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ni ellir ysgrifennu i %s"
+#: apt-pkg/pkgcache.cc
+msgid "optional"
+msgstr "opsiynnol"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
-msgid "Is /dev/pts mounted?"
-msgstr ""
+#: apt-pkg/pkgcache.cc
+msgid "extra"
+msgstr "ychwanegol"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1656
-msgid "Operation was interrupted before it could finish"
-msgstr ""
+#: apt-pkg/pkgcachegen.cc
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1718
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+#. 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)"

 
 

-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1723
-msgid "dependency problems - leaving unconfigured"
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of package names this APT is capable of."

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/deb/dpkgpm.cc:1725
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."

 
 

-#: apt-pkg/deb/dpkgpm.cc:1731
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+#: apt-pkg/pkgcachegen.cc
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."

 
 

-#: apt-pkg/deb/dpkgpm.cc:1738
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
+#: apt-pkg/pkgcachegen.cc
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."

 msgstr ""
 msgstr ""

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

 
 

-#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
+#: apt-pkg/pkgcachegen.cc
+#, fuzzy
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"

 
 

-#: apt-pkg/deb/dpkgpm.cc:1773
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#: apt-pkg/pkgcachegen.cc
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+
+#: apt-pkg/pkgrecords.cc
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"

 
 

-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/policy.cc

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

-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:94
+# FIXME: literal
+#: apt-pkg/policy.cc

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

-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"

 
 

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

 #, c-format
 #, c-format

-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"

 
 

-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+#: apt-pkg/policy.cc
+#, c-format
+msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
-
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
+#: apt-pkg/policy.cc
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"

 
 

-#: apt-inst/filelist.cc:464
-#, fuzzy
-msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
+#. 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
+msgid "Malformed entry %u in %s file %s (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"

 
 

-#: apt-inst/filelist.cc:477
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
+msgid "Opening %s"
+msgstr "Yn agor %s"

 
 

-# FIXME: "the"
-#: apt-inst/filelist.cc:506
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"

 
 

-#: apt-inst/filelist.cc:549
-#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ffeil cyfluniad dyblyg %s/%s"
+#: apt-pkg/sourcelist.cc
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"

 
 

-#: apt-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-pkg/sourcelist.cc
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"

 
 

-#: apt-inst/extract.cc:132
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "Yn dadbacio %s mwy nag unwaith"
+#: apt-pkg/sourcelist.cc
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"

 
 

-#: apt-inst/extract.cc:142
+#: apt-pkg/sourcelist.cc

 #, c-format
 #, c-format

-msgid "The directory %s is diverted"
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+msgid "Unsupported file %s given on commandline"
+msgstr ""
+
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"

 
 

-#: apt-inst/extract.cc:152
+#: apt-pkg/tagfile.cc

 #, c-format
 #, c-format

-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
+msgid "Cannot convert %s to integer: out of range"
+msgstr ""

 
 

-#: 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-pkg/update.cc
+#, fuzzy, c-format
+msgid "Failed to fetch %s  %s"
+msgstr "Methwyd cyrchu %s  %s\n"

 
 

-#: apt-inst/extract.cc:249
-#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+#: apt-pkg/update.cc
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."

 msgstr ""
 msgstr ""

-"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."

 
 

-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
+#: apt-pkg/upgrade.cc
+#, fuzzy
+msgid "Calculating upgrade"
+msgstr "Yn Cyfrifo'r Uwchraddiad"

 
 

-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Mae'r llwybr yn rhy hir"
+#~ msgid "Problem unlinking %s"
+#~ msgstr "Gwall wrth datgysylltu %s"

 
 

-# 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"
+#~ msgid "Failed to unlink %s"
+#~ msgstr "Methwyd datgysylltu %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"
+#~ msgid ""
+#~ "Usage: apt-cache [options] command\n"
+#~ "       apt-cache [options] show pkg1 [pkg2 ...]\n"
+#~ "\n"
+#~ "apt-cache is a low-level tool used to query information\n"
+#~ "from APT's binary cache files\n"
+#~ msgstr ""
+#~ "Defnydd: apt-cache [opsiynnau] gorchymyn\n"
+#~ "         apt-cache [opsiynnau] show pecyn1 [pecyn2 ...]\n"
+#~ "\n"
+#~ "Mae apt-cache yn erfyn lefel isel a ddefnyddir i ymdrin a ffeiliau storfa "
+#~ "deuol APT, ac ymholi gwybodaeth ohonynt\n"

 
 

-#: apt-inst/extract.cc:498
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Ni ellir gwneud stat() o %s"
+#~ msgid ""
+#~ "Options:\n"
+#~ "  -h   This help text.\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Opsiynnau:\n"
+#~ "  -h   Y testun cymorth hwn\n"
+#~ "  -c=? Darllen y ffeil cyfluniad\n"
+#~ "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"

 
 

-#: 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"
+#, fuzzy
+#~ msgid ""
+#~ "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+#~ "\n"
+#~ "apt-sortpkgs is a simple tool to sort package files. The -s option is "
+#~ "used\n"
+#~ "to indicate what kind of file it is.\n"
+#~ "\n"
+#~ "Options:\n"
+#~ "  -h   This help text\n"
+#~ "  -s   Use source file sorting\n"
+#~ "  -c=? Read this configuration file\n"
+#~ "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#~ msgstr ""
+#~ "Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+#~ "\n"
+#~ "Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir "
+#~ "yr\n"
+#~ "opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+#~ "\n"
+#~ "Opsiynnau:\n"
+#~ "  -h   Y testun cymorth hwn\n"
+#~ "  -s   Defnyddio trefnu ffeil ffynhonell\n"
+#~ "  -c=? Darllen y ffeil cyfluniad hwn\n"
+#~ "  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+
+#~ msgid "Child process failed"
+#~ msgstr "Methodd proses plentyn"

 
 

-#: apt-inst/dirstream.cc:104
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
+#, fuzzy
+#~ msgid "Must specifc at least one srv record"
+#~ msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"

 
 

-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
-#, 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 "Failed to create pipes"
+#~ msgstr "Methwyd creu pibau"

 
 

-#: apt-inst/deb/debfile.cc:132
-#, fuzzy, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+#~ msgid "Failed to exec gzip "
+#~ msgstr "Methwyd gweithredu gzip"

 
 

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

 #, fuzzy
 #, fuzzy

-msgid "Unparsable control file"
-msgstr "Ffeil rheoli ni ellir ei ramadegu"
+#~ msgid "%s %s for %s compiled on %s %s\n"
+#~ msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"

 
 

-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
+#~ msgid "Failed to create FILE*"
+#~ msgstr "Methwyd creu FILE*"

 
 

-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
+#, fuzzy
+#~ msgid "Malformed stanza %u in source list %s (URI parse)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"

 
 

-#: apt-inst/contrib/arfile.cc:96
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
+#, fuzzy
+#~ msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
+#, fuzzy
+#~ msgid "Malformed line %lu in source list %s ([option] too short)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"

 
 

-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
+#, fuzzy
+#~ msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
+#, 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
+#~ msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"

 
 

-#: apt-inst/contrib/extracttar.cc:128
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
+#~ msgid "Malformed line %lu in source list %s (URI)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"

 
 

-#: apt-inst/contrib/extracttar.cc:155
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip"
+#~ msgid "Malformed line %lu in source list %s (dist)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"

 
 

-#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
+#~ msgid "Malformed line %lu in source list %s (URI parse)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"

 
 

-#: apt-inst/contrib/extracttar.cc:207

 #, fuzzy
 #, fuzzy

-msgid "Tar checksum failed, archive corrupted"
-msgstr "Methodd swm gwirio Tar, archif llygredig"
+#~ msgid "Malformed line %lu in source list %s (absolute dist)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"

 
 

-#: apt-inst/contrib/extracttar.cc:312
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+#~ msgid "Malformed line %lu in source list %s (dist parse)"
+#~ msgstr ""
+#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#~ msgid "Package %s %s was not found while processing file dependencies"
+#~ msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+
+#~ msgid "Couldn't stat source package list %s"
+#~ msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#~ msgid "Collecting File Provides"
+#~ msgstr "Yn Casglu Darpariaethau Ffeil"
+
+# 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"

 
 #, fuzzy
 #~ msgid "Total dependency version space: "
 
 #, fuzzy
 #~ msgid "Total dependency version space: "


@@ -3704,48 +3953,6 @@ msgstr "Math pennawd TAR anhysbys %u, aelod %s"
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "Nid yw %s yn becyn DEB dilys."
 
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "Nid yw %s yn becyn DEB dilys."
 

-#, fuzzy
-#~ msgid "Note, selecting '%s' for task '%s'\n"
-#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-
-#, fuzzy
-#~ msgid "Note, selecting '%s' for regex '%s'\n"
-#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-
-#~ msgid "Package %s is a virtual package provided by:\n"
-#~ msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-
-#, fuzzy
-#~ msgid " [Not candidate version]"
-#~ msgstr "Fersiynau Posib"
-
-#~ msgid "You should explicitly select one to install."
-#~ msgstr "Dylech ddewis un yn benodol i'w sefydlu."
-
-# FIXME: punctuation
-#, 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"
-#~ 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"
-
-#~ msgid "However the following packages replace it:"
-#~ msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-
-#, fuzzy
-#~ msgid "Package '%s' has no installation candidate"
-#~ msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-
-#, fuzzy
-#~ msgid "Note, selecting '%s' instead of '%s'\n"
-#~ msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-

 #, fuzzy
 #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 #~ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 #, fuzzy
 #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 #~ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"