msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-04-29 21:56-0700\n"
+"POT-Creation-Date: 2005-07-02 11:19-0700\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:133
+#: cmdline/apt-cache.cc:135
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
-#: cmdline/apt-cache.cc:173 cmdline/apt-cache.cc:525 cmdline/apt-cache.cc:613
-#: cmdline/apt-cache.cc:769 cmdline/apt-cache.cc:987 cmdline/apt-cache.cc:1355
-#: cmdline/apt-cache.cc:1506
+#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
+#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
+#: cmdline/apt-cache.cc:1508
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
-#: cmdline/apt-cache.cc:230
-msgid "Total Package Names : "
+#: cmdline/apt-cache.cc:232
+#, fuzzy
+msgid "Total package names : "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:270
-msgid " Normal Packages: "
+#: cmdline/apt-cache.cc:272
+#, fuzzy
+msgid " Normal packages: "
msgstr " Pecynnau Normal: "
-#: cmdline/apt-cache.cc:271
-msgid " Pure Virtual Packages: "
+#: cmdline/apt-cache.cc:273
+#, fuzzy
+msgid " Pure virtual packages: "
msgstr " Pecynnau Cwbl Rhithwir: "
-#: cmdline/apt-cache.cc:272
-msgid " Single Virtual Packages: "
+#: cmdline/apt-cache.cc:274
+#, fuzzy
+msgid " Single virtual packages: "
msgstr " Pecynnau Rhithwir Sengl: "
-#: cmdline/apt-cache.cc:273
-msgid " Mixed Virtual Packages: "
+#: cmdline/apt-cache.cc:275
+#, fuzzy
+msgid " Mixed virtual packages: "
msgstr " Pecynnau Rhithwir Cymysg: "
-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:276
msgid " Missing: "
msgstr " Ar Goll: "
-#: cmdline/apt-cache.cc:276
-msgid "Total Distinct Versions: "
+#: cmdline/apt-cache.cc:278
+#, fuzzy
+msgid "Total distinct versions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:278
-msgid "Total Dependencies: "
+#: cmdline/apt-cache.cc:280
+#, fuzzy
+msgid "Total dependencies: "
msgstr "Cyfanswm Dibyniaethau: "
-#: cmdline/apt-cache.cc:281
-msgid "Total Ver/File relations: "
+#: cmdline/apt-cache.cc:283
+#, fuzzy
+msgid "Total ver/file relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:283
-msgid "Total Provides Mappings: "
+#: cmdline/apt-cache.cc:285
+#, fuzzy
+msgid "Total Provides mappings: "
msgstr "Cyfanswm Mapiau Darpariath: "
-#: cmdline/apt-cache.cc:295
-msgid "Total Globbed Strings: "
+#: cmdline/apt-cache.cc:297
+#, fuzzy
+msgid "Total globbed strings: "
msgstr "Cyfanswm Llinynau Glob: "
-#: cmdline/apt-cache.cc:309
-msgid "Total Dependency Version space: "
+#: cmdline/apt-cache.cc:311
+#, fuzzy
+msgid "Total dependency version space: "
msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-#: cmdline/apt-cache.cc:314
-msgid "Total Slack space: "
+#: cmdline/apt-cache.cc:316
+#, fuzzy
+msgid "Total slack space: "
msgstr "Cyfanswm gofod Slac: "
-#: cmdline/apt-cache.cc:322
-msgid "Total Space Accounted for: "
+#: cmdline/apt-cache.cc:324
+#, fuzzy
+msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
-#: cmdline/apt-cache.cc:444 cmdline/apt-cache.cc:1187
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
#, c-format
msgid "Package file %s is out of sync."
msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
-#: cmdline/apt-cache.cc:1229
+#: cmdline/apt-cache.cc:1231
msgid "You must give exactly one pattern"
msgstr "Rhaid i chi ddarparu un patrwm yn union"
-#: cmdline/apt-cache.cc:1383
+#: cmdline/apt-cache.cc:1385
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
-#: cmdline/apt-cache.cc:1460
-msgid "Package Files:"
+#: cmdline/apt-cache.cc:1462
+#, fuzzy
+msgid "Package files:"
msgstr "Ffeiliau Pecynnau:"
-#: cmdline/apt-cache.cc:1467 cmdline/apt-cache.cc:1553
+#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
-#: cmdline/apt-cache.cc:1468
+#: cmdline/apt-cache.cc:1470
#, c-format
msgid "%4i %s\n"
msgstr "%4i %s\n"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1480
-msgid "Pinned Packages:"
+#: cmdline/apt-cache.cc:1482
+#, fuzzy
+msgid "Pinned packages:"
msgstr "Pecynnau wedi eu Pinio:"
-#: cmdline/apt-cache.cc:1492 cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
msgid "(not found)"
msgstr "(heb ganfod)"
#. Installed version
-#: cmdline/apt-cache.cc:1513
+#: cmdline/apt-cache.cc:1515
msgid " Installed: "
msgstr " Wedi Sefydlu: "
-#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1523
+#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
msgid "(none)"
msgstr "(dim)"
#. Candidate Version
-#: cmdline/apt-cache.cc:1520
+#: cmdline/apt-cache.cc:1522
msgid " Candidate: "
msgstr " Ymgeisydd: "
-#: cmdline/apt-cache.cc:1530
-msgid " Package Pin: "
+#: cmdline/apt-cache.cc:1532
+#, fuzzy
+msgid " Package pin: "
msgstr " Pin Pecyn: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1539
-msgid " Version Table:"
+#: cmdline/apt-cache.cc:1541
+#, fuzzy
+msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1556
#, c-format
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1581 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2299 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
-#: cmdline/apt-cache.cc:1588
+#: cmdline/apt-cache.cc:1658
+#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\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 arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
"Defnydd: apt-cache [opsiynnau] gorchymyn\n"
msgstr "Nid yw ymresymiadau mewn parau"
#: cmdline/apt-config.cc:76
+#, fuzzy
msgid ""
"Usage: apt-config [options] command\n"
"\n"
"Options:\n"
" -h This help text.\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
-msgstr "Defnydd: apt-config [opsiynnau] gorchymyn\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"
# FIXME: "debian"
#: cmdline/apt-extracttemplates.cc:232
+#, fuzzy
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
"\n"
" -h This help text\n"
" -t Set the temp dir\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
"\n"
#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179
#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
-#, c-format
-msgid "Error Processing directory %s"
+#, fuzzy, c-format
+msgid "Error processing directory %s"
msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
#: ftparchive/apt-ftparchive.cc:250
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
#: ftparchive/apt-ftparchive.cc:397
-#, c-format
-msgid "Error Processing Contents %s"
+#, fuzzy, c-format
+msgid "Error processing contents %s"
msgstr "Gwall wrth Brosesu Cynnwys %s"
# FIXME: full stops
#: ftparchive/apt-ftparchive.cc:551
+#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
"Commands: packages binarypath [overridefile [pathprefix]]\n"
" --no-delink Enable delinking debug mode\n"
" --contents Control contents file generation\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option"
+" -o=? Set an arbitrary configuration option"
msgstr ""
"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\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"
+"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"
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:352 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: ftparchive/writer.cc:358 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/writer.cc:372
+#: ftparchive/writer.cc:378
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:380 ftparchive/writer.cc:589
+#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:423 ftparchive/writer.cc:671
+#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, fuzzy, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Methwyd neilltuo cof"
msgstr "Methwydd darllen y ffeil dargyfeirio %s"
#: ftparchive/multicompress.cc:75
-#, c-format
-msgid "Unknown Compresison Algorithm '%s'"
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"
msgstr "Dull Cywasgu Anhysbys '%s'"
#: ftparchive/multicompress.cc:105
msgstr "Methodd fork()"
#: ftparchive/multicompress.cc:215
-msgid "Compress Child"
+#, fuzzy
+msgid "Compress child"
msgstr "Plentyn Cywasgu"
#: ftparchive/multicompress.cc:238
-#, c-format
-msgid "Internal Error, Failed to create %s"
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"
msgstr "Gwall Mewnol, Methwyd creu %s"
#: ftparchive/multicompress.cc:289
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1466
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
#: cmdline/apt-get.cc:421
-msgid "The following packages have been kept back"
+#, fuzzy
+msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
#: cmdline/apt-get.cc:442
-msgid "The following packages will be upgraded"
+#, fuzzy
+msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
#: cmdline/apt-get.cc:463
-msgid "The following packages will be DOWNGRADED"
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
#: cmdline/apt-get.cc:483
msgstr "%s (oherwydd %s) "
#: cmdline/apt-get.cc:544
+#, fuzzy
msgid ""
-"WARNING: The following essential packages will be removed\n"
+"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"
msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
#: cmdline/apt-get.cc:687
-msgid "WARNING: The following packages cannot be securely authenticated!"
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
#: cmdline/apt-get.cc:698
-msgid "Abort? [Y/n] "
-msgstr "Erthylu? [I/n] "
+msgid "Install these packages without verification [y/N]? "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:755
-msgid "Packages need to be removed but Remove is disabled."
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+
+#: cmdline/apt-get.cc:762
+#, fuzzy
+msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: cmdline/apt-get.cc:781 cmdline/apt-get.cc:1755 cmdline/apt-get.cc:1788
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1836 cmdline/apt-get.cc:2047
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: cmdline/apt-get.cc:811
+#: cmdline/apt-get.cc:818
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:821
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:826
#, c-format
msgid "After unpacking %sB of additional disk space will be used.\n"
msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
-#: cmdline/apt-get.cc:822
+#: cmdline/apt-get.cc:829
#, c-format
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:846
#, 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:848
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-
-#: cmdline/apt-get.cc:854 cmdline/apt-get.cc:874
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
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:856
+#: cmdline/apt-get.cc:863
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:858
-#, c-format
+#: cmdline/apt-get.cc:865
+#, fuzzy, c-format
msgid ""
-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:879
-msgid "Do you want to continue? [Y/n] "
+#: cmdline/apt-get.cc:886
+#, fuzzy
+msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:954 cmdline/apt-get.cc:1325 cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-get.cc:972
+#: cmdline/apt-get.cc:976
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:973 cmdline/apt-get.cc:1954
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:979
+#: cmdline/apt-get.cc:983
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:987
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:988
+#: cmdline/apt-get.cc:992
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:989
-msgid "Aborting Install."
+#: cmdline/apt-get.cc:993
+#, fuzzy
+msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1022
+#: cmdline/apt-get.cc:1026
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: cmdline/apt-get.cc:1032
+#: cmdline/apt-get.cc:1036
#, 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"
-#: cmdline/apt-get.cc:1050
+#: cmdline/apt-get.cc:1054
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
-#: cmdline/apt-get.cc:1061
+#: cmdline/apt-get.cc:1065
#, 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:1073
+#: cmdline/apt-get.cc:1077
msgid " [Installed]"
msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:1078
+#: cmdline/apt-get.cc:1082
msgid "You should explicitly select one to install."
msgstr "Dylech ddewis un yn benodol i'w sefydlu."
# FIXME: punctuation
-#: cmdline/apt-get.cc:1083
-#, c-format
+#: cmdline/apt-get.cc:1087
+#, fuzzy, c-format
msgid ""
-"Package %s has no available version, but exists in the database.\n"
-"This typically means that the package was mentioned in a dependency and\n"
-"never uploaded, has been obsoleted or is not available with the contents\n"
-"of sources.list\n"
+"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:1103
+#: cmdline/apt-get.cc:1106
msgid "However the following packages replace it:"
msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-#: cmdline/apt-get.cc:1126
+#: cmdline/apt-get.cc:1129
#, 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:1134
+#: cmdline/apt-get.cc:1137
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-get.cc:1161
+#: cmdline/apt-get.cc:1164
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: cmdline/apt-get.cc:1169
+#: cmdline/apt-get.cc:1172
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: cmdline/apt-get.cc:1279
+#: cmdline/apt-get.cc:1282
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1292
+#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
msgid "Unable to lock the list directory"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: cmdline/apt-get.cc:1344
+#: cmdline/apt-get.cc:1353
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
"rai eu defnyddio yn lle."
-#: cmdline/apt-get.cc:1363
-msgid "Internal Error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1372
+#, fuzzy
+msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1453 cmdline/apt-get.cc:1489
+#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1476
+#: cmdline/apt-get.cc:1494
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1524
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:1509
+#: cmdline/apt-get.cc:1527
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1521
+#: cmdline/apt-get.cc:1539
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"
"heb gael eu symud allan o Incoming."
# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1529
+#: cmdline/apt-get.cc:1547
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"
"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."
-#: cmdline/apt-get.cc:1534
+#: cmdline/apt-get.cc:1552
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1555
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1563
+#: cmdline/apt-get.cc:1581
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1629
+#: cmdline/apt-get.cc:1652
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1630
+#: cmdline/apt-get.cc:1653
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1650
-msgid "Calculating Upgrade... "
+#: cmdline/apt-get.cc:1673
+#, fuzzy
+msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1653 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1658
+#: cmdline/apt-get.cc:1681
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1831
+#: cmdline/apt-get.cc:1854
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:1858 cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:1905
+#: cmdline/apt-get.cc:1928
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1933
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:1913
+#: cmdline/apt-get.cc:1936
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:1919
-#, c-format
-msgid "Fetch Source %s\n"
+#: cmdline/apt-get.cc:1942
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:1950
+#: cmdline/apt-get.cc:1973
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:1978
+#: cmdline/apt-get.cc:2001
#, 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:1990
+#: cmdline/apt-get.cc:2013
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2007
+#: cmdline/apt-get.cc:2030
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2026
+#: cmdline/apt-get.cc:2049
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:2065
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"
+msgstr ""
+"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2070
+#: cmdline/apt-get.cc:2093
#, 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:2090
+#: cmdline/apt-get.cc:2113
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2142
+#: cmdline/apt-get.cc:2165
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
+"s"
-#: cmdline/apt-get.cc:2194
+#: cmdline/apt-get.cc:2217
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can 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"
+"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:2229
+#: cmdline/apt-get.cc:2252
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
-msgstr "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy newydd"
+msgstr ""
+"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
+"newydd"
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2277
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2291
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2272
+#: cmdline/apt-get.cc:2295
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2304
-msgid "Supported Modules:"
+#: cmdline/apt-get.cc:2327
+#, fuzzy
+msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2345
+#: cmdline/apt-get.cc:2368
+#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
" -b Build the source package after fetching it\n"
" -V Show verbose version numbers\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
+#, c-format
msgid " [Working]"
msgstr " [Gweithio]"
#: cmdline/acqprogress.cc:271
-#, c-format
+#, fuzzy, c-format
msgid ""
-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
msgstr "Cofnod pecyn anhysbys!"
#: cmdline/apt-sortpkgs.cc:150
+#, fuzzy
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
"\n"
" -h This help text\n"
" -s Use source file sorting\n"
" -c=? Read this configuration file\n"
-" -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
msgstr ""
"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
"\n"
"eto."
#: dselect/update:30
-msgid "Merging Available information"
+#, fuzzy
+msgid "Merging available information"
msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-inst/contrib/extracttar.cc:115
+#: apt-inst/contrib/extracttar.cc:117
msgid "Failed to create pipes"
msgstr "Methwyd creu pibau"
-#: apt-inst/contrib/extracttar.cc:140
+#: apt-inst/contrib/extracttar.cc:143
msgid "Failed to exec gzip "
msgstr "Methwyd gweithredu gzip"
-#: apt-inst/contrib/extracttar.cc:177 apt-inst/contrib/extracttar.cc:203
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
msgid "Corrupted archive"
msgstr "Archif llygredig"
-#: apt-inst/contrib/extracttar.cc:192
-msgid "Tar Checksum failed, archive corrupted"
+#: apt-inst/contrib/extracttar.cc:195
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"
msgstr "Methodd swm gwirio Tar, archif llygredig"
-#: apt-inst/contrib/extracttar.cc:295
+#: apt-inst/contrib/extracttar.cc:298
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Math pennawd TAR anhysbys %u, aelod %s"
msgstr "Methwyd neilltuo dargyfeiriad"
#: apt-inst/filelist.cc:468
-msgid "Internal Error in AddDiversion"
+#, fuzzy
+msgid "Internal error in AddDiversion"
msgstr "Gwall Mewnol yn AddDiversion"
#: apt-inst/filelist.cc:481
msgstr "Ffeil cyfluniad dyblyg %s/%s"
#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
-#, c-format
-msgid "Failed write file %s"
+#, fuzzy, c-format
+msgid "Failed to write file %s"
msgstr "Methwyd ysgrifennu ffeil %s"
#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
#: apt-inst/extract.cc:243
#, c-format
msgid "The directory %s is being replaced by a non-directory"
-msgstr "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
+msgstr ""
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
#: apt-inst/extract.cc:283
msgid "Failed to locate node in its hash bucket"
#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
#: apt-pkg/pkgcachegen.cc:840
-msgid "Reading Package Lists"
+#, fuzzy
+msgid "Reading package lists"
msgstr "Yn Darllen Rhestrau Pecynnau"
#: apt-inst/deb/dpkgdb.cc:180
# FIXME
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
#: apt-inst/deb/dpkgdb.cc:448
-msgid "Internal Error getting a Package Name"
+#, fuzzy
+msgid "Internal error getting a package name"
msgstr "Gwall mewnol wrth gyrchu enw pecyn"
#: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+#, fuzzy
+msgid "Reading file listing"
msgstr "Yn Darllen Rhestr Ffeiliau"
#: apt-inst/deb/dpkgdb.cc:216
msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:266
-msgid "Internal Error getting a Node"
+#, fuzzy
+msgid "Internal error getting a node"
msgstr "Gwall Mewnol wrth gael Nôd"
# FIXME: literal
msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
#: apt-inst/deb/dpkgdb.cc:362
-msgid "Internal Error adding a diversion"
+#, fuzzy
+msgid "Internal error adding a diversion"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+#, fuzzy
+msgid "The pkg cache must be initialized first"
msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
+#, fuzzy
+msgid "Reading file list"
msgstr "Yn Darllen Rhestr Ffeiliau"
#: apt-inst/deb/dpkgdb.cc:443
-#, c-format
-msgid "Failed to find a Package: Header, offset %lu"
+#, fuzzy, c-format
+msgid "Failed to find a Package: header, offset %lu"
msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
#: apt-inst/deb/dpkgdb.cc:465
msgid "Error parsing MD5. Offset %lu"
msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
-#: apt-inst/deb/debfile.cc:55
+#: 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"
-#: apt-inst/deb/debfile.cc:72
-#, c-format
-msgid "Internal Error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+#: apt-inst/deb/debfile.cc:52
+#, fuzzy, c-format
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112
#, c-format
msgid "Couldn't change to %s"
msgstr "Methwyd newid i %s"
-#: apt-inst/deb/debfile.cc:125
-msgid "Internal Error, could not locate member"
+#: apt-inst/deb/debfile.cc:138
+#, fuzzy
+msgid "Internal error, could not locate member"
msgstr "Gwall Methwyd, methwyd lleoli aelod"
-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171
msgid "Failed to locate a valid control file"
msgstr "Methwyd lleoli ffeil rheoli dilys"
-#: apt-inst/deb/debfile.cc:243
-msgid "Unparsible control file"
+#: apt-inst/deb/debfile.cc:256
+#, fuzzy
+msgid "Unparsable control file"
msgstr "Ffeil rheoli ni ellir ei ramadegu"
#: methods/cdrom.cc:113
msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
#: methods/cdrom.cc:122
+#, fuzzy
msgid ""
-"Please use apt-cdrom to make this CD recognized by APT. apt-get update "
-"cannot be used to add new CDs"
+"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."
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."
#: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+#, fuzzy
+msgid "Wrong CD-ROM"
msgstr "CD Anghywir"
#: methods/cdrom.cc:163
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr "Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei "
-"ddefnyddio."
+msgstr ""
+"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
msgstr "Ni ellir darganfod yr enw lleol"
#: methods/ftp.cc:204 methods/ftp.cc:232
-#, c-format
-msgid "Server refused our connection and said: %s"
+#, fuzzy, c-format
+msgid "The server refused the connection and said: %s"
msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
#: methods/ftp.cc:210
"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:265
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:452 methods/rsh.cc:190
+#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
msgid "Read error"
msgstr "Gwall darllen"
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
-msgstr "Gwall Ysgrifennu"
+#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
+msgid "Write error"
+msgstr "Gwall ysgrifennu"
#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
msgid "Could not create a socket"
msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
#: methods/ftp.cc:704
-msgid "Could not connect passive socket"
+#, fuzzy
+msgid "Could not connect passive socket."
msgstr "Methwyd cysylltu soced goddefol"
# FIXME
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:864 methods/http.cc:912 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
msgstr "Ymholiad"
# FIXME
-#: methods/ftp.cc:1104
+#: methods/ftp.cc:1106
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:340
+#: methods/http.cc:344
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:486
+#: methods/http.cc:490
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:494
+#: methods/http.cc:498
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:513 methods/http.cc:520
-msgid "The http server sent an invalid reply header"
+#: methods/http.cc:517 methods/http.cc:524
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:549
-msgid "The http server sent an invalid Content-Length header"
+#: methods/http.cc:553
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:564
-msgid "The http server sent an invalid Content-Range header"
+#: methods/http.cc:568
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:566
-msgid "This http server has broken range support"
+#: methods/http.cc:570
+#, fuzzy
+msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:590
+#: methods/http.cc:594
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:733
+#: methods/http.cc:741
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:738
+#: methods/http.cc:746
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:761
+#: methods/http.cc:769
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:789
+#: methods/http.cc:797
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:814
+#: methods/http.cc:822
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:828
-msgid "Error reading from server Remote end closed connection"
+#: methods/http.cc:836
+#, fuzzy
+msgid "Error reading from server. Remote end closed connection"
msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
-#: methods/http.cc:830
+#: methods/http.cc:838
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1061
-msgid "Bad header Data"
+#: methods/http.cc:1069
+#, fuzzy
+msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1078
+#: methods/http.cc:1086
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1169
+#: methods/http.cc:1177
msgid "Internal error"
msgstr "Gwall mewnol"
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"
+
#: apt-pkg/contrib/mmap.cc:82
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
# FIXME
#: apt-pkg/contrib/configuration.cc:586
-#, c-format
-msgid "Syntax error %s:%u: Malformed Tag"
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
#: apt-pkg/contrib/configuration.cc:603
#: apt-pkg/contrib/configuration.cc:643
#, 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"
+msgstr ""
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
#: apt-pkg/contrib/configuration.cc:650
#, c-format
msgid "Unable to stat the mount point %s"
msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:418 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:358
-#, c-format
-msgid "Waited, for %s but it wasn't there"
+#: apt-pkg/contrib/fileutl.cc:359
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:369
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:372
#, 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:373
+#: apt-pkg/contrib/fileutl.cc:374
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:418
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:473
+#: apt-pkg/contrib/fileutl.cc:474
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "o hyd %lu i ddarllen ond dim ar ôl"
-#: apt-pkg/contrib/fileutl.cc:491
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
-
# FIXME
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:504
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:578
+#: apt-pkg/contrib/fileutl.cc:579
msgid "Problem closing the file"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:585
msgid "Problem unlinking the file"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:596
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
# FIXME: capitalisation?
#: apt-pkg/pkgcache.cc:142
-#, c-format
-msgid "This APT does not support the Versioning System '%s'"
+#, fuzzy, c-format
+msgid "This APT does not support the versioning system '%s'"
msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
#: apt-pkg/pkgcache.cc:147
msgstr "ychwanegol"
#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+#, fuzzy
+msgid "Building dependency tree"
msgstr "Yn Aideladu Coeden Dibyniaeth"
#: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+#, fuzzy
+msgid "Candidate versions"
msgstr "Fersiynau Posib"
#: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+#, fuzzy
+msgid "Dependency generation"
msgstr "Cynhyrchaid Dibyniaeth"
# FIXME: number?
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
#: apt-pkg/sourcelist.cc:98
-#, c-format
-msgid "Malformed line %lu in source list %s (Absolute dist)"
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
#: apt-pkg/sourcelist.cc:105
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
#: apt-pkg/sourcelist.cc:156
#, c-format
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known in on line %u in source list %s"
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
+#, fuzzy, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
# FIXME: %s may have an arbirrary length
#: apt-pkg/packagemanager.cc:402
#, c-format
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
-"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych "
-"wir eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
+"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
+"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
#: apt-pkg/pkgrecords.cc:37
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/algorithms.cc:238
+#: apt-pkg/algorithms.cc:241
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar ei "
-"gyfer."
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
+"ei gyfer."
-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
msgstr ""
-"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod "
-"wedi ei achosi gan pecynnau wedi eu dal."
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
+"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
+msgstr ""
+"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
#: apt-pkg/acquire.cc:61
#, c-format
msgstr "Ni chynhelir y system pecynnu '%s'"
#: apt-pkg/init.cc:135
-msgid "Unable to determine a suitable system type"
+#, fuzzy
+msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
#: apt-pkg/clean.cc:61
msgstr "Mae can y storfa system fersiwn anghyfaddas"
#: apt-pkg/pkgcachegen.cc:117
-#, c-format
-msgid "Error occured while processing %s (NewPackage)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewPackage)"
msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
#: apt-pkg/pkgcachegen.cc:129
-#, c-format
-msgid "Error occured while processing %s (UsePackage1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage1)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:150
-#, c-format
-msgid "Error occured while processing %s (UsePackage2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
#: apt-pkg/pkgcachegen.cc:154
-#, c-format
-msgid "Error occured while processing %s (NewFileVer1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:184
-#, c-format
-msgid "Error occured while processing %s (NewVersion1)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
#: apt-pkg/pkgcachegen.cc:188
-#, c-format
-msgid "Error occured while processing %s (UsePackage3)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
#: apt-pkg/pkgcachegen.cc:192
-#, c-format
-msgid "Error occured while processing %s (NewVersion2)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:207
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."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
#: apt-pkg/pkgcachegen.cc:210
msgid "Wow, you exceeded the number of versions this APT is capable of."
#: apt-pkg/pkgcachegen.cc:213
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."
+msgstr ""
+"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
#: apt-pkg/pkgcachegen.cc:241
-#, c-format
-msgid "Error occured while processing %s (FindPkg)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (FindPkg)"
msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
#: apt-pkg/pkgcachegen.cc:254
-#, c-format
-msgid "Error occured while processing %s (CollectFileProvides)"
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (CollectFileProvides)"
msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
#: apt-pkg/pkgcachegen.cc:260
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:205 apt-pkg/acquire-item.cc:817
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
# FIXME: case
-#: apt-pkg/acquire-item.cc:654
+#: apt-pkg/acquire-item.cc:714
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"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:689
+#: apt-pkg/acquire-item.cc:767
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"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:720
+#: apt-pkg/acquire-item.cc:803
#, 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:807
+#: apt-pkg/acquire-item.cc:890
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr "Ni Chanfuwyd Y Ffeil"
+#: apt-pkg/cdrom.cc:504
+#, c-format
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:513 apt-pkg/cdrom.cc:595
+msgid "Identifying.. "
+msgstr ""
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
+#: apt-pkg/cdrom.cc:538
+#, c-format
+msgid "Stored label: %s \n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:558
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:576
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:580
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Yn aros am benawdau"
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:588
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:606
+msgid "Scanning disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:644
+#, c-format
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:701
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:717
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:721
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-pkg/cdrom.cc:745
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/cdrom.cc:754
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:788
+msgid "Unmounting CD-ROM..."
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+
+#~ msgid "Abort? [Y/n] "
+#~ msgstr "Erthylu? [I/n] "
+
+#~ msgid "Write Error"
+#~ msgstr "Gwall Ysgrifennu"
+
+#~ msgid "File Not Found"
+#~ msgstr "Ni Chanfuwyd Y Ffeil"
HCoop / ntk / apt.git / blobdiff