merged from the debian-sid branch

1 files changed, 763 insertions, 317 deletions

diff --git a/po/cy.po b/po/cy.po
index 9ce8a41df..f83831eb6 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,17 +7,13 @@ msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2012-10-16 11:36+0100\n"
-"PO-Revision-Date: 2012-09-07 13:18+0000\n"
-"Last-Translator: Dafydd Harries <Unknown>\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"
 "Language: cy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
-"2 : 3;\n"
-"X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n"
-"X-Generator: Launchpad (build 16130)\n"
 
 #: cmdline/apt-cache.cc:158
 #, c-format
@@ -25,72 +21,88 @@ msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
 
 #: cmdline/apt-cache.cc:286
+#, fuzzy
 msgid "Total package names: "
-msgstr ""
+msgstr "Cyfanswm Enwau Pecynnau : "
 
 #: cmdline/apt-cache.cc:288
+#, fuzzy
 msgid "Total package structures: "
-msgstr ""
+msgstr "Cyfanswm Enwau Pecynnau : "
 
 #: cmdline/apt-cache.cc:328
+#, fuzzy
 msgid "  Normal packages: "
-msgstr ""
+msgstr "  Pecynnau Normal: "
 
 #: cmdline/apt-cache.cc:329
+#, fuzzy
 msgid "  Pure virtual packages: "
-msgstr ""
+msgstr "  Pecynnau Cwbl Rhithwir: "
 
 #: cmdline/apt-cache.cc:330
+#, fuzzy
 msgid "  Single virtual packages: "
-msgstr ""
+msgstr "  Pecynnau Rhithwir Sengl: "
 
 #: cmdline/apt-cache.cc:331
+#, fuzzy
 msgid "  Mixed virtual packages: "
-msgstr ""
+msgstr "  Pecynnau Rhithwir Cymysg: "
 
 #: cmdline/apt-cache.cc:332
 msgid "  Missing: "
 msgstr "  Ar Goll: "
 
 #: cmdline/apt-cache.cc:334
+#, fuzzy
 msgid "Total distinct versions: "
-msgstr ""
+msgstr "Cyfanswm Fersiynau Gwahanol: "
 
 #: cmdline/apt-cache.cc:336
+#, fuzzy
 msgid "Total distinct descriptions: "
-msgstr ""
+msgstr "Cyfanswm Fersiynau Gwahanol: "
 
 #: cmdline/apt-cache.cc:338
+#, fuzzy
 msgid "Total dependencies: "
-msgstr ""
+msgstr "Cyfanswm Dibyniaethau: "
 
 #: cmdline/apt-cache.cc:341
+#, fuzzy
 msgid "Total ver/file relations: "
-msgstr ""
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
 #: cmdline/apt-cache.cc:343
+#, fuzzy
 msgid "Total Desc/File relations: "
-msgstr ""
+msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
 
 #: cmdline/apt-cache.cc:345
+#, fuzzy
 msgid "Total Provides mappings: "
-msgstr ""
+msgstr "Cyfanswm Mapiau Darpariath: "
 
 #: cmdline/apt-cache.cc:357
+#, fuzzy
 msgid "Total globbed strings: "
-msgstr ""
+msgstr "Cyfanswm Llinynau Glob: "
 
 #: cmdline/apt-cache.cc:371
+#, fuzzy
 msgid "Total dependency version space: "
-msgstr ""
+msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
 
 #: cmdline/apt-cache.cc:376
+#, fuzzy
 msgid "Total slack space: "
-msgstr ""
+msgstr "Cyfanswm gofod Slac: "
 
 #: cmdline/apt-cache.cc:384
+#, fuzzy
 msgid "Total space accounted for: "
-msgstr ""
+msgstr "Cyfanswm Gofod Cyfrifwyd: "
 
 #: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
 #, c-format
@@ -104,8 +116,9 @@ msgid "No packages found"
 msgstr "Canfuwyd dim pecyn"
 
 #: cmdline/apt-cache.cc:1222
+#, fuzzy
 msgid "You must give at least one search pattern"
-msgstr ""
+msgstr "Rhaid i chi ddarparu un patrwm yn union"
 
 #: cmdline/apt-cache.cc:1357
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
@@ -117,8 +130,9 @@ msgid "Unable to locate package %s"
 msgstr "Ni ellir lleoli'r pecyn %s"
 
 #: cmdline/apt-cache.cc:1482
+#, fuzzy
 msgid "Package files:"
-msgstr ""
+msgstr "Ffeiliau Pecynnau:"
 
 #: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
 msgid "Cache is out of sync, can't x-ref a package file"
@@ -126,8 +140,9 @@ msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
 
 #. Show any packages have explicit pins
 #: cmdline/apt-cache.cc:1503
+#, fuzzy
 msgid "Pinned packages:"
-msgstr ""
+msgstr "Pecynnau wedi eu Pinio:"
 
 #: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
 msgid "(not found)"
@@ -146,23 +161,26 @@ msgid "(none)"
 msgstr "(dim)"
 
 #: cmdline/apt-cache.cc:1557
+#, fuzzy
 msgid "  Package pin: "
-msgstr ""
+msgstr "  Pin Pecyn: "
 
 #. Show the priority tables
 #: cmdline/apt-cache.cc:1566
+#, fuzzy
 msgid "  Version table:"
-msgstr ""
+msgstr "  Tabl Fersiynnau:"
 
 #: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81
 #: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590
 #: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
-#, c-format
+#, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr ""
+msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
 
 #: cmdline/apt-cache.cc:1686
+#, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -198,19 +216,58 @@ msgid ""
 "  -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:79
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 #: cmdline/apt-cdrom.cc:94
+#, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
 
 #: cmdline/apt-cdrom.cc:129
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
-msgstr ""
+msgstr "Methwyd ailenwi %s at %s"
 
 #: cmdline/apt-cdrom.cc:163
 msgid "Repeat this process for the rest of the CDs in your set."
@@ -221,6 +278,7 @@ msgid "Arguments not in pairs"
 msgstr "Nid yw ymresymiadau mewn parau"
 
 #: cmdline/apt-config.cc:87
+#, fuzzy
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -235,6 +293,18 @@ msgid ""
 "  -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"
 
 #: cmdline/apt-get.cc:135
 msgid "Y"
