diff options
Diffstat (limited to 'po/cy.po')
-rw-r--r-- | po/cy.po | 365 |
1 files changed, 209 insertions, 156 deletions
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-27 19:43+0200\n" +"POT-Creation-Date: 2009-11-27 00:15+0100\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -169,7 +169,7 @@ msgstr " %4i %s\n" #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2626 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144 #, 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" @@ -250,7 +250,7 @@ msgstr "" "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" #: cmdline/apt-cdrom.cc:77 -msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" #: cmdline/apt-cdrom.cc:92 @@ -551,26 +551,26 @@ msgstr "*** Methwyd cysylltu %s at %s" msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:387 +#: ftparchive/writer.cc:388 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:395 ftparchive/writer.cc:610 +#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:440 ftparchive/writer.cc:698 +#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:620 +#: ftparchive/writer.cc:637 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:624 +#: ftparchive/writer.cc:641 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -675,7 +675,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1695 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -827,7 +827,7 @@ msgstr "" msgid "Some packages could not be authenticated" msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!" -#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886 +#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890 msgid "There are problems and -y was used without --force-yes" msgstr "Mae problemau a defnyddwyd -y heb --force-yes" @@ -845,11 +845,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi." msgid "Internal error, Ordering didn't finish" msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2037 cmdline/apt-get.cc:2070 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2367 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." @@ -878,25 +878,26 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n" -#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2213 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2240 #, 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:876 +#: cmdline/apt-get.cc:880 #, 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:892 cmdline/apt-get.cc:912 +#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916 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:894 +#: cmdline/apt-get.cc:898 msgid "Yes, do as I say!" msgstr "Ie, gwna fel rydw i'n dweud!" -#: cmdline/apt-get.cc:896 +#: cmdline/apt-get.cc:900 #, fuzzy, c-format msgid "" "You are about to do something potentially harmful.\n" @@ -907,29 +908,29 @@ msgstr "" "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n" " ?]" -#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921 +#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925 msgid "Abort." msgstr "Erthylu." -#: cmdline/apt-get.cc:917 +#: cmdline/apt-get.cc:921 #, fuzzy msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2264 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: cmdline/apt-get.cc:1007 +#: cmdline/apt-get.cc:1011 msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:1014 +#: cmdline/apt-get.cc:1018 msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" @@ -937,49 +938,49 @@ msgstr "" "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu " "geidio defnyddio --fix-missing?" -#: cmdline/apt-get.cc:1018 +#: cmdline/apt-get.cc:1022 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:1023 +#: cmdline/apt-get.cc:1027 msgid "Unable to correct missing packages." msgstr "Ni ellir cywiro pecynnau ar goll." -#: cmdline/apt-get.cc:1024 +#: cmdline/apt-get.cc:1028 #, fuzzy msgid "Aborting install." msgstr "Yn Erthylu'r Sefydliad." -#: cmdline/apt-get.cc:1058 +#: cmdline/apt-get.cc:1086 #, c-format msgid "Note, selecting %s instead of %s\n" msgstr "Sylwer, yn dewis %s yn hytrach na %s\n" -#: cmdline/apt-get.cc:1068 +#: cmdline/apt-get.cc:1097 #, 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:1086 +#: cmdline/apt-get.cc:1115 #, 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:1097 +#: cmdline/apt-get.cc:1126 #, 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:1109 +#: cmdline/apt-get.cc:1138 msgid " [Installed]" msgstr " [Sefydliwyd]" -#: cmdline/apt-get.cc:1114 +#: cmdline/apt-get.cc:1143 msgid "You should explicitly select one to install." msgstr "Dylech ddewis un yn benodol i'w sefydlu." # FIXME: punctuation -#: cmdline/apt-get.cc:1119 +#: cmdline/apt-get.cc:1148 #, fuzzy, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -991,74 +992,85 @@ msgstr "" "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n" "ffeil sources.list.\n" -#: cmdline/apt-get.cc:1138 +#: cmdline/apt-get.cc:1167 msgid "However the following packages replace it:" msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:" -#: cmdline/apt-get.cc:1141 +#: cmdline/apt-get.cc:1170 #, c-format msgid "Package %s has no installation candidate" msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s" -#: cmdline/apt-get.cc:1161 +#: cmdline/apt-get.cc:1190 #, 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:1169 +#: cmdline/apt-get.cc:1198 #, c-format msgid "%s is already the newest version.\n" msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" -#: cmdline/apt-get.cc:1198 +#: cmdline/apt-get.cc:1227 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: cmdline/apt-get.cc:1200 +#: cmdline/apt-get.cc:1229 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: cmdline/apt-get.cc:1206 +#: cmdline/apt-get.cc:1235 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#: cmdline/apt-get.cc:1323 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1307 #, c-format -msgid "No source package '%s' picking '%s' instead\n" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1360 +#: cmdline/apt-get.cc:1332 +#, fuzzy, c-format +msgid "Picking '%s' as source package instead of '%s'\n" +msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" + +#: cmdline/apt-get.cc:1383 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1373 +#: cmdline/apt-get.cc:1396 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1429 +#: cmdline/apt-get.cc:1452 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1478 +#: cmdline/apt-get.cc:1501 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1480 +#: cmdline/apt-get.cc:1503 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: cmdline/apt-get.cc:1481 +#: cmdline/apt-get.cc:1504 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1486 +#: cmdline/apt-get.cc:1509 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1074,46 +1086,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1489 cmdline/apt-get.cc:1779 +#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1493 +#: cmdline/apt-get.cc:1516 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1512 +#: cmdline/apt-get.cc:1535 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1567 +#: cmdline/apt-get.cc:1590 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1682 cmdline/apt-get.cc:1718 +#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1705 +#: cmdline/apt-get.cc:1728 #, 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:1736 +#: cmdline/apt-get.cc:1759 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:1749 +#: cmdline/apt-get.cc:1772 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:1752 +#: cmdline/apt-get.cc:1775 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1122,7 +1134,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1764 +#: cmdline/apt-get.cc:1787 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" @@ -1134,118 +1146,118 @@ msgstr "" "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n" "heb gael eu symud allan o Incoming." -#: cmdline/apt-get.cc:1782 +#: cmdline/apt-get.cc:1805 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1811 +#: cmdline/apt-get.cc:1834 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1900 +#: cmdline/apt-get.cc:1923 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1901 +#: cmdline/apt-get.cc:1924 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1930 +#: cmdline/apt-get.cc:1953 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1933 methods/ftp.cc:707 methods/connect.cc:112 +#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1938 +#: cmdline/apt-get.cc:1961 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2005 cmdline/apt-get.cc:2013 +#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2113 +#: cmdline/apt-get.cc:2136 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:2143 cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2192 +#: cmdline/apt-get.cc:2215 #, 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:2223 +#: cmdline/apt-get.cc:2250 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:2229 +#: cmdline/apt-get.cc:2256 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2232 +#: cmdline/apt-get.cc:2259 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2238 +#: cmdline/apt-get.cc:2265 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2269 +#: cmdline/apt-get.cc:2296 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2297 +#: cmdline/apt-get.cc:2324 #, 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:2309 +#: cmdline/apt-get.cc:2336 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2310 +#: cmdline/apt-get.cc:2337 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2327 +#: cmdline/apt-get.cc:2354 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2346 +#: cmdline/apt-get.cc:2373 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2362 +#: cmdline/apt-get.cc:2389 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:2390 +#: cmdline/apt-get.cc:2417 #, 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:2410 +#: cmdline/apt-get.cc:2437 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2462 +#: cmdline/apt-get.cc:2489 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1254,7 +1266,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2515 +#: cmdline/apt-get.cc:2542 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1263,34 +1275,34 @@ 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:2551 +#: cmdline/apt-get.cc:2578 #, 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:2578 +#: cmdline/apt-get.cc:2605 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2594 +#: cmdline/apt-get.cc:2621 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2599 +#: cmdline/apt-get.cc:2626 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2631 +#: cmdline/apt-get.cc:2658 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2672 +#: cmdline/apt-get.cc:2699 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1375,7 +1387,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:2839 +#: cmdline/apt-get.cc:2866 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1463,11 +1475,13 @@ msgid "Do you want to erase any previously downloaded .deb files?" msgstr "" #: dselect/install:101 -msgid "Some errors occurred while unpacking. I'm going to configure the" +#, fuzzy +msgid "Some errors occurred while unpacking. Packages that were installed" msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r" #: dselect/install:102 -msgid "packages that were installed. This may result in duplicate errors" +#, fuzzy +msgid "will be configured. This may result in duplicate errors" msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu" #: dselect/install:103 @@ -1516,7 +1530,12 @@ msgstr "Llofnod archif annilys" msgid "Error reading archive member header" msgstr "Gwall wrth ddarllen pennawd aelod archif" -#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102 +#: apt-inst/contrib/arfile.cc:90 +#, fuzzy, c-format +msgid "Invalid archive member header %s" +msgstr "Pennawd aelod archif annilys" + +#: apt-inst/contrib/arfile.cc:102 msgid "Invalid archive member header" msgstr "Pennawd aelod archif annilys" @@ -1622,7 +1641,7 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822 +#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843 #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166 #: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 #: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33 @@ -1806,11 +1825,11 @@ msgid "File not found" msgstr "Ffeil heb ei ganfod" #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150 -#: methods/rred.cc:234 methods/rred.cc:243 +#: methods/rred.cc:483 methods/rred.cc:492 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240 +#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -1941,7 +1960,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303 +#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -2017,13 +2036,13 @@ msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" #: methods/connect.cc:193 -#, c-format -msgid "Something wicked happened resolving '%s:%s' (%i)" +#, fuzzy, c-format +msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" #: methods/connect.cc:240 -#, c-format -msgid "Unable to connect to %s %s:" +#, fuzzy, c-format +msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" #: methods/gpgv.cc:71 @@ -2111,50 +2130,50 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:787 +#: methods/http.cc:788 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:792 +#: methods/http.cc:793 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:815 +#: methods/http.cc:816 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:846 +#: methods/http.cc:847 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:874 +#: methods/http.cc:875 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:888 +#: methods/http.cc:889 #, 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:890 +#: methods/http.cc:891 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Methwyd ysgrifennu ffeil %s" -#: methods/http.cc:1146 +#: methods/http.cc:1147 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1163 methods/http.cc:1218 +#: methods/http.cc:1164 methods/http.cc:1219 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1310 +#: methods/http.cc:1311 msgid "Internal error" msgstr "Gwall mewnol" @@ -2162,95 +2181,102 @@ msgstr "Gwall mewnol" msgid "Can't mmap an empty file" msgstr "Ni ellir defnyddio mmap() ar ffeil gwag" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187 +#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "Methwyd gwneud mmap() efo %lu beit" -#: apt-pkg/contrib/mmap.cc:234 +#: apt-pkg/contrib/mmap.cc:252 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" +#: apt-pkg/contrib/mmap.cc:347 +#, c-format +msgid "" +"The size of a MMap has already reached the defined limit of %lu bytes,abort " +"the try to grow the MMap." +msgstr "" + #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:335 +#: apt-pkg/contrib/strutl.cc:346 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:342 +#: apt-pkg/contrib/strutl.cc:353 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:349 +#: apt-pkg/contrib/strutl.cc:360 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:354 +#: apt-pkg/contrib/strutl.cc:365 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1029 +#: apt-pkg/contrib/strutl.cc:1040 #, c-format msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:439 +#: apt-pkg/contrib/configuration.cc:458 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:497 +#: apt-pkg/contrib/configuration.cc:516 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:663 +#: apt-pkg/contrib/configuration.cc:684 #, 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:682 +#: apt-pkg/contrib/configuration.cc:703 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:699 +#: apt-pkg/contrib/configuration.cc:720 #, 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:739 +#: apt-pkg/contrib/configuration.cc:760 #, 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:746 +#: apt-pkg/contrib/configuration.cc:767 #, 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:750 apt-pkg/contrib/configuration.cc:755 +#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:759 +#: apt-pkg/contrib/configuration.cc:780 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:810 +#: apt-pkg/contrib/configuration.cc:831 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" @@ -2572,8 +2598,15 @@ msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" +#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576 +#, c-format +msgid "" +"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " +"under APT::Immediate-Configure for details. (%d)" +msgstr "" + # FIXME: %s may have an arbirrary length -#: apt-pkg/packagemanager.cc:426 +#: apt-pkg/packagemanager.cc:437 #, c-format msgid "" "This installation run will require temporarily removing the essential " @@ -2584,6 +2617,13 @@ msgstr "" "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir " "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak." +#: apt-pkg/packagemanager.cc:475 +#, c-format +msgid "" +"Could not perform immediate configuration on already unpacked '%s'.Please " +"see man 5 apt.conf under APT::Immediate-Configure for details." +msgstr "" + #: apt-pkg/pkgrecords.cc:32 #, c-format msgid "Index file type '%s' is not supported" @@ -2803,21 +2843,21 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" msgid "rename failed, %s (%s -> %s)." msgstr "methwyd ailenwi, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:396 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1114 msgid "There is no public key available for the following key IDs:\n" msgstr "" # FIXME: case -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1224 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2826,7 +2866,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:1275 +#: apt-pkg/acquire-item.cc:1283 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2835,14 +2875,14 @@ 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:1316 +#: apt-pkg/acquire-item.cc:1324 #, 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:1403 +#: apt-pkg/acquire-item.cc:1411 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -2979,12 +3019,12 @@ msgstr "" msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" @@ -2994,56 +3034,56 @@ msgstr "Yn agor %s" msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:546 +#: apt-pkg/deb/dpkgpm.cc:557 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:635 +#: apt-pkg/deb/dpkgpm.cc:653 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:636 +#: apt-pkg/deb/dpkgpm.cc:654 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:641 +#: apt-pkg/deb/dpkgpm.cc:659 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:643 +#: apt-pkg/deb/dpkgpm.cc:661 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:648 +#: apt-pkg/deb/dpkgpm.cc:666 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:650 +#: apt-pkg/deb/dpkgpm.cc:668 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:655 +#: apt-pkg/deb/dpkgpm.cc:673 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:656 +#: apt-pkg/deb/dpkgpm.cc:674 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:820 +#: apt-pkg/deb/dpkgpm.cc:878 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:848 +#: apt-pkg/deb/dpkgpm.cc:907 msgid "Running dpkg" msgstr "" @@ -3069,15 +3109,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Methwyd agor ffeil %s" +#: methods/rred.cc:465 +#, c-format +msgid "" +"Could not patch %s with mmap and with file operation usage - the patch seems " +"to be corrupt." +msgstr "" + +#: methods/rred.cc:470 +#, c-format +msgid "" +"Could not patch %s with mmap (but no mmap specific fail) - the patch seems " +"to be corrupt." +msgstr "" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Methwyd agor ffeil %s" + #~ msgid "%4i %s\n" #~ msgstr "%4i %s\n" |