diff options
Diffstat (limited to 'po/cy.po')
| -rw-r--r-- | po/cy.po | 2843 |
1 files changed, 1461 insertions, 1382 deletions
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-04-25 13:17+0200\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:1441 -#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59 -#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: 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 +#: 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:1420 +#: cmdline/apt-cache.cc:1505 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594 +#: 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:1545 +#: cmdline/apt-cache.cc:1630 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643 +#: 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:1566 +#: cmdline/apt-cache.cc:1651 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623 +#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1586 +#: cmdline/apt-cache.cc:1671 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1587 +#: cmdline/apt-cache.cc:1672 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613 +#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1705 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1629 +#: cmdline/apt-cache.cc:1714 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388 -#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217 -#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42 -#: cmdline/apt-sortpkgs.cc:147 +#: 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:1749 +#: 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,78 +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 +#: 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:765 cmdline/apt-get.cc:1058 +#: 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:782 +#: 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:787 +#: cmdline/apt-get.cc:785 #, c-format msgid "" "Please use:\n" @@ -396,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:861 cmdline/apt-get.cc:864 -#: apt-private/private-install.cc:186 apt-private/private-install.cc:189 -#, fuzzy, c-format -msgid "Couldn't determine free space in %s" -msgstr "Does dim digon o le rhydd yn %s gennych" - -#: cmdline/apt-get.cc:874 -#, 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:883 +#: 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:888 +#: 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:894 +#: cmdline/apt-get.cc:874 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:899 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313 +#: 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:942 +#: 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:954 +#: cmdline/apt-get.cc:942 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:955 +#: cmdline/apt-get.cc:943 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:971 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1002 +#: cmdline/apt-get.cc:990 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1021 +#: 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:1046 +#: 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:1070 cmdline/apt-get.cc:1073 +#: 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:1093 +#: 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:1263 +#: cmdline/apt-get.cc:1279 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -494,7 +489,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1281 +#: cmdline/apt-get.cc:1297 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -503,14 +498,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1304 +#: 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:1343 +#: cmdline/apt-get.cc:1359 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -519,7 +514,7 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:1349 +#: cmdline/apt-get.cc:1365 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -528,32 +523,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1372 +#: 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:1387 +#: 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:1392 +#: cmdline/apt-get.cc:1408 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497 +#: 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:1583 +#: cmdline/apt-get.cc:1615 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1624 +#: cmdline/apt-get.cc:1656 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -640,16 +635,20 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-helper.cc:35 +#: cmdline/apt-helper.cc:36 +msgid "Need one URL as argument" +msgstr "" + +#: cmdline/apt-helper.cc:49 #, fuzzy msgid "Must specify at least one pair url/filename" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-helper.cc:52 +#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79 msgid "Download Failed" msgstr "" -#: cmdline/apt-helper.cc:65 +#: cmdline/apt-helper.cc:93 msgid "" "Usage: apt-helper [options] command\n" " apt-helper [options] download-file uri target-path\n" @@ -658,57 +657,58 @@ msgid "" "\n" "Commands:\n" " download-file - download the given uri to the target-path\n" +" auto-detect-proxy - detect proxy using apt.conf\n" "\n" " 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:815 apt-pkg/contrib/gpgv.cc:219 -#: apt-pkg/deb/dpkgpm.cc:1201 +#: 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" @@ -787,16 +787,16 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:47 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:83 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" @@ -805,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." @@ -841,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:240 +#: 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:1478 -#: apt-pkg/contrib/fileutl.cc:1487 apt-pkg/contrib/fileutl.cc:1492 -#: apt-pkg/contrib/fileutl.cc:1494 +#: 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:246 apt-pkg/contrib/fileutl.cc:875 -#: apt-pkg/contrib/fileutl.cc:1600 apt-pkg/contrib/fileutl.cc:1609 -#: apt-pkg/contrib/fileutl.cc:1614 apt-pkg/contrib/fileutl.cc:1616 -#: apt-pkg/contrib/fileutl.cc:1641 +#: 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 apt-private/private-upgrade.cc:28 +#: 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:352 methods/rsh.cc:316 +#: 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:335 +#: 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 " @@ -996,7 +996,7 @@ msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:154 methods/rsh.cc:439 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@ -1026,215 +1026,376 @@ 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 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" +#: 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 -msgid "Unknown error executing gpgv" +#: 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:508 +#: methods/http.cc:517 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:522 +#: 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:524 +#: methods/http.cc:533 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:560 +#: methods/http.cc:569 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:620 +#: methods/http.cc:629 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:625 +#: methods/http.cc:634 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:648 +#: methods/http.cc:657 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/server.cc:51 +#: methods/server.cc:52 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/server.cc:109 +#: methods/server.cc:111 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/server.cc:134 methods/server.cc:141 +#: methods/server.cc:136 methods/server.cc:143 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/server.cc:171 +#: methods/server.cc:173 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/server.cc:194 +#: methods/server.cc:193 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/server.cc:196 +#: methods/server.cc:195 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/server.cc:220 +#: methods/server.cc:219 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/server.cc:489 +#: methods/server.cc:506 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:506 methods/server.cc:562 +#: methods/server.cc:523 methods/server.cc:617 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:654 +#: methods/server.cc:589 +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/server.cc:712 msgid "Internal error" msgstr "Gwall mewnol" -#: apt-private/acqprogress.cc:66 -msgid "Hit " -msgstr "Presennol " - -#: apt-private/acqprogress.cc:90 -msgid "Get:" -msgstr "Cyrchu:" - -#: apt-private/acqprogress.cc:121 -msgid "Ign " -msgstr "Anwybyddu " - -#: apt-private/acqprogress.cc:125 -msgid "Err " -msgstr "Gwall " - -#: apt-private/acqprogress.cc:146 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" +#: apt-private/private-list.cc:121 +msgid "Listing" +msgstr "" -#: apt-private/acqprogress.cc:236 +#: apt-private/private-list.cc:151 #, c-format -msgid " [Working]" -msgstr " [Gweithio]" - -#: apt-private/acqprogress.cc:297 -#, fuzzy, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" -" '%s'\n" -"yn y gyrriant '%s' a gwasgwch Enter\n" +msgid "There is %i additional version. Please use the '-a' switch to see it" +msgid_plural "" +"There are %i additional versions. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" -#: apt-private/private-cachefile.cc: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." -#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47 -msgid "Sorting" +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-download.cc:31 +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:268 #, fuzzy -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" +msgid "[installed,local]" +msgstr " [Sefydliwyd]" -#: apt-private/private-download.cc:35 -msgid "Authentication warning overridden.\n" +#: apt-private/private-output.cc:270 +msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-download.cc:40 apt-private/private-download.cc:47 +#: apt-private/private-output.cc:272 #, fuzzy -msgid "Some packages could not be authenticated" -msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" +msgid "[installed,automatic]" +msgstr " [Sefydliwyd]" -#: apt-private/private-download.cc:45 -msgid "Install these packages without verification?" +#: apt-private/private-output.cc:274 +#, fuzzy +msgid "[installed]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:277 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-download.cc:54 apt-private/private-install.cc:209 -msgid "There are problems and -y was used without --force-yes" -msgstr "Mae problemau a defnyddwyd -y heb --force-yes" +#: apt-private/private-output.cc:281 +msgid "[residual-config]" +msgstr "" -#: apt-private/private-download.cc:86 apt-pkg/update.cc:77 +#: apt-private/private-output.cc:455 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Methwyd cyrchu %s %s\n" +msgid "but %s is installed" +msgstr "ond mae %s wedi ei sefydlu" + +#: apt-private/private-output.cc:457 +#, c-format +msgid "but %s is to be installed" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: apt-private/private-output.cc:464 +msgid "but it is not installable" +msgstr "ond ni ellir ei sefydlu" + +#: apt-private/private-output.cc:466 +msgid "but it is a virtual package" +msgstr "ond mae'n becyn rhithwir" + +#: apt-private/private-output.cc:469 +msgid "but it is not installed" +msgstr "ond nid yw wedi ei sefydlu" + +#: apt-private/private-output.cc:469 +msgid "but it is not going to be installed" +msgstr "ond nid yw'n mynd i gael ei sefydlu" + +#: apt-private/private-output.cc:474 +msgid " or" +msgstr " neu" + +#: apt-private/private-output.cc:488 apt-private/private-output.cc:500 +msgid "The following packages have unmet dependencies:" +msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" + +#: apt-private/private-output.cc:523 +msgid "The following NEW packages will be installed:" +msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: apt-private/private-output.cc:549 +msgid "The following packages will be REMOVED:" +msgstr "Caiff y pecynnau canlynol eu TYNNU:" + +#: apt-private/private-output.cc:571 +#, fuzzy +msgid "The following packages have been kept back:" +msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" + +#: apt-private/private-output.cc:592 +#, fuzzy +msgid "The following packages will be upgraded:" +msgstr "Caiff y pecynnau canlynol eu uwchraddio" + +#: apt-private/private-output.cc:613 +#, fuzzy +msgid "The following packages will be DOWNGRADED:" +msgstr "Caiff y pecynnau canlynol eu ISRADDIO" + +#: apt-private/private-output.cc:633 +msgid "The following held packages will be changed:" +msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" + +#: apt-private/private-output.cc:688 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (oherwydd %s) " + +#: apt-private/private-output.cc:696 +#, fuzzy +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" +"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" +"ei wneud!" + +#: apt-private/private-output.cc:727 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " + +#: apt-private/private-output.cc:731 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu wedi ailsefydlu, " + +#: apt-private/private-output.cc:733 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu wedi eu israddio, " + +#: apt-private/private-output.cc:735 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" + +#: apt-private/private-output.cc:739 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" + +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc:761 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc:767 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: apt-private/private-output.cc:778 +msgid "Y" +msgstr "I" + +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: apt-private/private-output.cc:784 +msgid "N" +msgstr "" + +#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Gwall crynhoi patrwm - %s" + +#: apt-private/private-update.cc:31 +msgid "The update command takes no arguments" +msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" + +#: apt-private/private-update.cc:95 +#, c-format +msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n" +msgid_plural "" +"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n" +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-update.cc:99 +msgid "All packages are up to date." +msgstr "" + +#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 +msgid "Sorting" +msgstr "" + +#: apt-private/private-show.cc:156 +#, c-format +msgid "There is %i additional record. Please use the '-a' switch to see it" +msgid_plural "" +"There are %i additional records. Please use the '-a' switch to see them." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:163 +msgid "not a real package (virtual)" +msgstr "" + +#: apt-private/private-main.cc:32 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" #: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" @@ -1282,22 +1443,21 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" 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:199 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Does dim digon o le rhydd gennych yn %s." +#: apt-private/private-install.cc: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:215 apt-private/private-install.cc:237 +#: 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:219 +#: 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:221 +#: apt-private/private-install.cc:197 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1308,19 +1468,19 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: apt-private/private-install.cc:227 apt-private/private-install.cc:245 +#: apt-private/private-install.cc:203 apt-private/private-install.cc:221 msgid "Abort." msgstr "Erthylu." -#: apt-private/private-install.cc:242 +#: apt-private/private-install.cc:218 msgid "Do you want to continue?" msgstr "Ydych chi eisiau mynd ymlaen?" -#: apt-private/private-install.cc:312 +#: apt-private/private-install.cc:288 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: apt-private/private-install.cc:319 +#: apt-private/private-install.cc:295 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1328,20 +1488,20 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: apt-private/private-install.cc:323 +#: 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:328 +#: apt-private/private-install.cc:304 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: apt-private/private-install.cc:329 +#: apt-private/private-install.cc:305 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: apt-private/private-install.cc:365 +#: apt-private/private-install.cc:341 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1351,15 +1511,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:369 +#: apt-private/private-install.cc:345 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:390 +#: apt-private/private-install.cc:366 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:498 +#: 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." @@ -1375,16 +1535,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:501 apt-private/private-install.cc:642 +#: 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:505 +#: apt-private/private-install.cc:481 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: apt-private/private-install.cc:512 +#: apt-private/private-install.cc:488 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1394,7 +1554,7 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-install.cc:516 +#: apt-private/private-install.cc:492 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1402,18 +1562,18 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-install.cc:518 +#: 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:612 +#: 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:614 +#: apt-private/private-install.cc:589 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1422,7 +1582,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: apt-private/private-install.cc:627 +#: 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" @@ -1434,227 +1594,102 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: apt-private/private-install.cc:648 +#: apt-private/private-install.cc:633 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: apt-private/private-install.cc:701 +#: 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:791 +#: apt-private/private-install.cc:800 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: apt-private/private-install.cc:792 +#: apt-private/private-install.cc:801 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: apt-private/private-list.cc:131 -msgid "Listing" -msgstr "" - -#: apt-private/private-list.cc:164 +#: apt-private/private-install.cc:823 #, c-format -msgid "There is %i additional version. Please use the '-a' switch to see it" -msgid_plural "" -"There are %i additional versions. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" - -#: apt-private/private-main.cc:23 -msgid "" -"NOTE: This is only a simulation!\n" -" apt-get needs root privileges for real execution.\n" -" Keep also in mind that locking is deactivated,\n" -" so don't depend on the relevance to the real current situation!" -msgstr "" +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-output.cc:81 apt-private/private-show.cc:84 -#: apt-private/private-show.cc:89 -msgid "unknown" -msgstr "" - -#: apt-private/private-output.cc:211 +#: apt-private/private-install.cc:827 #, fuzzy, c-format -msgid "[installed,upgradable to: %s]" -msgstr " [Sefydliwyd]" - -#: apt-private/private-output.cc:215 -#, fuzzy -msgid "[installed,local]" -msgstr " [Sefydliwyd]" - -#: apt-private/private-output.cc:218 -msgid "[installed,auto-removable]" -msgstr "" +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-output.cc:220 -#, fuzzy -msgid "[installed,automatic]" -msgstr " [Sefydliwyd]" - -#: apt-private/private-output.cc:222 -#, fuzzy -msgid "[installed]" -msgstr " [Sefydliwyd]" - -#: apt-private/private-output.cc:226 -#, c-format -msgid "[upgradable from: %s]" -msgstr "" - -#: apt-private/private-output.cc:230 -msgid "[residual-config]" -msgstr "" - -#: apt-private/private-output.cc:330 -msgid "The following packages have unmet dependencies:" -msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" - -#: apt-private/private-output.cc:420 +#: apt-private/private-install.cc:839 #, c-format -msgid "but %s is installed" -msgstr "ond mae %s wedi ei sefydlu" +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-output.cc:422 +#: apt-private/private-install.cc:844 #, c-format -msgid "but %s is to be installed" -msgstr "ond mae %s yn mynd i gael ei sefydlu" - -#: apt-private/private-output.cc:429 -msgid "but it is not installable" -msgstr "ond ni ellir ei sefydlu" - -#: apt-private/private-output.cc:431 -msgid "but it is a virtual package" -msgstr "ond mae'n becyn rhithwir" - -#: apt-private/private-output.cc:434 -msgid "but it is not installed" -msgstr "ond nid yw wedi ei sefydlu" - -#: apt-private/private-output.cc:434 -msgid "but it is not going to be installed" -msgstr "ond nid yw'n mynd i gael ei sefydlu" - -#: apt-private/private-output.cc:439 -msgid " or" -msgstr " neu" - -#: apt-private/private-output.cc:468 -msgid "The following NEW packages will be installed:" -msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: apt-private/private-output.cc:494 -msgid "The following packages will be REMOVED:" -msgstr "Caiff y pecynnau canlynol eu TYNNU:" +msgid "%s is already the newest version.\n" +msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: apt-private/private-output.cc:516 -#, fuzzy -msgid "The following packages have been kept back:" -msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" +#: 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-output.cc:537 -#, fuzzy -msgid "The following packages will be upgraded:" -msgstr "Caiff y pecynnau canlynol eu uwchraddio" +#: 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" -#: apt-private/private-output.cc:558 -#, fuzzy -msgid "The following packages will be DOWNGRADED:" -msgstr "Caiff y pecynnau canlynol eu ISRADDIO" +#. 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-output.cc:578 -msgid "The following held packages will be changed:" -msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" +#: 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-output.cc:633 +#: apt-private/private-download.cc:62 #, c-format -msgid "%s (due to %s) " -msgstr "%s (oherwydd %s) " - -#: apt-private/private-output.cc:641 -#, fuzzy msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" +"Can't drop privileges for downloading as file '%s' couldn't be accessed by " +"user '%s'." msgstr "" -"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" -"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" -"ei wneud!" -#: apt-private/private-output.cc:672 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " - -#: apt-private/private-output.cc:676 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu wedi ailsefydlu, " - -#: apt-private/private-output.cc:678 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu wedi eu israddio, " - -#: apt-private/private-output.cc:680 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" - -#: apt-private/private-output.cc:684 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" - -#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] -#. e.g. "Do you want to continue? [Y/n] " -#. The user has to answer with an input matching the -#. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:706 -msgid "[Y/n]" -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!" -#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] -#. e.g. "Should this file be removed? [y/N] " -#. The user has to answer with an input matching the -#. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:712 -msgid "[y/N]" +#: apt-private/private-download.cc:98 +msgid "Authentication warning overridden.\n" msgstr "" -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:723 -msgid "Y" -msgstr "I" +#: 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!" -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:729 -msgid "N" +#: apt-private/private-download.cc:108 +msgid "Install these packages without verification?" msgstr "" -#: apt-private/private-output.cc:751 apt-pkg/cachefilter.cc:35 +#: apt-private/private-download.cc:149 apt-pkg/update.cc:77 #, c-format -msgid "Regex compilation error - %s" -msgstr "Gwall crynhoi patrwm - %s" +msgid "Failed to fetch %s %s\n" +msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-search.cc:51 -msgid "Full Text Search" -msgstr "" +#: 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-show.cc:156 +#: apt-private/private-download.cc:188 #, c-format -msgid "There is %i additional record. Please use the '-a' switch to see it" -msgid_plural "" -"There are %i additional records. Please use the '-a' switch to see them." -msgstr[0] "" -msgstr[1] "" - -#: apt-private/private-show.cc:163 -msgid "not a real package (virtual)" -msgstr "" +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 @@ -1666,38 +1701,61 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/private-update.cc:31 -msgid "The update command takes no arguments" -msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "" -#: apt-private/private-upgrade.cc:25 -#, fuzzy -msgid "Calculating upgrade... " -msgstr "Yn Cyfrifo'r Uwchraddiad... " +#: apt-private/acqprogress.cc:66 +msgid "Hit " +msgstr "Presennol " -#: apt-private/private-upgrade.cc:30 -#, fuzzy -msgid "Internal error, Upgrade broke stuff" -msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" +#: apt-private/acqprogress.cc:88 +msgid "Get:" +msgstr "Cyrchu:" -#: apt-private/private-upgrade.cc:32 -msgid "Done" -msgstr "Wedi Gorffen" +#: apt-private/acqprogress.cc:119 +msgid "Ign " +msgstr "Anwybyddu " + +#: apt-private/acqprogress.cc:126 +msgid "Err " +msgstr "Gwall " + +#: 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:240 +#, c-format +msgid " [Working]" +msgstr " [Gweithio]" + +#: apt-private/acqprogress.cc:301 +#, fuzzy, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" +" '%s'\n" +"yn y gyrriant '%s' a gwasgwch Enter\n" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:471 apt-pkg/acquire.cc:491 -#: apt-pkg/clean.cc:40 apt-pkg/init.cc:102 apt-pkg/init.cc:110 -#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 -#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:371 -#: apt-pkg/contrib/fileutl.cc:484 +#: 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/acquire.cc:497 -#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64 -#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49 +#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563 +#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201 #: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" @@ -1731,7 +1789,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:343 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -1775,7 +1833,7 @@ msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" # FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:224 +#: cmdline/apt-extracttemplates.cc:229 #, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" @@ -1800,46 +1858,47 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:254 +#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092 #, fuzzy, c-format msgid "Unable to mkstemp %s" msgstr "Ni ellir gwneud stat() o %s" -#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400 +#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385 +#: apt-pkg/contrib/fileutl.cc:2097 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: cmdline/apt-extracttemplates.cc:300 +#: 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:180 ftparchive/apt-ftparchive.cc:358 +#: 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:182 ftparchive/apt-ftparchive.cc:199 -#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273 -#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309 +#: 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:271 +#: 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:388 +#: 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:418 +#: 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:606 +#: ftparchive/apt-ftparchive.cc:625 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -1921,137 +1980,142 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol" -#: ftparchive/apt-ftparchive.cc:812 +#: ftparchive/apt-ftparchive.cc:821 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:890 +#: ftparchive/apt-ftparchive.cc:906 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: ftparchive/cachedb.cc:51 +#: ftparchive/cachedb.cc:67 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: ftparchive/cachedb.cc:69 +#: ftparchive/cachedb.cc:85 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: ftparchive/cachedb.cc:80 +#: 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:85 +#: ftparchive/cachedb.cc:101 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199 +#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199 #: apt-inst/extract.cc:216 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:253 +#: 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:494 +#: ftparchive/cachedb.cc:526 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:91 +#: ftparchive/writer.cc:104 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: ftparchive/writer.cc:96 +#: ftparchive/writer.cc:109 #, c-format msgid "W: Unable to stat %s\n" msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:165 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:154 +#: ftparchive/writer.cc:167 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:161 +#: ftparchive/writer.cc:174 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:179 ftparchive/writer.cc:211 +#: ftparchive/writer.cc:192 ftparchive/writer.cc:224 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:192 +#: ftparchive/writer.cc:205 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:219 +#: ftparchive/writer.cc:232 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:278 +#: ftparchive/writer.cc:291 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:299 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:290 +#: ftparchive/writer.cc:303 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:298 +#: ftparchive/writer.cc:311 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:308 +#: ftparchive/writer.cc:321 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:413 +#: ftparchive/writer.cc:427 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:421 ftparchive/writer.cc:711 +#: ftparchive/writer.cc:435 ftparchive/writer.cc:698 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:489 ftparchive/writer.cc:855 +#: ftparchive/writer.cc:502 ftparchive/writer.cc:862 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:721 +#: ftparchive/writer.cc:712 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:725 +#: ftparchive/writer.cc:716 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/contents.cc:340 ftparchive/contents.cc:371 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" @@ -2134,7 +2198,7 @@ msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" # FIXME: "debian" -#: cmdline/apt-internal-solver.cc:46 +#: cmdline/apt-internal-solver.cc:51 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2159,11 +2223,11 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-sortpkgs.cc:89 +#: cmdline/apt-sortpkgs.cc:91 msgid "Unknown package record!" msgstr "Cofnod pecyn anhysbys!" -#: cmdline/apt-sortpkgs.cc:153 +#: cmdline/apt-sortpkgs.cc:155 #, fuzzy msgid "" "Usage: apt-sortpkgs [options] file1 [file2 ...]\n" @@ -2188,213 +2252,424 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\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" - -#: apt-inst/dirstream.cc:105 +#: apt-pkg/install-progress.cc:59 #, c-format -msgid "Failed to close file %s" -msgstr "Methwyd cau ffeil %s" +msgid "Progress: [%3i%%]" +msgstr "" -#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 -#, c-format -msgid "The path %s is too long" -msgstr "Mae'r llwybr %s yn rhy hir" +#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176 +msgid "Running dpkg" +msgstr "" -#: apt-inst/extract.cc:132 +#: apt-pkg/init.cc:156 #, c-format -msgid "Unpacking %s more than once" -msgstr "Yn dadbacio %s mwy nag unwaith" +msgid "Packaging system '%s' is not supported" +msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-inst/extract.cc:142 +#: 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:775 #, c-format -msgid "The directory %s is diverted" -msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" +msgid "Wrote %i records.\n" +msgstr "" -#: apt-inst/extract.cc:152 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, 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 "Wrote %i records with %i missing files.\n" +msgstr "" -#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 -msgid "The diversion path is too long" -msgstr "Mae llwybr y dargyfeiriad yn rhy hir" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" -#: apt-inst/extract.cc:249 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format -msgid "The directory %s is being replaced by a non-directory" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-inst/extract.cc:289 -msgid "Failed to locate node in its hash bucket" -msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" -#: apt-inst/extract.cc:293 -msgid "The path is too long" -msgstr "Mae'r llwybr yn rhy hir" +#: apt-pkg/indexcopy.cc:521 +#, fuzzy, c-format +msgid "Hash mismatch for: %s" +msgstr "Camgyfatebiaeth swm MD5" -# FIXME: wtf? -#: apt-inst/extract.cc:421 +#: apt-pkg/acquire-worker.cc:133 #, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" +msgid "The method driver %s could not be found." +msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-inst/extract.cc:438 +#: apt-pkg/acquire-worker.cc:135 #, 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 "Is the package %s installed?" +msgstr "" -#: apt-inst/extract.cc:498 +#: apt-pkg/acquire-worker.cc:186 #, c-format -msgid "Unable to stat %s" -msgstr "Ni ellir gwneud stat() o %s" +msgid "Method %s did not start correctly" +msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-inst/filelist.cc:380 -msgid "DropNode called on still linked node" -msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" +#: apt-pkg/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-inst/filelist.cc:412 -msgid "Failed to locate the hash element!" -msgstr "Methyd lleoli yr elfen <hash>!" +#: apt-pkg/cachefile.cc:94 +msgid "The package lists or status file could not be parsed or opened." +msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." -#: apt-inst/filelist.cc:459 -msgid "Failed to allocate diversion" -msgstr "Methwyd neilltuo dargyfeiriad" +#: apt-pkg/cachefile.cc:98 +msgid "You may want to run apt-get update to correct these problems" +msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." -#: apt-inst/filelist.cc:464 -#, fuzzy -msgid "Internal error in AddDiversion" -msgstr "Gwall Mewnol yn AddDiversion" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Methwyd darllen y rhestr ffynhonellau." -#: apt-inst/filelist.cc:477 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" +#: apt-pkg/pkgcache.cc:154 +msgid "Empty package cache" +msgstr "Storfa pecyn gwag" -# FIXME: "the" -#: apt-inst/filelist.cc:506 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" +#: 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-inst/filelist.cc:549 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Ffeil cyfluniad dyblyg %s/%s" +#: apt-pkg/pkgcache.cc:165 +msgid "The package cache file is an incompatible version" +msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" -#: apt-inst/contrib/arfile.cc:76 -msgid "Invalid archive signature" -msgstr "Llofnod archif annilys" +#: 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" -#: apt-inst/contrib/arfile.cc:84 -msgid "Error reading archive member header" -msgstr "Gwall wrth ddarllen pennawd aelod archif" +# FIXME: capitalisation? +#: 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-inst/contrib/arfile.cc:96 +#: apt-pkg/pkgcache.cc:185 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Pennawd aelod archif annilys" +msgid "The package cache was built for different architectures: %s vs %s" +msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-inst/contrib/arfile.cc:108 -msgid "Invalid archive member header" -msgstr "Pennawd aelod archif annilys" +#: apt-pkg/pkgcache.cc:322 +msgid "Depends" +msgstr "Dibynnu" -#: apt-inst/contrib/arfile.cc:137 -msgid "Archive is too short" -msgstr "Mae'r archif yn rhy fyr" +#: apt-pkg/pkgcache.cc:322 +msgid "PreDepends" +msgstr "CynDdibynnu" -#: apt-inst/contrib/arfile.cc:141 -msgid "Failed to read the archive headers" -msgstr "Methwyd darllen pennawdau'r archif" +#: apt-pkg/pkgcache.cc:322 +msgid "Suggests" +msgstr "Awgrymu" -#: apt-inst/contrib/extracttar.cc:124 -msgid "Failed to create pipes" -msgstr "Methwyd creu pibau" +#: apt-pkg/pkgcache.cc:323 +msgid "Recommends" +msgstr "Argymell" -#: apt-inst/contrib/extracttar.cc:151 -msgid "Failed to exec gzip " -msgstr "Methwyd gweithredu gzip" +#: apt-pkg/pkgcache.cc:323 +msgid "Conflicts" +msgstr "Gwrthdaro" -#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218 -msgid "Corrupted archive" -msgstr "Archif llygredig" +#: apt-pkg/pkgcache.cc:323 +msgid "Replaces" +msgstr "Amnewid" + +#: apt-pkg/pkgcache.cc:324 +msgid "Obsoletes" +msgstr "Darfodi" + +#: apt-pkg/pkgcache.cc:324 +msgid "Breaks" +msgstr "" + +#: apt-pkg/pkgcache.cc:324 +msgid "Enhances" +msgstr "" -#: apt-inst/contrib/extracttar.cc:203 +#: apt-pkg/pkgcache.cc:335 +msgid "important" +msgstr "pwysig" + +#: apt-pkg/pkgcache.cc:335 +msgid "required" +msgstr "angenrheidiol" + +#: apt-pkg/pkgcache.cc:335 +msgid "standard" +msgstr "safonnol" + +#: apt-pkg/pkgcache.cc:336 +msgid "optional" +msgstr "opsiynnol" + +#: apt-pkg/pkgcache.cc:336 +msgid "extra" +msgstr "ychwanegol" + +#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182 #, fuzzy -msgid "Tar checksum failed, archive corrupted" -msgstr "Methodd swm gwirio Tar, archif llygredig" +msgid "Calculating upgrade" +msgstr "Yn Cyfrifo'r Uwchraddiad" -#: apt-inst/contrib/extracttar.cc:308 +#: apt-pkg/pkgrecords.cc:38 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Math pennawd TAR anhysbys %u, aelod %s" +msgid "Index file type '%s' is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 -#: apt-inst/deb/debfile.cc:63 -#, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" +#: apt-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-inst/deb/debfile.cc:132 +#: apt-pkg/sourcelist.cc:170 #, fuzzy, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" +msgid "Malformed line %lu in source list %s ([option] unparseable)" +msgstr "" +"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-inst/deb/debfile.cc:227 -#, fuzzy -msgid "Unparsable control file" -msgstr "Ffeil rheoli ni ellir ei ramadegu" +#: 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.cc:87 apt-pkg/cdrom.cc:816 +#: apt-pkg/sourcelist.cc:184 #, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." +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/acquire.cc:91 +#: apt-pkg/sourcelist.cc:190 #, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Mae'r cyfeiriadur archif %spartial ar goll." +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.cc:99 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" +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)" -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:899 +#: apt-pkg/sourcelist.cc:206 #, c-format -msgid "Retrieving file %li of %li (%s remaining)" +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)" + +#: 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 "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" + +#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." + +#: apt-pkg/sourcelist.cc:371 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/acquire.cc:901 +#: apt-pkg/sourcelist.cc:375 #, fuzzy, c-format -msgid "Retrieving file %li of %li" -msgstr "Yn Darllen Rhestr Ffeiliau" +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/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2054 +#: apt-pkg/sourcelist.cc:416 +#, fuzzy, c-format +msgid "Type '%s' is not known on stanza %u in source list %s" +msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" + +#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" + +#: apt-pkg/clean.cc:64 +#, c-format +msgid "Unable to stat %s." +msgstr "Ni ellir gwneud stat() o %s." + +#: apt-pkg/pkgcachegen.cc:113 +msgid "Cache has an incompatible versioning system" +msgstr "Mae can y storfa system fersiwn anghyfaddas" + +#. TRANSLATOR: The first placeholder is a package name, +#. the other two should be copied verbatim as they include debug info +#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250 +#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382 +#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 +#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 +#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 +#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525 +#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:584 +#, fuzzy, c-format +msgid "Error occurred while processing %s (%s%d)" +msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:273 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:276 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:279 +#, fuzzy +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:282 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." + +#: apt-pkg/pkgcachegen.cc:591 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" + +#: apt-pkg/pkgcachegen.cc:1196 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" + +#: 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:1301 +msgid "Collecting File Provides" +msgstr "Yn Casglu Darpariaethau Ffeil" + +#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500 +msgid "IO Error saving source cache" +msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" + +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" + +#: 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:163 +#: apt-pkg/acquire-item.cc:240 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:168 +#: apt-pkg/acquire-item.cc:245 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" -#: apt-pkg/acquire-item.cc:173 +#: apt-pkg/acquire-item.cc:250 #, fuzzy msgid "Invalid file format" msgstr "Gweithred annilys %s" -#: apt-pkg/acquire-item.cc:1579 +#: 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 " @@ -2402,42 +2677,36 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1595 +#: 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:1637 +#: 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:1675 +#: 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:1697 +#: apt-pkg/acquire-item.cc:2059 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1727 +#: apt-pkg/acquire-item.cc:2078 #, 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:1737 apt-pkg/acquire-item.cc:1742 -#, c-format -msgid "GPG error: %s: %s" +"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:1865 +#: 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 " @@ -2446,210 +2715,206 @@ 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:1931 +#: 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:1989 +#: 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/acquire-worker.cc:116 +#: apt-pkg/vendorlist.cc:83 #, c-format -msgid "The method driver %s could not be found." -msgstr "Methwyd canfod y gyrrydd dull %s." +msgid "Vendor block %s contains no fingerprint" +msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/acquire-worker.cc:118 -#, c-format -msgid "Is the package %s installed?" -msgstr "" +#: 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-worker.cc:169 -#, c-format -msgid "Method %s did not start correctly" -msgstr "Ni gychwynodd y dull %s yn gywir" +#: 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-worker.cc:455 +#: apt-pkg/acquire.cc:162 #, 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" +msgid "Unable to lock directory %s" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: apt-pkg/algorithms.cc:265 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:981 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " -"ei gyfer." - -#: apt-pkg/algorithms.cc:1086 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." -msgstr "" -"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " -"ei achosi gan pecynnau wedi eu dal." - -#: apt-pkg/algorithms.cc:1088 -msgid "Unable to correct problems, you have held broken packages." +msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." - -#: apt-pkg/cachefile.cc:94 -msgid "The package lists or status file could not be parsed or opened." -msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." -#: apt-pkg/cachefile.cc:98 -msgid "You may want to run apt-get update to correct these problems" -msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." - -#: apt-pkg/cachefile.cc:116 -msgid "The list of sources could not be read." -msgstr "Methwyd darllen y rhestr ffynhonellau." +#: apt-pkg/acquire.cc:983 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/cacheset.cc:487 -#, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" +# FIXME: ...file +#: apt-pkg/srcrecords.cc:53 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" -#: apt-pkg/cacheset.cc:490 +#: apt-pkg/policy.cc:83 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " - -#: apt-pkg/cacheset.cc:601 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Methwyd canfod pecyn %s" - -#: apt-pkg/cacheset.cc:607 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Methwyd canfod pecyn %s" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" +msgstr "" -#: apt-pkg/cacheset.cc:613 +# FIXME: literal +#: apt-pkg/policy.cc:422 #, fuzzy, c-format -msgid "Couldn't find any package by glob '%s'" -msgstr "Methwyd canfod pecyn %s" +msgid "Invalid record in the preferences file %s, no Package header" +msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" -#: apt-pkg/cacheset.cc:624 +# FIXME: tense +#: apt-pkg/policy.cc:444 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +msgid "Did not understand pin type %s" +msgstr "Methwyd daeall y math pin %s" + +#: apt-pkg/policy.cc:452 +msgid "No priority (or zero) specified for pin" +msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638 +#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984 #, c-format msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/cacheset.cc:645 -#, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593 +#, fuzzy, c-format +msgid "Could not configure '%s'. " +msgstr "Methwyd agor ffeil %s" -#: apt-pkg/cacheset.cc:653 +# FIXME: %s may have an arbirrary length +#: apt-pkg/packagemanager.cc:643 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" +msgid "" +"This installation run will require temporarily removing the essential " +"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " +"you really want to do it, activate the APT::Force-LoopBreak option." msgstr "" +"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s " +"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/cacheset.cc:661 -#, c-format -msgid "Can't select installed version from package %s as it is not installed" +#: 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: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/cdrom.cc:571 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "CD Anghywir" -#: apt-pkg/cdrom.cc:577 +#: apt-pkg/cdrom.cc:586 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "CD Anghywir" - -#: apt-pkg/cdrom.cc:592 +#: apt-pkg/cdrom.cc:599 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" -#: apt-pkg/cdrom.cc:602 +#: apt-pkg/cdrom.cc:609 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:610 +#: apt-pkg/cdrom.cc:620 msgid "Identifying... " msgstr "" -#: apt-pkg/cdrom.cc:648 +#: apt-pkg/cdrom.cc:662 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:672 +#: apt-pkg/cdrom.cc:680 msgid "Scanning disc for index files...\n" msgstr "" -#: apt-pkg/cdrom.cc:722 +#: apt-pkg/cdrom.cc:734 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:733 +#: apt-pkg/cdrom.cc:744 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:760 +#: apt-pkg/cdrom.cc:771 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:789 +#: apt-pkg/cdrom.cc:800 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:806 +#: apt-pkg/cdrom.cc:817 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:808 +#: apt-pkg/cdrom.cc:819 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:843 +#: 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:851 +#: apt-pkg/cdrom.cc:877 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/clean.cc:61 +#: apt-pkg/algorithms.cc:265 #, c-format -msgid "Unable to stat %s." -msgstr "Ni ellir gwneud stat() o %s." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " +"ei gyfer." + +#: apt-pkg/algorithms.cc:1090 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " +"ei achosi gan pecynnau wedi eu dal." + +#: 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/depcache.cc:138 apt-pkg/depcache.cc:167 #, fuzzy @@ -2671,654 +2936,263 @@ msgstr "Cynhyrchaid Dibyniaeth" msgid "Reading state information" msgstr "Yn cyfuno manylion Ar Gael" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/depcache.cc:252 #, fuzzy, c-format msgid "Failed to open StateFile %s" msgstr "Methwyd agor %s" -#: apt-pkg/depcache.cc:256 +#: apt-pkg/depcache.cc:258 #, fuzzy, c-format msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70 -msgid "Send scenario to solver" -msgstr "" +#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207 +#, c-format +msgid "Unable to parse package file %s (%d)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (%d)" -#: apt-pkg/edsp.cc:216 -msgid "Send request to solver" -msgstr "" +#: 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/edsp.cc:286 -msgid "Prepare for receiving solution" -msgstr "" +#: 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/edsp.cc:293 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-pkg/cacheset.cc:629 +#, fuzzy, c-format +msgid "Couldn't find task '%s'" +msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571 -msgid "Execute external solver" -msgstr "" +#: 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:641 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773 +#: apt-pkg/cacheset.cc:680 #, c-format -msgid "Wrote %i records.\n" +msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775 +#: apt-pkg/cacheset.cc:719 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778 +#: apt-pkg/cacheset.cc:727 #, c-format -msgid "Wrote %i records with %i mismatched files\n" +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781 +#: apt-pkg/cacheset.cc:735 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgid "Can't select installed version from package %s as it is not installed" msgstr "" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751 #, c-format -msgid "Can't find authentication record for: %s" +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -#: apt-pkg/indexcopy.cc:521 -#, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Camgyfatebiaeth swm MD5" - # FIXME: number? -#: apt-pkg/indexrecords.cc:78 +#: 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:86 +#: 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:117 +#: apt-pkg/indexrecords.cc:132 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:130 +#: 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:149 +#: apt-pkg/indexrecords.cc:164 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/init.cc:145 -#, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Ni chynhelir y system pecynnu '%s'" - -#: apt-pkg/init.cc:161 -#, fuzzy -msgid "Unable to determine a suitable packaging system type" -msgstr "Ni ellir canfod math system addas" - -#: apt-pkg/install-progress.cc:57 -#, c-format -msgid "Progress: [%3i%%]" -msgstr "" - -#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174 -msgid "Running dpkg" -msgstr "" - -#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932 -#, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" - -#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535 -#, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Methwyd agor ffeil %s" - -# FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:577 -#, c-format -msgid "" -"This installation run will require temporarily removing the essential " -"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if " -"you really want to do it, activate the APT::Force-LoopBreak option." -msgstr "" -"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s " -"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/pkgcache.cc:155 -msgid "Empty package cache" -msgstr "Storfa pecyn gwag" - -#: apt-pkg/pkgcache.cc:161 -msgid "The package cache file is corrupted" -msgstr "Mae'r ffeil storfa pecyn yn llygredig" - -#: apt-pkg/pkgcache.cc:166 -msgid "The package cache file is an incompatible version" -msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" - -#: apt-pkg/pkgcache.cc:169 -#, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Mae'r ffeil storfa pecyn yn llygredig" - -# FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:174 -#, fuzzy, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" - -#: apt-pkg/pkgcache.cc:179 -msgid "The package cache was built for a different architecture" -msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" - -#: apt-pkg/pkgcache.cc:321 -msgid "Depends" -msgstr "Dibynnu" - -#: apt-pkg/pkgcache.cc:321 -msgid "PreDepends" -msgstr "CynDdibynnu" - -#: apt-pkg/pkgcache.cc:321 -msgid "Suggests" -msgstr "Awgrymu" - -#: apt-pkg/pkgcache.cc:322 -msgid "Recommends" -msgstr "Argymell" - -#: apt-pkg/pkgcache.cc:322 -msgid "Conflicts" -msgstr "Gwrthdaro" - -#: apt-pkg/pkgcache.cc:322 -msgid "Replaces" -msgstr "Amnewid" - -#: apt-pkg/pkgcache.cc:323 -msgid "Obsoletes" -msgstr "Darfodi" - -#: apt-pkg/pkgcache.cc:323 -msgid "Breaks" -msgstr "" - -#: apt-pkg/pkgcache.cc:323 -msgid "Enhances" -msgstr "" - -#: apt-pkg/pkgcache.cc:334 -msgid "important" -msgstr "pwysig" - -#: apt-pkg/pkgcache.cc:334 -msgid "required" -msgstr "angenrheidiol" - -#: apt-pkg/pkgcache.cc:334 -msgid "standard" -msgstr "safonnol" - -#: apt-pkg/pkgcache.cc:335 -msgid "optional" -msgstr "opsiynnol" - -#: apt-pkg/pkgcache.cc:335 -msgid "extra" -msgstr "ychwanegol" - -#: apt-pkg/pkgcachegen.cc:93 -msgid "Cache has an incompatible versioning system" -msgstr "Mae can y storfa system fersiwn anghyfaddas" - -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234 -#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327 -#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382 -#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403 -#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415 -#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440 -#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555 -#: apt-pkg/pkgcachegen.cc:569 -#, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" - -#: apt-pkg/pkgcachegen.cc:257 -msgid "Wow, you exceeded the number of package names this APT is capable of." -msgstr "" -"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." - -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." - -#: apt-pkg/pkgcachegen.cc:263 -#, fuzzy -msgid "Wow, you exceeded the number of descriptions this APT is capable of." -msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." - -#: apt-pkg/pkgcachegen.cc:266 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" -"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." - -#: apt-pkg/pkgcachegen.cc:576 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" - -#: apt-pkg/pkgcachegen.cc:1211 -#, 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 -#, fuzzy -msgid "Reading package lists" -msgstr "Yn Darllen Rhestrau Pecynnau" - -#: apt-pkg/pkgcachegen.cc:1316 -msgid "Collecting File Provides" -msgstr "Yn Casglu Darpariaethau Ffeil" - -#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515 -msgid "IO Error saving source cache" -msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" - -#: apt-pkg/pkgrecords.cc:38 -#, c-format -msgid "Index file type '%s' is not supported" -msgstr "Ni chynhelir y math ffeil mynegai '%s'" - -#: apt-pkg/policy.cc:83 -#, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" -msgstr "" - -# FIXME: literal -#: apt-pkg/policy.cc:422 -#, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" - -# FIXME: tense -#: apt-pkg/policy.cc:444 +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Did not understand pin type %s" -msgstr "Methwyd daeall y math pin %s" - -#: apt-pkg/policy.cc:452 -msgid "No priority (or zero) specified for pin" -msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" - -#: apt-pkg/sourcelist.cc:127 -#, fuzzy, c-format -msgid "Malformed stanza %u in source list %s (URI parse)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" - -#: apt-pkg/sourcelist.cc:170 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] unparseable)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:173 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([option] too short)" -msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" - -#: apt-pkg/sourcelist.cc:184 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] is not an assignment)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:190 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] has no key)" -msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:193 -#, fuzzy, c-format -msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" +msgid "%lid %lih %limin %lis" 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)" -#: 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 +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 #, c-format -msgid "Malformed line %lu in source list %s (dist parse)" +msgid "%lih %limin %lis" msgstr "" -"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" - -#: apt-pkg/sourcelist.cc:335 -#, c-format -msgid "Opening %s" -msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:371 -#, c-format -msgid "Malformed line %u in source list %s (type)" -msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" - -#: apt-pkg/sourcelist.cc:375 -#, fuzzy, c-format -msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" - -#: apt-pkg/sourcelist.cc:416 -#, fuzzy, c-format -msgid "Type '%s' is not known on stanza %u in source list %s" -msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" - -# FIXME: ...file -#: apt-pkg/srcrecords.cc:52 -msgid "You must put some 'source' URIs in your sources.list" -msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list" - -# FIXME: number? -#: apt-pkg/tagfile.cc:140 -#, c-format -msgid "Unable to parse package file %s (1)" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" - -#: apt-pkg/tagfile.cc:237 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" - -#: 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/vendorlist.cc:85 -#, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" - -#: apt-pkg/contrib/cdromutl.cc:65 -#, c-format -msgid "Unable to stat the mount point %s" -msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" - -#: apt-pkg/contrib/cdromutl.cc:246 -msgid "Failed to stat the cdrom" -msgstr "Methwyd gwneud stat() o'r CD-ROM" - -# FIXME -#: apt-pkg/contrib/cmndline.cc:121 -#, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." - -#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155 -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not understood" -msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" - -#: apt-pkg/contrib/cmndline.cc:168 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" - -#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230 -#, c-format -msgid "Option %s requires an argument." -msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." - -#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249 -#, c-format -msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>." - -#: apt-pkg/contrib/cmndline.cc:278 -#, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" - -#: apt-pkg/contrib/cmndline.cc:309 -#, c-format -msgid "Option '%s' is too long" -msgstr "Opsiwn '%s' yn rhy hir" - -# FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:341 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." - -#: apt-pkg/contrib/cmndline.cc:391 -#, c-format -msgid "Invalid operation %s" -msgstr "Gweithred annilys %s" - -#: apt-pkg/contrib/configuration.cc:519 -#, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Talgryniad math anhysbys: '%c'" - -#: apt-pkg/contrib/configuration.cc:633 -#, c-format -msgid "Opening configuration file %s" -msgstr "Yn agor y ffeil cyfluniad %s" - -#: apt-pkg/contrib/configuration.cc:801 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." - -# FIXME -#: apt-pkg/contrib/configuration.cc:820 -#, fuzzy, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" - -#: apt-pkg/contrib/configuration.cc:837 -#, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" - -#: apt-pkg/contrib/configuration.cc:877 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:439 #, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgid "%limin %lis" msgstr "" -"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:884 -#, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" - -#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893 -#, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" - -#: apt-pkg/contrib/configuration.cc:897 +#. s means seconds +#: apt-pkg/contrib/strutl.cc:444 #, 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 -#, fuzzy, c-format -msgid "Syntax error %s:%u: clear directive requires an option tree as argument" +msgid "%lis" msgstr "" -"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:950 +#: apt-pkg/contrib/strutl.cc:1290 #, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" +msgid "Selection %s not found" +msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/fileutl.cc:193 +#: 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:198 +#: 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:221 +#: 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:226 +#: 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:363 apt-pkg/contrib/fileutl.cc:477 +#: 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:397 +#: 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:415 +#: 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:424 +#: 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:827 +#: 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:829 +#: 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:833 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:835 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:916 +#: 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:1104 +#: apt-pkg/contrib/fileutl.cc:1140 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1163 apt-pkg/contrib/fileutl.cc:1210 +#: 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:1317 +#: 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:1375 +#: apt-pkg/contrib/fileutl.cc:1412 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1516 +#: 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:1629 apt-pkg/contrib/fileutl.cc:1651 +#: 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:1922 +#: 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:1934 +#: 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:1945 +#: 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:1958 +#: apt-pkg/contrib/fileutl.cc:1989 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:72 +#: apt-pkg/contrib/progress.cc:148 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Gwall!" + +#: apt-pkg/contrib/progress.cc:150 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Wedi Gorffen" + +#: apt-pkg/contrib/progress.cc:181 +msgid "..." +msgstr "" + +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 #, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Yn Erthylu'r Sefydliad." +msgid "%c%s... %u%%" +msgstr "%c%s... Wedi Gorffen" #: apt-pkg/contrib/mmap.cc:79 msgid "Can't mmap an empty file" @@ -3374,219 +3248,455 @@ msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -#: apt-pkg/contrib/progress.cc:148 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Gwall!" +msgid "Unable to stat the mount point %s" +msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/progress.cc:150 +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Methwyd gwneud stat() o'r CD-ROM" + +#: apt-pkg/contrib/configuration.cc:522 #, c-format -msgid "%c%s... Done" -msgstr "%c%s... Wedi Gorffen" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/progress.cc:181 -msgid "..." -msgstr "" +#: apt-pkg/contrib/configuration.cc:636 +#, c-format +msgid "Opening configuration file %s" +msgstr "Yn agor y ffeil cyfluniad %s" -#. Print the spinner -#: apt-pkg/contrib/progress.cc:197 +#: 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:823 #, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Wedi Gorffen" +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:406 +#: apt-pkg/contrib/configuration.cc:840 #, c-format -msgid "%lid %lih %limin %lis" -msgstr "" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:413 +#: apt-pkg/contrib/configuration.cc:880 #, c-format -msgid "%lih %limin %lis" +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" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/contrib/configuration.cc:887 #, c-format -msgid "%limin %lis" -msgstr "" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:425 +#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896 #, c-format -msgid "%lis" +msgid "Syntax error %s:%u: Included from here" +msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" + +#: 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: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/strutl.cc:1236 +#: apt-pkg/contrib/configuration.cc:953 #, c-format -msgid "Selection %s not found" -msgstr "Ni chanfuwyd y dewis %s" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" -#: apt-pkg/deb/debsystem.cc:91 +# FIXME +#: apt-pkg/contrib/cmndline.cc:127 #, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +msgid "Command line option '%c' [from %s] is not known." +msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/deb/debsystem.cc:94 -#, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" +#: 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" -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:110 +#: apt-pkg/contrib/cmndline.cc:174 #, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +msgid "Command line option %s is not boolean" +msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/deb/debsystem.cc:128 -msgid "Not locked" -msgstr "" +#: 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: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/deb/dpkgpm.cc:95 +#: 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:315 +#, c-format +msgid "Option '%s' is too long" +msgstr "Opsiwn '%s' yn rhy hir" + +# FIXME: 'Sense'? +#: 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:397 +#, c-format +msgid "Invalid operation %s" +msgstr "Gweithred annilys %s" + +#: apt-pkg/deb/dpkgpm.cc:112 #, fuzzy, c-format msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996 +#: 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:97 apt-pkg/deb/dpkgpm.cc:1003 +#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:98 +#: apt-pkg/deb/dpkgpm.cc:115 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:99 +#: apt-pkg/deb/dpkgpm.cc:116 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:100 +#: apt-pkg/deb/dpkgpm.cc:117 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:827 +#: 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:842 apt-pkg/deb/dpkgpm.cc:864 +#: 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:989 +#: apt-pkg/deb/dpkgpm.cc:1001 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:1002 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:995 +#: 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:997 +#: apt-pkg/deb/dpkgpm.cc:1009 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/deb/dpkgpm.cc:1014 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1004 +#: apt-pkg/deb/dpkgpm.cc:1016 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:1009 +#: 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:1010 +#: apt-pkg/deb/dpkgpm.cc:1022 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1065 -msgid "ioctl(TIOCGWINSZ) failed" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089 +#: 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:1068 +#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1089 -msgid "Is stdout a terminal?" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1567 +#: apt-pkg/deb/dpkgpm.cc:1656 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1629 +#: 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:1634 +#: apt-pkg/deb/dpkgpm.cc:1723 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1636 +#: 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:1642 +#: 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:1649 +#: 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:1656 apt-pkg/deb/dpkgpm.cc:1662 +#: 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:1683 +#: apt-pkg/deb/dpkgpm.cc:1773 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" +#: apt-pkg/deb/debsystem.cc:91 +#, c-format +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" + +#: apt-pkg/deb/debsystem.cc:94 +#, fuzzy, c-format +msgid "Unable to lock the administration directory (%s), are you root?" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" + +#. TRANSLATORS: the %s contains the recovery command, usually +#. dpkg --configure -a +#: apt-pkg/deb/debsystem.cc:110 +#, c-format +msgid "" +"dpkg was interrupted, you must manually run '%s' to correct the problem. " +msgstr "" + +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: apt-inst/filelist.cc:380 +msgid "DropNode called on still linked node" +msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" + +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Methyd lleoli yr elfen <hash>!" + +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Methwyd neilltuo dargyfeiriad" + +#: apt-inst/filelist.cc:464 +#, fuzzy +msgid "Internal error in AddDiversion" +msgstr "Gwall Mewnol yn AddDiversion" + +#: apt-inst/filelist.cc:477 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" + +# FIXME: "the" +#: apt-inst/filelist.cc:506 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" + +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Ffeil cyfluniad dyblyg %s/%s" + +#: apt-inst/extract.cc:101 apt-inst/extract.cc:172 +#, c-format +msgid "The path %s is too long" +msgstr "Mae'r llwybr %s yn rhy hir" + +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Yn dadbacio %s mwy nag unwaith" + +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" + +#: apt-inst/extract.cc:152 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" + +#: apt-inst/extract.cc:162 apt-inst/extract.cc:306 +msgid "The diversion path is too long" +msgstr "Mae llwybr y dargyfeiriad yn rhy hir" + +#: apt-inst/extract.cc:249 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "" +"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" + +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" + +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Mae'r llwybr yn rhy hir" + +# FIXME: wtf? +#: apt-inst/extract.cc:421 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" + +#: apt-inst/extract.cc:438 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" + +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "Ni ellir gwneud stat() o %s" + +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Methwyd ysgrifennu ffeil %s" + +#: apt-inst/dirstream.cc:104 +#, c-format +msgid "Failed to close file %s" +msgstr "Methwyd cau ffeil %s" + +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" + +#: apt-inst/deb/debfile.cc:132 +#, fuzzy, c-format +msgid "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" + +#: apt-inst/deb/debfile.cc:231 +#, fuzzy +msgid "Unparsable control file" +msgstr "Ffeil rheoli ni ellir ei ramadegu" + +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Llofnod archif annilys" + +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Gwall wrth ddarllen pennawd aelod archif" + +#: apt-inst/contrib/arfile.cc:96 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" + +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Pennawd aelod archif annilys" + +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Mae'r archif yn rhy fyr" + +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Methwyd darllen pennawdau'r archif" + +#: apt-inst/contrib/extracttar.cc:128 +msgid "Failed to create pipes" +msgstr "Methwyd creu pibau" + +#: apt-inst/contrib/extracttar.cc:155 +msgid "Failed to exec gzip " +msgstr "Methwyd gweithredu gzip" + +#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222 +msgid "Corrupted archive" +msgstr "Archif llygredig" + +#: apt-inst/contrib/extracttar.cc:207 +#, fuzzy +msgid "Tar checksum failed, archive corrupted" +msgstr "Methodd swm gwirio Tar, archif llygredig" + +#: apt-inst/contrib/extracttar.cc:312 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Math pennawd TAR anhysbys %u, aelod %s" + +#, fuzzy +#~ msgid "Total dependency version space: " +#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " + +#~ msgid "You don't have enough free space in %s" +#~ msgstr "Does dim digon o le rhydd yn %s gennych" + +#~ msgid "Done" +#~ msgstr "Wedi Gorffen" + +#, fuzzy +#~ msgid "No keyring installed in %s." +#~ msgstr "Yn Erthylu'r Sefydliad." + +#, fuzzy +#~ msgid "Internal error, Upgrade broke stuff" +#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + #~ msgid "%s not a valid DEB package." #~ msgstr "Nid yw %s yn becyn DEB dilys." @@ -3629,40 +3739,9 @@ msgstr "" #~ msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" #, fuzzy -#~ 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" - -#, fuzzy -#~ 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" - -#, fuzzy #~ msgid "Note, selecting '%s' instead of '%s'\n" #~ msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#~ 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" - -#, fuzzy -#~ 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" - -#~ 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" - -#~ msgid "%s is already the newest version.\n" -#~ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s'\n" -#~ msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" - -#, fuzzy -#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -#~ msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" - #, fuzzy #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" #~ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" |