@@ -292,16 +362,19 @@ msgid "The following packages will be REMOVED:"
 msgstr "Caiff y pecynnau canlynol eu TYNNU:"
 
 #: cmdline/apt-get.cc:446
+#, fuzzy
 msgid "The following packages have been kept back:"
-msgstr ""
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
 
 #: cmdline/apt-get.cc:467
+#, fuzzy
 msgid "The following packages will be upgraded:"
-msgstr ""
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
 
 #: cmdline/apt-get.cc:488
+#, fuzzy
 msgid "The following packages will be DOWNGRADED:"
-msgstr ""
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
 
 #: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
@@ -313,10 +386,14 @@ msgid "%s (due to %s) "
 msgstr "%s (oherwydd %s) "
 
 #: cmdline/apt-get.cc:571
+#, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
 
 #: cmdline/apt-get.cc:602
 #, c-format
@@ -344,14 +421,14 @@ msgid "%lu not fully installed or removed.\n"
 msgstr "%lu  heb eu sefydlu na tynnu'n gyflawn.\n"
 
 #: cmdline/apt-get.cc:635
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
-msgstr ""
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
 #: cmdline/apt-get.cc:640
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr ""
+msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
 #: cmdline/apt-get.cc:657
 #, c-format
@@ -363,29 +440,35 @@ msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 
 #: cmdline/apt-get.cc:677
+#, fuzzy
 msgid " [Not candidate version]"
-msgstr ""
+msgstr "Fersiynau Posib"
 
 #: cmdline/apt-get.cc:679
 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
+# FIXME: punctuation
 #: cmdline/apt-get.cc:682
-#, c-format
+#, 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-get.cc:700
 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 
 #: cmdline/apt-get.cc:712
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
-msgstr ""
+msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
 
 #: cmdline/apt-get.cc:725
 #, c-format
@@ -394,19 +477,19 @@ msgstr ""
 
 #. TRANSLATORS: Note, this is not an interactive question
 #: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr ""
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
 #: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, c-format
+#, fuzzy, c-format
 msgid "Package '%s' is not installed, so not removed\n"
-msgstr ""
+msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
 #: cmdline/apt-get.cc:788
-#, c-format
+#, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr ""
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
 #: cmdline/apt-get.cc:818
 #, c-format
@@ -414,9 +497,9 @@ 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:822
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
 #: cmdline/apt-get.cc:834
 #, c-format
@@ -429,19 +512,19 @@ msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to manually installed.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-get.cc:884
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr ""
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
 #: cmdline/apt-get.cc:889
-#, c-format
+#, fuzzy, c-format
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr ""
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
 #: cmdline/apt-get.cc:1025
 msgid "Correcting dependencies..."
@@ -472,8 +555,9 @@ msgid "Unmet dependencies. Try using -f."
 msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
 
 #: cmdline/apt-get.cc:1068
+#, fuzzy
 msgid "WARNING: The following packages cannot be authenticated!"
-msgstr ""
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
 #: cmdline/apt-get.cc:1072
 msgid "Authentication warning overridden.\n"
@@ -484,8 +568,9 @@ msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
 #: cmdline/apt-get.cc:1081
+#, fuzzy
 msgid "Some packages could not be authenticated"
-msgstr ""
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
 #: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
 msgid "There are problems and -y was used without --force-yes"
@@ -496,12 +581,14 @@ msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
 #: cmdline/apt-get.cc:1140
+#, fuzzy
 msgid "Packages need to be removed but remove is disabled."
-msgstr ""
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 
 #: cmdline/apt-get.cc:1151
+#, fuzzy
 msgid "Internal error, Ordering didn't finish"
-msgstr ""
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
 #: cmdline/apt-get.cc:1189
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
@@ -524,22 +611,22 @@ 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
 #: cmdline/apt-get.cc:1208
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr ""
+msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\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
 #: cmdline/apt-get.cc:1213
-#, c-format
+#, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
-msgstr ""
+msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 
 #: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
 #: cmdline/apt-get.cc:2592
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
-msgstr ""
+msgstr "Does dim digon o le rhydd yn %s gennych"
 
 #: cmdline/apt-get.cc:1241
 #, c-format
@@ -555,20 +642,24 @@ msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
 #: cmdline/apt-get.cc:1261
-#, 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"
+" ?]"
 
 #: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286
 msgid "Abort."
 msgstr "Erthylu."
 
 #: cmdline/apt-get.cc:1282
+#, fuzzy
 msgid "Do you want to continue [Y/n]? "
-msgstr ""
+msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
 #: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
 #, c-format
@@ -600,8 +691,9 @@ msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
 #: cmdline/apt-get.cc:1389
+#, fuzzy
 msgid "Aborting install."
-msgstr ""
+msgstr "Yn Erthylu'r Sefydliad."
 
 #: cmdline/apt-get.cc:1417
 msgid ""
@@ -623,9 +715,9 @@ msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #: cmdline/apt-get.cc:1591
-#, c-format
+#, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr ""
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
 #. if (VerTag.empty() == false && Last == 0)
 #: cmdline/apt-get.cc:1629
@@ -662,25 +754,27 @@ msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
 #: cmdline/apt-get.cc:1822
+#, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
-msgstr ""
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #: cmdline/apt-get.cc:1829
+#, 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] ""
-msgstr[1] ""
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 #: cmdline/apt-get.cc:1833
-#, c-format
+#, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
 "%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
 #: cmdline/apt-get.cc:1835
 msgid "Use 'apt-get autoremove' to remove it."
@@ -689,8 +783,9 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: cmdline/apt-get.cc:1854
+#, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #: cmdline/apt-get.cc:1953
 msgid "You might want to run 'apt-get -f install' to correct these:"
@@ -740,9 +835,9 @@ msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
 #: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
 msgid ""
@@ -751,8 +846,9 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-get.cc:2183
+#, fuzzy
 msgid "Calculating upgrade... "
-msgstr ""
+msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
 #: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
 msgid "Failed"
@@ -763,8 +859,9 @@ msgid "Done"
 msgstr "Wedi Gorffen"
 
 #: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
+#, fuzzy
 msgid "Internal error, problem resolver broke stuff"
-msgstr ""
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
 #: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
 msgid "Unable to lock the download directory"
