diff options
| author | Michael Vogt <mvo@debian.org> | 2015-08-21 11:42:50 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-08-24 06:41:03 -0400 |
| commit | 864fe99c3628585ba2081650e441ab15e4ee7bae (patch) | |
| tree | e470b68e9ec52fbeb79794d9096f7ad84d12de44 /po/cy.po | |
| parent | c8ec5ab764e90565b58ba5f55f4d9d6939b44c69 (diff) | |
releasing package apt version 1.1~exp101.1.exp10
Diffstat (limited to 'po/cy.po')
| -rw-r--r-- | po/cy.po | 2878 |
1 files changed, 1491 insertions, 1387 deletions
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 1.0.5\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2015-03-09 02:17+0100\n" +"POT-Creation-Date: 2015-08-21 06:13-0400\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -20,164 +20,166 @@ msgstr "" msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:319 +#, fuzzy +msgid "apt-cache stats does not take any arguments" +msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" + +#: cmdline/apt-cache.cc:325 #, fuzzy msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:322 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total package structures: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:362 +#: cmdline/apt-cache.cc:367 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:363 +#: cmdline/apt-cache.cc:368 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:364 +#: cmdline/apt-cache.cc:369 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:365 +#: cmdline/apt-cache.cc:370 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:371 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:368 +#: cmdline/apt-cache.cc:373 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:370 +#: cmdline/apt-cache.cc:375 #, fuzzy msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:372 +#: cmdline/apt-cache.cc:377 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:375 +#: cmdline/apt-cache.cc:380 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:377 +#: cmdline/apt-cache.cc:382 #, fuzzy msgid "Total Desc/File relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:379 +#: cmdline/apt-cache.cc:384 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:433 +#: cmdline/apt-cache.cc:440 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:439 +#: cmdline/apt-cache.cc:446 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:454 +#: cmdline/apt-cache.cc:463 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239 +#: cmdline/apt-cache.cc:605 cmdline/apt-cache.cc:1256 #: 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:668 cmdline/apt-cache.cc:1526 -#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56 -#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229 -#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 +#: cmdline/apt-cache.cc:680 cmdline/apt-cache.cc:1541 cmdline/apt-cache.cc:1543 +#: cmdline/apt-cache.cc:1624 cmdline/apt-mark.cc:56 cmdline/apt-mark.cc:103 +#: cmdline/apt-mark.cc:229 apt-private/private-show.cc:173 +#: apt-private/private-show.cc:175 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41 +#: cmdline/apt-cache.cc:1356 apt-private/private-search.cc:41 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1505 +#: cmdline/apt-cache.cc:1520 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653 +#: cmdline/apt-cache.cc:1619 apt-pkg/cacheset.cc:762 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1630 +#: cmdline/apt-cache.cc:1649 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728 +#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1766 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:1651 +#: cmdline/apt-cache.cc:1672 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708 +#: cmdline/apt-cache.cc:1686 cmdline/apt-cache.cc:1743 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1671 +#. Print the package name and the version we are forcing to +#: cmdline/apt-cache.cc:1700 +#, c-format +msgid "%s -> %s with priority %d\n" +msgstr "" + +#: cmdline/apt-cache.cc:1706 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1672 +#: cmdline/apt-cache.cc:1707 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698 +#: cmdline/apt-cache.cc:1725 cmdline/apt-cache.cc:1733 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1705 +#: cmdline/apt-cache.cc:1740 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1714 +#: cmdline/apt-cache.cc:1749 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446 -#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222 -#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47 -#: cmdline/apt-sortpkgs.cc:149 -#, fuzzy, c-format -msgid "%s %s for %s compiled on %s %s\n" -msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" - -#: cmdline/apt-cache.cc:1834 +#: cmdline/apt-cache.cc:1871 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -256,7 +258,7 @@ msgstr "" #: cmdline/apt-cdrom.cc:92 #, fuzzy -msgid "Please insert a Disc in the drive and press enter" +msgid "Please insert a Disc in the drive and press [Enter]" msgstr "" "Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" " '%s'\n" @@ -283,7 +285,7 @@ msgstr "" msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" -#: cmdline/apt-config.cc:89 +#: cmdline/apt-config.cc:88 #, fuzzy msgid "" "Usage: apt-config [options] command\n" @@ -312,79 +314,79 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:224 +#: cmdline/apt-get.cc:211 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:311 +#: cmdline/apt-get.cc:287 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:314 +#: cmdline/apt-get.cc:290 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:358 +#: cmdline/apt-get.cc:327 #, 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:414 +#: cmdline/apt-get.cc:386 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:445 +#: cmdline/apt-get.cc:417 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78 -#: apt-private/private-install.cc:863 +#: cmdline/apt-get.cc:422 cmdline/apt-mark.cc:78 +#: apt-private/private-install.cc:839 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80 +#: cmdline/apt-get.cc:424 cmdline/apt-mark.cc:80 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124 +#: cmdline/apt-get.cc:432 cmdline/apt-mark.cc:124 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537 +#: cmdline/apt-get.cc:501 cmdline/apt-get.cc:509 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:598 +#: cmdline/apt-get.cc:570 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:716 +#: cmdline/apt-get.cc:688 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:760 cmdline/apt-get.cc:1074 +#: cmdline/apt-get.cc:725 cmdline/apt-get.cc:1035 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:780 +#: cmdline/apt-get.cc:745 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:785 +#: cmdline/apt-get.cc:750 #, c-format msgid "" "Please use:\n" @@ -392,95 +394,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:833 +#: cmdline/apt-get.cc:798 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:828 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:868 +#: cmdline/apt-get.cc:833 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:839 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:899 +#: cmdline/apt-get.cc:864 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289 +#: cmdline/apt-get.cc:869 apt-private/private-install.cc:300 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:929 +#: cmdline/apt-get.cc:894 #, 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:942 +#: cmdline/apt-get.cc:907 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:943 +#: cmdline/apt-get.cc:908 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:971 +#: cmdline/apt-get.cc:936 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:990 +#: cmdline/apt-get.cc:955 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1009 +#: cmdline/apt-get.cc:976 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:1030 +#: cmdline/apt-get.cc:994 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1047 +#: cmdline/apt-get.cc:1012 #, c-format msgid "Note, using directory '%s' to get the build dependencies\n" msgstr "" -#: cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:1022 #, fuzzy, c-format msgid "Note, using file '%s' to get the build dependencies\n" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1047 cmdline/apt-get.cc:1050 #, 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:1109 +#: cmdline/apt-get.cc:1070 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1279 +#: cmdline/apt-get.cc:1240 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -489,7 +491,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1297 +#: cmdline/apt-get.cc:1258 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -498,14 +500,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1320 +#: cmdline/apt-get.cc:1281 #, 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:1359 +#: cmdline/apt-get.cc:1320 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -514,7 +516,7 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:1365 +#: cmdline/apt-get.cc:1326 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -523,32 +525,27 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1388 +#: cmdline/apt-get.cc:1349 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1403 +#: cmdline/apt-get.cc:1364 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1369 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516 -#, fuzzy, c-format -msgid "Changelog for %s (%s)" -msgstr "Yn cysylltu i %s (%s)" - -#: cmdline/apt-get.cc:1615 +#: cmdline/apt-get.cc:1554 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1656 +#: cmdline/apt-get.cc:1595 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -635,20 +632,30 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-helper.cc:36 +#: cmdline/apt-helper.cc:37 msgid "Need one URL as argument" msgstr "" -#: cmdline/apt-helper.cc:49 +#: cmdline/apt-helper.cc:50 #, 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:75 cmdline/apt-helper.cc:79 +#: cmdline/apt-helper.cc:76 cmdline/apt-helper.cc:80 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:93 +#: cmdline/apt-helper.cc:88 +#, fuzzy +msgid "Must specifc at least one srv record" +msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" + +#: cmdline/apt-helper.cc:95 +#, c-format +msgid "GetSrvRec failed for %s" +msgstr "" + +#: cmdline/apt-helper.cc:118 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -657,6 +664,7 @@ msgid "" "\n" "Commands:\n" " download-file - download the given uri to the target-path\n" +" srv-lookup - lookup a SRV record (e.g. _http._tcp.ftp.debian.org)\n" " auto-detect-proxy - detect proxy using apt.conf\n" "\n" " This APT helper has Super Meep Powers.\n" @@ -688,8 +696,8 @@ msgid "%s was already not hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" #: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397 -#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192 -#: apt-pkg/deb/dpkgpm.cc:1303 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:207 +#: apt-pkg/deb/dpkgpm.cc:1302 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -708,7 +716,7 @@ msgstr "Methwyd agor %s" msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:450 +#: cmdline/apt-mark.cc:449 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -735,7 +743,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:47 +#: cmdline/apt.cc:46 msgid "" "Usage: apt [options] command\n" "\n" @@ -749,6 +757,7 @@ msgid "" "\n" " install - install packages\n" " remove - remove packages\n" +" autoremove - Remove automatically all unused packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" " full-upgrade - upgrade the system by removing/installing/upgrading " @@ -787,52 +796,52 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 +#: methods/cdrom.cc:262 methods/file.cc:121 methods/rsh.cc:299 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598 -#: methods/rred.cc:608 +#: methods/copy.cc:57 methods/gzip.cc:127 methods/rred.cc:654 +#: methods/rred.cc:664 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605 +#: methods/copy.cc:101 methods/gzip.cc:134 methods/rred.cc:661 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" -#: methods/file.cc:48 +#: methods/file.cc:49 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:178 +#: methods/ftp.cc:177 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:189 +#: methods/ftp.cc:188 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:220 methods/ftp.cc:248 +#: 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:226 +#: methods/ftp.cc:225 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:233 +#: methods/ftp.cc:232 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:253 +#: methods/ftp.cc:252 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -841,222 +850,222 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:281 +#: methods/ftp.cc:282 #, 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:307 +#: methods/ftp.cc:308 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243 +#: methods/ftp.cc:346 methods/ftp.cc:458 methods/rsh.cc:213 methods/rsh.cc:261 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:351 +#: methods/ftp.cc:352 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515 -#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529 -#: apt-pkg/contrib/fileutl.cc:1531 +#: methods/ftp.cc:355 methods/rsh.cc:220 apt-pkg/contrib/fileutl.cc:1569 +#: apt-pkg/contrib/fileutl.cc:1578 apt-pkg/contrib/fileutl.cc:1583 +#: apt-pkg/contrib/fileutl.cc:1585 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:361 methods/rsh.cc:209 +#: methods/ftp.cc:362 methods/rsh.cc:227 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:378 methods/ftp.cc:390 +#: methods/ftp.cc:379 methods/ftp.cc:391 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911 -#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646 -#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653 -#: apt-pkg/contrib/fileutl.cc:1678 +#: methods/ftp.cc:464 methods/rsh.cc:267 apt-pkg/contrib/fileutl.cc:946 +#: apt-pkg/contrib/fileutl.cc:1691 apt-pkg/contrib/fileutl.cc:1700 +#: apt-pkg/contrib/fileutl.cc:1705 apt-pkg/contrib/fileutl.cc:1707 +#: apt-pkg/contrib/fileutl.cc:1732 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743 +#: methods/ftp.cc:703 methods/ftp.cc:709 methods/ftp.cc:744 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:717 methods/connect.cc:116 +#: methods/ftp.cc:718 methods/connect.cc:120 methods/rsh.cc:102 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:719 +#: methods/ftp.cc:720 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:736 +#: methods/ftp.cc:737 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:750 +#: methods/ftp.cc:751 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:754 +#: methods/ftp.cc:755 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:761 +#: methods/ftp.cc:762 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:793 +#: methods/ftp.cc:794 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:803 +#: methods/ftp.cc:804 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:812 +#: methods/ftp.cc:813 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:832 +#: methods/ftp.cc:833 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:839 +#: methods/ftp.cc:840 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319 +#: methods/ftp.cc:880 methods/server.cc:391 methods/rsh.cc:337 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:892 +#: methods/ftp.cc:893 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:907 methods/rsh.cc:338 +#: methods/ftp.cc:908 methods/rsh.cc:356 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:944 +#: methods/ftp.cc:945 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1027 +#: methods/ftp.cc:1028 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1141 +#: methods/ftp.cc:1142 msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:76 +#: methods/connect.cc:80 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:87 +#: methods/connect.cc:91 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:94 +#: methods/connect.cc:98 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)" -#: methods/connect.cc:100 +#: methods/connect.cc:104 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:108 +#: methods/connect.cc:112 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: methods/connect.cc:126 +#: methods/connect.cc:130 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:442 +#: methods/connect.cc:155 methods/rsh.cc:460 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:180 methods/connect.cc:199 +#: methods/connect.cc:181 methods/connect.cc:200 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:205 +#: methods/connect.cc:206 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:209 +#: methods/connect.cc:210 #, fuzzy, c-format msgid "System error resolving '%s:%s'" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:211 +#: methods/connect.cc:212 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:258 +#: methods/connect.cc:259 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:158 -msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" +#: methods/gpgv.cc:205 methods/gpgv.cc:215 +msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:162 -msgid "At least one invalid signature was encountered." +#: methods/gpgv.cc:210 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:164 +#: methods/gpgv.cc:217 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:170 +#: methods/gpgv.cc:223 apt-pkg/acquire-item.cc:604 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:227 msgid "Unknown error executing apt-key" msgstr "" -#: methods/gpgv.cc:207 methods/gpgv.cc:214 +#: methods/gpgv.cc:260 methods/gpgv.cc:267 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:221 +#: methods/gpgv.cc:274 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1066,32 +1075,32 @@ msgstr "" msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:517 +#: methods/http.cc:515 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:531 +#: methods/http.cc:529 #, 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:533 +#: methods/http.cc:531 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:569 +#: methods/http.cc:567 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:629 +#: methods/http.cc:627 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:634 +#: methods/http.cc:632 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:657 +#: methods/http.cc:655 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" @@ -1113,351 +1122,202 @@ msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/server.cc:193 +#: methods/server.cc:200 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/server.cc:195 +#: methods/server.cc:202 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/server.cc:219 +#: methods/server.cc:229 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/server.cc:506 +#: methods/server.cc:535 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:523 methods/server.cc:617 +#: methods/server.cc:552 methods/server.cc:646 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:589 +#: methods/server.cc:618 #, c-format msgid "" "Automatically disabled %s due to incorrect response from server/proxy. (man " "5 apt.conf)" msgstr "" -#: methods/server.cc:712 +#: methods/server.cc:741 msgid "Internal error" msgstr "Gwall mewnol" -#: apt-private/private-list.cc:121 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:151 -#, c-format -msgid "There is %i additional version. Please use the '-a' switch to see it" -msgid_plural "" -"There are %i additional versions. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" - -#: apt-private/private-cachefile.cc:95 -msgid "Correcting dependencies..." -msgstr "Yn cywiro dibyniaethau..." - -#: apt-private/private-cachefile.cc:98 -msgid " failed." -msgstr " wedi methu." - -#: apt-private/private-cachefile.cc:101 -msgid "Unable to correct dependencies" -msgstr "Ni ellir cywiro dibyniaethau" - -#: apt-private/private-cachefile.cc:104 -msgid "Unable to minimize the upgrade set" -msgstr "Ni ellir bychanu y set uwchraddio" - -#: apt-private/private-cachefile.cc:106 -msgid " Done" -msgstr " Wedi Gorffen" - -#: apt-private/private-cachefile.cc:110 -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." - -#: apt-private/private-cachefile.cc:113 -msgid "Unmet dependencies. Try using -f." -msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." - -#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" +#: apt-private/private-cacheset.cc:38 apt-private/private-search.cc:65 +msgid "Sorting" msgstr "" -#: apt-private/private-output.cc:265 +#: apt-private/private-cacheset.cc:127 #, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Sefydliwyd]" +msgid "Note, selecting '%s' for task '%s'\n" +msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: apt-private/private-output.cc:268 -#, fuzzy -msgid "[installed,local]" -msgstr " [Sefydliwyd]" - -#: apt-private/private-output.cc:270 -msgid "[installed,auto-removable]" -msgstr "" - -#: apt-private/private-output.cc:272 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Sefydliwyd]" - -#: apt-private/private-output.cc:274 -#, fuzzy -msgid "[installed]" -msgstr " [Sefydliwyd]" - -#: apt-private/private-output.cc:277 -#, c-format -msgid "[upgradable from: %s]" -msgstr "" - -#: apt-private/private-output.cc:281 -msgid "[residual-config]" -msgstr "" +#: apt-private/private-cacheset.cc:133 +#, fuzzy, c-format +msgid "Note, selecting '%s' for glob '%s'\n" +msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: apt-private/private-output.cc:455 -#, c-format -msgid "but %s is installed" -msgstr "ond mae %s wedi ei sefydlu" +#: apt-private/private-cacheset.cc:139 +#, fuzzy, c-format +msgid "Note, selecting '%s' for regex '%s'\n" +msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" -#: apt-private/private-output.cc:457 +#: apt-private/private-cacheset.cc:157 #, c-format -msgid "but %s is to be installed" -msgstr "ond mae %s yn mynd i gael ei sefydlu" - -#: apt-private/private-output.cc:464 -msgid "but it is not installable" -msgstr "ond ni ellir ei sefydlu" - -#: apt-private/private-output.cc:466 -msgid "but it is a virtual package" -msgstr "ond mae'n becyn rhithwir" - -#: apt-private/private-output.cc:469 -msgid "but it is not installed" -msgstr "ond nid yw wedi ei sefydlu" - -#: apt-private/private-output.cc:469 -msgid "but it is not going to be installed" -msgstr "ond nid yw'n mynd i gael ei sefydlu" - -#: apt-private/private-output.cc:474 -msgid " or" -msgstr " neu" - -#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 -msgid "The following packages have unmet dependencies:" -msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" - -#: apt-private/private-output.cc:523 -msgid "The following NEW packages will be installed:" -msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: apt-private/private-output.cc:549 -msgid "The following packages will be REMOVED:" -msgstr "Caiff y pecynnau canlynol eu TYNNU:" +msgid "Package %s is a virtual package provided by:\n" +msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" -#: apt-private/private-output.cc:571 +#: apt-private/private-cacheset.cc:168 #, fuzzy -msgid "The following packages have been kept back:" -msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" - -#: apt-private/private-output.cc:592 -#, fuzzy -msgid "The following packages will be upgraded:" -msgstr "Caiff y pecynnau canlynol eu uwchraddio" +msgid " [Installed]" +msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:613 +#: apt-private/private-cacheset.cc:177 #, fuzzy -msgid "The following packages will be DOWNGRADED:" -msgstr "Caiff y pecynnau canlynol eu ISRADDIO" +msgid " [Not candidate version]" +msgstr "Fersiynau Posib" -#: apt-private/private-output.cc:633 -msgid "The following held packages will be changed:" -msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" +#: apt-private/private-cacheset.cc:179 +msgid "You should explicitly select one to install." +msgstr "Dylech ddewis un yn benodol i'w sefydlu." -#: apt-private/private-output.cc:688 -#, c-format -msgid "%s (due to %s)" -msgstr "%s (oherwydd %s)" - -#: apt-private/private-output.cc:696 -#, fuzzy +# FIXME: punctuation +#: apt-private/private-cacheset.cc:182 +#, fuzzy, c-format msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" msgstr "" -"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" -"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" -"ei wneud!" - -#: apt-private/private-output.cc:727 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " +"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" +"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n" +"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" +"ffeil sources.list.\n" -#: apt-private/private-output.cc:731 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu wedi ailsefydlu, " - -#: apt-private/private-output.cc:733 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu wedi eu israddio, " +#: apt-private/private-cacheset.cc:200 +msgid "However the following packages replace it:" +msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: apt-private/private-output.cc:735 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" +#: apt-private/private-cacheset.cc:213 +#, fuzzy, c-format +msgid "Package '%s' has no installation candidate" +msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: apt-private/private-output.cc:739 +#: apt-private/private-cacheset.cc:226 #, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" - -#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] -#. e.g. "Do you want to continue? [Y/n] " -#. The user has to answer with an input matching the -#. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:761 -msgid "[Y/n]" +msgid "Virtual packages like '%s' can't be removed\n" msgstr "" -#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] -#. e.g. "Should this file be removed? [y/N] " -#. The user has to answer with an input matching the -#. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:767 -msgid "[y/N]" -msgstr "" - -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:778 -msgid "Y" -msgstr "I" - -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:784 -msgid "N" -msgstr "" - -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Gwall crynhoi patrwm - %s" - -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-cacheset.cc:238 apt-private/private-install.cc:915 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: apt-private/private-update.cc:95 -#, c-format -msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" -msgid_plural "" -"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" -msgstr[0] "" -msgstr[1] "" +#: apt-private/private-cacheset.cc:244 apt-private/private-install.cc:921 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: apt-private/private-update.cc:99 -msgid "All packages are up to date." -msgstr "" +#: apt-private/private-cacheset.cc:289 +#, fuzzy, c-format +msgid "Note, selecting '%s' instead of '%s'\n" +msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" +#: apt-private/private-install.cc:87 +msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-private/private-show.cc:156 -#, c-format -msgid "There is %i additional record. Please use the '-a' switch to see it" -msgid_plural "" -"There are %i additional records. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" - -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +#: apt-private/private-install.cc:96 +#, fuzzy +msgid "Packages need to be removed but remove is disabled." +msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: apt-private/private-main.cc:32 +#: apt-private/private-install.cc:103 apt-private/private-download.cc:118 msgid "" -"NOTE: This is only a simulation!\n" -" apt-get needs root privileges for real execution.\n" -" Keep also in mind that locking is deactivated,\n" -" so don't depend on the relevance to the real current situation!" +"--force-yes is deprecated, use one of the options starting with --allow " +"instead." msgstr "" -#: apt-private/private-install.cc:81 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +#: apt-private/private-install.cc:108 +#, fuzzy +msgid "" +"Essential packages were removed and -y was used without --allow-remove-" +"essential." +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: apt-private/private-install.cc:90 +#: apt-private/private-install.cc:110 #, fuzzy -msgid "Packages need to be removed but remove is disabled." -msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." +msgid "Packages were downgraded and -y was used without --allow-downgrades." +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" + +#: apt-private/private-install.cc:112 +msgid "" +"Held packages were changed and -y was used without --allow-change-held-" +"packages." +msgstr "" -#: apt-private/private-install.cc:109 +#: apt-private/private-install.cc:128 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: apt-private/private-install.cc:147 +#: apt-private/private-install.cc:166 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:154 +#: apt-private/private-install.cc:173 #, 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:159 +#: apt-private/private-install.cc:178 #, 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:166 +#: apt-private/private-install.cc:185 #, 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:171 +#: apt-private/private-install.cc:190 #, 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:185 apt-private/private-download.cc:117 -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:191 apt-private/private-install.cc:213 +#: apt-private/private-install.cc:202 apt-private/private-install.cc:224 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:195 +#: apt-private/private-install.cc:206 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: apt-private/private-install.cc:197 +#: apt-private/private-install.cc:208 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1468,19 +1328,19 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: apt-private/private-install.cc:203 apt-private/private-install.cc:221 +#: apt-private/private-install.cc:214 apt-private/private-install.cc:232 msgid "Abort." msgstr "Erthylu." -#: apt-private/private-install.cc:218 +#: apt-private/private-install.cc:229 msgid "Do you want to continue?" msgstr "Ydych chi eisiau mynd ymlaen?" -#: apt-private/private-install.cc:288 +#: apt-private/private-install.cc:299 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: apt-private/private-install.cc:295 +#: apt-private/private-install.cc:306 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1488,15 +1348,15 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: apt-private/private-install.cc:299 +#: apt-private/private-install.cc:310 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:304 +#: apt-private/private-install.cc:315 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: apt-private/private-install.cc:305 +#: apt-private/private-install.cc:316 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." @@ -1511,15 +1371,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:345 +#: apt-private/private-install.cc:348 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:366 +#: apt-private/private-install.cc:370 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:474 +#: apt-private/private-install.cc:463 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1535,16 +1395,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:477 apt-private/private-install.cc:627 +#: apt-private/private-install.cc:466 apt-private/private-install.cc:622 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:481 +#: apt-private/private-install.cc:470 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: apt-private/private-install.cc:488 +#: apt-private/private-install.cc:479 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1554,7 +1414,7 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-install.cc:492 +#: apt-private/private-install.cc:486 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1562,18 +1422,18 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-install.cc:494 +#: apt-private/private-install.cc:488 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:587 +#: apt-private/private-install.cc:582 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:589 +#: apt-private/private-install.cc:584 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1582,7 +1442,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: apt-private/private-install.cc:612 +#: apt-private/private-install.cc:607 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" @@ -1594,62 +1454,299 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: apt-private/private-install.cc:633 +#: apt-private/private-install.cc:628 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: apt-private/private-install.cc:710 -msgid "The following extra packages will be installed:" +#: apt-private/private-install.cc:685 +#, fuzzy +msgid "The following additional packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: apt-private/private-install.cc:800 +#: apt-private/private-install.cc:774 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: apt-private/private-install.cc:801 +#: apt-private/private-install.cc:776 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: apt-private/private-install.cc:823 +#: apt-private/private-install.cc:798 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: apt-private/private-install.cc:827 +#: apt-private/private-install.cc:802 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: apt-private/private-install.cc:839 +#: apt-private/private-install.cc:814 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: apt-private/private-install.cc:844 -#, c-format -msgid "%s is already the newest version.\n" +#. TRANSLATORS: First string is package name, second is version +#: apt-private/private-install.cc:820 +#, fuzzy, c-format +msgid "%s is already the newest version (%s).\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: apt-private/private-install.cc:892 +#: apt-private/private-install.cc:868 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: apt-private/private-install.cc:897 +#: apt-private/private-install.cc:873 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#. TRANSLATORS: Note, this is not an interactive question -#: apt-private/private-install.cc:939 -#, fuzzy, c-format -msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" -msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" +#: apt-private/private-list.cc:121 +msgid "Listing" +msgstr "" + +#: apt-private/private-list.cc:151 +#, c-format +msgid "There is %i additional version. Please use the '-a' switch to see it" +msgid_plural "" +"There are %i additional versions. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-cachefile.cc:96 +msgid "Correcting dependencies..." +msgstr "Yn cywiro dibyniaethau..." + +#: apt-private/private-cachefile.cc:99 +msgid " failed." +msgstr " wedi methu." + +#: apt-private/private-cachefile.cc:102 +msgid "Unable to correct dependencies" +msgstr "Ni ellir cywiro dibyniaethau" + +#: apt-private/private-cachefile.cc:105 +msgid "Unable to minimize the upgrade set" +msgstr "Ni ellir bychanu y set uwchraddio" + +#: apt-private/private-cachefile.cc:107 +msgid " Done" +msgstr " Wedi Gorffen" + +#: apt-private/private-cachefile.cc:111 +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:114 +msgid "Unmet dependencies. Try using -f." +msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: apt-private/private-install.cc:945 +#: apt-private/private-output.cc:105 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" +msgstr "" + +#: apt-private/private-output.cc:272 #, fuzzy, c-format -msgid "Package '%s' is not installed, so not removed\n" -msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" +msgid "[installed,upgradable to: %s]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:275 +#, fuzzy +msgid "[installed,local]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:277 +msgid "[installed,auto-removable]" +msgstr "" + +#: apt-private/private-output.cc:279 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:281 +#, fuzzy +msgid "[installed]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:284 +#, c-format +msgid "[upgradable from: %s]" +msgstr "" + +#: apt-private/private-output.cc:288 +msgid "[residual-config]" +msgstr "" + +#: apt-private/private-output.cc:402 +#, c-format +msgid "but %s is installed" +msgstr "ond mae %s wedi ei sefydlu" + +#: apt-private/private-output.cc:404 +#, c-format +msgid "but %s is to be installed" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: apt-private/private-output.cc:411 +msgid "but it is not installable" +msgstr "ond ni ellir ei sefydlu" + +#: apt-private/private-output.cc:413 +msgid "but it is a virtual package" +msgstr "ond mae'n becyn rhithwir" + +#: apt-private/private-output.cc:416 +msgid "but it is not installed" +msgstr "ond nid yw wedi ei sefydlu" + +#: apt-private/private-output.cc:416 +msgid "but it is not going to be installed" +msgstr "ond nid yw'n mynd i gael ei sefydlu" + +#: apt-private/private-output.cc:421 +msgid " or" +msgstr " neu" + +#: apt-private/private-output.cc:435 apt-private/private-output.cc:445 +msgid "The following packages have unmet dependencies:" +msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" + +#: apt-private/private-output.cc:455 +msgid "The following NEW packages will be installed:" +msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: apt-private/private-output.cc:465 +msgid "The following packages will be REMOVED:" +msgstr "Caiff y pecynnau canlynol eu TYNNU:" + +#: apt-private/private-output.cc:481 +#, fuzzy +msgid "The following packages have been kept back:" +msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" + +#: apt-private/private-output.cc:497 +#, fuzzy +msgid "The following packages will be upgraded:" +msgstr "Caiff y pecynnau canlynol eu uwchraddio" + +#: apt-private/private-output.cc:512 +#, fuzzy +msgid "The following packages will be DOWNGRADED:" +msgstr "Caiff y pecynnau canlynol eu ISRADDIO" + +#: apt-private/private-output.cc:525 +msgid "The following held packages will be changed:" +msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" + +#: apt-private/private-output.cc:552 +#, c-format +msgid "%s (due to %s)" +msgstr "%s (oherwydd %s)" + +#: apt-private/private-output.cc:602 +#, fuzzy +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" +"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" +"ei wneud!" + +#: apt-private/private-output.cc:633 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " + +#: apt-private/private-output.cc:637 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu wedi ailsefydlu, " + +#: apt-private/private-output.cc:639 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu wedi eu israddio, " + +#: apt-private/private-output.cc:641 +#, 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:645 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" + +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc:667 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc:673 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: apt-private/private-output.cc:684 +msgid "Y" +msgstr "I" + +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: apt-private/private-output.cc:690 +msgid "N" +msgstr "" + +#: apt-private/private-output.cc:712 apt-pkg/cachefilter.cc:40 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Gwall crynhoi patrwm - %s" + +#: apt-private/private-update.cc:31 +msgid "The update command takes no arguments" +msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" + +#: apt-private/private-update.cc:96 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-update.cc:100 +msgid "All packages are up to date." +msgstr "" + +#: apt-private/private-show.cc:158 +#, 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:165 +msgid "not a real package (virtual)" +msgstr "" + +#: apt-private/private-main.cc:34 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" #: apt-private/private-download.cc:62 #, c-format @@ -1663,30 +1760,37 @@ msgstr "" msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: apt-private/private-download.cc:98 +#: apt-private/private-download.cc:101 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:103 apt-private/private-download.cc:110 +#: apt-private/private-download.cc:106 apt-private/private-download.cc:113 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: apt-private/private-download.cc:108 +#: apt-private/private-download.cc:111 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:149 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:122 +#, fuzzy +msgid "" +"There were unauthenticated packages and -y was used without --allow-" +"unauthenticated" +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" + +#: apt-private/private-download.cc:154 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-download.cc:171 apt-private/private-download.cc:174 +#: apt-private/private-download.cc:176 apt-private/private-download.cc:179 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: apt-private/private-download.cc:188 +#: apt-private/private-download.cc:193 #, c-format msgid "You don't have enough free space in %s." msgstr "Does dim digon o le rhydd gennych yn %s." @@ -1705,42 +1809,48 @@ msgstr "" msgid "Full Text Search" msgstr "" -#: apt-private/acqprogress.cc:66 +#. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update' +#: apt-private/acqprogress.cc:74 #, c-format msgid "Hit:%lu %s" msgstr "Presennol:%lu %s" -#: apt-private/acqprogress.cc:88 +#. TRANSLATOR: Very short word to be displayed for files processed in 'apt-get update' +#. Potentially replaced later by "Hit:", "Ign:" or "Err:" if something (bad) happens +#: apt-private/acqprogress.cc:96 #, c-format msgid "Get:%lu %s" msgstr "Cyrchu:%lu %s" -#: apt-private/acqprogress.cc:119 +#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update' +#. which failed to download, but the error is ignored (compare "Err:") +#: apt-private/acqprogress.cc:126 #, c-format msgid "Ign:%lu %s" msgstr "Anwybyddu:%lu %s" -#: apt-private/acqprogress.cc:126 +#. TRANSLATOR: Very short word to be displayed for files in 'apt-get update' +#. which failed to download and the error is critical (compare "Ign:") +#: apt-private/acqprogress.cc:136 #, c-format msgid "Err:%lu %s" msgstr "Gwall:%lu %s" -#: apt-private/acqprogress.cc:150 +#: apt-private/acqprogress.cc:159 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" -#: apt-private/acqprogress.cc:240 -#, c-format +#: apt-private/acqprogress.cc:229 msgid " [Working]" msgstr " [Gweithio]" -#: apt-private/acqprogress.cc:301 +#: apt-private/acqprogress.cc:297 #, fuzzy, c-format msgid "" "Media change: please insert the disc labeled\n" " '%s'\n" -"in the drive '%s' and press enter\n" +"in the drive '%s' and press [Enter]\n" msgstr "" "Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" " '%s'\n" @@ -1748,11 +1858,11 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121 -#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43 -#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374 -#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205 -#: apt-inst/extract.cc:471 +#: methods/mirror.cc:95 apt-pkg/init.cc:133 apt-pkg/init.cc:141 +#: apt-pkg/clean.cc:43 apt-pkg/acquire.cc:557 apt-pkg/policy.cc:412 +#: apt-pkg/sourcelist.cc:306 apt-pkg/sourcelist.cc:312 +#: apt-pkg/contrib/fileutl.cc:375 apt-pkg/contrib/fileutl.cc:488 +#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@ -1789,11 +1899,11 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 +#: methods/rsh.cc:109 ftparchive/multicompress.cc:170 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:346 +#: methods/rsh.cc:364 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -1803,7 +1913,8 @@ msgstr "Rhagosodiad gwael!" #: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 #: dselect/install:106 dselect/update:45 -msgid "Press enter to continue." +#, fuzzy +msgid "Press [Enter] to continue." msgstr "Gwasgwch Enter er mwyn mynd ymlaen." #: dselect/install:92 @@ -1836,881 +1947,304 @@ msgstr "" msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -# FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:229 -#, fuzzy -msgid "" -"Usage: apt-extracttemplates file1 [file2 ...]\n" -"\n" -"apt-extracttemplates is a tool to extract config and template info\n" -"from debian packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" -t Set the temp dir\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" -"\n" -"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" -"templed o becynnau Debian.\n" -"\n" -"Opsiynnau:\n" -" -h Dangos y testun cymorth hwn\n" -" -t Gosod y cyfeiriadur dros dro\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" - -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Ni ellir gwneud stat() o %s" - -#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385 -#: apt-pkg/contrib/fileutl.cc:2097 -#, c-format -msgid "Unable to write to %s" -msgstr "Ni ellir ysgrifennu i %s" - -#: cmdline/apt-extracttemplates.cc:305 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" - -#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370 -msgid "Package extension list is too long" -msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." - -#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205 -#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282 -#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318 -#, fuzzy, c-format -msgid "Error processing directory %s" -msgstr "Gwall wrth brosesu'r cyfeiriadur %s" - -#: ftparchive/apt-ftparchive.cc:280 -msgid "Source extension list is too long" -msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" - -#: ftparchive/apt-ftparchive.cc:400 -msgid "Error writing header to contents file" -msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" - -#: ftparchive/apt-ftparchive.cc:430 -#, fuzzy, c-format -msgid "Error processing contents %s" -msgstr "Gwall wrth Brosesu Cynnwys %s" - -# FIXME: full stops -#: ftparchive/apt-ftparchive.cc:625 -#, fuzzy -msgid "" -"Usage: apt-ftparchive [options] command\n" -"Commands: packages binarypath [overridefile [pathprefix]]\n" -" sources srcpath [overridefile [pathprefix]]\n" -" contents path\n" -" release path\n" -" generate config [groups]\n" -" clean config\n" -"\n" -"apt-ftparchive generates index files for Debian archives. It supports\n" -"many styles of generation from fully automated to functional replacements\n" -"for dpkg-scanpackages and dpkg-scansources\n" -"\n" -"apt-ftparchive generates Package files from a tree of .debs. The\n" -"Package file contains the contents of all the control fields from\n" -"each package as well as the MD5 hash and filesize. An override file\n" -"is supported to force the value of Priority and Section.\n" -"\n" -"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" -"The --source-override option can be used to specify a src override file\n" -"\n" -"The 'packages' and 'sources' command should be run in the root of the\n" -"tree. BinaryPath should point to the base of the recursive search and \n" -"override file should contain the override flags. Pathprefix is\n" -"appended to the filename fields if present. Example usage from the \n" -"Debian archive:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Options:\n" -" -h This help text\n" -" --md5 Control MD5 generation\n" -" -s=? Source override file\n" -" -q Quiet\n" -" -d=? Select the optional caching database\n" -" --no-delink Enable delinking debug mode\n" -" --contents Control contents file generation\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option" -msgstr "" -"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" -"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" -" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n" -" contents llwybr\n" -" release llwybr\n" -" generate cyfluniad [grŵpiau]\n" -" clean cyfluniad\n" -"\n" -"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" -"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" -"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" -"\n" -"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" -"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" -"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n" -"gorfodi'r gwerthoedd Priority a Section.\n" -"\n" -"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n" -".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n" -"gwrthwneud ffynhonell.\n" -"\n" -"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n" -"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n" -"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n" -"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n" -"defnydd o'r archif Debian:\n" -" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" -" dists/potato/main/binary-i386/Packages\n" -"\n" -"Opsiynnau:\n" -" -h Y testun cymorth hwn\n" -" --md5 Rheoli cynhyrchiad stwnch MD5\n" -" -s=? Ffeil gwrthwneud ffynhonell\n" -" -q Tawel\n" -" -d=? Dewis cronda data storfa opsiynnol\n" -" --no-delink Galluogi'r modd datgysylltu datnamu\n" -" --contents Rheoli cynhyrchiad ffeil cynnwys\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol" - -#: ftparchive/apt-ftparchive.cc:821 -msgid "No selections matched" -msgstr "Dim dewisiadau'n cyfateb" - -#: ftparchive/apt-ftparchive.cc:906 -#, c-format -msgid "Some files are missing in the package file group `%s'" -msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" - -#: ftparchive/cachedb.cc:67 -#, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" - -#: ftparchive/cachedb.cc:85 -#, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Hen gronfa data, yn ceisio uwchraddio %s" - -#: ftparchive/cachedb.cc:96 -msgid "" -"DB format is invalid. If you upgraded from an older version of apt, please " -"remove and re-create the database." -msgstr "" - -#: ftparchive/cachedb.cc:101 -#, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Ni ellir agor y ffeil DB2 %s: %s" - -#: ftparchive/cachedb.cc:184 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:326 -#, fuzzy -msgid "Failed to read .dsc" -msgstr "Methwyd darllen y cyswllt %s" - -#: ftparchive/cachedb.cc:359 -msgid "Archive has no control record" -msgstr "Does dim cofnod rheoli gan yr archif" - -#: ftparchive/cachedb.cc:526 -msgid "Unable to get a cursor" -msgstr "Ni ellir cael cyrchydd" - -#: ftparchive/writer.cc:104 -#, c-format -msgid "W: Unable to read directory %s\n" -msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" - -#: ftparchive/writer.cc:109 -#, c-format -msgid "W: Unable to stat %s\n" -msgstr "Rh: Ni ellir gwneud stat() o %s\n" - -#: ftparchive/writer.cc:165 -msgid "E: " -msgstr "G: " - -#: ftparchive/writer.cc:167 -msgid "W: " -msgstr "Rh: " - -#: ftparchive/writer.cc:174 -msgid "E: Errors apply to file " -msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " - -#: ftparchive/writer.cc:192 ftparchive/writer.cc:224 -#, c-format -msgid "Failed to resolve %s" -msgstr "Methwyd datrys %s" - -#: ftparchive/writer.cc:205 -msgid "Tree walking failed" -msgstr "Methwyd cerdded y goeden" - -#: ftparchive/writer.cc:232 -#, c-format -msgid "Failed to open %s" -msgstr "Methwyd agor %s" - -# FIXME -#: ftparchive/writer.cc:291 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DatGysylltu %s [%s]\n" - -#: ftparchive/writer.cc:299 -#, c-format -msgid "Failed to readlink %s" -msgstr "Methwyd darllen y cyswllt %s" - -#: ftparchive/writer.cc:303 -#, c-format -msgid "Failed to unlink %s" -msgstr "Methwyd datgysylltu %s" - -#: ftparchive/writer.cc:311 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Methwyd cysylltu %s at %s" - -#: ftparchive/writer.cc:321 -#, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Tarwyd y terfyn cyswllt %sB.\n" - -#: ftparchive/writer.cc:427 -msgid "Archive had no package field" -msgstr "Doedd dim maes pecyn gan yr archif" - -#: ftparchive/writer.cc:435 ftparchive/writer.cc:698 -#, c-format -msgid " %s has no override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" - -#: ftparchive/writer.cc:502 ftparchive/writer.cc:862 -#, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " Cynaliwr %s yw %s nid %s\n" - -#: ftparchive/writer.cc:712 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" - -#: ftparchive/writer.cc:716 -#, fuzzy, c-format -msgid " %s has no binary override entry either\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" - -#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 -msgid "realloc - Failed to allocate memory" -msgstr "realloc - Methwyd neilltuo cof" - -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Ni ellir agor %s" - -#. 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:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" - -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" - -#: ftparchive/multicompress.cc:73 -#, fuzzy, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Dull Cywasgu Anhysbys '%s'" - -#: 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:192 -msgid "Failed to create FILE*" -msgstr "Methwyd creu FILE*" - -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Methodd fork()" - -#: ftparchive/multicompress.cc:209 -#, fuzzy -msgid "Compress child" -msgstr "Plentyn Cywasgu" - -#: ftparchive/multicompress.cc:232 -#, fuzzy, c-format -msgid "Internal error, failed to create %s" -msgstr "Gwall Mewnol, Methwyd creu %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Methodd MA i isbroses/ffeil" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Methwyd darllen wrth gyfrifo MD5" - -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Gwall wrth datgysylltu %s" - -#: 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:51 -#, fuzzy -msgid "" -"Usage: apt-internal-solver\n" -"\n" -"apt-internal-solver is an interface to use the current internal\n" -"like an external resolver for the APT family for debugging or alike\n" -"\n" -"Options:\n" -" -h This help text.\n" -" -q Loggable output - no progress indicator\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" -"\n" -"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" -"templed o becynnau Debian.\n" -"\n" -"Opsiynnau:\n" -" -h Dangos y testun cymorth hwn\n" -" -t Gosod y cyfeiriadur dros dro\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" - -#: cmdline/apt-sortpkgs.cc:91 -msgid "Unknown package record!" -msgstr "Cofnod pecyn anhysbys!" - -#: cmdline/apt-sortpkgs.cc:155 -#, fuzzy -msgid "" -"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" -"\n" -"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" -"to indicate what kind of file it is.\n" -"\n" -"Options:\n" -" -h This help text\n" -" -s Use source file sorting\n" -" -c=? Read this configuration file\n" -" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -msgstr "" -"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" -"\n" -"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n" -"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n" -"\n" -"Opsiynnau:\n" -" -h Y testun cymorth hwn\n" -" -s Defnyddio trefnu ffeil ffynhonell\n" -" -c=? Darllen y ffeil cyfluniad hwn\n" -" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" - -#: apt-pkg/install-progress.cc:59 +#: apt-pkg/install-progress.cc:58 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176 +#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:177 msgid "Running dpkg" msgstr "" -#: apt-pkg/init.cc:156 +#: apt-pkg/init.cc:176 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:172 +#: apt-pkg/init.cc:192 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:228 apt-pkg/indexcopy.cc:753 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:230 apt-pkg/indexcopy.cc:755 #, 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:233 apt-pkg/indexcopy.cc:758 #, 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:236 apt-pkg/indexcopy.cc:761 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/indexcopy.cc:498 #, c-format msgid "Can't find authentication record for: %s" msgstr "" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/indexcopy.cc:504 #, fuzzy, c-format msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-worker.cc:133 -#, c-format -msgid "The method driver %s could not be found." -msgstr "Methwyd canfod y gyrrydd dull %s." - -#: apt-pkg/acquire-worker.cc:135 -#, c-format -msgid "Is the package %s installed?" -msgstr "" - -#: apt-pkg/acquire-worker.cc:186 -#, c-format -msgid "Method %s did not start correctly" -msgstr "Ni gychwynodd y dull %s yn gywir" - -#: apt-pkg/acquire-worker.cc:485 -#, fuzzy, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" -" '%s'\n" -"yn y gyrriant '%s' a gwasgwch Enter\n" - -#: apt-pkg/cachefile.cc:94 +#: apt-pkg/cachefile.cc:101 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:98 +#: apt-pkg/cachefile.cc:105 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:116 +#: apt-pkg/cachefile.cc:123 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: apt-pkg/pkgcache.cc:154 +#: apt-pkg/pkgcache.cc:163 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171 +#: apt-pkg/pkgcache.cc:169 apt-pkg/pkgcache.cc:180 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:165 +#: apt-pkg/pkgcache.cc:174 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" -#: apt-pkg/pkgcache.cc:168 +#: apt-pkg/pkgcache.cc:177 #, 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:175 +#: apt-pkg/pkgcache.cc:184 #, 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:185 +#: apt-pkg/pkgcache.cc:194 #, fuzzy, c-format msgid "The package cache was built for different architectures: %s vs %s" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:322 +#: apt-pkg/pkgcache.cc:319 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:322 +#: apt-pkg/pkgcache.cc:319 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:322 +#: apt-pkg/pkgcache.cc:319 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:323 +#: apt-pkg/pkgcache.cc:320 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:323 +#: apt-pkg/pkgcache.cc:320 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:323 +#: apt-pkg/pkgcache.cc:320 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:324 +#: apt-pkg/pkgcache.cc:321 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:324 +#: apt-pkg/pkgcache.cc:321 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:324 +#: apt-pkg/pkgcache.cc:321 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:335 +#: apt-pkg/pkgcache.cc:332 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:335 +#: apt-pkg/pkgcache.cc:332 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:335 +#: apt-pkg/pkgcache.cc:332 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:336 +#: apt-pkg/pkgcache.cc:333 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:336 +#: apt-pkg/pkgcache.cc:333 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182 -#, fuzzy -msgid "Calculating upgrade" -msgstr "Yn Cyfrifo'r Uwchraddiad" - -#: apt-pkg/pkgrecords.cc:38 -#, c-format -msgid "Index file type '%s' is not supported" -msgstr "Ni chynhelir y math ffeil mynegai '%s'" - -#: apt-pkg/sourcelist.cc:127 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" - -#: apt-pkg/sourcelist.cc:170 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:173 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" - -#: apt-pkg/sourcelist.cc:184 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:190 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:193 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/acquire-worker.cc:111 #, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" +msgid "The method driver %s could not be found." +msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-pkg/sourcelist.cc:208 +#: apt-pkg/acquire-worker.cc:113 #, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" +msgid "Is the package %s installed?" +msgstr "" -#: apt-pkg/sourcelist.cc:211 +#: apt-pkg/acquire-worker.cc:164 #, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" +msgid "Method %s did not start correctly" +msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/acquire-worker.cc:536 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" - -#: apt-pkg/sourcelist.cc:224 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" +msgid "" +"Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]." msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "Yn agor %s" - -#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." +"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" +" '%s'\n" +"yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" - -#: apt-pkg/sourcelist.cc:375 -#, fuzzy, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" - -#: apt-pkg/sourcelist.cc:416 -#, fuzzy, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" - -#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553 -#, fuzzy, c-format -msgid "Clean of %s is not supported" +msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/clean.cc:64 -#, c-format -msgid "Unable to stat %s." -msgstr "Ni ellir gwneud stat() o %s." - -#: apt-pkg/pkgcachegen.cc:113 -msgid "Cache has an incompatible versioning system" -msgstr "Mae can y storfa system fersiwn anghyfaddas" - -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250 -#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382 -#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 -#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 -#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525 -#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570 -#: apt-pkg/pkgcachegen.cc:584 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" - -#: apt-pkg/pkgcachegen.cc:273 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" -"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." - -#: apt-pkg/pkgcachegen.cc:276 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." - -#: apt-pkg/pkgcachegen.cc:279 +#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167 #, fuzzy -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." - -#: apt-pkg/pkgcachegen.cc:282 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" -"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." - -#: apt-pkg/pkgcachegen.cc:591 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" - -#: apt-pkg/pkgcachegen.cc:1196 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" +msgid "Building dependency tree" +msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388 -#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551 +#: apt-pkg/depcache.cc:140 #, fuzzy -msgid "Reading package lists" -msgstr "Yn Darllen Rhestrau Pecynnau" - -#: apt-pkg/pkgcachegen.cc:1301 -msgid "Collecting File Provides" -msgstr "Yn Casglu Darpariaethau Ffeil" - -#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500 -msgid "IO Error saving source cache" -msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" - -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" +msgid "Candidate versions" +msgstr "Fersiynau Posib" -#: apt-pkg/edsp.cc:244 -msgid "Send request to solver" -msgstr "" +#: apt-pkg/depcache.cc:168 +#, fuzzy +msgid "Dependency generation" +msgstr "Cynhyrchaid Dibyniaeth" -#: apt-pkg/edsp.cc:323 -msgid "Prepare for receiving solution" -msgstr "" +#: 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/edsp.cc:330 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/depcache.cc:252 +#, fuzzy, c-format +msgid "Failed to open StateFile %s" +msgstr "Methwyd agor %s" -#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630 -msgid "Execute external solver" -msgstr "" +#: apt-pkg/depcache.cc:257 +#, fuzzy, c-format +msgid "Failed to write temporary StateFile %s" +msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/acquire-item.cc:98 +#: apt-pkg/acquire-item.cc:116 msgid "Use --allow-insecure-repositories to force the update" msgstr "" -#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108 +#: apt-pkg/acquire-item.cc:561 apt-pkg/contrib/fileutl.cc:2161 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:240 +#: apt-pkg/acquire-item.cc:585 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:245 +#: apt-pkg/acquire-item.cc:590 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" -#: apt-pkg/acquire-item.cc:250 +#: apt-pkg/acquire-item.cc:595 #, fuzzy msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:255 +#: apt-pkg/acquire-item.cc:600 #, fuzzy msgid "Signature error" msgstr "Gwall ysgrifennu" -#: apt-pkg/acquire-item.cc:259 -msgid "Does not start with a cleartext signature" -msgstr "" - -#: apt-pkg/acquire-item.cc:1584 +#: apt-pkg/acquire-item.cc:789 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " -"updated and the previous index files will be used. GPG error: %s: %s\n" +"updated and the previous index files will be used. GPG error: %s: %s" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600 +#: apt-pkg/acquire-item.cc:799 apt-pkg/acquire-item.cc:805 #, c-format msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/acquire-item.cc:1707 -#, fuzzy, c-format -msgid "The repository '%s' is no longer signed." -msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" - -#: apt-pkg/acquire-item.cc:1714 -msgid "" -"This is normally not allowed, but the option Acquire::" -"AllowDowngradeToInsecureRepositories was given to override it." -msgstr "" - -#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202 -#, c-format -msgid "" -"The data from '%s' is not signed. Packages from that repository can not be " -"authenticated." -msgstr "" - -#: apt-pkg/acquire-item.cc:1956 +#: apt-pkg/acquire-item.cc:970 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -# FIXME: number? -#: apt-pkg/acquire-item.cc:1975 -#, fuzzy, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" - -#: apt-pkg/acquire-item.cc:1999 +#: apt-pkg/acquire-item.cc:1026 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:2037 +#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is +#. the time since then the file is invalid - formatted in the same way as in +#. the download progress display (e.g. 7d 3h 42min 1s) +#: apt-pkg/acquire-item.cc:1066 #, 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:2059 +#: apt-pkg/acquire-item.cc:1107 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:2078 +#: apt-pkg/acquire-item.cc:1224 apt-pkg/acquire-item.cc:1480 +#, c-format +msgid "" +"The data from '%s' is not signed. Packages from that repository can not be " +"authenticated." +msgstr "" + +#: apt-pkg/acquire-item.cc:1326 #, c-format msgid "" "The repository '%s' does not have a Release file. This is deprecated, please " "contact the owner of the repository." msgstr "" +#: apt-pkg/acquire-item.cc:1459 +#, fuzzy, c-format +msgid "The repository '%s' is no longer signed." +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" + +#: apt-pkg/acquire-item.cc:1466 +msgid "" +"This is normally not allowed, but the option Acquire::" +"AllowDowngradeToInsecureRepositories was given to override it." +msgstr "" + # FIXME: case -#: apt-pkg/acquire-item.cc:2249 +#: apt-pkg/acquire-item.cc:2611 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2719,24 +2253,86 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:2315 +#: apt-pkg/acquire-item.cc:2677 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:2351 +#: apt-pkg/acquire-item.cc:2715 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/vendorlist.cc:83 +#. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1 +#: apt-pkg/acquire-item.cc:2916 apt-pkg/acquire-item.cc:3054 +#, fuzzy, c-format +msgid "Changelog unavailable for %s=%s" +msgstr "Yn cysylltu i %s (%s)" + +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Ni ellir gwneud stat() o %s." + +#: apt-pkg/pkgcachegen.cc:112 +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:237 apt-pkg/pkgcachegen.cc:299 +#: apt-pkg/pkgcachegen.cc:365 apt-pkg/pkgcachegen.cc:369 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:394 +#: apt-pkg/pkgcachegen.cc:398 apt-pkg/pkgcachegen.cc:402 +#: apt-pkg/pkgcachegen.cc:423 apt-pkg/pkgcachegen.cc:428 +#: apt-pkg/pkgcachegen.cc:474 apt-pkg/pkgcachegen.cc:488 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" + +#: 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: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: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: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:1400 apt-pkg/pkgcachegen.cc:1526 +#: apt-pkg/pkgcachegen.cc:1552 apt-pkg/pkgcachegen.cc:1671 +#, fuzzy +msgid "Reading package lists" +msgstr "Yn Darllen Rhestrau Pecynnau" + +#: apt-pkg/pkgcachegen.cc:1471 apt-pkg/pkgcachegen.cc:1478 +msgid "IO Error saving source cache" +msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" + +#: apt-pkg/pkgcachegen.cc:1570 apt-pkg/pkgcachegen.cc:1572 +#: apt-pkg/contrib/fileutl.cc:2151 cmdline/apt-extracttemplates.cc:263 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" +msgid "Unable to write to %s" +msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832 +#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:833 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." @@ -2753,22 +2349,36 @@ msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:981 +#: apt-pkg/acquire.cc:1081 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:983 +#: apt-pkg/acquire.cc:1083 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" +#: apt-pkg/update.cc:76 +#, fuzzy, c-format +msgid "Failed to fetch %s %s" +msgstr "Methwyd cyrchu %s %s\n" + +#: apt-pkg/update.cc:102 apt-pkg/update.cc:104 +#, fuzzy +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" +"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " +"rai eu defnyddio yn lle." + # FIXME: ...file #: apt-pkg/srcrecords.cc:53 msgid "You must put some 'source' URIs in your sources.list" msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" -#: apt-pkg/policy.cc:83 +#: apt-pkg/policy.cc:77 #, c-format msgid "" "The value '%s' is invalid for APT::Default-Release as such a release is not " @@ -2776,35 +2386,40 @@ msgid "" msgstr "" # FIXME: literal -#: apt-pkg/policy.cc:422 +#: apt-pkg/policy.cc:453 #, 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:444 +#: apt-pkg/policy.cc:475 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:452 +#: apt-pkg/policy.cc:484 +#, c-format +msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)" +msgstr "" + +#: apt-pkg/policy.cc:491 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:983 #, 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:563 apt-pkg/packagemanager.cc:593 +#: apt-pkg/packagemanager.cc:562 apt-pkg/packagemanager.cc:592 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:643 +#: apt-pkg/packagemanager.cc:642 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2815,91 +2430,92 @@ msgstr "" "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 -#, fuzzy -msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." -msgstr "" -"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " -"rai eu defnyddio yn lle." +#: apt-pkg/cdrom.cc:498 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:571 +#: apt-pkg/cdrom.cc:572 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" -#: apt-pkg/cdrom.cc:586 +#: apt-pkg/cdrom.cc:587 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:599 +#: apt-pkg/cdrom.cc:600 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:610 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:620 +#: apt-pkg/cdrom.cc:621 msgid "Identifying... " msgstr "" -#: apt-pkg/cdrom.cc:662 +#: apt-pkg/cdrom.cc:663 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:680 +#: apt-pkg/cdrom.cc:681 msgid "Scanning disc for index files...\n" msgstr "" -#: apt-pkg/cdrom.cc:734 +#: apt-pkg/cdrom.cc:735 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:745 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:771 +#: apt-pkg/cdrom.cc:772 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:800 +#: apt-pkg/cdrom.cc:801 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:817 +#: apt-pkg/cdrom.cc:818 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:819 +#: apt-pkg/cdrom.cc:820 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:866 +#: apt-pkg/cdrom.cc:867 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:877 +#: apt-pkg/cdrom.cc:878 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/algorithms.cc:265 +#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182 +#, fuzzy +msgid "Calculating upgrade" +msgstr "Yn Cyfrifo'r Uwchraddiad" + +#: apt-pkg/algorithms.cc:263 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2907,7 +2523,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1090 +#: apt-pkg/algorithms.cc:1080 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2915,269 +2531,280 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1092 +#: apt-pkg/algorithms.cc:1082 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/depcache.cc:138 apt-pkg/depcache.cc:167 -#, fuzzy -msgid "Building dependency tree" -msgstr "Yn Aideladu Coeden Dibyniaeth" - -#: apt-pkg/depcache.cc:139 -#, fuzzy -msgid "Candidate versions" -msgstr "Fersiynau Posib" +#: apt-pkg/edsp.cc:184 apt-pkg/edsp.cc:210 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/depcache.cc:168 -#, fuzzy -msgid "Dependency generation" -msgstr "Cynhyrchaid Dibyniaeth" +#: apt-pkg/edsp.cc:232 +msgid "Send request to solver" +msgstr "" -#: 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/edsp.cc:311 +msgid "Prepare for receiving solution" +msgstr "" -#: apt-pkg/depcache.cc:252 -#, fuzzy, c-format -msgid "Failed to open StateFile %s" -msgstr "Methwyd agor %s" +#: apt-pkg/edsp.cc:318 +msgid "External solver failed without a proper error message" +msgstr "" -#: apt-pkg/depcache.cc:258 -#, fuzzy, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Methwyd ysgrifennu ffeil %s" +#: apt-pkg/edsp.cc:610 apt-pkg/edsp.cc:613 apt-pkg/edsp.cc:618 +msgid "Execute external solver" +msgstr "" -#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207 +#: apt-pkg/tagfile.cc:196 apt-pkg/tagfile.cc:296 apt-pkg/deb/debrecords.cc:212 #, c-format msgid "Unable to parse package file %s (%d)" msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)" -#: apt-pkg/cacheset.cc:501 +#: apt-pkg/tagfile.cc:541 apt-pkg/tagfile.cc:544 +#, c-format +msgid "Cannot convert %s to integer" +msgstr "" + +#. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports +#: apt-pkg/sourcelist.cc:133 apt-pkg/sourcelist.cc:140 +#: apt-pkg/sourcelist.cc:143 apt-pkg/sourcelist.cc:151 +#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:197 +#: apt-pkg/sourcelist.cc:200 apt-pkg/sourcelist.cc:211 +#: apt-pkg/sourcelist.cc:217 apt-pkg/sourcelist.cc:220 +#: apt-pkg/sourcelist.cc:233 apt-pkg/sourcelist.cc:235 +#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:244 +#: apt-pkg/sourcelist.cc:251 +#, fuzzy, c-format +msgid "Malformed entry %u in %s file %s (%s)" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#: apt-pkg/sourcelist.cc:355 +#, c-format +msgid "Opening %s" +msgstr "Yn agor %s" + +#: apt-pkg/sourcelist.cc:389 +#, 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:393 +#, 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:413 apt-pkg/sourcelist.cc:419 +#, fuzzy, c-format +msgid "Malformed stanza %u in source list %s (type)" +msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" + +#: apt-pkg/sourcelist.cc:429 +#, 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/cacheset.cc:500 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:504 +#: apt-pkg/cacheset.cc:503 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:629 +#: apt-pkg/cacheset.cc:738 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:744 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:641 +#: apt-pkg/cacheset.cc:750 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:680 +#: apt-pkg/cacheset.cc:789 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:719 +#: apt-pkg/cacheset.cc:828 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:727 +#: apt-pkg/cacheset.cc:836 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:735 +#: apt-pkg/cacheset.cc:844 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751 +#: apt-pkg/cacheset.cc:852 apt-pkg/cacheset.cc:860 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -# FIXME: number? -#: apt-pkg/indexrecords.cc:83 -#, fuzzy, c-format -msgid "Unable to parse Release file %s" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" - -#: apt-pkg/indexrecords.cc:91 -#, fuzzy, c-format -msgid "No sections in Release file %s" -msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" - -#: apt-pkg/indexrecords.cc:132 -#, c-format -msgid "No Hash entry in Release file %s" -msgstr "" - -#: apt-pkg/indexrecords.cc:145 -#, 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:164 -#, fuzzy, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" - -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%lid %lih %limin %lis" msgstr "" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#. TRANSLATOR: h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format msgid "%lih %limin %lis" msgstr "" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:439 +#. TRANSLATOR: min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:430 #, c-format msgid "%limin %lis" msgstr "" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:444 +#. TRANSLATOR: s means seconds +#: apt-pkg/contrib/strutl.cc:435 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1290 +#: apt-pkg/contrib/strutl.cc:1279 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/fileutl.cc:196 +#: apt-pkg/contrib/fileutl.cc:197 #, 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:201 +#: apt-pkg/contrib/fileutl.cc:202 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:224 +#: apt-pkg/contrib/fileutl.cc:225 #, 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:229 +#: apt-pkg/contrib/fileutl.cc:230 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480 +#: apt-pkg/contrib/fileutl.cc:367 apt-pkg/contrib/fileutl.cc:481 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:400 +#: apt-pkg/contrib/fileutl.cc:401 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:418 +#: apt-pkg/contrib/fileutl.cc:419 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:428 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:846 +#: apt-pkg/contrib/fileutl.cc:862 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:848 +#: apt-pkg/contrib/fileutl.cc:864 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212 +#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:227 #, 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:854 apt-pkg/contrib/gpgv.cc:205 +#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:220 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:952 +#: apt-pkg/contrib/fileutl.cc:987 #, fuzzy, c-format msgid "Problem closing the gzip file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1140 +#: apt-pkg/contrib/fileutl.cc:1194 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246 +#: apt-pkg/contrib/fileutl.cc:1253 apt-pkg/contrib/fileutl.cc:1300 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123 +#: apt-pkg/contrib/fileutl.cc:1408 apt-pkg/contrib/fileutl.cc:2176 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1412 +#: apt-pkg/contrib/fileutl.cc:1466 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1553 +#: apt-pkg/contrib/fileutl.cc:1607 #, 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:1666 apt-pkg/contrib/fileutl.cc:1688 +#: apt-pkg/contrib/fileutl.cc:1720 apt-pkg/contrib/fileutl.cc:1742 #, 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:1954 +#: apt-pkg/contrib/fileutl.cc:2008 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1965 +#: apt-pkg/contrib/fileutl.cc:2019 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1976 +#: apt-pkg/contrib/fileutl.cc:2030 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1989 +#: apt-pkg/contrib/fileutl.cc:2043 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" +#: apt-pkg/contrib/fileutl.cc:2146 cmdline/apt-extracttemplates.cc:258 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Ni ellir gwneud stat() o %s" + #: apt-pkg/contrib/progress.cc:148 #, c-format msgid "%c%s... Error!" @@ -3257,78 +2884,82 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:246 +#: apt-pkg/contrib/cdromutl.cc:247 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/configuration.cc:522 +#: apt-pkg/contrib/configuration.cc:516 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:636 +#: apt-pkg/contrib/configuration.cc:630 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:798 #, 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:823 +#: apt-pkg/contrib/configuration.cc:817 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:840 +#: apt-pkg/contrib/configuration.cc:834 #, 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:880 +#: apt-pkg/contrib/configuration.cc:874 #, 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:887 +#: apt-pkg/contrib/configuration.cc:881 #, 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:891 apt-pkg/contrib/configuration.cc:896 +#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/contrib/configuration.cc:894 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:903 +#: apt-pkg/contrib/configuration.cc:897 #, 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:953 +#: apt-pkg/contrib/configuration.cc:947 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" # FIXME #: apt-pkg/contrib/cmndline.cc:127 -#, c-format -msgid "Command line option '%c' [from %s] is not known." +#, fuzzy, c-format +msgid "" +"Command line option '%c' [from %s] is not understood in combination with the " +"other options." msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." #: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161 #: apt-pkg/contrib/cmndline.cc:169 -#, c-format -msgid "Command line option %s is not understood" +#, fuzzy, c-format +msgid "" +"Command line option %s is not understood in combination with the other " +"options" msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" #: apt-pkg/contrib/cmndline.cc:174 @@ -3367,93 +2998,133 @@ msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." msgid "Invalid operation %s" msgstr "Gweithred annilys %s" -#: apt-pkg/deb/dpkgpm.cc:112 +# FIXME: number? +#: apt-pkg/deb/debmetaindex.cc:229 +#, fuzzy, c-format +msgid "Unable to parse Release file %s" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#: apt-pkg/deb/debmetaindex.cc:238 +#, fuzzy, c-format +msgid "No sections in Release file %s" +msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" + +#: apt-pkg/deb/debmetaindex.cc:278 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + +# FIXME: number? +#: apt-pkg/deb/debmetaindex.cc:286 +#, fuzzy, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#: apt-pkg/deb/debmetaindex.cc:307 +#, fuzzy, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" + +#. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite +#: apt-pkg/deb/debmetaindex.cc:438 apt-pkg/deb/debmetaindex.cc:446 +#: apt-pkg/deb/debmetaindex.cc:454 apt-pkg/deb/debmetaindex.cc:462 +#: apt-pkg/deb/debmetaindex.cc:485 +#, c-format +msgid "Conflicting values set for option %s concerning source %s %s" +msgstr "" + +#: apt-pkg/deb/debmetaindex.cc:480 +#, c-format +msgid "Invalid value set for option %s concerning source %s %s (%s)" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:110 #, fuzzy, c-format msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008 +#: apt-pkg/deb/dpkgpm.cc:111 apt-pkg/deb/dpkgpm.cc:1007 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015 +#: apt-pkg/deb/dpkgpm.cc:112 apt-pkg/deb/dpkgpm.cc:1014 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:115 +#: apt-pkg/deb/dpkgpm.cc:113 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:116 +#: apt-pkg/deb/dpkgpm.cc:114 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:117 +#: apt-pkg/deb/dpkgpm.cc:115 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:839 +#: apt-pkg/deb/dpkgpm.cc:838 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876 +#: apt-pkg/deb/dpkgpm.cc:853 apt-pkg/deb/dpkgpm.cc:875 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:1001 +#: apt-pkg/deb/dpkgpm.cc:1000 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/deb/dpkgpm.cc:1001 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:1007 +#: apt-pkg/deb/dpkgpm.cc:1006 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:1009 +#: apt-pkg/deb/dpkgpm.cc:1008 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:1014 +#: apt-pkg/deb/dpkgpm.cc:1013 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1016 +#: apt-pkg/deb/dpkgpm.cc:1015 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:1021 +#: apt-pkg/deb/dpkgpm.cc:1020 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:1022 +#: apt-pkg/deb/dpkgpm.cc:1021 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169 +#: apt-pkg/deb/dpkgpm.cc:1080 apt-pkg/deb/dpkgpm.cc:1168 msgid "Is /dev/pts mounted?" msgstr "" @@ -3499,30 +3170,435 @@ msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" -#: apt-pkg/deb/debsystem.cc:91 +#: apt-pkg/deb/debsystem.cc:88 #, c-format msgid "" "Unable to lock the administration directory (%s), is another process using " "it?" msgstr "" -#: apt-pkg/deb/debsystem.cc:94 +#: apt-pkg/deb/debsystem.cc:91 #, fuzzy, c-format msgid "Unable to lock the administration directory (%s), are you root?" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. TRANSLATORS: the %s contains the recovery command, usually #. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: apt-pkg/deb/debsystem.cc:107 #, c-format msgid "" "dpkg was interrupted, you must manually run '%s' to correct the problem. " msgstr "" -#: apt-pkg/deb/debsystem.cc:128 +#: apt-pkg/deb/debsystem.cc:125 msgid "Not locked" msgstr "" +# FIXME: "debian" +#: cmdline/apt-extracttemplates.cc:228 +#, fuzzy +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" + +#: cmdline/apt-extracttemplates.cc:304 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" + +#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:368 +msgid "Package extension list is too long" +msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." + +#: ftparchive/apt-ftparchive.cc:190 ftparchive/apt-ftparchive.cc:202 +#: ftparchive/apt-ftparchive.cc:225 ftparchive/apt-ftparchive.cc:281 +#: ftparchive/apt-ftparchive.cc:291 ftparchive/apt-ftparchive.cc:313 +#, fuzzy, c-format +msgid "Error processing directory %s" +msgstr "Gwall wrth brosesu'r cyfeiriadur %s" + +#: ftparchive/apt-ftparchive.cc:279 +msgid "Source extension list is too long" +msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" + +#: ftparchive/apt-ftparchive.cc:394 +msgid "Error writing header to contents file" +msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" + +#: ftparchive/apt-ftparchive.cc:424 +#, fuzzy, c-format +msgid "Error processing contents %s" +msgstr "Gwall wrth Brosesu Cynnwys %s" + +# FIXME: full stops +#: ftparchive/apt-ftparchive.cc:616 +#, fuzzy +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n" +"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n" +" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n" +" contents llwybr\n" +" release llwybr\n" +" generate cyfluniad [grŵpiau]\n" +" clean cyfluniad\n" +"\n" +"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n" +"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n" +"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n" +"\n" +"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n" +"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n" +"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n" +"gorfodi'r gwerthoedd Priority a Section.\n" +"\n" +"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n" +".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n" +"gwrthwneud ffynhonell.\n" +"\n" +"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n" +"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n" +"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n" +"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n" +"defnydd o'r archif Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" --md5 Rheoli cynhyrchiad stwnch MD5\n" +" -s=? Ffeil gwrthwneud ffynhonell\n" +" -q Tawel\n" +" -d=? Dewis cronda data storfa opsiynnol\n" +" --no-delink Galluogi'r modd datgysylltu datnamu\n" +" --contents Rheoli cynhyrchiad ffeil cynnwys\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol" + +#: ftparchive/apt-ftparchive.cc:812 +msgid "No selections matched" +msgstr "Dim dewisiadau'n cyfateb" + +#: ftparchive/apt-ftparchive.cc:892 +#, 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:68 +#, 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:86 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "Hen gronfa data, yn ceisio uwchraddio %s" + +#: ftparchive/cachedb.cc:97 +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:102 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Ni ellir agor y ffeil DB2 %s: %s" + +#: ftparchive/cachedb.cc:185 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:327 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Methwyd darllen y cyswllt %s" + +#: ftparchive/cachedb.cc:360 +msgid "Archive has no control record" +msgstr "Does dim cofnod rheoli gan yr archif" + +#: ftparchive/cachedb.cc:527 +msgid "Unable to get a cursor" +msgstr "Ni ellir cael cyrchydd" + +#: ftparchive/writer.cc:104 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" + +#: ftparchive/writer.cc:109 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "Rh: Ni ellir gwneud stat() o %s\n" + +#: ftparchive/writer.cc:165 +msgid "E: " +msgstr "G: " + +#: ftparchive/writer.cc:167 +msgid "W: " +msgstr "Rh: " + +#: ftparchive/writer.cc:174 +msgid "E: Errors apply to file " +msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " + +#: ftparchive/writer.cc:192 ftparchive/writer.cc:224 +#, c-format +msgid "Failed to resolve %s" +msgstr "Methwyd datrys %s" + +#: ftparchive/writer.cc:205 +msgid "Tree walking failed" +msgstr "Methwyd cerdded y goeden" + +#: ftparchive/writer.cc:232 +#, c-format +msgid "Failed to open %s" +msgstr "Methwyd agor %s" + +# FIXME +#: ftparchive/writer.cc:291 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " DatGysylltu %s [%s]\n" + +#: ftparchive/writer.cc:299 +#, c-format +msgid "Failed to readlink %s" +msgstr "Methwyd darllen y cyswllt %s" + +#: ftparchive/writer.cc:303 +#, c-format +msgid "Failed to unlink %s" +msgstr "Methwyd datgysylltu %s" + +#: ftparchive/writer.cc:311 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** Methwyd cysylltu %s at %s" + +#: ftparchive/writer.cc:321 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr " Tarwyd y terfyn cyswllt %sB.\n" + +#: ftparchive/writer.cc:426 +msgid "Archive had no package field" +msgstr "Doedd dim maes pecyn gan yr archif" + +#: ftparchive/writer.cc:434 ftparchive/writer.cc:698 +#, c-format +msgid " %s has no override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/writer.cc:501 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 +#, fuzzy, c-format +msgid " %s has no source override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/writer.cc:716 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Methwyd neilltuo cof" + +#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#, c-format +msgid "Unable to open %s" +msgstr "Ni ellir agor %s" + +#. 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:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" + +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" + +#: ftparchive/multicompress.cc:72 +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Dull Cywasgu Anhysbys '%s'" + +#: ftparchive/multicompress.cc:102 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" + +#: ftparchive/multicompress.cc:193 +msgid "Failed to fork" +msgstr "Methodd fork()" + +#: ftparchive/multicompress.cc:206 +#, fuzzy +msgid "Compress child" +msgstr "Plentyn Cywasgu" + +#: ftparchive/multicompress.cc:229 +#, fuzzy, c-format +msgid "Internal error, failed to create %s" +msgstr "Gwall Mewnol, Methwyd creu %s" + +#: ftparchive/multicompress.cc:302 +msgid "IO to subprocess/file failed" +msgstr "Methodd MA i isbroses/ffeil" + +#: ftparchive/multicompress.cc:340 +msgid "Failed to read while computing MD5" +msgstr "Methwyd darllen wrth gyfrifo MD5" + +#: ftparchive/multicompress.cc:356 +#, c-format +msgid "Problem unlinking %s" +msgstr "Gwall wrth datgysylltu %s" + +#: ftparchive/multicompress.cc:371 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:50 +#, fuzzy +msgid "" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:91 +msgid "Unknown package record!" +msgstr "Cofnod pecyn anhysbys!" + +#: cmdline/apt-sortpkgs.cc:154 +#, fuzzy +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n" +"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" -s Defnyddio trefnu ffeil ffynhonell\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" + #: apt-inst/filelist.cc:380 msgid "DropNode called on still linked node" msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" @@ -3631,7 +3707,7 @@ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" msgid "Internal error, could not locate member %s" msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: apt-inst/deb/debfile.cc:231 +#: apt-inst/deb/debfile.cc:227 #, fuzzy msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" @@ -3661,90 +3737,118 @@ msgstr "Mae'r archif yn rhy fyr" msgid "Failed to read the archive headers" msgstr "Methwyd darllen pennawdau'r archif" -#: apt-inst/contrib/extracttar.cc:128 +#: apt-inst/contrib/extracttar.cc:123 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:155 +#: apt-inst/contrib/extracttar.cc:150 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222 +#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:207 +#: apt-inst/contrib/extracttar.cc:202 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:312 +#: apt-inst/contrib/extracttar.cc:307 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" #, fuzzy -#~ msgid "Total dependency version space: " -#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " +#~ msgid "%s %s for %s compiled on %s %s\n" +#~ msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#~ msgid "You don't have enough free space in %s" -#~ msgstr "Does dim digon o le rhydd yn %s gennych" +#~ msgid "Failed to create FILE*" +#~ msgstr "Methwyd creu FILE*" -#~ msgid "Done" -#~ msgstr "Wedi Gorffen" +#, fuzzy +#~ msgid "Malformed stanza %u in source list %s (URI parse)" +#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" #, fuzzy -#~ msgid "No keyring installed in %s." -#~ msgstr "Yn Erthylu'r Sefydliad." +#~ msgid "Malformed line %lu in source list %s ([option] unparseable)" +#~ msgstr "" +#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" #, fuzzy -#~ msgid "Internal error, Upgrade broke stuff" -#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" +#~ msgid "Malformed line %lu in source list %s ([option] too short)" +#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#~ msgid "%s not a valid DEB package." -#~ msgstr "Nid yw %s yn becyn DEB dilys." +#, fuzzy +#~ msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" +#~ msgstr "" +#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" #, fuzzy -#~ msgid "Note, selecting '%s' for task '%s'\n" -#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" +#~ msgid "Malformed line %lu in source list %s ([%s] has no key)" +#~ msgstr "" +#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" #, fuzzy -#~ msgid "Note, selecting '%s' for regex '%s'\n" -#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" +#~ 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)" -#~ msgid "Package %s is a virtual package provided by:\n" -#~ msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" +#~ msgid "Malformed line %lu in source list %s (URI)" +#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#, fuzzy -#~ msgid " [Not candidate version]" -#~ msgstr "Fersiynau Posib" +#~ msgid "Malformed line %lu in source list %s (dist)" +#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#~ msgid "You should explicitly select one to install." -#~ msgstr "Dylech ddewis un yn benodol i'w sefydlu." +#~ msgid "Malformed line %lu in source list %s (URI parse)" +#~ msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -# FIXME: punctuation #, fuzzy -#~ msgid "" -#~ "Package %s is not available, but is referred to by another package.\n" -#~ "This may mean that the package is missing, has been obsoleted, or\n" -#~ "is only available from another source\n" +#~ msgid "Malformed line %lu in source list %s (absolute dist)" #~ msgstr "" -#~ "Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" -#~ "Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond " -#~ "heb\n" -#~ "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" -#~ "ffeil sources.list.\n" +#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#~ msgid "However the following packages replace it:" -#~ msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" +#~ msgid "Malformed line %lu in source list %s (dist parse)" +#~ msgstr "" +#~ "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" + +#~ msgid "Package %s %s was not found while processing file dependencies" +#~ msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" + +#~ msgid "Couldn't stat source package list %s" +#~ msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" + +#~ msgid "Collecting File Provides" +#~ msgstr "Yn Casglu Darpariaethau Ffeil" +# FIXME: number? #, fuzzy -#~ msgid "Package '%s' has no installation candidate" -#~ msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" +#~ msgid "Unable to find hash sum for '%s' in Release file" +#~ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#~ msgid "Vendor block %s contains no fingerprint" +#~ msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" #, fuzzy -#~ msgid "Note, selecting '%s' instead of '%s'\n" -#~ msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" +#~ msgid "Total dependency version space: " +#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " + +#~ msgid "You don't have enough free space in %s" +#~ msgstr "Does dim digon o le rhydd yn %s gennych" + +#~ msgid "Done" +#~ msgstr "Wedi Gorffen" + +#, fuzzy +#~ msgid "No keyring installed in %s." +#~ msgstr "Yn Erthylu'r Sefydliad." + +#, fuzzy +#~ msgid "Internal error, Upgrade broke stuff" +#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + +#~ msgid "%s not a valid DEB package." +#~ msgstr "Nid yw %s yn becyn DEB dilys." #, fuzzy #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" |