msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-01-18 21:25+0100\n"
+"POT-Creation-Date: 2014-04-01 15:51+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:140
+#: cmdline/apt-cache.cc:149
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
-#: cmdline/apt-cache.cc:268
+#: cmdline/apt-cache.cc:277
#, fuzzy
msgid "Total package names: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:270
+#: cmdline/apt-cache.cc:279
#, fuzzy
msgid "Total package structures: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:310
+#: cmdline/apt-cache.cc:319
#, fuzzy
msgid " Normal packages: "
msgstr " Pecynnau Normal: "
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:320
#, fuzzy
msgid " Pure virtual packages: "
msgstr " Pecynnau Cwbl Rhithwir: "
-#: cmdline/apt-cache.cc:312
+#: cmdline/apt-cache.cc:321
#, fuzzy
msgid " Single virtual packages: "
msgstr " Pecynnau Rhithwir Sengl: "
-#: cmdline/apt-cache.cc:313
+#: cmdline/apt-cache.cc:322
#, fuzzy
msgid " Mixed virtual packages: "
msgstr " Pecynnau Rhithwir Cymysg: "
-#: cmdline/apt-cache.cc:314
+#: cmdline/apt-cache.cc:323
msgid " Missing: "
msgstr " Ar Goll: "
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:325
#, fuzzy
msgid "Total distinct versions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:318
+#: cmdline/apt-cache.cc:327
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:329
#, fuzzy
msgid "Total dependencies: "
msgstr "Cyfanswm Dibyniaethau: "
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:332
#, fuzzy
msgid "Total ver/file relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:334
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:336
#, fuzzy
msgid "Total Provides mappings: "
msgstr "Cyfanswm Mapiau Darpariath: "
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:348
#, fuzzy
msgid "Total globbed strings: "
msgstr "Cyfanswm Llinynau Glob: "
-#: cmdline/apt-cache.cc:353
+#: cmdline/apt-cache.cc:362
#, fuzzy
msgid "Total dependency version space: "
msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-#: cmdline/apt-cache.cc:358
+#: cmdline/apt-cache.cc:367
#, fuzzy
msgid "Total slack space: "
msgstr "Cyfanswm gofod Slac: "
-#: cmdline/apt-cache.cc:366
+#: cmdline/apt-cache.cc:375
#, fuzzy
msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
-#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: 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:575 cmdline/apt-cache.cc:1432
-#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
-#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:113 apt-private/private-show.cc:115
+#: 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:1245
+#: 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:1411
+#: cmdline/apt-cache.cc:1420
msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
msgstr ""
-#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
+#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
-#: cmdline/apt-cache.cc:1536
+#: cmdline/apt-cache.cc:1545
#, fuzzy
msgid "Package files:"
msgstr "Ffeiliau Pecynnau:"
-#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
+#: 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:1557
+#: cmdline/apt-cache.cc:1566
#, fuzzy
msgid "Pinned packages:"
msgstr "Pecynnau wedi eu Pinio:"
-#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
+#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
msgid "(not found)"
msgstr "(heb ganfod)"
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1586
msgid " Installed: "
msgstr " Wedi Sefydlu: "
-#: cmdline/apt-cache.cc:1578
+#: cmdline/apt-cache.cc:1587
msgid " Candidate: "
msgstr " Ymgeisydd: "
-#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
+#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
msgid "(none)"
msgstr "(dim)"
-#: cmdline/apt-cache.cc:1611
+#: cmdline/apt-cache.cc:1620
#, fuzzy
msgid " Package pin: "
msgstr " Pin Pecyn: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1629
#, fuzzy
msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
+#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
+#: 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:1740
+#: cmdline/apt-cache.cc:1749
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-#. }}}
-#: cmdline/apt-cdrom.cc:45
-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. See 'man apt-"
-"cdrom' for more information about the CD-ROM auto-detection and mount point."
-msgstr ""
-
-#: cmdline/apt-cdrom.cc:89
+#: cmdline/apt-cdrom.cc:76
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:104
+#: cmdline/apt-cdrom.cc:91
#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
msgid "Failed to mount '%s' to '%s'"
msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:178
+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"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
" -c=? Darllen y ffeil cyfluniad\n"
" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:244
+#: cmdline/apt-get.cc:245
#, fuzzy, c-format
msgid "Can not find a package for architecture '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:326
+#: cmdline/apt-get.cc:327
#, fuzzy, c-format
msgid "Can not find a package '%s' with version '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:329
+#: cmdline/apt-get.cc:330
#, fuzzy, c-format
msgid "Can not find a package '%s' with release '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:366
+#: cmdline/apt-get.cc:367
#, 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:422
+#: cmdline/apt-get.cc:423
#, c-format
msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:453
+#: cmdline/apt-get.cc:454
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:722
+#: cmdline/apt-get.cc:726
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:762 cmdline/apt-get.cc:1057
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:779
+#: cmdline/apt-get.cc:782
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:839
#, 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:860 cmdline/apt-get.cc:863
-#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
+#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:912
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325
+#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:942
#, 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:954
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:955
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:983
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:1001
+#: cmdline/apt-get.cc:1002
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:1020
+#: cmdline/apt-get.cc:1021
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:1045
+#: cmdline/apt-get.cc:1046
#, c-format
msgid ""
"No architecture information available for %s. See apt.conf(5) APT::"
"Architectures for setup"
msgstr ""
-#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072
+#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
#, 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:1092
+#: cmdline/apt-get.cc:1093
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:1262
+#: cmdline/apt-get.cc:1263
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1280
+#: cmdline/apt-get.cc:1281
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1303
+#: cmdline/apt-get.cc:1304
#, 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:1342
+#: cmdline/apt-get.cc:1343
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"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:1348
+#: cmdline/apt-get.cc:1349
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1371
+#: cmdline/apt-get.cc:1372
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:1386
+#: cmdline/apt-get.cc:1387
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1392
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
#, fuzzy, c-format
msgid "Changelog for %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:1582
+#: cmdline/apt-get.cc:1583
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:1623
+#: cmdline/apt-get.cc:1624
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
"\n"
" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: cmdline/apt-mark.cc:57
+#: cmdline/apt-helper.cc:35
+#, fuzzy
+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:52
+msgid "Download Failed"
+msgstr ""
+
+#: cmdline/apt-helper.cc:65
+msgid ""
+"Usage: apt-helper [options] command\n"
+" apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+" download-file - download the given uri to the target-path\n"
+"\n"
+" This APT helper has Super Meep Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:68
#, 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:63
+#: cmdline/apt-mark.cc:74
#, 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:65
+#: cmdline/apt-mark.cc:76
#, 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:230
+#: cmdline/apt-mark.cc:241
#, fuzzy, c-format
msgid "%s was already set on hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-mark.cc:232
+#: cmdline/apt-mark.cc:243
#, fuzzy, c-format
msgid "%s was already not hold.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
+#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
+#: apt-pkg/deb/dpkgpm.cc:1201
#, 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:262 cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
#, fuzzy, c-format
msgid "%s set on hold.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
#, fuzzy, c-format
msgid "Canceled hold on %s.\n"
msgstr "Methwyd agor %s"
-#: cmdline/apt-mark.cc:334
+#: cmdline/apt-mark.cc:345
msgid "Executing dpkg failed. Are you root?"
msgstr ""
-#: cmdline/apt-mark.cc:381
+#: cmdline/apt-mark.cc:392
msgid ""
"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
"\n"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
"See the apt-mark(8) and apt.conf(5) manual pages for more information."
msgstr ""
-#: cmdline/apt.cc:71
+#: cmdline/apt.cc:47
msgid ""
"Usage: apt [options] command\n"
"\n"
" install - install packages\n"
" remove - remove packages\n"
"\n"
-" upgrade - upgrade the systems packages\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+" full-upgrade - upgrade the system by removing/installing/upgrading "
+"packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
msgid "Disk not found."
msgstr "Ffeil heb ei ganfod"
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:617 methods/rred.cc:626
+#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/rred.cc:608
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:623
+#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
-#: methods/file.cc:47
+#: methods/file.cc:48
msgid "Invalid URI, local URIS must not start with //"
msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:173
+#: methods/ftp.cc:177
msgid "Logging in"
msgstr "Yn mewngofnodi"
-#: methods/ftp.cc:179
+#: methods/ftp.cc:183
msgid "Unable to determine the peer name"
msgstr "Ni ellir darganfod enw'r cymar"
-#: methods/ftp.cc:184
+#: methods/ftp.cc:188
msgid "Unable to determine the local name"
msgstr "Ni ellir darganfod yr enw lleol"
-#: methods/ftp.cc:215 methods/ftp.cc:243
+#: methods/ftp.cc:219 methods/ftp.cc:247
#, fuzzy, c-format
msgid "The server refused the connection and said: %s"
msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
-#: methods/ftp.cc:221
+#: methods/ftp.cc:225
#, c-format
msgid "USER failed, server said: %s"
msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
-#: methods/ftp.cc:228
+#: methods/ftp.cc:232
#, c-format
msgid "PASS failed, server said: %s"
msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
-#: methods/ftp.cc:248
+#: methods/ftp.cc:252
msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
"ProxyLogin yn wag.)"
# FIXME
-#: methods/ftp.cc:276
+#: methods/ftp.cc:280
#, c-format
msgid "Login script command '%s' failed, server said: %s"
msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
-#: methods/ftp.cc:302
+#: methods/ftp.cc:306
#, c-format
msgid "TYPE failed, server said: %s"
msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
-#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237
+#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
msgid "Connection timeout"
msgstr "Goramser cysylltu"
-#: methods/ftp.cc:346
+#: methods/ftp.cc:350
msgid "Server closed the connection"
msgstr "Caeodd y gweinydd y cysylltiad"
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292
-#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
+#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1468
+#: apt-pkg/contrib/fileutl.cc:1477 apt-pkg/contrib/fileutl.cc:1482
+#: apt-pkg/contrib/fileutl.cc:1484
msgid "Read error"
msgstr "Gwall darllen"
-#: methods/ftp.cc:356 methods/rsh.cc:206
+#: methods/ftp.cc:360 methods/rsh.cc:209
msgid "A response overflowed the buffer."
msgstr "Gorlifodd ateb y byffer."
-#: methods/ftp.cc:373 methods/ftp.cc:385
+#: methods/ftp.cc:377 methods/ftp.cc:389
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388
-#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400
-#: apt-pkg/contrib/fileutl.cc:1425
+#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:875
+#: apt-pkg/contrib/fileutl.cc:1590 apt-pkg/contrib/fileutl.cc:1599
+#: apt-pkg/contrib/fileutl.cc:1604 apt-pkg/contrib/fileutl.cc:1606
+#: apt-pkg/contrib/fileutl.cc:1631
msgid "Write error"
msgstr "Gwall ysgrifennu"
-#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738
+#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
msgid "Could not create a socket"
msgstr "Methwyd creu soced"
-#: methods/ftp.cc:708
+#: methods/ftp.cc:712
msgid "Could not connect data socket, connection timed out"
msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
-#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
msgid "Failed"
msgstr "Methwyd"
-#: methods/ftp.cc:714
+#: methods/ftp.cc:718
#, fuzzy
msgid "Could not connect passive socket."
msgstr "Methwyd cysylltu soced goddefol"
# FIXME
-#: methods/ftp.cc:731
+#: methods/ftp.cc:735
msgid "getaddrinfo was unable to get a listening socket"
msgstr "Methodd getaddrinfo gael soced gwrando"
-#: methods/ftp.cc:745
+#: methods/ftp.cc:749
msgid "Could not bind a socket"
msgstr "Methwyd rhwymo soced"
-#: methods/ftp.cc:749
+#: methods/ftp.cc:753
msgid "Could not listen on the socket"
msgstr "Methwyd gwrando ar y soced"
-#: methods/ftp.cc:756
+#: methods/ftp.cc:760
msgid "Could not determine the socket's name"
msgstr "Methwyd canfod enw'r soced"
-#: methods/ftp.cc:788
+#: methods/ftp.cc:792
msgid "Unable to send PORT command"
msgstr "Methwyd danfod gorchymyn PORT"
-#: methods/ftp.cc:798
+#: methods/ftp.cc:802
#, c-format
msgid "Unknown address family %u (AF_*)"
msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
-#: methods/ftp.cc:807
+#: methods/ftp.cc:811
#, c-format
msgid "EPRT failed, server said: %s"
msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
-#: methods/ftp.cc:827
+#: methods/ftp.cc:831
msgid "Data socket connect timed out"
msgstr "Goramserodd cysylltiad y soced data"
-#: methods/ftp.cc:834
+#: methods/ftp.cc:838
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
+#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
-#: methods/ftp.cc:886
+#: methods/ftp.cc:890
#, c-format
msgid "Unable to fetch file, server said '%s'"
msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
-#: methods/ftp.cc:901 methods/rsh.cc:332
+#: methods/ftp.cc:905 methods/rsh.cc:335
msgid "Data socket timed out"
msgstr "Goramserodd soced data"
-#: methods/ftp.cc:931
+#: methods/ftp.cc:935
#, c-format
msgid "Data transfer failed, server said '%s'"
msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
#. Get the files information
-#: methods/ftp.cc:1008
+#: methods/ftp.cc:1014
msgid "Query"
msgstr "Ymholiad"
# FIXME
-#: methods/ftp.cc:1120
+#: methods/ftp.cc:1128
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:435
+#: methods/connect.cc:154 methods/rsh.cc:439
#, c-format
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
msgid "Unable to connect to %s:%s:"
msgstr "Methwyd cysylltu i %s %s:"
-#: methods/gpgv.cc:167
+#: methods/gpgv.cc:168
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: methods/gpgv.cc:171
+#: methods/gpgv.cc:172
msgid "At least one invalid signature was encountered."
msgstr ""
-#: methods/gpgv.cc:173
+#: methods/gpgv.cc:174
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:180
#, c-format
msgid ""
"Clearsigned file isn't valid, got '%s' (does the network require "
"authentication?)"
msgstr ""
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:184
msgid "Unknown error executing gpgv"
msgstr ""
-#: methods/gpgv.cc:216 methods/gpgv.cc:223
+#: methods/gpgv.cc:217 methods/gpgv.cc:224
#, fuzzy
msgid "The following signatures were invalid:\n"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: methods/gpgv.cc:230
+#: methods/gpgv.cc:231
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-#: methods/gzip.cc:65
+#: methods/gzip.cc:69
msgid "Empty files can't be valid archives"
msgstr ""
-#: methods/http.cc:519
+#: methods/http.cc:508
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:533
+#: methods/http.cc:522
#, 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:535
+#: methods/http.cc:524
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:571
+#: methods/http.cc:560
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:631
+#: methods/http.cc:620
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:636
+#: methods/http.cc:625
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:659
+#: methods/http.cc:648
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/server.cc:56
+#: methods/server.cc:51
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/server.cc:114
+#: methods/server.cc:109
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/server.cc:139 methods/server.cc:146
+#: methods/server.cc:134 methods/server.cc:141
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/server.cc:176
+#: methods/server.cc:171
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/server.cc:199
+#: methods/server.cc:194
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/server.cc:201
+#: methods/server.cc:196
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/server.cc:225
+#: methods/server.cc:220
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/server.cc:490
+#: methods/server.cc:489
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/server.cc:507 methods/server.cc:564
+#: methods/server.cc:506 methods/server.cc:562
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/server.cc:656
+#: methods/server.cc:654
msgid "Internal error"
msgstr "Gwall mewnol"
-#: apt-private/private-list.cc:147
+#: apt-private/private-list.cc:132
msgid "Listing"
msgstr ""
-#: apt-private/private-install.cc:93
+#: apt-private/private-install.cc:81
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: apt-private/private-install.cc:102
+#: apt-private/private-install.cc:90
#, 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:121
+#: apt-private/private-install.cc:109
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: apt-private/private-install.cc:159
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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:166
+#: apt-private/private-install.cc:154
#, 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:171
+#: apt-private/private-install.cc:159
#, 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:178
+#: apt-private/private-install.cc:166
#, 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:183
+#: apt-private/private-install.cc:171
#, 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:211
+#: apt-private/private-install.cc:199
#, 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:221 apt-private/private-download.cc:55
+#: apt-private/private-install.cc:209 apt-private/private-download.cc:54
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:227 apt-private/private-install.cc:249
+#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
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:231
+#: apt-private/private-install.cc:219
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: apt-private/private-install.cc:233
+#: apt-private/private-install.cc:221
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
msgid "Abort."
msgstr "Erthylu."
-#: apt-private/private-install.cc:254
+#: apt-private/private-install.cc:242
msgid "Do you want to continue?"
msgstr "Ydych chi eisiau mynd ymlaen?"
-#: apt-private/private-install.cc:324
+#: apt-private/private-install.cc:312
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: apt-private/private-install.cc:331
+#: apt-private/private-install.cc:319
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: apt-private/private-install.cc:335
+#: apt-private/private-install.cc:323
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:340
+#: apt-private/private-install.cc:328
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: apt-private/private-install.cc:341
+#: apt-private/private-install.cc:329
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: apt-private/private-install.cc:377
+#: apt-private/private-install.cc:365
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
msgstr[0] ""
msgstr[1] ""
-#: apt-private/private-install.cc:381
+#: apt-private/private-install.cc:369
msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: apt-private/private-install.cc:402
+#: apt-private/private-install.cc:390
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: apt-private/private-install.cc:510
+#: apt-private/private-install.cc:498
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
#. "that package should be filed.") << std::endl;
#. }
#.
-#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
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:517
+#: apt-private/private-install.cc:505
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: apt-private/private-install.cc:524
+#: apt-private/private-install.cc:512
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-install.cc:528
+#: apt-private/private-install.cc:516
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
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:530
+#: apt-private/private-install.cc:518
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:624
+#: 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:626
+#: apt-private/private-install.cc:614
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: apt-private/private-install.cc:639
+#: apt-private/private-install.cc:627
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"
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: apt-private/private-install.cc:660
+#: apt-private/private-install.cc:648
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: apt-private/private-install.cc:713
+#: apt-private/private-install.cc:701
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: apt-private/private-install.cc:803
+#: apt-private/private-install.cc:791
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: apt-private/private-install.cc:804
+#: apt-private/private-install.cc:792
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: apt-private/private-download.cc:32
+#: apt-private/private-download.cc:31
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: apt-private/private-download.cc:36
+#: apt-private/private-download.cc:35
msgid "Authentication warning overridden.\n"
msgstr ""
-#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
#, fuzzy
msgid "Some packages could not be authenticated"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: apt-private/private-download.cc:46
+#: apt-private/private-download.cc:45
msgid "Install these packages without verification?"
msgstr ""
-#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: apt-private/private-output.cc:200
-msgid "installed,upgradable to: "
+#: apt-private/private-output.cc:81 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:206
+#: apt-private/private-output.cc:207
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:211
#, fuzzy
msgid "[installed,local]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:214
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:216
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:213
+#: apt-private/private-output.cc:218
#, fuzzy
msgid "[installed]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:219
-msgid "[upgradable from: "
+#: apt-private/private-output.cc:222
+#, c-format
+msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:225
+#: apt-private/private-output.cc:226
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:316
+#: apt-private/private-output.cc:326
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:416
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: apt-private/private-output.cc:408
+#: apt-private/private-output.cc:418
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:425
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: apt-private/private-output.cc:417
+#: apt-private/private-output.cc:427
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: apt-private/private-output.cc:420
+#: apt-private/private-output.cc:430
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: apt-private/private-output.cc:420
+#: apt-private/private-output.cc:430
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:425
+#: apt-private/private-output.cc:435
msgid " or"
msgstr " neu"
-#: apt-private/private-output.cc:454
+#: apt-private/private-output.cc:464
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-output.cc:480
+#: apt-private/private-output.cc:490
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: apt-private/private-output.cc:502
+#: apt-private/private-output.cc:512
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: apt-private/private-output.cc:523
+#: apt-private/private-output.cc:533
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: apt-private/private-output.cc:544
+#: apt-private/private-output.cc:554
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: apt-private/private-output.cc:564
+#: apt-private/private-output.cc:574
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: apt-private/private-output.cc:619
+#: apt-private/private-output.cc:629
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: apt-private/private-output.cc:627
+#: apt-private/private-output.cc:637
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\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:658
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:672
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: apt-private/private-output.cc:666
+#: apt-private/private-output.cc:676
#, 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:670
+#: apt-private/private-output.cc:680
#, c-format
msgid "%lu not fully installed or removed.\n"
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:692
+#: apt-private/private-output.cc:702
msgid "[Y/n]"
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:698
+#: apt-private/private-output.cc:708
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:709
+#: apt-private/private-output.cc:719
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:715
+#: apt-private/private-output.cc:725
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:747 apt-pkg/cachefilter.cc:35
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
-#: apt-private/private-cachefile.cc:87
+#: apt-private/private-cachefile.cc:93
msgid "Correcting dependencies..."
msgstr "Yn cywiro dibyniaethau..."
-#: apt-private/private-cachefile.cc:90
+#: apt-private/private-cachefile.cc:96
msgid " failed."
msgstr " wedi methu."
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:99
msgid "Unable to correct dependencies"
msgstr "Ni ellir cywiro dibyniaethau"
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:102
msgid "Unable to minimize the upgrade set"
msgstr "Ni ellir bychanu y set uwchraddio"
-#: apt-private/private-cachefile.cc:98
+#: apt-private/private-cachefile.cc:104
msgid " Done"
msgstr " Wedi Gorffen"
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:108
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:105
+#: apt-private/private-cachefile.cc:111
msgid "Unmet dependencies. Try using -f."
msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
+#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
msgid "Sorting"
msgstr ""
-#: apt-private/private-update.cc:45
+#: 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-upgrade.cc:18
+#: apt-private/private-upgrade.cc:25
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:30
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:32
msgid "Done"
msgstr "Wedi Gorffen"
-#: apt-private/private-search.cc:61
+#: apt-private/private-search.cc:51
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:105
+#: 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:19
+#: apt-private/private-main.cc:23
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:45
+#: apt-private/private-sources.cc:58
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Methwyd ailenwi %s at %s"
-#: apt-private/private-sources.cc:57
+#: apt-private/private-sources.cc:70
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
-#: apt-private/acqprogress.cc:60
+#: apt-private/acqprogress.cc:66
msgid "Hit "
msgstr "Presennol "
-#: apt-private/acqprogress.cc:84
+#: apt-private/acqprogress.cc:90
msgid "Get:"
msgstr "Cyrchu:"
-#: apt-private/acqprogress.cc:115
+#: apt-private/acqprogress.cc:121
msgid "Ign "
msgstr "Anwybyddu "
-#: apt-private/acqprogress.cc:119
+#: apt-private/acqprogress.cc:125
msgid "Err "
msgstr "Gwall "
-#: apt-private/acqprogress.cc:140
+#: 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:230
+#: apt-private/acqprogress.cc:236
#, c-format
msgid " [Working]"
msgstr " [Gweithio]"
-#: apt-private/acqprogress.cc:291
+#: apt-private/acqprogress.cc:297
#, fuzzy, c-format
msgid ""
"Media change: please insert the disc labeled\n"
#. Only warn if there are no sources.list.d.
#. Only warn if there is no sources.list file.
-#: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:254
-#: apt-pkg/sourcelist.cc:260 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
+#: methods/mirror.cc:95 apt-inst/extract.cc:471
+#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:371
+#: apt-pkg/contrib/fileutl.cc:484 apt-pkg/sourcelist.cc:280
+#: apt-pkg/sourcelist.cc:286 apt-pkg/acquire.cc:491 apt-pkg/init.cc:102
+#: apt-pkg/init.cc:110 apt-pkg/clean.cc:40 apt-pkg/policy.cc:381
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
-#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
-#: apt-pkg/clean.cc:123
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235 apt-pkg/acquire.cc:497
+#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
+#: apt-pkg/clean.cc:127
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
msgid "Failed to create IPC pipe to subprocess"
msgstr "Methwyd creu pibell cyfathrebu at isbroses"
-#: methods/rsh.cc:340
+#: methods/rsh.cc:343
msgid "Connection closed prematurely"
msgstr "Caewyd y cysylltiad yn gynnar"
msgid "Merging available information"
msgstr "Yn cyfuno manylion Ar Gael"
-#: cmdline/apt-extracttemplates.cc:100
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "Nid yw %s yn becyn DEB dilys."
-
# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:234
+#: cmdline/apt-extracttemplates.cc:224
#, fuzzy
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:254
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni ellir gwneud stat() o %s"
+
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
-#: cmdline/apt-extracttemplates.cc:308
+#: cmdline/apt-extracttemplates.cc:300
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
-#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
+#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
msgid "Package extension list is too long"
msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
-#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
-#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
+#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
+#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
+#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
#, fuzzy, c-format
msgid "Error processing directory %s"
msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-#: ftparchive/apt-ftparchive.cc:262
+#: ftparchive/apt-ftparchive.cc:271
msgid "Source extension list is too long"
msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-#: ftparchive/apt-ftparchive.cc:379
+#: ftparchive/apt-ftparchive.cc:388
msgid "Error writing header to contents file"
msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-#: ftparchive/apt-ftparchive.cc:409
+#: ftparchive/apt-ftparchive.cc:418
#, fuzzy, c-format
msgid "Error processing contents %s"
msgstr "Gwall wrth Brosesu Cynnwys %s"
# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:597
+#: ftparchive/apt-ftparchive.cc:606
#, fuzzy
msgid ""
"Usage: apt-ftparchive [options] command\n"
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol"
-#: ftparchive/apt-ftparchive.cc:803
+#: ftparchive/apt-ftparchive.cc:812
msgid "No selections matched"
msgstr "Dim dewisiadau'n cyfateb"
-#: ftparchive/apt-ftparchive.cc:881
+#: ftparchive/apt-ftparchive.cc:890
#, 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'"
-#: ftparchive/cachedb.cc:47
+#: ftparchive/cachedb.cc:51
#, 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:65
+#: ftparchive/cachedb.cc:69
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-#: ftparchive/cachedb.cc:76
+#: ftparchive/cachedb.cc:80
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:81
+#: ftparchive/cachedb.cc:85
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
-#: apt-inst/extract.cc:209
+#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
#, c-format
msgid "Failed to stat %s"
msgstr "Methodd stat() o %s"
-#: ftparchive/cachedb.cc:249
+#: ftparchive/cachedb.cc:253
msgid "Archive has no control record"
msgstr "Does dim cofnod rheoli gan yr archif"
-#: ftparchive/cachedb.cc:490
+#: ftparchive/cachedb.cc:494
msgid "Unable to get a cursor"
msgstr "Ni ellir cael cyrchydd"
-#: ftparchive/writer.cc:82
+#: 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:87
+#: 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:143
+#: ftparchive/writer.cc:152
msgid "E: "
msgstr "G: "
-#: ftparchive/writer.cc:145
+#: ftparchive/writer.cc:154
msgid "W: "
msgstr "Rh: "
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:161
msgid "E: Errors apply to file "
msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
#, c-format
msgid "Failed to resolve %s"
msgstr "Methwyd datrys %s"
-#: ftparchive/writer.cc:183
+#: ftparchive/writer.cc:192
msgid "Tree walking failed"
msgstr "Methwyd cerdded y goeden"
-#: ftparchive/writer.cc:210
+#: ftparchive/writer.cc:219
#, c-format
msgid "Failed to open %s"
msgstr "Methwyd agor %s"
# FIXME
-#: ftparchive/writer.cc:269
+#: ftparchive/writer.cc:278
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DatGysylltu %s [%s]\n"
-#: ftparchive/writer.cc:277
+#: ftparchive/writer.cc:286
#, c-format
msgid "Failed to readlink %s"
msgstr "Methwyd darllen y cyswllt %s"
-#: ftparchive/writer.cc:281
+#: ftparchive/writer.cc:290
#, c-format
msgid "Failed to unlink %s"
msgstr "Methwyd datgysylltu %s"
-#: ftparchive/writer.cc:289
+#: ftparchive/writer.cc:298
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Methwyd cysylltu %s at %s"
-#: ftparchive/writer.cc:299
+#: ftparchive/writer.cc:308
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: ftparchive/writer.cc:404
+#: ftparchive/writer.cc:413
msgid "Archive had no package field"
msgstr "Doedd dim maes pecyn gan yr archif"
-#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
+#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
#, c-format
msgid " %s has no override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
+#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " Cynaliwr %s yw %s nid %s\n"
-#: ftparchive/writer.cc:712
+#: ftparchive/writer.cc:721
#, fuzzy, c-format
msgid " %s has no source override entry\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/writer.cc:716
+#: ftparchive/writer.cc:725
#, fuzzy, c-format
msgid " %s has no binary override entry either\n"
msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Methwyd neilltuo cof"
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
#, c-format
msgid "Unable to open %s"
msgstr "Ni ellir agor %s"
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+
+#: ftparchive/override.cc:166
#, fuzzy, c-format
msgid "Malformed override %s line %llu #1"
msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: ftparchive/override.cc:178
#, fuzzy, c-format
msgid "Malformed override %s line %llu #2"
msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: ftparchive/override.cc:191
#, fuzzy, c-format
msgid "Malformed override %s line %llu #3"
msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
-
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:73
#, fuzzy, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Dull Cywasgu Anhysbys '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:103
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:192
msgid "Failed to create FILE*"
msgstr "Methwyd creu FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:195
msgid "Failed to fork"
msgstr "Methodd fork()"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:209
#, fuzzy
msgid "Compress child"
msgstr "Plentyn Cywasgu"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:232
#, fuzzy, c-format
msgid "Internal error, failed to create %s"
msgstr "Gwall Mewnol, Methwyd creu %s"
-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:305
msgid "IO to subprocess/file failed"
msgstr "Methodd MA i isbroses/ffeil"
-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:343
msgid "Failed to read while computing MD5"
msgstr "Methwyd darllen wrth gyfrifo MD5"
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:359
#, c-format
msgid "Problem unlinking %s"
msgstr "Gwall wrth datgysylltu %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
# FIXME: "debian"
-#: cmdline/apt-internal-solver.cc:38
+#: cmdline/apt-internal-solver.cc:46
#, fuzzy
msgid ""
"Usage: apt-internal-solver\n"
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:124
msgid "Failed to create pipes"
msgstr "Methwyd creu pibau"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:151
msgid "Failed to exec gzip "
msgstr "Methwyd gweithredu gzip"
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210
+#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
msgid "Corrupted archive"
msgstr "Archif llygredig"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:203
#, fuzzy
msgid "Tar checksum failed, archive corrupted"
msgstr "Methodd swm gwirio Tar, archif llygredig"
-#: apt-inst/contrib/extracttar.cc:300
+#: apt-inst/contrib/extracttar.cc:308
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Math pennawd TAR anhysbys %u, aelod %s"
-#: apt-inst/contrib/arfile.cc:74
+#: apt-inst/contrib/arfile.cc:76
msgid "Invalid archive signature"
msgstr "Llofnod archif annilys"
-#: apt-inst/contrib/arfile.cc:82
+#: apt-inst/contrib/arfile.cc:84
msgid "Error reading archive member header"
msgstr "Gwall wrth ddarllen pennawd aelod archif"
-#: apt-inst/contrib/arfile.cc:94
+#: apt-inst/contrib/arfile.cc:96
#, fuzzy, c-format
msgid "Invalid archive member header %s"
msgstr "Pennawd aelod archif annilys"
-#: apt-inst/contrib/arfile.cc:106
+#: apt-inst/contrib/arfile.cc:108
msgid "Invalid archive member header"
msgstr "Pennawd aelod archif annilys"
-#: apt-inst/contrib/arfile.cc:135
+#: apt-inst/contrib/arfile.cc:137
msgid "Archive is too short"
msgstr "Mae'r archif yn rhy fyr"
-#: apt-inst/contrib/arfile.cc:139
+#: apt-inst/contrib/arfile.cc:141
msgid "Failed to read the archive headers"
msgstr "Methwyd darllen pennawdau'r archif"
-#: apt-inst/filelist.cc:382
+#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
-#: apt-inst/filelist.cc:414
+#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
msgstr "Methyd lleoli yr elfen <hash>!"
-#: apt-inst/filelist.cc:461
+#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
msgstr "Methwyd neilltuo dargyfeiriad"
-#: apt-inst/filelist.cc:466
+#: apt-inst/filelist.cc:464
#, fuzzy
msgid "Internal error in AddDiversion"
msgstr "Gwall Mewnol yn AddDiversion"
-#: apt-inst/filelist.cc:479
+#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
# FIXME: "the"
-#: apt-inst/filelist.cc:508
+#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
-#: apt-inst/filelist.cc:551
+#: apt-inst/filelist.cc:549
#, c-format
msgid "Duplicate conf file %s/%s"
msgstr "Ffeil cyfluniad dyblyg %s/%s"
-#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
#, fuzzy, c-format
msgid "Failed to write file %s"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:105
#, c-format
msgid "Failed to close file %s"
msgstr "Methwyd cau ffeil %s"
-#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
#, c-format
msgid "The path %s is too long"
msgstr "Mae'r llwybr %s yn rhy hir"
-#: apt-inst/extract.cc:125
+#: apt-inst/extract.cc:132
#, c-format
msgid "Unpacking %s more than once"
msgstr "Yn dadbacio %s mwy nag unwaith"
-#: apt-inst/extract.cc:135
+#: apt-inst/extract.cc:142
#, c-format
msgid "The directory %s is diverted"
msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-#: apt-inst/extract.cc:145
+#: apt-inst/extract.cc:152
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
-#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
msgid "The diversion path is too long"
msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
-#: apt-inst/extract.cc:242
+#: apt-inst/extract.cc:249
#, c-format
msgid "The directory %s is being replaced by a non-directory"
msgstr ""
"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
-#: apt-inst/extract.cc:282
+#: apt-inst/extract.cc:289
msgid "Failed to locate node in its hash bucket"
msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
-#: apt-inst/extract.cc:286
+#: apt-inst/extract.cc:293
msgid "The path is too long"
msgstr "Mae'r llwybr yn rhy hir"
# FIXME: wtf?
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:421
#, c-format
msgid "Overwrite package match with no version for %s"
msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:438
#, c-format
msgid "File %s/%s overwrites the one in the package %s"
msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:498
#, c-format
msgid "Unable to stat %s"
msgstr "Ni ellir gwneud stat() o %s"
-#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
-#: apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-#: apt-inst/deb/debfile.cc:119
+#: apt-inst/deb/debfile.cc:132
#, fuzzy, c-format
msgid "Internal error, could not locate member %s"
msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
-#: apt-inst/deb/debfile.cc:213
+#: apt-inst/deb/debfile.cc:227
#, fuzzy
msgid "Unparsable control file"
msgstr "Ffeil rheoli ni ellir ei ramadegu"
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:440
+#: apt-pkg/contrib/mmap.cc:446
#, c-format
msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
-#: apt-pkg/contrib/mmap.cc:443
+#: apt-pkg/contrib/mmap.cc:449
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:401
+#: apt-pkg/contrib/strutl.cc:406
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:408
+#: apt-pkg/contrib/strutl.cc:413
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:415
+#: apt-pkg/contrib/strutl.cc:420
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1229
+#: apt-pkg/contrib/strutl.cc:1236
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
-#: apt-pkg/contrib/configuration.cc:503
+#: apt-pkg/contrib/configuration.cc:519
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:617
+#: 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:785
+#: 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:804
+#: 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:821
+#: 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:861
+#: 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:868
+#: 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:872 apt-pkg/contrib/configuration.cc:877
+#: 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:881
+#: 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:884
+#: 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:934
+#: 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"
-#: apt-pkg/contrib/progress.cc:146
+#: apt-pkg/contrib/progress.cc:148
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Gwall!"
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/contrib/progress.cc:150
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Wedi Gorffen"
-#: apt-pkg/contrib/progress.cc:179
+#: apt-pkg/contrib/progress.cc:181
msgid "..."
msgstr ""
#. Print the spinner
-#: apt-pkg/contrib/progress.cc:195
+#: apt-pkg/contrib/progress.cc:197
#, fuzzy, c-format
msgid "%c%s... %u%%"
msgstr "%c%s... Wedi Gorffen"
# FIXME
-#: apt-pkg/contrib/cmndline.cc:116
+#: apt-pkg/contrib/cmndline.cc:121
#, 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:141 apt-pkg/contrib/cmndline.cc:150
-#: apt-pkg/contrib/cmndline.cc:158
+#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
+#: apt-pkg/contrib/cmndline.cc:163
#, c-format
msgid "Command line option %s is not understood"
msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
-#: apt-pkg/contrib/cmndline.cc:163
+#: apt-pkg/contrib/cmndline.cc:168
#, 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:204 apt-pkg/contrib/cmndline.cc:225
+#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
#, c-format
msgid "Option %s requires an argument."
msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
-#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
+#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
#, 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:273
+#: apt-pkg/contrib/cmndline.cc:278
#, 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:304
+#: apt-pkg/contrib/cmndline.cc:309
#, c-format
msgid "Option '%s' is too long"
msgstr "Opsiwn '%s' yn rhy hir"
# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:336
+#: apt-pkg/contrib/cmndline.cc:341
#, 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:386
+#: apt-pkg/contrib/cmndline.cc:391
#, c-format
msgid "Invalid operation %s"
msgstr "Gweithred annilys %s"
-#: apt-pkg/contrib/cdromutl.cc:56
+#: apt-pkg/contrib/cdromutl.cc:65
#, c-format
msgid "Unable to stat the mount point %s"
msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-#: apt-pkg/contrib/cdromutl.cc:225
+#: apt-pkg/contrib/cdromutl.cc:246
msgid "Failed to stat the cdrom"
msgstr "Methwyd gwneud stat() o'r CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:95
-#, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Gwall wrth gau'r ffeil"
-
-#: apt-pkg/contrib/fileutl.cc:228
+#: apt-pkg/contrib/fileutl.cc:193
#, 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:233
+#: apt-pkg/contrib/fileutl.cc:198
#, c-format
msgid "Could not open lock file %s"
msgstr "Methwyd agor y ffeil clo %s"
-#: apt-pkg/contrib/fileutl.cc:256
+#: apt-pkg/contrib/fileutl.cc:221
#, 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:261
+#: apt-pkg/contrib/fileutl.cc:226
#, c-format
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
+#: apt-pkg/contrib/fileutl.cc:363 apt-pkg/contrib/fileutl.cc:477
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:432
+#: apt-pkg/contrib/fileutl.cc:397
#, c-format
msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:450
+#: apt-pkg/contrib/fileutl.cc:415
#, c-format
msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:424
#, c-format
msgid ""
"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:862
+#: apt-pkg/contrib/fileutl.cc:827
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:864
+#: apt-pkg/contrib/fileutl.cc:829
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
+#: apt-pkg/contrib/fileutl.cc:833 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:870 apt-pkg/contrib/gpgv.cc:230
+#: apt-pkg/contrib/fileutl.cc:835 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:1016
+#: apt-pkg/contrib/fileutl.cc:916
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gwall wrth gau'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1097
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/contrib/fileutl.cc:1093
+#: apt-pkg/contrib/fileutl.cc:1156 apt-pkg/contrib/fileutl.cc:1203
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Methwyd agor pibell ar gyfer %s"
-#: apt-pkg/contrib/fileutl.cc:1178
+#: apt-pkg/contrib/fileutl.cc:1310
msgid "Failed to create subprocess IPC"
msgstr "Methwyd creu isbroses IPC"
-#: apt-pkg/contrib/fileutl.cc:1233
+#: apt-pkg/contrib/fileutl.cc:1365
msgid "Failed to exec compressor "
msgstr "Methwyd gweithredu cywasgydd "
# FIXME
-#: apt-pkg/contrib/fileutl.cc:1326
+#: apt-pkg/contrib/fileutl.cc:1506
#, 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:1413 apt-pkg/contrib/fileutl.cc:1435
+#: apt-pkg/contrib/fileutl.cc:1619 apt-pkg/contrib/fileutl.cc:1641
#, 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:1726
+#: apt-pkg/contrib/fileutl.cc:1911
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1923
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1934
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1947
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
+#: apt-pkg/contrib/fileutl.cc:2043 apt-pkg/acquire-item.cc:148
+#, c-format
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."
+
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:70
+#: apt-pkg/contrib/gpgv.cc:72
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Yn Erthylu'r Sefydliad."
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:155
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
-#: apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:161
msgid "The package cache file is corrupted"
msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-#: apt-pkg/pkgcache.cc:159
+#: 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:162
+#: 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:167
+#: 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:172
+#: 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:314
+#: apt-pkg/pkgcache.cc:321
msgid "Depends"
msgstr "Dibynnu"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
msgid "PreDepends"
msgstr "CynDdibynnu"
-#: apt-pkg/pkgcache.cc:314
+#: apt-pkg/pkgcache.cc:321
msgid "Suggests"
msgstr "Awgrymu"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
msgid "Recommends"
msgstr "Argymell"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
msgid "Conflicts"
msgstr "Gwrthdaro"
-#: apt-pkg/pkgcache.cc:315
+#: apt-pkg/pkgcache.cc:322
msgid "Replaces"
msgstr "Amnewid"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
msgid "Obsoletes"
msgstr "Darfodi"
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:316
+#: apt-pkg/pkgcache.cc:323
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
msgid "important"
msgstr "pwysig"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
msgid "required"
msgstr "angenrheidiol"
-#: apt-pkg/pkgcache.cc:327
+#: apt-pkg/pkgcache.cc:334
msgid "standard"
msgstr "safonnol"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
msgid "optional"
msgstr "opsiynnol"
-#: apt-pkg/pkgcache.cc:328
+#: apt-pkg/pkgcache.cc:335
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
#, fuzzy
msgid "Building dependency tree"
msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/depcache.cc:133
+#: apt-pkg/depcache.cc:139
#, fuzzy
msgid "Candidate versions"
msgstr "Fersiynau Posib"
-#: apt-pkg/depcache.cc:162
+#: apt-pkg/depcache.cc:168
#, fuzzy
msgid "Dependency generation"
msgstr "Cynhyrchaid Dibyniaeth"
-#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
+#: 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/depcache.cc:244
+#: apt-pkg/depcache.cc:250
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Methwyd agor %s"
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:256
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Methwyd ysgrifennu ffeil %s"
# FIXME: number?
-#: apt-pkg/tagfile.cc:138
+#: 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:231
+#: 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/sourcelist.cc:84
+#: 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:144
+#: 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/sourcelist.cc:147
+#: 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:158
+#: 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:164
+#: 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:167
+#: 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:180
+#: 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:182
+#: 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:185
+#: 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:191
+#: apt-pkg/sourcelist.cc:217
#, 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:198
+#: 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)"
-#: apt-pkg/sourcelist.cc:309
+#: apt-pkg/sourcelist.cc:335
#, c-format
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:321 apt-pkg/cdrom.cc:495
+#: 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:345
+#: 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:349
+#: 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:386
+#: 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/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
+#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
#, 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:497 apt-pkg/packagemanager.cc:528
+#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
#, fuzzy, c-format
msgid "Could not configure '%s'. "
msgstr "Methwyd agor ffeil %s"
# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:570
+#: apt-pkg/packagemanager.cc:577
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:38
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/algorithms.cc:266
+#: apt-pkg/algorithms.cc:265
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1068
+#: apt-pkg/algorithms.cc:1083
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1070
+#: apt-pkg/algorithms.cc:1085
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/acquire.cc:85
+#: 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:93
+#: 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:893
+#: apt-pkg/acquire.cc:899
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:895
+#: apt-pkg/acquire.cc:901
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
-#: apt-pkg/acquire-worker.cc:112
+#: apt-pkg/acquire-worker.cc:116
#, c-format
msgid "The method driver %s could not be found."
msgstr "Methwyd canfod y gyrrydd dull %s."
-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:118
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:169
#, c-format
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/acquire-worker.cc:447
+#: apt-pkg/acquire-worker.cc:455
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/init.cc:143
+#: apt-pkg/init.cc:145
#, c-format
msgid "Packaging system '%s' is not supported"
msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-pkg/init.cc:159
+#: apt-pkg/init.cc:161
#, fuzzy
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:61
#, c-format
msgid "Unable to stat %s."
msgstr "Ni ellir gwneud stat() o %s."
# FIXME: ...file
-#: apt-pkg/srcrecords.cc:47
+#: apt-pkg/srcrecords.cc:52
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/cachefile.cc:87
+#: 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."
-#: apt-pkg/cachefile.cc:91
+#: apt-pkg/cachefile.cc:98
msgid "You may want to run apt-get update to correct these problems"
msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
-#: apt-pkg/cachefile.cc:109
+#: apt-pkg/cachefile.cc:116
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: apt-pkg/policy.cc:75
+#: apt-pkg/policy.cc:83
#, c-format
msgid ""
"The value '%s' is invalid for APT::Default-Release as such a release is not "
msgstr ""
# FIXME: literal
-#: apt-pkg/policy.cc:414
+#: apt-pkg/policy.cc:422
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
# FIXME: tense
-#: apt-pkg/policy.cc:436
+#: apt-pkg/policy.cc:444
#, c-format
msgid "Did not understand pin type %s"
msgstr "Methwyd daeall y math pin %s"
-#: apt-pkg/policy.cc:444
+#: apt-pkg/policy.cc:452
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-#: apt-pkg/pkgcachegen.cc:87
+#: 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:218 apt-pkg/pkgcachegen.cc:228
-#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
-#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
-#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
-#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
-#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
-#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
-#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
-#: apt-pkg/pkgcachegen.cc:563
+#: 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:251
+#: 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:254
+#: 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:257
+#: 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:260
+#: 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:570
+#: 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:1199
+#: 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:1287 apt-pkg/pkgcachegen.cc:1391
-#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#: 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:1304
+#: apt-pkg/pkgcachegen.cc:1316
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
+#: 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"
-#: apt-pkg/acquire-item.cc:139
-#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
-
-#: apt-pkg/acquire-item.cc:154
+#: apt-pkg/acquire-item.cc:163
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:159
+#: apt-pkg/acquire-item.cc:168
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
-#: apt-pkg/acquire-item.cc:164
+#: apt-pkg/acquire-item.cc:173
#, fuzzy
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:1561
+#: apt-pkg/acquire-item.cc:1579
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1577
+#: apt-pkg/acquire-item.cc:1595
#, 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:1619
+#: apt-pkg/acquire-item.cc:1637
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1657
+#: apt-pkg/acquire-item.cc:1675
#, 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:1679
+#: apt-pkg/acquire-item.cc:1697
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1709
+#: apt-pkg/acquire-item.cc:1727
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724
+#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1847
+#: apt-pkg/acquire-item.cc:1865
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1913
+#: apt-pkg/acquire-item.cc:1931
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1989
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
# FIXME: number?
-#: apt-pkg/indexrecords.cc:73
+#: 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:81
+#: 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:112
+#: apt-pkg/indexrecords.cc:117
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:125
+#: 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:144
+#: apt-pkg/indexrecords.cc:149
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/vendorlist.cc:78
+#: apt-pkg/vendorlist.cc:85
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr ""
-
-#: apt-pkg/cdrom.cc:613
+#: apt-pkg/cdrom.cc:577
#, c-format
-msgid "Stored label: %s\n"
+msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
+#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893
#, fuzzy
msgid "Unmounting CD-ROM...\n"
msgstr "CD Anghywir"
-#: apt-pkg/cdrom.cc:642
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:660
-msgid "Unmounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:592
#, fuzzy
msgid "Waiting for disc...\n"
msgstr "Yn aros am benawdau"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:602
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:693
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/cdrom.cc:610
+msgid "Identifying... "
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:648
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:672
+msgid "Scanning disc for index files...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:722
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:733
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:760
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:789
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:806
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:808
#, fuzzy
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:843
#, fuzzy
msgid "Writing new source list\n"
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:851
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: 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 ""
msgid "Hash mismatch for: %s"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:487
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: apt-pkg/cacheset.cc:470
+#: apt-pkg/cacheset.cc:490
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: apt-pkg/cacheset.cc:581
+#: apt-pkg/cacheset.cc:601
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:587
+#: apt-pkg/cacheset.cc:607
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:598
+#: apt-pkg/cacheset.cc:613
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc:624
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
+#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:619
+#: apt-pkg/cacheset.cc:645
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:627
+#: apt-pkg/cacheset.cc:653
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:635
+#: apt-pkg/cacheset.cc:661
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
msgid "Send scenario to solver"
msgstr ""
-#: apt-pkg/edsp.cc:209
+#: apt-pkg/edsp.cc:216
msgid "Send request to solver"
msgstr ""
-#: apt-pkg/edsp.cc:279
+#: apt-pkg/edsp.cc:286
msgid "Prepare for receiving solution"
msgstr ""
-#: apt-pkg/edsp.cc:286
+#: apt-pkg/edsp.cc:293
msgid "External solver failed without a proper error message"
msgstr ""
-#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:51
+#: apt-pkg/install-progress.cc:57
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
+#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#: 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 "
"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
"rai eu defnyddio yn lle."
-#: apt-pkg/deb/dpkgpm.cc:91
+#: apt-pkg/deb/dpkgpm.cc:95
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978
+#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985
+#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:98
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:99
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:96
+#: apt-pkg/deb/dpkgpm.cc:100
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:809
+#: apt-pkg/deb/dpkgpm.cc:827
#, fuzzy, c-format
msgid "Directory '%s' missing"
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846
+#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/deb/dpkgpm.cc:971
+#: apt-pkg/deb/dpkgpm.cc:989
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:972
+#: apt-pkg/deb/dpkgpm.cc:990
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:977
+#: apt-pkg/deb/dpkgpm.cc:995
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:979
+#: apt-pkg/deb/dpkgpm.cc:997
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:1002
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:986
+#: apt-pkg/deb/dpkgpm.cc:1004
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:991
+#: apt-pkg/deb/dpkgpm.cc:1009
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:992
+#: apt-pkg/deb/dpkgpm.cc:1010
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1045 apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1065
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
#, fuzzy, c-format
msgid "Can not write log (%s)"
msgstr "Ni ellir ysgrifennu i %s"
-#: apt-pkg/deb/dpkgpm.cc:1045
+#: apt-pkg/deb/dpkgpm.cc:1068
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1066
+#: apt-pkg/deb/dpkgpm.cc:1089
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1549
+#: apt-pkg/deb/dpkgpm.cc:1567
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1611
+#: apt-pkg/deb/dpkgpm.cc:1629
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1616
+#: apt-pkg/deb/dpkgpm.cc:1634
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1618
+#: apt-pkg/deb/dpkgpm.cc:1636
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1624
+#: apt-pkg/deb/dpkgpm.cc:1642
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1631
+#: apt-pkg/deb/dpkgpm.cc:1649
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1638 apt-pkg/deb/dpkgpm.cc:1644
+#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
msgid ""
"No apport report written because the error message indicates an issue on the "
"local system"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1665
+#: apt-pkg/deb/dpkgpm.cc:1683
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:84
+#: 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:87
+#: 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:103
+#: 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:121
+#: apt-pkg/deb/debsystem.cc:128
msgid "Not locked"
msgstr ""
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "Nid yw %s yn becyn DEB dilys."
+
#, fuzzy
#~ msgid "Note, selecting '%s' for task '%s'\n"
#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
projects / apt.git / blobdiff