@@ -805,9 +902,9 @@ msgid ""
 msgstr ""
 
 #: cmdline/apt-get.cc:2566
-#, c-format
+#, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
-msgstr ""
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
 #: cmdline/apt-get.cc:2603
 #, c-format
@@ -829,9 +926,9 @@ msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
 #: cmdline/apt-get.cc:2623
-#, c-format
+#, fuzzy, c-format
 msgid "Fetch source %s\n"
-msgstr ""
+msgstr "Cyrchu Ffynhonell %s\n"
 
 #: cmdline/apt-get.cc:2661
 msgid "Failed to fetch some archives."
@@ -884,11 +981,13 @@ msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
 #: cmdline/apt-get.cc:3008
-#, c-format
+#, 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"
 
 #: cmdline/apt-get.cc:3026
 #, c-format
@@ -907,18 +1006,22 @@ msgstr ""
 "newydd"
 
 #: cmdline/apt-get.cc:3088
-#, 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"
 
 #: cmdline/apt-get.cc:3094
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
 
 #: cmdline/apt-get.cc:3117
 #, c-format
@@ -935,15 +1038,18 @@ msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
 #: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, c-format
+#, fuzzy, c-format
 msgid "Changelog for %s (%s)"
-msgstr ""
+msgstr "Yn cysylltu i %s (%s)"
 
 #: cmdline/apt-get.cc:3369
+#, fuzzy
 msgid "Supported modules:"
-msgstr ""
+msgstr "Modylau a Gynhelir:"
 
+# FIXME: split
 #: cmdline/apt-get.cc:3410
+#, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -988,6 +1094,46 @@ msgid ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
+"Defnydd: apt-get [opsiynnau] gorchymyn\n"
+"         apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
+"         apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
+"\n"
+"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
+"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
+"ddefnyddir amlaf.\n"
+"\n"
+"Gorchmynion:\n"
+"   update - Cyrchu rhestrau pecynnau newydd\n"
+"   update - Uwchraddio pecynnau wedi sefydlu\n"
+"   install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
+"   remove - Tynnu pecynnau\n"
+"   source - Lawrlwytho archifau ffynhonell\n"
+"   build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
+"   dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
+"   dselect-upgrade - Dilyn dewisiadau dselect\n"
+"   clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
+"   autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
+"   check - Gwirio fod dim dibyniaethau torredig\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn.\n"
+"  -q   Allbwn cofnodadwy - dim dangosydd cynydd\n"
+"  -qq  Dim allbwn ar wahan i wallau\n"
+"  -d   Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
+"  -s   Peidio gweithredu. Gwneir efelychiad trefn.\n"
+"  -y   Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
+"  -f   Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
+"  -m   Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
+"  -u   Dangos rhestr o archifau a uwchraddir hefyd\n"
+"  -b   Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
+"  -V   Dangos rhifau fersiwn cyflawn\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+"\n"
+"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
+"fwy o wybodaeth ac opsiynnau.\n"
+"\n"
+"                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
 #: cmdline/apt-get.cc:3575
 msgid ""
@@ -1024,53 +1170,56 @@ msgid " [Working]"
 msgstr " [Gweithio]"
 
 #: cmdline/acqprogress.cc:286
-#, c-format
+#, 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-mark.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
-msgstr ""
+msgstr "ond nid yw wedi ei sefydlu"
 
 #: cmdline/apt-mark.cc:61
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-mark.cc:63
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-mark.cc:228
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already set on hold.\n"
-msgstr ""
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #: cmdline/apt-mark.cc:230
-#, c-format
+#, fuzzy, c-format
 msgid "%s was already not hold.\n"
-msgstr ""
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
 #: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
 #: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
-#, c-format
+#, fuzzy, c-format
 msgid "Waited for %s but it wasn't there"
-msgstr ""
+msgstr "Arhoswyd am %s ond nid oedd e yna"
 
 #: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, c-format
+#, fuzzy, c-format
 msgid "%s set on hold.\n"
-msgstr ""
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
 #: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, c-format
+#, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
-msgstr ""
+msgstr "Methwyd agor %s"
 
 #: cmdline/apt-mark.cc:332
 msgid "Executing dpkg failed. Are you root?"
@@ -1104,14 +1253,18 @@ msgid "Unable to read the cdrom database %s"
 msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
 
 #: methods/cdrom.cc:212
+#, fuzzy
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."
 
 #: methods/cdrom.cc:222
+#, fuzzy
 msgid "Wrong CD-ROM"
-msgstr ""
+msgstr "CD Anghywir"
 
 #: methods/cdrom.cc:249
 #, c-format
@@ -1120,8 +1273,9 @@ msgstr ""
 "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
 
 #: methods/cdrom.cc:254
+#, fuzzy
 msgid "Disk not found."
-msgstr ""
+msgstr "Ffeil heb ei ganfod"
 
 #: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
 msgid "File not found"
@@ -1154,9 +1308,9 @@ msgid "Unable to determine the local name"
 msgstr "Ni ellir darganfod yr enw lleol"
 
 #: methods/ftp.cc:215 methods/ftp.cc:243
-#, c-format
+#, fuzzy, c-format
 msgid "The server refused the connection and said: %s"
-msgstr ""
+msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
 
 #: methods/ftp.cc:221
 #, c-format
@@ -1223,8 +1377,9 @@ msgid "Could not connect data socket, connection timed out"
 msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
 
 #: methods/ftp.cc:713
+#, fuzzy
 msgid "Could not connect passive socket."
-msgstr ""
+msgstr "Methwyd cysylltu soced goddefol"
 
 # FIXME
 #: methods/ftp.cc:730
@@ -1341,14 +1496,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 
 #: methods/connect.cc:200
-#, c-format
+#, fuzzy, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
 #: methods/connect.cc:247
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
-msgstr ""
+msgstr "Methwyd cysylltu i %s %s:"
 
 #: methods/gpgv.cc:180
 msgid ""
@@ -1368,8 +1523,9 @@ msgid "Unknown error executing gpgv"
 msgstr ""
 
 #: methods/gpgv.cc:228 methods/gpgv.cc:235
+#, fuzzy
 msgid "The following signatures were invalid:\n"
-msgstr ""
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
 #: methods/gpgv.cc:242
 msgid ""
@@ -1390,20 +1546,24 @@ msgid "Bad header line"
 msgstr "Llinell pennawd gwael"
 
 #: methods/http.cc:569 methods/http.cc:576
