summaryrefslogtreecommitdiff
path: root/po/cy.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-10-13 15:36:54 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-10-13 15:36:54 +0200
commit61153c284c832a0d0f7faecd9ad96f6cd9591c64 (patch)
treea60d61b723bbc90b8b715a476c5f1ee5e8d6e0c2 /po/cy.po
parent940ff5d6b5634b57c2e622b5295f499a7807f3de (diff)
parent6bea738672fb503d2813ae2d998096015a81c4a2 (diff)
merged from debian-sid branch
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po546
1 files changed, 279 insertions, 267 deletions
diff --git a/po/cy.po b/po/cy.po
index 30c60bc57..3bd7e8755 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: 2010-08-23 18:41-0400\n"
+"POT-Creation-Date: 2010-09-28 17:23+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"
@@ -166,14 +166,14 @@ msgstr " Pin Pecyn: "
msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
+#: cmdline/apt-get.cc:2758 cmdline/apt-sortpkgs.cc:144
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
-#: cmdline/apt-cache.cc:1739
+#: cmdline/apt-cache.cc:1745
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -343,32 +343,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:168 ftparchive/apt-ftparchive.cc:345
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
msgid "Package extension list is too long"
msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
-#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
-#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
+#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
+#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
+#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
#, fuzzy, c-format
msgid "Error processing directory %s"
msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-#: ftparchive/apt-ftparchive.cc:258
+#: ftparchive/apt-ftparchive.cc:260
msgid "Source extension list is too long"
msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-#: ftparchive/apt-ftparchive.cc:375
+#: ftparchive/apt-ftparchive.cc:377
msgid "Error writing header to contents file"
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-#: ftparchive/apt-ftparchive.cc:405
+#: ftparchive/apt-ftparchive.cc:407
#, fuzzy, c-format
msgid "Error processing contents %s"
msgstr "Gwall wrth Brosesu Cynnwys %s"
# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:590
+#: ftparchive/apt-ftparchive.cc:595
#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
@@ -450,11 +450,11 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol"
-#: ftparchive/apt-ftparchive.cc:796
+#: ftparchive/apt-ftparchive.cc:801
msgid "No selections matched"
msgstr "Dim dewisiadau'n cyfateb"
-#: ftparchive/apt-ftparchive.cc:874
+#: ftparchive/apt-ftparchive.cc:879
#, 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'"
@@ -565,7 +565,7 @@ msgstr "Doedd dim maes pecyn gan yr archif"
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
@@ -676,82 +676,82 @@ msgstr "Gwall wrth datgysylltu %s"
msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/apt-get.cc:134
+#: cmdline/apt-get.cc:135
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:156 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
-#: cmdline/apt-get.cc:251
+#: cmdline/apt-get.cc:252
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:344
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:351
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: cmdline/apt-get.cc:352
+#: cmdline/apt-get.cc:353
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: cmdline/apt-get.cc:355
+#: cmdline/apt-get.cc:356
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: cmdline/apt-get.cc:355
+#: cmdline/apt-get.cc:356
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:360
+#: cmdline/apt-get.cc:361
msgid " or"
msgstr " neu"
-#: cmdline/apt-get.cc:391
+#: cmdline/apt-get.cc:392
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:419
+#: cmdline/apt-get.cc:420
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: cmdline/apt-get.cc:441
+#: cmdline/apt-get.cc:442
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: cmdline/apt-get.cc:464
+#: cmdline/apt-get.cc:465
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: cmdline/apt-get.cc:487
+#: cmdline/apt-get.cc:488
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: cmdline/apt-get.cc:507
+#: cmdline/apt-get.cc:508
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: cmdline/apt-get.cc:560
+#: cmdline/apt-get.cc:561
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: cmdline/apt-get.cc:568
+#: cmdline/apt-get.cc:569
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -761,66 +761,66 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:603
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:607
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: cmdline/apt-get.cc:608
+#: cmdline/apt-get.cc:609
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: cmdline/apt-get.cc:614
+#: cmdline/apt-get.cc:615
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:635
#, fuzzy, c-format
msgid "Note, selecting '%s' for task '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:640
+#: cmdline/apt-get.cc:641
#, fuzzy, 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:647
+#: cmdline/apt-get.cc:648
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:658
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:669
msgid " [Installed]"
msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:677
+#: cmdline/apt-get.cc:678
#, fuzzy
msgid " [Not candidate version]"
msgstr "Fersiynau Posib"
-#: cmdline/apt-get.cc:679
+#: cmdline/apt-get.cc:680
msgid "You should explicitly select one to install."
msgstr "Dylech ddewis un yn benodol i'w sefydlu."
# FIXME: punctuation
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:683
#, fuzzy, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -832,168 +832,171 @@ msgstr ""
"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
"ffeil sources.list.\n"
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:701
msgid "However the following packages replace it:"
msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:713
#, fuzzy, c-format
msgid "Package '%s' has no installation candidate"
msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:724
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr ""
-#: cmdline/apt-get.cc:754
+#: cmdline/apt-get.cc:755
#, fuzzy, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:785
#, 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:788
+#: cmdline/apt-get.cc:789
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:799
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
-#: cmdline/apt-get.cc:803
+#: cmdline/apt-get.cc:804
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:863
#, 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:934
+#: cmdline/apt-get.cc:938
msgid "Correcting dependencies..."
msgstr "Yn cywiro dibyniaethau..."
-#: cmdline/apt-get.cc:937
+#: cmdline/apt-get.cc:941
msgid " failed."
msgstr " wedi methu."
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:944
msgid "Unable to correct dependencies"
msgstr "Ni ellir cywiro dibyniaethau"
-#: cmdline/apt-get.cc:943
+#: cmdline/apt-get.cc:947
msgid "Unable to minimize the upgrade set"
msgstr "Ni ellir bychanu y set uwchraddio"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:949
msgid " Done"
msgstr " Wedi Gorffen"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:953
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
-#: cmdline/apt-get.cc:952
+#: cmdline/apt-get.cc:956
msgid "Unmet dependencies. Try using -f."
msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:981
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:985
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:992
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:994
#, fuzzy
msgid "Some packages could not be authenticated"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1044
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:1049
+#: cmdline/apt-get.cc:1053
#, 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:1060
+#: cmdline/apt-get.cc:1064
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
-#: apt-pkg/cachefile.cc:106
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
-
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1104
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-#: cmdline/apt-get.cc:1105
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1111
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
-#: cmdline/apt-get.cc:1108
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1116
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
-#: cmdline/apt-get.cc:1113
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1123
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
-#: cmdline/apt-get.cc:1116
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1128
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2335
#, 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:1144
+#: cmdline/apt-get.cc:1156
#, 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:1160 cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
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:1162
+#: cmdline/apt-get.cc:1174
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1176
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1004,29 +1007,29 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
+#: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1197
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
+#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-get.cc:1275
+#: cmdline/apt-get.cc:1287
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
+#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:1282
+#: cmdline/apt-get.cc:1294
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1034,20 +1037,20 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:1286
+#: cmdline/apt-get.cc:1298
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:1291
+#: cmdline/apt-get.cc:1303
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:1292
+#: cmdline/apt-get.cc:1304
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1332
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1057,35 +1060,35 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1324
+#: cmdline/apt-get.cc:1336
msgid "Note: This is done automatic and on purpose by dpkg."
msgstr ""
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1466
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:1498
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1524
+#: cmdline/apt-get.cc:1536
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1552
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1605
+#: cmdline/apt-get.cc:1618
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1666
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -1095,7 +1098,7 @@ msgid_plural ""
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1657
+#: cmdline/apt-get.cc:1670
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -1103,11 +1106,11 @@ msgid_plural ""
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1659
+#: cmdline/apt-get.cc:1672
msgid "Use 'apt-get autoremove' to remove them."
msgstr ""
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1677
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1123,26 +1126,26 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
+#: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:1684
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1690
+#: cmdline/apt-get.cc:1703
#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1779
+#: cmdline/apt-get.cc:1792
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:1782
+#: cmdline/apt-get.cc:1795
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1151,7 +1154,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1794
+#: cmdline/apt-get.cc:1807
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"
@@ -1163,71 +1166,71 @@ msgstr ""
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: cmdline/apt-get.cc:1812
+#: cmdline/apt-get.cc:1825
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1854
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1931
+#: cmdline/apt-get.cc:1944
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1932
+#: cmdline/apt-get.cc:1945
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:1987
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1981
+#: cmdline/apt-get.cc:1994
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2015
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2023
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
+#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2198
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:2225 cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2241
+#: cmdline/apt-get.cc:2254
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2246
+#: cmdline/apt-get.cc:2259
#, c-format
msgid ""
"Please use:\n"
@@ -1235,75 +1238,79 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2297
+#: cmdline/apt-get.cc:2310
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2332
+#: cmdline/apt-get.cc:2345
#, 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:2338
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:2353
#, 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:2341
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:2358
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2347
+#: cmdline/apt-get.cc:2364
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2380
+#: cmdline/apt-get.cc:2397
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2427
#, 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:2422
+#: cmdline/apt-get.cc:2439
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2440
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2440
+#: cmdline/apt-get.cc:2457
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2460
+#: cmdline/apt-get.cc:2477
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2493
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:2506
+#: cmdline/apt-get.cc:2524
#, 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:2526
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2595
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1312,7 +1319,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:2630
+#: cmdline/apt-get.cc:2648
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1321,34 +1328,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:2666
+#: cmdline/apt-get.cc:2684
#, 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:2693
+#: cmdline/apt-get.cc:2711
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2709
+#: cmdline/apt-get.cc:2727
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2714
+#: cmdline/apt-get.cc:2732
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2745
+#: cmdline/apt-get.cc:2763
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2786
+#: cmdline/apt-get.cc:2804
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1435,7 +1442,7 @@ msgstr ""
"\n"
" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: cmdline/apt-get.cc:2958
+#: cmdline/apt-get.cc:2960
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1689,10 +1696,10 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
-#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:311 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
+#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
#: methods/mirror.cc:87
#, c-format
msgid "Unable to read %s"
@@ -1837,23 +1844,23 @@ msgstr "Methwyd lleoli ffeil rheoli dilys"
msgid "Unparsable control file"
msgstr "Ffeil rheoli ni ellir ei ramadegu"
-#: methods/bzip2.cc:68
+#: methods/bzip2.cc:65
#, c-format
msgid "Couldn't open pipe for %s"
msgstr "Methwyd agor pibell ar gyfer %s"
-#: methods/bzip2.cc:113
+#: methods/bzip2.cc:109
#, c-format
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/bzip2.cc:145 methods/bzip2.cc:154 methods/copy.cc:43
-#: methods/gzip.cc:96 methods/gzip.cc:105 methods/rred.cc:486
+#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
+#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
#: methods/rred.cc:495
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/bzip2.cc:151 methods/copy.cc:80 methods/gzip.cc:102
+#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
#: methods/rred.cc:492
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
@@ -1951,7 +1958,7 @@ msgstr "Goramser cysylltu"
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
msgid "Read error"
msgstr "Gwall darllen"
@@ -1963,7 +1970,7 @@ msgstr "Gorlifodd ateb y byffer."
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
msgid "Write error"
msgstr "Gwall ysgrifennu"
@@ -2019,7 +2026,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
+#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -2151,74 +2158,74 @@ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:558 methods/http.cc:565
+#: methods/http.cc:564 methods/http.cc:571
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:594
+#: methods/http.cc:600
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:609
+#: methods/http.cc:615
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:611
+#: methods/http.cc:617
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:635
+#: methods/http.cc:641
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:793
+#: methods/http.cc:799
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:798
+#: methods/http.cc:804
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:821
+#: methods/http.cc:827
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:852
+#: methods/http.cc:858
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:880
+#: methods/http.cc:886
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:894
+#: methods/http.cc:900
#, 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:896
+#: methods/http.cc:902
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
#, fuzzy
msgid "Failed to truncate file"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: methods/http.cc:1154
+#: methods/http.cc:1160
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1171 methods/http.cc:1226
+#: methods/http.cc:1177 methods/http.cc:1232
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1318
+#: methods/http.cc:1324
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2416,14 +2423,14 @@ 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:162 apt-pkg/contrib/cdromutl.cc:196
-#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
+#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
+#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
#: methods/mirror.cc:93
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
-#: apt-pkg/contrib/cdromutl.cc:204
+#: apt-pkg/contrib/cdromutl.cc:217
msgid "Failed to stat the cdrom"
msgstr "Methwyd gwneud stat() o'r CD-ROM"
@@ -2447,152 +2454,152 @@ msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:621
+#: apt-pkg/contrib/fileutl.cc:643
#, 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:633
+#: apt-pkg/contrib/fileutl.cc:655
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:657
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:639
+#: apt-pkg/contrib/fileutl.cc:661
#, 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:641
+#: apt-pkg/contrib/fileutl.cc:663
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:728
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/contrib/fileutl.cc:714
+#: apt-pkg/contrib/fileutl.cc:745
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Methwyd agor pibell ar gyfer %s"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:774
+#: apt-pkg/contrib/fileutl.cc:805
#, 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:807
+#: apt-pkg/contrib/fileutl.cc:838
#, 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:906
+#: apt-pkg/contrib/fileutl.cc:937
#, fuzzy, c-format
msgid "Problem closing the gzip file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:909
+#: apt-pkg/contrib/fileutl.cc:940
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:914
+#: apt-pkg/contrib/fileutl.cc:945
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:925
+#: apt-pkg/contrib/fileutl.cc:956
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:938
+#: apt-pkg/contrib/fileutl.cc:969
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:145
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:151
msgid "The package cache file is corrupted"
msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:156
msgid "The package cache file is an incompatible version"
msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:158
+#: apt-pkg/pkgcache.cc:161
#, 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:163
+#: apt-pkg/pkgcache.cc:166
msgid "The package cache was built for a different architecture"
msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-#: apt-pkg/pkgcache.cc:290
+#: apt-pkg/pkgcache.cc:293
msgid "Depends"
msgstr "Dibynnu"
-#: apt-pkg/pkgcache.cc:290
+#: apt-pkg/pkgcache.cc:293
msgid "PreDepends"
msgstr "CynDdibynnu"
-#: apt-pkg/pkgcache.cc:290
+#: apt-pkg/pkgcache.cc:293
msgid "Suggests"
msgstr "Awgrymu"
-#: apt-pkg/pkgcache.cc:291
+#: apt-pkg/pkgcache.cc:294
msgid "Recommends"
msgstr "Argymell"
-#: apt-pkg/pkgcache.cc:291
+#: apt-pkg/pkgcache.cc:294
msgid "Conflicts"
msgstr "Gwrthdaro"
-#: apt-pkg/pkgcache.cc:291
+#: apt-pkg/pkgcache.cc:294
msgid "Replaces"
msgstr "Amnewid"
-#: apt-pkg/pkgcache.cc:292
+#: apt-pkg/pkgcache.cc:295
msgid "Obsoletes"
msgstr "Darfodi"
-#: apt-pkg/pkgcache.cc:292
+#: apt-pkg/pkgcache.cc:295
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:292
+#: apt-pkg/pkgcache.cc:295
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:303
+#: apt-pkg/pkgcache.cc:306
msgid "important"
msgstr "pwysig"
-#: apt-pkg/pkgcache.cc:303
+#: apt-pkg/pkgcache.cc:306
msgid "required"
msgstr "angenrheidiol"
-#: apt-pkg/pkgcache.cc:303
+#: apt-pkg/pkgcache.cc:306
msgid "standard"
msgstr "safonnol"
-#: apt-pkg/pkgcache.cc:304
+#: apt-pkg/pkgcache.cc:307
msgid "optional"
msgstr "opsiynnol"
-#: apt-pkg/pkgcache.cc:304
+#: apt-pkg/pkgcache.cc:307
msgid "extra"
msgstr "ychwanegol"
@@ -2720,7 +2727,7 @@ msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
#, c-format
msgid ""
-"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
@@ -2739,7 +2746,7 @@ msgstr ""
#: apt-pkg/packagemanager.cc:495
#, c-format
msgid ""
-"Could not perform immediate configuration on already unpacked '%s'.Please "
+"Could not perform immediate configuration on already unpacked '%s'. Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
@@ -2756,7 +2763,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1182
+#: apt-pkg/algorithms.cc:1210
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2764,12 +2771,12 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1184
+#: apt-pkg/algorithms.cc:1212
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
+#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -2794,12 +2801,12 @@ msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:878
+#: apt-pkg/acquire.cc:857
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:880
+#: apt-pkg/acquire.cc:859
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
@@ -2822,12 +2829,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/init.cc:141
+#: apt-pkg/init.cc:143
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-pkg/init.cc:157
+#: apt-pkg/init.cc:159
#, fuzzy
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
@@ -2850,19 +2857,23 @@ msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
msgid "You may want to run apt-get update to correct these problems"
msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
+#: apt-pkg/cachefile.cc:106
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."
+
# FIXME: literal
-#: apt-pkg/policy.cc:343
+#: apt-pkg/policy.cc:344
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
# FIXME: tense
-#: apt-pkg/policy.cc:365
+#: apt-pkg/policy.cc:366
#, c-format
msgid "Did not understand pin type %s"
msgstr "Methwyd daeall y math pin %s"
-#: apt-pkg/policy.cc:373
+#: apt-pkg/policy.cc:374
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
@@ -2967,43 +2978,43 @@ msgstr "methwyd ailenwi, %s (%s -> %s)."
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
-#: apt-pkg/acquire-item.cc:1713
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
+#: apt-pkg/acquire-item.cc:1717
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:1240
+#: apt-pkg/acquire-item.cc:1244
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formated in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1277
+#: apt-pkg/acquire-item.cc:1281
#, c-format
msgid "Release file expired, ignoring %s (invalid since %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1298
+#: apt-pkg/acquire-item.cc:1302
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1328
#, c-format
msgid ""
"A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used.GPG error: %s: %s\n"
+"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1333
+#: apt-pkg/acquire-item.cc:1337
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1361
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3012,7 +3023,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:1420
+#: apt-pkg/acquire-item.cc:1424
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -3021,14 +3032,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:1475
+#: apt-pkg/acquire-item.cc:1479
#, 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:1562
+#: apt-pkg/acquire-item.cc:1566
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -3151,37 +3162,37 @@ msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
+#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:532
+#: apt-pkg/indexcopy.cc:537
#, fuzzy, c-format
msgid "Skipping nonexistent file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/indexcopy.cc:538
+#: apt-pkg/indexcopy.cc:543
#, c-format
msgid "Can't find authentication record for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:544
+#: apt-pkg/indexcopy.cc:549
#, fuzzy, c-format
msgid "Hash mismatch for: %s"
msgstr "Camgyfatebiaeth swm MD5"
@@ -3238,12 +3249,12 @@ msgstr ""
msgid "Installing %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
@@ -3263,92 +3274,93 @@ msgstr ""
msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:643
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:646
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
+#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/deb/dpkgpm.cc:812
+#: apt-pkg/deb/dpkgpm.cc:815
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:813
+#: apt-pkg/deb/dpkgpm.cc:816
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:818
+#: apt-pkg/deb/dpkgpm.cc:821
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:823
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:825
+#: apt-pkg/deb/dpkgpm.cc:828
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/deb/dpkgpm.cc:830
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:832
+#: apt-pkg/deb/dpkgpm.cc:835
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:833
+#: apt-pkg/deb/dpkgpm.cc:836
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1039
+#: apt-pkg/deb/dpkgpm.cc:1042
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1070
+#: apt-pkg/deb/dpkgpm.cc:1073
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1273
+#: apt-pkg/deb/dpkgpm.cc:1276
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1278
+#: apt-pkg/deb/dpkgpm.cc:1281
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1280
+#: apt-pkg/deb/dpkgpm.cc:1283
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1286
+#: apt-pkg/deb/dpkgpm.cc:1289
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1292
+#: apt-pkg/deb/dpkgpm.cc:1295
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1299
+#: apt-pkg/deb/dpkgpm.cc:1302
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""