diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-03-09 01:34:10 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-03-16 17:59:31 +0100 |
| commit | d61960d9244340956a27f4ca46aecd15cc75e18b (patch) | |
| tree | c8f7cb33e08c84bcf06fbff39647dc03bc103afb /po/cy.po | |
| parent | b0be0e09cfbbcb033eb0b92eaf17ac31a6b9f423 (diff) | |
| parent | 1a0619ac765cc0b2f4906c96c1a4d7f510569a3f (diff) | |
merge debian/sid into debian/experimental
Diffstat (limited to 'po/cy.po')
| -rw-r--r-- | po/cy.po | 2170 |
1 files changed, 1052 insertions, 1118 deletions
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-11-06 09:45+0100\n" +"POT-Creation-Date: 2015-01-16 04:37-0500\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,169 @@ msgstr "" msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:317 +#: cmdline/apt-cache.cc:277 #, fuzzy msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:319 +#: cmdline/apt-cache.cc:279 #, fuzzy msgid "Total package structures: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:359 +#: cmdline/apt-cache.cc:319 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:360 +#: cmdline/apt-cache.cc:320 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:361 +#: cmdline/apt-cache.cc:321 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:362 +#: cmdline/apt-cache.cc:322 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:363 +#: cmdline/apt-cache.cc:323 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:365 +#: cmdline/apt-cache.cc:325 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:367 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:369 +#: cmdline/apt-cache.cc:329 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:372 +#: cmdline/apt-cache.cc:332 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:374 +#: cmdline/apt-cache.cc:334 #, fuzzy msgid "Total Desc/File relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:376 +#: cmdline/apt-cache.cc:336 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:428 +#: cmdline/apt-cache.cc:348 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:434 +#: cmdline/apt-cache.cc:362 +#, fuzzy +msgid "Total dependency version space: " +msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " + +#: cmdline/apt-cache.cc:367 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:449 +#: cmdline/apt-cache.cc:375 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234 +#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 #: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521 -#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59 +#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1442 +#: cmdline/apt-cache.cc:1444 cmdline/apt-cache.cc:1521 cmdline/apt-mark.cc:59 #: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41 +#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1500 +#: cmdline/apt-cache.cc:1421 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658 +#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1625 +#: cmdline/apt-cache.cc:1546 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723 +#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1646 +#: cmdline/apt-cache.cc:1567 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703 +#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1666 +#: cmdline/apt-cache.cc:1587 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1667 +#: cmdline/apt-cache.cc:1588 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693 +#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1700 +#: cmdline/apt-cache.cc:1621 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1709 +#: cmdline/apt-cache.cc:1630 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388 -#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220 +#: cmdline/apt-cache.cc:1743 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1591 cmdline/apt-helper.cc:84 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 #: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 #: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1829 +#: cmdline/apt-cache.cc:1750 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -312,84 +317,79 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:246 +#: cmdline/apt-get.cc:245 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:322 +#: cmdline/apt-get.cc:327 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:325 +#: cmdline/apt-get.cc:330 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:362 +#: cmdline/apt-get.cc:367 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: cmdline/apt-get.cc:418 +#: cmdline/apt-get.cc:423 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:449 +#: cmdline/apt-get.cc:454 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81 -#: apt-private/private-install.cc:863 +#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 +#: apt-private/private-install.cc:865 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83 +#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127 +#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541 +#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157 -#, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" - -#: cmdline/apt-get.cc:620 +#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:738 +#: cmdline/apt-get.cc:726 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083 +#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:796 +#: cmdline/apt-get.cc:786 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:801 +#: cmdline/apt-get.cc:791 #, c-format msgid "" "Please use:\n" @@ -397,95 +397,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:839 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" +#: cmdline/apt-get.cc:873 cmdline/apt-get.cc:876 +#: apt-private/private-install.cc:187 apt-private/private-install.cc:190 +#, fuzzy, c-format +msgid "Couldn't determine free space in %s" +msgstr "Does dim digon o le rhydd yn %s gennych" + +#: cmdline/apt-get.cc:886 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "Does dim digon o le rhydd yn %s gennych" + #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:879 +#: cmdline/apt-get.cc:895 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:900 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:890 +#: cmdline/apt-get.cc:906 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:924 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289 +#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:945 +#: cmdline/apt-get.cc:954 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:967 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:968 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:987 +#: cmdline/apt-get.cc:996 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1006 +#: cmdline/apt-get.cc:1015 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1025 +#: cmdline/apt-get.cc:1034 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:1043 +#: cmdline/apt-get.cc:1059 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1060 -#, c-format -msgid "Note, using directory '%s' to get the build dependencies\n" -msgstr "" - -#: cmdline/apt-get.cc:1070 -#, fuzzy, c-format -msgid "Note, using file '%s' to get the build dependencies\n" -msgstr "Methwyd prosesu dibyniaethau adeiladu" - -#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098 +#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:1118 +#: cmdline/apt-get.cc:1106 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1276 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -494,7 +495,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1306 +#: cmdline/apt-get.cc:1294 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -503,14 +504,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1329 +#: cmdline/apt-get.cc:1317 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:1368 +#: cmdline/apt-get.cc:1356 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -519,7 +520,7 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:1374 +#: cmdline/apt-get.cc:1362 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -528,32 +529,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1397 +#: cmdline/apt-get.cc:1385 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1412 +#: cmdline/apt-get.cc:1400 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1417 +#: cmdline/apt-get.cc:1405 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1615 +#: cmdline/apt-get.cc:1596 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1656 +#: cmdline/apt-get.cc:1637 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -649,11 +650,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-helper.cc:69 +#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:82 +#: cmdline/apt-helper.cc:91 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -692,8 +693,9 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" msgid "%s was already not hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285 -#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 +#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 +#: apt-pkg/deb/dpkgpm.cc:1317 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -795,12 +797,12 @@ msgstr "Ffeil heb ei ganfod" msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605 +#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -809,34 +811,34 @@ 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." @@ -845,126 +847,126 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:281 +#: methods/ftp.cc:280 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" -#: methods/ftp.cc:307 +#: methods/ftp.cc:306 #, 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:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:351 +#: methods/ftp.cc:350 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:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1476 +#: apt-pkg/contrib/fileutl.cc:1485 apt-pkg/contrib/fileutl.cc:1490 +#: apt-pkg/contrib/fileutl.cc:1492 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:361 methods/rsh.cc:209 +#: methods/ftp.cc:360 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:378 methods/ftp.cc:390 +#: methods/ftp.cc:377 methods/ftp.cc:389 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:462 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:872 +#: apt-pkg/contrib/fileutl.cc:1598 apt-pkg/contrib/fileutl.cc:1607 +#: apt-pkg/contrib/fileutl.cc:1612 apt-pkg/contrib/fileutl.cc:1614 +#: apt-pkg/contrib/fileutl.cc:1639 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743 +#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:713 +#: methods/ftp.cc:712 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:716 methods/connect.cc:116 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:719 +#: methods/ftp.cc:718 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:736 +#: methods/ftp.cc:735 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:750 +#: methods/ftp.cc:749 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:754 +#: methods/ftp.cc:753 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:761 +#: methods/ftp.cc:760 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:793 +#: methods/ftp.cc:792 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:803 +#: methods/ftp.cc:802 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:812 +#: methods/ftp.cc:811 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:832 +#: methods/ftp.cc:831 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:839 +#: methods/ftp.cc:838 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319 +#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:892 +#: methods/ftp.cc:890 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:907 methods/rsh.cc:338 +#: methods/ftp.cc:905 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:944 +#: methods/ftp.cc:935 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1027 +#: methods/ftp.cc:1014 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1141 +#: methods/ftp.cc:1128 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1030,72 +1032,72 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:168 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:172 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:185 +#: methods/gpgv.cc:174 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:180 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:195 +#: methods/gpgv.cc:184 msgid "Unknown error executing apt-key" msgstr "" -#: methods/gpgv.cc:228 methods/gpgv.cc:235 +#: methods/gpgv.cc:217 methods/gpgv.cc:224 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:242 +#: methods/gpgv.cc:231 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:79 +#: methods/gzip.cc:69 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:515 +#: methods/http.cc:513 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:529 +#: methods/http.cc:527 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:531 +#: methods/http.cc:529 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:567 +#: methods/http.cc:565 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:627 +#: methods/http.cc:625 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:632 +#: methods/http.cc:630 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:655 +#: methods/http.cc:653 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" @@ -1103,51 +1105,44 @@ msgstr "Gwall wrth ysgrifennu i ffeil allbwn" msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/server.cc:110 +#: methods/server.cc:111 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/server.cc:135 methods/server.cc:142 +#: methods/server.cc:136 methods/server.cc:143 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/server.cc:172 +#: methods/server.cc:173 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/server.cc:195 +#: methods/server.cc:193 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/server.cc:197 +#: methods/server.cc:195 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/server.cc:221 +#: methods/server.cc:219 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/server.cc:497 +#: methods/server.cc:494 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:514 methods/server.cc:608 +#: methods/server.cc:511 methods/server.cc:567 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:580 -#, c-format -msgid "" -"Automatically disabled %s due to incorrect response from server/proxy. (man " -"5 apt.conf)" -msgstr "" - -#: methods/server.cc:703 +#: methods/server.cc:659 msgid "Internal error" msgstr "Gwall mewnol" @@ -1155,67 +1150,72 @@ msgstr "Gwall mewnol" msgid "Sorting" msgstr "" -#: apt-private/private-install.cc:81 +#: apt-private/private-install.cc:82 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-private/private-install.cc:90 +#: apt-private/private-install.cc:91 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: apt-private/private-install.cc:109 +#: apt-private/private-install.cc:110 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: apt-private/private-install.cc:147 +#: apt-private/private-install.cc:148 msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:154 +#: apt-private/private-install.cc:155 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:159 +#: apt-private/private-install.cc:160 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:167 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:172 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: apt-private/private-install.cc:185 apt-private/private-download.cc:117 +#: apt-private/private-install.cc:200 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Does dim digon o le rhydd gennych yn %s." + +#: apt-private/private-install.cc:210 apt-private/private-download.cc:59 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: apt-private/private-install.cc:191 apt-private/private-install.cc:213 +#: apt-private/private-install.cc:216 apt-private/private-install.cc:238 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." #. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be #. careful with hard to type or special characters (like non-breaking spaces) -#: apt-private/private-install.cc:195 +#: apt-private/private-install.cc:220 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: apt-private/private-install.cc:197 +#: apt-private/private-install.cc:222 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1226,19 +1226,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:228 apt-private/private-install.cc:246 msgid "Abort." msgstr "Erthylu." -#: apt-private/private-install.cc:218 +#: apt-private/private-install.cc:243 msgid "Do you want to continue?" msgstr "Ydych chi eisiau mynd ymlaen?" -#: apt-private/private-install.cc:288 +#: apt-private/private-install.cc:313 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: apt-private/private-install.cc:295 +#: apt-private/private-install.cc:320 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1246,20 +1246,20 @@ 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:324 msgid "--fix-missing and media swapping is not currently supported" msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" -#: apt-private/private-install.cc:304 +#: apt-private/private-install.cc:329 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: apt-private/private-install.cc:305 +#: apt-private/private-install.cc:330 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:366 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1269,15 +1269,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:345 +#: apt-private/private-install.cc:370 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:366 +#: apt-private/private-install.cc:391 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:474 +#: apt-private/private-install.cc:499 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1293,16 +1293,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:502 apt-private/private-install.cc:653 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: apt-private/private-install.cc:481 +#: apt-private/private-install.cc:506 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: apt-private/private-install.cc:488 +#: apt-private/private-install.cc:513 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1312,7 +1312,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:517 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1320,18 +1320,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:519 msgid "Use 'apt-get autoremove' to remove it." msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:587 +#: apt-private/private-install.cc:612 msgid "You might want to run 'apt-get -f install' to correct these:" msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain:" # FIXME -#: apt-private/private-install.cc:589 +#: apt-private/private-install.cc:614 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1340,7 +1340,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: apt-private/private-install.cc:612 +#: apt-private/private-install.cc:638 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -1352,68 +1352,68 @@ 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:659 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: apt-private/private-install.cc:710 +#: apt-private/private-install.cc:712 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: apt-private/private-install.cc:800 +#: apt-private/private-install.cc:802 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: apt-private/private-install.cc:801 +#: apt-private/private-install.cc:803 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: apt-private/private-install.cc:823 +#: apt-private/private-install.cc:825 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: apt-private/private-install.cc:827 +#: apt-private/private-install.cc:829 #, fuzzy, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: apt-private/private-install.cc:839 +#: apt-private/private-install.cc:841 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: apt-private/private-install.cc:844 +#: apt-private/private-install.cc:846 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: apt-private/private-install.cc:892 +#: apt-private/private-install.cc:894 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: apt-private/private-install.cc:897 +#: apt-private/private-install.cc:899 #, fuzzy, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" #. TRANSLATORS: Note, this is not an interactive question -#: apt-private/private-install.cc:939 +#: apt-private/private-install.cc:941 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: apt-private/private-install.cc:945 +#: apt-private/private-install.cc:947 #, fuzzy, c-format msgid "Package '%s' is not installed, so not removed\n" msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" -#: apt-private/private-list.cc:121 +#: apt-private/private-list.cc:129 msgid "Listing" msgstr "" -#: apt-private/private-list.cc:151 +#: apt-private/private-list.cc:159 #, c-format msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" @@ -1421,31 +1421,31 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-cachefile.cc:95 +#: apt-private/private-cachefile.cc:93 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: apt-private/private-cachefile.cc:98 +#: apt-private/private-cachefile.cc:96 msgid " failed." msgstr " wedi methu." -#: apt-private/private-cachefile.cc:101 +#: apt-private/private-cachefile.cc:99 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: apt-private/private-cachefile.cc:104 +#: apt-private/private-cachefile.cc:102 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: apt-private/private-cachefile.cc:106 +#: apt-private/private-cachefile.cc:104 msgid " Done" msgstr " Wedi Gorffen" -#: apt-private/private-cachefile.cc:110 +#: apt-private/private-cachefile.cc:108 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." -#: apt-private/private-cachefile.cc:113 +#: apt-private/private-cachefile.cc:111 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." @@ -1614,7 +1614,7 @@ msgstr "I" msgid "N" msgstr "" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40 +#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1623,7 +1623,7 @@ msgstr "Gwall crynhoi patrwm - %s" msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: apt-private/private-update.cc:95 +#: apt-private/private-update.cc:97 #, c-format msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" msgid_plural "" @@ -1631,7 +1631,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-update.cc:99 +#: apt-private/private-update.cc:101 msgid "All packages are up to date." msgstr "" @@ -1655,46 +1655,29 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:62 -#, c-format -msgid "" -"Can't drop privileges for downloading as file '%s' couldn't be accessed by " -"user '%s'." -msgstr "" - -#: apt-private/private-download.cc:94 +#: apt-private/private-download.cc:36 #, fuzzy 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:40 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:103 apt-private/private-download.cc:110 +#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 #, 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:50 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:149 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 #, 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 -#, 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 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Does dim digon o le rhydd gennych yn %s." - #: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " @@ -1709,33 +1692,42 @@ msgstr "" msgid "Full Text Search" msgstr "" +#: apt-private/private-upgrade.cc:25 +#, fuzzy +msgid "Calculating upgrade" +msgstr "Yn Cyfrifo'r Uwchraddiad" + +#: apt-private/private-upgrade.cc:28 +msgid "Done" +msgstr "Wedi Gorffen" + #: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Presennol " -#: apt-private/acqprogress.cc:88 +#: apt-private/acqprogress.cc:90 msgid "Get:" msgstr "Cyrchu:" -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:121 msgid "Ign " msgstr "Anwybyddu " -#: apt-private/acqprogress.cc:126 +#: apt-private/acqprogress.cc:125 msgid "Err " msgstr "Gwall " -#: apt-private/acqprogress.cc:150 +#: apt-private/acqprogress.cc:146 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" -#: apt-private/acqprogress.cc:240 +#: apt-private/acqprogress.cc:236 #, c-format 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" @@ -1748,18 +1740,18 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121 -#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381 -#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487 -#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471 +#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/init.cc:103 +#: apt-pkg/init.cc:111 apt-pkg/clean.cc:43 apt-pkg/acquire.cc:494 +#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/contrib/fileutl.cc:368 apt-pkg/contrib/fileutl.cc:481 +#: apt-pkg/contrib/cdromutl.cc:205 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558 -#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 -#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49 +#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:500 +#: apt-pkg/acquire.cc:525 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1836,461 +1828,212 @@ msgstr "" msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -# FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:227 -#, 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:257 apt-pkg/contrib/fileutl.cc:2092 -#, fuzzy, c-format -msgid "Unable to mkstemp %s" -msgstr "Ni ellir gwneud stat() o %s" - -#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392 -#: apt-pkg/contrib/fileutl.cc:2097 -#, c-format -msgid "Unable to write to %s" -msgstr "Ni ellir ysgrifennu i %s" - -#: cmdline/apt-extracttemplates.cc:303 -msgid "Cannot get debconf version. Is debconf installed?" -msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" - -#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 -msgid "Package extension list is too long" -msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." - -#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 -#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 -#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 -#, fuzzy, c-format -msgid "Error processing directory %s" -msgstr "Gwall wrth brosesu'r cyfeiriadur %s" - -#: ftparchive/apt-ftparchive.cc:281 -msgid "Source extension list is too long" -msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" -#: ftparchive/apt-ftparchive.cc:401 -msgid "Error writing header to contents file" -msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Methyd lleoli yr elfen <hash>!" -#: ftparchive/apt-ftparchive.cc:431 -#, fuzzy, c-format -msgid "Error processing contents %s" -msgstr "Gwall wrth Brosesu Cynnwys %s" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Methwyd neilltuo dargyfeiriad" -# FIXME: full stops -#: ftparchive/apt-ftparchive.cc:626 +#: apt-inst/filelist.cc:464 #, 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:822 -msgid "No selections matched" -msgstr "Dim dewisiadau'n cyfateb" - -#: ftparchive/apt-ftparchive.cc:907 -#, 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'" +msgid "Internal error in AddDiversion" +msgstr "Gwall Mewnol yn AddDiversion" -#: ftparchive/cachedb.cc:67 +#: apt-inst/filelist.cc:477 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" -#: ftparchive/cachedb.cc:85 +# FIXME: "the" +#: apt-inst/filelist.cc:506 #, 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 "" +msgid "Double add of diversion %s -> %s" +msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" -#: ftparchive/cachedb.cc:101 +#: apt-inst/filelist.cc:549 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Ni ellir agor y ffeil DB2 %s: %s" +msgid "Duplicate conf file %s/%s" +msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199 -#: apt-inst/extract.cc:216 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, 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" +msgid "The path %s is too long" +msgstr "Mae'r llwybr %s yn rhy hir" -#: ftparchive/writer.cc:104 +#: apt-inst/extract.cc:132 #, c-format -msgid "W: Unable to read directory %s\n" -msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" +msgid "Unpacking %s more than once" +msgstr "Yn dadbacio %s mwy nag unwaith" -#: ftparchive/writer.cc:109 +#: apt-inst/extract.cc:142 #, 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 " +msgid "The directory %s is diverted" +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: ftparchive/writer.cc:192 ftparchive/writer.cc:224 +#: apt-inst/extract.cc:152 #, c-format -msgid "Failed to resolve %s" -msgstr "Methwyd datrys %s" +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" -#: ftparchive/writer.cc:205 -msgid "Tree walking failed" -msgstr "Methwyd cerdded y goeden" +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Mae llwybr y dargyfeiriad yn rhy hir" -#: ftparchive/writer.cc:232 +#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 +#: ftparchive/cachedb.cc:182 #, c-format -msgid "Failed to open %s" -msgstr "Methwyd agor %s" +msgid "Failed to stat %s" +msgstr "Methodd stat() o %s" -# FIXME -#: ftparchive/writer.cc:291 +#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 #, c-format -msgid " DeLink %s [%s]\n" -msgstr " DatGysylltu %s [%s]\n" +msgid "Failed to rename %s to %s" +msgstr "Methwyd ailenwi %s at %s" -#: ftparchive/writer.cc:299 +#: apt-inst/extract.cc:249 #, c-format -msgid "Failed to readlink %s" -msgstr "Methwyd darllen y cyswllt %s" +msgid "The directory %s is being replaced by a non-directory" +msgstr "" +"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: ftparchive/writer.cc:303 -#, c-format -msgid "Failed to unlink %s" -msgstr "Methwyd datgysylltu %s" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" -#: ftparchive/writer.cc:311 -#, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Methwyd cysylltu %s at %s" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Mae'r llwybr yn rhy hir" -#: ftparchive/writer.cc:321 +# FIXME: wtf? +#: apt-inst/extract.cc:421 #, 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" +msgid "Overwrite package match with no version for %s" +msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: ftparchive/writer.cc:435 ftparchive/writer.cc:706 +#: apt-inst/extract.cc:438 #, c-format -msgid " %s has no override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" -#: ftparchive/writer.cc:502 ftparchive/writer.cc:870 +#: apt-inst/extract.cc:498 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " Cynaliwr %s yw %s nid %s\n" - -#: ftparchive/writer.cc:720 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" +msgid "Unable to stat %s" +msgstr "Ni ellir gwneud stat() o %s" -#: ftparchive/writer.cc:724 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, 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" +msgid "Failed to write file %s" +msgstr "Methwyd ysgrifennu ffeil %s" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#: apt-inst/dirstream.cc:105 #, 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" +msgid "Failed to close file %s" +msgstr "Methwyd cau ffeil %s" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, 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" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: ftparchive/multicompress.cc:73 +#: apt-inst/deb/debfile.cc:132 #, 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" +msgid "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Methwyd creu FILE*" +#: apt-inst/deb/debfile.cc:227 +#, fuzzy +msgid "Unparsable control file" +msgstr "Ffeil rheoli ni ellir ei ramadegu" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Methodd fork()" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Llofnod archif annilys" -#: ftparchive/multicompress.cc:209 -#, fuzzy -msgid "Compress child" -msgstr "Plentyn Cywasgu" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: ftparchive/multicompress.cc:232 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format -msgid "Internal error, failed to create %s" -msgstr "Gwall Mewnol, Methwyd creu %s" +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Methodd MA i isbroses/ffeil" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Pennawd aelod archif annilys" -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Methwyd darllen wrth gyfrifo MD5" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Mae'r archif yn rhy fyr" -#: ftparchive/multicompress.cc:359 -#, c-format -msgid "Problem unlinking %s" -msgstr "Gwall wrth datgysylltu %s" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Methwyd darllen pennawdau'r archif" -#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 -#, c-format -msgid "Failed to rename %s to %s" -msgstr "Methwyd ailenwi %s at %s" +#: apt-inst/contrib/extracttar.cc:124 +msgid "Failed to create pipes" +msgstr "Methwyd creu pibau" -# FIXME: "debian" -#: cmdline/apt-internal-solver.cc:49 -#, 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" +#: apt-inst/contrib/extracttar.cc:151 +msgid "Failed to exec gzip " +msgstr "Methwyd gweithredu gzip" -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Cofnod pecyn anhysbys!" +#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 +msgid "Corrupted archive" +msgstr "Archif llygredig" -#: cmdline/apt-sortpkgs.cc:153 +#: apt-inst/contrib/extracttar.cc:203 #, 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" +msgid "Tar checksum failed, archive corrupted" +msgstr "Methodd swm gwirio Tar, archif llygredig" + +#: apt-inst/contrib/extracttar.cc:308 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Math pennawd TAR anhysbys %u, aelod %s" -#: apt-pkg/install-progress.cc:59 +#: apt-pkg/install-progress.cc:57 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176 +#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 msgid "Running dpkg" msgstr "" -#: apt-pkg/init.cc:156 +#: apt-pkg/init.cc:146 #, 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:162 #, 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:236 apt-pkg/indexcopy.cc:773 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2317,111 +2060,105 @@ msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." -#: apt-pkg/pkgcache.cc:149 +#: apt-pkg/pkgcache.cc:155 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166 +#: apt-pkg/pkgcache.cc:161 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:160 +#: apt-pkg/pkgcache.cc:166 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" -#: apt-pkg/pkgcache.cc:163 +#: apt-pkg/pkgcache.cc:169 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Mae'r ffeil storfa pecyn yn llygredig" # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:170 +#: apt-pkg/pkgcache.cc:174 #, fuzzy, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" -#: apt-pkg/pkgcache.cc:180 -#, fuzzy, c-format -msgid "The package cache was built for different architectures: %s vs %s" +#: apt-pkg/pkgcache.cc:179 +msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:317 +#: apt-pkg/pkgcache.cc:321 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:317 +#: apt-pkg/pkgcache.cc:321 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:317 +#: apt-pkg/pkgcache.cc:321 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:322 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:322 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:322 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:323 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:323 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:323 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:330 +#: apt-pkg/pkgcache.cc:334 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:330 +#: apt-pkg/pkgcache.cc:334 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:330 +#: apt-pkg/pkgcache.cc:334 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:331 +#: apt-pkg/pkgcache.cc:335 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:331 +#: apt-pkg/pkgcache.cc:335 msgid "extra" msgstr "ychwanegol" -#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178 -#, fuzzy -msgid "Calculating upgrade" -msgstr "Yn Cyfrifo'r Uwchraddiad" - -#: apt-pkg/acquire-worker.cc:133 +#: apt-pkg/acquire-worker.cc:116 #, c-format msgid "The method driver %s could not be found." msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-pkg/acquire-worker.cc:135 +#: apt-pkg/acquire-worker.cc:118 #, c-format msgid "Is the package %s installed?" msgstr "" -#: apt-pkg/acquire-worker.cc:186 +#: apt-pkg/acquire-worker.cc:169 #, c-format msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:485 +#: apt-pkg/acquire-worker.cc:455 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2464,70 +2201,26 @@ msgstr "Methwyd agor %s" msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/acquire-item.cc:98 -msgid "Use --allow-insecure-repositories to force the update" -msgstr "" - -#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108 +#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2047 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:245 +#: apt-pkg/acquire-item.cc:163 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:250 +#: apt-pkg/acquire-item.cc:168 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" -#: apt-pkg/acquire-item.cc:255 +#: apt-pkg/acquire-item.cc:173 #, fuzzy msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:260 -#, fuzzy -msgid "Signature error" -msgstr "Gwall ysgrifennu" - -#: apt-pkg/acquire-item.cc:264 -msgid "Does not start with a cleartext signature" -msgstr "" - -#: apt-pkg/acquire-item.cc:1588 -#, 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" -msgstr "" - -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604 -#, 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:2194 -#, c-format -msgid "" -"The data from '%s' is not signed. Packages from that repository can not be " -"authenticated." -msgstr "" - -#: apt-pkg/acquire-item.cc:1952 +#: apt-pkg/acquire-item.cc:1640 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -2535,36 +2228,42 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1971 +#: apt-pkg/acquire-item.cc:1656 #, fuzzy, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/acquire-item.cc:1995 +#: apt-pkg/acquire-item.cc:1698 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:2033 +#: apt-pkg/acquire-item.cc:1736 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:2055 +#: apt-pkg/acquire-item.cc:1758 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:2074 +#: apt-pkg/acquire-item.cc:1788 #, c-format msgid "" -"The repository '%s' does not have a Release file. This is deprecated, please " -"contact the owner of the repository." +"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" +msgstr "" + +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 +#, c-format +msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:2241 +#: apt-pkg/acquire-item.cc:1926 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2573,76 +2272,92 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:2307 +#: apt-pkg/acquire-item.cc:1992 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: apt-pkg/acquire-item.cc:2343 +#: apt-pkg/acquire-item.cc:2050 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/pkgcachegen.cc:113 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Ni ellir gwneud stat() o %s." + +#: apt-pkg/pkgcachegen.cc:93 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250 -#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 +#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 +#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 #: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 #: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 #: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 -#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525 -#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570 -#: apt-pkg/pkgcachegen.cc:584 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 +#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 +#: apt-pkg/pkgcachegen.cc:569 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:273 +#: 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:276 +#: 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:279 +#: 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:282 +#: 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:591 +#: apt-pkg/pkgcachegen.cc:576 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:1203 +#: apt-pkg/pkgcachegen.cc:1211 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395 -#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558 +#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 +#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/pkgcachegen.cc:1308 +#: apt-pkg/pkgcachegen.cc:1316 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507 +#: apt-pkg/pkgcachegen.cc:1400 cmdline/apt-extracttemplates.cc:259 +#, c-format +msgid "Unable to write to %s" +msgstr "Ni ellir ysgrifennu i %s" + +#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" @@ -2651,29 +2366,29 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829 +#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148 +#: apt-pkg/acquire.cc:91 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Mae'r cyfeiriadur archif %spartial ar goll." -#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39 +#: apt-pkg/acquire.cc:99 #, fuzzy, c-format -msgid "Clean of %s is not supported" -msgstr "Ni chynhelir y math ffeil mynegai '%s'" +msgid "Unable to lock directory %s" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:976 +#: apt-pkg/acquire.cc:902 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:978 +#: apt-pkg/acquire.cc:904 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" @@ -2688,15 +2403,10 @@ msgstr "" "rai eu defnyddio yn lle." # FIXME: ...file -#: apt-pkg/srcrecords.cc:52 +#: apt-pkg/srcrecords.cc:53 msgid "You must put some 'source' URIs in your sources.list" msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" -#: apt-pkg/clean.cc:64 -#, c-format -msgid "Unable to stat %s." -msgstr "Ni ellir gwneud stat() o %s." - #: apt-pkg/policy.cc:83 #, c-format msgid "" @@ -2720,20 +2430,20 @@ msgstr "Methwyd daeall y math pin %s" msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958 +#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:957 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581 +#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:631 +#: apt-pkg/packagemanager.cc:630 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2832,7 +2542,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1084 +#: apt-pkg/algorithms.cc:1086 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2840,7 +2550,7 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/algorithms.cc:1088 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." @@ -2849,56 +2559,50 @@ msgstr "" msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:237 +#: apt-pkg/edsp.cc:241 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:316 +#: apt-pkg/edsp.cc:320 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:323 +#: apt-pkg/edsp.cc:327 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623 +#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 msgid "Execute external solver" msgstr "" -# FIXME: number? -#: apt-pkg/tagfile.cc:169 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" - -#: apt-pkg/tagfile.cc:269 +#: apt-pkg/tagfile.cc:140 #, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" +msgid "Unable to parse package file %s (%d)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)" # FIXME: number? -#: apt-pkg/indexrecords.cc:83 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/indexrecords.cc:91 +#: apt-pkg/indexrecords.cc:86 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: apt-pkg/indexrecords.cc:139 +#: apt-pkg/indexrecords.cc:117 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:152 +#: apt-pkg/indexrecords.cc:130 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" # FIXME: number? -#: apt-pkg/indexrecords.cc:171 +#: apt-pkg/indexrecords.cc:149 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" @@ -2983,331 +2687,199 @@ msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" 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:501 +#: apt-pkg/cacheset.cc:489 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:504 +#: apt-pkg/cacheset.cc:492 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:634 +#: apt-pkg/cacheset.cc:603 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:640 +#: apt-pkg/cacheset.cc:609 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:646 +#: apt-pkg/cacheset.cc:615 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:690 +#: apt-pkg/cacheset.cc:626 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:734 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" - -#: apt-pkg/cacheset.cc:742 -#, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" - -#: apt-pkg/cacheset.cc:750 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" - -#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766 +#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:107 -#, fuzzy, c-format -msgid "Installing %s" -msgstr " Wedi Sefydlu: " - -#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011 -#, fuzzy, c-format -msgid "Configuring %s" -msgstr "Yn cysylltu i %s" - -#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Yn agor %s" - -#: apt-pkg/deb/dpkgpm.cc:110 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Methwyd dileu %s" - -#: apt-pkg/deb/dpkgpm.cc:111 +#: apt-pkg/cacheset.cc:647 #, c-format -msgid "Noting disappearance of %s" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:112 +#: apt-pkg/cacheset.cc:655 #, c-format -msgid "Running post-installation trigger %s" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:842 -#, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." - -#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Methwyd agor ffeil %s" - -#: apt-pkg/deb/dpkgpm.cc:1004 -#, fuzzy, c-format -msgid "Preparing %s" -msgstr "Yn agor %s" - -#: apt-pkg/deb/dpkgpm.cc:1005 -#, fuzzy, c-format -msgid "Unpacking %s" -msgstr "Yn agor %s" - -#: apt-pkg/deb/dpkgpm.cc:1010 -#, fuzzy, c-format -msgid "Preparing to configure %s" -msgstr "Yn agor y ffeil cyfluniad %s" - -#: apt-pkg/deb/dpkgpm.cc:1012 -#, fuzzy, c-format -msgid "Installed %s" -msgstr " Wedi Sefydlu: " - -#: apt-pkg/deb/dpkgpm.cc:1017 +#: apt-pkg/cacheset.cc:663 #, c-format -msgid "Preparing for removal of %s" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1019 -#, fuzzy, c-format -msgid "Removed %s" -msgstr "Argymell" - -#: apt-pkg/deb/dpkgpm.cc:1024 -#, fuzzy, c-format -msgid "Preparing to completely remove %s" -msgstr "Yn agor y ffeil cyfluniad %s" - -#: apt-pkg/deb/dpkgpm.cc:1025 -#, fuzzy, c-format -msgid "Completely removed %s" -msgstr "Methwyd dileu %s" - -#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134 -#: apt-pkg/deb/dpkgpm.cc:1160 -#, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Ni ellir ysgrifennu i %s" - -#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160 -msgid "Is /dev/pts mounted?" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1134 -msgid "Is stdout a terminal?" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1638 -msgid "Operation was interrupted before it could finish" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1700 -msgid "No apport report written because MaxReports is reached already" -msgstr "" - -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1705 -msgid "dependency problems - leaving unconfigured" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1707 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1713 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1720 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" +msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:418 +#, c-format +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1755 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 +#, c-format +msgid "%lih %limin %lis" msgstr "" -#: apt-pkg/deb/debsystem.cc:91 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" +msgid "%limin %lis" msgstr "" -#: apt-pkg/deb/debsystem.cc:94 -#, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" - -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:437 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgid "%lis" msgstr "" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: apt-pkg/contrib/strutl.cc:1258 +#, c-format +msgid "Selection %s not found" +msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/fileutl.cc:196 +#: apt-pkg/contrib/fileutl.cc:190 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:201 +#: apt-pkg/contrib/fileutl.cc:195 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:224 +#: apt-pkg/contrib/fileutl.cc:218 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:229 +#: apt-pkg/contrib/fileutl.cc:223 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480 +#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:400 +#: apt-pkg/contrib/fileutl.cc:394 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:418 +#: apt-pkg/contrib/fileutl.cc:412 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:427 +#: apt-pkg/contrib/fileutl.cc:421 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:846 +#: apt-pkg/contrib/fileutl.cc:824 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:848 +#: apt-pkg/contrib/fileutl.cc:826 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212 +#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:232 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:952 +#: apt-pkg/contrib/fileutl.cc:913 #, fuzzy, c-format msgid "Problem closing the gzip file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1140 +#: apt-pkg/contrib/fileutl.cc:1101 #, 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:1160 apt-pkg/contrib/fileutl.cc:1207 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123 +#: apt-pkg/contrib/fileutl.cc:1315 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1412 +#: apt-pkg/contrib/fileutl.cc:1373 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1553 +#: apt-pkg/contrib/fileutl.cc:1514 #, fuzzy, c-format msgid "read, still have %llu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688 +#: apt-pkg/contrib/fileutl.cc:1627 apt-pkg/contrib/fileutl.cc:1649 #, fuzzy, c-format msgid "write, still have %llu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:1954 +#: apt-pkg/contrib/fileutl.cc:1915 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1965 +#: apt-pkg/contrib/fileutl.cc:1927 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1976 +#: apt-pkg/contrib/fileutl.cc:1938 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1989 +#: apt-pkg/contrib/fileutl.cc:1951 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -3331,35 +2903,6 @@ msgstr "" msgid "%c%s... %u%%" msgstr "%c%s... Wedi Gorffen" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:425 -#, c-format -msgid "%lid %lih %limin %lis" -msgstr "" - -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 -#, c-format -msgid "%lih %limin %lis" -msgstr "" - -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:439 -#, c-format -msgid "%limin %lis" -msgstr "" - -#. s means seconds -#: apt-pkg/contrib/strutl.cc:444 -#, c-format -msgid "%lis" -msgstr "" - -#: apt-pkg/contrib/strutl.cc:1290 -#, c-format -msgid "Selection %s not found" -msgstr "Ni chanfuwyd y dewis %s" - #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" @@ -3423,64 +2966,70 @@ msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:519 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:630 +#: apt-pkg/contrib/configuration.cc:633 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:798 +#: apt-pkg/contrib/configuration.cc:801 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:817 +#: apt-pkg/contrib/configuration.cc:820 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:834 +#: apt-pkg/contrib/configuration.cc:837 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:874 +#: apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:884 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890 +#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:894 +#: apt-pkg/contrib/configuration.cc:897 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/contrib/configuration.cc:900 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:947 +#: apt-pkg/contrib/configuration.cc:950 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: apt-pkg/contrib/gpgv.cc:72 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Yn Erthylu'r Sefydliad." + # FIXME #: apt-pkg/contrib/cmndline.cc:124 #, c-format @@ -3529,179 +3078,564 @@ msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." msgid "Invalid operation %s" msgstr "Gweithred annilys %s" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" +#: apt-pkg/deb/dpkgpm.cc:112 +#, fuzzy, c-format +msgid "Installing %s" +msgstr " Wedi Sefydlu: " -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Methyd lleoli yr elfen <hash>!" +#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016 +#, fuzzy, c-format +msgid "Configuring %s" +msgstr "Yn cysylltu i %s" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Methwyd neilltuo dargyfeiriad" +#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023 +#, fuzzy, c-format +msgid "Removing %s" +msgstr "Yn agor %s" -#: apt-inst/filelist.cc:464 +#: apt-pkg/deb/dpkgpm.cc:115 +#, fuzzy, c-format +msgid "Completely removing %s" +msgstr "Methwyd dileu %s" + +#: apt-pkg/deb/dpkgpm.cc:116 +#, c-format +msgid "Noting disappearance of %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:117 +#, c-format +msgid "Running post-installation trigger %s" +msgstr "" + +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:847 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." + +#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Methwyd agor ffeil %s" + +#: apt-pkg/deb/dpkgpm.cc:1009 +#, fuzzy, c-format +msgid "Preparing %s" +msgstr "Yn agor %s" + +#: apt-pkg/deb/dpkgpm.cc:1010 +#, fuzzy, c-format +msgid "Unpacking %s" +msgstr "Yn agor %s" + +#: apt-pkg/deb/dpkgpm.cc:1015 +#, fuzzy, c-format +msgid "Preparing to configure %s" +msgstr "Yn agor y ffeil cyfluniad %s" + +#: apt-pkg/deb/dpkgpm.cc:1017 +#, fuzzy, c-format +msgid "Installed %s" +msgstr " Wedi Sefydlu: " + +#: apt-pkg/deb/dpkgpm.cc:1022 +#, c-format +msgid "Preparing for removal of %s" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1024 +#, fuzzy, c-format +msgid "Removed %s" +msgstr "Argymell" + +#: apt-pkg/deb/dpkgpm.cc:1029 +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Yn agor y ffeil cyfluniad %s" + +#: apt-pkg/deb/dpkgpm.cc:1030 +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Methwyd dileu %s" + +#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Ni ellir ysgrifennu i %s" + +#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1670 +msgid "Operation was interrupted before it could finish" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1732 +msgid "No apport report written because MaxReports is reached already" +msgstr "" + +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1737 +msgid "dependency problems - leaving unconfigured" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1739 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1745 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1752 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1787 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:91 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:94 +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 +#, c-format +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" + +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +# FIXME: "debian" +#: cmdline/apt-extracttemplates.cc:224 #, fuzzy -msgid "Internal error in AddDiversion" -msgstr "Gwall Mewnol yn AddDiversion" +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" -#: apt-inst/filelist.cc:477 +#: cmdline/apt-extracttemplates.cc:254 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Ni ellir gwneud stat() o %s" + +#: cmdline/apt-extracttemplates.cc:300 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" + +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 +msgid "Package extension list is too long" +msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." + +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 +#, fuzzy, c-format +msgid "Error processing directory %s" +msgstr "Gwall wrth brosesu'r cyfeiriadur %s" + +#: ftparchive/apt-ftparchive.cc:281 +msgid "Source extension list is too long" +msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" + +#: ftparchive/apt-ftparchive.cc:401 +msgid "Error writing header to contents file" +msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" + +#: ftparchive/apt-ftparchive.cc:431 +#, fuzzy, c-format +msgid "Error processing contents %s" +msgstr "Gwall wrth Brosesu Cynnwys %s" + +# FIXME: full stops +#: ftparchive/apt-ftparchive.cc:626 +#, 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:822 +msgid "No selections matched" +msgstr "Dim dewisiadau'n cyfateb" + +#: ftparchive/apt-ftparchive.cc:907 #, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" +msgid "Some files are missing in the package file group `%s'" +msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -# FIXME: "the" -#: apt-inst/filelist.cc:506 +#: ftparchive/cachedb.cc:65 #, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" +msgid "DB was corrupted, file renamed to %s.old" +msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: apt-inst/filelist.cc:549 +#: ftparchive/cachedb.cc:83 #, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Ffeil cyfluniad dyblyg %s/%s" +msgid "DB is old, attempting to upgrade %s" +msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#: ftparchive/cachedb.cc:94 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:99 #, c-format -msgid "The path %s is too long" -msgstr "Mae'r llwybr %s yn rhy hir" +msgid "Unable to open DB file %s: %s" +msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: apt-inst/extract.cc:132 +#: ftparchive/cachedb.cc:332 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Methwyd darllen y cyswllt %s" + +#: ftparchive/cachedb.cc:365 +msgid "Archive has no control record" +msgstr "Does dim cofnod rheoli gan yr archif" + +#: ftparchive/cachedb.cc:594 +msgid "Unable to get a cursor" +msgstr "Ni ellir cael cyrchydd" + +#: ftparchive/writer.cc:91 #, c-format -msgid "Unpacking %s more than once" -msgstr "Yn dadbacio %s mwy nag unwaith" +msgid "W: Unable to read directory %s\n" +msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: apt-inst/extract.cc:142 +#: ftparchive/writer.cc:96 #, c-format -msgid "The directory %s is diverted" -msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" +msgid "W: Unable to stat %s\n" +msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: apt-inst/extract.cc:152 +#: ftparchive/writer.cc:152 +msgid "E: " +msgstr "G: " + +#: ftparchive/writer.cc:154 +msgid "W: " +msgstr "Rh: " + +#: ftparchive/writer.cc:161 +msgid "E: Errors apply to file " +msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " + +#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 #, c-format -msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" +msgid "Failed to resolve %s" +msgstr "Methwyd datrys %s" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Mae llwybr y dargyfeiriad yn rhy hir" +#: ftparchive/writer.cc:192 +msgid "Tree walking failed" +msgstr "Methwyd cerdded y goeden" -#: apt-inst/extract.cc:249 +#: ftparchive/writer.cc:219 #, c-format -msgid "The directory %s is being replaced by a non-directory" -msgstr "" -"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" +msgid "Failed to open %s" +msgstr "Methwyd agor %s" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" +# FIXME +#: ftparchive/writer.cc:278 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr " DatGysylltu %s [%s]\n" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Mae'r llwybr yn rhy hir" +#: ftparchive/writer.cc:286 +#, c-format +msgid "Failed to readlink %s" +msgstr "Methwyd darllen y cyswllt %s" -# FIXME: wtf? -#: apt-inst/extract.cc:421 +#: ftparchive/writer.cc:290 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" +msgid "Failed to unlink %s" +msgstr "Methwyd datgysylltu %s" -#: apt-inst/extract.cc:438 +#: ftparchive/writer.cc:298 #, c-format -msgid "File %s/%s overwrites the one in the package %s" -msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" +msgid "*** Failed to link %s to %s" +msgstr "*** Methwyd cysylltu %s at %s" -#: apt-inst/extract.cc:498 +#: ftparchive/writer.cc:308 #, c-format -msgid "Unable to stat %s" -msgstr "Ni ellir gwneud stat() o %s" +msgid " DeLink limit of %sB hit.\n" +msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 -#, fuzzy, c-format -msgid "Failed to write file %s" -msgstr "Methwyd ysgrifennu ffeil %s" +#: ftparchive/writer.cc:417 +msgid "Archive had no package field" +msgstr "Doedd dim maes pecyn gan yr archif" -#: apt-inst/dirstream.cc:104 +#: ftparchive/writer.cc:425 ftparchive/writer.cc:684 #, c-format -msgid "Failed to close file %s" -msgstr "Methwyd cau ffeil %s" +msgid " %s has no override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 +#: ftparchive/writer.cc:493 ftparchive/writer.cc:840 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" +msgid " %s maintainer is %s not %s\n" +msgstr " Cynaliwr %s yw %s nid %s\n" -#: apt-inst/deb/debfile.cc:132 +#: ftparchive/writer.cc:698 #, fuzzy, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" +msgid " %s has no source override entry\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: apt-inst/deb/debfile.cc:227 -#, fuzzy -msgid "Unparsable control file" -msgstr "Ffeil rheoli ni ellir ei ramadegu" +#: ftparchive/writer.cc:702 +#, fuzzy, c-format +msgid " %s has no binary override entry either\n" +msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Llofnod archif annilys" +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Methwyd neilltuo cof" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Gwall wrth ddarllen pennawd aelod archif" +#: ftparchive/override.cc:38 ftparchive/override.cc:142 +#, c-format +msgid "Unable to open %s" +msgstr "Ni ellir agor %s" -#: apt-inst/contrib/arfile.cc:96 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Pennawd aelod archif annilys" +msgid "Malformed override %s line %llu (%s)" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Pennawd aelod archif annilys" +#: 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" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Mae'r archif yn rhy fyr" +#: ftparchive/override.cc:166 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #1" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Methwyd darllen pennawdau'r archif" +#: ftparchive/override.cc:178 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #2" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: apt-inst/contrib/extracttar.cc:123 -msgid "Failed to create pipes" -msgstr "Methwyd creu pibau" +#: ftparchive/override.cc:191 +#, fuzzy, c-format +msgid "Malformed override %s line %llu #3" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: apt-inst/contrib/extracttar.cc:150 -msgid "Failed to exec gzip " -msgstr "Methwyd gweithredu gzip" +#: ftparchive/multicompress.cc:73 +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Dull Cywasgu Anhysbys '%s'" -#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217 -msgid "Corrupted archive" -msgstr "Archif llygredig" +#: 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*" -#: apt-inst/contrib/extracttar.cc:202 +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Methodd fork()" + +#: ftparchive/multicompress.cc:209 #, fuzzy -msgid "Tar checksum failed, archive corrupted" -msgstr "Methodd swm gwirio Tar, archif llygredig" +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" -#: apt-inst/contrib/extracttar.cc:307 +#: ftparchive/multicompress.cc:343 +msgid "Failed to read while computing MD5" +msgstr "Methwyd darllen wrth gyfrifo MD5" + +#: ftparchive/multicompress.cc:359 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Math pennawd TAR anhysbys %u, aelod %s" +msgid "Problem unlinking %s" +msgstr "Gwall wrth datgysylltu %s" +# FIXME: "debian" +#: cmdline/apt-internal-solver.cc:49 #, fuzzy -#~ 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 "" +"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" -#~ msgid "Done" -#~ msgstr "Wedi Gorffen" +#: cmdline/apt-sortpkgs.cc:89 +msgid "Unknown package record!" +msgstr "Cofnod pecyn anhysbys!" +#: cmdline/apt-sortpkgs.cc:153 #, fuzzy -#~ msgid "No keyring installed in %s." -#~ msgstr "Yn Erthylu'r Sefydliad." +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" #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" |