diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2015-01-08 21:07:37 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2015-03-16 18:01:13 +0100 |
| commit | 2f6a2fbbdc9f76dc4eace83a427013f4e1c03afc (patch) | |
| tree | c831f594596241ef1ef56c20dbd1f4e39a6840b9 /po/cy.po | |
| parent | 3de7789a75c58204bcc979c72899cfdacba4e2ac (diff) | |
properly implement pkgRecord::Parser for *.deb files
Implementing FileName() works for most cases for us, but other
frontends might need more and even for us its not very stable as
the normal Jump() implementation is pretty bad on a deb file and
produce errors on its own at times.
So, replacing this makeshift with a complete implementation by
mostly just shuffling code around.
Diffstat (limited to 'po/cy.po')
| -rw-r--r-- | po/cy.po | 2734 |
1 files changed, 1395 insertions, 1339 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: 2015-01-16 04:37-0500\n" +"POT-Creation-Date: 2015-03-09 02:17+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -20,169 +20,164 @@ msgstr "" msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:277 +#: cmdline/apt-cache.cc:320 #, fuzzy msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:279 +#: cmdline/apt-cache.cc:322 #, fuzzy msgid "Total package structures: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:319 +#: cmdline/apt-cache.cc:362 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:363 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:321 +#: cmdline/apt-cache.cc:364 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:322 +#: cmdline/apt-cache.cc:365 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:366 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:368 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:370 #, fuzzy msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:329 +#: cmdline/apt-cache.cc:372 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:375 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:377 #, fuzzy msgid "Total Desc/File relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:336 +#: cmdline/apt-cache.cc:379 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:348 +#: cmdline/apt-cache.cc:433 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:362 -#, fuzzy -msgid "Total dependency version space: " -msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " - -#: cmdline/apt-cache.cc:367 +#: cmdline/apt-cache.cc:439 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:375 +#: cmdline/apt-cache.cc:454 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155 +#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239 #: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc: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 +#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526 +#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56 +#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1254 apt-private/private-search.cc:41 +#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1421 +#: cmdline/apt-cache.cc:1505 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1516 apt-pkg/cacheset.cc:596 +#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1546 +#: cmdline/apt-cache.cc:1630 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1553 cmdline/apt-cache.cc:1644 +#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1567 +#: cmdline/apt-cache.cc:1651 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1587 +#: cmdline/apt-cache.cc:1671 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1588 +#: cmdline/apt-cache.cc:1672 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1606 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1621 +#: cmdline/apt-cache.cc:1705 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1630 +#: cmdline/apt-cache.cc:1714 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: 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 +#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222 +#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47 +#: cmdline/apt-sortpkgs.cc:149 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1750 +#: cmdline/apt-cache.cc:1834 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -255,11 +250,11 @@ msgstr "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -#: cmdline/apt-cdrom.cc:76 +#: cmdline/apt-cdrom.cc:77 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:91 +#: cmdline/apt-cdrom.cc:92 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -267,12 +262,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:139 +#: cmdline/apt-cdrom.cc:140 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:178 +#: cmdline/apt-cdrom.cc:179 msgid "" "No CD-ROM could be auto-detected or found using the default mount point.\n" "You may try the --cdrom option to set the CD-ROM mount point.\n" @@ -280,7 +275,7 @@ msgid "" "mount point." msgstr "" -#: cmdline/apt-cdrom.cc:182 +#: cmdline/apt-cdrom.cc:183 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -317,79 +312,79 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:245 +#: cmdline/apt-get.cc:224 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:327 +#: cmdline/apt-get.cc:311 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:330 +#: cmdline/apt-get.cc:314 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:367 +#: cmdline/apt-get.cc:358 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: cmdline/apt-get.cc:423 +#: cmdline/apt-get.cc:414 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:454 +#: cmdline/apt-get.cc:445 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81 -#: apt-private/private-install.cc:865 +#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78 +#: apt-private/private-install.cc:863 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83 +#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127 +#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546 +#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611 +#: cmdline/apt-get.cc:598 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:726 +#: cmdline/apt-get.cc:716 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:1071 +#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:786 +#: cmdline/apt-get.cc:780 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:791 +#: cmdline/apt-get.cc:785 #, c-format msgid "" "Please use:\n" @@ -397,96 +392,95 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:839 +#: cmdline/apt-get.cc:833 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: 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:895 +#: cmdline/apt-get.cc:863 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:900 +#: cmdline/apt-get.cc:868 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:906 +#: cmdline/apt-get.cc:874 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:924 +#: cmdline/apt-get.cc:899 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:929 apt-private/private-install.cc:314 +#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:954 +#: cmdline/apt-get.cc:929 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:967 +#: cmdline/apt-get.cc:942 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:968 +#: cmdline/apt-get.cc:943 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:996 +#: cmdline/apt-get.cc:971 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1015 +#: cmdline/apt-get.cc:990 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1009 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:1059 +#: cmdline/apt-get.cc:1030 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1083 cmdline/apt-get.cc:1086 +#: cmdline/apt-get.cc:1047 +#, c-format +msgid "Note, using directory '%s' to get the build dependencies\n" +msgstr "" + +#: cmdline/apt-get.cc:1057 +#, fuzzy, c-format +msgid "Note, using file '%s' to get the build dependencies\n" +msgstr "Methwyd prosesu dibyniaethau adeiladu" + +#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:1106 +#: cmdline/apt-get.cc:1109 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1276 +#: cmdline/apt-get.cc:1279 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -495,7 +489,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1294 +#: cmdline/apt-get.cc:1297 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -504,14 +498,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1317 +#: cmdline/apt-get.cc:1320 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:1356 +#: cmdline/apt-get.cc:1359 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -520,7 +514,7 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:1362 +#: cmdline/apt-get.cc:1365 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -529,32 +523,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1385 +#: cmdline/apt-get.cc:1388 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1400 +#: cmdline/apt-get.cc:1403 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1408 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1498 cmdline/apt-get.cc:1510 +#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1596 +#: cmdline/apt-get.cc:1615 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1637 +#: cmdline/apt-get.cc:1656 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -650,11 +644,11 @@ msgstr "" msgid "Must specify at least one pair url/filename" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-helper.cc:73 cmdline/apt-helper.cc:77 +#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:91 +#: cmdline/apt-helper.cc:93 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -668,53 +662,53 @@ msgid "" " This APT helper has Super Meep Powers.\n" msgstr "" -#: cmdline/apt-mark.cc:68 +#: cmdline/apt-mark.cc:65 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-mark.cc:74 +#: cmdline/apt-mark.cc:71 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:76 +#: cmdline/apt-mark.cc:73 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:241 +#: cmdline/apt-mark.cc:238 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:243 +#: cmdline/apt-mark.cc:240 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 -#: apt-pkg/contrib/fileutl.cc:812 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1317 +#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397 +#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192 +#: apt-pkg/deb/dpkgpm.cc:1303 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 +#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 +#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Methwyd agor %s" -#: cmdline/apt-mark.cc:345 +#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:392 +#: cmdline/apt-mark.cc:450 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -797,12 +791,12 @@ msgstr "Ffeil heb ei ganfod" msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:61 methods/gzip.cc:117 methods/rred.cc:598 +#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598 #: methods/rred.cc:608 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:105 methods/gzip.cc:124 methods/rred.cc:605 +#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -811,34 +805,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:177 +#: methods/ftp.cc:178 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:183 +#: methods/ftp.cc:184 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:188 +#: methods/ftp.cc:189 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:219 methods/ftp.cc:247 +#: methods/ftp.cc:220 methods/ftp.cc:248 #, fuzzy, c-format msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" -#: methods/ftp.cc:225 +#: methods/ftp.cc:226 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:232 +#: methods/ftp.cc:233 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:252 +#: methods/ftp.cc:253 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -847,126 +841,126 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:280 +#: methods/ftp.cc:281 #, 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:306 +#: methods/ftp.cc:307 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:243 +#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:350 +#: methods/ftp.cc:351 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: 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 +#: 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 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:360 methods/rsh.cc:209 +#: methods/ftp.cc:361 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:377 methods/ftp.cc:389 +#: methods/ftp.cc:378 methods/ftp.cc:390 msgid "Protocol corruption" msgstr "Llygr protocol" -#: 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 +#: 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 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742 +#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:712 +#: methods/ftp.cc:713 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:716 methods/connect.cc:116 +#: methods/ftp.cc:717 methods/connect.cc:116 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:718 +#: methods/ftp.cc:719 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:735 +#: methods/ftp.cc:736 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:749 +#: methods/ftp.cc:750 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:753 +#: methods/ftp.cc:754 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:760 +#: methods/ftp.cc:761 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:792 +#: methods/ftp.cc:793 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:802 +#: methods/ftp.cc:803 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:811 +#: methods/ftp.cc:812 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:831 +#: methods/ftp.cc:832 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:838 +#: methods/ftp.cc:839 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:877 methods/server.cc:357 methods/rsh.cc:319 +#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:890 +#: methods/ftp.cc:892 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:905 methods/rsh.cc:338 +#: methods/ftp.cc:907 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:935 +#: methods/ftp.cc:944 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1014 +#: methods/ftp.cc:1027 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1128 +#: methods/ftp.cc:1141 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1032,72 +1026,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:168 +#: methods/gpgv.cc:158 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:162 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:174 +#: methods/gpgv.cc:164 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:180 +#: methods/gpgv.cc:170 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:184 +#: methods/gpgv.cc:174 msgid "Unknown error executing apt-key" msgstr "" -#: methods/gpgv.cc:217 methods/gpgv.cc:224 +#: methods/gpgv.cc:207 methods/gpgv.cc:214 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:231 +#: methods/gpgv.cc:221 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:69 +#: methods/gzip.cc:79 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:513 +#: methods/http.cc:517 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:527 +#: methods/http.cc:531 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:529 +#: methods/http.cc:533 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:565 +#: methods/http.cc:569 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:625 +#: methods/http.cc:629 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:630 +#: methods/http.cc:634 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:653 +#: methods/http.cc:657 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" @@ -1133,287 +1127,31 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/server.cc:494 +#: methods/server.cc:506 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:511 methods/server.cc:567 +#: methods/server.cc:523 methods/server.cc:617 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:659 -msgid "Internal error" -msgstr "Gwall mewnol" - -#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 -msgid "Sorting" -msgstr "" - -#: apt-private/private-install.cc:82 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" - -#: 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:110 -#, fuzzy -msgid "Internal error, Ordering didn't finish" -msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" - -#: 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: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: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: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: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:200 +#: methods/server.cc:589 #, 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: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:220 -msgid "Yes, do as I say!" -msgstr "Ie, gwna fel rydw i'n dweud!" - -#: apt-private/private-install.cc:222 -#, fuzzy, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n" -"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" -" ?]" - -#: apt-private/private-install.cc:228 apt-private/private-install.cc:246 -msgid "Abort." -msgstr "Erthylu." - -#: apt-private/private-install.cc:243 -msgid "Do you want to continue?" -msgstr "Ydych chi eisiau mynd ymlaen?" - -#: apt-private/private-install.cc:313 -msgid "Some files failed to download" -msgstr "Methodd rhai ffeiliau lawrlwytho" - -#: apt-private/private-install.cc:320 msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" msgstr "" -"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " -"geidio defnyddio --fix-missing?" - -#: 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:329 -msgid "Unable to correct missing packages." -msgstr "Ni ellir cywiro pecynnau ar goll." - -#: apt-private/private-install.cc:330 -#, fuzzy -msgid "Aborting install." -msgstr "Yn Erthylu'r Sefydliad." - -#: apt-private/private-install.cc:366 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -msgstr[1] "" - -#: apt-private/private-install.cc:370 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "" - -#: apt-private/private-install.cc:391 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" - -#: 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." -msgstr "" - -#. -#. if (Packages == 1) -#. { -#. c1out << std::endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" -#. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << std::endl; -#. } -#. -#: 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:506 -#, fuzzy -msgid "Internal Error, AutoRemover broke stuff" -msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" - -#: apt-private/private-install.cc:513 -#, fuzzy -msgid "" -"The following package was automatically installed and is no longer required:" -msgid_plural "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: apt-private/private-install.cc:517 -#, fuzzy, c-format -msgid "%lu package was automatically installed and is no longer required.\n" -msgid_plural "" -"%lu packages were automatically installed and are no longer required.\n" -msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: 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: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:614 -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." -msgstr "" -"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim " -"pecyn (neu penodwch ddatrys)" - -# FIXME: needs commas -#: 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" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." -msgstr "" -"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n" -"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n" -"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" -"heb gael eu symud allan o Incoming." - -#: apt-private/private-install.cc:659 -msgid "Broken packages" -msgstr "Pecynnau wedi torri" - -#: 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:802 -msgid "Suggested packages:" -msgstr "Pecynnau a awgrymmir:" - -#: apt-private/private-install.cc:803 -msgid "Recommended packages:" -msgstr "Pecynnau a argymhellir:" - -#: 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: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: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: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: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: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: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: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" +#: methods/server.cc:712 +msgid "Internal error" +msgstr "Gwall mewnol" -#: apt-private/private-list.cc:129 +#: apt-private/private-list.cc:121 msgid "Listing" msgstr "" -#: apt-private/private-list.cc:159 +#: apt-private/private-list.cc:151 #, c-format msgid "There is %i additional version. Please use the '-a' switch to see it" msgid_plural "" @@ -1421,31 +1159,31 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-cachefile.cc:93 +#: apt-private/private-cachefile.cc:95 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: apt-private/private-cachefile.cc:96 +#: apt-private/private-cachefile.cc:98 msgid " failed." msgstr " wedi methu." -#: apt-private/private-cachefile.cc:99 +#: apt-private/private-cachefile.cc:101 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: apt-private/private-cachefile.cc:102 +#: apt-private/private-cachefile.cc:104 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: apt-private/private-cachefile.cc:104 +#: apt-private/private-cachefile.cc:106 msgid " Done" msgstr " Wedi Gorffen" -#: apt-private/private-cachefile.cc:108 +#: apt-private/private-cachefile.cc:110 msgid "You might want to run 'apt-get -f install' to correct these." msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." -#: apt-private/private-cachefile.cc:111 +#: apt-private/private-cachefile.cc:113 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." @@ -1614,7 +1352,7 @@ msgstr "I" msgid "N" msgstr "" -#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:35 +#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1623,7 +1361,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:97 +#: apt-private/private-update.cc:95 #, c-format msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" msgid_plural "" @@ -1631,10 +1369,14 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-update.cc:101 +#: apt-private/private-update.cc:99 msgid "All packages are up to date." msgstr "" +#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 +msgid "Sorting" +msgstr "" + #: apt-private/private-show.cc:156 #, c-format msgid "There is %i additional record. Please use the '-a' switch to see it" @@ -1655,29 +1397,300 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-download.cc:36 +#: apt-private/private-install.cc:81 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" + +#: apt-private/private-install.cc:90 +#, fuzzy +msgid "Packages need to be removed but remove is disabled." +msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." + +#: apt-private/private-install.cc:109 +#, fuzzy +msgid "Internal error, Ordering didn't finish" +msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" + +#: apt-private/private-install.cc:147 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" +msgstr "" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc:154 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc:159 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Mae angen cyrchu %sB o archifau.\n" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc:166 +#, fuzzy, c-format +msgid "After this operation, %sB of additional disk space will be used.\n" +msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" + +#. TRANSLATOR: The required space between number and unit is already included +#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB +#: apt-private/private-install.cc:171 +#, fuzzy, c-format +msgid "After this operation, %sB disk space will be freed.\n" +msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" + +#: apt-private/private-install.cc:185 apt-private/private-download.cc:117 +msgid "There are problems and -y was used without --force-yes" +msgstr "Mae problemau a defnyddwyd -y heb --force-yes" + +#: apt-private/private-install.cc:191 apt-private/private-install.cc:213 +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 +msgid "Yes, do as I say!" +msgstr "Ie, gwna fel rydw i'n dweud!" + +#: apt-private/private-install.cc:197 +#, fuzzy, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n" +"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" +" ?]" + +#: apt-private/private-install.cc:203 apt-private/private-install.cc:221 +msgid "Abort." +msgstr "Erthylu." + +#: apt-private/private-install.cc:218 +msgid "Do you want to continue?" +msgstr "Ydych chi eisiau mynd ymlaen?" + +#: apt-private/private-install.cc:288 +msgid "Some files failed to download" +msgstr "Methodd rhai ffeiliau lawrlwytho" + +#: apt-private/private-install.cc:295 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " +"geidio defnyddio --fix-missing?" + +#: apt-private/private-install.cc:299 +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 +msgid "Unable to correct missing packages." +msgstr "Ni ellir cywiro pecynnau ar goll." + +#: apt-private/private-install.cc:305 +#, fuzzy +msgid "Aborting install." +msgstr "Yn Erthylu'r Sefydliad." + +#: apt-private/private-install.cc:341 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-install.cc:345 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "" + +#: apt-private/private-install.cc:366 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: apt-private/private-install.cc:474 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#. +#. if (Packages == 1) +#. { +#. c1out << std::endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << std::endl; +#. } +#. +#: apt-private/private-install.cc:477 apt-private/private-install.cc:627 +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 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + +#: apt-private/private-install.cc:488 +#, fuzzy +msgid "" +"The following package was automatically installed and is no longer required:" +msgid_plural "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: apt-private/private-install.cc:492 +#, fuzzy, c-format +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: apt-private/private-install.cc:494 +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 +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 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim " +"pecyn (neu penodwch ddatrys)" + +# FIXME: needs commas +#: apt-private/private-install.cc:612 +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" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n" +"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n" +"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" +"heb gael eu symud allan o Incoming." + +#: apt-private/private-install.cc:633 +msgid "Broken packages" +msgstr "Pecynnau wedi torri" + +#: apt-private/private-install.cc:710 +msgid "The following extra packages will be installed:" +msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" + +#: apt-private/private-install.cc:800 +msgid "Suggested packages:" +msgstr "Pecynnau a awgrymmir:" + +#: apt-private/private-install.cc:801 +msgid "Recommended packages:" +msgstr "Pecynnau a argymhellir:" + +#: apt-private/private-install.cc:823 +#, 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 +#, 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 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" + +#: apt-private/private-install.cc:844 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" + +#: apt-private/private-install.cc:892 +#, 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 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:939 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" + +#: apt-private/private-install.cc:945 +#, 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-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 #, fuzzy msgid "WARNING: The following packages cannot be authenticated!" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: apt-private/private-download.cc:40 +#: apt-private/private-download.cc:98 msgid "Authentication warning overridden.\n" msgstr "" -#: apt-private/private-download.cc:45 apt-private/private-download.cc:52 +#: apt-private/private-download.cc:103 apt-private/private-download.cc:110 #, fuzzy msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: apt-private/private-download.cc:50 +#: apt-private/private-download.cc:108 msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-download.cc:91 apt-pkg/update.cc:77 +#: apt-private/private-download.cc:149 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? " @@ -1692,42 +1705,33 @@ 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:90 +#: apt-private/acqprogress.cc:88 msgid "Get:" msgstr "Cyrchu:" -#: apt-private/acqprogress.cc:121 +#: apt-private/acqprogress.cc:119 msgid "Ign " msgstr "Anwybyddu " -#: apt-private/acqprogress.cc:125 +#: apt-private/acqprogress.cc:126 msgid "Err " msgstr "Gwall " -#: apt-private/acqprogress.cc:146 +#: apt-private/acqprogress.cc:150 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" -#: apt-private/acqprogress.cc:236 +#: apt-private/acqprogress.cc:240 #, c-format msgid " [Working]" msgstr " [Gweithio]" -#: apt-private/acqprogress.cc:297 +#: apt-private/acqprogress.cc:301 #, fuzzy, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1740,18 +1744,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-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 +#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121 +#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43 +#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374 +#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205 +#: apt-inst/extract.cc:471 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" #: 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/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563 +#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1828,212 +1832,461 @@ msgstr "" msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" +# FIXME: "debian" +#: cmdline/apt-extracttemplates.cc:229 +#, fuzzy +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: apt-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Methyd lleoli yr elfen <hash>!" +#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Ni ellir gwneud stat() o %s" -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Methwyd neilltuo dargyfeiriad" +#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385 +#: apt-pkg/contrib/fileutl.cc:2097 +#, c-format +msgid "Unable to write to %s" +msgstr "Ni ellir ysgrifennu i %s" -#: apt-inst/filelist.cc:464 +#: cmdline/apt-extracttemplates.cc:305 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" + +#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370 +msgid "Package extension list is too long" +msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." + +#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205 +#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282 +#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318 +#, fuzzy, c-format +msgid "Error processing directory %s" +msgstr "Gwall wrth brosesu'r cyfeiriadur %s" + +#: ftparchive/apt-ftparchive.cc:280 +msgid "Source extension list is too long" +msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" + +#: ftparchive/apt-ftparchive.cc:400 +msgid "Error writing header to contents file" +msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" + +#: ftparchive/apt-ftparchive.cc:430 +#, fuzzy, c-format +msgid "Error processing contents %s" +msgstr "Gwall wrth Brosesu Cynnwys %s" + +# FIXME: full stops +#: ftparchive/apt-ftparchive.cc:625 #, fuzzy -msgid "Internal error in AddDiversion" -msgstr "Gwall Mewnol yn AddDiversion" +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" -#: apt-inst/filelist.cc:477 +#: ftparchive/apt-ftparchive.cc:821 +msgid "No selections matched" +msgstr "Dim dewisiadau'n cyfateb" + +#: ftparchive/apt-ftparchive.cc:906 #, 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:67 #, 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:85 #, 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:96 +msgid "" +"DB format is invalid. If you upgraded from an older version of apt, please " +"remove and re-create the database." +msgstr "" + +#: ftparchive/cachedb.cc:101 #, c-format -msgid "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:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: apt-inst/extract.cc:216 #, c-format -msgid "Unpacking %s more than once" -msgstr "Yn dadbacio %s mwy nag unwaith" +msgid "Failed to stat %s" +msgstr "Methodd stat() o %s" -#: apt-inst/extract.cc:142 +#: ftparchive/cachedb.cc:326 +#, fuzzy +msgid "Failed to read .dsc" +msgstr "Methwyd darllen y cyswllt %s" + +#: ftparchive/cachedb.cc:359 +msgid "Archive has no control record" +msgstr "Does dim cofnod rheoli gan yr archif" + +#: ftparchive/cachedb.cc:526 +msgid "Unable to get a cursor" +msgstr "Ni ellir cael cyrchydd" + +#: ftparchive/writer.cc:104 #, c-format -msgid "The directory %s is diverted" -msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" +msgid "W: Unable to read directory %s\n" +msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: apt-inst/extract.cc:152 +#: ftparchive/writer.cc:109 #, 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 "W: Unable to stat %s\n" +msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: 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:165 +msgid "E: " +msgstr "G: " -#: apt-inst/extract.cc:186 apt-inst/extract.cc:199 apt-inst/extract.cc:216 -#: ftparchive/cachedb.cc:182 -#, c-format -msgid "Failed to stat %s" -msgstr "Methodd stat() o %s" +#: 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 " -#: apt-inst/extract.cc:194 ftparchive/multicompress.cc:374 +#: ftparchive/writer.cc:192 ftparchive/writer.cc:224 #, c-format -msgid "Failed to rename %s to %s" -msgstr "Methwyd ailenwi %s at %s" +msgid "Failed to resolve %s" +msgstr "Methwyd datrys %s" -#: apt-inst/extract.cc:249 +#: ftparchive/writer.cc:205 +msgid "Tree walking failed" +msgstr "Methwyd cerdded y goeden" + +#: ftparchive/writer.cc:232 #, 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:291 +#, 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:299 +#, c-format +msgid "Failed to readlink %s" +msgstr "Methwyd darllen y cyswllt %s" -# FIXME: wtf? -#: apt-inst/extract.cc:421 +#: ftparchive/writer.cc:303 #, 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:311 #, 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:321 #, 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:427 +msgid "Archive had no package field" +msgstr "Doedd dim maes pecyn gan yr archif" -#: apt-inst/dirstream.cc:105 +#: ftparchive/writer.cc:435 ftparchive/writer.cc:698 #, 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:502 ftparchive/writer.cc:862 #, 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:712 #, 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:716 +#, 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:124 -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:151 -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:188 apt-inst/contrib/extracttar.cc:218 -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" -#: apt-inst/contrib/extracttar.cc:203 +#: ftparchive/multicompress.cc:192 +msgid "Failed to create FILE*" +msgstr "Methwyd creu FILE*" + +#: ftparchive/multicompress.cc:195 +msgid "Failed to fork" +msgstr "Methodd fork()" + +#: ftparchive/multicompress.cc:209 #, fuzzy -msgid "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:308 +#: 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" + +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Methwyd ailenwi %s at %s" + +# FIXME: "debian" +#: cmdline/apt-internal-solver.cc:51 +#, fuzzy +msgid "" +"Usage: apt-internal-solver\n" +"\n" +"apt-internal-solver is an interface to use the current internal\n" +"like an external resolver for the APT family for debugging or alike\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n" +"templed o becynnau Debian.\n" +"\n" +"Opsiynnau:\n" +" -h Dangos y testun cymorth hwn\n" +" -t Gosod y cyfeiriadur dros dro\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" + +#: cmdline/apt-sortpkgs.cc:91 +msgid "Unknown package record!" +msgstr "Cofnod pecyn anhysbys!" + +#: cmdline/apt-sortpkgs.cc:155 +#, fuzzy +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n" +"\n" +"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n" +"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n" +"\n" +"Opsiynnau:\n" +" -h Y testun cymorth hwn\n" +" -s Defnyddio trefnu ffeil ffynhonell\n" +" -c=? Darllen y ffeil cyfluniad hwn\n" +" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: apt-pkg/install-progress.cc:57 +#: apt-pkg/install-progress.cc:59 #, c-format msgid "Progress: [%3i%%]" msgstr "" -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 +#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176 msgid "Running dpkg" msgstr "" -#: apt-pkg/init.cc:146 +#: apt-pkg/init.cc:156 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:162 +#: apt-pkg/init.cc:172 #, 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:773 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2048,6 +2301,29 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" +#: apt-pkg/acquire-worker.cc:133 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Methwyd canfod y gyrrydd dull %s." + +#: apt-pkg/acquire-worker.cc:135 +#, c-format +msgid "Is the package %s installed?" +msgstr "" + +#: apt-pkg/acquire-worker.cc:186 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Ni gychwynodd y dull %s yn gywir" + +#: apt-pkg/acquire-worker.cc:485 +#, fuzzy, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "" +"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" +" '%s'\n" +"yn y gyrriant '%s' a gwasgwch Enter\n" + #: apt-pkg/cachefile.cc:94 msgid "The package lists or status file could not be parsed or opened." msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." @@ -2060,231 +2336,186 @@ 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:155 +#: apt-pkg/pkgcache.cc:154 msgid "Empty package cache" msgstr "Storfa pecyn gwag" -#: apt-pkg/pkgcache.cc:161 +#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171 msgid "The package cache file is corrupted" msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-pkg/pkgcache.cc:166 +#: apt-pkg/pkgcache.cc:165 msgid "The package cache file is an incompatible version" msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" -#: apt-pkg/pkgcache.cc:169 +#: apt-pkg/pkgcache.cc:168 #, fuzzy msgid "The package cache file is corrupted, it is too small" msgstr "Mae'r ffeil storfa pecyn yn llygredig" # FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:174 +#: apt-pkg/pkgcache.cc:175 #, fuzzy, c-format msgid "This APT does not support the versioning system '%s'" msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" +#: apt-pkg/pkgcache.cc:185 +#, fuzzy, c-format +msgid "The package cache was built for different architectures: %s vs %s" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:321 +#: apt-pkg/pkgcache.cc:322 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:321 +#: apt-pkg/pkgcache.cc:322 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:321 +#: apt-pkg/pkgcache.cc:322 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:322 +#: apt-pkg/pkgcache.cc:323 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:322 +#: apt-pkg/pkgcache.cc:323 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:322 +#: apt-pkg/pkgcache.cc:323 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:323 +#: apt-pkg/pkgcache.cc:324 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:323 +#: apt-pkg/pkgcache.cc:324 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:323 +#: apt-pkg/pkgcache.cc:324 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:334 +#: apt-pkg/pkgcache.cc:335 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:334 +#: apt-pkg/pkgcache.cc:335 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:334 +#: apt-pkg/pkgcache.cc:335 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:335 +#: apt-pkg/pkgcache.cc:336 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:335 +#: apt-pkg/pkgcache.cc:336 msgid "extra" msgstr "ychwanegol" -#: 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:118 -#, c-format -msgid "Is the package %s installed?" -msgstr "" - -#: apt-pkg/acquire-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "Ni gychwynodd y dull %s yn gywir" - -#: apt-pkg/acquire-worker.cc:455 -#, fuzzy, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" -" '%s'\n" -"yn y gyrriant '%s' a gwasgwch Enter\n" +#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182 +#, fuzzy +msgid "Calculating upgrade" +msgstr "Yn Cyfrifo'r Uwchraddiad" #: apt-pkg/pkgrecords.cc:38 #, c-format msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 -#, fuzzy -msgid "Building dependency tree" -msgstr "Yn Aideladu Coeden Dibyniaeth" - -#: apt-pkg/depcache.cc:139 -#, fuzzy -msgid "Candidate versions" -msgstr "Fersiynau Posib" - -#: apt-pkg/depcache.cc:168 -#, fuzzy -msgid "Dependency generation" -msgstr "Cynhyrchaid Dibyniaeth" - -#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 -#, fuzzy -msgid "Reading state information" -msgstr "Yn cyfuno manylion Ar Gael" - -#: apt-pkg/depcache.cc:250 +#: apt-pkg/sourcelist.cc:127 #, fuzzy, c-format -msgid "Failed to open StateFile %s" -msgstr "Methwyd agor %s" +msgid "Malformed stanza %u in source list %s (URI parse)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/depcache.cc:256 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Methwyd ysgrifennu ffeil %s" - -#: 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:163 -#, fuzzy -msgid "Hash Sum mismatch" -msgstr "Camgyfatebiaeth swm MD5" - -#: apt-pkg/acquire-item.cc:168 -msgid "Size mismatch" -msgstr "Camgyfatebiaeth maint" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/acquire-item.cc:173 -#, fuzzy -msgid "Invalid file format" -msgstr "Gweithred annilys %s" +#: apt-pkg/sourcelist.cc:173 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([option] too short)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/acquire-item.cc:1640 -#, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" +#: apt-pkg/sourcelist.cc:184 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -# FIXME: number? -#: apt-pkg/acquire-item.cc:1656 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" +msgid "Malformed line %lu in source list %s ([%s] has no key)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/acquire-item.cc:1698 -msgid "There is no public key available for the following key IDs:\n" +#: apt-pkg/sourcelist.cc:193 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/acquire-item.cc:1736 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." -msgstr "" +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/acquire-item.cc:1758 +#: apt-pkg/sourcelist.cc:208 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" -msgstr "" +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/acquire-item.cc:1788 +#: apt-pkg/sourcelist.cc:211 #, 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 "" +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1798 apt-pkg/acquire-item.cc:1803 +#: apt-pkg/sourcelist.cc:217 +#, fuzzy, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" + +#: apt-pkg/sourcelist.cc:224 #, c-format -msgid "GPG error: %s: %s" +msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -# FIXME: case -#: apt-pkg/acquire-item.cc:1926 +#: apt-pkg/sourcelist.cc:335 #, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" -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.)" +msgid "Opening %s" +msgstr "Yn agor %s" -#: apt-pkg/acquire-item.cc:1992 +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "" +msgid "Line %u too long in source list %s." +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/acquire-item.cc:2050 +#: apt-pkg/sourcelist.cc:371 #, 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." +msgid "Malformed line %u in source list %s (type)" +msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" + +#: apt-pkg/sourcelist.cc:375 +#, fuzzy, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" + +#: apt-pkg/sourcelist.cc:416 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:490 +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553 #, fuzzy, c-format msgid "Clean of %s is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" @@ -2294,114 +2525,240 @@ msgstr "Ni chynhelir y math ffeil mynegai '%s'" msgid "Unable to stat %s." msgstr "Ni ellir gwneud stat() o %s." -#: apt-pkg/pkgcachegen.cc:93 +#: apt-pkg/pkgcachegen.cc:113 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc: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:240 apt-pkg/pkgcachegen.cc:250 +#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382 #: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 #: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 #: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 -#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525 +#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:584 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/pkgcachegen.cc:257 +#: apt-pkg/pkgcachegen.cc:273 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:276 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:263 +#: apt-pkg/pkgcachegen.cc:279 #, fuzzy msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:266 +#: apt-pkg/pkgcachegen.cc:282 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:576 +#: apt-pkg/pkgcachegen.cc:591 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:1211 +#: apt-pkg/pkgcachegen.cc:1196 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403 -#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566 +#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388 +#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/pkgcachegen.cc:1316 +#: apt-pkg/pkgcachegen.cc:1301 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: 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 +#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/vendorlist.cc:85 +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" + +#: apt-pkg/edsp.cc:244 +msgid "Send request to solver" +msgstr "" + +#: apt-pkg/edsp.cc:323 +msgid "Prepare for receiving solution" +msgstr "" + +#: apt-pkg/edsp.cc:330 +msgid "External solver failed without a proper error message" +msgstr "" + +#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630 +msgid "Execute external solver" +msgstr "" + +#: apt-pkg/acquire-item.cc:98 +msgid "Use --allow-insecure-repositories to force the update" +msgstr "" + +#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "methwyd ailenwi, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:240 +#, fuzzy +msgid "Hash Sum mismatch" +msgstr "Camgyfatebiaeth swm MD5" + +#: apt-pkg/acquire-item.cc:245 +msgid "Size mismatch" +msgstr "Camgyfatebiaeth maint" + +#: apt-pkg/acquire-item.cc:250 +#, fuzzy +msgid "Invalid file format" +msgstr "Gweithred annilys %s" + +#: apt-pkg/acquire-item.cc:255 +#, fuzzy +msgid "Signature error" +msgstr "Gwall ysgrifennu" + +#: apt-pkg/acquire-item.cc:259 +msgid "Does not start with a cleartext signature" +msgstr "" + +#: apt-pkg/acquire-item.cc:1584 +#, 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:1594 apt-pkg/acquire-item.cc:1600 +#, c-format +msgid "GPG error: %s: %s" +msgstr "" + +#: apt-pkg/acquire-item.cc:1707 +#, fuzzy, c-format +msgid "The repository '%s' is no longer signed." +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" + +#: apt-pkg/acquire-item.cc:1714 +msgid "" +"This is normally not allowed, but the option Acquire::" +"AllowDowngradeToInsecureRepositories was given to override it." +msgstr "" + +#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202 +#, c-format +msgid "" +"The data from '%s' is not signed. Packages from that repository can not be " +"authenticated." +msgstr "" + +#: apt-pkg/acquire-item.cc:1956 +#, c-format +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" +msgstr "" + +# FIXME: number? +#: apt-pkg/acquire-item.cc:1975 +#, fuzzy, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#: apt-pkg/acquire-item.cc:1999 +msgid "There is no public key available for the following key IDs:\n" +msgstr "" + +#: apt-pkg/acquire-item.cc:2037 +#, c-format +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." +msgstr "" + +#: apt-pkg/acquire-item.cc:2059 +#, c-format +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "" + +#: apt-pkg/acquire-item.cc:2078 +#, c-format +msgid "" +"The repository '%s' does not have a Release file. This is deprecated, please " +"contact the owner of the repository." +msgstr "" + +# FIXME: case +#: apt-pkg/acquire-item.cc:2249 +#, c-format +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" +msgstr "" +"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " +"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" + +#: apt-pkg/acquire-item.cc:2315 +#, c-format +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "" + +#: apt-pkg/acquire-item.cc:2351 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." + +#: apt-pkg/vendorlist.cc:83 #, c-format msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:829 +#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/acquire.cc:91 +#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151 #, fuzzy, c-format msgid "Archives directory %spartial is missing." msgstr "Mae'r cyfeiriadur archif %spartial ar goll." -#: apt-pkg/acquire.cc:99 +#: apt-pkg/acquire.cc:162 #, fuzzy, c-format msgid "Unable to lock directory %s" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:902 +#: apt-pkg/acquire.cc:981 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:904 +#: apt-pkg/acquire.cc:983 #, fuzzy, c-format msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 -#, fuzzy -msgid "" -"Some index files failed to download. They have been ignored, or old ones " -"used instead." -msgstr "" -"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " -"rai eu defnyddio yn lle." - # FIXME: ...file #: apt-pkg/srcrecords.cc:53 msgid "You must put some 'source' URIs in your sources.list" @@ -2430,20 +2787,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:303 apt-pkg/packagemanager.cc:957 +#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:550 apt-pkg/packagemanager.cc:580 +#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:630 +#: apt-pkg/packagemanager.cc:643 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2454,10 +2811,14 @@ msgstr "" "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." -#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347 -#, c-format -msgid "Line %u too long in source list %s." -msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#, fuzzy +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" +"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " +"rai eu defnyddio yn lle." #: apt-pkg/cdrom.cc:571 #, fuzzy @@ -2525,12 +2886,12 @@ msgstr "" msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:863 +#: apt-pkg/cdrom.cc:866 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:874 +#: apt-pkg/cdrom.cc:877 msgid "Source list entries for this disc are:\n" msgstr "" @@ -2542,7 +2903,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1086 +#: apt-pkg/algorithms.cc:1090 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2550,336 +2911,266 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1088 +#: apt-pkg/algorithms.cc:1092 msgid "Unable to correct problems, you have held broken packages." msgstr "" "Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 -msgid "Send scenario to solver" -msgstr "" - -#: apt-pkg/edsp.cc:241 -msgid "Send request to solver" -msgstr "" - -#: apt-pkg/edsp.cc:320 -msgid "Prepare for receiving solution" -msgstr "" - -#: apt-pkg/edsp.cc:327 -msgid "External solver failed without a proper error message" -msgstr "" - -#: apt-pkg/edsp.cc:619 apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:627 -msgid "Execute external solver" -msgstr "" - -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (%d)" -msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)" - -# FIXME: number? -#: 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: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:117 -#, c-format -msgid "No Hash entry in Release file %s" -msgstr "" - -#: 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:149 -#, fuzzy, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" - -#: apt-pkg/sourcelist.cc:127 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" - -#: apt-pkg/sourcelist.cc:170 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 +#, fuzzy +msgid "Building dependency tree" +msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/sourcelist.cc:173 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" +#: apt-pkg/depcache.cc:139 +#, fuzzy +msgid "Candidate versions" +msgstr "Fersiynau Posib" -#: apt-pkg/sourcelist.cc:184 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" +#: apt-pkg/depcache.cc:168 +#, fuzzy +msgid "Dependency generation" +msgstr "Cynhyrchaid Dibyniaeth" -#: apt-pkg/sourcelist.cc:190 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 +#, fuzzy +msgid "Reading state information" +msgstr "Yn cyfuno manylion Ar Gael" -#: apt-pkg/sourcelist.cc:193 +#: apt-pkg/depcache.cc:252 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:206 -#, c-format -msgid "Malformed line %lu in source list %s (URI)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" - -#: apt-pkg/sourcelist.cc:208 -#, c-format -msgid "Malformed line %lu in source list %s (dist)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" - -#: apt-pkg/sourcelist.cc:211 -#, c-format -msgid "Malformed line %lu in source list %s (URI parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" +msgid "Failed to open StateFile %s" +msgstr "Methwyd agor %s" -#: apt-pkg/sourcelist.cc:217 +#: apt-pkg/depcache.cc:258 #, fuzzy, c-format -msgid "Malformed line %lu in source list %s (absolute dist)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" - -#: apt-pkg/sourcelist.cc:224 -#, c-format -msgid "Malformed line %lu in source list %s (dist parse)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "Yn agor %s" +msgid "Failed to write temporary StateFile %s" +msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/sourcelist.cc:371 +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207 #, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" - -#: apt-pkg/sourcelist.cc:375 -#, fuzzy, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" - -#: apt-pkg/sourcelist.cc:416 -#, fuzzy, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" +msgid "Unable to parse package file %s (%d)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)" -#: apt-pkg/cacheset.cc:489 +#: apt-pkg/cacheset.cc:501 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:492 +#: apt-pkg/cacheset.cc:504 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:603 +#: apt-pkg/cacheset.cc:629 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:609 +#: apt-pkg/cacheset.cc:635 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:615 +#: apt-pkg/cacheset.cc:641 #, fuzzy, c-format msgid "Couldn't find any package by glob '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:626 +#: apt-pkg/cacheset.cc:680 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:633 apt-pkg/cacheset.cc:640 -#, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" - -#: apt-pkg/cacheset.cc:647 +#: apt-pkg/cacheset.cc:719 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:655 +#: apt-pkg/cacheset.cc:727 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:663 +#: apt-pkg/cacheset.cc:735 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" +#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" +msgstr "" + +# FIXME: number? +#: apt-pkg/indexrecords.cc:83 +#, fuzzy, c-format +msgid "Unable to parse Release file %s" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#: apt-pkg/indexrecords.cc:91 +#, fuzzy, c-format +msgid "No sections in Release file %s" +msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" + +#: apt-pkg/indexrecords.cc:132 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:145 +#, fuzzy, c-format +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" + +# FIXME: number? +#: apt-pkg/indexrecords.cc:164 +#, fuzzy, c-format +msgid "Invalid 'Date' entry in Release file %s" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:418 +#: 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:425 +#: apt-pkg/contrib/strutl.cc:432 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:432 +#: apt-pkg/contrib/strutl.cc:439 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:437 +#: apt-pkg/contrib/strutl.cc:444 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1258 +#: apt-pkg/contrib/strutl.cc:1290 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/fileutl.cc:190 +#: apt-pkg/contrib/fileutl.cc:196 #, 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:195 +#: apt-pkg/contrib/fileutl.cc:201 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:218 +#: apt-pkg/contrib/fileutl.cc:224 #, 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:223 +#: apt-pkg/contrib/fileutl.cc:229 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:360 apt-pkg/contrib/fileutl.cc:474 +#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:394 +#: apt-pkg/contrib/fileutl.cc:400 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:412 +#: apt-pkg/contrib/fileutl.cc:418 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:421 +#: apt-pkg/contrib/fileutl.cc:427 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:824 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:826 +#: apt-pkg/contrib/fileutl.cc:848 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:830 apt-pkg/contrib/gpgv.cc:239 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212 #, 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:832 apt-pkg/contrib/gpgv.cc:232 +#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:913 +#: apt-pkg/contrib/fileutl.cc:952 #, fuzzy, c-format msgid "Problem closing the gzip file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1101 +#: apt-pkg/contrib/fileutl.cc:1140 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1160 apt-pkg/contrib/fileutl.cc:1207 +#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1315 +#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1373 +#: apt-pkg/contrib/fileutl.cc:1412 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1514 +#: apt-pkg/contrib/fileutl.cc:1553 #, 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:1627 apt-pkg/contrib/fileutl.cc:1649 +#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688 #, 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:1915 +#: apt-pkg/contrib/fileutl.cc:1954 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1927 +#: apt-pkg/contrib/fileutl.cc:1965 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1938 +#: apt-pkg/contrib/fileutl.cc:1976 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1951 +#: apt-pkg/contrib/fileutl.cc:1989 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2966,114 +3257,108 @@ 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:519 +#: apt-pkg/contrib/configuration.cc:522 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:633 +#: apt-pkg/contrib/configuration.cc:636 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:801 +#: apt-pkg/contrib/configuration.cc:804 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:820 +#: apt-pkg/contrib/configuration.cc:823 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:837 +#: apt-pkg/contrib/configuration.cc:840 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:880 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:887 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 +#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:897 +#: apt-pkg/contrib/configuration.cc:900 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:900 +#: apt-pkg/contrib/configuration.cc:903 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/contrib/configuration.cc:953 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" -#. 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 +#: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 -#: apt-pkg/contrib/cmndline.cc:166 +#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161 +#: apt-pkg/contrib/cmndline.cc:169 #, c-format msgid "Command line option %s is not understood" msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/contrib/cmndline.cc:171 +#: apt-pkg/contrib/cmndline.cc:174 #, c-format msgid "Command line option %s is not boolean" msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 +#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236 #, c-format msgid "Option %s requires an argument." msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 +#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>." -#: apt-pkg/contrib/cmndline.cc:281 +#: apt-pkg/contrib/cmndline.cc:284 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" -#: apt-pkg/contrib/cmndline.cc:312 +#: apt-pkg/contrib/cmndline.cc:315 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" # FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:344 +#: apt-pkg/contrib/cmndline.cc:347 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." -#: apt-pkg/contrib/cmndline.cc:394 +#: apt-pkg/contrib/cmndline.cc:397 #, c-format msgid "Invalid operation %s" msgstr "Gweithred annilys %s" @@ -3083,12 +3368,12 @@ msgstr "Gweithred annilys %s" msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1016 +#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1023 +#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" @@ -3109,103 +3394,103 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:847 +#: apt-pkg/deb/dpkgpm.cc:839 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:862 apt-pkg/deb/dpkgpm.cc:884 +#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:1009 +#: apt-pkg/deb/dpkgpm.cc:1001 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:1010 +#: apt-pkg/deb/dpkgpm.cc:1002 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:1015 +#: apt-pkg/deb/dpkgpm.cc:1007 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:1017 +#: apt-pkg/deb/dpkgpm.cc:1009 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:1022 +#: apt-pkg/deb/dpkgpm.cc:1014 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1024 +#: apt-pkg/deb/dpkgpm.cc:1016 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:1029 +#: apt-pkg/deb/dpkgpm.cc:1021 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:1030 +#: apt-pkg/deb/dpkgpm.cc:1022 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179 +#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/deb/dpkgpm.cc:1091 apt-pkg/deb/dpkgpm.cc:1179 +#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1670 +#: apt-pkg/deb/dpkgpm.cc:1656 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1732 +#: apt-pkg/deb/dpkgpm.cc:1718 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1737 +#: apt-pkg/deb/dpkgpm.cc:1723 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1739 +#: apt-pkg/deb/dpkgpm.cc:1725 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1745 +#: apt-pkg/deb/dpkgpm.cc:1731 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1752 +#: apt-pkg/deb/dpkgpm.cc:1738 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1759 apt-pkg/deb/dpkgpm.cc:1765 +#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1787 +#: apt-pkg/deb/dpkgpm.cc:1773 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3234,408 +3519,179 @@ msgstr "" msgid "Not locked" msgstr "" -# FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:224 -#, 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: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" +#: 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" +msgid "Internal error in AddDiversion" +msgstr "Gwall Mewnol yn AddDiversion" -#: ftparchive/apt-ftparchive.cc:907 +#: apt-inst/filelist.cc:477 #, 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 "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" -#: ftparchive/cachedb.cc:65 +# FIXME: "the" +#: apt-inst/filelist.cc:506 #, c-format -msgid "DB was corrupted, file renamed to %s.old" -msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" +msgid "Double add of diversion %s -> %s" +msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" -#: ftparchive/cachedb.cc:83 +#: apt-inst/filelist.cc:549 #, c-format -msgid "DB is old, attempting to upgrade %s" -msgstr "Hen gronfa data, yn ceisio uwchraddio %s" - -#: 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 "" +msgid "Duplicate conf file %s/%s" +msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: ftparchive/cachedb.cc:99 +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 #, c-format -msgid "Unable to open DB file %s: %s" -msgstr "Ni ellir agor y ffeil DB2 %s: %s" - -#: 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" +msgid "The path %s is too long" +msgstr "Mae'r llwybr %s yn rhy hir" -#: ftparchive/writer.cc:91 +#: 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:96 +#: 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: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 " +msgid "The directory %s is diverted" +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: 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:192 -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:219 +#: apt-inst/extract.cc:249 #, c-format -msgid "Failed to open %s" -msgstr "Methwyd agor %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" -# FIXME -#: ftparchive/writer.cc:278 -#, c-format -msgid " DeLink %s [%s]\n" -msgstr " DatGysylltu %s [%s]\n" +#: 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:286 -#, c-format -msgid "Failed to readlink %s" -msgstr "Methwyd darllen y cyswllt %s" +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Mae'r llwybr yn rhy hir" -#: ftparchive/writer.cc:290 +# FIXME: wtf? +#: apt-inst/extract.cc:421 #, c-format -msgid "Failed to unlink %s" -msgstr "Methwyd datgysylltu %s" +msgid "Overwrite package match with no version for %s" +msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: ftparchive/writer.cc:298 +#: apt-inst/extract.cc:438 #, c-format -msgid "*** Failed to link %s to %s" -msgstr "*** Methwyd cysylltu %s at %s" +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:308 +#: apt-inst/extract.cc:498 #, c-format -msgid " DeLink limit of %sB hit.\n" -msgstr " Tarwyd y terfyn cyswllt %sB.\n" +msgid "Unable to stat %s" +msgstr "Ni ellir gwneud stat() o %s" -#: ftparchive/writer.cc:417 -msgid "Archive had no package field" -msgstr "Doedd dim maes pecyn gan yr archif" +#: 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:425 ftparchive/writer.cc:684 +#: apt-inst/dirstream.cc:104 #, c-format -msgid " %s has no override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" +msgid "Failed to close file %s" +msgstr "Methwyd cau ffeil %s" -#: ftparchive/writer.cc:493 ftparchive/writer.cc:840 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid " %s maintainer is %s not %s\n" -msgstr " Cynaliwr %s yw %s nid %s\n" - -#: ftparchive/writer.cc:698 -#, fuzzy, c-format -msgid " %s has no source override entry\n" -msgstr " Does dim cofnod gwrthwneud gan %s\n" +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" -#: ftparchive/writer.cc:702 +#: apt-inst/deb/debfile.cc:132 #, 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 "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: ftparchive/override.cc:38 ftparchive/override.cc:142 -#, c-format -msgid "Unable to open %s" -msgstr "Ni ellir agor %s" +#: apt-inst/deb/debfile.cc:231 +#, fuzzy +msgid "Unparsable control file" +msgstr "Ffeil rheoli ni ellir ei ramadegu" -#. 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" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Llofnod 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:84 +msgid "Error reading archive member header" +msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: ftparchive/override.cc:166 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format -msgid "Malformed override %s line %llu #1" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" -#: ftparchive/override.cc:178 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #2" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Pennawd aelod archif annilys" -#: ftparchive/override.cc:191 -#, fuzzy, c-format -msgid "Malformed override %s line %llu #3" -msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Mae'r archif yn rhy fyr" -#: ftparchive/multicompress.cc:73 -#, fuzzy, c-format -msgid "Unknown compression algorithm '%s'" -msgstr "Dull Cywasgu Anhysbys '%s'" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Methwyd darllen pennawdau'r archif" -#: 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" +#: apt-inst/contrib/extracttar.cc:128 +msgid "Failed to create pipes" +msgstr "Methwyd creu pibau" -#: ftparchive/multicompress.cc:192 -msgid "Failed to create FILE*" -msgstr "Methwyd creu FILE*" +#: apt-inst/contrib/extracttar.cc:155 +msgid "Failed to exec gzip " +msgstr "Methwyd gweithredu gzip" -#: ftparchive/multicompress.cc:195 -msgid "Failed to fork" -msgstr "Methodd fork()" +#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222 +msgid "Corrupted archive" +msgstr "Archif llygredig" -#: ftparchive/multicompress.cc:209 +#: apt-inst/contrib/extracttar.cc:207 #, fuzzy -msgid "Compress child" -msgstr "Plentyn Cywasgu" - -#: ftparchive/multicompress.cc:232 -#, fuzzy, c-format -msgid "Internal error, failed to create %s" -msgstr "Gwall Mewnol, Methwyd creu %s" - -#: ftparchive/multicompress.cc:305 -msgid "IO to subprocess/file failed" -msgstr "Methodd MA i isbroses/ffeil" - -#: ftparchive/multicompress.cc:343 -msgid "Failed to read while computing MD5" -msgstr "Methwyd darllen wrth gyfrifo MD5" +msgid "Tar checksum failed, archive corrupted" +msgstr "Methodd swm gwirio Tar, archif llygredig" -#: ftparchive/multicompress.cc:359 +#: apt-inst/contrib/extracttar.cc:312 #, c-format -msgid "Problem unlinking %s" -msgstr "Gwall wrth datgysylltu %s" +msgid "Unknown TAR header type %u, member %s" +msgstr "Math pennawd TAR anhysbys %u, aelod %s" -# 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" +#~ msgid "Total dependency version space: " +#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-sortpkgs.cc:89 -msgid "Unknown package record!" -msgstr "Cofnod pecyn anhysbys!" +#~ msgid "You don't have enough free space in %s" +#~ msgstr "Does dim digon o le rhydd yn %s gennych" + +#~ msgid "Done" +#~ msgstr "Wedi Gorffen" -#: cmdline/apt-sortpkgs.cc:153 #, 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 "No keyring installed in %s." +#~ msgstr "Yn Erthylu'r Sefydliad." #, fuzzy #~ msgid "Internal error, Upgrade broke stuff" |