X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe..bf6ac7ca615922c23d1f3cf1963efc5be9c23e32:/po/cy.po diff --git a/po/cy.po b/po/cy.po index f03fbf0f6..a25e4be08 100644 --- a/po/cy.po +++ b/po/cy.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team \n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-11-06 09:45+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries \n" "Language-Team: Welsh \n" @@ -15,173 +15,169 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:140 +#: cmdline/apt-cache.cc:149 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n" -#: cmdline/apt-cache.cc:268 +#: cmdline/apt-cache.cc:317 #, fuzzy msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:270 +#: cmdline/apt-cache.cc:319 #, fuzzy msgid "Total package structures: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:310 +#: cmdline/apt-cache.cc:359 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:360 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:312 +#: cmdline/apt-cache.cc:361 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:313 +#: cmdline/apt-cache.cc:362 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:314 +#: cmdline/apt-cache.cc:363 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:365 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:318 +#: cmdline/apt-cache.cc:367 #, fuzzy msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:320 +#: cmdline/apt-cache.cc:369 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:323 +#: cmdline/apt-cache.cc:372 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:325 +#: cmdline/apt-cache.cc:374 #, fuzzy msgid "Total Desc/File relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:327 +#: cmdline/apt-cache.cc:376 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:339 +#: cmdline/apt-cache.cc:428 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:353 -#, fuzzy -msgid "Total dependency version space: " -msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " - -#: cmdline/apt-cache.cc:358 +#: cmdline/apt-cache.cc:434 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:366 +#: cmdline/apt-cache.cc:449 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 -#: apt-private/private-show.cc:55 +#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234 +#: apt-private/private-show.cc:58 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432 -#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48 -#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221 -#: apt-private/private-show.cc:167 apt-private/private-show.cc:169 +#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521 +#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59 +#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232 +#: apt-private/private-show.cc:171 apt-private/private-show.cc:173 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1245 +#: cmdline/apt-cache.cc:1333 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:1411 +#: cmdline/apt-cache.cc:1500 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1536 +#: cmdline/apt-cache.cc:1625 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1557 +#: cmdline/apt-cache.cc:1646 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 +#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1577 +#: cmdline/apt-cache.cc:1666 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1578 +#: cmdline/apt-cache.cc:1667 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 +#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1611 +#: cmdline/apt-cache.cc:1700 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1620 +#: cmdline/apt-cache.cc:1709 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388 +#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220 +#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45 +#: cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n" -#: cmdline/apt-cache.cc:1740 +#: cmdline/apt-cache.cc:1829 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -254,19 +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:45 -msgid "" -"No CD-ROM could be auto-detected or found using the default mount point.\n" -"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-" -"cdrom' for more information about the CD-ROM auto-detection and mount point." -msgstr "" - -#: cmdline/apt-cdrom.cc:89 +#: cmdline/apt-cdrom.cc:76 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:104 +#: cmdline/apt-cdrom.cc:91 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -279,7 +267,15 @@ msgstr "" msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:174 +#: cmdline/apt-cdrom.cc:178 +msgid "" +"No CD-ROM could be auto-detected or found using the default mount point.\n" +"You may try the --cdrom option to set the CD-ROM mount point.\n" +"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and " +"mount point." +msgstr "" + +#: cmdline/apt-cdrom.cc:182 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -316,78 +312,84 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:244 +#: cmdline/apt-get.cc:246 #, fuzzy, c-format msgid "Can not find a package for architecture '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:326 +#: cmdline/apt-get.cc:322 #, fuzzy, c-format msgid "Can not find a package '%s' with version '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:329 +#: cmdline/apt-get.cc:325 #, fuzzy, c-format msgid "Can not find a package '%s' with release '%s'" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:362 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: cmdline/apt-get.cc:422 +#: cmdline/apt-get.cc:418 #, c-format msgid "Can not find version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:453 +#: cmdline/apt-get.cc:449 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81 +#: 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:460 cmdline/apt-mark.cc:72 +#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 +#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 +#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 +#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157 +#, fuzzy, c-format +msgid "Unable to lock directory %s" +msgstr "Ni ellir cloi'r cyfeiriadur rhestr" + +#: cmdline/apt-get.cc:620 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:738 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:796 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:801 #, c-format msgid "" "Please use:\n" @@ -395,37 +397,26 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:849 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 -#: apt-private/private-install.cc:198 apt-private/private-install.cc:201 -#, 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:879 #, 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:884 #, 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:890 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" @@ -434,11 +425,11 @@ msgstr "Cyrchu Ffynhonell %s\n" msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:920 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:946 +#: cmdline/apt-get.cc:945 #, 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" @@ -453,38 +444,48 @@ msgstr "Methodd y gorchymyn dadbacio '%s'.\n" msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:987 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1006 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1025 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1043 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1060 +#, c-format +msgid "Note, using directory '%s' to get the build dependencies\n" +msgstr "" + +#: cmdline/apt-get.cc:1070 +#, fuzzy, c-format +msgid "Note, using file '%s' to get the build dependencies\n" +msgstr "Methwyd prosesu dibyniaethau adeiladu" + +#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1118 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1288 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -493,7 +494,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1306 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -502,14 +503,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1329 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1368 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -518,7 +519,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:1348 +#: cmdline/apt-get.cc:1374 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -527,32 +528,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1397 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1412 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1417 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1615 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1656 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -639,53 +640,79 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-mark.cc:57 +#: 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:69 +msgid "Download Failed" +msgstr "" + +#: cmdline/apt-helper.cc:82 +msgid "" +"Usage: apt-helper [options] command\n" +" apt-helper [options] download-file uri target-path\n" +"\n" +"apt-helper is a internal helper for apt\n" +"\n" +"Commands:\n" +" download-file - download the given uri to the target-path\n" +" auto-detect-proxy - detect proxy using apt.conf\n" +"\n" +" This APT helper has Super Meep Powers.\n" +msgstr "" + +#: cmdline/apt-mark.cc:68 #, fuzzy, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-mark.cc:63 +#: cmdline/apt-mark.cc:74 #, fuzzy, c-format msgid "%s was already set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:65 +#: cmdline/apt-mark.cc:76 #, fuzzy, c-format msgid "%s was already set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:241 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:232 +#: cmdline/apt-mark.cc:243 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285 +#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 +#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 +#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Methwyd agor %s" -#: cmdline/apt-mark.cc:334 +#: cmdline/apt-mark.cc:345 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:381 +#: cmdline/apt-mark.cc:392 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -712,7 +739,7 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" -#: cmdline/apt.cc:71 +#: cmdline/apt.cc:47 msgid "" "Usage: apt [options] command\n" "\n" @@ -728,7 +755,8 @@ msgid "" " remove - remove packages\n" "\n" " upgrade - upgrade the system by installing/upgrading packages\n" -"full-upgrade - upgrade the system by removing/installing/upgrading packages\n" +" full-upgrade - upgrade the system by removing/installing/upgrading " +"packages\n" "\n" " edit-sources - edit the source information file\n" msgstr "" @@ -763,52 +791,52 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: 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:111 methods/rred.cc:624 +#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" -#: methods/file.cc:47 +#: methods/file.cc:48 msgid "Invalid URI, local URIS must not start with //" msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:178 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:179 +#: methods/ftp.cc:184 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:184 +#: methods/ftp.cc:189 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc: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:221 +#: methods/ftp.cc:226 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:233 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:253 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -817,124 +845,126 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:276 +#: 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:302 +#: methods/ftp.cc:307 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:346 +#: methods/ftp.cc:351 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 -#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 +#: methods/ftp.cc: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:356 methods/rsh.cc:206 +#: methods/ftp.cc:361 methods/rsh.cc:209 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:378 methods/ftp.cc:390 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 -#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 -#: apt-pkg/contrib/fileutl.cc:1425 +#: methods/ftp.cc: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:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: 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:708 +#: methods/ftp.cc:713 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:717 methods/connect.cc:116 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:714 +#: methods/ftp.cc:719 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:731 +#: methods/ftp.cc:736 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:745 +#: methods/ftp.cc:750 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:749 +#: methods/ftp.cc:754 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:756 +#: methods/ftp.cc:761 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:788 +#: methods/ftp.cc:793 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:803 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:812 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:832 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:834 +#: methods/ftp.cc:839 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:886 +#: 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:901 methods/rsh.cc:332 +#: methods/ftp.cc:907 methods/rsh.cc:338 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:931 +#: 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:1008 +#: methods/ftp.cc:1027 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1141 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -970,7 +1000,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:435 +#: methods/connect.cc:154 methods/rsh.cc:442 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@ -1000,190 +1030,192 @@ 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:167 +#: methods/gpgv.cc:179 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:183 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 -msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" +#: methods/gpgv.cc:185 +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:179 +#: methods/gpgv.cc:191 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 -msgid "Unknown error executing gpgv" +#: methods/gpgv.cc:195 +msgid "Unknown error executing apt-key" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:228 methods/gpgv.cc:235 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:242 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:79 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:515 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:533 +#: methods/http.cc:529 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:535 +#: methods/http.cc:531 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:571 +#: methods/http.cc:567 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:631 +#: methods/http.cc:627 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:636 +#: methods/http.cc:632 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:659 +#: methods/http.cc:655 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/server.cc:56 +#: methods/server.cc:52 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/server.cc:114 +#: methods/server.cc:110 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/server.cc:139 methods/server.cc:146 +#: methods/server.cc:135 methods/server.cc:142 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/server.cc:176 +#: methods/server.cc:172 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/server.cc:199 +#: methods/server.cc:195 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/server.cc:201 +#: methods/server.cc:197 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/server.cc:225 +#: methods/server.cc:221 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/server.cc:490 +#: methods/server.cc:497 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:514 methods/server.cc:608 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:656 +#: methods/server.cc:580 +#, c-format +msgid "" +"Automatically disabled %s due to incorrect response from server/proxy. (man " +"5 apt.conf)" +msgstr "" + +#: methods/server.cc:703 msgid "Internal error" msgstr "Gwall mewnol" -#: apt-private/private-list.cc:147 -msgid "Listing" +#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65 +msgid "Sorting" msgstr "" -#: apt-private/private-install.cc:93 +#: apt-private/private-install.cc:81 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: apt-private/private-install.cc:102 +#: apt-private/private-install.cc:90 #, fuzzy msgid "Packages need to be removed but remove is disabled." msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: apt-private/private-install.cc:121 +#: apt-private/private-install.cc:109 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: apt-private/private-install.cc:159 -msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +#: apt-private/private-install.cc:147 +msgid "How odd... The sizes didn't match, email apt@packages.debian.org" msgstr "" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:166 +#: apt-private/private-install.cc:154 #, c-format msgid "Need to get %sB/%sB of archives.\n" msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:171 +#: apt-private/private-install.cc:159 #, c-format msgid "Need to get %sB of archives.\n" msgstr "Mae angen cyrchu %sB o archifau.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:178 +#: apt-private/private-install.cc:166 #, fuzzy, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: apt-private/private-install.cc:183 +#: apt-private/private-install.cc:171 #, fuzzy, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: apt-private/private-install.cc:211 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Does dim digon o le rhydd gennych yn %s." - -#: apt-private/private-install.cc:221 apt-private/private-download.cc:55 +#: apt-private/private-install.cc: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:227 apt-private/private-install.cc:249 +#: 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:231 +#: 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:233 +#: apt-private/private-install.cc:197 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -1194,19 +1226,19 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +#: apt-private/private-install.cc:203 apt-private/private-install.cc:221 msgid "Abort." msgstr "Erthylu." -#: apt-private/private-install.cc:254 +#: apt-private/private-install.cc:218 msgid "Do you want to continue?" msgstr "Ydych chi eisiau mynd ymlaen?" -#: apt-private/private-install.cc:324 +#: apt-private/private-install.cc:288 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: apt-private/private-install.cc:331 +#: apt-private/private-install.cc:295 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -1214,20 +1246,20 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: apt-private/private-install.cc:335 +#: 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:340 +#: apt-private/private-install.cc:304 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: apt-private/private-install.cc:341 +#: apt-private/private-install.cc:305 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: apt-private/private-install.cc:377 +#: apt-private/private-install.cc:341 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -1237,15 +1269,15 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: apt-private/private-install.cc:381 +#: apt-private/private-install.cc:345 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: apt-private/private-install.cc:402 +#: apt-private/private-install.cc:366 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: apt-private/private-install.cc:510 +#: 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." @@ -1261,16 +1293,16 @@ msgstr "" #. "that package should be filed.") << std::endl; #. } #. -#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +#: 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:517 +#: apt-private/private-install.cc:481 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: apt-private/private-install.cc:524 +#: apt-private/private-install.cc:488 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -1280,7 +1312,7 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-install.cc:528 +#: apt-private/private-install.cc:492 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -1288,18 +1320,18 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-install.cc:530 +#: 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:624 +#: 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:626 +#: apt-private/private-install.cc:589 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1308,7 +1340,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: apt-private/private-install.cc:639 +#: 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" @@ -1320,143 +1352,208 @@ 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:660 +#: apt-private/private-install.cc:633 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: apt-private/private-install.cc:713 +#: 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:803 +#: apt-private/private-install.cc:800 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: apt-private/private-install.cc:804 +#: apt-private/private-install.cc:801 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: apt-private/private-download.cc:32 -#, fuzzy -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" +#: apt-private/private-install.cc:823 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: apt-private/private-download.cc:36 -msgid "Authentication warning overridden.\n" -msgstr "" +#: apt-private/private-install.cc:827 +#, fuzzy, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: apt-private/private-download.cc:41 apt-private/private-download.cc:48 -#, fuzzy -msgid "Some packages could not be authenticated" -msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" +#: apt-private/private-install.cc:839 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n" -#: apt-private/private-download.cc:46 -msgid "Install these packages without verification?" +#: apt-private/private-install.cc:844 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" + +#: apt-private/private-install.cc:892 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s'\n" +msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" + +#: apt-private/private-install.cc:897 +#, fuzzy, c-format +msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" +msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" + +#. TRANSLATORS: Note, this is not an interactive question +#: apt-private/private-install.cc:939 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" + +#: apt-private/private-install.cc:945 +#, fuzzy, c-format +msgid "Package '%s' is not installed, so not removed\n" +msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n" + +#: apt-private/private-list.cc:121 +msgid "Listing" msgstr "" -#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#: apt-private/private-list.cc:151 #, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Methwyd cyrchu %s %s\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:95 +msgid "Correcting dependencies..." +msgstr "Yn cywiro dibyniaethau..." + +#: apt-private/private-cachefile.cc:98 +msgid " failed." +msgstr " wedi methu." + +#: apt-private/private-cachefile.cc:101 +msgid "Unable to correct dependencies" +msgstr "Ni ellir cywiro dibyniaethau" + +#: apt-private/private-cachefile.cc:104 +msgid "Unable to minimize the upgrade set" +msgstr "Ni ellir bychanu y set uwchraddio" + +#: apt-private/private-cachefile.cc:106 +msgid " Done" +msgstr " Wedi Gorffen" + +#: apt-private/private-cachefile.cc:110 +msgid "You might want to run 'apt-get -f install' to correct these." +msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." + +#: apt-private/private-cachefile.cc:113 +msgid "Unmet dependencies. Try using -f." +msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:103 apt-private/private-show.cc:84 +#: apt-private/private-show.cc:89 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:265 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:268 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:270 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:272 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:274 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:277 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:281 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 -msgid "The following packages have unmet dependencies:" -msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" - -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:455 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc: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:415 +#: apt-private/private-output.cc:464 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:466 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:469 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:420 +#: 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:425 +#: apt-private/private-output.cc:474 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:454 +#: 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:480 +#: 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:502 +#: 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:523 +#: 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:544 +#: 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:564 +#: 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:619 +#: apt-private/private-output.cc:688 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:696 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1466,27 +1563,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:727 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:731 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:733 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:666 +#: 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:670 +#: 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" @@ -1495,7 +1592,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:761 msgid "[Y/n]" msgstr "" @@ -1503,96 +1600,54 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:767 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:778 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:784 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: 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-cachefile.cc:87 -msgid "Correcting dependencies..." -msgstr "Yn cywiro dibyniaethau..." - -#: apt-private/private-cachefile.cc:90 -msgid " failed." -msgstr " wedi methu." - -#: apt-private/private-cachefile.cc:93 -msgid "Unable to correct dependencies" -msgstr "Ni ellir cywiro dibyniaethau" - -#: apt-private/private-cachefile.cc:96 -msgid "Unable to minimize the upgrade set" -msgstr "Ni ellir bychanu y set uwchraddio" - -#: apt-private/private-cachefile.cc:98 -msgid " Done" -msgstr " Wedi Gorffen" - -#: apt-private/private-cachefile.cc:102 -msgid "You might want to run 'apt-get -f install' to correct these." -msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain." - -#: apt-private/private-cachefile.cc:105 -msgid "Unmet dependencies. Try using -f." -msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." - -#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57 -msgid "Sorting" -msgstr "" - -#: apt-private/private-update.cc:45 +#: apt-private/private-update.cc:31 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: apt-private/private-upgrade.cc:19 -#, fuzzy -msgid "Calculating upgrade... " -msgstr "Yn Cyfrifo'r Uwchraddiad... " - -#: apt-private/private-upgrade.cc:24 -#, fuzzy -msgid "Internal error, Upgrade broke stuff" -msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" - -#: apt-private/private-upgrade.cc:26 -msgid "Done" -msgstr "Wedi Gorffen" - -#: apt-private/private-search.cc:61 -msgid "Full Text Search" -msgstr "" +#: 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-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" +#: apt-private/private-update.cc:99 +msgid "All packages are up to date." msgstr "" -#: apt-private/private-show.cc:152 +#: apt-private/private-show.cc:156 #, c-format -msgid "There is %lu additional record. Please use the '-a' switch to see it" +msgid "There is %i additional record. Please use the '-a' switch to see it" msgid_plural "" -"There are %lu additional records. Please use the '-a' switch to see them." +"There are %i additional records. Please use the '-a' switch to see them." msgstr[0] "" msgstr[1] "" -#: apt-private/private-show.cc:159 +#: apt-private/private-show.cc:163 msgid "not a real package (virtual)" msgstr "" -#: apt-private/private-main.cc:19 +#: apt-private/private-main.cc:32 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1600,43 +1655,87 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: apt-private/private-sources.cc:45 +#: apt-private/private-download.cc:62 +#, c-format +msgid "" +"Can't drop privileges for downloading as file '%s' couldn't be accessed by " +"user '%s'." +msgstr "" + +#: apt-private/private-download.cc:94 +#, fuzzy +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" + +#: apt-private/private-download.cc:98 +msgid "Authentication warning overridden.\n" +msgstr "" + +#: apt-private/private-download.cc:103 apt-private/private-download.cc:110 +#, fuzzy +msgid "Some packages could not be authenticated" +msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" + +#: apt-private/private-download.cc:108 +msgid "Install these packages without verification?" +msgstr "" + +#: apt-private/private-download.cc:149 apt-pkg/update.cc:77 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Methwyd cyrchu %s %s\n" + +#: apt-private/private-download.cc:171 apt-private/private-download.cc:174 +#, fuzzy, c-format +msgid "Couldn't determine free space in %s" +msgstr "Does dim digon o le rhydd yn %s gennych" + +#: apt-private/private-download.cc:188 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Does dim digon o le rhydd gennych yn %s." + +#: apt-private/private-sources.cc:58 #, fuzzy, c-format msgid "Failed to parse %s. Edit again? " msgstr "Methwyd ailenwi %s at %s" -#: apt-private/private-sources.cc:57 +#: apt-private/private-sources.cc:70 #, c-format msgid "Your '%s' file changed, please run 'apt-get update'." msgstr "" -#: apt-private/acqprogress.cc:60 +#: apt-private/private-search.cc:69 +msgid "Full Text Search" +msgstr "" + +#: apt-private/acqprogress.cc:66 msgid "Hit " msgstr "Presennol " -#: apt-private/acqprogress.cc:84 +#: apt-private/acqprogress.cc:88 msgid "Get:" msgstr "Cyrchu:" -#: apt-private/acqprogress.cc:115 +#: apt-private/acqprogress.cc:119 msgid "Ign " msgstr "Anwybyddu " -#: apt-private/acqprogress.cc:119 +#: apt-private/acqprogress.cc:126 msgid "Err " msgstr "Gwall " -#: apt-private/acqprogress.cc:140 +#: 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:230 +#: apt-private/acqprogress.cc:240 #, c-format msgid " [Working]" msgstr " [Gweithio]" -#: apt-private/acqprogress.cc:291 +#: apt-private/acqprogress.cc:301 #, fuzzy, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1649,19 +1748,19 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406 -#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271 -#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100 -#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373 +#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121 +#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381 +#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 +#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487 +#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 -#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 -#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 -#: apt-pkg/clean.cc:123 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558 +#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67 +#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201 +#: apt-pkg/contrib/cdromutl.cc:235 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" @@ -1690,11 +1789,11 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:102 ftparchive/multicompress.cc:171 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:340 +#: methods/rsh.cc:346 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -1737,13 +1836,8 @@ msgstr "" msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: cmdline/apt-extracttemplates.cc:100 -#, c-format -msgid "%s not a valid DEB package." -msgstr "Nid yw %s yn becyn DEB dilys." - # FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:227 #, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" @@ -1768,41 +1862,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:266 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092 +#, fuzzy, c-format +msgid "Unable to mkstemp %s" +msgstr "Ni ellir gwneud stat() o %s" + +#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392 +#: apt-pkg/contrib/fileutl.cc:2097 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: cmdline/apt-extracttemplates.cc:308 +#: cmdline/apt-extracttemplates.cc:303 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" -#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349 +#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371 msgid "Package extension list is too long" msgstr "Mae'r rhestr estyniad pecyn yn rhy hir." -#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190 -#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264 -#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300 +#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206 +#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283 +#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319 #, fuzzy, c-format msgid "Error processing directory %s" msgstr "Gwall wrth brosesu'r cyfeiriadur %s" -#: ftparchive/apt-ftparchive.cc:262 +#: ftparchive/apt-ftparchive.cc:281 msgid "Source extension list is too long" msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir" -#: ftparchive/apt-ftparchive.cc:379 +#: ftparchive/apt-ftparchive.cc:401 msgid "Error writing header to contents file" msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys" -#: ftparchive/apt-ftparchive.cc:409 +#: ftparchive/apt-ftparchive.cc:431 #, fuzzy, c-format msgid "Error processing contents %s" msgstr "Gwall wrth Brosesu Cynnwys %s" # FIXME: full stops -#: ftparchive/apt-ftparchive.cc:597 +#: ftparchive/apt-ftparchive.cc:626 #, fuzzy msgid "" "Usage: apt-ftparchive [options] command\n" @@ -1884,213 +1984,225 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol" -#: ftparchive/apt-ftparchive.cc:803 +#: ftparchive/apt-ftparchive.cc:822 msgid "No selections matched" msgstr "Dim dewisiadau'n cyfateb" -#: ftparchive/apt-ftparchive.cc:881 +#: ftparchive/apt-ftparchive.cc:907 #, c-format msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: ftparchive/cachedb.cc:47 +#: 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:65 +#: 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:76 +#: 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:81 +#: 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:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 -#: apt-inst/extract.cc:209 +#: 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:249 +#: 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:490 +#: ftparchive/cachedb.cc:526 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:82 +#: 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:87 +#: 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:143 +#: ftparchive/writer.cc:165 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:145 +#: ftparchive/writer.cc:167 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:152 +#: ftparchive/writer.cc:174 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 +#: ftparchive/writer.cc:192 ftparchive/writer.cc:224 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:183 +#: ftparchive/writer.cc:205 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:210 +#: ftparchive/writer.cc:232 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:269 +#: ftparchive/writer.cc:291 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:277 +#: ftparchive/writer.cc:299 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:281 +#: ftparchive/writer.cc:303 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:289 +#: ftparchive/writer.cc:311 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:299 +#: ftparchive/writer.cc:321 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:404 +#: ftparchive/writer.cc:427 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 +#: ftparchive/writer.cc:435 ftparchive/writer.cc:706 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 +#: ftparchive/writer.cc:502 ftparchive/writer.cc:870 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:712 +#: ftparchive/writer.cc:720 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:716 +#: ftparchive/writer.cc:724 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 +#: ftparchive/contents.cc:351 ftparchive/contents.cc:382 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:38 ftparchive/override.cc:142 #, c-format msgid "Unable to open %s" msgstr "Ni ellir agor %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:68 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" + +#: ftparchive/override.cc:166 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:178 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:191 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Methwydd darllen y ffeil dargyfeirio %s" - -#: ftparchive/multicompress.cc:70 +#: ftparchive/multicompress.cc:73 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:103 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: ftparchive/multicompress.cc:189 +#: ftparchive/multicompress.cc:192 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:195 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:209 #, fuzzy msgid "Compress child" msgstr "Plentyn Cywasgu" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:232 #, fuzzy, c-format msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:305 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:343 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:359 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" # FIXME: "debian" -#: cmdline/apt-internal-solver.cc:38 +#: cmdline/apt-internal-solver.cc:49 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2144,1405 +2256,1459 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: apt-inst/contrib/extracttar.cc:116 -msgid "Failed to create pipes" -msgstr "Methwyd creu pibau" +#: apt-pkg/install-progress.cc:59 +#, c-format +msgid "Progress: [%3i%%]" +msgstr "" -#: apt-inst/contrib/extracttar.cc:143 -msgid "Failed to exec gzip " -msgstr "Methwyd gweithredu gzip" +#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176 +msgid "Running dpkg" +msgstr "" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 -msgid "Corrupted archive" -msgstr "Archif llygredig" +#: apt-pkg/init.cc:156 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-pkg/init.cc:172 #, fuzzy -msgid "Tar checksum failed, archive corrupted" -msgstr "Methodd swm gwirio Tar, archif llygredig" +msgid "Unable to determine a suitable packaging system type" +msgstr "Ni ellir canfod math system addas" -#: apt-inst/contrib/extracttar.cc:300 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format -msgid "Unknown TAR header type %u, member %s" -msgstr "Math pennawd TAR anhysbys %u, aelod %s" +msgid "Wrote %i records.\n" +msgstr "" -#: apt-inst/contrib/arfile.cc:74 -msgid "Invalid archive signature" -msgstr "Llofnod archif annilys" +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "" -#: apt-inst/contrib/arfile.cc:82 -msgid "Error reading archive member header" -msgstr "Gwall wrth ddarllen pennawd aelod archif" +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "" + +#: apt-pkg/indexcopy.cc:515 +#, c-format +msgid "Can't find authentication record for: %s" +msgstr "" -#: apt-inst/contrib/arfile.cc:94 +#: apt-pkg/indexcopy.cc:521 #, fuzzy, c-format -msgid "Invalid archive member header %s" -msgstr "Pennawd aelod archif annilys" +msgid "Hash mismatch for: %s" +msgstr "Camgyfatebiaeth swm MD5" -#: apt-inst/contrib/arfile.cc:106 -msgid "Invalid archive member header" -msgstr "Pennawd aelod archif annilys" +#: 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/contrib/arfile.cc:135 -msgid "Archive is too short" -msgstr "Mae'r archif yn rhy fyr" +#: 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/contrib/arfile.cc:139 -msgid "Failed to read the archive headers" -msgstr "Methwyd darllen pennawdau'r archif" +#: apt-pkg/cachefile.cc:116 +msgid "The list of sources could not be read." +msgstr "Methwyd darllen y rhestr ffynhonellau." -#: apt-inst/filelist.cc:382 -msgid "DropNode called on still linked node" -msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu" +#: apt-pkg/pkgcache.cc:149 +msgid "Empty package cache" +msgstr "Storfa pecyn gwag" -#: apt-inst/filelist.cc:414 -msgid "Failed to locate the hash element!" -msgstr "Methyd lleoli yr elfen !" +#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166 +msgid "The package cache file is corrupted" +msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-inst/filelist.cc:461 -msgid "Failed to allocate diversion" -msgstr "Methwyd neilltuo dargyfeiriad" +#: apt-pkg/pkgcache.cc:160 +msgid "The package cache file is an incompatible version" +msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" -#: apt-inst/filelist.cc:466 +#: apt-pkg/pkgcache.cc:163 #, fuzzy -msgid "Internal error in AddDiversion" -msgstr "Gwall Mewnol yn AddDiversion" +msgid "The package cache file is corrupted, it is too small" +msgstr "Mae'r ffeil storfa pecyn yn llygredig" -#: apt-inst/filelist.cc:479 -#, c-format -msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s" +# FIXME: capitalisation? +#: apt-pkg/pkgcache.cc:170 +#, 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'" -# FIXME: "the" -#: apt-inst/filelist.cc:508 -#, c-format -msgid "Double add of diversion %s -> %s" -msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" +#: apt-pkg/pkgcache.cc:180 +#, fuzzy, c-format +msgid "The package cache was built for different architectures: %s vs %s" +msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-inst/filelist.cc:551 -#, c-format -msgid "Duplicate conf file %s/%s" -msgstr "Ffeil cyfluniad dyblyg %s/%s" +#: apt-pkg/pkgcache.cc:317 +msgid "Depends" +msgstr "Dibynnu" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 -#, fuzzy, c-format -msgid "Failed to write file %s" -msgstr "Methwyd ysgrifennu ffeil %s" +#: apt-pkg/pkgcache.cc:317 +msgid "PreDepends" +msgstr "CynDdibynnu" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 -#, c-format -msgid "Failed to close file %s" -msgstr "Methwyd cau ffeil %s" +#: apt-pkg/pkgcache.cc:317 +msgid "Suggests" +msgstr "Awgrymu" -#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 -#, c-format -msgid "The path %s is too long" -msgstr "Mae'r llwybr %s yn rhy hir" +#: apt-pkg/pkgcache.cc:318 +msgid "Recommends" +msgstr "Argymell" -#: apt-inst/extract.cc:125 -#, c-format -msgid "Unpacking %s more than once" -msgstr "Yn dadbacio %s mwy nag unwaith" +#: apt-pkg/pkgcache.cc:318 +msgid "Conflicts" +msgstr "Gwrthdaro" -#: apt-inst/extract.cc:135 -#, c-format -msgid "The directory %s is diverted" -msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" +#: apt-pkg/pkgcache.cc:318 +msgid "Replaces" +msgstr "Amnewid" -#: apt-inst/extract.cc:145 -#, 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-pkg/pkgcache.cc:319 +msgid "Obsoletes" +msgstr "Darfodi" -#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 -msgid "The diversion path is too long" -msgstr "Mae llwybr y dargyfeiriad yn rhy hir" +#: apt-pkg/pkgcache.cc:319 +msgid "Breaks" +msgstr "" -#: apt-inst/extract.cc:242 -#, c-format -msgid "The directory %s is being replaced by a non-directory" +#: apt-pkg/pkgcache.cc:319 +msgid "Enhances" msgstr "" -"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-inst/extract.cc:282 -msgid "Failed to locate node in its hash bucket" -msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" +#: apt-pkg/pkgcache.cc:330 +msgid "important" +msgstr "pwysig" -#: apt-inst/extract.cc:286 -msgid "The path is too long" -msgstr "Mae'r llwybr yn rhy hir" +#: apt-pkg/pkgcache.cc:330 +msgid "required" +msgstr "angenrheidiol" -# FIXME: wtf? -#: apt-inst/extract.cc:414 -#, c-format -msgid "Overwrite package match with no version for %s" -msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" +#: apt-pkg/pkgcache.cc:330 +msgid "standard" +msgstr "safonnol" + +#: apt-pkg/pkgcache.cc:331 +msgid "optional" +msgstr "opsiynnol" -#: apt-inst/extract.cc:431 +#: apt-pkg/pkgcache.cc:331 +msgid "extra" +msgstr "ychwanegol" + +#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178 +#, fuzzy +msgid "Calculating upgrade" +msgstr "Yn Cyfrifo'r Uwchraddiad" + +#: apt-pkg/acquire-worker.cc:133 #, 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 "The method driver %s could not be found." +msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-inst/extract.cc:491 +#: apt-pkg/acquire-worker.cc:135 #, c-format -msgid "Unable to stat %s" -msgstr "Ni ellir gwneud stat() o %s" +msgid "Is the package %s installed?" +msgstr "" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 -#: apt-inst/deb/debfile.cc:54 +#: apt-pkg/acquire-worker.cc:186 #, c-format -msgid "This is not a valid DEB archive, missing '%s' member" -msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll" +msgid "Method %s did not start correctly" +msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-inst/deb/debfile.cc:119 +#: apt-pkg/acquire-worker.cc:485 #, fuzzy, c-format -msgid "Internal error, could not locate member %s" -msgstr "Gwall Mewnol, methwyd lleoli aelod %s" +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "" +"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" +" '%s'\n" +"yn y gyrriant '%s' a gwasgwch Enter\n" + +#: apt-pkg/pkgrecords.cc:38 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-inst/deb/debfile.cc:213 +#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167 #, fuzzy -msgid "Unparsable control file" -msgstr "Ffeil rheoli ni ellir ei ramadegu" +msgid "Building dependency tree" +msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/contrib/mmap.cc:79 -msgid "Can't mmap an empty file" -msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" +#: apt-pkg/depcache.cc:139 +#, fuzzy +msgid "Candidate versions" +msgstr "Fersiynau Posib" -#: apt-pkg/contrib/mmap.cc:111 +#: apt-pkg/depcache.cc:168 +#, fuzzy +msgid "Dependency generation" +msgstr "Cynhyrchaid Dibyniaeth" + +#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225 +#, fuzzy +msgid "Reading state information" +msgstr "Yn cyfuno manylion Ar Gael" + +#: apt-pkg/depcache.cc:250 #, fuzzy, c-format -msgid "Couldn't duplicate file descriptor %i" -msgstr "Methwyd agor pibell ar gyfer %s" +msgid "Failed to open StateFile %s" +msgstr "Methwyd agor %s" -#: apt-pkg/contrib/mmap.cc:119 +#: apt-pkg/depcache.cc:256 #, fuzzy, c-format -msgid "Couldn't make mmap of %llu bytes" -msgstr "Methwyd gwneud mmap() efo %lu beit" +msgid "Failed to write temporary StateFile %s" +msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/contrib/mmap.cc:146 -#, fuzzy -msgid "Unable to close mmap" -msgstr "Ni ellir agor %s" +#: apt-pkg/acquire-item.cc:98 +msgid "Use --allow-insecure-repositories to force the update" +msgstr "" -# FIXME -#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#: apt-pkg/acquire-item.cc:220 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:245 #, fuzzy -msgid "Unable to synchronize mmap" -msgstr "Methwyd gweithredu " +msgid "Hash Sum mismatch" +msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/contrib/mmap.cc:290 -#, c-format -msgid "Couldn't make mmap of %lu bytes" -msgstr "Methwyd gwneud mmap() efo %lu beit" +#: apt-pkg/acquire-item.cc:250 +msgid "Size mismatch" +msgstr "Camgyfatebiaeth maint" -#: apt-pkg/contrib/mmap.cc:322 +#: apt-pkg/acquire-item.cc:255 #, fuzzy -msgid "Failed to truncate file" -msgstr "Methwyd ysgrifennu ffeil %s" +msgid "Invalid file format" +msgstr "Gweithred annilys %s" -#: apt-pkg/contrib/mmap.cc:341 +#: apt-pkg/acquire-item.cc:260 +#, fuzzy +msgid "Signature error" +msgstr "Gwall ysgrifennu" + +#: apt-pkg/acquire-item.cc:264 +msgid "Does not start with a cleartext signature" +msgstr "" + +#: apt-pkg/acquire-item.cc:1588 #, c-format msgid "" -"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " -"Current value: %lu. (man 5 apt.conf)" +"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 "" -#: apt-pkg/contrib/mmap.cc:440 +#. Invalid signature file, reject (LP: #346386) (Closes: #627642) +#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604 #, c-format -msgid "" -"Unable to increase the size of the MMap as the limit of %lu bytes is already " -"reached." +msgid "GPG error: %s: %s" msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: 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 "" -"Unable to increase size of the MMap as automatic growing is disabled by user." +"This is normally not allowed, but the option Acquire::" +"AllowDowngradeToInsecureRepositories was given to override it." msgstr "" -#. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:401 +#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194 #, c-format -msgid "%lid %lih %limin %lis" +msgid "" +"The data from '%s' is not signed. Packages from that repository can not be " +"authenticated." msgstr "" -#. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:408 +#: apt-pkg/acquire-item.cc:1952 #, c-format -msgid "%lih %limin %lis" +msgid "" +"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " +"or malformed file)" msgstr "" -#. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:415 -#, c-format -msgid "%limin %lis" +# FIXME: number? +#: apt-pkg/acquire-item.cc:1971 +#, fuzzy, c-format +msgid "Unable to find hash sum for '%s' in Release file" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" + +#: apt-pkg/acquire-item.cc:1995 +msgid "There is no public key available for the following key IDs:\n" msgstr "" -#. s means seconds -#: apt-pkg/contrib/strutl.cc:420 +#: apt-pkg/acquire-item.cc:2033 #, c-format -msgid "%lis" +msgid "" +"Release file for %s is expired (invalid since %s). Updates for this " +"repository will not be applied." msgstr "" -#: apt-pkg/contrib/strutl.cc:1229 +#: apt-pkg/acquire-item.cc:2055 #, c-format -msgid "Selection %s not found" -msgstr "Ni chanfuwyd y dewis %s" +msgid "Conflicting distribution: %s (expected %s but got %s)" +msgstr "" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/acquire-item.cc:2074 #, c-format -msgid "Unrecognized type abbreviation: '%c'" -msgstr "Talgryniad math anhysbys: '%c'" +msgid "" +"The repository '%s' does not have a Release file. This is deprecated, please " +"contact the owner of the repository." +msgstr "" -#: apt-pkg/contrib/configuration.cc:617 +# FIXME: case +#: apt-pkg/acquire-item.cc:2241 #, c-format -msgid "Opening configuration file %s" -msgstr "Yn agor y ffeil cyfluniad %s" - -#: apt-pkg/contrib/configuration.cc:785 -#, c-format -msgid "Syntax error %s:%u: Block starts with no name." -msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." - -# FIXME -#: apt-pkg/contrib/configuration.cc:804 -#, fuzzy, c-format -msgid "Syntax error %s:%u: Malformed tag" -msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" - -#: apt-pkg/contrib/configuration.cc:821 -#, c-format -msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" - -#: apt-pkg/contrib/configuration.cc:861 -#, c-format -msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgid "" +"I wasn't able to locate a file for the %s package. This might mean you need " +"to manually fix this package. (due to missing arch)" msgstr "" -"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" +"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/contrib/configuration.cc:868 +#: apt-pkg/acquire-item.cc:2307 #, c-format -msgid "Syntax error %s:%u: Too many nested includes" -msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" +msgid "Can't find a source to download version '%s' of '%s'" +msgstr "" -#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/acquire-item.cc:2343 #, c-format -msgid "Syntax error %s:%u: Included from here" -msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" +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/contrib/configuration.cc:881 -#, c-format -msgid "Syntax error %s:%u: Unsupported directive '%s'" -msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" +#: apt-pkg/pkgcachegen.cc:113 +msgid "Cache has an incompatible versioning system" +msgstr "Mae can y storfa system fersiwn anghyfaddas" -#: apt-pkg/contrib/configuration.cc:884 +#. 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 "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" +msgid "Error occurred while processing %s (%s%d)" +msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" -#: apt-pkg/contrib/configuration.cc:934 -#, c-format -msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" +#: apt-pkg/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/contrib/progress.cc:146 -#, c-format -msgid "%c%s... Error!" -msgstr "%c%s... Gwall!" +#: 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/contrib/progress.cc:148 -#, c-format -msgid "%c%s... Done" -msgstr "%c%s... Wedi Gorffen" +#: 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/contrib/progress.cc:179 -msgid "..." +#: 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." -#. Print the spinner -#: apt-pkg/contrib/progress.cc:195 -#, fuzzy, c-format -msgid "%c%s... %u%%" -msgstr "%c%s... Wedi Gorffen" - -# FIXME -#: apt-pkg/contrib/cmndline.cc:116 +#: apt-pkg/pkgcachegen.cc:591 #, c-format -msgid "Command line option '%c' [from %s] is not known." -msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 -#: apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/pkgcachegen.cc:1203 #, c-format -msgid "Command line option %s is not understood" -msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" +msgid "Couldn't stat source package list %s" +msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/contrib/cmndline.cc:163 -#, c-format -msgid "Command line option %s is not boolean" -msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" +#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395 +#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558 +#, fuzzy +msgid "Reading package lists" +msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225 -#, c-format -msgid "Option %s requires an argument." -msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." +#: apt-pkg/pkgcachegen.cc:1308 +msgid "Collecting File Provides" +msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 -#, c-format -msgid "Option %s: Configuration item specification must have an =." -msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =." +#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507 +msgid "IO Error saving source cache" +msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" -#: apt-pkg/contrib/cmndline.cc:273 +#: apt-pkg/vendorlist.cc:85 #, c-format -msgid "Option %s requires an integer argument, not '%s'" -msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" +msgid "Vendor block %s contains no fingerprint" +msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/contrib/cmndline.cc:304 -#, c-format -msgid "Option '%s' is too long" -msgstr "Opsiwn '%s' yn rhy hir" +#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829 +#, fuzzy, c-format +msgid "List directory %spartial is missing." +msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -# FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:336 -#, c-format -msgid "Sense %s is not understood, try true or false." -msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." +#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148 +#, fuzzy, c-format +msgid "Archives directory %spartial is missing." +msgstr "Mae'r cyfeiriadur archif %spartial ar goll." -#: apt-pkg/contrib/cmndline.cc:386 -#, c-format -msgid "Invalid operation %s" -msgstr "Gweithred annilys %s" +#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39 +#, fuzzy, c-format +msgid "Clean of %s is not supported" +msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/contrib/cdromutl.cc:56 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:976 #, c-format -msgid "Unable to stat the mount point %s" -msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" - -#: apt-pkg/contrib/cdromutl.cc:225 -msgid "Failed to stat the cdrom" -msgstr "Methwyd gwneud stat() o'r CD-ROM" +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:95 +#: apt-pkg/acquire.cc:978 #, fuzzy, c-format -msgid "Problem closing the gzip file %s" -msgstr "Gwall wrth gau'r ffeil" - -#: apt-pkg/contrib/fileutl.cc:228 -#, c-format -msgid "Not using locking for read only lock file %s" -msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" +msgid "Retrieving file %li of %li" +msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/contrib/fileutl.cc:233 -#, c-format -msgid "Could not open lock file %s" -msgstr "Methwyd agor y ffeil clo %s" +#: apt-pkg/update.cc:103 apt-pkg/update.cc:105 +#, fuzzy +msgid "" +"Some index files failed to download. They have been ignored, or old ones " +"used instead." +msgstr "" +"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " +"rai eu defnyddio yn lle." -#: apt-pkg/contrib/fileutl.cc:256 -#, c-format -msgid "Not using locking for nfs mounted lock file %s" -msgstr "Ddim yn cloi'r ffeil clo ar NFS %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" -#: apt-pkg/contrib/fileutl.cc:261 +#: apt-pkg/clean.cc:64 #, c-format -msgid "Could not get lock %s" -msgstr "Methwyd cael y clo %s" +msgid "Unable to stat %s." +msgstr "Ni ellir gwneud stat() o %s." -#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 +#: apt-pkg/policy.cc:83 #, c-format -msgid "List of files can't be created as '%s' is not a directory" +msgid "" +"The value '%s' is invalid for APT::Default-Release as such a release is not " +"available in the sources" msgstr "" -#: apt-pkg/contrib/fileutl.cc:432 -#, c-format -msgid "Ignoring '%s' in directory '%s' as it is not a regular file" -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'" -#: apt-pkg/contrib/fileutl.cc:450 +# FIXME: tense +#: apt-pkg/policy.cc:444 #, c-format -msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" -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/contrib/fileutl.cc:459 +#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958 #, c-format msgid "" -"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" +"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:862 -#, c-format -msgid "Sub-process %s received a segmentation fault." -msgstr "Derbyniodd is-broses %s wall segmentu." - -#: apt-pkg/contrib/fileutl.cc:864 +#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581 #, fuzzy, c-format -msgid "Sub-process %s received signal %u." -msgstr "Derbyniodd is-broses %s wall segmentu." - -#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237 -#, c-format -msgid "Sub-process %s returned an error code (%u)" -msgstr "Dychwelodd is-broses %s gôd gwall (%u)" +msgid "Could not configure '%s'. " +msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 +# FIXME: %s may have an arbirrary length +#: apt-pkg/packagemanager.cc:631 #, c-format -msgid "Sub-process %s exited unexpectedly" -msgstr "Gorffenodd is-broses %s yn annisgwyl" +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/contrib/fileutl.cc:1016 +#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347 #, c-format -msgid "Could not open file %s" -msgstr "Methwyd agor ffeil %s" - -#: apt-pkg/contrib/fileutl.cc:1093 -#, fuzzy, c-format -msgid "Could not open file descriptor %d" -msgstr "Methwyd agor pibell ar gyfer %s" +msgid "Line %u too long in source list %s." +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/contrib/fileutl.cc:1178 -msgid "Failed to create subprocess IPC" -msgstr "Methwyd creu isbroses IPC" +#: apt-pkg/cdrom.cc:571 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "CD Anghywir" -#: apt-pkg/contrib/fileutl.cc:1233 -msgid "Failed to exec compressor " -msgstr "Methwyd gweithredu cywasgydd " +#: apt-pkg/cdrom.cc:586 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "" -# FIXME -#: apt-pkg/contrib/fileutl.cc:1326 -#, fuzzy, c-format -msgid "read, still have %llu to read but none left" -msgstr "o hyd %lu i ddarllen ond dim ar ôl" +#: apt-pkg/cdrom.cc:599 +#, fuzzy +msgid "Waiting for disc...\n" +msgstr "Yn aros am benawdau" -# FIXME -#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435 -#, fuzzy, c-format -msgid "write, still have %llu to write but couldn't" -msgstr "o hyd %lu i ysgrifennu ond methwyd" +#: apt-pkg/cdrom.cc:609 +msgid "Mounting CD-ROM...\n" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1726 -#, fuzzy, c-format -msgid "Problem closing the file %s" -msgstr "Gwall wrth gau'r ffeil" +#: apt-pkg/cdrom.cc:620 +msgid "Identifying... " +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1738 -#, fuzzy, c-format -msgid "Problem renaming the file %s to %s" -msgstr "Gwall wrth gyfamseru'r ffeil" +#: apt-pkg/cdrom.cc:662 +#, c-format +msgid "Stored label: %s\n" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1749 -#, fuzzy, c-format -msgid "Problem unlinking the file %s" -msgstr "Gwall wrth dadgysylltu'r ffeil" +#: apt-pkg/cdrom.cc:680 +msgid "Scanning disc for index files...\n" +msgstr "" -#: apt-pkg/contrib/fileutl.cc:1762 -msgid "Problem syncing the file" -msgstr "Gwall wrth gyfamseru'r ffeil" +#: apt-pkg/cdrom.cc:734 +#, c-format +msgid "" +"Found %zu package indexes, %zu source indexes, %zu translation indexes and " +"%zu signatures\n" +msgstr "" -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:70 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Yn Erthylu'r Sefydliad." +#: 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/pkgcache.cc:148 -msgid "Empty package cache" -msgstr "Storfa pecyn gwag" +#: apt-pkg/cdrom.cc:771 +#, c-format +msgid "Found label '%s'\n" +msgstr "" -#: apt-pkg/pkgcache.cc:154 -msgid "The package cache file is corrupted" -msgstr "Mae'r ffeil storfa pecyn yn llygredig" +#: apt-pkg/cdrom.cc:800 +msgid "That is not a valid name, try again.\n" +msgstr "" -#: apt-pkg/pkgcache.cc:159 -msgid "The package cache file is an incompatible version" -msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn" +#: apt-pkg/cdrom.cc:817 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" -#: apt-pkg/pkgcache.cc:162 +#: apt-pkg/cdrom.cc:819 #, fuzzy -msgid "The package cache file is corrupted, it is too small" -msgstr "Mae'r ffeil storfa pecyn yn llygredig" - -# FIXME: capitalisation? -#: apt-pkg/pkgcache.cc:167 -#, fuzzy, c-format -msgid "This APT does not support the versioning system '%s'" -msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" - -#: apt-pkg/pkgcache.cc:172 -msgid "The package cache was built for a different architecture" -msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" - -#: apt-pkg/pkgcache.cc:314 -msgid "Depends" -msgstr "Dibynnu" - -#: apt-pkg/pkgcache.cc:314 -msgid "PreDepends" -msgstr "CynDdibynnu" - -#: apt-pkg/pkgcache.cc:314 -msgid "Suggests" -msgstr "Awgrymu" - -#: apt-pkg/pkgcache.cc:315 -msgid "Recommends" -msgstr "Argymell" - -#: apt-pkg/pkgcache.cc:315 -msgid "Conflicts" -msgstr "Gwrthdaro" +msgid "Copying package lists..." +msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/pkgcache.cc:315 -msgid "Replaces" -msgstr "Amnewid" +#: apt-pkg/cdrom.cc:863 +#, fuzzy +msgid "Writing new source list\n" +msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/pkgcache.cc:316 -msgid "Obsoletes" -msgstr "Darfodi" +#: apt-pkg/cdrom.cc:874 +msgid "Source list entries for this disc are:\n" +msgstr "" -#: apt-pkg/pkgcache.cc:316 -msgid "Breaks" +#: apt-pkg/algorithms.cc:265 +#, 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/pkgcache.cc:316 -msgid "Enhances" +#: apt-pkg/algorithms.cc:1084 +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/pkgcache.cc:327 -msgid "important" -msgstr "pwysig" +#: apt-pkg/algorithms.cc:1086 +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/pkgcache.cc:327 -msgid "required" -msgstr "angenrheidiol" +#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78 +msgid "Send scenario to solver" +msgstr "" -#: apt-pkg/pkgcache.cc:327 -msgid "standard" -msgstr "safonnol" +#: apt-pkg/edsp.cc:237 +msgid "Send request to solver" +msgstr "" -#: apt-pkg/pkgcache.cc:328 -msgid "optional" -msgstr "opsiynnol" +#: apt-pkg/edsp.cc:316 +msgid "Prepare for receiving solution" +msgstr "" -#: apt-pkg/pkgcache.cc:328 -msgid "extra" -msgstr "ychwanegol" +#: apt-pkg/edsp.cc:323 +msgid "External solver failed without a proper error message" +msgstr "" -#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 -#, fuzzy -msgid "Building dependency tree" -msgstr "Yn Aideladu Coeden Dibyniaeth" +#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623 +msgid "Execute external solver" +msgstr "" -#: apt-pkg/depcache.cc:133 -#, fuzzy -msgid "Candidate versions" -msgstr "Fersiynau Posib" +# FIXME: number? +#: apt-pkg/tagfile.cc:169 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/depcache.cc:162 -#, fuzzy -msgid "Dependency generation" -msgstr "Cynhyrchaid Dibyniaeth" +#: apt-pkg/tagfile.cc:269 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 -#, fuzzy -msgid "Reading state information" -msgstr "Yn cyfuno manylion Ar Gael" +# FIXME: number? +#: apt-pkg/indexrecords.cc:83 +#, fuzzy, c-format +msgid "Unable to parse Release file %s" +msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/depcache.cc:244 +#: apt-pkg/indexrecords.cc:91 #, fuzzy, c-format -msgid "Failed to open StateFile %s" -msgstr "Methwyd agor %s" +msgid "No sections in Release file %s" +msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: apt-pkg/depcache.cc:250 +#: apt-pkg/indexrecords.cc:139 +#, c-format +msgid "No Hash entry in Release file %s" +msgstr "" + +#: apt-pkg/indexrecords.cc:152 #, fuzzy, c-format -msgid "Failed to write temporary StateFile %s" -msgstr "Methwyd ysgrifennu ffeil %s" +msgid "Invalid 'Valid-Until' entry in Release file %s" +msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" # FIXME: number? -#: apt-pkg/tagfile.cc:138 -#, c-format -msgid "Unable to parse package file %s (1)" +#: apt-pkg/indexrecords.cc:171 +#, fuzzy, c-format +msgid "Invalid 'Date' entry in Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:231 -#, c-format -msgid "Unable to parse package file %s (2)" -msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" - -#: apt-pkg/sourcelist.cc:118 +#: 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:161 +#: 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:164 +#: 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:175 +#: 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:181 +#: 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:184 +#: apt-pkg/sourcelist.cc:193 #, fuzzy, c-format msgid "Malformed line %lu in source list %s ([%s] key %s has no value)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:197 +#: 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:199 +#: 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:202 +#: 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:208 +#: 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:215 +#: 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:326 +#: apt-pkg/sourcelist.cc:335 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495 -#, 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:362 +#: 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:366 +#: 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:407 +#: apt-pkg/sourcelist.cc:416 #, fuzzy, c-format msgid "Type '%s' is not known on stanza %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922 +#: apt-pkg/cacheset.cc:501 #, c-format -msgid "" -"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " -"under APT::Immediate-Configure for details. (%d)" -msgstr "" +msgid "Release '%s' for '%s' was not found" +msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" + +#: 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/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 +#: apt-pkg/cacheset.cc:634 #, fuzzy, c-format -msgid "Could not configure '%s'. " -msgstr "Methwyd agor ffeil %s" +msgid "Couldn't find task '%s'" +msgstr "Methwyd canfod pecyn %s" -# FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:570 +#: apt-pkg/cacheset.cc:640 +#, fuzzy, c-format +msgid "Couldn't find any package by regex '%s'" +msgstr "Methwyd canfod pecyn %s" + +#: apt-pkg/cacheset.cc:646 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Methwyd canfod pecyn %s" + +#: apt-pkg/cacheset.cc:690 #, 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." +msgid "Can't select versions from package '%s' as it is purely virtual" 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/pkgrecords.cc:34 +#: apt-pkg/cacheset.cc:734 #, c-format -msgid "Index file type '%s' is not supported" -msgstr "Ni chynhelir y math ffeil mynegai '%s'" +msgid "Can't select newest version from package '%s' as it is purely virtual" +msgstr "" -#: apt-pkg/algorithms.cc:266 +#: apt-pkg/cacheset.cc:742 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." +msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " -"ei gyfer." -#: apt-pkg/algorithms.cc:1068 -msgid "" -"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " -"held packages." +#: apt-pkg/cacheset.cc:750 +#, c-format +msgid "Can't select installed version from package %s as it is not installed" msgstr "" -"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " -"ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1070 -msgid "Unable to correct problems, you have held broken packages." +#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766 +#, c-format +msgid "" +"Can't select installed nor candidate version from package '%s' as it has " +"neither of them" msgstr "" -"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig." -#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/deb/dpkgpm.cc:107 #, fuzzy, c-format -msgid "List directory %spartial is missing." -msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." +msgid "Installing %s" +msgstr " Wedi Sefydlu: " -#: apt-pkg/acquire.cc:85 +#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011 #, fuzzy, c-format -msgid "Archives directory %spartial is missing." -msgstr "Mae'r cyfeiriadur archif %spartial ar goll." +msgid "Configuring %s" +msgstr "Yn cysylltu i %s" -#: apt-pkg/acquire.cc:93 +#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018 #, fuzzy, c-format -msgid "Unable to lock directory %s" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" - -#. only show the ETA if it makes sense -#. two days -#: apt-pkg/acquire.cc:893 -#, c-format -msgid "Retrieving file %li of %li (%s remaining)" -msgstr "" +msgid "Removing %s" +msgstr "Yn agor %s" -#: apt-pkg/acquire.cc:895 +#: apt-pkg/deb/dpkgpm.cc:110 #, fuzzy, c-format -msgid "Retrieving file %li of %li" -msgstr "Yn Darllen Rhestr Ffeiliau" - -#: apt-pkg/acquire-worker.cc:112 -#, c-format -msgid "The method driver %s could not be found." -msgstr "Methwyd canfod y gyrrydd dull %s." +msgid "Completely removing %s" +msgstr "Methwyd dileu %s" -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/deb/dpkgpm.cc:111 #, c-format -msgid "Method %s did not start correctly" -msgstr "Ni gychwynodd y dull %s yn gywir" - -#: apt-pkg/acquire-worker.cc:447 -#, fuzzy, c-format -msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgid "Noting disappearance of %s" msgstr "" -"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" -" '%s'\n" -"yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:143 +#: apt-pkg/deb/dpkgpm.cc:112 #, c-format -msgid "Packaging system '%s' is not supported" -msgstr "Ni chynhelir y system pecynnu '%s'" +msgid "Running post-installation trigger %s" +msgstr "" -#: apt-pkg/init.cc:159 -#, fuzzy -msgid "Unable to determine a suitable packaging system type" -msgstr "Ni ellir canfod math system addas" +#. FIXME: use a better string after freeze +#: apt-pkg/deb/dpkgpm.cc:842 +#, fuzzy, c-format +msgid "Directory '%s' missing" +msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/clean.cc:57 -#, c-format -msgid "Unable to stat %s." -msgstr "Ni ellir gwneud stat() o %s." +#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879 +#, fuzzy, c-format +msgid "Could not open file '%s'" +msgstr "Methwyd agor ffeil %s" -# FIXME: ...file -#: apt-pkg/srcrecords.cc:47 -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/deb/dpkgpm.cc:1004 +#, fuzzy, c-format +msgid "Preparing %s" +msgstr "Yn agor %s" -#: apt-pkg/cachefile.cc:87 -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/deb/dpkgpm.cc:1005 +#, fuzzy, c-format +msgid "Unpacking %s" +msgstr "Yn agor %s" -#: apt-pkg/cachefile.cc:91 -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/deb/dpkgpm.cc:1010 +#, fuzzy, c-format +msgid "Preparing to configure %s" +msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/cachefile.cc:109 -msgid "The list of sources could not be read." -msgstr "Methwyd darllen y rhestr ffynhonellau." +#: apt-pkg/deb/dpkgpm.cc:1012 +#, fuzzy, c-format +msgid "Installed %s" +msgstr " Wedi Sefydlu: " -#: apt-pkg/policy.cc:75 +#: apt-pkg/deb/dpkgpm.cc:1017 #, c-format -msgid "" -"The value '%s' is invalid for APT::Default-Release as such a release is not " -"available in the sources" +msgid "Preparing for removal of %s" msgstr "" -# FIXME: literal -#: apt-pkg/policy.cc:414 +#: apt-pkg/deb/dpkgpm.cc:1019 #, fuzzy, c-format -msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" - -# FIXME: tense -#: apt-pkg/policy.cc:436 -#, c-format -msgid "Did not understand pin type %s" -msgstr "Methwyd daeall y math pin %s" +msgid "Removed %s" +msgstr "Argymell" -#: apt-pkg/policy.cc:444 -msgid "No priority (or zero) specified for pin" -msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" +#: apt-pkg/deb/dpkgpm.cc:1024 +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/pkgcachegen.cc:87 -msgid "Cache has an incompatible versioning system" -msgstr "Mae can y storfa system fersiwn anghyfaddas" +#: apt-pkg/deb/dpkgpm.cc:1025 +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "Methwyd dileu %s" -#. TRANSLATOR: The first placeholder is a package name, -#. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 -#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 -#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 -#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 -#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 -#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 -#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 -#: apt-pkg/pkgcachegen.cc:563 +#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134 +#: apt-pkg/deb/dpkgpm.cc:1160 #, fuzzy, c-format -msgid "Error occurred while processing %s (%s%d)" -msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" +msgid "Can not write log (%s)" +msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/pkgcachegen.cc:251 -msgid "Wow, you exceeded the number of package names this APT is capable of." +#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160 +msgid "Is /dev/pts mounted?" msgstr "" -"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:254 -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/deb/dpkgpm.cc:1134 +msgid "Is stdout a terminal?" +msgstr "" -#: apt-pkg/pkgcachegen.cc:257 -#, 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/deb/dpkgpm.cc:1638 +msgid "Operation was interrupted before it could finish" +msgstr "" -#: apt-pkg/pkgcachegen.cc:260 -msgid "Wow, you exceeded the number of dependencies this APT is capable of." +#: apt-pkg/deb/dpkgpm.cc:1700 +msgid "No apport report written because MaxReports is reached already" msgstr "" -"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:570 -#, c-format -msgid "Package %s %s was not found while processing file dependencies" -msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" +#. check if its not a follow up error +#: apt-pkg/deb/dpkgpm.cc:1705 +msgid "dependency problems - leaving unconfigured" +msgstr "" -#: apt-pkg/pkgcachegen.cc:1199 -#, c-format -msgid "Couldn't stat source package list %s" -msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" +#: apt-pkg/deb/dpkgpm.cc:1707 +msgid "" +"No apport report written because the error message indicates its a followup " +"error from a previous failure." +msgstr "" -#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 -#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 -#, fuzzy -msgid "Reading package lists" -msgstr "Yn Darllen Rhestrau Pecynnau" +#: apt-pkg/deb/dpkgpm.cc:1713 +msgid "" +"No apport report written because the error message indicates a disk full " +"error" +msgstr "" -#: apt-pkg/pkgcachegen.cc:1304 -msgid "Collecting File Provides" -msgstr "Yn Casglu Darpariaethau Ffeil" +#: apt-pkg/deb/dpkgpm.cc:1720 +msgid "" +"No apport report written because the error message indicates a out of memory " +"error" +msgstr "" -#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 -msgid "IO Error saving source cache" -msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" +#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1755 +msgid "" +"No apport report written because the error message indicates a dpkg I/O error" +msgstr "" -#: apt-pkg/acquire-item.cc:139 +#: apt-pkg/deb/debsystem.cc:91 #, c-format -msgid "rename failed, %s (%s -> %s)." -msgstr "methwyd ailenwi, %s (%s -> %s)." +msgid "" +"Unable to lock the administration directory (%s), is another process using " +"it?" +msgstr "" -#: apt-pkg/acquire-item.cc:154 -#, fuzzy -msgid "Hash Sum mismatch" -msgstr "Camgyfatebiaeth swm MD5" +#: 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/acquire-item.cc:159 -msgid "Size mismatch" -msgstr "Camgyfatebiaeth maint" +#. 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/acquire-item.cc:164 -#, fuzzy -msgid "Invalid file format" -msgstr "Gweithred annilys %s" +#: apt-pkg/deb/debsystem.cc:128 +msgid "Not locked" +msgstr "" + +#: 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/acquire-item.cc:1561 +#: apt-pkg/contrib/fileutl.cc:201 #, c-format -msgid "" -"Unable to find expected entry '%s' in Release file (Wrong sources.list entry " -"or malformed file)" -msgstr "" +msgid "Could not open lock file %s" +msgstr "Methwyd agor y ffeil clo %s" -# FIXME: number? -#: apt-pkg/acquire-item.cc:1577 -#, fuzzy, c-format -msgid "Unable to find hash sum for '%s' in Release file" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" +#: 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/acquire-item.cc:1619 -msgid "There is no public key available for the following key IDs:\n" +#: 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: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/acquire-item.cc:1657 +#: apt-pkg/contrib/fileutl.cc:400 #, c-format -msgid "" -"Release file for %s is expired (invalid since %s). Updates for this " -"repository will not be applied." +msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/acquire-item.cc:1679 +#: apt-pkg/contrib/fileutl.cc:418 #, c-format -msgid "Conflicting distribution: %s (expected %s but got %s)" +msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/acquire-item.cc:1709 +#: apt-pkg/contrib/fileutl.cc:427 #, 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" +"Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1719 apt-pkg/acquire-item.cc:1724 +#: apt-pkg/contrib/fileutl.cc:846 #, c-format -msgid "GPG error: %s: %s" -msgstr "" +msgid "Sub-process %s received a segmentation fault." +msgstr "Derbyniodd is-broses %s wall segmentu." -# FIXME: case -#: apt-pkg/acquire-item.cc:1847 +#: 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:852 apt-pkg/contrib/gpgv.cc:212 #, c-format -msgid "" -"I wasn't able to locate a file for the %s package. This might mean you need " -"to manually fix this package. (due to missing arch)" -msgstr "" -"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " -"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" +msgid "Sub-process %s returned an error code (%u)" +msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/acquire-item.cc:1913 +#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205 #, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "" +msgid "Sub-process %s exited unexpectedly" +msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/acquire-item.cc:1971 +#: 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:1140 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." -msgstr "" -"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." +msgid "Could not open file %s" +msgstr "Methwyd agor ffeil %s" -# FIXME: number? -#: apt-pkg/indexrecords.cc:73 +#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246 #, fuzzy, c-format -msgid "Unable to parse Release file %s" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" +msgid "Could not open file descriptor %d" +msgstr "Methwyd agor pibell ar gyfer %s" + +#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123 +msgid "Failed to create subprocess IPC" +msgstr "Methwyd creu isbroses IPC" + +#: apt-pkg/contrib/fileutl.cc:1412 +msgid "Failed to exec compressor " +msgstr "Methwyd gweithredu cywasgydd " -#: apt-pkg/indexrecords.cc:81 +# FIXME +#: apt-pkg/contrib/fileutl.cc:1553 #, fuzzy, c-format -msgid "No sections in Release file %s" -msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" +msgid "read, still have %llu to read but none left" +msgstr "o hyd %lu i ddarllen ond dim ar ôl" -#: apt-pkg/indexrecords.cc:112 -#, c-format -msgid "No Hash entry in Release file %s" -msgstr "" +# FIXME +#: 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/indexrecords.cc:125 +#: apt-pkg/contrib/fileutl.cc:1954 #, fuzzy, c-format -msgid "Invalid 'Valid-Until' entry in Release file %s" -msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" +msgid "Problem closing the file %s" +msgstr "Gwall wrth gau'r ffeil" -# FIXME: number? -#: apt-pkg/indexrecords.cc:144 +#: apt-pkg/contrib/fileutl.cc:1965 #, fuzzy, c-format -msgid "Invalid 'Date' entry in Release file %s" -msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" +msgid "Problem renaming the file %s to %s" +msgstr "Gwall wrth gyfamseru'r ffeil" + +#: 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:1989 +msgid "Problem syncing the file" +msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/vendorlist.cc:78 +#: apt-pkg/contrib/progress.cc:148 #, c-format -msgid "Vendor block %s contains no fingerprint" -msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" +msgid "%c%s... Error!" +msgstr "%c%s... Gwall!" -#: apt-pkg/cdrom.cc:576 +#: apt-pkg/contrib/progress.cc:150 #, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" +msgid "%c%s... Done" +msgstr "%c%s... Wedi Gorffen" -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " +#: apt-pkg/contrib/progress.cc:181 +msgid "..." msgstr "" -#: apt-pkg/cdrom.cc:613 +#. Print the spinner +#: apt-pkg/contrib/progress.cc:197 +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Wedi Gorffen" + +#. d means days, h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:425 #, c-format -msgid "Stored label: %s\n" +msgid "%lid %lih %limin %lis" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "CD Anghywir" +#. h means hours, min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:432 +#, c-format +msgid "%lih %limin %lis" +msgstr "" -#: apt-pkg/cdrom.cc:642 +#. min means minutes, s means seconds +#: apt-pkg/contrib/strutl.cc:439 #, c-format -msgid "Using CD-ROM mount point %s\n" +msgid "%limin %lis" msgstr "" -#: apt-pkg/cdrom.cc:660 -msgid "Unmounting CD-ROM\n" +#. s means seconds +#: apt-pkg/contrib/strutl.cc:444 +#, c-format +msgid "%lis" msgstr "" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/contrib/strutl.cc:1290 +#, c-format +msgid "Selection %s not found" +msgstr "Ni chanfuwyd y dewis %s" + +#: apt-pkg/contrib/mmap.cc:79 +msgid "Can't mmap an empty file" +msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" + +#: apt-pkg/contrib/mmap.cc:111 +#, fuzzy, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "Methwyd agor pibell ar gyfer %s" + +#: apt-pkg/contrib/mmap.cc:119 +#, fuzzy, c-format +msgid "Couldn't make mmap of %llu bytes" +msgstr "Methwyd gwneud mmap() efo %lu beit" + +#: apt-pkg/contrib/mmap.cc:146 #, fuzzy -msgid "Waiting for disc...\n" -msgstr "Yn aros am benawdau" +msgid "Unable to close mmap" +msgstr "Ni ellir agor %s" -#: apt-pkg/cdrom.cc:674 -msgid "Mounting CD-ROM...\n" -msgstr "" +# FIXME +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 +#, fuzzy +msgid "Unable to synchronize mmap" +msgstr "Methwyd gweithredu " + +#: apt-pkg/contrib/mmap.cc:290 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Methwyd gwneud mmap() efo %lu beit" + +#: apt-pkg/contrib/mmap.cc:322 +#, fuzzy +msgid "Failed to truncate file" +msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/cdrom.cc:693 -msgid "Scanning disc for index files..\n" +#: apt-pkg/contrib/mmap.cc:341 +#, c-format +msgid "" +"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. " +"Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" -"Found %zu package indexes, %zu source indexes, %zu translation indexes and " -"%zu signatures\n" +"Unable to increase the size of the MMap as the limit of %lu bytes is already " +"reached." msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/contrib/mmap.cc:449 msgid "" -"Unable to locate any package files, perhaps this is not a Debian Disc or the " -"wrong architecture?" +"Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/contrib/cdromutl.cc:65 #, c-format -msgid "Found label '%s'\n" -msgstr "" +msgid "Unable to stat the mount point %s" +msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/cdrom.cc:811 -msgid "That is not a valid name, try again.\n" -msgstr "" +#: apt-pkg/contrib/cdromutl.cc:246 +msgid "Failed to stat the cdrom" +msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/contrib/configuration.cc:516 #, c-format -msgid "" -"This disc is called: \n" -"'%s'\n" -msgstr "" +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/cdrom.cc:830 -#, fuzzy -msgid "Copying package lists..." -msgstr "Yn Darllen Rhestrau Pecynnau" +#: apt-pkg/contrib/configuration.cc:630 +#, c-format +msgid "Opening configuration file %s" +msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/cdrom.cc:865 -#, fuzzy -msgid "Writing new source list\n" -msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." +#: apt-pkg/contrib/configuration.cc:798 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." -#: apt-pkg/cdrom.cc:873 -msgid "Source list entries for this disc are:\n" -msgstr "" +# FIXME +#: apt-pkg/contrib/configuration.cc:817 +#, fuzzy, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 +#: apt-pkg/contrib/configuration.cc:834 #, c-format -msgid "Wrote %i records.\n" -msgstr "" +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 +#: apt-pkg/contrib/configuration.cc:874 #, c-format -msgid "Wrote %i records with %i missing files.\n" +msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" +"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 +#: apt-pkg/contrib/configuration.cc:881 #, c-format -msgid "Wrote %i records with %i mismatched files\n" -msgstr "" +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 +#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890 #, c-format -msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "" +msgid "Syntax error %s:%u: Included from here" +msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/indexcopy.cc:515 +#: apt-pkg/contrib/configuration.cc:894 #, c-format -msgid "Can't find authentication record for: %s" -msgstr "" +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/indexcopy.cc:521 +#: apt-pkg/contrib/configuration.cc:897 #, fuzzy, c-format -msgid "Hash mismatch for: %s" -msgstr "Camgyfatebiaeth swm MD5" +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/cacheset.cc:467 +#: apt-pkg/contrib/configuration.cc:947 #, c-format -msgid "Release '%s' for '%s' was not found" -msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" + +# FIXME +#: apt-pkg/contrib/cmndline.cc:124 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158 +#: apt-pkg/contrib/cmndline.cc:166 #, c-format -msgid "Version '%s' for '%s' was not found" -msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " +msgid "Command line option %s is not understood" +msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/cacheset.cc:581 -#, fuzzy, c-format -msgid "Couldn't find task '%s'" -msgstr "Methwyd canfod pecyn %s" +#: apt-pkg/contrib/cmndline.cc:171 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd" -#: apt-pkg/cacheset.cc:587 -#, fuzzy, c-format -msgid "Couldn't find any package by regex '%s'" -msgstr "Methwyd canfod pecyn %s" +#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233 +#, c-format +msgid "Option %s requires an argument." +msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252 #, c-format -msgid "Can't select versions from package '%s' as it is purely virtual" -msgstr "" +msgid "Option %s: Configuration item specification must have an =." +msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =." -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/contrib/cmndline.cc:281 #, c-format -msgid "" -"Can't select installed nor candidate version from package '%s' as it has " -"neither of them" -msgstr "" +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/contrib/cmndline.cc:312 #, c-format -msgid "Can't select newest version from package '%s' as it is purely virtual" -msgstr "" +msgid "Option '%s' is too long" +msgstr "Opsiwn '%s' yn rhy hir" -#: apt-pkg/cacheset.cc:627 +# FIXME: 'Sense'? +#: apt-pkg/contrib/cmndline.cc:344 #, c-format -msgid "Can't select candidate version from package %s as it has no candidate" -msgstr "" +msgid "Sense %s is not understood, try true or false." +msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'." -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/contrib/cmndline.cc:394 #, c-format -msgid "Can't select installed version from package %s as it is not installed" -msgstr "" +msgid "Invalid operation %s" +msgstr "Gweithred annilys %s" -#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61 -msgid "Send scenario to solver" -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-pkg/edsp.cc:209 -msgid "Send request to solver" -msgstr "" +#: apt-inst/filelist.cc:412 +msgid "Failed to locate the hash element!" +msgstr "Methyd lleoli yr elfen !" -#: apt-pkg/edsp.cc:279 -msgid "Prepare for receiving solution" -msgstr "" +#: apt-inst/filelist.cc:459 +msgid "Failed to allocate diversion" +msgstr "Methwyd neilltuo dargyfeiriad" -#: apt-pkg/edsp.cc:286 -msgid "External solver failed without a proper error message" -msgstr "" +#: apt-inst/filelist.cc:464 +#, fuzzy +msgid "Internal error in AddDiversion" +msgstr "Gwall Mewnol yn AddDiversion" -#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 -msgid "Execute external solver" -msgstr "" +#: 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/install-progress.cc:51 +# FIXME: "the" +#: apt-inst/filelist.cc:506 #, c-format -msgid "Progress: [%3i%%]" -msgstr "" +msgid "Double add of diversion %s -> %s" +msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" -#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 -msgid "Running dpkg" -msgstr "" +#: apt-inst/filelist.cc:549 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-pkg/update.cc:110 apt-pkg/update.cc:112 -#, 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-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/deb/dpkgpm.cc:91 -#, fuzzy, c-format -msgid "Installing %s" -msgstr " Wedi Sefydlu: " +#: apt-inst/extract.cc:132 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Yn dadbacio %s mwy nag unwaith" -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 -#, fuzzy, c-format -msgid "Configuring %s" -msgstr "Yn cysylltu i %s" +#: apt-inst/extract.cc:142 +#, c-format +msgid "The directory %s is diverted" +msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 -#, fuzzy, c-format -msgid "Removing %s" -msgstr "Yn agor %s" +#: 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-pkg/deb/dpkgpm.cc:94 -#, fuzzy, c-format -msgid "Completely removing %s" -msgstr "Methwyd dileu %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-pkg/deb/dpkgpm.cc:95 +#: apt-inst/extract.cc:249 #, c-format -msgid "Noting disappearance of %s" +msgid "The directory %s is being replaced by a non-directory" msgstr "" +"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-pkg/deb/dpkgpm.cc:96 -#, c-format -msgid "Running post-installation trigger %s" -msgstr "" +#: apt-inst/extract.cc:289 +msgid "Failed to locate node in its hash bucket" +msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" -#. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 -#, fuzzy, c-format -msgid "Directory '%s' missing" -msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." +#: apt-inst/extract.cc:293 +msgid "The path is too long" +msgstr "Mae'r llwybr yn rhy hir" -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 -#, fuzzy, c-format -msgid "Could not open file '%s'" -msgstr "Methwyd agor ffeil %s" +# 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-pkg/deb/dpkgpm.cc:971 -#, fuzzy, c-format -msgid "Preparing %s" -msgstr "Yn agor %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-pkg/deb/dpkgpm.cc:972 -#, fuzzy, c-format -msgid "Unpacking %s" -msgstr "Yn agor %s" +#: apt-inst/extract.cc:498 +#, c-format +msgid "Unable to stat %s" +msgstr "Ni ellir gwneud stat() o %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format -msgid "Preparing to configure %s" -msgstr "Yn agor y ffeil cyfluniad %s" +msgid "Failed to write file %s" +msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:979 -#, fuzzy, c-format -msgid "Installed %s" -msgstr " Wedi Sefydlu: " +#: apt-inst/dirstream.cc:104 +#, c-format +msgid "Failed to close file %s" +msgstr "Methwyd cau ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54 +#: apt-inst/deb/debfile.cc:63 #, c-format -msgid "Preparing for removal of %s" -msgstr "" +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/deb/dpkgpm.cc:986 +#: apt-inst/deb/debfile.cc:132 #, fuzzy, c-format -msgid "Removed %s" -msgstr "Argymell" +msgid "Internal error, could not locate member %s" +msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: apt-pkg/deb/dpkgpm.cc:991 -#, fuzzy, c-format -msgid "Preparing to completely remove %s" -msgstr "Yn agor y ffeil cyfluniad %s" +#: apt-inst/deb/debfile.cc:227 +#, fuzzy +msgid "Unparsable control file" +msgstr "Ffeil rheoli ni ellir ei ramadegu" -#: apt-pkg/deb/dpkgpm.cc:992 -#, fuzzy, c-format -msgid "Completely removed %s" -msgstr "Methwyd dileu %s" +#: apt-inst/contrib/arfile.cc:76 +msgid "Invalid archive signature" +msgstr "Llofnod archif annilys" -#: apt-pkg/deb/dpkgpm.cc:1047 -msgid "ioctl(TIOCGWINSZ) failed" -msgstr "" +#: apt-inst/contrib/arfile.cc:84 +msgid "Error reading archive member header" +msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-inst/contrib/arfile.cc:96 #, fuzzy, c-format -msgid "Can not write log (%s)" -msgstr "Ni ellir ysgrifennu i %s" +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" -#: apt-pkg/deb/dpkgpm.cc:1050 -msgid "Is /dev/pts mounted?" -msgstr "" +#: apt-inst/contrib/arfile.cc:108 +msgid "Invalid archive member header" +msgstr "Pennawd aelod archif annilys" -#: apt-pkg/deb/dpkgpm.cc:1071 -msgid "Is stdout a terminal?" -msgstr "" +#: apt-inst/contrib/arfile.cc:137 +msgid "Archive is too short" +msgstr "Mae'r archif yn rhy fyr" -#: apt-pkg/deb/dpkgpm.cc:1559 -msgid "Operation was interrupted before it could finish" -msgstr "" +#: apt-inst/contrib/arfile.cc:141 +msgid "Failed to read the archive headers" +msgstr "Methwyd darllen pennawdau'r archif" -#: apt-pkg/deb/dpkgpm.cc:1621 -msgid "No apport report written because MaxReports is reached already" -msgstr "" +#: apt-inst/contrib/extracttar.cc:123 +msgid "Failed to create pipes" +msgstr "Methwyd creu pibau" -#. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 -msgid "dependency problems - leaving unconfigured" -msgstr "" +#: apt-inst/contrib/extracttar.cc:150 +msgid "Failed to exec gzip " +msgstr "Methwyd gweithredu gzip" -#: apt-pkg/deb/dpkgpm.cc:1628 -msgid "" -"No apport report written because the error message indicates its a followup " -"error from a previous failure." -msgstr "" +#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217 +msgid "Corrupted archive" +msgstr "Archif llygredig" -#: apt-pkg/deb/dpkgpm.cc:1634 -msgid "" -"No apport report written because the error message indicates a disk full " -"error" -msgstr "" +#: apt-inst/contrib/extracttar.cc:202 +#, fuzzy +msgid "Tar checksum failed, archive corrupted" +msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-pkg/deb/dpkgpm.cc:1641 -msgid "" -"No apport report written because the error message indicates a out of memory " -"error" -msgstr "" +#: apt-inst/contrib/extracttar.cc:307 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Math pennawd TAR anhysbys %u, aelod %s" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 -msgid "" -"No apport report written because the error message indicates an issue on the " -"local system" -msgstr "" +#, fuzzy +#~ msgid "Total dependency version space: " +#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: apt-pkg/deb/dpkgpm.cc:1675 -msgid "" -"No apport report written because the error message indicates a dpkg I/O error" -msgstr "" +#~ msgid "You don't have enough free space in %s" +#~ msgstr "Does dim digon o le rhydd yn %s gennych" -#: apt-pkg/deb/debsystem.cc:84 -#, c-format -msgid "" -"Unable to lock the administration directory (%s), is another process using " -"it?" -msgstr "" +#~ msgid "Done" +#~ msgstr "Wedi Gorffen" -#: apt-pkg/deb/debsystem.cc:87 -#, fuzzy, c-format -msgid "Unable to lock the administration directory (%s), are you root?" -msgstr "Ni ellir cloi'r cyfeiriadur rhestr" +#, fuzzy +#~ msgid "No keyring installed in %s." +#~ msgstr "Yn Erthylu'r Sefydliad." -#. TRANSLATORS: the %s contains the recovery command, usually -#. dpkg --configure -a -#: apt-pkg/deb/debsystem.cc:103 -#, c-format -msgid "" -"dpkg was interrupted, you must manually run '%s' to correct the problem. " -msgstr "" +#, fuzzy +#~ msgid "Internal error, Upgrade broke stuff" +#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: apt-pkg/deb/debsystem.cc:121 -msgid "Not locked" -msgstr "" +#~ msgid "%s not a valid DEB package." +#~ msgstr "Nid yw %s yn becyn DEB dilys." #, fuzzy #~ msgid "Note, selecting '%s' for task '%s'\n" @@ -3582,41 +3748,10 @@ msgstr "" #~ msgid "Package '%s' has no installation candidate" #~ 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"