diff options
Diffstat (limited to 'po/cy.po')
| -rw-r--r-- | po/cy.po | 959 |
1 files changed, 471 insertions, 488 deletions
@@ -6,10 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2012-09-04 15:34+0200\n" +"POT-Creation-Date: 2012-10-15 00:04+0100\n" "PO-Revision-Date: 2012-09-07 13:18+0000\n" "Last-Translator: Dafydd Harries <Unknown>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" +"Language: cy\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,7 +18,6 @@ msgstr "" "2 : 3;\n" "X-Launchpad-Export-Date: 2012-10-12 10:33+0000\n" "X-Generator: Launchpad (build 16130)\n" -"Language: cy\n" #: cmdline/apt-cache.cc:158 #, c-format @@ -98,8 +98,8 @@ 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:1378 -#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39 -#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162 +#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:46 +#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219 msgid "No packages found" msgstr "Canfuwyd dim pecyn" @@ -111,7 +111,7 @@ msgstr "" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:445 +#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:510 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" @@ -154,10 +154,10 @@ msgstr "" msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75 -#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590 -#: cmdline/apt-get.cc:3247 cmdline/apt-internal-solver.cc:32 -#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147 +#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:198 cmdline/apt-config.cc:81 +#: cmdline/apt-get.cc:3364 cmdline/apt-mark.cc:375 +#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:590 +#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -212,7 +212,7 @@ msgstr "" msgid "Failed to mount '%s' to '%s'" msgstr "" -#: cmdline/apt-cdrom.cc:164 +#: cmdline/apt-cdrom.cc:163 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -220,7 +220,7 @@ msgstr "" msgid "Arguments not in pairs" msgstr "Nid yw ymresymiadau mewn parau" -#: cmdline/apt-config.cc:81 +#: cmdline/apt-config.cc:87 msgid "" "Usage: apt-config [options] command\n" "\n" @@ -244,133 +244,133 @@ msgstr "I" msgid "N" msgstr "" -#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31 +#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" -#: cmdline/apt-get.cc:257 +#: cmdline/apt-get.cc:260 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: cmdline/apt-get.cc:347 +#: cmdline/apt-get.cc:350 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: cmdline/apt-get.cc:349 +#: cmdline/apt-get.cc:352 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:356 +#: cmdline/apt-get.cc:359 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: cmdline/apt-get.cc:358 +#: cmdline/apt-get.cc:361 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:364 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: cmdline/apt-get.cc:361 +#: cmdline/apt-get.cc:364 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:366 +#: cmdline/apt-get.cc:369 msgid " or" msgstr " neu" -#: cmdline/apt-get.cc:395 +#: cmdline/apt-get.cc:398 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:421 +#: cmdline/apt-get.cc:424 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: cmdline/apt-get.cc:443 +#: cmdline/apt-get.cc:446 msgid "The following packages have been kept back:" msgstr "" -#: cmdline/apt-get.cc:464 +#: cmdline/apt-get.cc:467 msgid "The following packages will be upgraded:" msgstr "" -#: cmdline/apt-get.cc:485 +#: cmdline/apt-get.cc:488 msgid "The following packages will be DOWNGRADED:" msgstr "" -#: cmdline/apt-get.cc:505 +#: cmdline/apt-get.cc:508 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: cmdline/apt-get.cc:560 +#: cmdline/apt-get.cc:563 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: cmdline/apt-get.cc:568 +#: cmdline/apt-get.cc:571 msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -#: cmdline/apt-get.cc:599 +#: cmdline/apt-get.cc:602 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: cmdline/apt-get.cc:603 +#: cmdline/apt-get.cc:606 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: cmdline/apt-get.cc:605 +#: cmdline/apt-get.cc:608 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: cmdline/apt-get.cc:607 +#: cmdline/apt-get.cc:610 #, 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:611 +#: cmdline/apt-get.cc:614 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" -#: cmdline/apt-get.cc:633 +#: cmdline/apt-get.cc:635 #, c-format msgid "Note, selecting '%s' for task '%s'\n" msgstr "" -#: cmdline/apt-get.cc:639 +#: cmdline/apt-get.cc:640 #, c-format msgid "Note, selecting '%s' for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:656 +#: cmdline/apt-get.cc:657 #, 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:667 +#: cmdline/apt-get.cc:668 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:676 +#: cmdline/apt-get.cc:677 msgid " [Not candidate version]" msgstr "" -#: cmdline/apt-get.cc:678 +#: cmdline/apt-get.cc:679 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." -#: cmdline/apt-get.cc:681 +#: cmdline/apt-get.cc:682 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -378,16 +378,16 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:699 +#: cmdline/apt-get.cc:700 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:711 +#: cmdline/apt-get.cc:712 #, c-format msgid "Package '%s' has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 #, c-format msgid "Virtual packages like '%s' can't be removed\n" msgstr "" @@ -403,159 +403,158 @@ msgstr "" msgid "Package '%s' is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:753 +#: cmdline/apt-get.cc:788 #, c-format msgid "Note, selecting '%s' instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:783 +#: cmdline/apt-get.cc:818 #, 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" +msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n" -#: cmdline/apt-get.cc:787 +#: cmdline/apt-get.cc:822 #, c-format msgid "Skipping %s, it is not installed and only upgrades are requested.\n" msgstr "" -#: cmdline/apt-get.cc:799 +#: cmdline/apt-get.cc:834 #, 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:804 +#: cmdline/apt-get.cc:839 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:2103 cmdline/apt-mark.cc:61 +#: cmdline/apt-get.cc:858 cmdline/apt-get.cc:2157 cmdline/apt-mark.cc:68 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:849 +#: cmdline/apt-get.cc:884 #, c-format msgid "Selected version '%s' (%s) for '%s'\n" msgstr "" -#: cmdline/apt-get.cc:854 +#: cmdline/apt-get.cc:889 #, c-format msgid "Selected version '%s' (%s) for '%s' because of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:974 +#: cmdline/apt-get.cc:1025 msgid "Correcting dependencies..." msgstr "Yn cywiro dibyniaethau..." -#: cmdline/apt-get.cc:977 +#: cmdline/apt-get.cc:1028 msgid " failed." msgstr " wedi methu." -#: cmdline/apt-get.cc:980 +#: cmdline/apt-get.cc:1031 msgid "Unable to correct dependencies" msgstr "Ni ellir cywiro dibyniaethau" -#: cmdline/apt-get.cc:983 +#: cmdline/apt-get.cc:1034 msgid "Unable to minimize the upgrade set" msgstr "Ni ellir bychanu y set uwchraddio" -#: cmdline/apt-get.cc:985 +#: cmdline/apt-get.cc:1036 msgid " Done" msgstr " Wedi Gorffen" -#: cmdline/apt-get.cc:989 +#: cmdline/apt-get.cc:1040 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:992 +#: cmdline/apt-get.cc:1043 msgid "Unmet dependencies. Try using -f." msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f." -#: cmdline/apt-get.cc:1017 +#: cmdline/apt-get.cc:1068 msgid "WARNING: The following packages cannot be authenticated!" msgstr "" -#: cmdline/apt-get.cc:1021 +#: cmdline/apt-get.cc:1072 msgid "Authentication warning overridden.\n" msgstr "" -#: cmdline/apt-get.cc:1028 +#: cmdline/apt-get.cc:1079 msgid "Install these packages without verification [y/N]? " msgstr "" -#: cmdline/apt-get.cc:1030 +#: cmdline/apt-get.cc:1081 msgid "Some packages could not be authenticated" msgstr "" -#: cmdline/apt-get.cc:1039 cmdline/apt-get.cc:1200 +#: cmdline/apt-get.cc:1090 cmdline/apt-get.cc:1251 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" -#: cmdline/apt-get.cc:1080 +#: cmdline/apt-get.cc:1131 msgid "Internal error, InstallPackages was called with broken packages!" msgstr "" -#: cmdline/apt-get.cc:1089 +#: cmdline/apt-get.cc:1140 msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:1100 +#: cmdline/apt-get.cc:1151 msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:1138 +#: cmdline/apt-get.cc:1189 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:1145 +#: cmdline/apt-get.cc:1196 #, 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:1150 +#: cmdline/apt-get.cc:1201 #, 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:1157 +#: cmdline/apt-get.cc:1208 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" msgstr "" #. 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:1162 +#: cmdline/apt-get.cc:1213 #, c-format msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:1177 cmdline/apt-get.cc:1180 cmdline/apt-get.cc:2523 -#: cmdline/apt-get.cc:2526 +#: cmdline/apt-get.cc:1228 cmdline/apt-get.cc:1231 cmdline/apt-get.cc:2589 +#: cmdline/apt-get.cc:2592 #, c-format msgid "Couldn't determine free space in %s" msgstr "" -#: cmdline/apt-get.cc:1190 +#: cmdline/apt-get.cc:1241 #, 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:1206 cmdline/apt-get.cc:1226 +#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1277 msgid "Trivial Only specified but this is not a trivial operation." msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml." -#: cmdline/apt-get.cc:1208 +#: cmdline/apt-get.cc:1259 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:1210 +#: cmdline/apt-get.cc:1261 #, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -563,28 +562,28 @@ msgid "" " ?] " msgstr "" -#: cmdline/apt-get.cc:1216 cmdline/apt-get.cc:1235 +#: cmdline/apt-get.cc:1267 cmdline/apt-get.cc:1286 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:1231 +#: cmdline/apt-get.cc:1282 msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:1303 cmdline/apt-get.cc:2588 apt-pkg/algorithms.cc:1492 +#: cmdline/apt-get.cc:1354 cmdline/apt-get.cc:2654 apt-pkg/algorithms.cc:1543 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1321 +#: cmdline/apt-get.cc:1372 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1322 cmdline/apt-get.cc:2600 +#: cmdline/apt-get.cc:1373 cmdline/apt-get.cc:2666 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1328 +#: cmdline/apt-get.cc:1379 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -592,19 +591,19 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1332 +#: cmdline/apt-get.cc:1383 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:1337 +#: cmdline/apt-get.cc:1388 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1338 +#: cmdline/apt-get.cc:1389 msgid "Aborting install." msgstr "" -#: cmdline/apt-get.cc:1366 +#: cmdline/apt-get.cc:1417 msgid "" "The following package disappeared from your system as\n" "all files have been overwritten by other packages:" @@ -618,37 +617,37 @@ msgstr[1] "" msgid "Note: This is done automatically and on purpose by dpkg." msgstr "" -#: cmdline/apt-get.cc:1508 +#: cmdline/apt-get.cc:1559 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1540 +#: cmdline/apt-get.cc:1591 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1578 +#: cmdline/apt-get.cc:1629 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1594 +#: cmdline/apt-get.cc:1645 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1657 +#: cmdline/apt-get.cc:1711 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1761 +#: cmdline/apt-get.cc:1815 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; @@ -657,16 +656,16 @@ msgstr "" #. "the package is simply not installable and a bug report against\n" #. "that package should be filed.") << endl; #. } -#. -#: cmdline/apt-get.cc:1764 cmdline/apt-get.cc:1933 +#. +#: cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1987 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1768 +#: cmdline/apt-get.cc:1822 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1775 +#: cmdline/apt-get.cc:1829 msgid "" "The following package was automatically installed and is no longer required:" msgid_plural "" @@ -675,7 +674,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1779 +#: cmdline/apt-get.cc:1833 #, c-format msgid "%lu package was automatically installed and is no longer required.\n" msgid_plural "" @@ -689,16 +688,16 @@ msgid_plural "Use 'apt-get autoremove' to remove them." msgstr[0] "" msgstr[1] "" -#: cmdline/apt-get.cc:1800 +#: cmdline/apt-get.cc:1854 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1899 +#: cmdline/apt-get.cc:1953 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:1903 +#: cmdline/apt-get.cc:1957 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -707,7 +706,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1918 +#: cmdline/apt-get.cc:1972 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" @@ -719,55 +718,55 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1939 +#: cmdline/apt-get.cc:1993 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:2019 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:2055 +#: cmdline/apt-get.cc:2109 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2110 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:2098 +#: cmdline/apt-get.cc:2152 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:2105 cmdline/apt-mark.cc:63 +#: cmdline/apt-get.cc:2159 cmdline/apt-mark.cc:70 #, c-format msgid "%s set to automatically installed.\n" msgstr "" -#: cmdline/apt-get.cc:2113 cmdline/apt-mark.cc:107 +#: cmdline/apt-get.cc:2167 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:2129 +#: cmdline/apt-get.cc:2183 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:2132 methods/ftp.cc:711 methods/connect.cc:115 +#: cmdline/apt-get.cc:2186 methods/ftp.cc:711 methods/connect.cc:115 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:2137 +#: cmdline/apt-get.cc:2191 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2204 cmdline/apt-get.cc:2212 +#: cmdline/apt-get.cc:2258 cmdline/apt-get.cc:2266 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2240 cmdline/apt-get.cc:2276 +#: cmdline/apt-get.cc:2294 cmdline/apt-get.cc:2330 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" @@ -776,28 +775,28 @@ msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" msgid "Can't find a source to download version '%s' of '%s'" msgstr "" -#: cmdline/apt-get.cc:2327 +#: cmdline/apt-get.cc:2391 #, c-format msgid "Downloading %s %s" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2451 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:2425 cmdline/apt-get.cc:2737 +#: cmdline/apt-get.cc:2491 cmdline/apt-get.cc:2803 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2442 +#: cmdline/apt-get.cc:2508 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:2447 +#: cmdline/apt-get.cc:2513 #, c-format msgid "" "Please use:\n" @@ -805,93 +804,93 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:2500 +#: cmdline/apt-get.cc:2566 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2537 +#: cmdline/apt-get.cc:2603 #, 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:2546 +#: cmdline/apt-get.cc:2612 #, 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:2551 +#: cmdline/apt-get.cc:2617 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2557 +#: cmdline/apt-get.cc:2623 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2595 +#: cmdline/apt-get.cc:2661 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2626 +#: cmdline/apt-get.cc:2692 #, 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:2638 +#: cmdline/apt-get.cc:2704 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2639 +#: cmdline/apt-get.cc:2705 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2661 +#: cmdline/apt-get.cc:2727 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2681 +#: cmdline/apt-get.cc:2747 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2700 +#: cmdline/apt-get.cc:2766 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:2725 +#: cmdline/apt-get.cc:2791 #, c-format msgid "" -"No architecture information available for %s. See apt.conf(5) " -"APT::Architectures for setup" +"No architecture information available for %s. See apt.conf(5) APT::" +"Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:2742 +#: cmdline/apt-get.cc:2815 cmdline/apt-get.cc:2818 #, 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:2762 +#: cmdline/apt-get.cc:2838 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2892 +#: cmdline/apt-get.cc:3008 #, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " "packages" msgstr "" -#: cmdline/apt-get.cc:2913 +#: cmdline/apt-get.cc:3026 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -900,52 +899,51 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:2936 +#: cmdline/apt-get.cc:3049 #, c-format -msgid "" -"Failed to satisfy %s dependency for %s: Installed package %s is too new" +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:2975 +#: cmdline/apt-get.cc:3088 #, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " "package %s can't satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2981 +#: cmdline/apt-get.cc:3094 #, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " "version" msgstr "" -#: cmdline/apt-get.cc:3004 +#: cmdline/apt-get.cc:3117 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:3020 +#: cmdline/apt-get.cc:3133 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:3025 +#: cmdline/apt-get.cc:3138 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:3118 cmdline/apt-get.cc:3130 +#: cmdline/apt-get.cc:3231 cmdline/apt-get.cc:3243 #, c-format msgid "Changelog for %s (%s)" msgstr "" -#: cmdline/apt-get.cc:3252 +#: cmdline/apt-get.cc:3369 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:3293 +#: cmdline/apt-get.cc:3410 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -991,7 +989,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:3458 +#: cmdline/apt-get.cc:3575 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -999,33 +997,33 @@ msgid "" " so don't depend on the relevance to the real current situation!" msgstr "" -#: cmdline/acqprogress.cc:59 +#: cmdline/acqprogress.cc:60 msgid "Hit " msgstr "Presennol " -#: cmdline/acqprogress.cc:83 +#: cmdline/acqprogress.cc:84 msgid "Get:" msgstr "Cyrchu:" -#: cmdline/acqprogress.cc:114 +#: cmdline/acqprogress.cc:115 msgid "Ign " msgstr "Anwybyddu " -#: cmdline/acqprogress.cc:118 +#: cmdline/acqprogress.cc:119 msgid "Err " msgstr "Gwall " -#: cmdline/acqprogress.cc:139 +#: 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:229 +#: cmdline/acqprogress.cc:230 #, c-format msgid " [Working]" msgstr " [Gweithio]" -#: cmdline/acqprogress.cc:285 +#: cmdline/acqprogress.cc:286 #, c-format msgid "" "Media change: please insert the disc labeled\n" @@ -1033,47 +1031,48 @@ msgid "" "in the drive '%s' and press enter\n" msgstr "" -#: cmdline/apt-mark.cc:48 +#: cmdline/apt-mark.cc:55 #, c-format msgid "%s can not be marked as it is not installed.\n" msgstr "" -#: cmdline/apt-mark.cc:54 +#: cmdline/apt-mark.cc:61 #, c-format msgid "%s was already set to manually installed.\n" msgstr "" -#: cmdline/apt-mark.cc:56 +#: cmdline/apt-mark.cc:63 #, c-format msgid "%s was already set to automatically installed.\n" msgstr "" -#: cmdline/apt-mark.cc:171 +#: cmdline/apt-mark.cc:228 #, c-format msgid "%s was already set on hold.\n" msgstr "" -#: cmdline/apt-mark.cc:173 +#: cmdline/apt-mark.cc:230 #, c-format msgid "%s was already not hold.\n" msgstr "" -#: apt-pkg/contrib/fileutl.cc:691 +#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326 +#: apt-pkg/contrib/fileutl.cc:828 apt-pkg/deb/dpkgpm.cc:1001 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209 +#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309 #, c-format msgid "%s set on hold.\n" msgstr "" -#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214 +#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314 #, c-format msgid "Canceled hold on %s.\n" msgstr "" -#: cmdline/apt-mark.cc:222 +#: cmdline/apt-mark.cc:332 msgid "Executing dpkg failed. Are you root?" msgstr "" @@ -1124,18 +1123,16 @@ msgstr "" msgid "Disk not found." msgstr "" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:273 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46 -#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:530 -#: methods/rred.cc:539 +#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 +#: methods/rred.cc:512 methods/rred.cc:521 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100 -#: methods/rred.cc:536 +#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1144,77 +1141,80 @@ 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:172 +#: methods/ftp.cc:173 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:178 +#: methods/ftp.cc:179 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:183 +#: methods/ftp.cc:184 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:214 methods/ftp.cc:242 +#: methods/ftp.cc:215 methods/ftp.cc:243 #, c-format msgid "The server refused the connection and said: %s" msgstr "" -#: methods/ftp.cc:220 +#: methods/ftp.cc:221 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:227 +#: methods/ftp.cc:228 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:247 +#: methods/ftp.cc:248 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." msgstr "" -"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae " -"Acquire::ftp::ProxyLogin yn wag.)" +"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::" +"ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:275 +#: methods/ftp.cc:276 #, 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:301 +#: methods/ftp.cc:302 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233 +#: methods/ftp.cc:340 methods/ftp.cc:451 methods/rsh.cc:192 methods/rsh.cc:235 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:345 +#: methods/ftp.cc:346 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:832 methods/rsh.cc:197 +#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1274 +#: apt-pkg/contrib/fileutl.cc:1283 apt-pkg/contrib/fileutl.cc:1286 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:355 methods/rsh.cc:204 +#: methods/ftp.cc:356 methods/rsh.cc:206 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:372 methods/ftp.cc:384 +#: methods/ftp.cc:373 methods/ftp.cc:385 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:874 methods/rsh.cc:239 +#: methods/ftp.cc:457 methods/rred.cc:238 methods/rsh.cc:241 +#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1381 +#: apt-pkg/contrib/fileutl.cc:1384 apt-pkg/contrib/fileutl.cc:1410 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:696 methods/ftp.cc:702 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" @@ -1227,69 +1227,69 @@ msgid "Could not connect passive socket." msgstr "" # 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:1031 methods/rsh.cc:309 +#: methods/ftp.cc:872 methods/http.cc:1035 methods/rsh.cc:311 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:328 +#: methods/ftp.cc:900 methods/rsh.cc:330 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:1007 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1119 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1325,7 +1325,7 @@ msgstr "Methwyd cysylltu i %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:153 methods/rsh.cc:431 +#: methods/connect.cc:153 methods/rsh.cc:433 #, c-format msgid "Connecting to %s" msgstr "Yn cysylltu i %s" @@ -1350,161 +1350,162 @@ msgstr "" msgid "Unable to connect to %s:%s:" msgstr "" -#: methods/gpgv.cc:172 +#: methods/gpgv.cc:180 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:177 +#: methods/gpgv.cc:185 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:181 +#: methods/gpgv.cc:189 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:186 +#: methods/gpgv.cc:194 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:220 methods/gpgv.cc:227 +#: methods/gpgv.cc:228 methods/gpgv.cc:235 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:234 +#: methods/gpgv.cc:242 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/bzip2.cc:63 methods/gzip.cc:54 +#: methods/gzip.cc:65 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:393 +#: methods/http.cc:394 msgid "Waiting for headers" msgstr "Yn aros am benawdau" -#: methods/http.cc:547 +#: methods/http.cc:544 msgid "Bad header line" msgstr "Llinell pennawd gwael" -#: methods/http.cc:572 methods/http.cc:579 +#: methods/http.cc:569 methods/http.cc:576 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:608 +#: methods/http.cc:606 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:623 +#: methods/http.cc:621 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:625 +#: methods/http.cc:623 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:649 +#: methods/http.cc:647 msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:808 +#: methods/http.cc:818 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:813 +#: methods/http.cc:823 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:836 +#: methods/http.cc:846 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:867 +#: methods/http.cc:877 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:895 +#: methods/http.cc:905 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:909 +#: methods/http.cc:919 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:911 +#: methods/http.cc:921 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:1191 +#: methods/http.cc:1194 msgid "Bad header data" msgstr "" -#: methods/http.cc:1208 methods/http.cc:1263 +#: methods/http.cc:1211 methods/http.cc:1266 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1355 +#: methods/http.cc:1358 msgid "Internal error" msgstr "Gwall mewnol" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183 -#: apt-pkg/contrib/fileutl.cc:344 apt-pkg/sourcelist.cc:208 -#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108 -#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359 -#: methods/mirror.cc:95 +#: methods/mirror.cc:95 apt-inst/extract.cc:465 +#: apt-pkg/contrib/cdromutl.cc:183 apt-pkg/contrib/fileutl.cc:400 +#: apt-pkg/contrib/fileutl.cc:513 apt-pkg/sourcelist.cc:208 +#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:109 +#: apt-pkg/init.cc:117 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" -#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213 -#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42 -#: methods/mirror.cc:101 +#: 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 +#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60 +#: apt-pkg/clean.cc:123 #, c-format msgid "Unable to change to %s" msgstr "Ni ellir newid i %s" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default -#: methods/mirror.cc:279 +#: methods/mirror.cc:280 #, c-format msgid "No mirror file '%s' found " msgstr "" #. FIXME: fallback to a default mirror here instead #. and provide a config option to define that default -#: methods/mirror.cc:286 +#: methods/mirror.cc:287 #, c-format msgid "Can not read mirror file '%s'" msgstr "" -#: methods/mirror.cc:441 +#: methods/mirror.cc:442 #, c-format msgid "[Mirror: %s]" msgstr "" -#: methods/rred.cc:509 +#: 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:514 +#: 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 "" -#: ftparchive/multicompress.cc:167 methods/rsh.cc:97 +#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:336 +#: methods/rsh.cc:338 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -1544,12 +1545,12 @@ msgstr "" msgid "Merging available information" msgstr "" -#: cmdline/apt-extracttemplates.cc:100 +#: cmdline/apt-extracttemplates.cc:102 #, c-format msgid "%s not a valid DEB package." msgstr "Nid yw %s yn becyn DEB dilys." -#: cmdline/apt-extracttemplates.cc:234 +#: cmdline/apt-extracttemplates.cc:236 msgid "" "Usage: apt-extracttemplates file1 [file2 ...]\n" "\n" @@ -1563,12 +1564,12 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1269 +#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1282 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" -#: cmdline/apt-extracttemplates.cc:311 +#: cmdline/apt-extracttemplates.cc:313 msgid "Cannot get debconf version. Is debconf installed?" msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?" @@ -1647,38 +1648,38 @@ msgstr "Dim dewisiadau'n cyfateb" msgid "Some files are missing in the package file group `%s'" msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'" -#: ftparchive/cachedb.cc:46 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old" -#: ftparchive/cachedb.cc:64 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "Hen gronfa data, yn ceisio uwchraddio %s" -#: ftparchive/cachedb.cc:75 +#: ftparchive/cachedb.cc:76 msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -#: ftparchive/cachedb.cc:80 +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "Ni ellir agor y ffeil DB2 %s: %s" -#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193 -#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 +#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193 +#: apt-inst/extract.cc:210 #, c-format msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:248 +#: ftparchive/cachedb.cc:249 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:489 +#: ftparchive/cachedb.cc:490 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" @@ -1768,76 +1769,76 @@ msgstr "" msgid " %s has no binary override entry either\n" msgstr "" -#: ftparchive/contents.cc:339 ftparchive/contents.cc:370 +#: ftparchive/contents.cc:341 ftparchive/contents.cc:372 msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:34 ftparchive/override.cc:142 +#: ftparchive/override.cc:35 ftparchive/override.cc:143 #, c-format msgid "Unable to open %s" msgstr "Ni ellir agor %s" -#: ftparchive/override.cc:60 ftparchive/override.cc:166 +#: ftparchive/override.cc:61 ftparchive/override.cc:167 #, c-format msgid "Malformed override %s line %llu #1" msgstr "" -#: ftparchive/override.cc:74 ftparchive/override.cc:178 +#: ftparchive/override.cc:75 ftparchive/override.cc:179 #, c-format msgid "Malformed override %s line %llu #2" msgstr "" -#: ftparchive/override.cc:88 ftparchive/override.cc:191 +#: ftparchive/override.cc:89 ftparchive/override.cc:192 #, c-format msgid "Malformed override %s line %llu #3" msgstr "" -#: ftparchive/override.cc:127 ftparchive/override.cc:201 +#: 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:69 +#: ftparchive/multicompress.cc:70 #, c-format msgid "Unknown compression algorithm '%s'" msgstr "" -#: ftparchive/multicompress.cc:99 +#: ftparchive/multicompress.cc:100 #, c-format msgid "Compressed output %s needs a compression set" msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod" -#: ftparchive/multicompress.cc:193 +#: ftparchive/multicompress.cc:189 msgid "Failed to create FILE*" msgstr "Methwyd creu FILE*" -#: ftparchive/multicompress.cc:196 +#: ftparchive/multicompress.cc:192 msgid "Failed to fork" msgstr "Methodd fork()" -#: ftparchive/multicompress.cc:210 +#: ftparchive/multicompress.cc:206 msgid "Compress child" msgstr "" -#: ftparchive/multicompress.cc:233 +#: ftparchive/multicompress.cc:229 #, c-format msgid "Internal error, failed to create %s" msgstr "" -#: ftparchive/multicompress.cc:403 +#: ftparchive/multicompress.cc:304 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:455 +#: ftparchive/multicompress.cc:342 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:472 +#: ftparchive/multicompress.cc:358 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" @@ -1952,12 +1953,12 @@ msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s" msgid "Duplicate conf file %s/%s" msgstr "Ffeil cyfluniad dyblyg %s/%s" -#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55 #, c-format msgid "Failed to write file %s" msgstr "" -#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108 +#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -2016,23 +2017,23 @@ 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:42 apt-inst/deb/debfile.cc:47 +#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46 #, 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:56 +#: apt-inst/deb/debfile.cc:55 #, c-format msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member" msgstr "" -#: apt-inst/deb/debfile.cc:157 +#: apt-inst/deb/debfile.cc:120 #, c-format msgid "Internal error, could not locate member %s" msgstr "" -#: apt-inst/deb/debfile.cc:277 +#: apt-inst/deb/debfile.cc:214 msgid "Unparsable control file" msgstr "" @@ -2040,30 +2041,30 @@ msgstr "" msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/contrib/mmap.cc:91 +#: apt-pkg/contrib/mmap.cc:111 #, c-format msgid "Couldn't duplicate file descriptor %i" msgstr "" -#: apt-pkg/contrib/mmap.cc:99 +#: apt-pkg/contrib/mmap.cc:119 #, c-format msgid "Couldn't make mmap of %llu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:126 +#: apt-pkg/contrib/mmap.cc:146 msgid "Unable to close mmap" msgstr "" -#: apt-pkg/contrib/mmap.cc:154 apt-pkg/contrib/mmap.cc:182 +#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202 msgid "Unable to synchronize mmap" msgstr "" -#: apt-pkg/contrib/mmap.cc:260 +#: apt-pkg/contrib/mmap.cc:290 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: methods/http.cc:1016 apt-pkg/contrib/mmap.cc:293 +#: apt-pkg/contrib/mmap.cc:322 msgid "Failed to truncate file" msgstr "" @@ -2074,100 +2075,99 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:411 +#: apt-pkg/contrib/mmap.cc:440 #, 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:414 +#: apt-pkg/contrib/mmap.cc:443 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:371 +#: apt-pkg/contrib/strutl.cc:372 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:378 +#: apt-pkg/contrib/strutl.cc:379 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:385 +#: apt-pkg/contrib/strutl.cc:386 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:390 +#: apt-pkg/contrib/strutl.cc:391 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1165 +#: apt-pkg/contrib/strutl.cc:1167 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:468 +#: apt-pkg/contrib/configuration.cc:491 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:526 +#: 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:694 +#: 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." -#: apt-pkg/contrib/configuration.cc:713 +#: apt-pkg/contrib/configuration.cc:792 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:730 +#: 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:770 +#: 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:777 +#: 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:781 apt-pkg/contrib/configuration.cc:786 +#: 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:790 +#: 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:793 +#: apt-pkg/contrib/configuration.cc:872 #, c-format -msgid "" -"Syntax error %s:%u: clear directive requires an option tree as argument" +msgid "Syntax error %s:%u: clear directive requires an option tree as argument" msgstr "" -#: apt-pkg/contrib/configuration.cc:843 +#: 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" @@ -2188,44 +2188,44 @@ msgstr "%c%s... Wedi Gorffen" 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:104 apt-pkg/contrib/cmndline.cc:112 -#: apt-pkg/contrib/cmndline.cc:120 +#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s" -#: apt-pkg/contrib/cmndline.cc:125 +#: apt-pkg/contrib/cmndline.cc:127 #, 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:166 apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189 #, c-format msgid "Option %s requires an argument." msgstr "Mae'r opsiwn %s yn mynnu ymresymiad." -#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 +#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208 #, 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:235 +#: apt-pkg/contrib/cmndline.cc:237 #, 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:266 +#: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" msgstr "Opsiwn '%s' yn rhy hir" # FIXME: 'Sense'? -#: apt-pkg/contrib/cmndline.cc:298 +#: apt-pkg/contrib/cmndline.cc:300 #, 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:348 +#: apt-pkg/contrib/cmndline.cc:350 #, c-format msgid "Invalid operation %s" msgstr "Gweithred annilys %s" @@ -2239,116 +2239,116 @@ 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:1023 +#: apt-pkg/contrib/fileutl.cc:93 #, c-format msgid "Problem closing the gzip file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:169 +#: apt-pkg/contrib/fileutl.cc:225 #, 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:174 +#: apt-pkg/contrib/fileutl.cc:230 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:192 +#: apt-pkg/contrib/fileutl.cc:248 #, 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:196 +#: apt-pkg/contrib/fileutl.cc:252 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:336 +#: apt-pkg/contrib/fileutl.cc:392 apt-pkg/contrib/fileutl.cc:506 #, c-format msgid "List of files can't be created as '%s' is not a directory" msgstr "" -#: apt-pkg/contrib/fileutl.cc:363 +#: apt-pkg/contrib/fileutl.cc:426 #, c-format msgid "Ignoring '%s' in directory '%s' as it is not a regular file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:381 +#: apt-pkg/contrib/fileutl.cc:444 #, c-format msgid "Ignoring file '%s' in directory '%s' as it has no filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:390 +#: apt-pkg/contrib/fileutl.cc:453 #, c-format msgid "" "Ignoring file '%s' in directory '%s' as it has an invalid filename extension" msgstr "" -#: apt-pkg/contrib/fileutl.cc:703 +#: apt-pkg/contrib/fileutl.cc:840 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:705 +#: apt-pkg/contrib/fileutl.cc:842 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:709 +#: apt-pkg/contrib/fileutl.cc:846 #, 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:711 +#: apt-pkg/contrib/fileutl.cc:848 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:776 apt-pkg/indexcopy.cc:676 +#: apt-pkg/contrib/fileutl.cc:1004 apt-pkg/indexcopy.cc:659 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/contrib/fileutl.cc:793 +#: apt-pkg/contrib/fileutl.cc:1066 #, c-format msgid "Could not open file descriptor %d" msgstr "" -#: ftparchive/multicompress.cc:284 +#: apt-pkg/contrib/fileutl.cc:1156 msgid "Failed to create subprocess IPC" msgstr "Methwyd creu isbroses IPC" -#: ftparchive/multicompress.cc:321 +#: apt-pkg/contrib/fileutl.cc:1212 msgid "Failed to exec compressor " msgstr "Methwyd gweithredu cywasgydd " -#: apt-pkg/contrib/fileutl.cc:853 +#: apt-pkg/contrib/fileutl.cc:1309 #, c-format msgid "read, still have %llu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:886 +#: apt-pkg/contrib/fileutl.cc:1398 apt-pkg/contrib/fileutl.cc:1420 #, c-format msgid "write, still have %llu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1026 +#: apt-pkg/contrib/fileutl.cc:1736 #, c-format msgid "Problem closing the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1031 +#: apt-pkg/contrib/fileutl.cc:1748 #, c-format msgid "Problem renaming the file %s to %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1042 +#: apt-pkg/contrib/fileutl.cc:1759 #, c-format msgid "Problem unlinking the file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:1055 +#: apt-pkg/contrib/fileutl.cc:1774 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2433,39 +2433,39 @@ msgstr "opsiynnol" msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:130 apt-pkg/depcache.cc:159 +#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161 msgid "Building dependency tree" msgstr "" -#: apt-pkg/depcache.cc:131 +#: apt-pkg/depcache.cc:133 msgid "Candidate versions" msgstr "" -#: apt-pkg/depcache.cc:160 +#: apt-pkg/depcache.cc:162 msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:180 apt-pkg/depcache.cc:213 apt-pkg/depcache.cc:217 +#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219 msgid "Reading state information" msgstr "" -#: apt-pkg/depcache.cc:242 +#: apt-pkg/depcache.cc:244 #, c-format msgid "Failed to open StateFile %s" msgstr "" -#: apt-pkg/depcache.cc:248 +#: apt-pkg/depcache.cc:250 #, c-format msgid "Failed to write temporary StateFile %s" msgstr "" # FIXME: number? -#: apt-pkg/tagfile.cc:126 +#: apt-pkg/tagfile.cc:129 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:213 +#: apt-pkg/tagfile.cc:216 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -2526,7 +2526,7 @@ msgstr "" msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:447 +#: apt-pkg/sourcelist.cc:265 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." @@ -2541,20 +2541,20 @@ msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775 +#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:896 #, 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:437 apt-pkg/packagemanager.cc:467 +#: apt-pkg/packagemanager.cc:473 apt-pkg/packagemanager.cc:503 #, c-format msgid "Could not configure '%s'. " msgstr "" # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:507 +#: apt-pkg/packagemanager.cc:545 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2570,7 +2570,7 @@ msgstr "" msgid "Index file type '%s' is not supported" msgstr "Ni chynhelir y math ffeil mynegai '%s'" -#: apt-pkg/algorithms.cc:255 +#: apt-pkg/algorithms.cc:261 #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." @@ -2578,7 +2578,7 @@ msgstr "" "Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar " "ei gyfer." -#: apt-pkg/algorithms.cc:1191 +#: apt-pkg/algorithms.cc:1223 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." @@ -2586,12 +2586,12 @@ msgstr "" "Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi " "ei achosi gan pecynnau wedi eu dal." -#: apt-pkg/algorithms.cc:1193 +#: apt-pkg/algorithms.cc:1225 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:1518 apt-pkg/algorithms.cc:1520 +#: apt-pkg/algorithms.cc:1569 apt-pkg/algorithms.cc:1571 msgid "" "Some index files failed to download. They have been ignored, or old ones " "used instead." @@ -2614,12 +2614,12 @@ msgstr "" #. only show the ETA if it makes sense #. two days -#: apt-pkg/acquire.cc:864 +#: apt-pkg/acquire.cc:893 #, c-format msgid "Retrieving file %li of %li (%s remaining)" msgstr "" -#: apt-pkg/acquire.cc:866 +#: apt-pkg/acquire.cc:895 #, c-format msgid "Retrieving file %li of %li" msgstr "" @@ -2634,22 +2634,21 @@ 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:425 +#: apt-pkg/acquire-worker.cc:440 #, c-format -msgid "" -"Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:151 +#: apt-pkg/init.cc:152 #, 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:168 msgid "Unable to determine a suitable packaging system type" msgstr "" -#: apt-pkg/clean.cc:59 +#: apt-pkg/clean.cc:57 #, c-format msgid "Unable to stat %s." msgstr "Ni ellir gwneud stat() o %s." @@ -2665,8 +2664,7 @@ msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws." #: apt-pkg/cachefile.cc:91 msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." +msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." #: apt-pkg/cachefile.cc:109 msgid "The list of sources could not be read." @@ -2694,63 +2692,62 @@ msgstr "Methwyd daeall y math pin %s" msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" -#: apt-pkg/pkgcachegen.cc:83 +#: apt-pkg/pkgcachegen.cc:85 msgid "Cache has an incompatible versioning system" msgstr "Mae can y storfa system fersiwn anghyfaddas" #. TRANSLATOR: The first placeholder is a package name, #. the other two should be copied verbatim as they include debug info -#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:275 -#: apt-pkg/pkgcachegen.cc:311 apt-pkg/pkgcachegen.cc:353 -#: apt-pkg/pkgcachegen.cc:357 apt-pkg/pkgcachegen.cc:374 -#: apt-pkg/pkgcachegen.cc:384 apt-pkg/pkgcachegen.cc:388 -#: apt-pkg/pkgcachegen.cc:392 apt-pkg/pkgcachegen.cc:413 -#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:463 -#: apt-pkg/pkgcachegen.cc:494 apt-pkg/pkgcachegen.cc:508 +#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277 +#: apt-pkg/pkgcachegen.cc:308 apt-pkg/pkgcachegen.cc:316 +#: apt-pkg/pkgcachegen.cc:358 apt-pkg/pkgcachegen.cc:362 +#: apt-pkg/pkgcachegen.cc:379 apt-pkg/pkgcachegen.cc:389 +#: apt-pkg/pkgcachegen.cc:393 apt-pkg/pkgcachegen.cc:397 +#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:423 +#: apt-pkg/pkgcachegen.cc:463 apt-pkg/pkgcachegen.cc:471 +#: apt-pkg/pkgcachegen.cc:502 apt-pkg/pkgcachegen.cc:516 #, c-format msgid "Error occurred while processing %s (%s%d)" msgstr "" -#: apt-pkg/pkgcachegen.cc:232 +#: apt-pkg/pkgcachegen.cc:234 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" "Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:235 +#: apt-pkg/pkgcachegen.cc:237 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" -"Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." +msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin." -#: apt-pkg/pkgcachegen.cc:238 +#: apt-pkg/pkgcachegen.cc:240 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:243 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:515 +#: apt-pkg/pkgcachegen.cc:523 #, 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:1080 +#: apt-pkg/pkgcachegen.cc:1093 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1168 -#: apt-pkg/pkgcachegen.cc:1272 apt-pkg/pkgcachegen.cc:1278 -#: apt-pkg/pkgcachegen.cc:1434 +#: apt-pkg/pkgcachegen.cc:1181 apt-pkg/pkgcachegen.cc:1285 +#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1448 msgid "Reading package lists" msgstr "" -#: apt-pkg/pkgcachegen.cc:1185 +#: apt-pkg/pkgcachegen.cc:1198 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:1376 apt-pkg/pkgcachegen.cc:1383 +#: apt-pkg/pkgcachegen.cc:1390 apt-pkg/pkgcachegen.cc:1397 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" @@ -2759,44 +2756,44 @@ 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:640 +#: apt-pkg/acquire-item.cc:599 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863 -#: apt-pkg/acquire-item.cc:2006 +#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1870 +#: apt-pkg/acquire-item.cc:2013 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1399 +#: apt-pkg/acquire-item.cc:1381 #, c-format msgid "" "Unable to find expected entry '%s' in Release file (Wrong sources.list entry " "or malformed file)" msgstr "" -#: apt-pkg/acquire-item.cc:1415 +#: apt-pkg/acquire-item.cc:1397 #, c-format msgid "Unable to find hash sum for '%s' in Release file" msgstr "" -#: apt-pkg/acquire-item.cc:1450 +#: apt-pkg/acquire-item.cc:1439 msgid "There is no public key available for the following key IDs:\n" msgstr "" -#: apt-pkg/acquire-item.cc:1488 +#: apt-pkg/acquire-item.cc:1477 #, 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:1510 +#: apt-pkg/acquire-item.cc:1499 #, c-format msgid "Conflicting distribution: %s (expected %s but got %s)" msgstr "" -#: apt-pkg/acquire-item.cc:1543 +#: apt-pkg/acquire-item.cc:1532 #, c-format msgid "" "A error occurred during the signature verification. The repository is not " @@ -2804,13 +2801,13 @@ msgid "" msgstr "" #. Invalid signature file, reject (LP: #346386) (Closes: #627642) -#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558 +#: apt-pkg/acquire-item.cc:1542 apt-pkg/acquire-item.cc:1547 #, c-format msgid "GPG error: %s: %s" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1650 +#: apt-pkg/acquire-item.cc:1646 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2819,7 +2816,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:1709 +#: apt-pkg/acquire-item.cc:1705 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2828,38 +2825,38 @@ 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:1768 +#: apt-pkg/acquire-item.cc:1764 #, 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:1855 +#: apt-pkg/acquire-item.cc:1862 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" -#: apt-pkg/indexrecords.cc:61 +#: apt-pkg/indexrecords.cc:64 #, c-format msgid "Unable to parse Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:71 +#: apt-pkg/indexrecords.cc:74 #, c-format msgid "No sections in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:105 +#: apt-pkg/indexrecords.cc:108 #, c-format msgid "No Hash entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:118 +#: apt-pkg/indexrecords.cc:121 #, c-format msgid "Invalid 'Valid-Until' entry in Release file %s" msgstr "" -#: apt-pkg/indexrecords.cc:137 +#: apt-pkg/indexrecords.cc:140 #, c-format msgid "Invalid 'Date' entry in Release file %s" msgstr "" @@ -2869,172 +2866,172 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys" -#: apt-pkg/cdrom.cc:528 +#: apt-pkg/cdrom.cc:576 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:537 apt-pkg/cdrom.cc:634 +#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:565 +#: apt-pkg/cdrom.cc:613 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:574 apt-pkg/cdrom.cc:850 +#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:907 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:594 +#: apt-pkg/cdrom.cc:642 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:612 +#: apt-pkg/cdrom.cc:660 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:617 +#: apt-pkg/cdrom.cc:665 msgid "Waiting for disc...\n" msgstr "" -#: apt-pkg/cdrom.cc:626 +#: apt-pkg/cdrom.cc:674 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:645 +#: apt-pkg/cdrom.cc:693 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:687 +#: apt-pkg/cdrom.cc:744 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and " "%zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:698 +#: apt-pkg/cdrom.cc:755 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:725 +#: apt-pkg/cdrom.cc:782 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:811 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:771 +#: apt-pkg/cdrom.cc:828 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:773 +#: apt-pkg/cdrom.cc:830 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:800 +#: apt-pkg/cdrom.cc:857 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:808 +#: apt-pkg/cdrom.cc:865 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:930 +#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:880 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:932 +#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:882 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:935 +#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:885 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:281 apt-pkg/indexcopy.cc:938 +#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:888 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:546 +#: apt-pkg/indexcopy.cc:515 #, c-format msgid "Can't find authentication record for: %s" msgstr "" -#: apt-pkg/indexcopy.cc:552 +#: apt-pkg/indexcopy.cc:521 #, c-format msgid "Hash mismatch for: %s" msgstr "" -#: apt-pkg/indexcopy.cc:680 +#: 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:711 +#: apt-pkg/indexcopy.cc:692 #, c-format msgid "No keyring installed in %s." msgstr "" -#: apt-pkg/cacheset.cc:342 +#: apt-pkg/cacheset.cc:403 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:345 +#: apt-pkg/cacheset.cc:406 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s'" -#: apt-pkg/cacheset.cc:452 +#: apt-pkg/cacheset.cc:517 #, c-format msgid "Couldn't find task '%s'" msgstr "" -#: apt-pkg/cacheset.cc:459 +#: apt-pkg/cacheset.cc:523 #, c-format msgid "Couldn't find any package by regex '%s'" msgstr "" -#: apt-pkg/cacheset.cc:472 +#: apt-pkg/cacheset.cc:534 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:480 apt-pkg/cacheset.cc:488 +#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:496 +#: apt-pkg/cacheset.cc:555 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:504 +#: apt-pkg/cacheset.cc:563 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:512 +#: apt-pkg/cacheset.cc:571 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3043,149 +3040,149 @@ msgstr "" msgid "Send scenario to solver" msgstr "" -#: apt-pkg/edsp.cc:213 +#: apt-pkg/edsp.cc:209 msgid "Send request to solver" msgstr "" -#: apt-pkg/edsp.cc:281 +#: apt-pkg/edsp.cc:277 msgid "Prepare for receiving solution" msgstr "" -#: apt-pkg/edsp.cc:288 +#: apt-pkg/edsp.cc:284 msgid "External solver failed without a proper error message" msgstr "" -#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567 +#: apt-pkg/edsp.cc:555 apt-pkg/edsp.cc:558 apt-pkg/edsp.cc:563 msgid "Execute external solver" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:70 +#: apt-pkg/deb/dpkgpm.cc:72 #, c-format msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:71 apt-pkg/deb/dpkgpm.cc:865 +#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:951 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:872 +#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:958 #, c-format msgid "Removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:73 +#: apt-pkg/deb/dpkgpm.cc:75 #, c-format msgid "Completely removing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:74 +#: apt-pkg/deb/dpkgpm.cc:76 #, c-format msgid "Noting disappearance of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:75 +#: apt-pkg/deb/dpkgpm.cc:77 #, c-format msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:671 +#: apt-pkg/deb/dpkgpm.cc:704 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:686 apt-pkg/deb/dpkgpm.cc:706 +#: apt-pkg/deb/dpkgpm.cc:719 apt-pkg/deb/dpkgpm.cc:739 #, c-format msgid "Could not open file '%s'" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:858 +#: apt-pkg/deb/dpkgpm.cc:944 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:859 +#: apt-pkg/deb/dpkgpm.cc:945 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:864 +#: apt-pkg/deb/dpkgpm.cc:950 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:866 +#: apt-pkg/deb/dpkgpm.cc:952 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:871 +#: apt-pkg/deb/dpkgpm.cc:957 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:873 +#: apt-pkg/deb/dpkgpm.cc:959 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:878 +#: apt-pkg/deb/dpkgpm.cc:964 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:879 +#: apt-pkg/deb/dpkgpm.cc:965 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1110 +#: apt-pkg/deb/dpkgpm.cc:1208 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1140 +#: apt-pkg/deb/dpkgpm.cc:1238 msgid "Running dpkg" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1319 +#: apt-pkg/deb/dpkgpm.cc:1410 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1376 +#: apt-pkg/deb/dpkgpm.cc:1472 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1381 +#: apt-pkg/deb/dpkgpm.cc:1477 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1383 +#: apt-pkg/deb/dpkgpm.cc:1479 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1389 +#: apt-pkg/deb/dpkgpm.cc:1485 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1396 +#: apt-pkg/deb/dpkgpm.cc:1492 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1403 apt-pkg/deb/dpkgpm.cc:1409 +#: apt-pkg/deb/dpkgpm.cc:1499 apt-pkg/deb/dpkgpm.cc:1505 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1430 +#: apt-pkg/deb/dpkgpm.cc:1526 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" @@ -3214,34 +3211,27 @@ msgstr "" msgid "Not locked" msgstr "" -#, c-format #~ msgid "Got a single header line over %u chars" #~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod" -#, c-format #~ msgid "Read error from %s process" #~ msgstr "Gwall darllen o broses %s" -#, c-format #~ msgid "Couldn't open pipe for %s" #~ msgstr "Methwyd agor pibell ar gyfer %s" #~ msgid "Failed to locate a valid control file" #~ msgstr "Methwyd lleoli ffeil rheoli dilys" -#, c-format #~ msgid "Couldn't change to %s" #~ msgstr "Methwyd newid i %s" -#, c-format #~ msgid "Error parsing MD5. Offset %lu" #~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu" -#, c-format #~ msgid "Bad ConfFile section in the status file. Offset %lu" #~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu" -#, c-format #~ msgid "Invalid line in the diversion file: %s" #~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s" @@ -3249,43 +3239,36 @@ msgstr "" #~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru" # FIXME: literal -#, c-format #~ msgid "Failed to open the diversions file %sdiversions" #~ msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions" # FIXME -#, c-format #~ msgid "Failed reading the list file %sinfo/%s" #~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s" -#, c-format #~ msgid "" #~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file " #~ "then make it empty and immediately re-install the same version of the " #~ "package!" #~ msgstr "" -#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn yna " -#~ "gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!" +#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn " +#~ "yna gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!" -#, c-format #~ msgid "Failed to change to the admin dir %sinfo" #~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo" #~ msgid "The info and temp directories need to be on the same filesystem" -#~ msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" +#~ msgstr "" +#~ "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" -#, c-format #~ msgid "Failed to stat %sinfo" #~ msgstr "Methwyd stat() ar %sinfo" -#, c-format #~ msgid "Unable to create %s" #~ msgstr "Ni ellir creu %s" -#, c-format #~ msgid "Failed to remove %s" #~ msgstr "Methwyd dileu %s" -#, 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" |