+#, fuzzy
 msgid "The HTTP server sent an invalid reply header"
-msgstr ""
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
 
 #: methods/http.cc:606
+#, fuzzy
 msgid "The HTTP server sent an invalid Content-Length header"
-msgstr ""
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
 
 #: methods/http.cc:621
+#, fuzzy
 msgid "The HTTP server sent an invalid Content-Range header"
-msgstr ""
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
 
 #: methods/http.cc:623
+#, fuzzy
 msgid "This HTTP server has broken range support"
-msgstr ""
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 
 #: methods/http.cc:647
 msgid "Unknown date format"
@@ -1430,16 +1590,18 @@ msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
 #: methods/http.cc:919
+#, fuzzy
 msgid "Error reading from server. Remote end closed connection"
-msgstr ""
+msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 
 #: methods/http.cc:921
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
 #: methods/http.cc:1194
+#, fuzzy
 msgid "Bad header data"
-msgstr ""
+msgstr "Data pennawd gwael"
 
 #: methods/http.cc:1211 methods/http.cc:1266
 msgid "Connection failed"
@@ -1478,9 +1640,9 @@ msgstr ""
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 #: methods/mirror.cc:287
-#, c-format
+#, fuzzy, c-format
 msgid "Can not read mirror file '%s'"
-msgstr ""
+msgstr "Methwyd agor ffeil %s"
 
 #: methods/mirror.cc:442
 #, c-format
@@ -1523,12 +1685,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
+#, fuzzy
 msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr ""
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
 
 #: dselect/install:102
+#, fuzzy
 msgid "will be configured. This may result in duplicate errors"
-msgstr ""
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
 
 #: dselect/install:103
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1542,15 +1706,18 @@ msgstr ""
 "eto."
 
 #: dselect/update:30
+#, fuzzy
 msgid "Merging available information"
-msgstr ""
+msgstr "Yn cyfuno manylion Ar Gael"
 
 #: cmdline/apt-extracttemplates.cc:102
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr "Nid yw %s yn becyn DEB dilys."
 
+# FIXME: "debian"
 #: cmdline/apt-extracttemplates.cc:236
+#, fuzzy
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1563,6 +1730,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Dangos y testun cymorth hwn\n"
+"  -t   Gosod y cyfeiriadur dros dro\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
 
 #: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1281
 #, c-format
@@ -1580,9 +1757,9 @@ msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
 #: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
 #: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
 #: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299
-#, c-format
+#, fuzzy, c-format
 msgid "Error processing directory %s"
-msgstr ""
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
 
 #: ftparchive/apt-ftparchive.cc:261
 msgid "Source extension list is too long"
@@ -1593,11 +1770,13 @@ msgid "Error writing header to contents file"
 msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
 
 #: ftparchive/apt-ftparchive.cc:408
-#, c-format
+#, fuzzy, c-format
 msgid "Error processing contents %s"
-msgstr ""
+msgstr "Gwall wrth Brosesu Cynnwys %s"
 
+# FIXME: full stops
 #: ftparchive/apt-ftparchive.cc:596
+#, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1638,6 +1817,45 @@ msgid ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
+"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
+"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+"             contents llwybr\n"
+"             release llwybr\n"
+"             generate cyfluniad [grŵpiau]\n"
+"             clean cyfluniad\n"
+"\n"
+"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
+"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
+"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
+"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
+"gorfodi'r gwerthoedd Priority a Section.\n"
+"\n"
+"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
+".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
+"gwrthwneud ffynhonell.\n"
+"\n"
+"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
+"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
+"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
+"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
+"defnydd o'r archif Debian:\n"
+"   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+"               dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opsiynnau:\n"
+"  -h          Y testun cymorth hwn\n"
+"  --md5       Rheoli cynhyrchiad stwnch MD5\n"
+"  -s=?        Ffeil gwrthwneud ffynhonell\n"
+"  -q          Tawel\n"
+"  -d=?        Dewis cronda data storfa opsiynnol\n"
+"  --no-delink Galluogi'r modd datgysylltu datnamu\n"
+"  --contents  Rheoli cynhyrchiad ffeil cynnwys\n"
+"  -c=?        Darllen y ffeil cyfluniad hwn\n"
+"  -o=?        Gosod opsiwn cyfluniad mympwyol"
 
 #: ftparchive/apt-ftparchive.cc:802
 msgid "No selections matched"
@@ -1743,7 +1961,7 @@ msgstr "*** Methwyd cysylltu %s at %s"
 #: ftparchive/writer.cc:296
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
-msgstr " Tarwyd y terfyn cyswllt %sB.\n"
+msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
 
 #: ftparchive/writer.cc:401
 msgid "Archive had no package field"
@@ -1760,14 +1978,14 @@ msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 
 #: ftparchive/writer.cc:721
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no source override entry\n"
-msgstr ""
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
 #: ftparchive/writer.cc:725
-#, c-format
+#, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
-msgstr ""
+msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
 #: ftparchive/contents.cc:341 ftparchive/contents.cc:372
 msgid "realloc - Failed to allocate memory"
@@ -1779,19 +1997,19 @@ msgid "Unable to open %s"
 msgstr "Ni ellir agor %s"
 
 #: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #1"
-msgstr ""
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
 
 #: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #2"
-msgstr ""
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
 
 #: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed override %s line %llu #3"
-msgstr ""
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
 
 #: ftparchive/override.cc:128 ftparchive/override.cc:202
 #, c-format
@@ -1799,9 +2017,9 @@ msgid "Failed to read the override file %s"
 msgstr "Methwydd darllen y ffeil dargyfeirio %s"
 
 #: ftparchive/multicompress.cc:70
-#, c-format
+#, fuzzy, c-format
 msgid "Unknown compression algorithm '%s'"
-msgstr ""
+msgstr "Dull Cywasgu Anhysbys '%s'"
 
 #: ftparchive/multicompress.cc:100
 #, c-format
@@ -1817,13 +2035,14 @@ msgid "Failed to fork"
 msgstr "Methodd fork()"
 
 #: ftparchive/multicompress.cc:206
+#, fuzzy
 msgid "Compress child"
-msgstr ""
+msgstr "Plentyn Cywasgu"
 
 #: ftparchive/multicompress.cc:229
