diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-27 22:52:34 +0100 |
| commit | fce69e7a0f38299c57ef96ae1c1dd9a5379bfd5a (patch) | |
| tree | be7d18baa836e9df166ec63f6c9fe6f94bb84b40 /po/cy.po | |
| parent | a5e790985752c6820e08e7a7e650e1607fa826e4 (diff) | |
| parent | fc104da6a583736223b2f941e43a05ea26b63a7d (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-private/private-list.cc
configure.ac
debian/apt.install.in
debian/changelog
Diffstat (limited to 'po/cy.po')
| -rw-r--r-- | po/cy.po | 2187 |
1 files changed, 1146 insertions, 1041 deletions
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2013-07-31 16:24+0200\n" +"POT-Creation-Date: 2014-02-23 00:29+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -15,171 +15,173 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:158 +#: cmdline/apt-cache.cc:140 #, 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:286 +#: cmdline/apt-cache.cc:268 #, fuzzy msgid "Total package names: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:288 +#: cmdline/apt-cache.cc:270 #, fuzzy msgid "Total package structures: " msgstr "Cyfanswm Enwau Pecynnau : " -#: cmdline/apt-cache.cc:328 +#: cmdline/apt-cache.cc:310 #, fuzzy msgid " Normal packages: " msgstr " Pecynnau Normal: " -#: cmdline/apt-cache.cc:329 +#: cmdline/apt-cache.cc:311 #, fuzzy msgid " Pure virtual packages: " msgstr " Pecynnau Cwbl Rhithwir: " -#: cmdline/apt-cache.cc:330 +#: cmdline/apt-cache.cc:312 #, fuzzy msgid " Single virtual packages: " msgstr " Pecynnau Rhithwir Sengl: " -#: cmdline/apt-cache.cc:331 +#: cmdline/apt-cache.cc:313 #, fuzzy msgid " Mixed virtual packages: " msgstr " Pecynnau Rhithwir Cymysg: " -#: cmdline/apt-cache.cc:332 +#: cmdline/apt-cache.cc:314 msgid " Missing: " msgstr " Ar Goll: " -#: cmdline/apt-cache.cc:334 +#: cmdline/apt-cache.cc:316 #, fuzzy msgid "Total distinct versions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:336 +#: cmdline/apt-cache.cc:318 #, fuzzy msgid "Total distinct descriptions: " msgstr "Cyfanswm Fersiynau Gwahanol: " -#: cmdline/apt-cache.cc:338 +#: cmdline/apt-cache.cc:320 #, fuzzy msgid "Total dependencies: " msgstr "Cyfanswm Dibyniaethau: " -#: cmdline/apt-cache.cc:341 +#: cmdline/apt-cache.cc:323 #, fuzzy msgid "Total ver/file relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:343 +#: cmdline/apt-cache.cc:325 #, fuzzy msgid "Total Desc/File relations: " msgstr "Cyfanswm perthyniadau fersiwn/ffeil: " -#: cmdline/apt-cache.cc:345 +#: cmdline/apt-cache.cc:327 #, fuzzy msgid "Total Provides mappings: " msgstr "Cyfanswm Mapiau Darpariath: " -#: cmdline/apt-cache.cc:357 +#: cmdline/apt-cache.cc:339 #, fuzzy msgid "Total globbed strings: " msgstr "Cyfanswm Llinynau Glob: " -#: cmdline/apt-cache.cc:371 +#: cmdline/apt-cache.cc:353 #, fuzzy msgid "Total dependency version space: " msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: " -#: cmdline/apt-cache.cc:376 +#: cmdline/apt-cache.cc:358 #, fuzzy msgid "Total slack space: " msgstr "Cyfanswm gofod Slac: " -#: cmdline/apt-cache.cc:384 +#: cmdline/apt-cache.cc:366 #, fuzzy msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 +#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146 +#: apt-private/private-show.cc:55 #, c-format msgid "Package file %s is out of sync." msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig." -#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452 -#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46 -#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 +#: 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 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1265 +#: cmdline/apt-cache.cc:1245 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1431 +#: cmdline/apt-cache.cc:1411 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1536 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 +#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634 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:1577 +#: cmdline/apt-cache.cc:1557 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 +#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1597 +#: cmdline/apt-cache.cc:1577 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1598 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 +#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1631 +#: cmdline/apt-cache.cc:1611 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1640 +#: cmdline/apt-cache.cc:1620 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375 -#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591 -#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-extracttemplates.cc:217 ftparchive/apt-ftparchive.cc:591 +#: cmdline/apt-internal-solver.cc:34 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:1760 +#: cmdline/apt-cache.cc:1740 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -253,18 +255,18 @@ msgstr "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" #. }}} -#: cmdline/apt-cdrom.cc:43 +#: 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:85 +#: cmdline/apt-cdrom.cc:89 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:100 +#: cmdline/apt-cdrom.cc:104 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -272,20 +274,20 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:135 +#: cmdline/apt-cdrom.cc:141 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:170 +#: cmdline/apt-cdrom.cc:196 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" -#: cmdline/apt-config.cc:46 +#: cmdline/apt-config.cc:48 msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" -#: cmdline/apt-config.cc:87 +#: cmdline/apt-config.cc:89 #, fuzzy msgid "" "Usage: apt-config [options] command\n" @@ -314,613 +316,78 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] -#. e.g. "Do you want to continue? [Y/n] " -#. The user has to answer with an input matching the -#. YESEXPR/NOEXPR defined in your l10n. -#: cmdline/apt-get.cc:146 -msgid "[Y/n]" -msgstr "" - -#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] -#. e.g. "Should this file be removed? [y/N] " -#. The user has to answer with an input matching the -#. YESEXPR/NOEXPR defined in your l10n. -#: cmdline/apt-get.cc:152 -msgid "[y/N]" -msgstr "" - -#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: cmdline/apt-get.cc:163 -msgid "Y" -msgstr "I" - -#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: cmdline/apt-get.cc:169 -msgid "N" -msgstr "" - -#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33 -#, c-format -msgid "Regex compilation error - %s" -msgstr "Gwall crynhoi patrwm - %s" - -#: cmdline/apt-get.cc:289 -msgid "The following packages have unmet dependencies:" -msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" - -#: cmdline/apt-get.cc:379 -#, c-format -msgid "but %s is installed" -msgstr "ond mae %s wedi ei sefydlu" - -#: cmdline/apt-get.cc:381 -#, c-format -msgid "but %s is to be installed" -msgstr "ond mae %s yn mynd i gael ei sefydlu" - -#: cmdline/apt-get.cc:388 -msgid "but it is not installable" -msgstr "ond ni ellir ei sefydlu" - -#: cmdline/apt-get.cc:390 -msgid "but it is a virtual package" -msgstr "ond mae'n becyn rhithwir" - -#: cmdline/apt-get.cc:393 -msgid "but it is not installed" -msgstr "ond nid yw wedi ei sefydlu" - -#: cmdline/apt-get.cc:393 -msgid "but it is not going to be installed" -msgstr "ond nid yw'n mynd i gael ei sefydlu" - -#: cmdline/apt-get.cc:398 -msgid " or" -msgstr " neu" - -#: cmdline/apt-get.cc:427 -msgid "The following NEW packages will be installed:" -msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: cmdline/apt-get.cc:453 -msgid "The following packages will be REMOVED:" -msgstr "Caiff y pecynnau canlynol eu TYNNU:" - -#: cmdline/apt-get.cc:475 -#, fuzzy -msgid "The following packages have been kept back:" -msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" - -#: cmdline/apt-get.cc:496 -#, fuzzy -msgid "The following packages will be upgraded:" -msgstr "Caiff y pecynnau canlynol eu uwchraddio" - -#: cmdline/apt-get.cc:517 -#, fuzzy -msgid "The following packages will be DOWNGRADED:" -msgstr "Caiff y pecynnau canlynol eu ISRADDIO" - -#: cmdline/apt-get.cc:537 -msgid "The following held packages will be changed:" -msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" - -#: cmdline/apt-get.cc:592 -#, c-format -msgid "%s (due to %s) " -msgstr "%s (oherwydd %s) " - -#: cmdline/apt-get.cc:600 -#, fuzzy -msgid "" -"WARNING: The following essential packages will be removed.\n" -"This should NOT be done unless you know exactly what you are doing!" -msgstr "" -"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" -"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" -"ei wneud!" - -#: cmdline/apt-get.cc:631 -#, c-format -msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " - -#: cmdline/apt-get.cc:635 -#, c-format -msgid "%lu reinstalled, " -msgstr "%lu wedi ailsefydlu, " - -#: cmdline/apt-get.cc:637 -#, c-format -msgid "%lu downgraded, " -msgstr "%lu wedi eu israddio, " - -#: cmdline/apt-get.cc:639 -#, c-format -msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" - -#: cmdline/apt-get.cc:643 -#, c-format -msgid "%lu not fully installed or removed.\n" -msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" - -#: cmdline/apt-get.cc:664 -#, fuzzy, c-format -msgid "Note, selecting '%s' for task '%s'\n" -msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" - -#: cmdline/apt-get.cc:669 -#, fuzzy, c-format -msgid "Note, selecting '%s' for regex '%s'\n" -msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" - -#: cmdline/apt-get.cc:686 -#, c-format -msgid "Package %s is a virtual package provided by:\n" -msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" - -#: cmdline/apt-get.cc:697 -msgid " [Installed]" -msgstr " [Sefydliwyd]" - -#: cmdline/apt-get.cc:706 -#, fuzzy -msgid " [Not candidate version]" -msgstr "Fersiynau Posib" - -#: cmdline/apt-get.cc:708 -msgid "You should explicitly select one to install." -msgstr "Dylech ddewis un yn benodol i'w sefydlu." - -# FIXME: punctuation -#: cmdline/apt-get.cc:711 -#, fuzzy, c-format -msgid "" -"Package %s is not available, but is referred to by another package.\n" -"This may mean that the package is missing, has been obsoleted, or\n" -"is only available from another source\n" -msgstr "" -"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" -"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n" -"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" -"ffeil sources.list.\n" - -#: cmdline/apt-get.cc:729 -msgid "However the following packages replace it:" -msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" - -#: cmdline/apt-get.cc:741 -#, fuzzy, c-format -msgid "Package '%s' has no installation candidate" -msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" - -#: cmdline/apt-get.cc:754 -#, c-format -msgid "Virtual packages like '%s' can't be removed\n" -msgstr "" - -#. TRANSLATORS: Note, this is not an interactive question -#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969 -#, 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" - -#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975 -#, 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" - -#: cmdline/apt-get.cc:817 +#: cmdline/apt-get.cc:244 #, fuzzy, c-format -msgid "Note, selecting '%s' instead of '%s'\n" -msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" - -#: cmdline/apt-get.cc:847 -#, 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" - -#: cmdline/apt-get.cc:851 -#, 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" - -#: cmdline/apt-get.cc:863 -#, 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" - -#: cmdline/apt-get.cc:868 -#, c-format -msgid "%s is already the newest version.\n" -msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" - -#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68 -#, fuzzy, c-format -msgid "%s set to manually installed.\n" -msgstr "ond mae %s yn mynd i gael ei sefydlu" - -#: cmdline/apt-get.cc:913 -#, fuzzy, c-format -msgid "Selected version '%s' (%s) for '%s'\n" -msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" - -#: cmdline/apt-get.cc:918 -#, fuzzy, c-format -msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" -msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" - -#: cmdline/apt-get.cc:1054 -msgid "Correcting dependencies..." -msgstr "Yn cywiro dibyniaethau..." - -#: cmdline/apt-get.cc:1057 -msgid " failed." -msgstr " wedi methu." - -#: cmdline/apt-get.cc:1060 -msgid "Unable to correct dependencies" -msgstr "Ni ellir cywiro dibyniaethau" - -#: cmdline/apt-get.cc:1063 -msgid "Unable to minimize the upgrade set" -msgstr "Ni ellir bychanu y set uwchraddio" - -#: cmdline/apt-get.cc:1065 -msgid " Done" -msgstr " Wedi Gorffen" - -#: cmdline/apt-get.cc:1069 -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." - -#: cmdline/apt-get.cc:1072 -msgid "Unmet dependencies. Try using -f." -msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." - -#: cmdline/apt-get.cc:1097 -#, fuzzy -msgid "WARNING: The following packages cannot be authenticated!" -msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" - -#: cmdline/apt-get.cc:1101 -msgid "Authentication warning overridden.\n" -msgstr "" - -#: cmdline/apt-get.cc:1108 -msgid "Install these packages without verification?" -msgstr "" - -#: cmdline/apt-get.cc:1110 -#, fuzzy -msgid "Some packages could not be authenticated" -msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" - -#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280 -msgid "There are problems and -y was used without --force-yes" -msgstr "Mae problemau a defnyddwyd -y heb --force-yes" - -#: cmdline/apt-get.cc:1160 -msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" - -#: cmdline/apt-get.cc:1169 -#, fuzzy -msgid "Packages need to be removed but remove is disabled." -msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." - -#: cmdline/apt-get.cc:1180 -#, fuzzy -msgid "Internal error, Ordering didn't finish" -msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" - -#: cmdline/apt-get.cc:1218 -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 -#: cmdline/apt-get.cc:1225 -#, 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 -#: cmdline/apt-get.cc:1230 -#, 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 -#: cmdline/apt-get.cc:1237 -#, 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 -#: cmdline/apt-get.cc:1242 -#, 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" +msgid "Can not find a package for architecture '%s'" +msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 -#: cmdline/apt-get.cc:2624 +#: cmdline/apt-get.cc:326 #, 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:1270 -#, c-format -msgid "You don't have enough free space in %s." -msgstr "Does dim digon o le rhydd gennych yn %s." - -#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308 -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) -#: cmdline/apt-get.cc:1290 -msgid "Yes, do as I say!" -msgstr "Ie, gwna fel rydw i'n dweud!" +msgid "Can not find a package '%s' with version '%s'" +msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1292 +#: cmdline/apt-get.cc:329 #, fuzzy, c-format -msgid "" -"You are about to do something potentially harmful.\n" -"To continue type in the phrase '%s'\n" -" ?] " -msgstr "" -"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n" -"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" -" ?]" - -#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 -msgid "Abort." -msgstr "Erthylu." - -#: cmdline/apt-get.cc:1313 -msgid "Do you want to continue?" -msgstr "Ydych chi eisiau mynd ymlaen?" - -#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566 -#, c-format -msgid "Failed to fetch %s %s\n" -msgstr "Methwyd cyrchu %s %s\n" - -#: cmdline/apt-get.cc:1403 -msgid "Some files failed to download" -msgstr "Methodd rhai ffeiliau lawrlwytho" - -#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698 -msgid "Download complete and in download only mode" -msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" - -#: cmdline/apt-get.cc:1410 -msgid "" -"Unable to fetch some archives, maybe run apt-get update or try with --fix-" -"missing?" -msgstr "" -"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " -"geidio defnyddio --fix-missing?" - -#: cmdline/apt-get.cc:1414 -msgid "--fix-missing and media swapping is not currently supported" -msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd" - -#: cmdline/apt-get.cc:1419 -msgid "Unable to correct missing packages." -msgstr "Ni ellir cywiro pecynnau ar goll." - -#: cmdline/apt-get.cc:1420 -#, fuzzy -msgid "Aborting install." -msgstr "Yn Erthylu'r Sefydliad." - -#: cmdline/apt-get.cc:1448 -msgid "" -"The following package disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgid_plural "" -"The following packages disappeared from your system as\n" -"all files have been overwritten by other packages:" -msgstr[0] "" -msgstr[1] "" - -#: cmdline/apt-get.cc:1452 -msgid "Note: This is done automatically and on purpose by dpkg." -msgstr "" - -#: cmdline/apt-get.cc:1590 -#, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" -msgstr "" +msgid "Can not find a package '%s' with release '%s'" +msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1622 +#: cmdline/apt-get.cc:366 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1660 +#: cmdline/apt-get.cc:422 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1676 -msgid "The update command takes no arguments" -msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" - -#: cmdline/apt-get.cc:1742 -msgid "We are not supposed to delete stuff, can't start AutoRemover" -msgstr "" - -#: cmdline/apt-get.cc:1846 -msgid "" -"Hmm, seems like the AutoRemover destroyed something which really\n" -"shouldn't happen. Please file a bug report against apt." -msgstr "" - -#. -#. if (Packages == 1) -#. { -#. c1out << endl; -#. c1out << -#. _("Since you only requested a single operation it is extremely likely that\n" -#. "the package is simply not installable and a bug report against\n" -#. "that package should be filed.") << endl; -#. } -#. -#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017 -msgid "The following information may help to resolve the situation:" -msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" - -#: cmdline/apt-get.cc:1853 -#, fuzzy -msgid "Internal Error, AutoRemover broke stuff" -msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" - -#: cmdline/apt-get.cc:1860 -#, fuzzy -msgid "" -"The following package was automatically installed and is no longer required:" -msgid_plural "" -"The following packages were automatically installed and are no longer " -"required:" -msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: cmdline/apt-get.cc:1864 -#, fuzzy, c-format -msgid "%lu package was automatically installed and is no longer required.\n" -msgid_plural "" -"%lu packages were automatically installed and are no longer required.\n" -msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" - -#: cmdline/apt-get.cc:1866 -msgid "Use 'apt-get autoremove' to remove it." -msgid_plural "Use 'apt-get autoremove' to remove them." -msgstr[0] "" -msgstr[1] "" - -#: cmdline/apt-get.cc:1885 -#, fuzzy -msgid "Internal error, AllUpgrade broke stuff" -msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" - -#: cmdline/apt-get.cc:1984 -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 -#: cmdline/apt-get.cc:1988 -msgid "" -"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " -"solution)." +msgid "Can not find version '%s' of package '%s'" msgstr "" -"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim " -"pecyn (neu penodwch ddatrys)" - -# FIXME: needs commas -#: cmdline/apt-get.cc:2002 -msgid "" -"Some packages could not be installed. This may mean that you have\n" -"requested an impossible situation or if you are using the unstable\n" -"distribution that some required packages have not yet been created\n" -"or been moved out of Incoming." -msgstr "" -"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n" -"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n" -"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" -"heb gael eu symud allan o Incoming." - -#: cmdline/apt-get.cc:2023 -msgid "Broken packages" -msgstr "Pecynnau wedi torri" - -#: cmdline/apt-get.cc:2049 -msgid "The following extra packages will be installed:" -msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:2139 -msgid "Suggested packages:" -msgstr "Pecynnau a awgrymmir:" - -#: cmdline/apt-get.cc:2140 -msgid "Recommended packages:" -msgstr "Pecynnau a argymhellir:" - -#: cmdline/apt-get.cc:2182 +#: cmdline/apt-get.cc:453 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70 +#, 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 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2213 -#, fuzzy -msgid "Calculating upgrade... " -msgstr "Yn Cyfrifo'r Uwchraddiad... " - -#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 -msgid "Failed" -msgstr "Methwyd" - -#: cmdline/apt-get.cc:2221 -msgid "Done" -msgstr "Wedi Gorffen" - -#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 +#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 +#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:2418 -#, c-format -msgid "Can't find a source to download version '%s' of '%s'" -msgstr "" - -#: cmdline/apt-get.cc:2423 -#, c-format -msgid "Downloading %s %s" -msgstr "" - -#: cmdline/apt-get.cc:2483 +#: cmdline/apt-get.cc:725 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:2523 cmdline/apt-get.cc:2835 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2540 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2545 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -928,86 +395,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2598 +#: cmdline/apt-get.cc:840 #, 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:2635 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 +#: 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:877 #, 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:2644 +#: cmdline/apt-get.cc:886 #, 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:2649 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2655 +#: cmdline/apt-get.cc:897 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2693 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2724 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 +msgid "Download complete and in download only mode" +msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" + +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:2736 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2737 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2759 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2779 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2798 +#: cmdline/apt-get.cc:1023 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:2823 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, 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:2870 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:3040 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -1016,7 +493,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3058 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1025,14 +502,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3081 +#: cmdline/apt-get.cc:1306 #, 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:3120 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1041,7 +518,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:3126 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1050,32 +527,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3149 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:3164 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:3169 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:3397 +#: cmdline/apt-get.cc:1585 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:3438 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1162,98 +639,53 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:3603 -msgid "" -"NOTE: This is only a simulation!\n" -" apt-get needs root privileges for real execution.\n" -" Keep also in mind that locking is deactivated,\n" -" so don't depend on the relevance to the real current situation!" -msgstr "" - -#: cmdline/acqprogress.cc:60 -msgid "Hit " -msgstr "Presennol " - -#: cmdline/acqprogress.cc:84 -msgid "Get:" -msgstr "Cyrchu:" - -#: cmdline/acqprogress.cc:115 -msgid "Ign " -msgstr "Anwybyddu " - -#: cmdline/acqprogress.cc:119 -msgid "Err " -msgstr "Gwall " - -#: cmdline/acqprogress.cc:140 -#, c-format -msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" - -#: cmdline/acqprogress.cc:230 -#, c-format -msgid " [Working]" -msgstr " [Gweithio]" - -#: cmdline/acqprogress.cc:286 -#, fuzzy, c-format -msgid "" -"Media change: please insert the disc labeled\n" -" '%s'\n" -"in the drive '%s' and press enter\n" -msgstr "" -"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" -" '%s'\n" -"yn y gyrriant '%s' a gwasgwch Enter\n" - -#: cmdline/apt-mark.cc:55 +#: cmdline/apt-mark.cc:57 #, 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:61 +#: cmdline/apt-mark.cc:63 #, 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:63 +#: cmdline/apt-mark.cc:65 #, 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:228 +#: cmdline/apt-mark.cc:230 #, fuzzy, c-format msgid "%s was already set on hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:230 +#: cmdline/apt-mark.cc:232 #, fuzzy, c-format msgid "%s was already not hold.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 -#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 -#: apt-pkg/deb/dpkgpm.cc:1032 +#: 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:1182 #, 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:260 cmdline/apt-mark.cc:309 +#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311 #, fuzzy, c-format msgid "%s set on hold.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314 +#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316 #, fuzzy, c-format msgid "Canceled hold on %s.\n" msgstr "Methwyd agor %s" -#: cmdline/apt-mark.cc:332 +#: cmdline/apt-mark.cc:334 msgid "Executing dpkg failed. Are you root?" msgstr "" -#: cmdline/apt-mark.cc:379 +#: cmdline/apt-mark.cc:381 msgid "" "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n" "\n" @@ -1263,6 +695,11 @@ msgid "" "Commands:\n" " auto - Mark the given packages as automatically installed\n" " manual - Mark the given packages as manually installed\n" +" hold - Mark a package as held back\n" +" unhold - Unset a package set as held back\n" +" showauto - Print the list of automatically installed packages\n" +" showmanual - Print the list of manually installed packages\n" +" showhold - Print the list of package on hold\n" "\n" "Options:\n" " -h This help text.\n" @@ -1275,6 +712,28 @@ msgid "" "See the apt-mark(8) and apt.conf(5) manual pages for more information." msgstr "" +#: cmdline/apt.cc:71 +msgid "" +"Usage: apt [options] command\n" +"\n" +"CLI for apt.\n" +"Basic commands: \n" +" list - list packages based on package names\n" +" search - search in package descriptions\n" +" show - show package details\n" +"\n" +" update - update list of available packages\n" +"\n" +" install - install packages\n" +" 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" +"\n" +" edit-sources - edit the source information file\n" +msgstr "" + #: methods/cdrom.cc:203 #, c-format msgid "Unable to read the cdrom database %s" @@ -1305,16 +764,16 @@ 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:82 methods/rsh.cc:274 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:512 methods/rred.cc:521 +#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599 +#: methods/rred.cc:609 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 +#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1323,34 +782,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 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:214 methods/ftp.cc:242 #, 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:220 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -1359,120 +818,124 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, 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:301 #, 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:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264 -#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 +#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243 -#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369 -#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 +#: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 +#: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:714 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +msgid "Failed" +msgstr "Methwyd" + +#: methods/ftp.cc:713 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, 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:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, 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:1009 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1538,37 +1001,37 @@ 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:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1578,87 +1041,623 @@ msgstr "" msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:394 +#: methods/http.cc:516 +msgid "Error writing to the file" +msgstr "Gwall wrth ysgrifennu at y ffeil" + +#: methods/http.cc:530 +#, 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:532 +msgid "Error reading from server" +msgstr "Gwall wrth ddarllen o'r gweinydd" + +#: methods/http.cc:568 +msgid "Error writing to file" +msgstr "Gwall wrth ysgrifennu at ffeil" + +#: methods/http.cc:628 +msgid "Select failed" +msgstr "Methwyd dewis" + +#: methods/http.cc:633 +msgid "Connection timed out" +msgstr "Goramserodd y cysylltiad" + +#: methods/http.cc:656 +msgid "Error writing to output file" +msgstr "Gwall wrth ysgrifennu i ffeil allbwn" + +#: methods/server.cc:56 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:544 +#: methods/server.cc:114 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:569 methods/http.cc:576 +#: methods/server.cc:139 methods/server.cc:146 #, fuzzy msgid "The HTTP server sent an invalid reply header" msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys" -#: methods/http.cc:606 +#: methods/server.cc:176 #, fuzzy msgid "The HTTP server sent an invalid Content-Length header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys" -#: methods/http.cc:621 +#: methods/server.cc:199 #, fuzzy msgid "The HTTP server sent an invalid Content-Range header" msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys" -#: methods/http.cc:623 +#: methods/server.cc:201 #, fuzzy msgid "This HTTP server has broken range support" msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" -#: methods/http.cc:647 +#: methods/server.cc:225 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:826 -msgid "Select failed" -msgstr "Methwyd dewis" +#: methods/server.cc:494 +#, fuzzy +msgid "Bad header data" +msgstr "Data pennawd gwael" -#: methods/http.cc:831 -msgid "Connection timed out" -msgstr "Goramserodd y cysylltiad" +#: methods/server.cc:511 methods/server.cc:567 +msgid "Connection failed" +msgstr "Methodd y cysylltiad" -#: methods/http.cc:854 -msgid "Error writing to output file" -msgstr "Gwall wrth ysgrifennu i ffeil allbwn" +#: methods/server.cc:659 +msgid "Internal error" +msgstr "Gwall mewnol" -#: methods/http.cc:885 -msgid "Error writing to file" -msgstr "Gwall wrth ysgrifennu at ffeil" +#: apt-private/private-list.cc:147 +msgid "Listing" +msgstr "" -#: methods/http.cc:913 -msgid "Error writing to the file" -msgstr "Gwall wrth ysgrifennu at y ffeil" +#: apt-private/private-install.cc:93 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "" -#: methods/http.cc:927 +#: apt-private/private-install.cc:102 #, fuzzy -msgid "Error reading from server. Remote end closed connection" -msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" +msgid "Packages need to be removed but remove is disabled." +msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." -#: methods/http.cc:929 -msgid "Error reading from server" -msgstr "Gwall wrth ddarllen o'r gweinydd" +#: apt-private/private-install.cc:121 +#, 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" +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 +#, 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 +#, 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 +#, 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 +#, 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 +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 +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 +msgid "Yes, do as I say!" +msgstr "Ie, gwna fel rydw i'n dweud!" + +#: apt-private/private-install.cc:233 +#, fuzzy, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"Rydych ar fin gwneud rhywbeth a all fod yn niweidiol\n" +"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" +" ?]" + +#: apt-private/private-install.cc:239 apt-private/private-install.cc:257 +msgid "Abort." +msgstr "Erthylu." + +#: apt-private/private-install.cc:254 +msgid "Do you want to continue?" +msgstr "Ydych chi eisiau mynd ymlaen?" + +#: apt-private/private-install.cc:324 +msgid "Some files failed to download" +msgstr "Methodd rhai ffeiliau lawrlwytho" + +#: apt-private/private-install.cc:331 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " +"geidio defnyddio --fix-missing?" + +#: apt-private/private-install.cc:335 +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 +msgid "Unable to correct missing packages." +msgstr "Ni ellir cywiro pecynnau ar goll." -#: methods/http.cc:1197 +#: apt-private/private-install.cc:341 #, fuzzy -msgid "Bad header data" -msgstr "Data pennawd gwael" +msgid "Aborting install." +msgstr "Yn Erthylu'r Sefydliad." -#: methods/http.cc:1214 methods/http.cc:1269 -msgid "Connection failed" -msgstr "Methodd y cysylltiad" +#: apt-private/private-install.cc:377 +msgid "" +"The following package disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgid_plural "" +"The following packages disappeared from your system as\n" +"all files have been overwritten by other packages:" +msgstr[0] "" +msgstr[1] "" -#: methods/http.cc:1361 -msgid "Internal error" -msgstr "Gwall mewnol" +#: apt-private/private-install.cc:381 +msgid "Note: This is done automatically and on purpose by dpkg." +msgstr "" + +#: apt-private/private-install.cc:402 +msgid "We are not supposed to delete stuff, can't start AutoRemover" +msgstr "" + +#: apt-private/private-install.cc:510 +msgid "" +"Hmm, seems like the AutoRemover destroyed something which really\n" +"shouldn't happen. Please file a bug report against apt." +msgstr "" + +#. +#. if (Packages == 1) +#. { +#. c1out << std::endl; +#. c1out << +#. _("Since you only requested a single operation it is extremely likely that\n" +#. "the package is simply not installable and a bug report against\n" +#. "that package should be filed.") << std::endl; +#. } +#. +#: apt-private/private-install.cc:513 apt-private/private-install.cc:654 +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 +#, fuzzy +msgid "Internal Error, AutoRemover broke stuff" +msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" + +#: apt-private/private-install.cc:524 +#, fuzzy +msgid "" +"The following package was automatically installed and is no longer required:" +msgid_plural "" +"The following packages were automatically installed and are no longer " +"required:" +msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: apt-private/private-install.cc:528 +#, fuzzy, c-format +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" +msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: apt-private/private-install.cc:530 +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 +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 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Dibyniaethau heb eu bodloni. Ceisiwch rhedeg 'apt-get -f install' efo dim " +"pecyn (neu penodwch ddatrys)" + +# FIXME: needs commas +#: apt-private/private-install.cc:639 +msgid "" +"Some packages could not be installed. This may mean that you have\n" +"requested an impossible situation or if you are using the unstable\n" +"distribution that some required packages have not yet been created\n" +"or been moved out of Incoming." +msgstr "" +"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n" +"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n" +"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" +"heb gael eu symud allan o Incoming." + +#: apt-private/private-install.cc:660 +msgid "Broken packages" +msgstr "Pecynnau wedi torri" + +#: apt-private/private-install.cc:713 +msgid "The following extra packages will be installed:" +msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" + +#: apt-private/private-install.cc:803 +msgid "Suggested packages:" +msgstr "Pecynnau a awgrymmir:" + +#: apt-private/private-install.cc:804 +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-download.cc:36 +msgid "Authentication warning overridden.\n" +msgstr "" + +#: 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-download.cc:46 +msgid "Install these packages without verification?" +msgstr "" + +#: apt-private/private-download.cc:87 apt-pkg/update.cc:84 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Methwyd cyrchu %s %s\n" + +#: apt-private/private-output.cc:75 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" +msgstr "" + +#: apt-private/private-output.cc:201 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:205 +#, fuzzy +msgid "[installed,local]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:208 +msgid "[installed,auto-removable]" +msgstr "" + +#: apt-private/private-output.cc:210 +#, fuzzy +msgid "[installed,automatic]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:212 +#, fuzzy +msgid "[installed]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:216 +#, c-format +msgid "[upgradable from: %s]" +msgstr "" + +#: apt-private/private-output.cc:220 +msgid "[residual-config]" +msgstr "" + +#: apt-private/private-output.cc:320 +msgid "The following packages have unmet dependencies:" +msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" + +#: apt-private/private-output.cc:410 +#, c-format +msgid "but %s is installed" +msgstr "ond mae %s wedi ei sefydlu" + +#: apt-private/private-output.cc:412 +#, c-format +msgid "but %s is to be installed" +msgstr "ond mae %s yn mynd i gael ei sefydlu" + +#: apt-private/private-output.cc:419 +msgid "but it is not installable" +msgstr "ond ni ellir ei sefydlu" + +#: apt-private/private-output.cc:421 +msgid "but it is a virtual package" +msgstr "ond mae'n becyn rhithwir" + +#: apt-private/private-output.cc:424 +msgid "but it is not installed" +msgstr "ond nid yw wedi ei sefydlu" + +#: apt-private/private-output.cc:424 +msgid "but it is not going to be installed" +msgstr "ond nid yw'n mynd i gael ei sefydlu" + +#: apt-private/private-output.cc:429 +msgid " or" +msgstr " neu" + +#: apt-private/private-output.cc:458 +msgid "The following NEW packages will be installed:" +msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" + +#: apt-private/private-output.cc:484 +msgid "The following packages will be REMOVED:" +msgstr "Caiff y pecynnau canlynol eu TYNNU:" + +#: apt-private/private-output.cc:506 +#, fuzzy +msgid "The following packages have been kept back:" +msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" + +#: apt-private/private-output.cc:527 +#, fuzzy +msgid "The following packages will be upgraded:" +msgstr "Caiff y pecynnau canlynol eu uwchraddio" + +#: apt-private/private-output.cc:548 +#, fuzzy +msgid "The following packages will be DOWNGRADED:" +msgstr "Caiff y pecynnau canlynol eu ISRADDIO" + +#: apt-private/private-output.cc:568 +msgid "The following held packages will be changed:" +msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" + +#: apt-private/private-output.cc:623 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (oherwydd %s) " + +#: apt-private/private-output.cc:631 +#, fuzzy +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n" +"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" +"ei wneud!" + +#: apt-private/private-output.cc:662 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " + +#: apt-private/private-output.cc:666 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu wedi ailsefydlu, " + +#: apt-private/private-output.cc:668 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu wedi eu israddio, " + +#: apt-private/private-output.cc:670 +#, 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:674 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" + +#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es] +#. e.g. "Do you want to continue? [Y/n] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc:696 +msgid "[Y/n]" +msgstr "" + +#. TRANSLATOR: Yes/No question help-text: defaulting to N[o] +#. e.g. "Should this file be removed? [y/N] " +#. The user has to answer with an input matching the +#. YESEXPR/NOEXPR defined in your l10n. +#: apt-private/private-output.cc:702 +msgid "[y/N]" +msgstr "" + +#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set +#: apt-private/private-output.cc:713 +msgid "Y" +msgstr "I" + +#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set +#: apt-private/private-output.cc:719 +msgid "N" +msgstr "" + +#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33 +#, 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 +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-show.cc:152 +#, c-format +msgid "There is %lu 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." +msgstr[0] "" +msgstr[1] "" + +#: apt-private/private-show.cc:159 +msgid "not a real package (virtual)" +msgstr "" + +#: apt-private/private-main.cc:19 +msgid "" +"NOTE: This is only a simulation!\n" +" apt-get needs root privileges for real execution.\n" +" Keep also in mind that locking is deactivated,\n" +" so don't depend on the relevance to the real current situation!" +msgstr "" + +#: apt-private/private-sources.cc:45 +#, fuzzy, c-format +msgid "Failed to parse %s. Edit again? " +msgstr "Methwyd ailenwi %s at %s" + +#: apt-private/private-sources.cc:57 +#, c-format +msgid "Your '%s' file changed, please run 'apt-get update'." +msgstr "" + +#: apt-private/acqprogress.cc:63 +msgid "Hit " +msgstr "Presennol " + +#: apt-private/acqprogress.cc:87 +msgid "Get:" +msgstr "Cyrchu:" + +#: apt-private/acqprogress.cc:118 +msgid "Ign " +msgstr "Anwybyddu " + +#: apt-private/acqprogress.cc:122 +msgid "Err " +msgstr "Gwall " + +#: apt-private/acqprogress.cc:143 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Cyrchwyd %sB yn %s (%sB/s)\n" + +#: apt-private/acqprogress.cc:233 +#, c-format +msgid " [Working]" +msgstr " [Gweithio]" + +#: apt-private/acqprogress.cc:294 +#, fuzzy, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n" +" '%s'\n" +"yn y gyrriant '%s' a gwasgwch Enter\n" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. #: methods/mirror.cc:95 apt-inst/extract.cc:464 -#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404 -#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108 -#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362 +#: 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 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@ -1695,56 +1694,42 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:491 -#, c-format -msgid "" -"Could not patch %s with mmap and with file operation usage - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rred.cc:496 -#, c-format -msgid "" -"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " -"to be corrupt." -msgstr "" - -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:169 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" -#: dselect/install:32 +#: dselect/install:33 msgid "Bad default setting!" msgstr "Rhagosodiad gwael!" -#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 -#: dselect/install:105 dselect/update:45 +#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95 +#: dselect/install:106 dselect/update:45 msgid "Press enter to continue." msgstr "Gwasgwch Enter er mwyn mynd ymlaen." -#: dselect/install:91 +#: dselect/install:92 msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" -#: dselect/install:101 +#: dselect/install:102 #, fuzzy msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" -#: dselect/install:102 +#: dselect/install:103 #, fuzzy msgid "will be configured. This may result in duplicate errors" msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" -#: dselect/install:103 +#: dselect/install:104 msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y" -#: dselect/install:104 +#: dselect/install:105 msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" @@ -1756,13 +1741,8 @@ msgstr "" msgid "Merging available information" msgstr "Yn cyfuno manylion Ar Gael" -#: cmdline/apt-extracttemplates.cc:102 -#, c-format -msgid "%s not a valid DEB package." -msgstr "Nid yw %s yn becyn DEB dilys." - # FIXME: "debian" -#: cmdline/apt-extracttemplates.cc:236 +#: cmdline/apt-extracttemplates.cc:224 #, fuzzy msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" @@ -1787,12 +1767,12 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 +#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: cmdline/apt-extracttemplates.cc:313 +#: cmdline/apt-extracttemplates.cc:298 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" @@ -1999,36 +1979,36 @@ msgstr "Methwyd darllen y cyswllt %s" msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:288 +#: ftparchive/writer.cc:289 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:298 +#: ftparchive/writer.cc:299 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:403 +#: ftparchive/writer.cc:404 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 +#: ftparchive/writer.cc:412 ftparchive/writer.cc:702 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 +#: ftparchive/writer.cc:480 ftparchive/writer.cc:846 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:711 +#: ftparchive/writer.cc:712 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:715 +#: ftparchive/writer.cc:716 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -2037,79 +2017,86 @@ msgstr " Does dim cofnod gwrthwneud gan %s\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, 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:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" + +#: ftparchive/override.cc:163 #, 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:175 #, 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:188 #, 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:71 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" msgstr "Dull Cywasgu Anhysbys '%s'" -#: ftparchive/multicompress.cc:100 +#: ftparchive/multicompress.cc:101 #, 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:190 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:192 +#: ftparchive/multicompress.cc:193 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:206 +#: ftparchive/multicompress.cc:207 #, fuzzy msgid "Compress child" msgstr "Plentyn Cywasgu" -#: ftparchive/multicompress.cc:229 +#: ftparchive/multicompress.cc:230 #, fuzzy, c-format msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:303 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:341 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:357 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" # FIXME: "debian" -#: cmdline/apt-internal-solver.cc:37 +#: cmdline/apt-internal-solver.cc:38 #, fuzzy msgid "" "Usage: apt-internal-solver\n" @@ -2163,24 +2150,24 @@ 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 +#: apt-inst/contrib/extracttar.cc:122 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:143 +#: apt-inst/contrib/extracttar.cc:149 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 +#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:195 +#: apt-inst/contrib/extracttar.cc:201 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:302 +#: apt-inst/contrib/extracttar.cc:306 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -2248,7 +2235,7 @@ msgstr "Ffeil cyfluniad dyblyg %s/%s" msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -2307,23 +2294,18 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" msgid "Unable to stat %s" msgstr "Ni ellir gwneud stat() o %s" -#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48 +#: apt-inst/deb/debfile.cc:57 #, 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" -#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain -#: apt-inst/deb/debfile.cc:55 -#, fuzzy, c-format -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" - -#: apt-inst/deb/debfile.cc:120 +#: apt-inst/deb/debfile.cc:124 #, fuzzy, c-format msgid "Internal error, could not locate member %s" msgstr "Gwall Mewnol, methwyd lleoli aelod %s" -#: apt-inst/deb/debfile.cc:214 +#: apt-inst/deb/debfile.cc:219 #, fuzzy msgid "Unparsable control file" msgstr "Ffeil rheoli ni ellir ei ramadegu" @@ -2370,101 +2352,101 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:378 +#: apt-pkg/contrib/strutl.cc:401 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:385 +#: apt-pkg/contrib/strutl.cc:408 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:392 +#: apt-pkg/contrib/strutl.cc:415 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:397 +#: apt-pkg/contrib/strutl.cc:420 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1173 +#: apt-pkg/contrib/strutl.cc:1229 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:491 +#: apt-pkg/contrib/configuration.cc:503 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:605 +#: apt-pkg/contrib/configuration.cc:617 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:773 +#: 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:792 +#: 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:809 +#: 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:849 +#: apt-pkg/contrib/configuration.cc:861 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:856 +#: apt-pkg/contrib/configuration.cc:868 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865 +#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:869 +#: 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/contrib/configuration.cc:872 +#: apt-pkg/contrib/configuration.cc:884 #, fuzzy, c-format msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:922 +#: 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" @@ -2490,49 +2472,49 @@ msgid "%c%s... %u%%" msgstr "%c%s... Wedi Gorffen" # FIXME -#: apt-pkg/contrib/cmndline.cc:80 +#: apt-pkg/contrib/cmndline.cc:116 #, c-format msgid "Command line option '%c' [from %s] is not known." msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)." -#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114 -#: apt-pkg/contrib/cmndline.cc:122 +#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150 +#: apt-pkg/contrib/cmndline.cc:158 #, c-format msgid "Command line option %s is not understood" msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/contrib/cmndline.cc:127 +#: 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/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189 +#: 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/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208 +#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>." -#: apt-pkg/contrib/cmndline.cc:237 +#: apt-pkg/contrib/cmndline.cc:273 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'" -#: apt-pkg/contrib/cmndline.cc:268 +#: apt-pkg/contrib/cmndline.cc:304 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" # FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:300 +#: 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/contrib/cmndline.cc:350 +#: apt-pkg/contrib/cmndline.cc:386 #, c-format msgid "Invalid operation %s" msgstr "Gweithred annilys %s" @@ -2546,123 +2528,123 @@ msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:93 +#: apt-pkg/contrib/fileutl.cc:95 #, fuzzy, c-format msgid "Problem closing the gzip file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:226 +#: 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" -#: apt-pkg/contrib/fileutl.cc:231 +#: apt-pkg/contrib/fileutl.cc:233 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:254 +#: 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" -#: apt-pkg/contrib/fileutl.cc:259 +#: apt-pkg/contrib/fileutl.cc:261 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 +#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:430 +#: apt-pkg/contrib/fileutl.cc:432 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:448 +#: apt-pkg/contrib/fileutl.cc:450 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:457 +#: apt-pkg/contrib/fileutl.cc:459 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:844 +#: 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:846 +#: apt-pkg/contrib/fileutl.cc:864 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 +#: 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)" -#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 +#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:988 +#: apt-pkg/contrib/fileutl.cc:1016 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1065 +#: apt-pkg/contrib/fileutl.cc:1093 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1150 +#: apt-pkg/contrib/fileutl.cc:1178 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1205 +#: apt-pkg/contrib/fileutl.cc:1233 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1298 +#: 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" # FIXME -#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 +#: 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/contrib/fileutl.cc:1695 +#: apt-pkg/contrib/fileutl.cc:1723 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1707 +#: apt-pkg/contrib/fileutl.cc:1735 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1718 +#: apt-pkg/contrib/fileutl.cc:1746 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1731 +#: apt-pkg/contrib/fileutl.cc:1759 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" #. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/contrib/gpgv.cc:76 +#: apt-pkg/contrib/gpgv.cc:70 #, fuzzy, c-format msgid "No keyring installed in %s." msgstr "Yn Erthylu'r Sefydliad." @@ -2781,105 +2763,115 @@ msgid "Failed to write temporary StateFile %s" msgstr "Methwyd ysgrifennu ffeil %s" # FIXME: number? -#: apt-pkg/tagfile.cc:129 +#: apt-pkg/tagfile.cc:138 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:216 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:96 +#: apt-pkg/sourcelist.cc:118 +#, 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 #, 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:99 +#: apt-pkg/sourcelist.cc:164 #, 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:110 +#: apt-pkg/sourcelist.cc:175 #, 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:116 +#: apt-pkg/sourcelist.cc:181 #, 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:119 +#: apt-pkg/sourcelist.cc:184 #, 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:132 +#: apt-pkg/sourcelist.cc:197 #, 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:134 +#: apt-pkg/sourcelist.cc:199 #, 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:137 +#: apt-pkg/sourcelist.cc:202 #, 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:143 +#: apt-pkg/sourcelist.cc:208 #, 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:150 +#: apt-pkg/sourcelist.cc:215 #, 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:248 +#: apt-pkg/sourcelist.cc:326 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495 +#: 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:289 +#: apt-pkg/sourcelist.cc:362 #, 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:293 +#: apt-pkg/sourcelist.cc:366 #, 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/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 +#: apt-pkg/sourcelist.cc:407 +#, 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 #, c-format msgid "" "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" -#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 +#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:571 +#: apt-pkg/packagemanager.cc:570 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2903,7 +2895,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1238 +#: apt-pkg/algorithms.cc:1068 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2911,21 +2903,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1240 +#: apt-pkg/algorithms.cc:1070 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/algorithms.cc:1592 apt-pkg/algorithms.cc:1594 -#, 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/acquire.cc:81 apt-pkg/cdrom.cc:838 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." @@ -2952,17 +2935,22 @@ msgstr "" msgid "Retrieving file %li of %li" msgstr "Yn Darllen Rhestr Ffeiliau" -#: apt-pkg/acquire-worker.cc:112 +#: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." msgstr "Methwyd canfod y gyrrydd dull %s." -#: apt-pkg/acquire-worker.cc:161 +#: apt-pkg/acquire-worker.cc:115 +#, c-format +msgid "Is the package %s installed?" +msgstr "" + +#: apt-pkg/acquire-worker.cc:166 #, c-format msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:447 +#: apt-pkg/acquire-worker.cc:452 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2970,12 +2958,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: apt-pkg/init.cc:151 +#: apt-pkg/init.cc:143 #, c-format msgid "Packaging system '%s' is not supported" msgstr "Ni chynhelir y system pecynnu '%s'" -#: apt-pkg/init.cc:167 +#: apt-pkg/init.cc:159 #, fuzzy msgid "Unable to determine a suitable packaging system type" msgstr "Ni ellir canfod math system addas" @@ -3010,18 +2998,18 @@ msgid "" msgstr "" # FIXME: literal -#: apt-pkg/policy.cc:399 +#: apt-pkg/policy.cc:414 #, 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:421 +#: apt-pkg/policy.cc:436 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:429 +#: apt-pkg/policy.cc:444 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" @@ -3092,17 +3080,21 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:599 -msgid "MD5Sum mismatch" -msgstr "Camgyfatebiaeth swm MD5" - -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 -#: apt-pkg/acquire-item.cc:2030 +#: apt-pkg/acquire-item.cc:154 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1388 +#: apt-pkg/acquire-item.cc:159 +msgid "Size mismatch" +msgstr "Camgyfatebiaeth maint" + +#: apt-pkg/acquire-item.cc:164 +#, fuzzy +msgid "Invalid file format" +msgstr "Gweithred annilys %s" + +#: apt-pkg/acquire-item.cc:1570 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3110,28 +3102,28 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1404 +#: apt-pkg/acquire-item.cc:1586 #, 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:1446 +#: apt-pkg/acquire-item.cc:1628 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1484 +#: apt-pkg/acquire-item.cc:1666 #, c-format msgid "" "Release file for %s is expired (invalid since %s). Updates for this " "repository will not be applied." msgstr "" -#: apt-pkg/acquire-item.cc:1506 +#: apt-pkg/acquire-item.cc:1688 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1536 +#: apt-pkg/acquire-item.cc:1718 #, c-format msgid "" "An error occurred during the signature verification. The repository is not " @@ -3139,13 +3131,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 +#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1663 +#: apt-pkg/acquire-item.cc:1856 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3154,33 +3146,25 @@ msgstr "" "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)" -#: apt-pkg/acquire-item.cc:1722 +#: apt-pkg/acquire-item.cc:1922 #, 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." +msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi " -"drwsio'r pecyn hyn a law." -#: apt-pkg/acquire-item.cc:1781 +#: apt-pkg/acquire-item.cc:1980 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s." -#: apt-pkg/acquire-item.cc:1879 -msgid "Size mismatch" -msgstr "Camgyfatebiaeth maint" - # FIXME: number? -#: apt-pkg/indexrecords.cc:68 +#: apt-pkg/indexrecords.cc:73 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/indexrecords.cc:78 +#: apt-pkg/indexrecords.cc:81 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" @@ -3206,89 +3190,82 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:576 -#, c-format -msgid "" -"Using CD-ROM mount point %s\n" -"Mounting CD-ROM\n" -msgstr "" - -#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 -msgid "Identifying.. " -msgstr "" - -#: apt-pkg/cdrom.cc:613 -#, c-format -msgid "Stored label: %s\n" -msgstr "" - -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 -#, fuzzy -msgid "Unmounting CD-ROM...\n" -msgstr "CD Anghywir" - -#: apt-pkg/cdrom.cc:642 +#: apt-pkg/cdrom.cc:575 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:660 +#: apt-pkg/cdrom.cc:583 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:665 +#: apt-pkg/cdrom.cc:588 #, fuzzy msgid "Waiting for disc...\n" msgstr "Yn aros am benawdau" -#: apt-pkg/cdrom.cc:674 +#: apt-pkg/cdrom.cc:597 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:693 +#: apt-pkg/cdrom.cc:605 +msgid "Identifying.. " +msgstr "" + +#: apt-pkg/cdrom.cc:643 +#, c-format +msgid "Stored label: %s\n" +msgstr "" + +#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888 +#, fuzzy +msgid "Unmounting CD-ROM...\n" +msgstr "CD Anghywir" + +#: apt-pkg/cdrom.cc:667 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:744 +#: apt-pkg/cdrom.cc:717 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:728 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:782 +#: apt-pkg/cdrom.cc:755 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:811 +#: apt-pkg/cdrom.cc:784 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:828 +#: apt-pkg/cdrom.cc:801 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:830 +#: apt-pkg/cdrom.cc:803 #, fuzzy msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:838 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:873 +#: apt-pkg/cdrom.cc:846 msgid "Source list entries for this disc are:\n" msgstr "" @@ -3322,49 +3299,54 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/cacheset.cc:403 +#: apt-pkg/cacheset.cc:479 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:406 +#: apt-pkg/cacheset.cc:482 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:517 +#: apt-pkg/cacheset.cc:593 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:523 +#: apt-pkg/cacheset.cc:599 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:534 +#: apt-pkg/cacheset.cc:605 +#, fuzzy, c-format +msgid "Couldn't find any package by glob '%s'" +msgstr "Methwyd canfod pecyn %s" + +#: apt-pkg/cacheset.cc:616 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548 +#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:555 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:563 +#: apt-pkg/cacheset.cc:645 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:571 +#: apt-pkg/cacheset.cc:653 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3389,127 +3371,160 @@ msgstr "" msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/install-progress.cc:51 +#, c-format +msgid "Progress: [%3i%%]" +msgstr "" + +#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168 +msgid "Running dpkg" +msgstr "" + +#: 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-pkg/deb/dpkgpm.cc:91 #, fuzzy, c-format msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:76 +#: apt-pkg/deb/dpkgpm.cc:94 #, fuzzy, c-format msgid "Completely removing %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:77 +#: apt-pkg/deb/dpkgpm.cc:95 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:78 +#: apt-pkg/deb/dpkgpm.cc:96 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:735 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:975 +#: apt-pkg/deb/dpkgpm.cc:970 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:976 +#: apt-pkg/deb/dpkgpm.cc:971 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:981 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:983 +#: apt-pkg/deb/dpkgpm.cc:978 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:988 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:990 +#: apt-pkg/deb/dpkgpm.cc:985 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:995 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:996 +#: apt-pkg/deb/dpkgpm.cc:991 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1243 -msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" +#: apt-pkg/deb/dpkgpm.cc:1046 +msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1273 -msgid "Running dpkg" +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 +#, fuzzy, c-format +msgid "Can not write log (%s)" +msgstr "Ni ellir ysgrifennu i %s" + +#: apt-pkg/deb/dpkgpm.cc:1049 +msgid "Is /dev/pts mounted?" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1070 +msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1445 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1507 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1512 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1514 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1520 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1526 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1533 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 +msgid "" +"No apport report written because the error message indicates an issue on the " +"local system" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3538,6 +3553,96 @@ msgstr "" 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" +#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" + +#, fuzzy +#~ msgid "Note, selecting '%s' for regex '%s'\n" +#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n" + +#~ msgid "Package %s is a virtual package provided by:\n" +#~ msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n" + +#, fuzzy +#~ msgid " [Not candidate version]" +#~ msgstr "Fersiynau Posib" + +#~ msgid "You should explicitly select one to install." +#~ msgstr "Dylech ddewis un yn benodol i'w sefydlu." + +# FIXME: punctuation +#, fuzzy +#~ msgid "" +#~ "Package %s is not available, but is referred to by another package.\n" +#~ "This may mean that the package is missing, has been obsoleted, or\n" +#~ "is only available from another source\n" +#~ msgstr "" +#~ "Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n" +#~ "Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond " +#~ "heb\n" +#~ "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" +#~ "ffeil sources.list.\n" + +#~ msgid "However the following packages replace it:" +#~ msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" + +#, fuzzy +#~ 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" + +#~ msgid "MD5Sum mismatch" +#~ msgstr "Camgyfatebiaeth swm MD5" + +#~ msgid "" +#~ "I wasn't able to locate a file for the %s package. This might mean you " +#~ "need to manually fix this package." +#~ msgstr "" +#~ "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i " +#~ "chi drwsio'r pecyn hyn a law." + #, fuzzy #~ msgid "Skipping nonexistent file %s" #~ msgstr "Yn agor y ffeil cyfluniad %s" |