diff options
Diffstat (limited to 'po/cy.po')
| -rw-r--r-- | po/cy.po | 376 |
1 files changed, 193 insertions, 183 deletions
@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2014-01-25 22:21+0100\n" +"POT-Creation-Date: 2014-02-06 20:46+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" @@ -126,7 +126,7 @@ msgstr "Rhaid i chi ddarparu un patrwm yn union" msgid "This command is deprecated. Please use 'apt-mark showauto' instead." msgstr "" -#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574 +#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:576 #, c-format msgid "Unable to locate package %s" msgstr "Ni ellir lleoli'r pecyn %s" @@ -174,7 +174,7 @@ msgid " Version table:" msgstr " Tabl Fersiynnau:" #: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83 -#: cmdline/apt-get.cc:1577 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 +#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66 #: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591 #: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147 #, fuzzy, c-format @@ -371,23 +371,23 @@ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:722 +#: cmdline/apt-get.cc:725 msgid "Must specify at least one package to fetch source for" msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer" -#: cmdline/apt-get.cc:762 cmdline/apt-get.cc:1057 +#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:779 +#: cmdline/apt-get.cc:782 #, c-format msgid "" "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n" "%s\n" msgstr "" -#: cmdline/apt-get.cc:784 +#: cmdline/apt-get.cc:787 #, c-format msgid "" "Please use:\n" @@ -395,96 +395,96 @@ msgid "" "to retrieve the latest (possibly unreleased) updates to the package.\n" msgstr "" -#: cmdline/apt-get.cc:837 +#: cmdline/apt-get.cc:840 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:860 cmdline/apt-get.cc:863 +#: cmdline/apt-get.cc:863 cmdline/apt-get.cc:866 #: apt-private/private-install.cc:198 apt-private/private-install.cc:201 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" -#: cmdline/apt-get.cc:874 +#: cmdline/apt-get.cc:877 #, c-format msgid "You don't have enough free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:883 +#: cmdline/apt-get.cc:886 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n" #. TRANSLATOR: The required space between number and unit is already included #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB -#: cmdline/apt-get.cc:888 +#: cmdline/apt-get.cc:891 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:894 +#: cmdline/apt-get.cc:897 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:915 +#: cmdline/apt-get.cc:918 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:920 apt-private/private-install.cc:325 +#: cmdline/apt-get.cc:923 apt-private/private-install.cc:325 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" -#: cmdline/apt-get.cc:946 +#: cmdline/apt-get.cc:949 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n" -#: cmdline/apt-get.cc:958 +#: cmdline/apt-get.cc:961 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:959 +#: cmdline/apt-get.cc:962 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:981 +#: cmdline/apt-get.cc:984 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:1001 +#: cmdline/apt-get.cc:1004 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:1020 +#: cmdline/apt-get.cc:1023 msgid "Must specify at least one package to check builddeps for" msgstr "" "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer" -#: cmdline/apt-get.cc:1045 +#: cmdline/apt-get.cc:1048 #, c-format msgid "" "No architecture information available for %s. See apt.conf(5) APT::" "Architectures for setup" msgstr "" -#: cmdline/apt-get.cc:1069 cmdline/apt-get.cc:1072 +#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s" -#: cmdline/apt-get.cc:1092 +#: cmdline/apt-get.cc:1095 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:1262 +#: cmdline/apt-get.cc:1265 #, fuzzy, c-format msgid "" "%s dependency for %s can't be satisfied because %s is not allowed on '%s' " @@ -493,7 +493,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1280 +#: cmdline/apt-get.cc:1283 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -502,14 +502,14 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1303 +#: cmdline/apt-get.cc:1306 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy " "newydd" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1345 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because candidate version of " @@ -518,7 +518,7 @@ msgstr "" "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd " "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin" -#: cmdline/apt-get.cc:1348 +#: cmdline/apt-get.cc:1351 #, fuzzy, c-format msgid "" "%s dependency for %s cannot be satisfied because package %s has no candidate " @@ -527,32 +527,32 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn " "%s" -#: cmdline/apt-get.cc:1371 +#: cmdline/apt-get.cc:1374 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:1386 +#: cmdline/apt-get.cc:1389 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:1391 +#: cmdline/apt-get.cc:1394 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:1484 cmdline/apt-get.cc:1496 +#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499 #, fuzzy, c-format msgid "Changelog for %s (%s)" msgstr "Yn cysylltu i %s (%s)" -#: cmdline/apt-get.cc:1582 +#: cmdline/apt-get.cc:1585 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:1623 +#: cmdline/apt-get.cc:1626 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -666,7 +666,7 @@ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n" #: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328 #: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217 -#: apt-pkg/deb/dpkgpm.cc:1183 +#: apt-pkg/deb/dpkgpm.cc:1182 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" @@ -763,16 +763,16 @@ msgstr "" msgid "Disk not found." msgstr "Ffeil heb ei ganfod" -#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275 +#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274 msgid "File not found" msgstr "Ffeil heb ei ganfod" -#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114 -#: methods/rred.cc:618 methods/rred.cc:627 +#: methods/copy.cc:45 methods/gzip.cc:103 methods/gzip.cc:118 +#: methods/rred.cc:598 methods/rred.cc:608 msgid "Failed to stat" msgstr "Methwyd stat()" -#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:624 +#: methods/copy.cc:82 methods/gzip.cc:112 methods/rred.cc:605 msgid "Failed to set modification time" msgstr "Methwyd gosod amser newid" @@ -781,34 +781,34 @@ msgid "Invalid URI, local URIS must not start with //" msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\"" #. Login must be before getpeername otherwise dante won't work. -#: methods/ftp.cc:173 +#: methods/ftp.cc:172 msgid "Logging in" msgstr "Yn mewngofnodi" -#: methods/ftp.cc:179 +#: methods/ftp.cc:178 msgid "Unable to determine the peer name" msgstr "Ni ellir darganfod enw'r cymar" -#: methods/ftp.cc:184 +#: methods/ftp.cc:183 msgid "Unable to determine the local name" msgstr "Ni ellir darganfod yr enw lleol" -#: methods/ftp.cc:215 methods/ftp.cc:243 +#: methods/ftp.cc:214 methods/ftp.cc:242 #, fuzzy, c-format msgid "The server refused the connection and said: %s" msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s" -#: methods/ftp.cc:221 +#: methods/ftp.cc:220 #, c-format msgid "USER failed, server said: %s" msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s" -#: methods/ftp.cc:228 +#: methods/ftp.cc:227 #, c-format msgid "PASS failed, server said: %s" msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s" -#: methods/ftp.cc:248 +#: methods/ftp.cc:247 msgid "" "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " "is empty." @@ -817,124 +817,124 @@ msgstr "" "ProxyLogin yn wag.)" # FIXME -#: methods/ftp.cc:276 +#: methods/ftp.cc:275 #, c-format msgid "Login script command '%s' failed, server said: %s" msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s" -#: methods/ftp.cc:302 +#: methods/ftp.cc:301 #, c-format msgid "TYPE failed, server said: %s" msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s" -#: methods/ftp.cc:340 methods/ftp.cc:452 methods/rsh.cc:192 methods/rsh.cc:237 +#: methods/ftp.cc:339 methods/ftp.cc:451 methods/rsh.cc:191 methods/rsh.cc:236 msgid "Connection timeout" msgstr "Goramser cysylltu" -#: methods/ftp.cc:346 +#: methods/ftp.cc:345 msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292 +#: methods/ftp.cc:348 methods/rsh.cc:198 apt-pkg/contrib/fileutl.cc:1292 #: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304 msgid "Read error" msgstr "Gwall darllen" -#: methods/ftp.cc:356 methods/rsh.cc:206 +#: methods/ftp.cc:355 methods/rsh.cc:205 msgid "A response overflowed the buffer." msgstr "Gorlifodd ateb y byffer." -#: methods/ftp.cc:373 methods/ftp.cc:385 +#: methods/ftp.cc:372 methods/ftp.cc:384 msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:458 methods/rsh.cc:243 apt-pkg/contrib/fileutl.cc:1388 +#: methods/ftp.cc:457 methods/rsh.cc:242 apt-pkg/contrib/fileutl.cc:1388 #: apt-pkg/contrib/fileutl.cc:1397 apt-pkg/contrib/fileutl.cc:1400 #: apt-pkg/contrib/fileutl.cc:1425 msgid "Write error" msgstr "Gwall ysgrifennu" -#: methods/ftp.cc:697 methods/ftp.cc:703 methods/ftp.cc:738 +#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:737 msgid "Could not create a socket" msgstr "Methwyd creu soced" -#: methods/ftp.cc:708 +#: methods/ftp.cc:707 msgid "Could not connect data socket, connection timed out" msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad" -#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:22 +#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22 msgid "Failed" msgstr "Methwyd" -#: methods/ftp.cc:714 +#: methods/ftp.cc:713 #, fuzzy msgid "Could not connect passive socket." msgstr "Methwyd cysylltu soced goddefol" # FIXME -#: methods/ftp.cc:731 +#: methods/ftp.cc:730 msgid "getaddrinfo was unable to get a listening socket" msgstr "Methodd getaddrinfo gael soced gwrando" -#: methods/ftp.cc:745 +#: methods/ftp.cc:744 msgid "Could not bind a socket" msgstr "Methwyd rhwymo soced" -#: methods/ftp.cc:749 +#: methods/ftp.cc:748 msgid "Could not listen on the socket" msgstr "Methwyd gwrando ar y soced" -#: methods/ftp.cc:756 +#: methods/ftp.cc:755 msgid "Could not determine the socket's name" msgstr "Methwyd canfod enw'r soced" -#: methods/ftp.cc:788 +#: methods/ftp.cc:787 msgid "Unable to send PORT command" msgstr "Methwyd danfod gorchymyn PORT" -#: methods/ftp.cc:798 +#: methods/ftp.cc:797 #, c-format msgid "Unknown address family %u (AF_*)" msgstr "Teulu cyfeiriad anhysbys %u (AF_*)" -#: methods/ftp.cc:807 +#: methods/ftp.cc:806 #, c-format msgid "EPRT failed, server said: %s" msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s" -#: methods/ftp.cc:827 +#: methods/ftp.cc:826 msgid "Data socket connect timed out" msgstr "Goramserodd cysylltiad y soced data" -#: methods/ftp.cc:834 +#: methods/ftp.cc:833 msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313 +#: methods/ftp.cc:872 methods/server.cc:353 methods/rsh.cc:312 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" -#: methods/ftp.cc:886 +#: methods/ftp.cc:885 #, c-format msgid "Unable to fetch file, server said '%s'" msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'" -#: methods/ftp.cc:901 methods/rsh.cc:332 +#: methods/ftp.cc:900 methods/rsh.cc:331 msgid "Data socket timed out" msgstr "Goramserodd soced data" -#: methods/ftp.cc:931 +#: methods/ftp.cc:930 #, c-format msgid "Data transfer failed, server said '%s'" msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'" #. Get the files information -#: methods/ftp.cc:1008 +#: methods/ftp.cc:1009 msgid "Query" msgstr "Ymholiad" # FIXME -#: methods/ftp.cc:1120 +#: methods/ftp.cc:1123 msgid "Unable to invoke " msgstr "Methwyd gweithredu " @@ -1000,72 +1000,72 @@ msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)" msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:167 +#: methods/gpgv.cc:166 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:171 +#: methods/gpgv.cc:170 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:173 +#: methods/gpgv.cc:172 msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)" msgstr "" #. TRANSLATORS: %s is a single techy word like 'NODATA' -#: methods/gpgv.cc:179 +#: methods/gpgv.cc:178 #, c-format msgid "" "Clearsigned file isn't valid, got '%s' (does the network require " "authentication?)" msgstr "" -#: methods/gpgv.cc:183 +#: methods/gpgv.cc:182 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:216 methods/gpgv.cc:223 +#: methods/gpgv.cc:215 methods/gpgv.cc:222 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:230 +#: methods/gpgv.cc:229 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" -#: methods/gzip.cc:65 +#: methods/gzip.cc:64 msgid "Empty files can't be valid archives" msgstr "" -#: methods/http.cc:519 +#: methods/http.cc:516 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:533 +#: methods/http.cc:530 #, fuzzy msgid "Error reading from server. Remote end closed connection" msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad" -#: methods/http.cc:535 +#: methods/http.cc:532 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:571 +#: methods/http.cc:568 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:631 +#: methods/http.cc:628 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:636 +#: methods/http.cc:633 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:659 +#: methods/http.cc:656 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" @@ -1106,11 +1106,11 @@ msgstr "Fformat dyddiad anhysbys" msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/server.cc:507 methods/server.cc:564 +#: methods/server.cc:507 methods/server.cc:563 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/server.cc:656 +#: methods/server.cc:655 msgid "Internal error" msgstr "Gwall mewnol" @@ -1359,104 +1359,111 @@ msgstr "" msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" -#: apt-private/private-output.cc:200 -msgid "installed,upgradable to: " +#: apt-private/private-output.cc:72 apt-private/private-show.cc:81 +#: apt-private/private-show.cc:86 +msgid "unknown" msgstr "" -#: apt-private/private-output.cc:206 +#: apt-private/private-output.cc:198 +#, fuzzy, c-format +msgid "[installed,upgradable to: %s]" +msgstr " [Sefydliwyd]" + +#: apt-private/private-output.cc:202 #, fuzzy msgid "[installed,local]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:209 +#: apt-private/private-output.cc:205 msgid "[installed,auto-removable]" msgstr "" -#: apt-private/private-output.cc:211 +#: apt-private/private-output.cc:207 #, fuzzy msgid "[installed,automatic]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:213 +#: apt-private/private-output.cc:209 #, fuzzy msgid "[installed]" msgstr " [Sefydliwyd]" -#: apt-private/private-output.cc:219 -msgid "[upgradable from: " +#: apt-private/private-output.cc:213 +#, c-format +msgid "[upgradable from: %s]" msgstr "" -#: apt-private/private-output.cc:225 +#: apt-private/private-output.cc:217 msgid "[residual-config]" msgstr "" -#: apt-private/private-output.cc:316 +#: apt-private/private-output.cc:317 msgid "The following packages have unmet dependencies:" msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:" -#: apt-private/private-output.cc:406 +#: apt-private/private-output.cc:407 #, c-format msgid "but %s is installed" msgstr "ond mae %s wedi ei sefydlu" -#: apt-private/private-output.cc:408 +#: apt-private/private-output.cc:409 #, c-format msgid "but %s is to be installed" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: apt-private/private-output.cc:415 +#: apt-private/private-output.cc:416 msgid "but it is not installable" msgstr "ond ni ellir ei sefydlu" -#: apt-private/private-output.cc:417 +#: apt-private/private-output.cc:418 msgid "but it is a virtual package" msgstr "ond mae'n becyn rhithwir" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not installed" msgstr "ond nid yw wedi ei sefydlu" -#: apt-private/private-output.cc:420 +#: apt-private/private-output.cc:421 msgid "but it is not going to be installed" msgstr "ond nid yw'n mynd i gael ei sefydlu" -#: apt-private/private-output.cc:425 +#: apt-private/private-output.cc:426 msgid " or" msgstr " neu" -#: apt-private/private-output.cc:454 +#: apt-private/private-output.cc:455 msgid "The following NEW packages will be installed:" msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:" -#: apt-private/private-output.cc:480 +#: apt-private/private-output.cc:481 msgid "The following packages will be REMOVED:" msgstr "Caiff y pecynnau canlynol eu TYNNU:" -#: apt-private/private-output.cc:502 +#: apt-private/private-output.cc:503 #, fuzzy msgid "The following packages have been kept back:" msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl" -#: apt-private/private-output.cc:523 +#: apt-private/private-output.cc:524 #, fuzzy msgid "The following packages will be upgraded:" msgstr "Caiff y pecynnau canlynol eu uwchraddio" -#: apt-private/private-output.cc:544 +#: apt-private/private-output.cc:545 #, fuzzy msgid "The following packages will be DOWNGRADED:" msgstr "Caiff y pecynnau canlynol eu ISRADDIO" -#: apt-private/private-output.cc:564 +#: apt-private/private-output.cc:565 msgid "The following held packages will be changed:" msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:" -#: apt-private/private-output.cc:619 +#: apt-private/private-output.cc:620 #, c-format msgid "%s (due to %s) " msgstr "%s (oherwydd %s) " -#: apt-private/private-output.cc:627 +#: apt-private/private-output.cc:628 #, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" @@ -1466,27 +1473,27 @@ msgstr "" "NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n" "ei wneud!" -#: apt-private/private-output.cc:658 +#: apt-private/private-output.cc:659 #, c-format msgid "%lu upgraded, %lu newly installed, " msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, " -#: apt-private/private-output.cc:662 +#: apt-private/private-output.cc:663 #, c-format msgid "%lu reinstalled, " msgstr "%lu wedi ailsefydlu, " -#: apt-private/private-output.cc:664 +#: apt-private/private-output.cc:665 #, c-format msgid "%lu downgraded, " msgstr "%lu wedi eu israddio, " -#: apt-private/private-output.cc:666 +#: apt-private/private-output.cc:667 #, c-format msgid "%lu to remove and %lu not upgraded.\n" msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n" -#: apt-private/private-output.cc:670 +#: apt-private/private-output.cc:671 #, c-format msgid "%lu not fully installed or removed.\n" msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" @@ -1495,7 +1502,7 @@ msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n" #. e.g. "Do you want to continue? [Y/n] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:692 +#: apt-private/private-output.cc:693 msgid "[Y/n]" msgstr "" @@ -1503,21 +1510,21 @@ msgstr "" #. e.g. "Should this file be removed? [y/N] " #. The user has to answer with an input matching the #. YESEXPR/NOEXPR defined in your l10n. -#: apt-private/private-output.cc:698 +#: apt-private/private-output.cc:699 msgid "[y/N]" msgstr "" #. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set -#: apt-private/private-output.cc:709 +#: apt-private/private-output.cc:710 msgid "Y" msgstr "I" #. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set -#: apt-private/private-output.cc:715 +#: apt-private/private-output.cc:716 msgid "N" msgstr "" -#: apt-private/private-output.cc:737 apt-pkg/cachefilter.cc:33 +#: apt-private/private-output.cc:738 apt-pkg/cachefilter.cc:33 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -1576,10 +1583,6 @@ msgstr "Wedi Gorffen" msgid "Full Text Search" msgstr "" -#: apt-private/private-show.cc:81 apt-private/private-show.cc:86 -msgid "unknown" -msgstr "" - #: apt-private/private-show.cc:152 #, c-format msgid "There is %lu additional record. Please use the '-a' switch to see it" @@ -1690,11 +1693,11 @@ msgstr "Methwyd agor ffeil %s" msgid "[Mirror: %s]" msgstr "" -#: methods/rsh.cc:99 ftparchive/multicompress.cc:168 +#: methods/rsh.cc:98 ftparchive/multicompress.cc:168 msgid "Failed to create IPC pipe to subprocess" msgstr "Methwyd creu pibell cyfathrebu at isbroses" -#: methods/rsh.cc:340 +#: methods/rsh.cc:339 msgid "Connection closed prematurely" msgstr "Caewyd y cysylltiad yn gynnar" @@ -2018,31 +2021,38 @@ msgstr " Does dim cofnod gwrthwneud gan %s\n" msgid "realloc - Failed to allocate memory" msgstr "realloc - Methwyd neilltuo cof" -#: ftparchive/override.cc:35 ftparchive/override.cc:143 +#: ftparchive/override.cc:35 ftparchive/override.cc:139 #, c-format msgid "Unable to open %s" msgstr "Ni ellir agor %s" -#: ftparchive/override.cc:61 ftparchive/override.cc:167 +#. skip spaces +#. find end of word +#: ftparchive/override.cc:65 +#, fuzzy, c-format +msgid "Malformed override %s line %llu (%s)" +msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" + +#: ftparchive/override.cc:124 ftparchive/override.cc:198 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Methwydd darllen y ffeil dargyfeirio %s" + +#: ftparchive/override.cc:163 #, fuzzy, c-format msgid "Malformed override %s line %llu #1" msgstr "Gwrthwneud camffurfiol %s llinell %lu #1" -#: ftparchive/override.cc:75 ftparchive/override.cc:179 +#: ftparchive/override.cc:175 #, fuzzy, c-format msgid "Malformed override %s line %llu #2" msgstr "Gwrthwneud camffurfiol %s llinell %lu #2" -#: ftparchive/override.cc:89 ftparchive/override.cc:192 +#: ftparchive/override.cc:188 #, fuzzy, c-format msgid "Malformed override %s line %llu #3" msgstr "Gwrthwneud camffurfiol %s llinell %lu #3" -#: ftparchive/override.cc:128 ftparchive/override.cc:202 -#, c-format -msgid "Failed to read the override file %s" -msgstr "Methwydd darllen y ffeil dargyfeirio %s" - #: ftparchive/multicompress.cc:70 #, fuzzy, c-format msgid "Unknown compression algorithm '%s'" @@ -2071,20 +2081,20 @@ msgstr "Plentyn Cywasgu" msgid "Internal error, failed to create %s" msgstr "Gwall Mewnol, Methwyd creu %s" -#: ftparchive/multicompress.cc:304 +#: ftparchive/multicompress.cc:302 msgid "IO to subprocess/file failed" msgstr "Methodd MA i isbroses/ffeil" -#: ftparchive/multicompress.cc:342 +#: ftparchive/multicompress.cc:340 msgid "Failed to read while computing MD5" msgstr "Methwyd darllen wrth gyfrifo MD5" -#: ftparchive/multicompress.cc:358 +#: ftparchive/multicompress.cc:356 #, c-format msgid "Problem unlinking %s" msgstr "Gwall wrth datgysylltu %s" -#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187 +#: ftparchive/multicompress.cc:371 apt-inst/extract.cc:187 #, c-format msgid "Failed to rename %s to %s" msgstr "Methwyd ailenwi %s at %s" @@ -2224,12 +2234,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:50 apt-inst/dirstream.cc:55 +#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54 #, fuzzy, c-format msgid "Failed to write file %s" msgstr "Methwyd ysgrifennu ffeil %s" -#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106 +#: apt-inst/dirstream.cc:105 #, c-format msgid "Failed to close file %s" msgstr "Methwyd cau ffeil %s" @@ -2346,14 +2356,14 @@ msgid "" "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:440 +#: apt-pkg/contrib/mmap.cc:446 #, c-format msgid "" "Unable to increase the size of the MMap as the limit of %lu bytes is already " "reached." msgstr "" -#: apt-pkg/contrib/mmap.cc:443 +#: apt-pkg/contrib/mmap.cc:449 msgid "" "Unable to increase size of the MMap as automatic growing is disabled by user." msgstr "" @@ -2762,7 +2772,7 @@ msgstr "Methwyd ysgrifennu ffeil %s" msgid "Unable to parse package file %s (1)" msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" -#: apt-pkg/tagfile.cc:231 +#: apt-pkg/tagfile.cc:235 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" @@ -3295,49 +3305,49 @@ msgstr "" msgid "Hash mismatch for: %s" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/cacheset.cc:467 +#: apt-pkg/cacheset.cc:469 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'" -#: apt-pkg/cacheset.cc:470 +#: apt-pkg/cacheset.cc:472 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " -#: apt-pkg/cacheset.cc:581 +#: apt-pkg/cacheset.cc:583 #, fuzzy, c-format msgid "Couldn't find task '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:587 +#: apt-pkg/cacheset.cc:589 #, fuzzy, c-format msgid "Couldn't find any package by regex '%s'" msgstr "Methwyd canfod pecyn %s" -#: apt-pkg/cacheset.cc:598 +#: apt-pkg/cacheset.cc:600 #, c-format msgid "Can't select versions from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612 +#: apt-pkg/cacheset.cc:607 apt-pkg/cacheset.cc:614 #, c-format msgid "" "Can't select installed nor candidate version from package '%s' as it has " "neither of them" msgstr "" -#: apt-pkg/cacheset.cc:619 +#: apt-pkg/cacheset.cc:621 #, c-format msgid "Can't select newest version from package '%s' as it is purely virtual" msgstr "" -#: apt-pkg/cacheset.cc:627 +#: apt-pkg/cacheset.cc:629 #, c-format msgid "Can't select candidate version from package %s as it has no candidate" msgstr "" -#: apt-pkg/cacheset.cc:635 +#: apt-pkg/cacheset.cc:637 #, c-format msgid "Can't select installed version from package %s as it is not installed" msgstr "" @@ -3385,12 +3395,12 @@ msgstr "" msgid "Installing %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:978 +#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:977 #, fuzzy, c-format msgid "Configuring %s" msgstr "Yn cysylltu i %s" -#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:985 +#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984 #, fuzzy, c-format msgid "Removing %s" msgstr "Yn agor %s" @@ -3411,111 +3421,111 @@ msgid "Running post-installation trigger %s" msgstr "" #. FIXME: use a better string after freeze -#: apt-pkg/deb/dpkgpm.cc:809 +#: apt-pkg/deb/dpkgpm.cc:808 #, fuzzy, c-format msgid "Directory '%s' missing" msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll." -#: apt-pkg/deb/dpkgpm.cc:824 apt-pkg/deb/dpkgpm.cc:846 +#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845 #, fuzzy, c-format msgid "Could not open file '%s'" msgstr "Methwyd agor ffeil %s" -#: apt-pkg/deb/dpkgpm.cc:971 +#: apt-pkg/deb/dpkgpm.cc:970 #, fuzzy, c-format msgid "Preparing %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:972 +#: apt-pkg/deb/dpkgpm.cc:971 #, fuzzy, c-format msgid "Unpacking %s" msgstr "Yn agor %s" -#: apt-pkg/deb/dpkgpm.cc:977 +#: apt-pkg/deb/dpkgpm.cc:976 #, fuzzy, c-format msgid "Preparing to configure %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:979 +#: apt-pkg/deb/dpkgpm.cc:978 #, fuzzy, c-format msgid "Installed %s" msgstr " Wedi Sefydlu: " -#: apt-pkg/deb/dpkgpm.cc:984 +#: apt-pkg/deb/dpkgpm.cc:983 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:986 +#: apt-pkg/deb/dpkgpm.cc:985 #, fuzzy, c-format msgid "Removed %s" msgstr "Argymell" -#: apt-pkg/deb/dpkgpm.cc:991 +#: apt-pkg/deb/dpkgpm.cc:990 #, fuzzy, c-format msgid "Preparing to completely remove %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/deb/dpkgpm.cc:992 +#: apt-pkg/deb/dpkgpm.cc:991 #, fuzzy, c-format msgid "Completely removed %s" msgstr "Methwyd dileu %s" -#: apt-pkg/deb/dpkgpm.cc:1047 +#: apt-pkg/deb/dpkgpm.cc:1046 msgid "ioctl(TIOCGWINSZ) failed" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1050 apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1049 apt-pkg/deb/dpkgpm.cc:1070 #, fuzzy, c-format msgid "Can not write log (%s)" msgstr "Ni ellir ysgrifennu i %s" -#: apt-pkg/deb/dpkgpm.cc:1050 +#: apt-pkg/deb/dpkgpm.cc:1049 msgid "Is /dev/pts mounted?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1071 +#: apt-pkg/deb/dpkgpm.cc:1070 msgid "Is stdout a terminal?" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1559 +#: apt-pkg/deb/dpkgpm.cc:1558 msgid "Operation was interrupted before it could finish" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1621 +#: apt-pkg/deb/dpkgpm.cc:1620 msgid "No apport report written because MaxReports is reached already" msgstr "" #. check if its not a follow up error -#: apt-pkg/deb/dpkgpm.cc:1626 +#: apt-pkg/deb/dpkgpm.cc:1625 msgid "dependency problems - leaving unconfigured" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1628 +#: apt-pkg/deb/dpkgpm.cc:1627 msgid "" "No apport report written because the error message indicates its a followup " "error from a previous failure." msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1634 +#: apt-pkg/deb/dpkgpm.cc:1633 msgid "" "No apport report written because the error message indicates a disk full " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1641 +#: apt-pkg/deb/dpkgpm.cc:1640 msgid "" "No apport report written because the error message indicates a out of memory " "error" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1648 apt-pkg/deb/dpkgpm.cc:1654 +#: apt-pkg/deb/dpkgpm.cc:1647 apt-pkg/deb/dpkgpm.cc:1653 msgid "" "No apport report written because the error message indicates an issue on the " "local system" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:1675 +#: apt-pkg/deb/dpkgpm.cc:1674 msgid "" "No apport report written because the error message indicates a dpkg I/O error" msgstr "" |