-#, c-format
+#, fuzzy, c-format
 msgid "Internal error, failed to create %s"
-msgstr ""
+msgstr "Gwall Mewnol, Methwyd creu %s"
 
 #: ftparchive/multicompress.cc:304
 msgid "IO to subprocess/file failed"
@@ -1843,7 +2062,9 @@ msgstr "Gwall wrth datgysylltu %s"
 msgid "Failed to rename %s to %s"
 msgstr "Methwyd ailenwi %s at %s"
 
+# FIXME: "debian"
 #: cmdline/apt-internal-solver.cc:37
+#, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1856,12 +2077,23 @@ msgid ""
 "  -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:89
 msgid "Unknown package record!"
 msgstr "Cofnod pecyn anhysbys!"
 
 #: cmdline/apt-sortpkgs.cc:153
+#, fuzzy
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -1874,6 +2106,16 @@ msgid ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
+"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
+"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+"\n"
+"Opsiynnau:\n"
+"  -h   Y testun cymorth hwn\n"
+"  -s   Defnyddio trefnu ffeil ffynhonell\n"
+"  -c=? Darllen y ffeil cyfluniad hwn\n"
+"  -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
 
 #: apt-inst/contrib/extracttar.cc:117
 msgid "Failed to create pipes"
@@ -1881,15 +2123,16 @@ msgstr "Methwyd creu pibau"
 
 #: apt-inst/contrib/extracttar.cc:144
 msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip "
+msgstr "Methwyd gweithredu gzip"
 
 #: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211
 msgid "Corrupted archive"
 msgstr "Archif llygredig"
 
 #: apt-inst/contrib/extracttar.cc:196
+#, fuzzy
 msgid "Tar checksum failed, archive corrupted"
-msgstr ""
+msgstr "Methodd swm gwirio Tar, archif llygredig"
 
 #: apt-inst/contrib/extracttar.cc:303
 #, c-format
@@ -1905,9 +2148,9 @@ msgid "Error reading archive member header"
 msgstr "Gwall wrth ddarllen pennawd aelod archif"
 
 #: apt-inst/contrib/arfile.cc:94
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid archive member header %s"
-msgstr ""
+msgstr "Pennawd aelod archif annilys"
 
 #: apt-inst/contrib/arfile.cc:106
 msgid "Invalid archive member header"
@@ -1934,8 +2177,9 @@ msgid "Failed to allocate diversion"
 msgstr "Methwyd neilltuo dargyfeiriad"
 
 #: apt-inst/filelist.cc:466
+#, fuzzy
 msgid "Internal error in AddDiversion"
-msgstr ""
+msgstr "Gwall Mewnol yn AddDiversion"
 
 #: apt-inst/filelist.cc:479
 #, c-format
@@ -1954,9 +2198,9 @@ msgid "Duplicate conf file %s/%s"
 msgstr "Ffeil cyfluniad dyblyg %s/%s"
 
 #: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write file %s"
-msgstr ""
+msgstr "Methwyd ysgrifennu ffeil %s"
 
 #: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
 #, c-format
@@ -2024,40 +2268,44 @@ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
 #. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
 #: apt-inst/deb/debfile.cc:55
-#, c-format
+#, fuzzy, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
 
 #: apt-inst/deb/debfile.cc:120
-#, c-format
+#, fuzzy, c-format
 msgid "Internal error, could not locate member %s"
-msgstr ""
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
 
 #: apt-inst/deb/debfile.cc:214
+#, fuzzy
 msgid "Unparsable control file"
-msgstr ""
+msgstr "Ffeil rheoli ni ellir ei ramadegu"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
 
 #: apt-pkg/contrib/mmap.cc:111
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't duplicate file descriptor %i"
-msgstr ""
+msgstr "Methwyd agor pibell ar gyfer %s"
 
 #: apt-pkg/contrib/mmap.cc:119
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't make mmap of %llu bytes"
-msgstr ""
+msgstr "Methwyd gwneud mmap() efo %lu beit"
 
 #: apt-pkg/contrib/mmap.cc:146
+#, fuzzy
 msgid "Unable to close mmap"
-msgstr ""
+msgstr "Ni ellir agor %s"
 
+# FIXME
 #: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
+#, fuzzy
 msgid "Unable to synchronize mmap"
-msgstr ""
+msgstr "Methwyd gweithredu "
 
 #: apt-pkg/contrib/mmap.cc:290
 #, c-format
@@ -2065,8 +2313,9 @@ msgid "Couldn't make mmap of %lu bytes"
 msgstr "Methwyd gwneud mmap() efo %lu beit"
 
 #: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
 msgid "Failed to truncate file"
-msgstr ""
+msgstr "Methwyd ysgrifennu ffeil %s"
 
 #: apt-pkg/contrib/mmap.cc:341
 #, c-format
@@ -2131,10 +2380,11 @@ msgstr "Yn agor y ffeil cyfluniad %s"
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
 
+# FIXME
 #: apt-pkg/contrib/configuration.cc:792
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: Malformed tag"
-msgstr ""
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
 
 #: apt-pkg/contrib/configuration.cc:809
 #, c-format
@@ -2163,9 +2413,10 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
 
 #: apt-pkg/contrib/configuration.cc:872
-#, c-format
+#, fuzzy, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
 
 #: apt-pkg/contrib/configuration.cc:922
 #, c-format
@@ -2240,9 +2491,9 @@ msgid "Failed to stat the cdrom"
 msgstr "Methwyd gwneud stat() o'r CD-ROM"
 
 #: apt-pkg/contrib/fileutl.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
-msgstr ""
+msgstr "Gwall wrth gau'r ffeil"
 
 #: apt-pkg/contrib/fileutl.cc:225
 #, c-format
@@ -2291,9 +2542,9 @@ msgid "Sub-process %s received a segmentation fault."
 msgstr "Derbyniodd is-broses %s wall segmentu."
 
 #: apt-pkg/contrib/fileutl.cc:842
-#, c-format
+#, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
-msgstr ""
+msgstr "Derbyniodd is-broses %s wall segmentu."
 
 #: apt-pkg/contrib/fileutl.cc:846
 #, c-format
