summaryrefslogtreecommitdiff
path: root/po/cy.po
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2015-06-23 12:17:35 +0100
committerMichael Vogt <mvo@debian.org>2015-06-23 12:17:35 +0100
commit245dde96193702f7f51389d3583dee547f8ba366 (patch)
tree6cf8c191641c760bcc6a6c08fb0ff65d27e0cffd /po/cy.po
parent5530255b5f3ad7de2e23dfcb39ce325001126501 (diff)
parentc8a4ce6cbed57ae108dc955d4a850f9b129a0693 (diff)
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po1814
1 files changed, 904 insertions, 910 deletions
diff --git a/po/cy.po b/po/cy.po
index a25e4be08..b05bc7c59 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-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\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"
@@ -20,164 +20,164 @@ msgstr ""
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:320
#, fuzzy
msgid "Total package names: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid "Total package structures: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
#, fuzzy
msgid " Normal packages: "
msgstr " Pecynnau Normal: "
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
#, fuzzy
msgid " Pure virtual packages: "
msgstr " Pecynnau Cwbl Rhithwir: "
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
#, fuzzy
msgid " Single virtual packages: "
msgstr " Pecynnau Rhithwir Sengl: "
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
#, fuzzy
msgid " Mixed virtual packages: "
msgstr " Pecynnau Rhithwir Cymysg: "
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
msgid " Missing: "
msgstr " Ar Goll: "
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
#, fuzzy
msgid "Total distinct versions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
#, fuzzy
msgid "Total dependencies: "
msgstr "Cyfanswm Dibyniaethau: "
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
#, fuzzy
msgid "Total ver/file relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
#, fuzzy
msgid "Total Provides mappings: "
msgstr "Cyfanswm Mapiau Darpariath: "
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
#, fuzzy
msgid "Total globbed strings: "
msgstr "Cyfanswm Llinynau Glob: "
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
#, fuzzy
msgid "Total slack space: "
msgstr "Cyfanswm gofod Slac: "
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
#, fuzzy
msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
#: 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:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Rhaid i chi ddarparu un patrwm yn union"
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
#, fuzzy
msgid "Package files:"
msgstr "Ffeiliau Pecynnau:"
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
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:1646
+#: cmdline/apt-cache.cc:1651
#, fuzzy
msgid "Pinned packages:"
msgstr "Pecynnau wedi eu Pinio:"
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
msgid "(not found)"
msgstr "(heb ganfod)"
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
msgid " Installed: "
msgstr " Wedi Sefydlu: "
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
msgid " Candidate: "
msgstr " Ymgeisydd: "
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
msgid "(none)"
msgstr "(dim)"
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
#, fuzzy
msgid " Package pin: "
msgstr " Pin Pecyn: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
#, fuzzy
msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
#, 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:1829
+#: cmdline/apt-cache.cc:1834
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
@@ -250,11 +250,11 @@ msgstr ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
@@ -262,12 +262,12 @@ msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
msgid ""
"No CD-ROM could be auto-detected or found using the default mount point.\n"
"You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -275,7 +275,7 @@ msgid ""
"mount point."
msgstr ""
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
@@ -312,84 +312,79 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad\n"
" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
#: apt-private/private-install.cc:863
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
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:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
#, c-format
msgid ""
"Please use:\n"
@@ -397,95 +392,95 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
#. 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:879
+#: cmdline/apt-get.cc:863
#, 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:884
+#: cmdline/apt-get.cc:868
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
#, 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:958
+#: cmdline/apt-get.cc:942
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
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:1043
+#: cmdline/apt-get.cc:1030
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
#, c-format
msgid "Note, using directory '%s' to get the build dependencies\n"
msgstr ""
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
#, fuzzy, c-format
msgid "Note, using file '%s' to get the build dependencies\n"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
#, 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:1118
+#: cmdline/apt-get.cc:1109
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
@@ -494,7 +489,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -503,14 +498,14 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
#, 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:1368
+#: cmdline/apt-get.cc:1359
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
@@ -519,7 +514,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:1374
+#: cmdline/apt-get.cc:1365
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
@@ -528,17 +523,17 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
@@ -649,11 +644,11 @@ msgstr ""
msgid "Must specify at least one pair url/filename"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
msgid "Download Failed"
msgstr ""
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
msgid ""
"Usage: apt-helper [options] command\n"
" apt-helper [options] download-file uri target-path\n"
@@ -667,52 +662,53 @@ msgid ""
" This APT helper has Super Meep Powers.\n"
msgstr ""
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
#, fuzzy, c-format
msgid "%s can not be marked as it is not installed.\n"
msgstr "ond nid yw wedi ei sefydlu"
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
#, fuzzy, c-format
msgid "%s was already set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
#, fuzzy, c-format
msgid "%s was already set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Methwyd agor %s"
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
@@ -940,7 +936,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -1030,37 +1026,37 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
msgid "Unable to connect to %s:%s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
msgid "Unknown error executing apt-key"
msgstr ""
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -1070,32 +1066,32 @@ msgstr ""
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:515
+#: methods/http.cc:517
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:529
+#: methods/http.cc:531
#, 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:531
+#: methods/http.cc:533
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:567
+#: methods/http.cc:569
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:627
+#: methods/http.cc:629
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:632
+#: methods/http.cc:634
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:655
+#: methods/http.cc:657
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
@@ -1103,58 +1099,304 @@ msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/server.cc:110
+#: methods/server.cc:111
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/server.cc:172
+#: methods/server.cc:173
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/server.cc:195
+#: methods/server.cc:193
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/server.cc:197
+#: methods/server.cc:195
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/server.cc:221
+#: methods/server.cc:219
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/server.cc:497
+#: methods/server.cc:506
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/server.cc:580
+#: methods/server.cc:589
#, c-format
msgid ""
"Automatically disabled %s due to incorrect response from server/proxy. (man "
"5 apt.conf)"
msgstr ""
-#: methods/server.cc:703
+#: methods/server.cc:712
msgid "Internal error"
msgstr "Gwall mewnol"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:110
+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."
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " neu"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+
+#: apt-private/private-output.cc:571
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+
+#: apt-private/private-output.cc:592
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+
+#: apt-private/private-output.cc:613
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (oherwydd %s) "
+
+#: apt-private/private-output.cc:696
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
+
+#: apt-private/private-output.cc:735
+#, 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:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. 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:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. 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:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
msgid "Sorting"
msgstr ""
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
+
#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
@@ -1409,252 +1651,6 @@ msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
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"
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr " wedi methu."
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr " Wedi Gorffen"
-
-#: apt-private/private-cachefile.cc:110
-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."
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:268
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:274
-#, fuzzy
-msgid "[installed]"
-msgstr " [Sefydliwyd]"
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr " neu"
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-
-#: apt-private/private-output.cc:571
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-
-#: apt-private/private-output.cc:592
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-
-#: apt-private/private-output.cc:613
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
-
-#: apt-private/private-output.cc:696
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
-"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
-"ei wneud!"
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
-
-#: apt-private/private-output.cc:735
-#, 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:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. 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:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. 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:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr "I"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
-msgstr ""
-
#: apt-private/private-download.cc:62
#, c-format
msgid ""
@@ -1710,20 +1706,24 @@ msgid "Full Text Search"
msgstr ""
#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Presennol "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "Presennol:%lu %s"
#: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "Cyrchu:"
+#, c-format
+msgid "Get:%lu %s"
+msgstr "Cyrchu:%lu %s"
#: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "Anwybyddu "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "Anwybyddu:%lu %s"
#: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "Gwall "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "Gwall:%lu %s"
#: apt-private/acqprogress.cc:150
#, c-format
@@ -1749,17 +1749,17 @@ msgstr ""
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
#: apt-pkg/contrib/cdromutl.cc:235
#, c-format
msgid "Unable to change to %s"
@@ -1837,7 +1837,7 @@ msgid "Merging available information"
msgstr "Yn cyfuno manylion Ar Gael"
# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
#, fuzzy
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
@@ -1862,47 +1862,47 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
#, fuzzy, c-format
msgid "Unable to mkstemp %s"
msgstr "Ni ellir gwneud stat() o %s"
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
#: apt-pkg/contrib/fileutl.cc:2097
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
msgid "Package extension list is too long"
msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
#, fuzzy, c-format
msgid "Error processing directory %s"
msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
msgid "Source extension list is too long"
msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
msgid "Error writing header to contents file"
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
#, fuzzy, c-format
msgid "Error processing contents %s"
msgstr "Gwall wrth Brosesu Cynnwys %s"
# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
@@ -1984,11 +1984,11 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol"
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
msgid "No selections matched"
msgstr "Dim dewisiadau'n cyfateb"
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
#, 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'"
@@ -2099,22 +2099,22 @@ msgstr " Tarwyd y terfyn cyswllt %sB.\n"
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
@@ -2202,7 +2202,7 @@ msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
@@ -2227,11 +2227,11 @@ msgstr ""
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
msgid "Unknown package record!"
msgstr "Cofnod pecyn anhysbys!"
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
#, fuzzy
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
@@ -2305,6 +2305,29 @@ msgstr ""
msgid "Hash mismatch for: %s"
msgstr "Camgyfatebiaeth swm MD5"
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
+
+#: apt-pkg/acquire-worker.cc:485
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
+
#: apt-pkg/cachefile.cc:94
msgid "The package lists or status file could not be parsed or opened."
msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
@@ -2317,186 +2340,309 @@ 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:149
+#: apt-pkg/pkgcache.cc:154
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
msgid "The package cache file is corrupted"
msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
msgid "The package cache file is an incompatible version"
msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
#, 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:170
+#: apt-pkg/pkgcache.cc:175
#, 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:180
+#: apt-pkg/pkgcache.cc:185
#, fuzzy, c-format
msgid "The package cache was built for different architectures: %s vs %s"
msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Depends"
msgstr "Dibynnu"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "PreDepends"
msgstr "CynDdibynnu"
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
msgid "Suggests"
msgstr "Awgrymu"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Recommends"
msgstr "Argymell"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Conflicts"
msgstr "Gwrthdaro"
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
msgid "Replaces"
msgstr "Amnewid"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Obsoletes"
msgstr "Darfodi"
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "important"
msgstr "pwysig"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "required"
msgstr "angenrheidiol"
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
msgid "standard"
msgstr "safonnol"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "optional"
msgstr "opsiynnol"
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
#, fuzzy
msgid "Calculating upgrade"
msgstr "Yn Cyfrifo'r Uwchraddiad"
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/acquire-worker.cc:135
-#, c-format
-msgid "Is the package %s installed?"
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:173
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:217
#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:335
#, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Opening %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+
+#: apt-pkg/sourcelist.cc:375
+#, fuzzy, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
+#: apt-pkg/sourcelist.cc:416
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr "Ni ellir gwneud stat() o %s."
-#: apt-pkg/depcache.cc:139
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"
-#: apt-pkg/depcache.cc:168
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 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:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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:279
#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+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/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#: apt-pkg/pkgcachegen.cc:282
+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:591
+#, 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:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/depcache.cc:250
-#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/depcache.cc:256
-#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
#: apt-pkg/acquire-item.cc:98
msgid "Use --allow-insecure-repositories to force the update"
msgstr ""
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
#, fuzzy
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
#, fuzzy
msgid "Signature error"
msgstr "Gwall ysgrifennu"
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
msgid "Does not start with a cleartext signature"
msgstr ""
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
@@ -2504,7 +2650,7 @@ msgid ""
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
@@ -2520,14 +2666,14 @@ msgid ""
"AllowDowngradeToInsecureRepositories was given to override it."
msgstr ""
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
#, c-format
msgid ""
"The data from '%s' is not signed. Packages from that repository can not be "
"authenticated."
msgstr ""
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
@@ -2535,28 +2681,28 @@ msgid ""
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
#, 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:1995
+#: apt-pkg/acquire-item.cc:1999
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
#, 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:2055
+#: apt-pkg/acquire-item.cc:2059
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
#, c-format
msgid ""
"The repository '%s' does not have a Release file. This is deprecated, please "
@@ -2564,7 +2710,7 @@ msgid ""
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2573,130 +2719,55 @@ 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:2307
+#: apt-pkg/acquire-item.cc:2315
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
#, 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/pkgcachegen.cc:113
-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:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 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:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:273
-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:276
-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:279
-#, 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:282
-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:591
-#, 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:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-#, fuzzy
-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
#, fuzzy, c-format
-msgid "Clean of %s is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+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:976
+#: apt-pkg/acquire.cc:981
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
-"rai eu defnyddio yn lle."
-
# FIXME: ...file
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
#: apt-pkg/policy.cc:83
#, c-format
msgid ""
@@ -2720,20 +2791,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:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
#, 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:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Methwyd agor ffeil %s"
# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2744,10 +2815,14 @@ msgstr ""
"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."
#: apt-pkg/cdrom.cc:571
#, fuzzy
@@ -2815,12 +2890,12 @@ msgstr ""
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
#, fuzzy
msgid "Writing new source list\n"
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
msgid "Source list entries for this disc are:\n"
msgstr ""
@@ -2832,7 +2907,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2840,148 +2915,45 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
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/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-# FIXME: number?
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:83
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/indexrecords.cc:91
-#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, 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:171
-#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+#, fuzzy
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: apt-pkg/depcache.cc:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
-#: apt-pkg/sourcelist.cc:190
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/depcache.cc:252
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
-#: apt-pkg/sourcelist.cc:217
+#: apt-pkg/depcache.cc:258
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-pkg/sourcelist.cc:335
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/sourcelist.cc:371
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-
-#: apt-pkg/sourcelist.cc:375
-#, fuzzy, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
-
-#: apt-pkg/sourcelist.cc:416
-#, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)"
#: apt-pkg/cacheset.cc:501
#, c-format
@@ -2993,208 +2965,103 @@ msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
#, fuzzy, c-format
msgid "Couldn't find any package by glob '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:107
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr " Wedi Sefydlu: "
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Yn cysylltu i %s"
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:83
#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:110
+#: apt-pkg/indexrecords.cc:91
#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Methwyd dileu %s"
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/deb/dpkgpm.cc:112
+#: apt-pkg/indexrecords.cc:132
#, c-format
-msgid "Running post-installation trigger %s"
+msgid "No Hash entry in Release file %s"
msgstr ""
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Methwyd agor ffeil %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Yn agor %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:145
#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-#: apt-pkg/deb/dpkgpm.cc:1012
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:164
#, fuzzy, c-format
-msgid "Installed %s"
-msgstr " Wedi Sefydlu: "
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/deb/dpkgpm.cc:1017
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1019
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Argymell"
-
-#: apt-pkg/deb/dpkgpm.cc:1024
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1025
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
-#, fuzzy, c-format
-msgid "Can not write log (%s)"
-msgstr "Ni ellir ysgrifennu i %s"
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
+msgid "%lid %lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
+#, c-format
+msgid "%lih %limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:94
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgid "%lis"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
#: apt-pkg/contrib/fileutl.cc:196
#, c-format
@@ -3331,35 +3198,6 @@ msgstr ""
msgid "%c%s... %u%%"
msgstr "%c%s... Wedi Gorffen"
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
-
#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
@@ -3423,112 +3261,268 @@ 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:516
+#: apt-pkg/contrib/configuration.cc:522
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
#, 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:817
+#: apt-pkg/contrib/configuration.cc:823
#, fuzzy, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
#, 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:874
+#: apt-pkg/contrib/configuration.cc:880
#, 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:881
+#: apt-pkg/contrib/configuration.cc:887
#, 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:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
#, 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:947
+#: apt-pkg/contrib/configuration.cc:953
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
# FIXME
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
#, c-format
msgid "Command line option %s is not understood"
msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an argument."
msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
#, c-format
msgid "Option '%s' is too long"
msgstr "Opsiwn '%s' yn rhy hir"
# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
#, c-format
msgid "Invalid operation %s"
msgstr "Gweithred annilys %s"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, fuzzy, c-format
+msgid "Installing %s"
+msgstr " Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Methwyd agor ffeil %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr " Wedi Sefydlu: "
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Argymell"
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
@@ -3637,7 +3631,7 @@ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
msgid "Internal error, could not locate member %s"
msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
#, fuzzy
msgid "Unparsable control file"
msgstr "Ffeil rheoli ni ellir ei ramadegu"
@@ -3667,24 +3661,24 @@ msgstr "Mae'r archif yn rhy fyr"
msgid "Failed to read the archive headers"
msgstr "Methwyd darllen pennawdau'r archif"
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
msgid "Failed to create pipes"
msgstr "Methwyd creu pibau"
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
msgid "Failed to exec gzip "
msgstr "Methwyd gweithredu gzip"
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
msgid "Corrupted archive"
msgstr "Archif llygredig"
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
#, fuzzy
msgid "Tar checksum failed, archive corrupted"
msgstr "Methodd swm gwirio Tar, archif llygredig"
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Math pennawd TAR anhysbys %u, aelod %s"