diff options
| author | Michael Vogt <mvo@debian.org> | 2013-08-15 09:26:00 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-08-15 09:26:00 +0200 |
| commit | d7a4635391d9ff36152603ab6faa6eafa206750a (patch) | |
| tree | e16a562e3e9a195cae286433c5751a1ab9990635 /po/cy.po | |
| parent | 2a49601f69e08f06fb2727d869d420daacdd09d5 (diff) | |
| parent | 183116d1a64a2610b88fa6b50f2c5199b69d5841 (diff) | |
Merge branch 'debian/sid' into debian/experimental
Conflicts:
apt-pkg/contrib/strutl.cc
apt-pkg/deb/dpkgpm.cc
configure.ac
debian/changelog
doc/po/apt-doc.pot
po/apt-all.pot
po/ar.po
po/ast.po
po/bg.po
po/bs.po
po/ca.po
po/cs.po
po/cy.po
po/da.po
po/de.po
po/dz.po
po/el.po
po/es.po
po/eu.po
po/fi.po
po/fr.po
po/gl.po
po/hu.po
po/it.po
po/ja.po
po/km.po
po/ko.po
po/ku.po
po/lt.po
po/mr.po
po/nb.po
po/ne.po
po/nl.po
po/nn.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/sv.po
po/th.po
po/tl.po
po/uk.po
po/vi.po
po/zh_CN.po
po/zh_TW.po
test/integration/framework
test/integration/test-bug-602412-dequote-redirect
test/integration/test-ubuntu-bug-346386-apt-get-update-paywall
test/interactive-helper/aptwebserver.cc
test/interactive-helper/makefile
Diffstat (limited to 'po/cy.po')
| -rw-r--r-- | po/cy.po | 867 |
1 files changed, 447 insertions, 420 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-03-01 12:27+0100\n" +"POT-Creation-Date: 2013-07-31 16:24+0200\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" @@ -104,82 +104,82 @@ msgstr "Cyfanswm gofod Slac: " msgid "Total space accounted for: " msgstr "Cyfanswm Gofod Cyfrifwyd: " -#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1147 +#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165 #, 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:1382 -#: cmdline/apt-cache.cc:1384 cmdline/apt-cache.cc:1461 cmdline/apt-mark.cc:46 +#: 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 msgid "No packages found" msgstr "Canfuwyd dim pecyn" -#: cmdline/apt-cache.cc:1226 +#: cmdline/apt-cache.cc:1265 #, fuzzy msgid "You must give at least one search pattern" msgstr "Rhaid i chi ddarparu un patrwm yn union" -#: cmdline/apt-cache.cc:1361 +#: cmdline/apt-cache.cc:1431 msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1456 apt-pkg/cacheset.cc:510 +#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" -#: cmdline/apt-cache.cc:1486 +#: cmdline/apt-cache.cc:1556 #, fuzzy msgid "Package files:" msgstr "Ffeiliau Pecynnau:" -#: cmdline/apt-cache.cc:1493 cmdline/apt-cache.cc:1584 +#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654 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:1507 +#: cmdline/apt-cache.cc:1577 #, fuzzy msgid "Pinned packages:" msgstr "Pecynnau wedi eu Pinio:" -#: cmdline/apt-cache.cc:1519 cmdline/apt-cache.cc:1564 +#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634 msgid "(not found)" msgstr "(heb ganfod)" -#: cmdline/apt-cache.cc:1527 +#: cmdline/apt-cache.cc:1597 msgid " Installed: " msgstr " Wedi Sefydlu: " -#: cmdline/apt-cache.cc:1528 +#: cmdline/apt-cache.cc:1598 msgid " Candidate: " msgstr " Ymgeisydd: " -#: cmdline/apt-cache.cc:1546 cmdline/apt-cache.cc:1554 +#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624 msgid "(none)" msgstr "(dim)" -#: cmdline/apt-cache.cc:1561 +#: cmdline/apt-cache.cc:1631 #, fuzzy msgid " Package pin: " msgstr " Pin Pecyn: " #. Show the priority tables -#: cmdline/apt-cache.cc:1570 +#: cmdline/apt-cache.cc:1640 #, fuzzy msgid " Version table:" msgstr " Tabl Fersiynnau:" -#: cmdline/apt-cache.cc:1683 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 -#: cmdline/apt-get.cc:3360 cmdline/apt-mark.cc:375 +#: 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 #, 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:1690 +#: cmdline/apt-cache.cc:1760 #, fuzzy msgid "" "Usage: apt-cache [options] command\n" @@ -252,11 +252,19 @@ msgstr "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" -#: cmdline/apt-cdrom.cc:79 +#. }}} +#: cmdline/apt-cdrom.cc:43 +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 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -#: cmdline/apt-cdrom.cc:94 +#: cmdline/apt-cdrom.cc:100 #, fuzzy msgid "Please insert a Disc in the drive and press enter" msgstr "" @@ -264,12 +272,12 @@ msgstr "" " '%s'\n" "yn y gyrriant '%s' a gwasgwch Enter\n" -#: cmdline/apt-cdrom.cc:129 +#: cmdline/apt-cdrom.cc:135 #, fuzzy, c-format msgid "Failed to mount '%s' to '%s'" msgstr "Methwyd ailenwi %s at %s" -#: cmdline/apt-cdrom.cc:163 +#: cmdline/apt-cdrom.cc:170 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -306,86 +314,104 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad\n" " -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n" -#: cmdline/apt-get.cc:135 +#. 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" -#: cmdline/apt-get.cc:140 +#. 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:162 apt-pkg/cachefilter.cc:33 +#: 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:260 +#: 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:350 +#: cmdline/apt-get.cc:379 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:352 +#: 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:359 +#: cmdline/apt-get.cc:388 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:390 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:364 +#: cmdline/apt-get.cc:393 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:364 +#: 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:369 +#: cmdline/apt-get.cc:398 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:398 +#: 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:424 +#: cmdline/apt-get.cc:453 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:446 +#: 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:467 +#: cmdline/apt-get.cc:496 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: cmdline/apt-get.cc:488 +#: cmdline/apt-get.cc:517 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: cmdline/apt-get.cc:508 +#: 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:563 +#: cmdline/apt-get.cc:592 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:571 +#: cmdline/apt-get.cc:600 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -395,61 +421,61 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: cmdline/apt-get.cc:602 +#: 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:606 +#: cmdline/apt-get.cc:635 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:608 +#: cmdline/apt-get.cc:637 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:610 +#: 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:614 +#: 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:635 +#: 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:640 +#: 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:657 +#: 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:668 +#: cmdline/apt-get.cc:697 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:677 +#: cmdline/apt-get.cc:706 #, fuzzy msgid " [Not candidate version]" msgstr "Fersiynau Posib" -#: cmdline/apt-get.cc:679 +#: 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:682 +#: cmdline/apt-get.cc:711 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -461,189 +487,189 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:700 +#: 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:712 +#: 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:725 +#: 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:737 cmdline/apt-get.cc:940 +#: 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:743 cmdline/apt-get.cc:946 +#: 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:788 +#: cmdline/apt-get.cc:817 #, 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:818 +#: 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:822 +#: 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:834 +#: 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:839 +#: 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:858 cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:68 +#: 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:884 +#: 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:889 +#: 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:1025 +#: cmdline/apt-get.cc:1054 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1057 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:1031 +#: cmdline/apt-get.cc:1060 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:1034 +#: cmdline/apt-get.cc:1063 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:1036 +#: cmdline/apt-get.cc:1065 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:1040 +#: 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:1043 +#: cmdline/apt-get.cc:1072 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:1068 +#: 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:1072 +#: cmdline/apt-get.cc:1101 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1079 -msgid "Install these packages without verification [y/N]? " +#: cmdline/apt-get.cc:1108 +msgid "Install these packages without verification?" msgstr "" -#: cmdline/apt-get.cc:1081 +#: 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:1090 cmdline/apt-get.cc:1251 +#: 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:1131 +#: cmdline/apt-get.cc:1160 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1140 +#: 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:1151 +#: cmdline/apt-get.cc:1180 #, fuzzy msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:1189 +#: 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:1196 +#: 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:1201 +#: 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:1208 +#: 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:1213 +#: 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" -#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2588 -#: cmdline/apt-get.cc:2591 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621 +#: cmdline/apt-get.cc:2624 #, 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:1241 +#: 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:1257 cmdline/apt-get.cc:1279 +#: 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:1261 +#: cmdline/apt-get.cc:1290 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:1263 +#: cmdline/apt-get.cc:1292 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -654,29 +680,28 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:1288 +#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:1284 -#, fuzzy -msgid "Do you want to continue [Y/n]? " -msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " +#: cmdline/apt-get.cc:1313 +msgid "Do you want to continue?" +msgstr "Ydych chi eisiau mynd ymlaen?" -#: cmdline/apt-get.cc:1356 cmdline/apt-get.cc:2653 apt-pkg/algorithms.cc:1555 +#: 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:1374 +#: cmdline/apt-get.cc:1403 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1375 cmdline/apt-get.cc:2665 +#: 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:1381 +#: cmdline/apt-get.cc:1410 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -684,20 +709,20 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1385 +#: 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:1390 +#: cmdline/apt-get.cc:1419 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1420 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1419 +#: cmdline/apt-get.cc:1448 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -707,35 +732,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1423 +#: cmdline/apt-get.cc:1452 msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1561 +#: cmdline/apt-get.cc:1590 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1593 +#: cmdline/apt-get.cc:1622 #, 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:1631 +#: cmdline/apt-get.cc:1660 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1647 +#: 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:1713 +#: cmdline/apt-get.cc:1742 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1817 +#: 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." @@ -751,16 +776,16 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1989 +#: 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:1824 +#: cmdline/apt-get.cc:1853 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1831 +#: cmdline/apt-get.cc:1860 #, fuzzy msgid "" "The following package was automatically installed and is no longer required:" @@ -770,7 +795,7 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1835 +#: cmdline/apt-get.cc:1864 #, fuzzy, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -778,23 +803,23 @@ msgid_plural "" msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1837 +#: 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:1856 +#: cmdline/apt-get.cc:1885 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1955 +#: 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:1959 +#: cmdline/apt-get.cc:1988 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -803,7 +828,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1974 +#: 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" @@ -815,87 +840,87 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1995 +#: cmdline/apt-get.cc:2023 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:2021 +#: 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:2111 +#: cmdline/apt-get.cc:2139 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:2112 +#: cmdline/apt-get.cc:2140 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:2154 +#: cmdline/apt-get.cc:2182 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:2161 cmdline/apt-mark.cc:70 +#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70 #, fuzzy, c-format msgid "%s set to automatically installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:2169 cmdline/apt-mark.cc:114 +#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114 msgid "" "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' " "instead." msgstr "" -#: cmdline/apt-get.cc:2185 +#: cmdline/apt-get.cc:2213 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:2188 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:2193 +#: cmdline/apt-get.cc:2221 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2260 cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2296 cmdline/apt-get.cc:2332 +#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:2388 +#: cmdline/apt-get.cc:2418 #, c-format msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2393 +#: cmdline/apt-get.cc:2423 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2453 +#: cmdline/apt-get.cc:2483 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:2493 cmdline/apt-get.cc:2802 +#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2510 +#: cmdline/apt-get.cc:2540 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2545 #, c-format msgid "" "Please use:\n" @@ -903,86 +928,86 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2565 +#: cmdline/apt-get.cc:2598 #, 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:2602 +#: cmdline/apt-get.cc:2635 #, 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:2611 +#: cmdline/apt-get.cc:2644 #, 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:2616 +#: cmdline/apt-get.cc:2649 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2622 +#: cmdline/apt-get.cc:2655 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2660 +#: cmdline/apt-get.cc:2693 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2691 +#: cmdline/apt-get.cc:2724 #, 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:2703 +#: cmdline/apt-get.cc:2736 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2704 +#: cmdline/apt-get.cc:2737 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2726 +#: cmdline/apt-get.cc:2759 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2746 +#: cmdline/apt-get.cc:2779 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2765 +#: cmdline/apt-get.cc:2798 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:2790 +#: cmdline/apt-get.cc:2823 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2814 cmdline/apt-get.cc:2817 +#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850 #, 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:2837 +#: cmdline/apt-get.cc:2870 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:3007 +#: cmdline/apt-get.cc:3040 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -991,7 +1016,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3025 +#: cmdline/apt-get.cc:3058 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1000,14 +1025,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3048 +#: cmdline/apt-get.cc:3081 #, 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:3087 +#: cmdline/apt-get.cc:3120 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -1016,7 +1041,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:3093 +#: cmdline/apt-get.cc:3126 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -1025,32 +1050,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:3116 +#: cmdline/apt-get.cc:3149 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:3132 +#: cmdline/apt-get.cc:3164 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:3137 +#: cmdline/apt-get.cc:3169 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:3230 cmdline/apt-get.cc:3242 +#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:3365 +#: cmdline/apt-get.cc:3397 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:3406 +#: cmdline/apt-get.cc:3438 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1137,7 +1162,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:3571 +#: cmdline/apt-get.cc:3603 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1208,7 +1233,8 @@ 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:830 apt-pkg/deb/dpkgpm.cc:1002 +#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223 +#: apt-pkg/deb/dpkgpm.cc:1032 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -1279,7 +1305,7 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 msgid "File not found" msgstr "Ffeil heb ei ganfod" @@ -1343,7 +1369,7 @@ msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 +#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 msgid "Connection timeout" msgstr "Goramser cysylltu" @@ -1351,8 +1377,8 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1276 -#: apt-pkg/contrib/fileutl.cc:1285 apt-pkg/contrib/fileutl.cc:1288 +#: 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 msgid "Read error" msgstr "Gwall darllen" @@ -1364,172 +1390,185 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 -#: apt-pkg/contrib/fileutl.cc:1374 apt-pkg/contrib/fileutl.cc:1383 -#: apt-pkg/contrib/fileutl.cc:1386 apt-pkg/contrib/fileutl.cc:1412 +#: 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 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 +#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:707 +#: methods/ftp.cc:708 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:713 +#: methods/ftp.cc:714 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:730 +#: methods/ftp.cc:731 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:744 +#: methods/ftp.cc:745 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:748 +#: methods/ftp.cc:749 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:755 +#: methods/ftp.cc:756 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:787 +#: methods/ftp.cc:788 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:797 +#: methods/ftp.cc:798 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:806 +#: methods/ftp.cc:807 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:826 +#: methods/ftp.cc:827 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:833 +#: methods/ftp.cc:834 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:872 methods/http.cc:1039 methods/rsh.cc:311 +#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:885 +#: methods/ftp.cc:886 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:900 methods/rsh.cc:330 +#: methods/ftp.cc:901 methods/rsh.cc:332 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:930 +#: methods/ftp.cc:931 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1007 +#: methods/ftp.cc:1008 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1119 +#: methods/ftp.cc:1120 msgid "Unable to invoke " msgstr "Methwyd gweithredu " -#: methods/connect.cc:75 +#: methods/connect.cc:76 #, c-format msgid "Connecting to %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: methods/connect.cc:86 +#: methods/connect.cc:87 #, c-format msgid "[IP: %s %s]" msgstr "[IP: %s %s]" -#: methods/connect.cc:93 +#: methods/connect.cc:94 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)" -#: methods/connect.cc:99 +#: methods/connect.cc:100 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)." -#: methods/connect.cc:107 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad" -#: methods/connect.cc:125 +#: methods/connect.cc:126 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:433 +#: methods/connect.cc:154 methods/rsh.cc:435 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:172 methods/connect.cc:191 +#: methods/connect.cc:180 methods/connect.cc:199 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:197 +#: methods/connect.cc:205 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:200 +#: methods/connect.cc:209 +#, fuzzy, c-format +msgid "System error resolving '%s:%s'" +msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" + +#: methods/connect.cc:211 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" -#: methods/connect.cc:247 +#: methods/connect.cc:258 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:180 +#: methods/gpgv.cc:167 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:185 +#: methods/gpgv.cc:171 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:189 +#: methods/gpgv.cc:173 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:194 +#. TRANSLATORS: %s is a single techy word like 'NODATA' +#: methods/gpgv.cc:179 +#, c-format +msgid "" +"Clearsigned file isn't valid, got '%s' (does the network require " +"authentication?)" +msgstr "" + +#: methods/gpgv.cc:183 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:228 methods/gpgv.cc:235 +#: methods/gpgv.cc:216 methods/gpgv.cc:223 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:242 +#: methods/gpgv.cc:230 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1571,61 +1610,61 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:822 +#: methods/http.cc:826 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:827 +#: methods/http.cc:831 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:850 +#: methods/http.cc:854 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:881 +#: methods/http.cc:885 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:909 +#: methods/http.cc:913 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:923 +#: methods/http.cc:927 #, 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:925 +#: methods/http.cc:929 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1198 +#: methods/http.cc:1197 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1215 methods/http.cc:1270 +#: methods/http.cc:1214 methods/http.cc:1269 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1362 +#: methods/http.cc:1361 msgid "Internal error" msgstr "Gwall mewnol" #. 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:465 -#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:402 -#: apt-pkg/contrib/fileutl.cc:515 apt-pkg/sourcelist.cc:208 +#: 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 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:179 -#: apt-pkg/contrib/cdromutl.cc:213 apt-pkg/acquire.cc:491 +#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180 +#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491 #: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 #: apt-pkg/clean.cc:123 #, c-format @@ -1646,7 +1685,12 @@ msgstr "" msgid "Can not read mirror file '%s'" msgstr "Methwyd agor ffeil %s" -#: methods/mirror.cc:442 +#: methods/mirror.cc:315 +#, fuzzy, c-format +msgid "No entry found in mirror file '%s'" +msgstr "Methwyd agor ffeil %s" + +#: methods/mirror.cc:445 #, c-format msgid "[Mirror: %s]" msgstr "" @@ -1669,7 +1713,7 @@ msgstr "" msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:338 +#: methods/rsh.cc:340 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -1743,7 +1787,7 @@ 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:1339 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -1889,8 +1933,8 @@ msgstr "" msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192 +#: apt-inst/extract.cc:209 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" @@ -1903,88 +1947,88 @@ msgstr "Does dim cofnod rheoli gan yr archif" msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" -#: ftparchive/writer.cc:80 +#: ftparchive/writer.cc:82 #, c-format msgid "W: Unable to read directory %s\n" msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n" -#: ftparchive/writer.cc:85 +#: ftparchive/writer.cc:87 #, c-format msgid "W: Unable to stat %s\n" msgstr "Rh: Ni ellir gwneud stat() o %s\n" -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:143 msgid "E: " msgstr "G: " -#: ftparchive/writer.cc:143 +#: ftparchive/writer.cc:145 msgid "W: " msgstr "Rh: " -#: ftparchive/writer.cc:150 +#: ftparchive/writer.cc:152 msgid "E: Errors apply to file " msgstr "G: Mae gwallau yn cymhwyso i'r ffeil " -#: ftparchive/writer.cc:168 ftparchive/writer.cc:200 +#: ftparchive/writer.cc:170 ftparchive/writer.cc:202 #, c-format msgid "Failed to resolve %s" msgstr "Methwyd datrys %s" -#: ftparchive/writer.cc:181 +#: ftparchive/writer.cc:183 msgid "Tree walking failed" msgstr "Methwyd cerdded y goeden" -#: ftparchive/writer.cc:208 +#: ftparchive/writer.cc:210 #, c-format msgid "Failed to open %s" msgstr "Methwyd agor %s" # FIXME -#: ftparchive/writer.cc:267 +#: ftparchive/writer.cc:269 #, c-format msgid " DeLink %s [%s]\n" msgstr " DatGysylltu %s [%s]\n" -#: ftparchive/writer.cc:275 +#: ftparchive/writer.cc:277 #, c-format msgid "Failed to readlink %s" msgstr "Methwyd darllen y cyswllt %s" -#: ftparchive/writer.cc:279 +#: ftparchive/writer.cc:281 #, c-format msgid "Failed to unlink %s" msgstr "Methwyd datgysylltu %s" -#: ftparchive/writer.cc:286 +#: ftparchive/writer.cc:288 #, c-format msgid "*** Failed to link %s to %s" msgstr "*** Methwyd cysylltu %s at %s" -#: ftparchive/writer.cc:296 +#: ftparchive/writer.cc:298 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:401 +#: ftparchive/writer.cc:403 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:409 ftparchive/writer.cc:714 +#: ftparchive/writer.cc:411 ftparchive/writer.cc:701 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:477 ftparchive/writer.cc:858 +#: ftparchive/writer.cc:479 ftparchive/writer.cc:845 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:724 +#: ftparchive/writer.cc:711 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:728 +#: ftparchive/writer.cc:715 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -2059,7 +2103,7 @@ msgstr "Methwyd darllen wrth gyfrifo MD5" msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" @@ -2119,24 +2163,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:117 +#: apt-inst/contrib/extracttar.cc:116 msgid "Failed to create pipes" msgstr "Methwyd creu pibau" -#: apt-inst/contrib/extracttar.cc:144 +#: apt-inst/contrib/extracttar.cc:143 msgid "Failed to exec gzip " msgstr "Methwyd gweithredu gzip" -#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:210 msgid "Corrupted archive" msgstr "Archif llygredig" -#: apt-inst/contrib/extracttar.cc:196 +#: apt-inst/contrib/extracttar.cc:195 #, fuzzy msgid "Tar checksum failed, archive corrupted" msgstr "Methodd swm gwirio Tar, archif llygredig" -#: apt-inst/contrib/extracttar.cc:303 +#: apt-inst/contrib/extracttar.cc:302 #, c-format msgid "Unknown TAR header type %u, member %s" msgstr "Math pennawd TAR anhysbys %u, aelod %s" @@ -2158,11 +2202,11 @@ msgstr "Pennawd aelod archif annilys" msgid "Invalid archive member header" msgstr "Pennawd aelod archif annilys" -#: apt-inst/contrib/arfile.cc:132 +#: apt-inst/contrib/arfile.cc:135 msgid "Archive is too short" msgstr "Mae'r archif yn rhy fyr" -#: apt-inst/contrib/arfile.cc:136 +#: apt-inst/contrib/arfile.cc:139 msgid "Failed to read the archive headers" msgstr "Methwyd darllen pennawdau'r archif" @@ -2209,56 +2253,56 @@ msgstr "Methwyd ysgrifennu ffeil %s" msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" -#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#: apt-inst/extract.cc:94 apt-inst/extract.cc:165 #, c-format msgid "The path %s is too long" msgstr "Mae'r llwybr %s yn rhy hir" -#: apt-inst/extract.cc:127 +#: apt-inst/extract.cc:125 #, c-format msgid "Unpacking %s more than once" msgstr "Yn dadbacio %s mwy nag unwaith" -#: apt-inst/extract.cc:137 +#: apt-inst/extract.cc:135 #, c-format msgid "The directory %s is diverted" msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio" -#: apt-inst/extract.cc:147 +#: apt-inst/extract.cc:145 #, c-format msgid "The package is trying to write to the diversion target %s/%s" msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s" -#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +#: apt-inst/extract.cc:155 apt-inst/extract.cc:299 msgid "The diversion path is too long" msgstr "Mae llwybr y dargyfeiriad yn rhy hir" -#: apt-inst/extract.cc:243 +#: apt-inst/extract.cc:242 #, c-format msgid "The directory %s is being replaced by a non-directory" msgstr "" "Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw" -#: apt-inst/extract.cc:283 +#: apt-inst/extract.cc:282 msgid "Failed to locate node in its hash bucket" msgstr "Methwyd lleoli nôd yn ei fwced stwnsh" -#: apt-inst/extract.cc:287 +#: apt-inst/extract.cc:286 msgid "The path is too long" msgstr "Mae'r llwybr yn rhy hir" # FIXME: wtf? -#: apt-inst/extract.cc:415 +#: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s" -#: apt-inst/extract.cc:432 +#: apt-inst/extract.cc:431 #, c-format msgid "File %s/%s overwrites the one in the package %s" msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" -#: apt-inst/extract.cc:492 +#: apt-inst/extract.cc:491 #, c-format msgid "Unable to stat %s" msgstr "Ni ellir gwneud stat() o %s" @@ -2339,88 +2383,88 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:372 +#: apt-pkg/contrib/strutl.cc:378 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:379 +#: apt-pkg/contrib/strutl.cc:385 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:386 +#: apt-pkg/contrib/strutl.cc:392 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:391 +#: apt-pkg/contrib/strutl.cc:397 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1167 +#: apt-pkg/contrib/strutl.cc:1173 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:503 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:617 +#: apt-pkg/contrib/configuration.cc:605 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:785 +#: apt-pkg/contrib/configuration.cc:773 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:804 +#: apt-pkg/contrib/configuration.cc:792 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:821 +#: apt-pkg/contrib/configuration.cc:809 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:861 +#: apt-pkg/contrib/configuration.cc:849 #, 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:868 +#: apt-pkg/contrib/configuration.cc:856 #, 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:872 apt-pkg/contrib/configuration.cc:877 +#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:881 +#: apt-pkg/contrib/configuration.cc:869 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:884 +#: apt-pkg/contrib/configuration.cc:872 #, 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:934 +#: apt-pkg/contrib/configuration.cc:922 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" @@ -2441,9 +2485,9 @@ msgstr "" #. Print the spinner #: apt-pkg/contrib/progress.cc:195 -#, c-format -msgid "\r%s... %u%%" -msgstr "" +#, fuzzy, c-format +msgid "%c%s... %u%%" +msgstr "%c%s... Wedi Gorffen" # FIXME #: apt-pkg/contrib/cmndline.cc:80 @@ -2498,125 +2542,131 @@ msgstr "Gweithred annilys %s" msgid "Unable to stat the mount point %s" msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s" -#: apt-pkg/contrib/cdromutl.cc:224 +#: apt-pkg/contrib/cdromutl.cc:225 msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:95 +#: apt-pkg/contrib/fileutl.cc:93 #, fuzzy, c-format msgid "Problem closing the gzip file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:227 +#: apt-pkg/contrib/fileutl.cc:226 #, 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:232 +#: apt-pkg/contrib/fileutl.cc:231 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:250 +#: apt-pkg/contrib/fileutl.cc:254 #, 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:254 +#: apt-pkg/contrib/fileutl.cc:259 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:394 apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:428 +#: apt-pkg/contrib/fileutl.cc:430 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:446 +#: apt-pkg/contrib/fileutl.cc:448 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:455 +#: apt-pkg/contrib/fileutl.cc:457 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:842 +#: apt-pkg/contrib/fileutl.cc:844 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:844 +#: apt-pkg/contrib/fileutl.cc:846 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:848 +#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243 #, 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:850 +#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:1006 apt-pkg/indexcopy.cc:659 +#: apt-pkg/contrib/fileutl.cc:988 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:1068 +#: apt-pkg/contrib/fileutl.cc:1065 #, fuzzy, c-format msgid "Could not open file descriptor %d" msgstr "Methwyd agor pibell ar gyfer %s" -#: apt-pkg/contrib/fileutl.cc:1158 +#: apt-pkg/contrib/fileutl.cc:1150 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: apt-pkg/contrib/fileutl.cc:1214 +#: apt-pkg/contrib/fileutl.cc:1205 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " # FIXME -#: apt-pkg/contrib/fileutl.cc:1311 +#: apt-pkg/contrib/fileutl.cc:1298 #, 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:1400 apt-pkg/contrib/fileutl.cc:1422 +#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407 #, 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:1738 +#: apt-pkg/contrib/fileutl.cc:1695 #, fuzzy, c-format msgid "Problem closing the file %s" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1750 +#: apt-pkg/contrib/fileutl.cc:1707 #, fuzzy, c-format msgid "Problem renaming the file %s to %s" msgstr "Gwall wrth gyfamseru'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1761 +#: apt-pkg/contrib/fileutl.cc:1718 #, fuzzy, c-format msgid "Problem unlinking the file %s" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:1776 +#: apt-pkg/contrib/fileutl.cc:1731 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 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Yn Erthylu'r Sefydliad." + #: apt-pkg/pkgcache.cc:148 msgid "Empty package cache" msgstr "Storfa pecyn gwag" @@ -2644,59 +2694,59 @@ msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'" msgid "The package cache was built for a different architecture" msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Depends" msgstr "Dibynnu" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "PreDepends" msgstr "CynDdibynnu" -#: apt-pkg/pkgcache.cc:305 +#: apt-pkg/pkgcache.cc:314 msgid "Suggests" msgstr "Awgrymu" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Recommends" msgstr "Argymell" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Conflicts" msgstr "Gwrthdaro" -#: apt-pkg/pkgcache.cc:306 +#: apt-pkg/pkgcache.cc:315 msgid "Replaces" msgstr "Amnewid" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Obsoletes" msgstr "Darfodi" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Breaks" msgstr "" -#: apt-pkg/pkgcache.cc:307 +#: apt-pkg/pkgcache.cc:316 msgid "Enhances" msgstr "" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "important" msgstr "pwysig" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "required" msgstr "angenrheidiol" -#: apt-pkg/pkgcache.cc:318 +#: apt-pkg/pkgcache.cc:327 msgid "standard" msgstr "safonnol" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "optional" msgstr "opsiynnol" -#: apt-pkg/pkgcache.cc:319 +#: apt-pkg/pkgcache.cc:328 msgid "extra" msgstr "ychwanegol" @@ -2806,30 +2856,30 @@ msgstr "Yn agor %s" msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:285 +#: apt-pkg/sourcelist.cc:289 #, 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:289 +#: apt-pkg/sourcelist.cc:293 #, 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:898 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923 #, 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:473 apt-pkg/packagemanager.cc:504 +#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529 #, fuzzy, c-format msgid "Could not configure '%s'. " msgstr "Methwyd agor ffeil %s" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:546 +#: apt-pkg/packagemanager.cc:571 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2853,7 +2903,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1229 +#: apt-pkg/algorithms.cc:1238 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2861,12 +2911,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1231 +#: apt-pkg/algorithms.cc:1240 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:1581 apt-pkg/algorithms.cc:1583 +#: 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 " @@ -2875,7 +2925,7 @@ msgstr "" "Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen " "rai eu defnyddio yn lle." -#: apt-pkg/acquire.cc:81 +#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838 #, fuzzy, c-format msgid "List directory %spartial is missing." msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." @@ -2912,7 +2962,7 @@ msgstr "Methwyd canfod y gyrrydd dull %s." msgid "Method %s did not start correctly" msgstr "Ni gychwynodd y dull %s yn gywir" -#: apt-pkg/acquire-worker.cc:440 +#: apt-pkg/acquire-worker.cc:447 #, fuzzy, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" @@ -2982,14 +3032,14 @@ msgstr "Mae can y storfa system fersiwn anghyfaddas" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info #: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228 -#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:325 -#: apt-pkg/pkgcachegen.cc:333 apt-pkg/pkgcachegen.cc:375 -#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:396 -#: apt-pkg/pkgcachegen.cc:406 apt-pkg/pkgcachegen.cc:410 -#: apt-pkg/pkgcachegen.cc:414 apt-pkg/pkgcachegen.cc:435 -#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:517 -#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:556 -#: apt-pkg/pkgcachegen.cc:570 +#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321 +#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376 +#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409 +#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434 +#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511 +#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549 +#: apt-pkg/pkgcachegen.cc:563 #, fuzzy, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)" @@ -3013,27 +3063,27 @@ msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:577 +#: apt-pkg/pkgcachegen.cc:570 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:1150 +#: apt-pkg/pkgcachegen.cc:1199 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:1238 apt-pkg/pkgcachegen.cc:1342 -#: apt-pkg/pkgcachegen.cc:1348 apt-pkg/pkgcachegen.cc:1505 +#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391 +#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/pkgcachegen.cc:1255 +#: apt-pkg/pkgcachegen.cc:1304 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1447 apt-pkg/pkgcachegen.cc:1454 +#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" @@ -3046,13 +3096,13 @@ msgstr "methwyd ailenwi, %s (%s -> %s)." msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870 -#: apt-pkg/acquire-item.cc:2013 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887 +#: apt-pkg/acquire-item.cc:2030 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1381 +#: apt-pkg/acquire-item.cc:1388 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " @@ -3060,42 +3110,42 @@ msgid "" msgstr "" # FIXME: number? -#: apt-pkg/acquire-item.cc:1397 +#: apt-pkg/acquire-item.cc:1404 #, 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:1439 +#: apt-pkg/acquire-item.cc:1446 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1477 +#: apt-pkg/acquire-item.cc:1484 #, 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:1499 +#: apt-pkg/acquire-item.cc:1506 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1532 +#: apt-pkg/acquire-item.cc:1536 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 +#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1646 +#: apt-pkg/acquire-item.cc:1663 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3104,7 +3154,7 @@ 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:1705 +#: apt-pkg/acquire-item.cc:1722 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -3113,40 +3163,40 @@ 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:1764 +#: apt-pkg/acquire-item.cc:1781 #, 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:1862 +#: apt-pkg/acquire-item.cc:1879 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" # FIXME: number? -#: apt-pkg/indexrecords.cc:64 +#: apt-pkg/indexrecords.cc:68 #, fuzzy, c-format msgid "Unable to parse Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/indexrecords.cc:74 +#: apt-pkg/indexrecords.cc:78 #, fuzzy, c-format msgid "No sections in Release file %s" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: apt-pkg/indexrecords.cc:108 +#: apt-pkg/indexrecords.cc:112 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:121 +#: apt-pkg/indexrecords.cc:125 #, fuzzy, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" # FIXME: number? -#: apt-pkg/indexrecords.cc:140 +#: apt-pkg/indexrecords.cc:144 #, fuzzy, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" @@ -3172,7 +3222,7 @@ msgstr "" msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915 #, fuzzy msgid "Unmounting CD-ROM...\n" msgstr "CD Anghywir" @@ -3233,31 +3283,31 @@ msgstr "" msgid "Copying package lists..." msgstr "Yn Darllen Rhestrau Pecynnau" -#: apt-pkg/cdrom.cc:857 +#: apt-pkg/cdrom.cc:865 #, fuzzy msgid "Writing new source list\n" msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/cdrom.cc:865 +#: apt-pkg/cdrom.cc:873 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -3272,17 +3322,6 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/indexcopy.cc:662 -#, c-format -msgid "File %s doesn't start with a clearsigned message" -msgstr "" - -#. TRANSLATOR: %s is the trusted keyring parts directory -#: apt-pkg/indexcopy.cc:692 -#, fuzzy, c-format -msgid "No keyring installed in %s." -msgstr "Yn Erthylu'r Sefydliad." - #: apt-pkg/cacheset.cc:403 #, c-format msgid "Release '%s' for '%s' was not found" @@ -3346,7 +3385,7 @@ msgstr "" msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:557 apt-pkg/edsp.cc:560 apt-pkg/edsp.cc:565 +#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564 msgid "Execute external solver" msgstr "" @@ -3355,12 +3394,12 @@ msgstr "" msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:952 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:959 +#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" @@ -3381,100 +3420,96 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:705 +#: apt-pkg/deb/dpkgpm.cc:735 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:720 apt-pkg/deb/dpkgpm.cc:740 +#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:945 +#: apt-pkg/deb/dpkgpm.cc:975 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:946 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:951 +#: apt-pkg/deb/dpkgpm.cc:981 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:953 +#: apt-pkg/deb/dpkgpm.cc:983 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:958 +#: apt-pkg/deb/dpkgpm.cc:988 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:960 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:965 +#: apt-pkg/deb/dpkgpm.cc:995 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:966 +#: apt-pkg/deb/dpkgpm.cc:996 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1213 +#: apt-pkg/deb/dpkgpm.cc:1243 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1235 -msgid "Can not write log, tcgetattr() failed for stdout" -msgstr "" - -#: apt-pkg/deb/dpkgpm.cc:1248 +#: apt-pkg/deb/dpkgpm.cc:1273 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1420 +#: apt-pkg/deb/dpkgpm.cc:1445 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1482 +#: apt-pkg/deb/dpkgpm.cc:1507 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1487 +#: apt-pkg/deb/dpkgpm.cc:1512 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1489 +#: apt-pkg/deb/dpkgpm.cc:1514 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1495 +#: apt-pkg/deb/dpkgpm.cc:1520 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1501 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1508 +#: apt-pkg/deb/dpkgpm.cc:1533 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3504,14 +3539,6 @@ msgid "Not locked" msgstr "" #, fuzzy -#~ msgid "System error resolving '%s:%s'" -#~ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" - -#, fuzzy -#~ msgid "%c%s... %u%%" -#~ msgstr "%c%s... Wedi Gorffen" - -#, fuzzy #~ msgid "Skipping nonexistent file %s" #~ msgstr "Yn agor y ffeil cyfluniad %s" |