@@ -2311,9 +2562,9 @@ msgid "Could not open file %s"
 msgstr "Methwyd agor ffeil %s"
 
 #: apt-pkg/contrib/fileutl.cc:1066
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file descriptor %d"
-msgstr ""
+msgstr "Methwyd agor pibell ar gyfer %s"
 
 #: apt-pkg/contrib/fileutl.cc:1156
 msgid "Failed to create subprocess IPC"
@@ -2323,30 +2574,32 @@ msgstr "Methwyd creu isbroses IPC"
 msgid "Failed to exec compressor "
 msgstr "Methwyd gweithredu cywasgydd "
 
+# FIXME
 #: apt-pkg/contrib/fileutl.cc:1309
-#, c-format
+#, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
-msgstr ""
+msgstr "o hyd %lu i ddarllen ond dim ar ôl"
 
+# FIXME
 #: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, c-format
+#, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
-msgstr ""
+msgstr "o hyd %lu i ysgrifennu ond methwyd"
 
 #: apt-pkg/contrib/fileutl.cc:1736
-#, c-format
+#, fuzzy, c-format
 msgid "Problem closing the file %s"
-msgstr ""
+msgstr "Gwall wrth gau'r ffeil"
 
 #: apt-pkg/contrib/fileutl.cc:1748
-#, c-format
+#, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
-msgstr ""
+msgstr "Gwall wrth gyfamseru'r ffeil"
 
 #: apt-pkg/contrib/fileutl.cc:1759
-#, c-format
+#, fuzzy, c-format
 msgid "Problem unlinking the file %s"
-msgstr ""
+msgstr "Gwall wrth dadgysylltu'r ffeil"
 
 #: apt-pkg/contrib/fileutl.cc:1774
 msgid "Problem syncing the file"
@@ -2365,13 +2618,15 @@ msgid "The package cache file is an incompatible version"
 msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
 
 #: apt-pkg/pkgcache.cc:162
+#, fuzzy
 msgid "The package cache file is corrupted, it is too small"
-msgstr ""
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
 
+# FIXME: capitalisation?
 #: apt-pkg/pkgcache.cc:167
-#, c-format
+#, fuzzy, c-format
 msgid "This APT does not support the versioning system '%s'"
-msgstr ""
+msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
 
 #: apt-pkg/pkgcache.cc:172
 msgid "The package cache was built for a different architecture"
@@ -2434,30 +2689,34 @@ msgid "extra"
 msgstr "ychwanegol"
 
 #: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#, fuzzy
 msgid "Building dependency tree"
-msgstr ""
+msgstr "Yn Aideladu Coeden Dibyniaeth"
 
 #: apt-pkg/depcache.cc:133
+#, fuzzy
 msgid "Candidate versions"
-msgstr ""
+msgstr "Fersiynau Posib"
 
 #: apt-pkg/depcache.cc:162
+#, fuzzy
 msgid "Dependency generation"
-msgstr ""
+msgstr "Cynhyrchaid Dibyniaeth"
 
 #: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#, fuzzy
 msgid "Reading state information"
-msgstr ""
+msgstr "Yn cyfuno manylion Ar Gael"
 
 #: apt-pkg/depcache.cc:244
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to open StateFile %s"
-msgstr ""
+msgstr "Methwyd agor %s"
 
 #: apt-pkg/depcache.cc:250
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
-msgstr ""
+msgstr "Methwyd ysgrifennu ffeil %s"
 
 # FIXME: number?
 #: apt-pkg/tagfile.cc:129
@@ -2471,29 +2730,33 @@ msgid "Unable to parse package file %s (2)"
 msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
 
 #: apt-pkg/sourcelist.cc:96
-#, 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)"
 
 #: apt-pkg/sourcelist.cc:99
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
 #: apt-pkg/sourcelist.cc:110
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
 #: apt-pkg/sourcelist.cc:116
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
 
 #: apt-pkg/sourcelist.cc:119
-#, 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)"
 
 #: apt-pkg/sourcelist.cc:132
 #, c-format
@@ -2511,9 +2774,9 @@ msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
 
 #: apt-pkg/sourcelist.cc:143
-#, c-format
+#, fuzzy, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr ""
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
 
 #: apt-pkg/sourcelist.cc:150
 #, c-format
@@ -2537,9 +2800,9 @@ msgid "Malformed line %u in source list %s (type)"
 msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
 
 #: apt-pkg/sourcelist.cc:289
-#, c-format
+#, fuzzy, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
-msgstr ""
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 
 #: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
 #, c-format
@@ -2549,9 +2812,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, c-format
+#, fuzzy, c-format
 msgid "Could not configure '%s'. "
-msgstr ""
+msgstr "Methwyd agor ffeil %s"
 
 # FIXME: %s may have an arbirrary length
 #: apt-pkg/packagemanager.cc:545
@@ -2592,25 +2855,28 @@ msgstr ""
 "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
 
 #: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
+#, fuzzy
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
 "used instead."
 msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."
 
 #: apt-pkg/acquire.cc:81
-#, c-format
+#, fuzzy, c-format
 msgid "List directory %spartial is missing."
-msgstr ""
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
 #: apt-pkg/acquire.cc:85
-#, c-format
+#, fuzzy, c-format
 msgid "Archives directory %spartial is missing."
-msgstr ""
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
 
 #: apt-pkg/acquire.cc:93
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock directory %s"
-msgstr ""
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 #. only show the ETA if it makes sense
 #. two days
@@ -2620,9 +2886,9 @@ msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #: apt-pkg/acquire.cc:895
-#, c-format
+#, fuzzy, c-format
 msgid "Retrieving file %li of %li"
-msgstr ""
+msgstr "Yn Darllen Rhestr Ffeiliau"
 
 #: apt-pkg/acquire-worker.cc:112
 #, c-format
@@ -2635,9 +2901,12 @@ msgid "Method %s did not start correctly"
 msgstr "Ni gychwynodd y dull %s yn gywir"
 
 #: apt-pkg/acquire-worker.cc:440
-#, 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/init.cc:152
 #, c-format
@@ -2645,8 +2914,9 @@ msgid "Packaging system '%s' is not supported"
 msgstr "Ni chynhelir y system pecynnu '%s'"
 
 #: apt-pkg/init.cc:168
+#, fuzzy
 msgid "Unable to determine a suitable packaging system type"
-msgstr ""
+msgstr "Ni ellir canfod math system addas"
 
 #: apt-pkg/clean.cc:57
 #, c-format
