summaryrefslogtreecommitdiff
path: root/po/cy.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-11-09 04:40:46 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-11-09 04:40:46 +0000
commit1d1b09d580e2de36f719cd9e1f6004b265b41cb9 (patch)
tree15edabd2c577b71232323426b00bd0898aa75ad7 /po/cy.po
parentbe2d3759d2b9fb35b0e9c5c24f264d3dafbb1ed0 (diff)
parent19326d244793da9135d3ef0d026b5c29a82fc27a (diff)
* merged with apt--mvo
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-105 Proofread by Fred Bothamy * bubulle@debian.org--2005/apt--main--0--patch-106 Merge with mvo * bubulle@debian.org--2005/apt--main--0--patch-107 Italian translation corrected * bubulle@debian.org--2005/apt--main--0--patch-108 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-109 Italian translation completed * bubulle@debian.org--2005/apt--main--0--patch-110 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-111 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-112 Swedish translation completed * bubulle@debian.org--2005/apt--main--0--patch-113 Silly update to French translation (testing) * bubulle@debian.org--2005/apt--main--0--patch-114 Basque translation update * bubulle@debian.org--2005/apt--main--0--patch-115 Basque translation completed * bubulle@debian.org--2005/apt--main--0--patch-116 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-117 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-118 Russian translation update by Yuri Kozlov * bubulle@debian.org--2005/apt--main--0--patch-119 Merge with Michael and add update-po as a pre-req for binary * bubulle@debian.org--2005/apt--main--0--patch-120 Re-generate all PO Files * bubulle@debian.org--2005/apt--main--0--patch-121 Complete French translation * bubulle@debian.org--2005/apt--main--0--patch-122 Correct typography in French translation * bubulle@debian.org--2005/apt--main--0--patch-123 Spelling fix for consistency in French translation * bubulle@debian.org--2005/apt--main--0--patch-124 Merge with Michael * bubulle@debian.org--2005/apt--main--0--patch-125 Fixed localization of y/n questions in German translation * bubulle@debian.org--2005/apt--main--0--patch-126 Swedish translation update * bubulle@debian.org--2005/apt--main--0--patch-127 Complete Tagalog translation / Add Changelog * bubulle@debian.org--2005/apt--main--0--patch-128 Danish translation update * bubulle@debian.org--2005/apt--main--0--patch-129 Basque translation update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63 * changelog update * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-65 * inital support for "apt-get source -t dist" (but no downgrades yet * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-66 * full support for apt-get source -t now (and honor pining too) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-67 * added APT::Authentication::Trust-CDROM option * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-68 * fix a crash in apt-ftparchive * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-69 * sparc64 alignment fix * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-70 * fix segfault when there is no Archive for a VerFile * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-71 * don't get candidate release as version tag for FindSrc by default. because it break for bin-NMUs :/ (e.g. dpkg source is 1.13.11, but i386 version string is 1.13.11.0.1) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-72 * corrections in the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-73 * init the default ScreenWidth to 79 columns by default (Closes: #324921) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-74 apt-cdrom.cc:fix some missing gettext() calls (closes: #334539); doc/apt-cache.8.xml: fix typo (closes: #334714) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-75 * seting section to "admin" to match override file * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-76 * finalized the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-77 * renamed Trust-CDROM to TrustCDROM to make it consistent with ubuntu * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78 * fix a incorrect example * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79 * revert patch from patch-59, causes all sorts of trouble * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80 * fix changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81 * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83 * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84 * added armeb to archtable * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-85 * merged with bubulle, changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-86 * merged the NMU from Franz Pop, fixed armeb problem (#333599) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-87 * removed double armeb entry in buildlib/sizetable
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po497
1 files changed, 318 insertions, 179 deletions
diff --git a/po/cy.po b/po/cy.po
index 219125086..03d6fe042 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-02 11:19-0700\n"
+"POT-Creation-Date: 2005-09-22 23:07+0200\n"
"PO-Revision-Date: 2005-06-06 13:46+0100\n"
"Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
"Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -163,8 +163,8 @@ msgid " %4i %s\n"
msgstr " %4i %s\n"
#: 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:2322 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2325 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"
@@ -317,32 +317,32 @@ msgstr "Ni ellir ysgrifennu i %s"
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
-#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
msgid "Package extension list is too long"
msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-#: 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
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
#, fuzzy, c-format
msgid "Error processing directory %s"
msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-#: ftparchive/apt-ftparchive.cc:250
+#: ftparchive/apt-ftparchive.cc:254
msgid "Source extension list is too long"
msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-#: ftparchive/apt-ftparchive.cc:367
+#: ftparchive/apt-ftparchive.cc:371
msgid "Error writing header to contents file"
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-#: ftparchive/apt-ftparchive.cc:397
+#: ftparchive/apt-ftparchive.cc:401
#, fuzzy, c-format
msgid "Error processing contents %s"
msgstr "Gwall wrth Brosesu Cynnwys %s"
# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:551
+#: ftparchive/apt-ftparchive.cc:556
#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
@@ -424,11 +424,11 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol"
-#: ftparchive/apt-ftparchive.cc:757
+#: ftparchive/apt-ftparchive.cc:762
msgid "No selections matched"
msgstr "Dim dewisiadau'n cyfateb"
-#: ftparchive/apt-ftparchive.cc:830
+#: ftparchive/apt-ftparchive.cc:835
#, c-format
msgid "Some files are missing in the package file group `%s'"
msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'"
@@ -461,84 +461,84 @@ msgstr "Does dim cofnod rheoli gan yr archif"
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
-#: ftparchive/writer.cc:79
+#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: ftparchive/writer.cc:84
+#: ftparchive/writer.cc:83
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: ftparchive/writer.cc:126
+#: ftparchive/writer.cc:125
msgid "E: "
msgstr "G: "
-#: ftparchive/writer.cc:128
+#: ftparchive/writer.cc:127
msgid "W: "
msgstr "Rh: "
-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:134
msgid "E: Errors apply to file "
msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
#, c-format
msgid "Failed to resolve %s"
msgstr "Methwyd datrys %s"
-#: ftparchive/writer.cc:164
+#: ftparchive/writer.cc:163
msgid "Tree walking failed"
msgstr "Methwyd cerdded y goeden"
-#: ftparchive/writer.cc:189
+#: ftparchive/writer.cc:188
#, c-format
msgid "Failed to open %s"
msgstr "Methwyd agor %s"
# FIXME
-#: ftparchive/writer.cc:246
+#: ftparchive/writer.cc:245
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DatGysylltu %s [%s]\n"
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:253
#, c-format
msgid "Failed to readlink %s"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/writer.cc:258
+#: ftparchive/writer.cc:257
#, c-format
msgid "Failed to unlink %s"
msgstr "Methwyd datgysylltu %s"
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:264
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Methwyd cysylltu %s at %s"
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:274
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
#: 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
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
#, c-format
msgid "Failed to stat %s"
msgstr "Methodd stat() o %s"
-#: ftparchive/writer.cc:378
+#: ftparchive/writer.cc:386
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
@@ -643,7 +643,7 @@ msgstr "Methwyd ailenwi %s at %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
+#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -782,6 +782,10 @@ msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+#: cmdline/apt-get.cc:691
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
#: cmdline/apt-get.cc:698
msgid "Install these packages without verification [y/N]? "
msgstr ""
@@ -791,58 +795,76 @@ msgstr ""
msgid "Some packages could not be authenticated"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:856
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+#: cmdline/apt-get.cc:753
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
#: 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:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
+#: cmdline/apt-get.cc:773
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: cmdline/apt-get.cc:818
+#: cmdline/apt-get.cc:814
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+
+#: cmdline/apt-get.cc:819
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:822
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
-#: cmdline/apt-get.cc:826
+#: cmdline/apt-get.cc:827
#, 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:829
+#: cmdline/apt-get.cc:830
#, 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:846
+#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"
+
+#: cmdline/apt-get.cc:847
#, 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:861 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882
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:863
+#: cmdline/apt-get.cc:864
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:865
+#: cmdline/apt-get.cc:866
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -853,29 +875,29 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:887
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:977
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:984
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -883,49 +905,49 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:988
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:992
+#: cmdline/apt-get.cc:993
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:994
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1026
+#: cmdline/apt-get.cc:1028
#, c-format
msgid "Note, selecting %s instead of %s\n"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: cmdline/apt-get.cc:1036
+#: cmdline/apt-get.cc:1038
#, 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:1054
+#: cmdline/apt-get.cc:1056
#, 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:1065
+#: cmdline/apt-get.cc:1067
#, 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:1077
+#: cmdline/apt-get.cc:1079
msgid " [Installed]"
msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1084
msgid "You should explicitly select one to install."
msgstr "Dylech ddewis un yn benodol i'w sefydlu."
# FIXME: punctuation
-#: cmdline/apt-get.cc:1087
+#: cmdline/apt-get.cc:1089
#, fuzzy, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -937,49 +959,49 @@ msgstr ""
"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
"ffeil sources.list.\n"
-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1108
msgid "However the following packages replace it:"
msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Package %s has no installation candidate"
msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-#: cmdline/apt-get.cc:1129
+#: cmdline/apt-get.cc:1131
#, 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:1137
+#: cmdline/apt-get.cc:1139
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1166
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1168
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: cmdline/apt-get.cc:1172
+#: cmdline/apt-get.cc:1174
#, c-format
msgid "Selected version %s (%s) for %s\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: cmdline/apt-get.cc:1282
+#: cmdline/apt-get.cc:1284
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
msgid "Unable to lock the list directory"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: cmdline/apt-get.cc:1353
+#: cmdline/apt-get.cc:1355
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -987,27 +1009,27 @@ msgstr ""
"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
"rai eu defnyddio yn lle."
-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1374
#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
+#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1494
+#: cmdline/apt-get.cc:1496
#, 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:1524
+#: cmdline/apt-get.cc:1526
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:1527
+#: cmdline/apt-get.cc:1529
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1016,7 +1038,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1541
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"
@@ -1029,7 +1051,7 @@ msgstr ""
"heb gael eu symud allan o Incoming."
# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1549
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"
@@ -1038,107 +1060,117 @@ 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."
-#: cmdline/apt-get.cc:1552
+#: cmdline/apt-get.cc:1554
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1555
+#: cmdline/apt-get.cc:1557
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1583
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1654
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1655
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1673
+#: cmdline/apt-get.cc:1675
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1683
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: cmdline/apt-get.cc:1856
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:1881 cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:1928
+#: cmdline/apt-get.cc:1930
#, 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:1933
+#: cmdline/apt-get.cc:1935
#, 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:1936
+#: cmdline/apt-get.cc:1938
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:1942
+#: cmdline/apt-get.cc:1944
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1975
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:2003
#, 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:2013
+#: cmdline/apt-get.cc:2015
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2016
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2033
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2052
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:2068
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:2093
+#: cmdline/apt-get.cc:2096
#, 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:2113
+#: cmdline/apt-get.cc:2116
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2168
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1147,7 +1179,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2220
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1156,34 +1188,34 @@ 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:2252
+#: cmdline/apt-get.cc:2255
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2280
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2294
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2295
+#: cmdline/apt-get.cc:2298
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2330
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2368
+#: cmdline/apt-get.cc:2371
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1499,8 +1531,8 @@ msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
@@ -1650,12 +1682,12 @@ msgstr "Methwyd lleoli ffeil rheoli dilys"
msgid "Unparsable control file"
msgstr "Ffeil rheoli ni ellir ei ramadegu"
-#: methods/cdrom.cc:113
+#: methods/cdrom.cc:114
#, c-format
msgid "Unable to read the cdrom database %s"
msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
-#: methods/cdrom.cc:122
+#: methods/cdrom.cc:123
#, fuzzy
msgid ""
"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
@@ -1664,30 +1696,36 @@ 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:130 methods/cdrom.cc:168
+#: methods/cdrom.cc:131
#, fuzzy
msgid "Wrong CD-ROM"
msgstr "CD Anghywir"
-#: methods/cdrom.cc:163
+#: methods/cdrom.cc:164
#, 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."
-#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
+#: methods/cdrom.cc:169
+#, fuzzy
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
-#: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
+#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:79 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
-#: methods/file.cc:42
+#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
@@ -1746,7 +1784,7 @@ msgstr "Goramser cysylltu"
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:453
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190
msgid "Read error"
msgstr "Gwall darllen"
@@ -1758,7 +1796,7 @@ msgstr "Gorlifodd ateb y byffer."
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232
msgid "Write error"
msgstr "Gwall ysgrifennu"
@@ -1862,43 +1900,81 @@ msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
-#: methods/connect.cc:92
+#: methods/connect.cc:93
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-#: methods/connect.cc:104
+#: methods/connect.cc:106
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Methwyd cysylltu i %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:132 methods/rsh.cc:425
+#: methods/connect.cc:134 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
-#: methods/connect.cc:163
+#: methods/connect.cc:165
#, c-format
msgid "Could not resolve '%s'"
msgstr "Methwyd datrys '%s'"
-#: methods/connect.cc:167
+#: methods/connect.cc:171
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Methiant dros dro yn datrys '%s'"
-#: methods/connect.cc:169
+#: methods/connect.cc:174
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: methods/connect.cc:216
+#: methods/connect.cc:221
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Methwyd cysylltu i %s %s:"
+#: methods/gpgv.cc:92
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:191
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+
+#: methods/gpgv.cc:196
+msgid "At least one invalid signature was encountered."
+msgstr ""
+
+#. FIXME String concatenation considered harmful.
+#: methods/gpgv.cc:201
+#, fuzzy
+msgid "Could not execute "
+msgstr "Methwyd cael y clo %s"
+
+#: methods/gpgv.cc:202
+msgid " to verify signature (is gnupg installed?)"
+msgstr ""
+
+#: methods/gpgv.cc:206
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:237
+#, fuzzy
+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+
+#: methods/gpgv.cc:244
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+
#: methods/gzip.cc:57
#, c-format
msgid "Couldn't open pipe for %s"
@@ -1988,10 +2064,6 @@ msgstr "Methodd y cysylltiad"
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"
@@ -2006,59 +2078,59 @@ msgstr "Methwyd gwneud mmap() efo %lu beit"
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
-#: apt-pkg/contrib/configuration.cc:395
+#: apt-pkg/contrib/configuration.cc:436
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:453
+#: apt-pkg/contrib/configuration.cc:494
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:471
+#: apt-pkg/contrib/configuration.cc:512
#, c-format
msgid "Line %d too long (max %d)"
msgstr "Linell %d yn rhy hir (uchaf %d)"
-#: apt-pkg/contrib/configuration.cc:567
+#: apt-pkg/contrib/configuration.cc:608
#, 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:586
+#: apt-pkg/contrib/configuration.cc:627
#, 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:644
#, 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:643
+#: apt-pkg/contrib/configuration.cc:684
#, 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:650
+#: apt-pkg/contrib/configuration.cc:691
#, 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:654 apt-pkg/contrib/configuration.cc:659
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:663
+#: apt-pkg/contrib/configuration.cc:704
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:738
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
@@ -2126,7 +2198,7 @@ msgstr "Gweithred annilys %s"
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:422 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
@@ -2135,72 +2207,72 @@ msgstr "Ni ellir newid i %s"
msgid "Failed to stat the cdrom"
msgstr "Methwyd gwneud stat() o'r CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:80
+#: apt-pkg/contrib/fileutl.cc:82
#, 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:85
+#: apt-pkg/contrib/fileutl.cc:87
#, c-format
msgid "Could not open lock file %s"
msgstr "Methwyd agor y ffeil clo %s"
-#: apt-pkg/contrib/fileutl.cc:103
+#: apt-pkg/contrib/fileutl.cc:105
#, 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:107
+#: apt-pkg/contrib/fileutl.cc:109
#, c-format
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:359
+#: apt-pkg/contrib/fileutl.cc:377
#, 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:369
+#: apt-pkg/contrib/fileutl.cc:387
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:372
+#: apt-pkg/contrib/fileutl.cc:390
#, 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:374
+#: apt-pkg/contrib/fileutl.cc:392
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:418
+#: apt-pkg/contrib/fileutl.cc:436
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:474
+#: apt-pkg/contrib/fileutl.cc:492
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "o hyd %lu i ddarllen ond dim ar ôl"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:504
+#: apt-pkg/contrib/fileutl.cc:522
#, 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:579
+#: apt-pkg/contrib/fileutl.cc:597
msgid "Problem closing the file"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:585
+#: apt-pkg/contrib/fileutl.cc:603
msgid "Problem unlinking the file"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:596
+#: apt-pkg/contrib/fileutl.cc:614
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
@@ -2331,7 +2403,7 @@ msgstr ""
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
@@ -2389,26 +2461,39 @@ 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/acquire.cc:61
+#: apt-pkg/acquire.cc:62
#, c-format
msgid "Lists directory %spartial is missing."
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/acquire.cc:65
+#: apt-pkg/acquire.cc:66
#, c-format
msgid "Archive directory %spartial is missing."
msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/acquire.cc:817
+#, c-format
+msgid "Downloading file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
msgstr "Methwyd canfod y gyrrydd dull %s."
-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:162
#, c-format
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
+#: apt-pkg/acquire-worker.cc:377
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
#: apt-pkg/init.cc:119
#, c-format
msgid "Packaging system '%s' is not supported"
@@ -2538,12 +2623,12 @@ 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:235 apt-pkg/acquire-item.cc:900
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:908
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
# FIXME: case
-#: apt-pkg/acquire-item.cc:714
+#: apt-pkg/acquire-item.cc:722
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2552,7 +2637,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:767
+#: apt-pkg/acquire-item.cc:775
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2561,14 +2646,14 @@ 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:803
+#: apt-pkg/acquire-item.cc:811
#, 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:890
+#: apt-pkg/acquire-item.cc:898
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -2577,76 +2662,76 @@ msgstr "Camgyfatebiaeth maint"
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/cdrom.cc:504
+#: apt-pkg/cdrom.cc:507
#, 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
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
msgid "Identifying.. "
msgstr ""
-#: apt-pkg/cdrom.cc:538
+#: apt-pkg/cdrom.cc:541
#, c-format
msgid "Stored label: %s \n"
msgstr ""
-#: apt-pkg/cdrom.cc:558
+#: apt-pkg/cdrom.cc:561
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:576
+#: apt-pkg/cdrom.cc:579
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:580
+#: apt-pkg/cdrom.cc:583
#, fuzzy
msgid "Waiting for disc...\n"
msgstr "Yn aros am benawdau"
#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:588
+#: apt-pkg/cdrom.cc:591
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:606
+#: apt-pkg/cdrom.cc:609
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:644
+#: apt-pkg/cdrom.cc:647
#, c-format
msgid "Found %i package indexes, %i source indexes and %i signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:701
+#: apt-pkg/cdrom.cc:710
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:717
+#: apt-pkg/cdrom.cc:726
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:721
+#: apt-pkg/cdrom.cc:730
#, fuzzy
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:745
+#: apt-pkg/cdrom.cc:754
#, fuzzy
msgid "Writing new source list\n"
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/cdrom.cc:754
+#: apt-pkg/cdrom.cc:763
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/cdrom.cc:788
+#: apt-pkg/cdrom.cc:803
msgid "Unmounting CD-ROM..."
msgstr ""
@@ -2670,6 +2755,60 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
+#: apt-pkg/deb/dpkgpm.cc:358
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr " Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Argymell"
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, c-format
+msgid "Preparing for remove with config %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, c-format
+msgid "Removed with config %s"
+msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"
+
#~ msgid "Abort? [Y/n] "
#~ msgstr "Erthylu? [I/n] "