summaryrefslogtreecommitdiff
path: root/po/cy.po
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@canonical.com>2012-10-12 13:01:28 +0200
committerMartin Pitt <martin.pitt@canonical.com>2012-10-12 13:01:28 +0200
commit66b40c04d002c5085d8985936046b05b55b70797 (patch)
tree95e17f26a83abff55ad34483cbc0b82f676948f0 /po/cy.po
parent3df2cc3c0e9fb4dff107b69a99443ae9a03a3f80 (diff)
Refresh translations from Launchpad. Amongst other fixes, this drops the
erroneous "个" from "Retrieving file ..." translation in zn_CN. (LP: #985634)
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po2029
1 files changed, 800 insertions, 1229 deletions
diff --git a/po/cy.po b/po/cy.po
index 440bfce65..7a958c2a2 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,13 +7,17 @@ msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
"POT-Creation-Date: 2012-09-04 15:34+0200\n"
-"PO-Revision-Date: 2005-06-06 13:46+0100\n"
-"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
+"PO-Revision-Date: 2012-09-07 13:18+0000\n"
+"Last-Translator: Dafydd Harries <Unknown>\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"
+"Language: cy\n"
#: cmdline/apt-cache.cc:158
#, c-format
@@ -21,88 +25,72 @@ 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 "Cyfanswm Enwau Pecynnau : "
+msgstr ""
#: cmdline/apt-cache.cc:288
-#, fuzzy
msgid "Total package structures: "
-msgstr "Cyfanswm Enwau Pecynnau : "
+msgstr ""
#: cmdline/apt-cache.cc:328
-#, fuzzy
msgid " Normal packages: "
-msgstr " Pecynnau Normal: "
+msgstr ""
#: cmdline/apt-cache.cc:329
-#, fuzzy
msgid " Pure virtual packages: "
-msgstr " Pecynnau Cwbl Rhithwir: "
+msgstr ""
#: cmdline/apt-cache.cc:330
-#, fuzzy
msgid " Single virtual packages: "
-msgstr " Pecynnau Rhithwir Sengl: "
+msgstr ""
#: cmdline/apt-cache.cc:331
-#, fuzzy
msgid " Mixed virtual packages: "
-msgstr " Pecynnau Rhithwir Cymysg: "
+msgstr ""
#: cmdline/apt-cache.cc:332
msgid " Missing: "
msgstr " Ar Goll: "
#: cmdline/apt-cache.cc:334
-#, fuzzy
msgid "Total distinct versions: "
-msgstr "Cyfanswm Fersiynau Gwahanol: "
+msgstr ""
#: cmdline/apt-cache.cc:336
-#, fuzzy
msgid "Total distinct descriptions: "
-msgstr "Cyfanswm Fersiynau Gwahanol: "
+msgstr ""
#: cmdline/apt-cache.cc:338
-#, fuzzy
msgid "Total dependencies: "
-msgstr "Cyfanswm Dibyniaethau: "
+msgstr ""
#: cmdline/apt-cache.cc:341
-#, fuzzy
msgid "Total ver/file relations: "
-msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+msgstr ""
#: cmdline/apt-cache.cc:343
-#, fuzzy
msgid "Total Desc/File relations: "
-msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
+msgstr ""
#: cmdline/apt-cache.cc:345
-#, fuzzy
msgid "Total Provides mappings: "
-msgstr "Cyfanswm Mapiau Darpariath: "
+msgstr ""
#: cmdline/apt-cache.cc:357
-#, fuzzy
msgid "Total globbed strings: "
-msgstr "Cyfanswm Llinynau Glob: "
+msgstr ""
#: cmdline/apt-cache.cc:371
-#, fuzzy
msgid "Total dependency version space: "
-msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
+msgstr ""
#: cmdline/apt-cache.cc:376
-#, fuzzy
msgid "Total slack space: "
-msgstr "Cyfanswm gofod Slac: "
+msgstr ""
#: cmdline/apt-cache.cc:384
-#, fuzzy
msgid "Total space accounted for: "
-msgstr "Cyfanswm Gofod Cyfrifwyd: "
+msgstr ""
#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143
#, c-format
@@ -110,29 +98,27 @@ msgid "Package file %s is out of sync."
msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
-#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46
-#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39
+#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
#: cmdline/apt-cache.cc:1222
-#, fuzzy
msgid "You must give at least one search pattern"
-msgstr "Rhaid i chi ddarparu un patrwm yn union"
+msgstr ""
#: cmdline/apt-cache.cc:1357
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
#: cmdline/apt-cache.cc:1482
-#, fuzzy
msgid "Package files:"
-msgstr "Ffeiliau Pecynnau:"
+msgstr ""
#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580
msgid "Cache is out of sync, can't x-ref a package file"
@@ -140,9 +126,8 @@ 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 "Pecynnau wedi eu Pinio:"
+msgstr ""
#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560
msgid "(not found)"
@@ -161,26 +146,23 @@ msgid "(none)"
msgstr "(dim)"
#: cmdline/apt-cache.cc:1557
-#, fuzzy
msgid " Package pin: "
-msgstr " Pin Pecyn: "
+msgstr ""
#. Show the priority tables
#: cmdline/apt-cache.cc:1566
-#, fuzzy
msgid " Version table:"
-msgstr " Tabl Fersiynnau:"
+msgstr ""
-#: 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
-#, fuzzy, c-format
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3247 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147
+#, 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"
+msgstr ""
#: cmdline/apt-cache.cc:1686
-#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -216,60 +198,21 @@ 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
-#, fuzzy, c-format
+#, c-format
msgid "Failed to mount '%s' to '%s'"
-msgstr "Methwyd ailenwi %s at %s"
+msgstr ""
-#: cmdline/apt-cdrom.cc:163
+#: cmdline/apt-cdrom.cc:164
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -277,8 +220,7 @@ msgstr ""
msgid "Arguments not in pairs"
msgstr "Nid yw ymresymiadau mewn parau"
-#: cmdline/apt-config.cc:87
-#, fuzzy
+#: cmdline/apt-config.cc:81
msgid ""
"Usage: apt-config [options] command\n"
"\n"
@@ -293,18 +235,6 @@ 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"
@@ -314,367 +244,347 @@ msgstr "I"
msgid "N"
msgstr ""
-#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
-#: cmdline/apt-get.cc:260
+#: cmdline/apt-get.cc:257
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:347
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: cmdline/apt-get.cc:352
+#: cmdline/apt-get.cc:349
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:359
+#: cmdline/apt-get.cc:356
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: cmdline/apt-get.cc:361
+#: cmdline/apt-get.cc:358
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: cmdline/apt-get.cc:364
+#: cmdline/apt-get.cc:361
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: cmdline/apt-get.cc:364
+#: cmdline/apt-get.cc:361
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:369
+#: cmdline/apt-get.cc:366
msgid " or"
msgstr " neu"
-#: cmdline/apt-get.cc:398
+#: cmdline/apt-get.cc:395
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:424
+#: cmdline/apt-get.cc:421
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: cmdline/apt-get.cc:446
-#, fuzzy
+#: cmdline/apt-get.cc:443
msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+msgstr ""
-#: cmdline/apt-get.cc:467
-#, fuzzy
+#: cmdline/apt-get.cc:464
msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+msgstr ""
-#: cmdline/apt-get.cc:488
-#, fuzzy
+#: cmdline/apt-get.cc:485
msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+msgstr ""
-#: cmdline/apt-get.cc:508
+#: cmdline/apt-get.cc:505
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: cmdline/apt-get.cc:563
+#: cmdline/apt-get.cc:560
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: cmdline/apt-get.cc:571
-#, fuzzy
+#: cmdline/apt-get.cc:568
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
+#: cmdline/apt-get.cc:599
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:603
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: cmdline/apt-get.cc:608
+#: cmdline/apt-get.cc:605
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:607
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: cmdline/apt-get.cc:614
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-#: cmdline/apt-get.cc:635
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:633
+#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+msgstr ""
-#: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:639
+#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+msgstr ""
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:656
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:667
msgid " [Installed]"
msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:677
-#, fuzzy
+#: cmdline/apt-get.cc:676
msgid " [Not candidate version]"
-msgstr "Fersiynau Posib"
+msgstr ""
-#: cmdline/apt-get.cc:679
+#: cmdline/apt-get.cc:678
msgid "You should explicitly select one to install."
msgstr "Dylech ddewis un yn benodol i'w sefydlu."
-# FIXME: punctuation
-#: cmdline/apt-get.cc:682
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:681
+#, 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
+#: cmdline/apt-get.cc:699
msgid "However the following packages replace it:"
msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:711
+#, c-format
msgid "Package '%s' has no installation candidate"
-msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+msgstr ""
-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:722
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr ""
#. TRANSLATORS: Note, this is not an interactive question
#: cmdline/apt-get.cc:737 cmdline/apt-get.cc:940
-#, fuzzy, c-format
+#, 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"
+msgstr ""
#: cmdline/apt-get.cc:743 cmdline/apt-get.cc:946
-#, fuzzy, c-format
+#, 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"
+msgstr ""
-#: cmdline/apt-get.cc:788
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:753
+#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+msgstr ""
-#: cmdline/apt-get.cc:818
+#: cmdline/apt-get.cc:783
#, 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"
+msgstr ""
+"Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: cmdline/apt-get.cc:822
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:787
+#, 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"
+msgstr ""
-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:799
#, 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"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:804
#, c-format
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
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61
+#, c-format
msgid "%s set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgstr ""
-#: cmdline/apt-get.cc:884
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:849
+#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+msgstr ""
-#: cmdline/apt-get.cc:889
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:854
+#, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+msgstr ""
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:974
msgid "Correcting dependencies..."
msgstr "Yn cywiro dibyniaethau..."
-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:977
msgid " failed."
msgstr " wedi methu."
-#: cmdline/apt-get.cc:1031
+#: cmdline/apt-get.cc:980
msgid "Unable to correct dependencies"
msgstr "Ni ellir cywiro dibyniaethau"
-#: cmdline/apt-get.cc:1034
+#: cmdline/apt-get.cc:983
msgid "Unable to minimize the upgrade set"
msgstr "Ni ellir bychanu y set uwchraddio"
-#: cmdline/apt-get.cc:1036
+#: cmdline/apt-get.cc:985
msgid " Done"
msgstr " Wedi Gorffen"
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:989
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:1043
+#: cmdline/apt-get.cc:992
msgid "Unmet dependencies. Try using -f."
msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-#: cmdline/apt-get.cc:1068
-#, fuzzy
+#: cmdline/apt-get.cc:1017
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+msgstr ""
-#: cmdline/apt-get.cc:1072
+#: cmdline/apt-get.cc:1021
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:1079
+#: cmdline/apt-get.cc:1028
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:1081
-#, fuzzy
+#: cmdline/apt-get.cc:1030
msgid "Some packages could not be authenticated"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+msgstr ""
-#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251
+#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: cmdline/apt-get.cc:1131
+#: cmdline/apt-get.cc:1080
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:1140
-#, fuzzy
+#: cmdline/apt-get.cc:1089
msgid "Packages need to be removed but remove is disabled."
-msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
+msgstr ""
-#: cmdline/apt-get.cc:1151
-#, fuzzy
+#: cmdline/apt-get.cc:1100
msgid "Internal error, Ordering didn't finish"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+msgstr ""
-#: cmdline/apt-get.cc:1189
+#: cmdline/apt-get.cc:1138
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1196
+#: cmdline/apt-get.cc:1145
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1150
#, c-format
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
-#: cmdline/apt-get.cc:1208
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1157
+#, 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"
+msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1213
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1162
+#, 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"
+msgstr ""
-#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589
-#: cmdline/apt-get.cc:2592
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523
+#: cmdline/apt-get.cc:2526
+#, c-format
msgid "Couldn't determine free space in %s"
-msgstr "Does dim digon o le rhydd yn %s gennych"
+msgstr ""
-#: cmdline/apt-get.cc:1241
+#: cmdline/apt-get.cc:1190
#, 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:1257 cmdline/apt-get.cc:1277
+#: cmdline/apt-get.cc:1206 cmdline/apt-get.cc:1226
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
-#: cmdline/apt-get.cc:1259
+#: cmdline/apt-get.cc:1208
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:1261
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1210
+#, 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
+#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:1282
-#, fuzzy
+#: cmdline/apt-get.cc:1231
msgid "Do you want to continue [Y/n]? "
-msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
+msgstr ""
-#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543
+#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1321
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:1379
+#: cmdline/apt-get.cc:1328
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -682,20 +592,19 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:1383
+#: cmdline/apt-get.cc:1332
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:1388
+#: cmdline/apt-get.cc:1337
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:1389
-#, fuzzy
+#: cmdline/apt-get.cc:1338
msgid "Aborting install."
-msgstr "Yn Erthylu'r Sefydliad."
+msgstr ""
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -709,37 +618,37 @@ msgstr[1] ""
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: cmdline/apt-get.cc:1559
+#: cmdline/apt-get.cc:1508
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1591
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1540
+#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+msgstr ""
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1629
+#: cmdline/apt-get.cc:1578
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1645
+#: cmdline/apt-get.cc:1594
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1657
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1815
+#: cmdline/apt-get.cc:1761
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#.
+#.
#. if (Packages == 1)
#. {
#. c1out << endl;
@@ -748,33 +657,31 @@ msgstr ""
#. "the package is simply not installable and a bug report against\n"
#. "that package should be filed.") << endl;
#. }
-#.
-#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987
+#.
+#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933
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
+#: cmdline/apt-get.cc:1768
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgstr ""
-#: cmdline/apt-get.cc:1829
-#, fuzzy
+#: cmdline/apt-get.cc:1775
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:"
+msgstr[0] ""
+msgstr[1] ""
-#: cmdline/apt-get.cc:1833
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:1779
+#, 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:"
+msgstr[0] ""
+msgstr[1] ""
#: cmdline/apt-get.cc:1835
msgid "Use 'apt-get autoremove' to remove it."
@@ -782,17 +689,16 @@ msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1854
-#, fuzzy
+#: cmdline/apt-get.cc:1800
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgstr ""
-#: cmdline/apt-get.cc:1953
+#: cmdline/apt-get.cc:1899
msgid "You might want to run 'apt-get -f install' to correct these:"
msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:"
# FIXME
-#: cmdline/apt-get.cc:1957
+#: cmdline/apt-get.cc:1903
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -801,7 +707,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1972
+#: cmdline/apt-get.cc:1918
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"
@@ -813,57 +719,55 @@ msgstr ""
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: cmdline/apt-get.cc:1993
+#: cmdline/apt-get.cc:1939
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:2019
+#: cmdline/apt-get.cc:1965
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:2109
+#: cmdline/apt-get.cc:2055
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:2110
+#: cmdline/apt-get.cc:2056
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:2152
+#: cmdline/apt-get.cc:2098
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63
+#, c-format
msgid "%s set to automatically installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgstr ""
-#: cmdline/apt-get.cc:2167 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:2183
-#, fuzzy
+#: cmdline/apt-get.cc:2129
msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
+msgstr ""
-#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115
+#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:2191
+#: cmdline/apt-get.cc:2137
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266
-#, fuzzy
+#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212
msgid "Internal error, problem resolver broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgstr ""
-#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
@@ -872,28 +776,28 @@ msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: cmdline/apt-get.cc:2391
+#: cmdline/apt-get.cc:2327
#, c-format
msgid "Downloading %s %s"
msgstr ""
-#: cmdline/apt-get.cc:2451
+#: cmdline/apt-get.cc:2385
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:2491 cmdline/apt-get.cc:2803
+#: cmdline/apt-get.cc:2425 cmdline/apt-get.cc:2737
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2508
+#: cmdline/apt-get.cc:2442
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2447
#, c-format
msgid ""
"Please use:\n"
@@ -901,95 +805,93 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2566
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2500
+#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+msgstr ""
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2537
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
#. 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:2612
+#: cmdline/apt-get.cc:2546
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2551
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2623
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2557
+#, c-format
msgid "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
+msgstr ""
-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:2595
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2692
+#: cmdline/apt-get.cc:2626
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2704
+#: cmdline/apt-get.cc:2638
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2705
+#: cmdline/apt-get.cc:2639
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2661
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2747
+#: cmdline/apt-get.cc:2681
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2766
+#: cmdline/apt-get.cc:2700
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2791
+#: cmdline/apt-get.cc:2725
#, c-format
msgid ""
-"No architecture information available for %s. See apt.conf(5) APT::"
-"Architectures for setup"
+"No architecture information available for %s. See apt.conf(5) "
+"APT::Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818
+#: cmdline/apt-get.cc:2742
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2838
+#: cmdline/apt-get.cc:2762
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:3008
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2892
+#, 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
+#: cmdline/apt-get.cc:2913
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -998,58 +900,52 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:3049
+#: cmdline/apt-get.cc:2936
#, c-format
-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgid ""
+"Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:3088
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2975
+#, 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
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:2981
+#, 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
+#: cmdline/apt-get.cc:3004
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:3133
+#: cmdline/apt-get.cc:3020
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:3138
+#: cmdline/apt-get.cc:3025
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243
-#, fuzzy, c-format
+#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130
+#, c-format
msgid "Changelog for %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+msgstr ""
-#: cmdline/apt-get.cc:3369
-#, fuzzy
+#: cmdline/apt-get.cc:3252
msgid "Supported modules:"
-msgstr "Modylau a Gynhelir:"
+msgstr ""
-# FIXME: split
-#: cmdline/apt-get.cc:3410
-#, fuzzy
+#: cmdline/apt-get.cc:3293
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1094,48 +990,8 @@ 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
+#: cmdline/apt-get.cc:3458
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1143,85 +999,81 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: cmdline/acqprogress.cc:60
+#: cmdline/acqprogress.cc:59
msgid "Hit "
msgstr "Presennol "
-#: cmdline/acqprogress.cc:84
+#: cmdline/acqprogress.cc:83
msgid "Get:"
msgstr "Cyrchu:"
-#: cmdline/acqprogress.cc:115
+#: cmdline/acqprogress.cc:114
msgid "Ign "
msgstr "Anwybyddu "
-#: cmdline/acqprogress.cc:119
+#: cmdline/acqprogress.cc:118
msgid "Err "
msgstr "Gwall "
-#: cmdline/acqprogress.cc:140
+#: cmdline/acqprogress.cc:139
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
-#: cmdline/acqprogress.cc:230
+#: cmdline/acqprogress.cc:229
#, c-format
msgid " [Working]"
msgstr " [Gweithio]"
-#: cmdline/acqprogress.cc:286
-#, fuzzy, c-format
+#: cmdline/acqprogress.cc:285
+#, 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
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:48
+#, c-format
msgid "%s can not be marked as it is not installed.\n"
-msgstr "ond nid yw wedi ei sefydlu"
+msgstr ""
-#: cmdline/apt-mark.cc:61
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:54
+#, c-format
msgid "%s was already set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgstr ""
-#: cmdline/apt-mark.cc:63
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:56
+#, c-format
msgid "%s was already set to automatically installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgstr ""
-#: cmdline/apt-mark.cc:228
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:171
+#, c-format
msgid "%s was already set on hold.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+msgstr ""
-#: cmdline/apt-mark.cc:230
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:173
+#, c-format
msgid "%s was already not hold.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+msgstr ""
-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:691
+#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
+msgstr ""
-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209
+#, c-format
msgid "%s set on hold.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgstr ""
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
-#, fuzzy, c-format
+#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214
+#, c-format
msgid "Canceled hold on %s.\n"
-msgstr "Methwyd agor %s"
+msgstr ""
-#: cmdline/apt-mark.cc:332
+#: cmdline/apt-mark.cc:222
msgid "Executing dpkg failed. Are you root?"
msgstr ""
@@ -1253,18 +1105,14 @@ 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 "CD Anghywir"
+msgstr ""
#: methods/cdrom.cc:249
#, c-format
@@ -1273,20 +1121,21 @@ 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 "Ffeil heb ei ganfod"
+msgstr ""
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530
+#: methods/rred.cc:539
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:536
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -1295,80 +1144,77 @@ msgid "Invalid URI, local URIS must not start with //"
msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:173
+#: methods/ftp.cc:172
msgid "Logging in"
msgstr "Yn mewngofnodi"
-#: methods/ftp.cc:179
+#: methods/ftp.cc:178
msgid "Unable to determine the peer name"
msgstr "Ni ellir darganfod enw'r cymar"
-#: methods/ftp.cc:184
+#: methods/ftp.cc:183
msgid "Unable to determine the local name"
msgstr "Ni ellir darganfod yr enw lleol"
-#: methods/ftp.cc:215 methods/ftp.cc:243
-#, fuzzy, c-format
+#: methods/ftp.cc:214 methods/ftp.cc:242
+#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
+msgstr ""
-#: methods/ftp.cc:221
+#: methods/ftp.cc:220
#, c-format
msgid "USER failed, server said: %s"
msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
-#: methods/ftp.cc:228
+#: methods/ftp.cc:227
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
-#: methods/ftp.cc:248
+#: methods/ftp.cc:247
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
-"ProxyLogin yn wag.)"
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae "
+"Acquire::ftp::ProxyLogin yn wag.)"
# FIXME
-#: methods/ftp.cc:276
+#: methods/ftp.cc:275
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
-#: methods/ftp.cc:302
+#: methods/ftp.cc:301
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
-#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233
msgid "Connection timeout"
msgstr "Goramser cysylltu"
-#: methods/ftp.cc:346
+#: methods/ftp.cc:345
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274
-#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197
msgid "Read error"
msgstr "Gwall darllen"
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:355 methods/rsh.cc:204
msgid "A response overflowed the buffer."
msgstr "Gorlifodd ateb y byffer."
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:372 methods/ftp.cc:384
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381
-#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239
msgid "Write error"
msgstr "Gwall ysgrifennu"
-#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738
msgid "Could not create a socket"
msgstr "Methwyd creu soced"
@@ -1377,74 +1223,73 @@ 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 "Methwyd cysylltu soced goddefol"
+msgstr ""
# FIXME
-#: methods/ftp.cc:730
+#: methods/ftp.cc:731
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Methodd getaddrinfo gael soced gwrando"
-#: methods/ftp.cc:744
+#: methods/ftp.cc:745
msgid "Could not bind a socket"
msgstr "Methwyd rhwymo soced"
-#: methods/ftp.cc:748
+#: methods/ftp.cc:749
msgid "Could not listen on the socket"
msgstr "Methwyd gwrando ar y soced"
-#: methods/ftp.cc:755
+#: methods/ftp.cc:756
msgid "Could not determine the socket's name"
msgstr "Methwyd canfod enw'r soced"
-#: methods/ftp.cc:787
+#: methods/ftp.cc:788
msgid "Unable to send PORT command"
msgstr "Methwyd danfod gorchymyn PORT"
-#: methods/ftp.cc:797
+#: methods/ftp.cc:798
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
-#: methods/ftp.cc:806
+#: methods/ftp.cc:807
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
-#: methods/ftp.cc:826
+#: methods/ftp.cc:827
msgid "Data socket connect timed out"
msgstr "Goramserodd cysylltiad y soced data"
-#: methods/ftp.cc:833
+#: methods/ftp.cc:834
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311
+#: methods/ftp.cc:873 methods/http.cc:1031 methods/rsh.cc:309
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
-#: methods/ftp.cc:885
+#: methods/ftp.cc:886
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
-#: methods/ftp.cc:900 methods/rsh.cc:330
+#: methods/ftp.cc:901 methods/rsh.cc:328
msgid "Data socket timed out"
msgstr "Goramserodd soced data"
-#: methods/ftp.cc:930
+#: methods/ftp.cc:931
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
#. Get the files information
-#: methods/ftp.cc:1007
+#: methods/ftp.cc:1008
msgid "Query"
msgstr "Ymholiad"
# FIXME
-#: methods/ftp.cc:1119
+#: methods/ftp.cc:1120
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
@@ -1480,7 +1325,7 @@ 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:153 methods/rsh.cc:433
+#: methods/connect.cc:153 methods/rsh.cc:431
#, c-format
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
@@ -1496,178 +1341,170 @@ msgid "Temporary failure resolving '%s'"
msgstr "Methiant dros dro yn datrys '%s'"
#: methods/connect.cc:200
-#, fuzzy, c-format
+#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+msgstr ""
#: methods/connect.cc:247
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "Methwyd cysylltu i %s %s:"
+msgstr ""
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:172
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:177
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:189
+#: methods/gpgv.cc:181
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-#: methods/gpgv.cc:194
+#: methods/gpgv.cc:186
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
-#, fuzzy
+#: methods/gpgv.cc:220 methods/gpgv.cc:227
msgid "The following signatures were invalid:\n"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+msgstr ""
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:234
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-#: methods/gzip.cc:65
+#: methods/bzip2.cc:63 methods/gzip.cc:54
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:394
+#: methods/http.cc:393
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:544
+#: methods/http.cc:547
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:569 methods/http.cc:576
-#, fuzzy
+#: methods/http.cc:572 methods/http.cc:579
msgid "The HTTP server sent an invalid reply header"
-msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+msgstr ""
-#: methods/http.cc:606
-#, fuzzy
+#: methods/http.cc:608
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+msgstr ""
-#: methods/http.cc:621
-#, fuzzy
+#: methods/http.cc:623
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+msgstr ""
-#: methods/http.cc:623
-#, fuzzy
+#: methods/http.cc:625
msgid "This HTTP server has broken range support"
-msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+msgstr ""
-#: methods/http.cc:647
+#: methods/http.cc:649
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:818
+#: methods/http.cc:808
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:823
+#: methods/http.cc:813
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:846
+#: methods/http.cc:836
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:877
+#: methods/http.cc:867
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:905
+#: methods/http.cc:895
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:919
-#, fuzzy
+#: methods/http.cc:909
msgid "Error reading from server. Remote end closed connection"
-msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+msgstr ""
-#: methods/http.cc:921
+#: methods/http.cc:911
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1194
-#, fuzzy
+#: methods/http.cc:1191
msgid "Bad header data"
-msgstr "Data pennawd gwael"
+msgstr ""
-#: methods/http.cc:1211 methods/http.cc:1266
+#: methods/http.cc:1208 methods/http.cc:1263
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1358
+#: methods/http.cc:1355
msgid "Internal error"
msgstr "Gwall mewnol"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:465
-#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400
-#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109
-#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179
-#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101
#, 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:279
#, c-format
msgid "No mirror file '%s' found "
msgstr ""
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
-#: methods/mirror.cc:287
-#, fuzzy, c-format
+#: methods/mirror.cc:286
+#, c-format
msgid "Can not read mirror file '%s'"
-msgstr "Methwyd agor ffeil %s"
+msgstr ""
-#: methods/mirror.cc:442
+#: methods/mirror.cc:441
#, c-format
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
+#: methods/rred.cc:509
#, c-format
msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
-#: methods/rred.cc:496
+#: methods/rred.cc:514
#, c-format
msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: ftparchive/multicompress.cc:167 methods/rsh.cc:97
msgid "Failed to create IPC pipe to subprocess"
msgstr "Methwyd creu pibell cyfathrebu at isbroses"
-#: methods/rsh.cc:338
+#: methods/rsh.cc:336
msgid "Connection closed prematurely"
msgstr "Caewyd y cysylltiad yn gynnar"
@@ -1685,14 +1522,12 @@ 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 "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
+msgstr ""
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+msgstr ""
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1706,18 +1541,15 @@ msgstr ""
"eto."
#: dselect/update:30
-#, fuzzy
msgid "Merging available information"
-msgstr "Yn cyfuno manylion Ar Gael"
+msgstr ""
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, 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
+#: cmdline/apt-extracttemplates.cc:234
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
@@ -1730,23 +1562,13 @@ 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:1277
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:311
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
@@ -1757,9 +1579,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
-#, fuzzy, c-format
+#, c-format
msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+msgstr ""
#: ftparchive/apt-ftparchive.cc:261
msgid "Source extension list is too long"
@@ -1770,13 +1592,11 @@ msgid "Error writing header to contents file"
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
#: ftparchive/apt-ftparchive.cc:408
-#, fuzzy, c-format
+#, c-format
msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
+msgstr ""
-# FIXME: full stops
#: ftparchive/apt-ftparchive.cc:596
-#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1817,45 +1637,6 @@ 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"
@@ -1866,38 +1647,38 @@ msgstr "Dim dewisiadau'n cyfateb"
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:47
+#: ftparchive/cachedb.cc:46
#, 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:65
+#: ftparchive/cachedb.cc:64
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-#: ftparchive/cachedb.cc:76
+#: ftparchive/cachedb.cc:75
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:81
+#: ftparchive/cachedb.cc:80
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
#, c-format
msgid "Failed to stat %s"
msgstr "Methodd stat() o %s"
-#: ftparchive/cachedb.cc:249
+#: ftparchive/cachedb.cc:248
msgid "Archive has no control record"
msgstr "Does dim cofnod rheoli gan yr archif"
-#: ftparchive/cachedb.cc:490
+#: ftparchive/cachedb.cc:489
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
@@ -1961,7 +1742,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"
@@ -1978,93 +1759,90 @@ msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
#: ftparchive/writer.cc:721
-#, fuzzy, c-format
+#, c-format
msgid " %s has no source override entry\n"
-msgstr " Does dim cofnod gwrthwneud gan %s\n"
+msgstr ""
#: ftparchive/writer.cc:725
-#, fuzzy, c-format
+#, c-format
msgid " %s has no binary override entry either\n"
-msgstr " Does dim cofnod gwrthwneud gan %s\n"
+msgstr ""
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Methwyd neilltuo cof"
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
msgid "Unable to open %s"
msgstr "Ni ellir agor %s"
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
-#, fuzzy, c-format
+#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#, c-format
msgid "Malformed override %s line %llu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgstr ""
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
-#, fuzzy, c-format
+#: ftparchive/override.cc:74 ftparchive/override.cc:178
+#, c-format
msgid "Malformed override %s line %llu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+msgstr ""
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
-#, fuzzy, c-format
+#: ftparchive/override.cc:88 ftparchive/override.cc:191
+#, c-format
msgid "Malformed override %s line %llu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+msgstr ""
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
+#: 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/multicompress.cc:70
-#, fuzzy, c-format
+#: ftparchive/multicompress.cc:69
+#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
+msgstr ""
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:99
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:193
msgid "Failed to create FILE*"
msgstr "Methwyd creu FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:196
msgid "Failed to fork"
msgstr "Methodd fork()"
-#: ftparchive/multicompress.cc:206
-#, fuzzy
+#: ftparchive/multicompress.cc:210
msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+msgstr ""
-#: ftparchive/multicompress.cc:229
-#, fuzzy, c-format
+#: ftparchive/multicompress.cc:233
+#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+msgstr ""
-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
msgstr "Methodd MA i isbroses/ffeil"
-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
msgstr "Methwyd darllen wrth gyfrifo MD5"
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
msgstr "Gwall wrth datgysylltu %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188
#, c-format
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"
@@ -2077,23 +1855,12 @@ 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"
@@ -2106,16 +1873,6 @@ 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"
@@ -2123,16 +1880,15 @@ 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 "Methodd swm gwirio Tar, archif llygredig"
+msgstr ""
#: apt-inst/contrib/extracttar.cc:303
#, c-format
@@ -2148,9 +1904,9 @@ msgid "Error reading archive member header"
msgstr "Gwall wrth ddarllen pennawd aelod archif"
#: apt-inst/contrib/arfile.cc:94
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
+msgstr ""
#: apt-inst/contrib/arfile.cc:106
msgid "Invalid archive member header"
@@ -2177,9 +1933,8 @@ msgid "Failed to allocate diversion"
msgstr "Methwyd neilltuo dargyfeiriad"
#: apt-inst/filelist.cc:466
-#, fuzzy
msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
+msgstr ""
#: apt-inst/filelist.cc:479
#, c-format
@@ -2197,12 +1952,12 @@ msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
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
-#, fuzzy, c-format
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55
+#, c-format
msgid "Failed to write file %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgstr ""
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108
#, c-format
msgid "Failed to close file %s"
msgstr "Methwyd cau ffeil %s"
@@ -2261,61 +2016,56 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
msgid "Unable to stat %s"
msgstr "Ni ellir gwneud stat() o %s"
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47
#, 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"
#. 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
-#, fuzzy, c-format
+#: apt-inst/deb/debfile.cc:56
+#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
+msgstr ""
-#: apt-inst/deb/debfile.cc:120
-#, fuzzy, c-format
+#: apt-inst/deb/debfile.cc:157
+#, c-format
msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+msgstr ""
-#: apt-inst/deb/debfile.cc:214
-#, fuzzy
+#: apt-inst/deb/debfile.cc:277
msgid "Unparsable control file"
-msgstr "Ffeil rheoli ni ellir ei ramadegu"
+msgstr ""
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
-#: apt-pkg/contrib/mmap.cc:111
-#, fuzzy, c-format
+#: apt-pkg/contrib/mmap.cc:91
+#, c-format
msgid "Couldn't duplicate file descriptor %i"
-msgstr "Methwyd agor pibell ar gyfer %s"
+msgstr ""
-#: apt-pkg/contrib/mmap.cc:119
-#, fuzzy, c-format
+#: apt-pkg/contrib/mmap.cc:99
+#, c-format
msgid "Couldn't make mmap of %llu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
+msgstr ""
-#: apt-pkg/contrib/mmap.cc:146
-#, fuzzy
+#: apt-pkg/contrib/mmap.cc:126
msgid "Unable to close mmap"
-msgstr "Ni ellir agor %s"
+msgstr ""
-# FIXME
-#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
-#, fuzzy
+#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182
msgid "Unable to synchronize mmap"
-msgstr "Methwyd gweithredu "
+msgstr ""
-#: apt-pkg/contrib/mmap.cc:290
+#: apt-pkg/contrib/mmap.cc:260
#, c-format
msgid "Couldn't make mmap of %lu bytes"
msgstr "Methwyd gwneud mmap() efo %lu beit"
-#: apt-pkg/contrib/mmap.cc:322
-#, fuzzy
+#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293
msgid "Failed to truncate file"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgstr ""
#: apt-pkg/contrib/mmap.cc:341
#, c-format
@@ -2324,101 +2074,100 @@ msgid ""
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/contrib/mmap.cc:411
#, 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:443
+#: apt-pkg/contrib/mmap.cc:414
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:372
+#: apt-pkg/contrib/strutl.cc:371
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:379
+#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:386
+#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:391
+#: apt-pkg/contrib/strutl.cc:390
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1167
+#: apt-pkg/contrib/strutl.cc:1165
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:468
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:526
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:773
+#: apt-pkg/contrib/configuration.cc:694
#, 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
-#: apt-pkg/contrib/configuration.cc:792
-#, fuzzy, c-format
+#: apt-pkg/contrib/configuration.cc:713
+#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+msgstr ""
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:730
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
-#: apt-pkg/contrib/configuration.cc:849
+#: apt-pkg/contrib/configuration.cc:770
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/contrib/configuration.cc:856
+#: apt-pkg/contrib/configuration.cc:777
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
-#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:869
+#: apt-pkg/contrib/configuration.cc:790
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:872
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/contrib/configuration.cc:793
+#, 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
+#: apt-pkg/contrib/configuration.cc:843
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
@@ -2439,44 +2188,44 @@ msgstr "%c%s... Wedi Gorffen"
msgid "Command line option '%c' [from %s] is not known."
msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
-#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120
#, c-format
msgid "Command line option %s is not understood"
msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/contrib/cmndline.cc:125
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
-#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
#, c-format
msgid "Option %s requires an argument."
msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
-#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
-#: apt-pkg/contrib/cmndline.cc:237
+#: apt-pkg/contrib/cmndline.cc:235
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:266
#, c-format
msgid "Option '%s' is too long"
msgstr "Opsiwn '%s' yn rhy hir"
# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:298
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348
#, c-format
msgid "Invalid operation %s"
msgstr "Gweithred annilys %s"
@@ -2490,118 +2239,116 @@ msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
msgid "Failed to stat the cdrom"
msgstr "Methwyd gwneud stat() o'r CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:93
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:1023
+#, c-format
msgid "Problem closing the gzip file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:225
+#: apt-pkg/contrib/fileutl.cc:169
#, 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:230
+#: apt-pkg/contrib/fileutl.cc:174
#, c-format
msgid "Could not open lock file %s"
msgstr "Methwyd agor y ffeil clo %s"
-#: apt-pkg/contrib/fileutl.cc:248
+#: apt-pkg/contrib/fileutl.cc:192
#, 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:252
+#: apt-pkg/contrib/fileutl.cc:196
#, c-format
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506
+#: apt-pkg/contrib/fileutl.cc:336
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:426
+#: apt-pkg/contrib/fileutl.cc:363
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:381
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:453
+#: apt-pkg/contrib/fileutl.cc:390
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:840
+#: apt-pkg/contrib/fileutl.cc:703
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:842
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:705
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "Derbyniodd is-broses %s wall segmentu."
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:709
#, 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:848
+#: apt-pkg/contrib/fileutl.cc:711
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659
+#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/contrib/fileutl.cc:1066
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:793
+#, c-format
msgid "Could not open file descriptor %d"
-msgstr "Methwyd agor pibell ar gyfer %s"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1156
+#: ftparchive/multicompress.cc:284
msgid "Failed to create subprocess IPC"
msgstr "Methwyd creu isbroses IPC"
-#: apt-pkg/contrib/fileutl.cc:1212
+#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
msgstr "Methwyd gweithredu cywasgydd "
-# FIXME
-#: apt-pkg/contrib/fileutl.cc:1309
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:853
+#, c-format
msgid "read, still have %llu to read but none left"
-msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+msgstr ""
-# FIXME
-#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:886
+#, c-format
msgid "write, still have %llu to write but couldn't"
-msgstr "o hyd %lu i ysgrifennu ond methwyd"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1736
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:1026
+#, c-format
msgid "Problem closing the file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1748
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:1031
+#, c-format
msgid "Problem renaming the file %s to %s"
-msgstr "Gwall wrth gyfamseru'r ffeil"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1759
-#, fuzzy, c-format
+#: apt-pkg/contrib/fileutl.cc:1042
+#, c-format
msgid "Problem unlinking the file %s"
-msgstr "Gwall wrth dadgysylltu'r ffeil"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:1774
+#: apt-pkg/contrib/fileutl.cc:1055
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
@@ -2618,15 +2365,13 @@ 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 "Mae'r ffeil storfa pecyn yn llygredig"
+msgstr ""
-# FIXME: capitalisation?
#: apt-pkg/pkgcache.cc:167
-#, fuzzy, c-format
+#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
+msgstr ""
#: apt-pkg/pkgcache.cc:172
msgid "The package cache was built for a different architecture"
@@ -2688,75 +2433,67 @@ msgstr "opsiynnol"
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
-#, fuzzy
+#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159
msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+msgstr ""
-#: apt-pkg/depcache.cc:133
-#, fuzzy
+#: apt-pkg/depcache.cc:131
msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+msgstr ""
-#: apt-pkg/depcache.cc:162
-#, fuzzy
+#: apt-pkg/depcache.cc:160
msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+msgstr ""
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
-#, fuzzy
+#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217
msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+msgstr ""
-#: apt-pkg/depcache.cc:244
-#, fuzzy, c-format
+#: apt-pkg/depcache.cc:242
+#, c-format
msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+msgstr ""
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
+#: apt-pkg/depcache.cc:248
+#, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgstr ""
# FIXME: number?
-#: apt-pkg/tagfile.cc:129
+#: apt-pkg/tagfile.cc:126
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/tagfile.cc:216
+#: apt-pkg/tagfile.cc:213
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
#: apt-pkg/sourcelist.cc:96
-#, fuzzy, c-format
+#, 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
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+msgstr ""
#: apt-pkg/sourcelist.cc:110
-#, fuzzy, c-format
+#, 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
-#, fuzzy, c-format
+#, 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
-#, fuzzy, c-format
+#, 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
@@ -2774,9 +2511,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
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+msgstr ""
#: apt-pkg/sourcelist.cc:150
#, c-format
@@ -2789,7 +2526,7 @@ msgstr ""
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
@@ -2800,24 +2537,24 @@ msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
#: apt-pkg/sourcelist.cc:289
-#, fuzzy, c-format
+#, 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"
+msgstr ""
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503
-#, fuzzy, c-format
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467
+#, c-format
msgid "Could not configure '%s'. "
-msgstr "Methwyd agor ffeil %s"
+msgstr ""
# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:545
+#: apt-pkg/packagemanager.cc:507
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2833,7 +2570,7 @@ msgstr ""
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/algorithms.cc:261
+#: apt-pkg/algorithms.cc:255
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
@@ -2841,7 +2578,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1223
+#: apt-pkg/algorithms.cc:1191
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2849,46 +2586,43 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1225
+#: apt-pkg/algorithms.cc:1193
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/algorithms.cc:1569 apt-pkg/algorithms.cc:1571
-#, fuzzy
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520
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
-#, fuzzy, c-format
+#, c-format
msgid "List directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+msgstr ""
#: apt-pkg/acquire.cc:85
-#, fuzzy, c-format
+#, c-format
msgid "Archives directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
+msgstr ""
#: apt-pkg/acquire.cc:93
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock directory %s"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+msgstr ""
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:893
+#: apt-pkg/acquire.cc:864
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:895
-#, fuzzy, c-format
+#: apt-pkg/acquire.cc:866
+#, c-format
msgid "Retrieving file %li of %li"
-msgstr "Yn Darllen Rhestr Ffeiliau"
+msgstr ""
#: apt-pkg/acquire-worker.cc:112
#, c-format
@@ -2900,25 +2634,22 @@ msgstr "Methwyd canfod y gyrrydd dull %s."
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/acquire-worker.cc:440
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+#: apt-pkg/acquire-worker.cc:425
+#, 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
+#: apt-pkg/init.cc:151
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-pkg/init.cc:168
-#, fuzzy
+#: apt-pkg/init.cc:167
msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
+msgstr ""
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:59
#, c-format
msgid "Unable to stat %s."
msgstr "Ni ellir gwneud stat() o %s."
@@ -2934,7 +2665,8 @@ msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
#: apt-pkg/cachefile.cc:91
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."
+msgstr ""
+"Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
#: apt-pkg/cachefile.cc:109
msgid "The list of sources could not be read."
@@ -2947,11 +2679,10 @@ msgid ""
"available in the sources"
msgstr ""
-# FIXME: literal
#: apt-pkg/policy.cc:396
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
+msgstr ""
# FIXME: tense
#: apt-pkg/policy.cc:418
@@ -2963,64 +2694,63 @@ msgstr "Methwyd daeall y math pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-#: apt-pkg/pkgcachegen.cc:85
+#: apt-pkg/pkgcachegen.cc:83
msgid "Cache has an incompatible versioning system"
msgstr "Mae can y storfa system fersiwn anghyfaddas"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
-#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362
-#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389
-#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397
-#: 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
-#, fuzzy, c-format
+#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275
+#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353
+#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374
+#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388
+#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413
+#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463
+#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508
+#, c-format
msgid "Error occurred while processing %s (%s%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+msgstr ""
-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:232
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-pkg/pkgcachegen.cc:237
+#: apt-pkg/pkgcachegen.cc:235
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."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:240
-#, fuzzy
+#: apt-pkg/pkgcachegen.cc:238
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."
+msgstr ""
-#: apt-pkg/pkgcachegen.cc:243
+#: apt-pkg/pkgcachegen.cc:241
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:523
+#: apt-pkg/pkgcachegen.cc:515
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-#: apt-pkg/pkgcachegen.cc:1088
+#: apt-pkg/pkgcachegen.cc:1080
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: apt-pkg/pkgcachegen.cc:1176 apt-pkg/pkgcachegen.cc:1280
-#: apt-pkg/pkgcachegen.cc:1286 apt-pkg/pkgcachegen.cc:1443
-#, fuzzy
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168
+#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278
+#: apt-pkg/pkgcachegen.cc:1434
msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
+msgstr ""
-#: apt-pkg/pkgcachegen.cc:1193
+#: apt-pkg/pkgcachegen.cc:1185
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:1385 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
@@ -3029,46 +2759,44 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:599
+#: apt-pkg/acquire-item.cc:640
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870
-#: apt-pkg/acquire-item.cc:2013
-#, fuzzy
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
msgid "Hash Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
+msgstr ""
-#: apt-pkg/acquire-item.cc:1381
+#: apt-pkg/acquire-item.cc:1399
#, 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:1397
-#, fuzzy, c-format
+#: apt-pkg/acquire-item.cc:1415
+#, c-format
msgid "Unable to find hash sum for '%s' in Release file"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgstr ""
-#: apt-pkg/acquire-item.cc:1439
+#: apt-pkg/acquire-item.cc:1450
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1488
#, 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:1499
+#: apt-pkg/acquire-item.cc:1510
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1532
+#: apt-pkg/acquire-item.cc:1543
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
@@ -3076,13 +2804,13 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1646
+#: apt-pkg/acquire-item.cc:1650
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3091,7 +2819,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1709
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3100,219 +2828,213 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:1764
+#: apt-pkg/acquire-item.cc:1768
#, 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/acquire-item.cc:1862
+#: apt-pkg/acquire-item.cc:1855
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:64
-#, fuzzy, c-format
+#: apt-pkg/indexrecords.cc:61
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgstr ""
-#: apt-pkg/indexrecords.cc:74
-#, fuzzy, c-format
+#: apt-pkg/indexrecords.cc:71
+#, c-format
msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+msgstr ""
-#: apt-pkg/indexrecords.cc:108
+#: apt-pkg/indexrecords.cc:105
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:121
-#, fuzzy, c-format
+#: apt-pkg/indexrecords.cc:118
+#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+msgstr ""
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:140
-#, fuzzy, c-format
+#: apt-pkg/indexrecords.cc:137
+#, c-format
msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgstr ""
#: apt-pkg/vendorlist.cc:78
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/cdrom.cc:576
+#: apt-pkg/cdrom.cc:528
#, c-format
msgid ""
"Using CD-ROM mount point %s\n"
"Mounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
+#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:613
+#: apt-pkg/cdrom.cc:565
#, c-format
msgid "Stored label: %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907
-#, fuzzy
+#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850
msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
+msgstr ""
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:594
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:612
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:665
-#, fuzzy
+#: apt-pkg/cdrom.cc:617
msgid "Waiting for disc...\n"
-msgstr "Yn aros am benawdau"
+msgstr ""
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:626
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:645
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:687
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:698
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:725
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:754
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:771
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:830
-#, fuzzy
+#: apt-pkg/cdrom.cc:773
msgid "Copying package lists..."
-msgstr "Yn Darllen Rhestrau Pecynnau"
+msgstr ""
-#: apt-pkg/cdrom.cc:857
-#, fuzzy
+#: apt-pkg/cdrom.cc:800
msgid "Writing new source list\n"
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+msgstr ""
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:808
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888
+#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/indexcopy.cc:546
#, c-format
msgid "Can't find authentication record for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
+#: apt-pkg/indexcopy.cc:552
+#, c-format
msgid "Hash mismatch for: %s"
-msgstr "Camgyfatebiaeth swm MD5"
+msgstr ""
-#: apt-pkg/indexcopy.cc:662
+#: apt-pkg/indexcopy.cc:680
#, c-format
msgid "File %s doesn't start with a clearsigned message"
msgstr ""
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/indexcopy.cc:692
-#, fuzzy, c-format
+#: apt-pkg/indexcopy.cc:711
+#, c-format
msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
+msgstr ""
-#: apt-pkg/cacheset.cc:403
+#: apt-pkg/cacheset.cc:342
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: apt-pkg/cacheset.cc:406
+#: apt-pkg/cacheset.cc:345
#, 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
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:452
+#, c-format
msgid "Couldn't find task '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgstr ""
-#: apt-pkg/cacheset.cc:523
-#, fuzzy, c-format
+#: apt-pkg/cacheset.cc:459
+#, c-format
msgid "Couldn't find any package by regex '%s'"
-msgstr "Methwyd canfod pecyn %s"
+msgstr ""
-#: apt-pkg/cacheset.cc:534
+#: apt-pkg/cacheset.cc:472
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
+#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:555
+#: apt-pkg/cacheset.cc:496
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:563
+#: apt-pkg/cacheset.cc:504
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:571
+#: apt-pkg/cacheset.cc:512
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
@@ -3321,149 +3043,149 @@ msgstr ""
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:209
+#: apt-pkg/edsp.cc:213
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:277
+#: apt-pkg/edsp.cc:281
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:284
+#: apt-pkg/edsp.cc:288
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:72
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:70
+#, c-format
msgid "Installing %s"
-msgstr " Wedi Sefydlu: "
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:865
+#, c-format
msgid "Configuring %s"
-msgstr "Yn cysylltu i %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:872
+#, c-format
msgid "Removing %s"
-msgstr "Yn agor %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:75
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:73
+#, c-format
msgid "Completely removing %s"
-msgstr "Methwyd dileu %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:74
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:75
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:704
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:671
+#, c-format
msgid "Directory '%s' missing"
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:686 apt-pkg/deb/dpkgpm.cc:706
+#, c-format
msgid "Could not open file '%s'"
-msgstr "Methwyd agor ffeil %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:944
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:858
+#, c-format
msgid "Preparing %s"
-msgstr "Yn agor %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:945
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:859
+#, c-format
msgid "Unpacking %s"
-msgstr "Yn agor %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:950
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:864
+#, c-format
msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:952
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:866
+#, c-format
msgid "Installed %s"
-msgstr " Wedi Sefydlu: "
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:957
+#: apt-pkg/deb/dpkgpm.cc:871
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:959
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:873
+#, c-format
msgid "Removed %s"
-msgstr "Argymell"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:964
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:878
+#, c-format
msgid "Preparing to completely remove %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:965
-#, fuzzy, c-format
+#: apt-pkg/deb/dpkgpm.cc:879
+#, c-format
msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
+msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1208
+#: apt-pkg/deb/dpkgpm.cc:1110
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1238
+#: apt-pkg/deb/dpkgpm.cc:1140
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1410
+#: apt-pkg/deb/dpkgpm.cc:1319
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1472
+#: apt-pkg/deb/dpkgpm.cc:1376
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1477
+#: apt-pkg/deb/dpkgpm.cc:1381
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1479
+#: apt-pkg/deb/dpkgpm.cc:1383
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1485
+#: apt-pkg/deb/dpkgpm.cc:1389
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1492
+#: apt-pkg/deb/dpkgpm.cc:1396
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505
+#: apt-pkg/deb/dpkgpm.cc:1403 apt-pkg/deb/dpkgpm.cc:1409
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1526
+#: apt-pkg/deb/dpkgpm.cc:1430
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -3476,9 +3198,9 @@ msgid ""
msgstr ""
#: apt-pkg/deb/debsystem.cc:87
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+msgstr ""
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
@@ -3492,229 +3214,78 @@ msgstr ""
msgid "Not locked"
msgstr ""
-#, fuzzy
-#~ msgid "Skipping nonexistent file %s"
-#~ msgstr "Yn agor y ffeil cyfluniad %s"
-
-#~ msgid "Failed to remove %s"
-#~ msgstr "Methwyd dileu %s"
-
-#~ msgid "Unable to create %s"
-#~ msgstr "Ni ellir creu %s"
+#, c-format
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#~ msgid "Failed to stat %sinfo"
-#~ msgstr "Methwyd stat() ar %sinfo"
+#, c-format
+#~ msgid "Read error from %s process"
+#~ msgstr "Gwall darllen o broses %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"
+#, c-format
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Methwyd agor pibell ar gyfer %s"
-#~ msgid "Failed to change to the admin dir %sinfo"
-#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Methwyd lleoli ffeil rheoli dilys"
-# FIXME
-#, fuzzy
-#~ msgid "Internal error getting a package name"
-#~ msgstr "Gwall mewnol wrth gyrchu enw pecyn"
+#, c-format
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Methwyd newid i %s"
-#, fuzzy
-#~ msgid "Reading file listing"
-#~ msgstr "Yn Darllen Rhestr Ffeiliau"
+#, c-format
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
-#~ 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!"
+#, c-format
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
-# FIXME
-#~ msgid "Failed reading the list file %sinfo/%s"
-#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+#, c-format
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-#, fuzzy
-#~ msgid "Internal error getting a node"
-#~ msgstr "Gwall Mewnol wrth gael Nôd"
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
# FIXME: literal
+#, c-format
#~ 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 "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"
+#, c-format
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
-# FIXME: commas, wrapping
+#, c-format
#~ msgid ""
-#~ "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."
+#~ "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 ""
-#~ "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."
-
-#, fuzzy
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "Linell %d yn rhy hir (uchaf %d)"
-
-#, fuzzy
-#~ msgid "Line %d too long (max %d)"
-#~ msgstr "Linell %d yn rhy hir (uchaf %d)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+#~ "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!"
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-
-#, fuzzy
-#~ msgid "openpty failed\n"
-#~ msgstr "Methwyd dewis"
-
-#~ msgid "File date has changed %s"
-#~ msgstr "Dyddiad ffeil wedi newid %s"
+#, c-format
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
-#, fuzzy
-#~ msgid "Reading file list"
-#~ msgstr "Yn Darllen Rhestr Ffeiliau"
+#~ 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 "Could not execute "
-#~ msgstr "Methwyd cael y clo %s"
+#, c-format
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Methwyd stat() ar %sinfo"
-#~ msgid "Abort? [Y/n] "
-#~ msgstr "Erthylu? [I/n] "
+#, c-format
+#~ msgid "Unable to create %s"
+#~ msgstr "Ni ellir creu %s"
-#~ msgid "Write Error"
-#~ msgstr "Gwall Ysgrifennu"
+#, c-format
+#~ msgid "Failed to remove %s"
+#~ msgstr "Methwyd dileu %s"
-#~ msgid "File Not Found"
-#~ msgstr "Ni Chanfuwyd Y Ffeil"
+#, 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"