@@ -2677,10 +2947,11 @@ msgid ""
 "available in the sources"
 msgstr ""
 
+# FIXME: literal
 #: apt-pkg/policy.cc:396
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
-msgstr ""
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
 
 # FIXME: tense
 #: apt-pkg/policy.cc:418
@@ -2706,9 +2977,9 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas"
 #: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423
 #: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471
 #: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516
-#, c-format
+#, fuzzy, c-format
 msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
 
 #: apt-pkg/pkgcachegen.cc:234
 msgid "Wow, you exceeded the number of package names this APT is capable of."
@@ -2720,8 +2991,9 @@ msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
 #: apt-pkg/pkgcachegen.cc:240
+#, fuzzy
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
+msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
 
 #: apt-pkg/pkgcachegen.cc:243
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
@@ -2740,8 +3012,9 @@ msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
 
 #: apt-pkg/pkgcachegen.cc:1180 apt-pkg/pkgcachegen.cc:1284
 #: apt-pkg/pkgcachegen.cc:1290 apt-pkg/pkgcachegen.cc:1447
+#, fuzzy
 msgid "Reading package lists"
-msgstr ""
+msgstr "Yn Darllen Rhestrau Pecynnau"
 
 #: apt-pkg/pkgcachegen.cc:1197
 msgid "Collecting File Provides"
@@ -2762,8 +3035,9 @@ msgstr "Camgyfatebiaeth swm MD5"
 
 #: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
 #: apt-pkg/acquire-item.cc:2013
+#, fuzzy
 msgid "Hash Sum mismatch"
-msgstr ""
+msgstr "Camgyfatebiaeth swm MD5"
 
 #: apt-pkg/acquire-item.cc:1381
 #, c-format
@@ -2772,10 +3046,11 @@ msgid ""
 "or malformed file)"
 msgstr ""
 
+# FIXME: number?
 #: apt-pkg/acquire-item.cc:1397
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
-msgstr ""
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
 #: apt-pkg/acquire-item.cc:1439
 msgid "There is no public key available for the following key IDs:\n"
@@ -2836,15 +3111,16 @@ msgstr ""
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
+# FIXME: number?
 #: apt-pkg/indexrecords.cc:64
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to parse Release file %s"
-msgstr ""
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
 #: apt-pkg/indexrecords.cc:74
-#, c-format
+#, fuzzy, c-format
 msgid "No sections in Release file %s"
-msgstr ""
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
 #: apt-pkg/indexrecords.cc:108
 #, c-format
@@ -2852,14 +3128,15 @@ msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #: apt-pkg/indexrecords.cc:121
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
 
+# FIXME: number?
 #: apt-pkg/indexrecords.cc:140
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
 
 #: apt-pkg/vendorlist.cc:78
 #, c-format
@@ -2883,8 +3160,9 @@ msgid "Stored label: %s\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
+#, fuzzy
 msgid "Unmounting CD-ROM...\n"
-msgstr ""
+msgstr "CD Anghywir"
 
 #: apt-pkg/cdrom.cc:642
 #, c-format
@@ -2896,8 +3174,9 @@ msgid "Unmounting CD-ROM\n"
 msgstr ""
 
 #: apt-pkg/cdrom.cc:665
+#, fuzzy
 msgid "Waiting for disc...\n"
-msgstr ""
+msgstr "Yn aros am benawdau"
 
 #: apt-pkg/cdrom.cc:674
 msgid "Mounting CD-ROM...\n"
@@ -2937,12 +3216,14 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/cdrom.cc:830
+#, fuzzy
 msgid "Copying package lists..."
-msgstr ""
+msgstr "Yn Darllen Rhestrau Pecynnau"
 
 #: apt-pkg/cdrom.cc:857
+#, fuzzy
 msgid "Writing new source list\n"
-msgstr ""
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
 
 #: apt-pkg/cdrom.cc:865
 msgid "Source list entries for this disc are:\n"
@@ -2974,9 +3255,9 @@ msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #: apt-pkg/indexcopy.cc:521
-#, c-format
+#, fuzzy, c-format
 msgid "Hash mismatch for: %s"
-msgstr ""
+msgstr "Camgyfatebiaeth swm MD5"
 
 #: apt-pkg/indexcopy.cc:662
 #, c-format
@@ -2985,9 +3266,9 @@ msgstr ""
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #: apt-pkg/indexcopy.cc:692
-#, c-format
+#, fuzzy, c-format
 msgid "No keyring installed in %s."
-msgstr ""
+msgstr "Yn Erthylu'r Sefydliad."
 
 #: apt-pkg/cacheset.cc:403
 #, c-format
@@ -2997,17 +3278,17 @@ msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 #: apt-pkg/cacheset.cc:406
 #, c-format
 msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s'"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
 #: apt-pkg/cacheset.cc:517
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find task '%s'"
-msgstr ""
+msgstr "Methwyd canfod pecyn %s"
 
 #: apt-pkg/cacheset.cc:523
-#, c-format
+#, fuzzy, c-format
 msgid "Couldn't find any package by regex '%s'"
-msgstr ""
+msgstr "Methwyd canfod pecyn %s"
 
 #: apt-pkg/cacheset.cc:534
 #, c-format
@@ -3057,24 +3338,24 @@ msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:72
-#, c-format
+#, fuzzy, c-format
 msgid "Installing %s"
-msgstr ""
+msgstr "  Wedi Sefydlu: "
 
 #: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
-#, c-format
+#, fuzzy, c-format
 msgid "Configuring %s"
-msgstr ""
+msgstr "Yn cysylltu i %s"
 
 #: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
-#, c-format
+#, fuzzy, c-format
 msgid "Removing %s"
-msgstr ""
+msgstr "Yn agor %s"
 
 #: apt-pkg/deb/dpkgpm.cc:75
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removing %s"
-msgstr ""
+msgstr "Methwyd dileu %s"
 
 #: apt-pkg/deb/dpkgpm.cc:76
 #, c-format
@@ -3088,34 +3369,34 @@ msgstr ""
 
 #. FIXME: use a better string after freeze
 #: apt-pkg/deb/dpkgpm.cc:704
-#, c-format
+#, fuzzy, c-format
 msgid "Directory '%s' missing"
-msgstr ""
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
 
 #: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, c-format
