summaryrefslogtreecommitdiff
path: root/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po681
1 files changed, 339 insertions, 342 deletions
diff --git a/po/cy.po b/po/cy.po
index 3502517b3..9fa432356 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-06-19 12:24+0200\n"
+"POT-Creation-Date: 2014-07-10 10:53+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"
@@ -15,26 +15,31 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: apt-pkg/clean.cc:40 apt-pkg/init.cc:103 apt-pkg/init.cc:111
-#: apt-pkg/acquire.cc:492 apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280
-#: apt-pkg/sourcelist.cc:286 apt-pkg/contrib/fileutl.cc:369
-#: apt-pkg/contrib/fileutl.cc:482 apt-pkg/contrib/cdromutl.cc:205
+#: apt-pkg/clean.cc:43 apt-pkg/init.cc:103 apt-pkg/init.cc:111
+#: apt-pkg/acquire.cc:494 apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280
+#: apt-pkg/sourcelist.cc:286 apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:481 apt-pkg/contrib/cdromutl.cc:205
#: methods/mirror.cc:95 apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
-#: apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 apt-pkg/clean.cc:127
-#: apt-pkg/acquire.cc:498 apt-pkg/acquire.cc:523
+#: apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 apt-pkg/clean.cc:130
+#: apt-pkg/acquire.cc:500 apt-pkg/acquire.cc:525
#: apt-pkg/contrib/cdromutl.cc:201 apt-pkg/contrib/cdromutl.cc:235
#: methods/mirror.cc:101 methods/mirror.cc:130
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
-#: apt-pkg/clean.cc:61
+#: apt-pkg/clean.cc:64
#, c-format
msgid "Unable to stat %s."
msgstr "Ni ellir gwneud stat() o %s."
@@ -58,22 +63,22 @@ msgstr "Ni chynhelir y system pecynnu '%s'"
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
@@ -103,7 +108,7 @@ msgstr ""
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/acquire-worker.cc:460
+#: apt-pkg/acquire-worker.cc:455
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
@@ -123,87 +128,86 @@ msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: apt-pkg/pkgcache.cc:150
+#: apt-pkg/pkgcache.cc:155
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
-#: apt-pkg/pkgcache.cc:156 apt-pkg/pkgcache.cc:167
+#: apt-pkg/pkgcache.cc:161
msgid "The package cache file is corrupted"
msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:166
msgid "The package cache file is an incompatible version"
msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
-#: apt-pkg/pkgcache.cc:164
+#: apt-pkg/pkgcache.cc:169
#, fuzzy
msgid "The package cache file is corrupted, it is too small"
msgstr "Mae'r ffeil storfa pecyn yn llygredig"
# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:171
+#: apt-pkg/pkgcache.cc:174
#, 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:181
-#, fuzzy, c-format
-msgid "The package cache was built for different architectures: %s vs %s"
+#: apt-pkg/pkgcache.cc:179
+msgid "The package cache was built for a different architecture"
msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-#: apt-pkg/pkgcache.cc:324
+#: apt-pkg/pkgcache.cc:321
msgid "Depends"
msgstr "Dibynnu"
-#: apt-pkg/pkgcache.cc:324
+#: apt-pkg/pkgcache.cc:321
msgid "PreDepends"
msgstr "CynDdibynnu"
-#: apt-pkg/pkgcache.cc:324
+#: apt-pkg/pkgcache.cc:321
msgid "Suggests"
msgstr "Awgrymu"
-#: apt-pkg/pkgcache.cc:325
+#: apt-pkg/pkgcache.cc:322
msgid "Recommends"
msgstr "Argymell"
-#: apt-pkg/pkgcache.cc:325
+#: apt-pkg/pkgcache.cc:322
msgid "Conflicts"
msgstr "Gwrthdaro"
-#: apt-pkg/pkgcache.cc:325
+#: apt-pkg/pkgcache.cc:322
msgid "Replaces"
msgstr "Amnewid"
-#: apt-pkg/pkgcache.cc:326
+#: apt-pkg/pkgcache.cc:323
msgid "Obsoletes"
msgstr "Darfodi"
-#: apt-pkg/pkgcache.cc:326
+#: apt-pkg/pkgcache.cc:323
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:326
+#: apt-pkg/pkgcache.cc:323
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:337
+#: apt-pkg/pkgcache.cc:334
msgid "important"
msgstr "pwysig"
-#: apt-pkg/pkgcache.cc:337
+#: apt-pkg/pkgcache.cc:334
msgid "required"
msgstr "angenrheidiol"
-#: apt-pkg/pkgcache.cc:337
+#: apt-pkg/pkgcache.cc:334
msgid "standard"
msgstr "safonnol"
-#: apt-pkg/pkgcache.cc:338
+#: apt-pkg/pkgcache.cc:335
msgid "optional"
msgstr "opsiynnol"
-#: apt-pkg/pkgcache.cc:338
+#: apt-pkg/pkgcache.cc:335
msgid "extra"
msgstr "ychwanegol"
@@ -212,75 +216,75 @@ msgstr "ychwanegol"
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/cachefilter.cc:35 apt-private/private-output.cc:785
+#: apt-pkg/cachefilter.cc:35 apt-private/private-output.cc:786
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
-#: apt-pkg/pkgcachegen.cc:116
+#: apt-pkg/pkgcachegen.cc:93
msgid "Cache has an incompatible versioning system"
msgstr "Mae can y storfa system fersiwn anghyfaddas"
#. TRANSLATOR: The first placeholder is a package name,
#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:247 apt-pkg/pkgcachegen.cc:257
-#: apt-pkg/pkgcachegen.cc:323 apt-pkg/pkgcachegen.cc:389
-#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:410
-#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:422
-#: apt-pkg/pkgcachegen.cc:426 apt-pkg/pkgcachegen.cc:447
-#: apt-pkg/pkgcachegen.cc:486 apt-pkg/pkgcachegen.cc:532
-#: apt-pkg/pkgcachegen.cc:546 apt-pkg/pkgcachegen.cc:577
-#: apt-pkg/pkgcachegen.cc:591
+#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
+#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
+#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
+#: apt-pkg/pkgcachegen.cc:569
#, fuzzy, c-format
msgid "Error occurred while processing %s (%s%d)"
msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:280
+#: apt-pkg/pkgcachegen.cc:257
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:283
+#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:286
+#: apt-pkg/pkgcachegen.cc:263
#, fuzzy
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:289
+#: apt-pkg/pkgcachegen.cc:266
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:598
+#: apt-pkg/pkgcachegen.cc:576
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-#: apt-pkg/pkgcachegen.cc:1233
+#: apt-pkg/pkgcachegen.cc:1211
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: apt-pkg/pkgcachegen.cc:1321 apt-pkg/pkgcachegen.cc:1425
-#: apt-pkg/pkgcachegen.cc:1431 apt-pkg/pkgcachegen.cc:1588
+#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
+#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
#, fuzzy
msgid "Reading package lists"
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/pkgcachegen.cc:1338
+#: apt-pkg/pkgcachegen.cc:1316
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:1422 apt-pkg/contrib/fileutl.cc:2098
-#: cmdline/apt-extracttemplates.cc:262
+#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
-#: apt-pkg/pkgcachegen.cc:1530 apt-pkg/pkgcachegen.cc:1537
+#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
@@ -304,26 +308,26 @@ msgstr ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/acquire-item.cc:160 apt-pkg/contrib/fileutl.cc:2109
+#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:175
+#: apt-pkg/acquire-item.cc:163
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:180
+#: apt-pkg/acquire-item.cc:168
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
-#: apt-pkg/acquire-item.cc:185
+#: apt-pkg/acquire-item.cc:173
#, fuzzy
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:1679
+#: apt-pkg/acquire-item.cc:1573
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -331,28 +335,28 @@ msgid ""
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1697
+#: apt-pkg/acquire-item.cc:1589
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/acquire-item.cc:1737
+#: apt-pkg/acquire-item.cc:1631
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1775
+#: apt-pkg/acquire-item.cc:1669
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1797
+#: apt-pkg/acquire-item.cc:1691
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1827
+#: apt-pkg/acquire-item.cc:1721
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -360,13 +364,13 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1837 apt-pkg/acquire-item.cc:1842
+#: apt-pkg/acquire-item.cc:1731 apt-pkg/acquire-item.cc:1736
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1972
+#: apt-pkg/acquire-item.cc:1859
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -375,12 +379,12 @@ 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:2038
+#: apt-pkg/acquire-item.cc:1925
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:1983
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
@@ -392,29 +396,29 @@ msgstr ""
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/acquire.cc:88 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/acquire.cc:92
+#: apt-pkg/acquire.cc:91
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-#: apt-pkg/acquire.cc:100
+#: apt-pkg/acquire.cc:99
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:925
+#: apt-pkg/acquire.cc:902
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:927
+#: apt-pkg/acquire.cc:904
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
@@ -461,20 +465,20 @@ msgstr "Methwyd daeall y math pin %s"
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:911
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:910
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
-#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:534
+#: apt-pkg/packagemanager.cc:503 apt-pkg/packagemanager.cc:533
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Methwyd agor ffeil %s"
# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:584
+#: apt-pkg/packagemanager.cc:583
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -617,96 +621,96 @@ msgid "Failed to write temporary StateFile %s"
msgstr "Methwyd ysgrifennu ffeil %s"
# FIXME: number?
-#: apt-pkg/tagfile.cc:169
+#: apt-pkg/tagfile.cc:140
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/tagfile.cc:269
+#: apt-pkg/tagfile.cc:237
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-#: apt-pkg/cacheset.cc:490
+#: apt-pkg/cacheset.cc:489
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: apt-pkg/cacheset.cc:493
+#: apt-pkg/cacheset.cc:492
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: apt-pkg/cacheset.cc:597 cmdline/apt-cache.cc:1567
+#: apt-pkg/cacheset.cc:596 cmdline/apt-cache.cc:1515
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
-#: apt-pkg/cacheset.cc:604
+#: apt-pkg/cacheset.cc:603
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:610
+#: apt-pkg/cacheset.cc:609
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:616
+#: apt-pkg/cacheset.cc:615
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:627
+#: apt-pkg/cacheset.cc:626
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:634 apt-pkg/cacheset.cc:641
+#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:648
+#: apt-pkg/cacheset.cc:647
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:656
+#: apt-pkg/cacheset.cc:655
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:664
+#: apt-pkg/cacheset.cc:663
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
# FIXME: number?
-#: apt-pkg/indexrecords.cc:83
+#: apt-pkg/indexrecords.cc:78
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/indexrecords.cc:91
+#: apt-pkg/indexrecords.cc:86
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/indexrecords.cc:136
+#: apt-pkg/indexrecords.cc:117
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/indexrecords.cc:130
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
# FIXME: number?
-#: apt-pkg/indexrecords.cc:168
+#: apt-pkg/indexrecords.cc:149
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
@@ -872,67 +876,67 @@ msgstr "Yn agor y ffeil cyfluniad %s"
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1064
+#: apt-pkg/deb/dpkgpm.cc:1066
msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1067 apt-pkg/deb/dpkgpm.cc:1088
+#: apt-pkg/deb/dpkgpm.cc:1069 apt-pkg/deb/dpkgpm.cc:1090
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ni ellir ysgrifennu i %s"
-#: apt-pkg/deb/dpkgpm.cc:1067
+#: apt-pkg/deb/dpkgpm.cc:1069
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1088
+#: apt-pkg/deb/dpkgpm.cc:1090
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1196 apt-pkg/contrib/fileutl.cc:829
+#: apt-pkg/deb/dpkgpm.cc:1202 apt-pkg/contrib/fileutl.cc:812
#: apt-pkg/contrib/gpgv.cc:219 cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
-#: apt-pkg/deb/dpkgpm.cc:1563
+#: apt-pkg/deb/dpkgpm.cc:1569
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1625
+#: apt-pkg/deb/dpkgpm.cc:1631
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1630
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1632
+#: apt-pkg/deb/dpkgpm.cc:1638
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638
+#: apt-pkg/deb/dpkgpm.cc:1644
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1645
+#: apt-pkg/deb/dpkgpm.cc:1651
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1652 apt-pkg/deb/dpkgpm.cc:1658
+#: apt-pkg/deb/dpkgpm.cc:1658 apt-pkg/deb/dpkgpm.cc:1664
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1679
+#: apt-pkg/deb/dpkgpm.cc:1685
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
@@ -990,139 +994,134 @@ msgstr ""
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
-#: apt-pkg/contrib/fileutl.cc:191
+#: apt-pkg/contrib/fileutl.cc:190
#, 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:196
+#: apt-pkg/contrib/fileutl.cc:195
#, c-format
msgid "Could not open lock file %s"
msgstr "Methwyd agor y ffeil clo %s"
-#: apt-pkg/contrib/fileutl.cc:219
+#: apt-pkg/contrib/fileutl.cc:218
#, 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:224
+#: apt-pkg/contrib/fileutl.cc:223
#, c-format
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:361 apt-pkg/contrib/fileutl.cc:475
+#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:395
+#: apt-pkg/contrib/fileutl.cc:394
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:413
+#: apt-pkg/contrib/fileutl.cc:412
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:422
+#: apt-pkg/contrib/fileutl.cc:421
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:841
+#: apt-pkg/contrib/fileutl.cc:824
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:843
+#: apt-pkg/contrib/fileutl.cc:826
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:847 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239
#, 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:849 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:910 apt-pkg/contrib/fileutl.cc:1636
-#: apt-pkg/contrib/fileutl.cc:1645 apt-pkg/contrib/fileutl.cc:1650
-#: apt-pkg/contrib/fileutl.cc:1652 apt-pkg/contrib/fileutl.cc:1677
+#: apt-pkg/contrib/fileutl.cc:872 apt-pkg/contrib/fileutl.cc:1598
+#: apt-pkg/contrib/fileutl.cc:1607 apt-pkg/contrib/fileutl.cc:1612
+#: apt-pkg/contrib/fileutl.cc:1614 apt-pkg/contrib/fileutl.cc:1639
#: methods/ftp.cc:462 methods/rsh.cc:246
msgid "Write error"
msgstr "Gwall ysgrifennu"
-#: apt-pkg/contrib/fileutl.cc:951
+#: apt-pkg/contrib/fileutl.cc:913
#, fuzzy, c-format
msgid "Problem closing the gzip file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1139
+#: apt-pkg/contrib/fileutl.cc:1101
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/contrib/fileutl.cc:1198 apt-pkg/contrib/fileutl.cc:1245
+#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Methwyd agor pibell ar gyfer %s"
-#: apt-pkg/contrib/fileutl.cc:1353 apt-pkg/contrib/fileutl.cc:2125
+#: apt-pkg/contrib/fileutl.cc:1315
msgid "Failed to create subprocess IPC"
msgstr "Methwyd creu isbroses IPC"
-#: apt-pkg/contrib/fileutl.cc:1411
+#: apt-pkg/contrib/fileutl.cc:1373
msgid "Failed to exec compressor "
msgstr "Methwyd gweithredu cywasgydd "
-#: apt-pkg/contrib/fileutl.cc:1514 apt-pkg/contrib/fileutl.cc:1523
-#: apt-pkg/contrib/fileutl.cc:1528 apt-pkg/contrib/fileutl.cc:1530
+#: apt-pkg/contrib/fileutl.cc:1476 apt-pkg/contrib/fileutl.cc:1485
+#: apt-pkg/contrib/fileutl.cc:1490 apt-pkg/contrib/fileutl.cc:1492
#: methods/ftp.cc:353 methods/rsh.cc:202
msgid "Read error"
msgstr "Gwall darllen"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:1552
+#: apt-pkg/contrib/fileutl.cc:1514
#, fuzzy, c-format
msgid "read, still have %llu to read but none left"
msgstr "o hyd %lu i ddarllen ond dim ar ôl"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:1665 apt-pkg/contrib/fileutl.cc:1687
+#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649
#, fuzzy, c-format
msgid "write, still have %llu to write but couldn't"
msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:1953
+#: apt-pkg/contrib/fileutl.cc:1915
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1964
+#: apt-pkg/contrib/fileutl.cc:1927
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1975
+#: apt-pkg/contrib/fileutl.cc:1938
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1988
+#: apt-pkg/contrib/fileutl.cc:1951
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:2093 cmdline/apt-extracttemplates.cc:257
-#, fuzzy, c-format
-msgid "Unable to mkstemp %s"
-msgstr "Ni ellir gwneud stat() o %s"
-
#: apt-pkg/contrib/progress.cc:148
#, c-format
msgid "%c%s... Error!"
@@ -1206,60 +1205,60 @@ msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
msgid "Failed to stat the cdrom"
msgstr "Methwyd gwneud stat() o'r CD-ROM"
-#: apt-pkg/contrib/configuration.cc:521
+#: apt-pkg/contrib/configuration.cc:519
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:635
+#: apt-pkg/contrib/configuration.cc:633
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:803
+#: apt-pkg/contrib/configuration.cc:801
#, 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:822
+#: apt-pkg/contrib/configuration.cc:820
#, fuzzy, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
-#: apt-pkg/contrib/configuration.cc:839
+#: apt-pkg/contrib/configuration.cc:837
#, 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:879
+#: apt-pkg/contrib/configuration.cc:877
#, 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:886
+#: apt-pkg/contrib/configuration.cc:884
#, 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:890 apt-pkg/contrib/configuration.cc:895
+#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:899
+#: apt-pkg/contrib/configuration.cc:897
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:902
+#: apt-pkg/contrib/configuration.cc:900
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/contrib/configuration.cc:952
+#: apt-pkg/contrib/configuration.cc:950
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
@@ -1323,164 +1322,164 @@ msgstr "Gweithred annilys %s"
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:317
+#: cmdline/apt-cache.cc:277
#, fuzzy
msgid "Total package names: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:279
#, fuzzy
msgid "Total package structures: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:319
#, fuzzy
msgid " Normal packages: "
msgstr " Pecynnau Normal: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:320
#, fuzzy
msgid " Pure virtual packages: "
msgstr " Pecynnau Cwbl Rhithwir: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:321
#, fuzzy
msgid " Single virtual packages: "
msgstr " Pecynnau Rhithwir Sengl: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid " Mixed virtual packages: "
msgstr " Pecynnau Rhithwir Cymysg: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:323
msgid " Missing: "
msgstr " Ar Goll: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:325
#, fuzzy
msgid "Total distinct versions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:327
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:329
#, fuzzy
msgid "Total dependencies: "
msgstr "Cyfanswm Dibyniaethau: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:332
#, fuzzy
msgid "Total ver/file relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:334
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:336
#, fuzzy
msgid "Total Provides mappings: "
msgstr "Cyfanswm Mapiau Darpariath: "
-#: cmdline/apt-cache.cc:388
+#: cmdline/apt-cache.cc:348
#, fuzzy
msgid "Total globbed strings: "
msgstr "Cyfanswm Llinynau Glob: "
-#: cmdline/apt-cache.cc:402
+#: cmdline/apt-cache.cc:362
#, fuzzy
msgid "Total dependency version space: "
msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-#: cmdline/apt-cache.cc:407
+#: cmdline/apt-cache.cc:367
#, fuzzy
msgid "Total slack space: "
msgstr "Cyfanswm gofod Slac: "
-#: cmdline/apt-cache.cc:422
+#: cmdline/apt-cache.cc:375
#, fuzzy
msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
-#: cmdline/apt-cache.cc:558 cmdline/apt-cache.cc:1207
+#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
#: apt-private/private-show.cc:58
#, c-format
msgid "Package file %s is out of sync."
msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
-#: cmdline/apt-cache.cc:636 cmdline/apt-cache.cc:1493
-#: cmdline/apt-cache.cc:1495 cmdline/apt-cache.cc:1572 cmdline/apt-mark.cc:59
+#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
+#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
-#: cmdline/apt-cache.cc:1306
+#: cmdline/apt-cache.cc:1254
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Rhaid i chi ddarparu un patrwm yn union"
-#: cmdline/apt-cache.cc:1472
+#: cmdline/apt-cache.cc:1420
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1545
#, fuzzy
msgid "Package files:"
msgstr "Ffeiliau Pecynnau:"
-#: cmdline/apt-cache.cc:1604 cmdline/apt-cache.cc:1695
+#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
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"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1566
#, fuzzy
msgid "Pinned packages:"
msgstr "Pecynnau wedi eu Pinio:"
-#: cmdline/apt-cache.cc:1630 cmdline/apt-cache.cc:1675
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
msgid "(not found)"
msgstr "(heb ganfod)"
-#: cmdline/apt-cache.cc:1638
+#: cmdline/apt-cache.cc:1586
msgid " Installed: "
msgstr " Wedi Sefydlu: "
-#: cmdline/apt-cache.cc:1639
+#: cmdline/apt-cache.cc:1587
msgid " Candidate: "
msgstr " Ymgeisydd: "
-#: cmdline/apt-cache.cc:1657 cmdline/apt-cache.cc:1665
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
msgid "(none)"
msgstr "(dim)"
-#: cmdline/apt-cache.cc:1672
+#: cmdline/apt-cache.cc:1620
#, fuzzy
msgid " Package pin: "
msgstr " Pin Pecyn: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1681
+#: cmdline/apt-cache.cc:1629
#, fuzzy
msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1794 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1611 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1586 cmdline/apt-helper.cc:59 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
#: cmdline/apt-sortpkgs.cc:147
#, 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:1801
+#: cmdline/apt-cache.cc:1749
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -1646,7 +1645,7 @@ msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
-#: apt-private/private-install.cc:891
+#: apt-private/private-install.cc:865
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
@@ -1675,7 +1674,7 @@ msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
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:766 cmdline/apt-get.cc:1091
+#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1066
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
@@ -1695,96 +1694,96 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:843
#, 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:871 cmdline/apt-get.cc:874
-#: apt-private/private-install.cc:189 apt-private/private-install.cc:192
+#: cmdline/apt-get.cc:869 cmdline/apt-get.cc:872
+#: apt-private/private-install.cc:187 apt-private/private-install.cc:190
#, 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:884
+#: cmdline/apt-get.cc:882
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:893
+#: cmdline/apt-get.cc:891
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:896
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:904
+#: cmdline/apt-get.cc:902
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:922
+#: cmdline/apt-get.cc:920
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:927 apt-private/private-install.cc:316
+#: cmdline/apt-get.cc:925 apt-private/private-install.cc:314
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:952
+#: cmdline/apt-get.cc:950
#, 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:964
+#: cmdline/apt-get.cc:962
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:965
+#: cmdline/apt-get.cc:963
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:991
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:1012
+#: cmdline/apt-get.cc:1010
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:1031
+#: cmdline/apt-get.cc:1029
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:1056
+#: cmdline/apt-get.cc:1054
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1103 cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1078 cmdline/apt-get.cc:1081
#, 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:1126
+#: cmdline/apt-get.cc:1101
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:1296
+#: cmdline/apt-get.cc:1271
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -1793,7 +1792,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1314
+#: cmdline/apt-get.cc:1289
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1802,14 +1801,14 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1337
+#: cmdline/apt-get.cc:1312
#, 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:1376
+#: cmdline/apt-get.cc:1351
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -1818,7 +1817,7 @@ 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:1382
+#: cmdline/apt-get.cc:1357
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -1827,32 +1826,32 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1405
+#: cmdline/apt-get.cc:1380
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:1420
+#: cmdline/apt-get.cc:1395
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:1425
+#: cmdline/apt-get.cc:1400
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:1518 cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1505
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:1616
+#: cmdline/apt-get.cc:1591
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:1657
+#: cmdline/apt-get.cc:1632
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -2406,23 +2405,16 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/server.cc:496
+#: methods/server.cc:489
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/server.cc:513 methods/server.cc:600
+#: methods/server.cc:506 methods/server.cc:562
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/server.cc:572
-#, c-format
-msgid ""
-"Automatically disabled %s due to incorrect response from server/proxy. (man "
-"5 apt.conf)"
-msgstr ""
-
-#: methods/server.cc:692
+#: methods/server.cc:654
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2439,11 +2431,11 @@ msgstr "Wedi Gorffen"
msgid "Sorting"
msgstr ""
-#: apt-private/private-list.cc:123
+#: apt-private/private-list.cc:131
msgid "Listing"
msgstr ""
-#: apt-private/private-list.cc:156
+#: apt-private/private-list.cc:164
#, c-format
msgid "There is %i additional version. Please use the '-a' switch to see it"
msgid_plural ""
@@ -2484,106 +2476,106 @@ msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:233
+#: apt-private/private-output.cc:234
#, fuzzy, c-format
msgid "[installed,upgradable to: %s]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:237
+#: apt-private/private-output.cc:238
#, fuzzy
msgid "[installed,local]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:240
+#: apt-private/private-output.cc:241
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:242
+#: apt-private/private-output.cc:243
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:244
+#: apt-private/private-output.cc:245
#, fuzzy
msgid "[installed]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:248
+#: apt-private/private-output.cc:249
#, c-format
msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:252
+#: apt-private/private-output.cc:253
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:434
+#: apt-private/private-output.cc:435
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: apt-private/private-output.cc:436
+#: apt-private/private-output.cc:437
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:443
+#: apt-private/private-output.cc:444
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: apt-private/private-output.cc:445
+#: apt-private/private-output.cc:446
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: apt-private/private-output.cc:448
+#: apt-private/private-output.cc:449
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: apt-private/private-output.cc:448
+#: apt-private/private-output.cc:449
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:453
+#: apt-private/private-output.cc:454
msgid " or"
msgstr " neu"
-#: apt-private/private-output.cc:467 apt-private/private-output.cc:479
+#: apt-private/private-output.cc:468 apt-private/private-output.cc:480
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: apt-private/private-output.cc:502
+#: apt-private/private-output.cc:503
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-output.cc:528
+#: apt-private/private-output.cc:529
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: apt-private/private-output.cc:550
+#: apt-private/private-output.cc:551
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: apt-private/private-output.cc:571
+#: apt-private/private-output.cc:572
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: apt-private/private-output.cc:592
+#: apt-private/private-output.cc:593
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: apt-private/private-output.cc:612
+#: apt-private/private-output.cc:613
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: apt-private/private-output.cc:667
+#: apt-private/private-output.cc:668
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: apt-private/private-output.cc:675
+#: apt-private/private-output.cc:676
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -2593,27 +2585,27 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: apt-private/private-output.cc:706
+#: apt-private/private-output.cc:707
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: apt-private/private-output.cc:710
+#: apt-private/private-output.cc:711
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: apt-private/private-output.cc:712
+#: apt-private/private-output.cc:713
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: apt-private/private-output.cc:714
+#: apt-private/private-output.cc:715
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: apt-private/private-output.cc:718
+#: apt-private/private-output.cc:719
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
@@ -2622,7 +2614,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
#. e.g. "Do you want to continue? [Y/n] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:740
+#: apt-private/private-output.cc:741
msgid "[Y/n]"
msgstr ""
@@ -2630,17 +2622,17 @@ msgstr ""
#. e.g. "Should this file be removed? [y/N] "
#. The user has to answer with an input matching the
#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:746
+#: apt-private/private-output.cc:747
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:757
+#: apt-private/private-output.cc:758
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:763
+#: apt-private/private-output.cc:764
msgid "N"
msgstr ""
@@ -2672,72 +2664,72 @@ msgstr[1] ""
msgid "not a real package (virtual)"
msgstr ""
-#: apt-private/private-install.cc:84
+#: apt-private/private-install.cc:82
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: apt-private/private-install.cc:93
+#: apt-private/private-install.cc:91
#, fuzzy
msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: apt-private/private-install.cc:112
+#: apt-private/private-install.cc:110
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: apt-private/private-install.cc:150
+#: apt-private/private-install.cc:148
msgid "How odd... The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:157
+#: apt-private/private-install.cc:155
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:162
+#: apt-private/private-install.cc:160
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: apt-private/private-install.cc:169
+#: apt-private/private-install.cc:167
#, 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"
#. 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
-#: apt-private/private-install.cc:174
+#: apt-private/private-install.cc:172
#, 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"
-#: apt-private/private-install.cc:202
+#: apt-private/private-install.cc:200
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Does dim digon o le rhydd gennych yn %s."
-#: apt-private/private-install.cc:212 apt-private/private-download.cc:59
+#: apt-private/private-install.cc:210 apt-private/private-download.cc:59
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: apt-private/private-install.cc:218 apt-private/private-install.cc:240
+#: apt-private/private-install.cc:216 apt-private/private-install.cc:238
msgid "Trivial Only specified but this is not a trivial operation."
msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
#. careful with hard to type or special characters (like non-breaking spaces)
-#: apt-private/private-install.cc:222
+#: apt-private/private-install.cc:220
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: apt-private/private-install.cc:224
+#: apt-private/private-install.cc:222
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -2748,19 +2740,19 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: apt-private/private-install.cc:230 apt-private/private-install.cc:248
+#: apt-private/private-install.cc:228 apt-private/private-install.cc:246
msgid "Abort."
msgstr "Erthylu."
-#: apt-private/private-install.cc:245
+#: apt-private/private-install.cc:243
msgid "Do you want to continue?"
msgstr "Ydych chi eisiau mynd ymlaen?"
-#: apt-private/private-install.cc:315
+#: apt-private/private-install.cc:313
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: apt-private/private-install.cc:322
+#: apt-private/private-install.cc:320
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -2768,20 +2760,20 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: apt-private/private-install.cc:326
+#: apt-private/private-install.cc:324
msgid "--fix-missing and media swapping is not currently supported"
msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:329
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: apt-private/private-install.cc:332
+#: apt-private/private-install.cc:330
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: apt-private/private-install.cc:368
+#: apt-private/private-install.cc:366
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -2791,15 +2783,15 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:372
+#: apt-private/private-install.cc:370
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:393
+#: apt-private/private-install.cc:391
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:501
+#: apt-private/private-install.cc:499
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -2815,16 +2807,16 @@ msgstr ""
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:504 apt-private/private-install.cc:655
+#: apt-private/private-install.cc:502 apt-private/private-install.cc:653
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: apt-private/private-install.cc:508
+#: apt-private/private-install.cc:506
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: apt-private/private-install.cc:515
+#: apt-private/private-install.cc:513
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
@@ -2834,7 +2826,7 @@ msgid_plural ""
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-install.cc:519
+#: apt-private/private-install.cc:517
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
@@ -2842,18 +2834,18 @@ msgid_plural ""
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-install.cc:521
+#: apt-private/private-install.cc:519
msgid "Use 'apt-get autoremove' to remove it."
msgid_plural "Use 'apt-get autoremove' to remove them."
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:612
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
-#: apt-private/private-install.cc:616
+#: apt-private/private-install.cc:614
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -2862,7 +2854,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: apt-private/private-install.cc:640
+#: apt-private/private-install.cc:638
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"
@@ -2874,59 +2866,59 @@ msgstr ""
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: apt-private/private-install.cc:661
+#: apt-private/private-install.cc:659
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: apt-private/private-install.cc:738
+#: apt-private/private-install.cc:712
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: apt-private/private-install.cc:828
+#: apt-private/private-install.cc:802
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: apt-private/private-install.cc:829
+#: apt-private/private-install.cc:803
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: apt-private/private-install.cc:851
+#: apt-private/private-install.cc:825
#, 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"
-#: apt-private/private-install.cc:855
+#: apt-private/private-install.cc:829
#, 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"
-#: apt-private/private-install.cc:867
+#: apt-private/private-install.cc:841
#, 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"
-#: apt-private/private-install.cc:872
+#: apt-private/private-install.cc:846
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: apt-private/private-install.cc:920
+#: apt-private/private-install.cc:894
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-#: apt-private/private-install.cc:925
+#: apt-private/private-install.cc:899
#, fuzzy, c-format
msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
#. TRANSLATORS: Note, this is not an interactive question
-#: apt-private/private-install.cc:967
+#: apt-private/private-install.cc:941
#, fuzzy, c-format
msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
-#: apt-private/private-install.cc:973
+#: apt-private/private-install.cc:947
#, fuzzy, 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"
@@ -2975,29 +2967,29 @@ msgstr ""
msgid "Hit "
msgstr "Presennol "
-#: apt-private/acqprogress.cc:88
+#: apt-private/acqprogress.cc:90
msgid "Get:"
msgstr "Cyrchu:"
-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:121
msgid "Ign "
msgstr "Anwybyddu "
-#: apt-private/acqprogress.cc:123
+#: apt-private/acqprogress.cc:125
msgid "Err "
msgstr "Gwall "
-#: apt-private/acqprogress.cc:147
+#: apt-private/acqprogress.cc:146
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
-#: apt-private/acqprogress.cc:237
+#: apt-private/acqprogress.cc:236
#, c-format
msgid " [Working]"
msgstr " [Gweithio]"
-#: apt-private/acqprogress.cc:298
+#: apt-private/acqprogress.cc:297
#, fuzzy, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -3137,7 +3129,7 @@ msgid "The diversion path is too long"
msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216
-#: ftparchive/cachedb.cc:184
+#: ftparchive/cachedb.cc:182
#, c-format
msgid "Failed to stat %s"
msgstr "Methodd stat() o %s"
@@ -3251,7 +3243,7 @@ msgid "Unknown TAR header type %u, member %s"
msgstr "Math pennawd TAR anhysbys %u, aelod %s"
# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:224
#, fuzzy
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -3276,7 +3268,12 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni ellir gwneud stat() o %s"
+
+#: cmdline/apt-extracttemplates.cc:300
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
@@ -3396,122 +3393,122 @@ msgstr "Dim dewisiadau'n cyfateb"
msgid "Some files are missing in the package file group `%s'"
msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'"
-#: ftparchive/cachedb.cc:67
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
-#: ftparchive/cachedb.cc:85
+#: ftparchive/cachedb.cc:83
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-#: ftparchive/cachedb.cc:96
+#: ftparchive/cachedb.cc:94
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-#: ftparchive/cachedb.cc:101
+#: ftparchive/cachedb.cc:99
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-#: ftparchive/cachedb.cc:326
+#: ftparchive/cachedb.cc:332
#, fuzzy
msgid "Failed to read .dsc"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/cachedb.cc:359
+#: ftparchive/cachedb.cc:365
msgid "Archive has no control record"
msgstr "Does dim cofnod rheoli gan yr archif"
-#: ftparchive/cachedb.cc:522
+#: ftparchive/cachedb.cc:594
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
-#: ftparchive/writer.cc:104
+#: ftparchive/writer.cc:91
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: ftparchive/writer.cc:109
+#: ftparchive/writer.cc:96
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: ftparchive/writer.cc:165
+#: ftparchive/writer.cc:152
msgid "E: "
msgstr "G: "
-#: ftparchive/writer.cc:167
+#: ftparchive/writer.cc:154
msgid "W: "
msgstr "Rh: "
-#: ftparchive/writer.cc:174
+#: ftparchive/writer.cc:161
msgid "E: Errors apply to file "
msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
#, c-format
msgid "Failed to resolve %s"
msgstr "Methwyd datrys %s"
-#: ftparchive/writer.cc:205
+#: ftparchive/writer.cc:192
msgid "Tree walking failed"
msgstr "Methwyd cerdded y goeden"
-#: ftparchive/writer.cc:232
+#: ftparchive/writer.cc:219
#, c-format
msgid "Failed to open %s"
msgstr "Methwyd agor %s"
# FIXME
-#: ftparchive/writer.cc:291
+#: ftparchive/writer.cc:278
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DatGysylltu %s [%s]\n"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:286
#, c-format
msgid "Failed to readlink %s"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/writer.cc:303
+#: ftparchive/writer.cc:290
#, c-format
msgid "Failed to unlink %s"
msgstr "Methwyd datgysylltu %s"
-#: ftparchive/writer.cc:311
+#: ftparchive/writer.cc:298
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Methwyd cysylltu %s at %s"
-#: ftparchive/writer.cc:321
+#: ftparchive/writer.cc:308
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:427
+#: ftparchive/writer.cc:417
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:704
+#: ftparchive/writer.cc:425 ftparchive/writer.cc:692
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:500 ftparchive/writer.cc:868
+#: ftparchive/writer.cc:493 ftparchive/writer.cc:848
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:718
+#: ftparchive/writer.cc:706
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:722
+#: ftparchive/writer.cc:710
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 22:24:12 +0000