msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-12-07 14:40+0100\n"
+"POT-Creation-Date: 2014-02-13 10:19+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"
msgstr "Cyfanswm Gofod Cyfrifwyd: "
#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
-#: apt-private/private-show.cc:52
+#: apt-private/private-show.cc:55
#, c-format
msgid "Package file %s is out of sync."
msgstr "Nid yw'r ffeil pecyn %s yn gydamseredig."
#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
-#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
+#: apt-private/private-show.cc:167 apt-private/private-show.cc:169
msgid "No packages found"
msgstr "Canfuwyd dim pecyn"
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"
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:1524 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
-#: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1580 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:591
#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
#, fuzzy, c-format
msgid "%s %s for %s compiled on %s %s\n"
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:141
#, fuzzy, c-format
msgid "Failed to mount '%s' to '%s'"
msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/apt-cdrom.cc:174
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
" -c=? Darllen y ffeil cyfluniad\n"
" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: cmdline/apt-get.cc:313
+#: cmdline/apt-get.cc:244
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:326
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:329
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:366
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:422
#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+msgid "Can not find version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:398
+#: cmdline/apt-get.cc:453
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:403 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:405 cmdline/apt-mark.cc:72
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:72
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:413 cmdline/apt-mark.cc:116
+#: cmdline/apt-get.cc:468 cmdline/apt-mark.cc:116
msgid ""
"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
"instead."
msgstr ""
-#: cmdline/apt-get.cc:482 cmdline/apt-get.cc:490
+#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:518 cmdline/apt-get.cc:555
+#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:667
+#: 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:707 cmdline/apt-get.cc:1002
+#: 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:724
+#: 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:729
+#: cmdline/apt-get.cc:787
#, c-format
msgid ""
"Please use:\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:782
+#: 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:805 cmdline/apt-get.cc:808
+#: 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:819
+#: 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:828
+#: 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:833
+#: 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:839
+#: cmdline/apt-get.cc:897
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:860
+#: cmdline/apt-get.cc:918
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:865 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:891
+#: 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:903
+#: cmdline/apt-get.cc:961
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:904
+#: cmdline/apt-get.cc:962
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:926
+#: cmdline/apt-get.cc:984
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:946
+#: cmdline/apt-get.cc:1004
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:965
+#: 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:990
+#: 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:1014 cmdline/apt-get.cc:1017
+#: 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:1037
+#: 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:1207
+#: cmdline/apt-get.cc:1265
#, fuzzy, c-format
msgid ""
"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1283
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1248
+#: 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:1287
+#: cmdline/apt-get.cc:1345
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because candidate version of "
"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:1293
+#: cmdline/apt-get.cc:1351
#, fuzzy, c-format
msgid ""
"%s dependency for %s cannot be satisfied because package %s has no candidate "
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:1316
+#: 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:1331
+#: 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:1336
+#: cmdline/apt-get.cc:1394
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:1429 cmdline/apt-get.cc:1441
+#: 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:1529
+#: cmdline/apt-get.cc:1585
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:1570
+#: cmdline/apt-get.cc:1626
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
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:223
-#: apt-pkg/deb/dpkgpm.cc:1174
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:217
+#: apt-pkg/deb/dpkgpm.cc:1182
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
"Commands:\n"
" auto - Mark the given packages as automatically installed\n"
" manual - Mark the given packages as manually installed\n"
+" hold - Mark a package as held back\n"
+" unhold - Unset a package set as held back\n"
+" showauto - Print the list of automatically installed packages\n"
+" showmanual - Print the list of manually installed packages\n"
+" showhold - Print the list of package on hold\n"
"\n"
"Options:\n"
" -h This help text.\n"
"Usage: apt [options] command\n"
"\n"
"CLI for apt.\n"
-"Commands: \n"
+"Basic commands: \n"
" list - list packages based on package names\n"
" search - search in package descriptions\n"
" show - show package details\n"
"\n"
" update - update list of available packages\n"
+"\n"
" install - install packages\n"
-" upgrade - upgrade the systems packages\n"
+" remove - remove packages\n"
+"\n"
+" upgrade - upgrade the system by installing/upgrading packages\n"
+"full-upgrade - upgrade the system by removing/installing/upgrading packages\n"
"\n"
" edit-sources - edit the source information file\n"
msgstr ""
msgid "Disk not found."
msgstr "Ffeil heb ei ganfod"
-#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:275
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
msgid "File not found"
msgstr "Ffeil heb ei ganfod"
-#: methods/copy.cc:46 methods/gzip.cc:105 methods/gzip.cc:114
-#: methods/rred.cc:512 methods/rred.cc:521
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
msgid "Failed to stat"
msgstr "Methwyd stat()"
-#: methods/copy.cc:83 methods/gzip.cc:111 methods/rred.cc:518
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
msgid "Failed to set modification time"
msgstr "Methwyd gosod amser newid"
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."
"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/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
-#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
+#: 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:21
+#: 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 "
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"
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"
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"
-#: apt-private/private-list.cc:143
+#: apt-private/private-list.cc:147
msgid "Listing"
msgstr ""
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: apt-private/private-output.cc:198
-msgid "installed,upgradable to: "
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
+#: apt-private/private-show.cc:86
+msgid "unknown"
msgstr ""
-#: apt-private/private-output.cc:204
+#: apt-private/private-output.cc:201
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:205
#, fuzzy
msgid "[installed,local]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:207
+#: apt-private/private-output.cc:208
msgid "[installed,auto-removable]"
msgstr ""
-#: apt-private/private-output.cc:209
+#: apt-private/private-output.cc:210
#, fuzzy
msgid "[installed,automatic]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:211
+#: apt-private/private-output.cc:212
#, fuzzy
msgid "[installed]"
msgstr " [Sefydliwyd]"
-#: apt-private/private-output.cc:217
-msgid "[upgradable from: "
+#: apt-private/private-output.cc:216
+#, c-format
+msgid "[upgradable from: %s]"
msgstr ""
-#: apt-private/private-output.cc:223
+#: apt-private/private-output.cc:220
msgid "[residual-config]"
msgstr ""
-#: apt-private/private-output.cc:314
+#: apt-private/private-output.cc:320
msgid "The following packages have unmet dependencies:"
msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: apt-private/private-output.cc:404
+#: apt-private/private-output.cc:410
#, c-format
msgid "but %s is installed"
msgstr "ond mae %s wedi ei sefydlu"
-#: apt-private/private-output.cc:406
+#: apt-private/private-output.cc:412
#, c-format
msgid "but %s is to be installed"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:413
+#: apt-private/private-output.cc:419
msgid "but it is not installable"
msgstr "ond ni ellir ei sefydlu"
-#: apt-private/private-output.cc:415
+#: apt-private/private-output.cc:421
msgid "but it is a virtual package"
msgstr "ond mae'n becyn rhithwir"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:424
msgid "but it is not installed"
msgstr "ond nid yw wedi ei sefydlu"
-#: apt-private/private-output.cc:418
+#: apt-private/private-output.cc:424
msgid "but it is not going to be installed"
msgstr "ond nid yw'n mynd i gael ei sefydlu"
-#: apt-private/private-output.cc:423
+#: apt-private/private-output.cc:429
msgid " or"
msgstr " neu"
-#: apt-private/private-output.cc:452
+#: apt-private/private-output.cc:458
msgid "The following NEW packages will be installed:"
msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-private/private-output.cc:478
+#: apt-private/private-output.cc:484
msgid "The following packages will be REMOVED:"
msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: apt-private/private-output.cc:500
+#: apt-private/private-output.cc:506
#, fuzzy
msgid "The following packages have been kept back:"
msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
-#: apt-private/private-output.cc:521
+#: apt-private/private-output.cc:527
#, fuzzy
msgid "The following packages will be upgraded:"
msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: apt-private/private-output.cc:542
+#: apt-private/private-output.cc:548
#, fuzzy
msgid "The following packages will be DOWNGRADED:"
msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: apt-private/private-output.cc:562
+#: apt-private/private-output.cc:568
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: apt-private/private-output.cc:617
+#: apt-private/private-output.cc:623
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: apt-private/private-output.cc:625
+#: apt-private/private-output.cc:631
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: apt-private/private-output.cc:656
+#: apt-private/private-output.cc:662
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: apt-private/private-output.cc:660
+#: apt-private/private-output.cc:666
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: apt-private/private-output.cc:662
+#: apt-private/private-output.cc:668
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: apt-private/private-output.cc:664
+#: apt-private/private-output.cc:670
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: apt-private/private-output.cc:668
+#: apt-private/private-output.cc:674
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
#. 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:690
+#: apt-private/private-output.cc:696
msgid "[Y/n]"
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:696
+#: apt-private/private-output.cc:702
msgid "[y/N]"
msgstr ""
#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:707
+#: apt-private/private-output.cc:713
msgid "Y"
msgstr "I"
#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:713
+#: apt-private/private-output.cc:719
msgid "N"
msgstr ""
-#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: apt-private/private-upgrade.cc:18
+#: apt-private/private-upgrade.cc:19
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: apt-private/private-upgrade.cc:23
+#: apt-private/private-upgrade.cc:24
#, fuzzy
msgid "Internal error, Upgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: apt-private/private-upgrade.cc:25
+#: apt-private/private-upgrade.cc:26
msgid "Done"
msgstr "Wedi Gorffen"
msgid "Full Text Search"
msgstr ""
-#: apt-private/private-show.cc:106
+#: apt-private/private-show.cc:152
+#, c-format
+msgid "There is %lu additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %lu additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:159
msgid "not a real package (virtual)"
msgstr ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: apt-private/private-sources.cc:41
+#: apt-private/private-sources.cc:45
#, fuzzy, c-format
msgid "Failed to parse %s. Edit again? "
msgstr "Methwyd ailenwi %s at %s"
-#: apt-private/private-sources.cc:52
+#: apt-private/private-sources.cc:57
#, c-format
msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
#. Only warn if there is no sources.list file.
#: methods/mirror.cc:95 apt-inst/extract.cc:464
#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
-#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:271
+#: apt-pkg/sourcelist.cc:277 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
#, c-format
msgid "Unable to read %s"
msgid "[Mirror: %s]"
msgstr ""
-#: methods/rred.cc:491
-#, c-format
-msgid ""
-"Could not patch %s with mmap and with file operation usage - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rred.cc:496
-#, c-format
-msgid ""
-"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
-"to be corrupt."
-msgstr ""
-
-#: methods/rsh.cc:99 ftparchive/multicompress.cc:168
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
msgid "Failed to create IPC pipe to subprocess"
msgstr "Methwyd creu pibell cyfathrebu at isbroses"
-#: methods/rsh.cc:340
+#: methods/rsh.cc:339
msgid "Connection closed prematurely"
msgstr "Caewyd y cysylltiad yn gynnar"
msgid "Merging available information"
msgstr "Yn cyfuno manylion Ar Gael"
-#: cmdline/apt-extracttemplates.cc:102
+#: cmdline/apt-extracttemplates.cc:100
#, c-format
msgid "%s not a valid DEB package."
msgstr "Nid yw %s yn becyn DEB dilys."
# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:236
+#: cmdline/apt-extracttemplates.cc:234
#, fuzzy
msgid ""
"Usage: apt-extracttemplates file1 [file2 ...]\n"
" -c=? Darllen y ffeil cyfluniad hwn\n"
" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:271 apt-pkg/pkgcachegen.cc:1388
+#: cmdline/apt-extracttemplates.cc:266 apt-pkg/pkgcachegen.cc:1388
#, c-format
msgid "Unable to write to %s"
msgstr "Ni ellir ysgrifennu i %s"
-#: cmdline/apt-extracttemplates.cc:313
+#: cmdline/apt-extracttemplates.cc:308
msgid "Cannot get debconf version. Is debconf installed?"
msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
msgid "realloc - Failed to allocate memory"
msgstr "realloc - Methwyd neilltuo cof"
-#: ftparchive/override.cc:35 ftparchive/override.cc:143
+#: ftparchive/override.cc:35 ftparchive/override.cc:139
#, c-format
msgid "Unable to open %s"
msgstr "Ni ellir agor %s"
-#: ftparchive/override.cc:61 ftparchive/override.cc:167
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:65
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#: ftparchive/override.cc:124 ftparchive/override.cc:198
+#, c-format
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+
+#: ftparchive/override.cc:163
#, fuzzy, c-format
msgid "Malformed override %s line %llu #1"
msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-#: ftparchive/override.cc:75 ftparchive/override.cc:179
+#: ftparchive/override.cc:175
#, fuzzy, c-format
msgid "Malformed override %s line %llu #2"
msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
-#: ftparchive/override.cc:89 ftparchive/override.cc:192
+#: ftparchive/override.cc:188
#, fuzzy, c-format
msgid "Malformed override %s line %llu #3"
msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
-#: ftparchive/override.cc:128 ftparchive/override.cc:202
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
-
-#: ftparchive/multicompress.cc:70
+#: ftparchive/multicompress.cc:71
#, fuzzy, c-format
msgid "Unknown compression algorithm '%s'"
msgstr "Dull Cywasgu Anhysbys '%s'"
-#: ftparchive/multicompress.cc:100
+#: ftparchive/multicompress.cc:101
#, c-format
msgid "Compressed output %s needs a compression set"
msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
-#: ftparchive/multicompress.cc:189
+#: ftparchive/multicompress.cc:190
msgid "Failed to create FILE*"
msgstr "Methwyd creu FILE*"
-#: ftparchive/multicompress.cc:192
+#: ftparchive/multicompress.cc:193
msgid "Failed to fork"
msgstr "Methodd fork()"
-#: ftparchive/multicompress.cc:206
+#: ftparchive/multicompress.cc:207
#, fuzzy
msgid "Compress child"
msgstr "Plentyn Cywasgu"
-#: ftparchive/multicompress.cc:229
+#: ftparchive/multicompress.cc:230
#, fuzzy, c-format
msgid "Internal error, failed to create %s"
msgstr "Gwall Mewnol, Methwyd creu %s"
-#: ftparchive/multicompress.cc:304
+#: ftparchive/multicompress.cc:303
msgid "IO to subprocess/file failed"
msgstr "Methodd MA i isbroses/ffeil"
-#: ftparchive/multicompress.cc:342
+#: ftparchive/multicompress.cc:341
msgid "Failed to read while computing MD5"
msgstr "Methwyd darllen wrth gyfrifo MD5"
-#: ftparchive/multicompress.cc:358
+#: ftparchive/multicompress.cc:357
#, c-format
msgid "Problem unlinking %s"
msgstr "Gwall wrth datgysylltu %s"
-#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:187
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
#, c-format
msgid "Failed to rename %s to %s"
msgstr "Methwyd ailenwi %s at %s"
msgid "Failed to write file %s"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-inst/dirstream.cc:98 apt-inst/dirstream.cc:106
+#: apt-inst/dirstream.cc:106
#, c-format
msgid "Failed to close file %s"
msgstr "Methwyd cau ffeil %s"
"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 ""
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:237
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:230
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
msgid "write, still have %llu to write but couldn't"
msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:1726
+#: apt-pkg/contrib/fileutl.cc:1732
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1738
+#: apt-pkg/contrib/fileutl.cc:1744
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1749
+#: apt-pkg/contrib/fileutl.cc:1755
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1762
+#: apt-pkg/contrib/fileutl.cc:1768
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:76
+#: apt-pkg/contrib/gpgv.cc:70
#, fuzzy, c-format
msgid "No keyring installed in %s."
msgstr "Yn Erthylu'r Sefydliad."
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)"
-#: apt-pkg/sourcelist.cc:96
+#: apt-pkg/sourcelist.cc:118
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+
+#: apt-pkg/sourcelist.cc:161
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:164
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:110
+#: apt-pkg/sourcelist.cc:175
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:116
+#: apt-pkg/sourcelist.cc:181
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:119
+#: apt-pkg/sourcelist.cc:184
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:132
+#: apt-pkg/sourcelist.cc:197
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/sourcelist.cc:134
+#: apt-pkg/sourcelist.cc:199
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/sourcelist.cc:137
+#: apt-pkg/sourcelist.cc:202
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-#: apt-pkg/sourcelist.cc:143
+#: apt-pkg/sourcelist.cc:208
#, fuzzy, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-#: apt-pkg/sourcelist.cc:150
+#: apt-pkg/sourcelist.cc:215
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
msgstr ""
"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:248
+#: apt-pkg/sourcelist.cc:326
#, c-format
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:495
+#: apt-pkg/sourcelist.cc:338 apt-pkg/cdrom.cc:495
#, c-format
msgid "Line %u too long in source list %s."
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/sourcelist.cc:289
+#: apt-pkg/sourcelist.cc:362
#, c-format
msgid "Malformed line %u in source list %s (type)"
msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-#: apt-pkg/sourcelist.cc:293
+#: apt-pkg/sourcelist.cc:366
#, fuzzy, c-format
msgid "Type '%s' is not known on line %u in source list %s"
msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+#: apt-pkg/sourcelist.cc:407
+#, fuzzy, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
+
#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
+#: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:811
#, fuzzy, c-format
msgid "List directory %spartial is missing."
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
msgstr ""
# FIXME: literal
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:414
#, fuzzy, c-format
msgid "Invalid record in the preferences file %s, no Package header"
msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
# FIXME: tense
-#: apt-pkg/policy.cc:432
+#: apt-pkg/policy.cc:436
#, c-format
msgid "Did not understand pin type %s"
msgstr "Methwyd daeall y math pin %s"
-#: apt-pkg/policy.cc:440
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
msgid "Invalid file format"
msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:1419
+#: apt-pkg/acquire-item.cc:1570
#, c-format
msgid ""
"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
msgstr ""
# FIXME: number?
-#: apt-pkg/acquire-item.cc:1435
+#: apt-pkg/acquire-item.cc:1586
#, fuzzy, c-format
msgid "Unable to find hash sum for '%s' in Release file"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/acquire-item.cc:1477
+#: apt-pkg/acquire-item.cc:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1515
+#: apt-pkg/acquire-item.cc:1666
#, c-format
msgid ""
"Release file for %s is expired (invalid since %s). Updates for this "
"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1537
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1567
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
"An error occurred during the signature verification. The repository is not "
msgstr ""
#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
+#: apt-pkg/acquire-item.cc:1728 apt-pkg/acquire-item.cc:1733
#, c-format
msgid "GPG error: %s: %s"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1705
+#: apt-pkg/acquire-item.cc:1856
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"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:1771
+#: apt-pkg/acquire-item.cc:1922
#, c-format
msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: apt-pkg/acquire-item.cc:1829
+#: apt-pkg/acquire-item.cc:1980
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/cdrom.cc:576
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:585 apt-pkg/cdrom.cc:682
-msgid "Identifying.. "
-msgstr ""
-
-#: apt-pkg/cdrom.cc:613
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:622 apt-pkg/cdrom.cc:915
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
-
-#: apt-pkg/cdrom.cc:642
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:660
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:665
+#: apt-pkg/cdrom.cc:588
#, fuzzy
msgid "Waiting for disc...\n"
msgstr "Yn aros am benawdau"
-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:693
+#: apt-pkg/cdrom.cc:605
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:643
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:652 apt-pkg/cdrom.cc:888
+#, fuzzy
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
+
+#: apt-pkg/cdrom.cc:667
msgid "Scanning disc for index files..\n"
msgstr ""
-#: apt-pkg/cdrom.cc:744
+#: apt-pkg/cdrom.cc:717
#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:728
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
-#: apt-pkg/cdrom.cc:782
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:811
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:828
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:830
+#: apt-pkg/cdrom.cc:803
#, fuzzy
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:865
+#: apt-pkg/cdrom.cc:838
#, fuzzy
msgid "Writing new source list\n"
msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/cdrom.cc:873
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr ""
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 ""
msgid "Execute external solver"
msgstr ""
-#: apt-pkg/install-progress.cc:50
+#: apt-pkg/install-progress.cc:51
#, c-format
msgid "Progress: [%3i%%]"
msgstr ""
-#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
msgid "Running dpkg"
msgstr ""
"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
"rai eu defnyddio yn lle."
-#: apt-pkg/deb/dpkgpm.cc:90
+#: apt-pkg/deb/dpkgpm.cc:91
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:91 apt-pkg/deb/dpkgpm.cc:977
+#: 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:92 apt-pkg/deb/dpkgpm.cc:984
+#: apt-pkg/deb/dpkgpm.cc:93 apt-pkg/deb/dpkgpm.cc:984
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:93
+#: apt-pkg/deb/dpkgpm.cc:94
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:94
+#: apt-pkg/deb/dpkgpm.cc:95
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/deb/dpkgpm.cc:96
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1041 apt-pkg/deb/dpkgpm.cc:1062
+#: apt-pkg/deb/dpkgpm.cc:1046
+msgid "ioctl(TIOCGWINSZ) failed"
+msgstr ""
+
+#: 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:1041
+#: apt-pkg/deb/dpkgpm.cc:1049
msgid "Is /dev/pts mounted?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1062
+#: apt-pkg/deb/dpkgpm.cc:1070
msgid "Is stdout a terminal?"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1545
+#: apt-pkg/deb/dpkgpm.cc:1558
msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1607
+#: 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:1612
+#: apt-pkg/deb/dpkgpm.cc:1625
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1614
+#: 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:1620
+#: 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:1627
+#: 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:1634 apt-pkg/deb/dpkgpm.cc:1640
+#: 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:1661
+#: apt-pkg/deb/dpkgpm.cc:1674
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
projects / apt.git / blobdiff