+#, fuzzy, c-format
 msgid "Could not open file '%s'"
-msgstr ""
+msgstr "Methwyd agor ffeil %s"
 
 #: apt-pkg/deb/dpkgpm.cc:944
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing %s"
-msgstr ""
+msgstr "Yn agor %s"
 
 #: apt-pkg/deb/dpkgpm.cc:945
-#, c-format
+#, fuzzy, c-format
 msgid "Unpacking %s"
-msgstr ""
+msgstr "Yn agor %s"
 
 #: apt-pkg/deb/dpkgpm.cc:950
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing to configure %s"
-msgstr ""
+msgstr "Yn agor y ffeil cyfluniad %s"
 
 #: apt-pkg/deb/dpkgpm.cc:952
-#, c-format
+#, fuzzy, c-format
 msgid "Installed %s"
-msgstr ""
+msgstr "  Wedi Sefydlu: "
 
 #: apt-pkg/deb/dpkgpm.cc:957
 #, c-format
@@ -3123,19 +3404,19 @@ msgid "Preparing for removal of %s"
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:959
-#, c-format
+#, fuzzy, c-format
 msgid "Removed %s"
-msgstr ""
+msgstr "Argymell"
 
 #: apt-pkg/deb/dpkgpm.cc:964
-#, c-format
+#, fuzzy, c-format
 msgid "Preparing to completely remove %s"
-msgstr ""
+msgstr "Yn agor y ffeil cyfluniad %s"
 
 #: apt-pkg/deb/dpkgpm.cc:965
-#, c-format
+#, fuzzy, c-format
 msgid "Completely removed %s"
-msgstr ""
+msgstr "Methwyd dileu %s"
 
 #: apt-pkg/deb/dpkgpm.cc:1208
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
@@ -3195,9 +3476,9 @@ msgid ""
 msgstr ""
 
 #: apt-pkg/deb/debsystem.cc:87
-#, c-format
+#, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr ""
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
@@ -3211,64 +3492,229 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#~ msgid "Got a single header line over %u chars"
-#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Yn agor y ffeil cyfluniad %s"
 
-#~ msgid "Read error from %s process"
-#~ msgstr "Gwall darllen o broses %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Methwyd dileu %s"
 
-#~ msgid "Couldn't open pipe for %s"
-#~ msgstr "Methwyd agor pibell ar gyfer %s"
+#~ msgid "Unable to create %s"
+#~ msgstr "Ni ellir creu %s"
 
-#~ msgid "Failed to locate a valid control file"
-#~ msgstr "Methwyd lleoli ffeil rheoli dilys"
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Methwyd stat() ar %sinfo"
 
-#~ msgid "Couldn't change to %s"
-#~ msgstr "Methwyd newid i %s"
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
 
-#~ msgid "Error parsing MD5. Offset %lu"
-#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
 
-#~ msgid "Bad ConfFile section in the status file. Offset %lu"
-#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+# FIXME
+#, fuzzy
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Gwall mewnol wrth gyrchu enw pecyn"
 
-#~ msgid "Invalid line in the diversion file: %s"
-#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+#, fuzzy
+#~ msgid "Reading file listing"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
 
-#~ msgid "The diversion file is corrupted"
-#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+#~ msgid ""
+#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+#~ "then make it empty and immediately re-install the same version of the "
+#~ "package!"
+#~ msgstr ""
+#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn "
+#~ "yna gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
+
+# FIXME
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+
+#, fuzzy
+#~ msgid "Internal error getting a node"
+#~ msgstr "Gwall Mewnol wrth gael Nôd"
 
 # FIXME: literal
 #~ msgid "Failed to open the diversions file %sdiversions"
 #~ msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
 
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+
+#, fuzzy
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+
+#, fuzzy
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
+
+#, fuzzy
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Methwyd newid i %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Methwyd lleoli ffeil rheoli dilys"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Methwyd agor pibell ar gyfer %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Gwall darllen o broses %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "datgywasgydd"
+
 # FIXME
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+
+# FIXME
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "o hyd %lu i ysgrifennu ond methwyd"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
+#, fuzzy
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+
+#, fuzzy
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Gwall Methwyd, methwyd lleoli aelod"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
+
+#, fuzzy
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#, fuzzy
+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Methwyd datrys '%s'"
+
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Methwyd agor ffeil %s"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
+#~ msgid "%4i %s\n"
+#~ msgstr "%4i %s\n"
+
+#, fuzzy
+#~ msgid "Processing triggers for %s"
+#~ msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
+# FIXME: commas, wrapping
 #~ msgid ""
-#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-#~ "then make it empty and immediately re-install the same version of the "
-#~ "package!"
+#~ "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."
 #~ msgstr ""
-#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn "
-#~ "yna gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
+#~ "Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
+#~ "yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
 
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
+#, fuzzy
+#~ msgid "Line %d too long (max %lu)"
+#~ msgstr "Linell %d yn rhy hir (uchaf %d)"
 
-#~ msgid "The info and temp directories need to be on the same filesystem"
-#~ msgstr ""
-#~ "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
+#, fuzzy
+#~ msgid "Line %d too long (max %d)"
+#~ msgstr "Linell %d yn rhy hir (uchaf %d)"
 
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Methwyd stat() ar %sinfo"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
-#~ msgid "Unable to create %s"
-#~ msgstr "Ni ellir creu %s"
+#, fuzzy
+#~ msgid "Error occured while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
 
-#~ msgid "Failed to remove %s"
-#~ msgstr "Methwyd dileu %s"
+#, fuzzy
+#~ msgid "openpty failed\n"
+#~ msgstr "Methwyd dewis"
+
+#~ msgid "File date has changed %s"
+#~ msgstr "Dyddiad ffeil wedi newid %s"
+
+#, fuzzy
+#~ msgid "Reading file list"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#, fuzzy
+#~ msgid "Could not execute "
+#~ msgstr "Methwyd cael y clo %s"
+
+#~ msgid "Abort? [Y/n] "
+#~ msgstr "Erthylu? [I/n] "
+
+#~ msgid "Write Error"
+#~ msgstr "Gwall Ysgrifennu"
 
-#~ msgid "Package %s is not installed, so not removed\n"
-#~ msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
+#~ msgid "File Not Found"
+#~ msgstr "Ni Chanfuwyd Y Ffeil"