msgid ""
msgstr ""
"Project-Id-Version: APT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-12 17:42+0100\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2014-02-28 10:56+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"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: cmdline/apt-cache.cc:156
+#: cmdline/apt-cache.cc:140
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
msgstr "Mae gan y pecyn %s fersiwn %s ddibyniaeth heb ei gwrdd:\n"
-#: cmdline/apt-cache.cc:284
+#: cmdline/apt-cache.cc:268
#, fuzzy
msgid "Total package names: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:270
#, fuzzy
msgid "Total package structures: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:310
#, fuzzy
msgid " Normal packages: "
msgstr " Pecynnau Normal: "
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:311
#, fuzzy
msgid " Pure virtual packages: "
msgstr " Pecynnau Cwbl Rhithwir: "
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:312
#, fuzzy
msgid " Single virtual packages: "
msgstr " Pecynnau Rhithwir Sengl: "
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:313
#, fuzzy
msgid " Mixed virtual packages: "
msgstr " Pecynnau Rhithwir Cymysg: "
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:314
msgid " Missing: "
msgstr " Ar Goll: "
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:316
#, fuzzy
msgid "Total distinct versions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:318
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:320
#, fuzzy
msgid "Total dependencies: "
msgstr "Cyfanswm Dibyniaethau: "
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:323
#, fuzzy
msgid "Total ver/file relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:325
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:327
#, fuzzy
msgid "Total Provides mappings: "
msgstr "Cyfanswm Mapiau Darpariath: "
-#: cmdline/apt-cache.cc:355
+#: cmdline/apt-cache.cc:339
#, fuzzy
msgid "Total globbed strings: "
msgstr "Cyfanswm Llinynau Glob: "
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:353
#, fuzzy
msgid "Total dependency version space: "
msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:358
#, fuzzy
msgid "Total slack space: "
msgstr "Cyfanswm gofod Slac: "
-#: cmdline/apt-cache.cc:382
+#: cmdline/apt-cache.cc:366
#, fuzzy
msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
+#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
+#: 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:1273
+#: 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:167 apt-private/private-show.cc:169
+msgid "No packages found"
+msgstr "Canfuwyd dim pecyn"
+
+#: cmdline/apt-cache.cc:1245
#, fuzzy
msgid "You must give at least one search pattern"
msgstr "Rhaid i chi ddarparu un patrwm yn union"
-#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
-#: cmdline/apt-cache.cc:1508
-msgid "No packages found"
-msgstr "Canfuwyd dim pecyn"
+#: cmdline/apt-cache.cc:1411
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
+msgstr ""
-#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:586
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
-#: cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1536
#, fuzzy
msgid "Package files:"
msgstr "Ffeiliau Pecynnau:"
-#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
+#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
msgid "Cache is out of sync, can't x-ref a package file"
msgstr "Nid yw'r storfa yn gydamserol, ni ellir croesgyfeirio ffeil pecym"
#. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1554
+#: cmdline/apt-cache.cc:1557
#, fuzzy
msgid "Pinned packages:"
msgstr "Pecynnau wedi eu Pinio:"
-#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
msgid "(not found)"
msgstr "(heb ganfod)"
-#: cmdline/apt-cache.cc:1575
+#: cmdline/apt-cache.cc:1577
msgid " Installed: "
msgstr " Wedi Sefydlu: "
-#: cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1578
msgid " Candidate: "
msgstr " Ymgeisydd: "
-#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
msgid "(none)"
msgstr "(dim)"
-#: cmdline/apt-cache.cc:1615
+#: cmdline/apt-cache.cc:1611
#, fuzzy
msgid " Package pin: "
msgstr " Pin Pecyn: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1620
#, fuzzy
msgid " Version table:"
msgstr " Tabl Fersiynnau:"
-#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
-#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:252 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1580 cmdline/apt-helper.cc:60 cmdline/apt-mark.cc:377
+#: cmdline/apt.cc:66 cmdline/apt-extracttemplates.cc:217
+#: 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"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
-#: cmdline/apt-cache.cc:1745
+#: cmdline/apt-cache.cc:1740
#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
-" apt-cache [options] add file1 [file2 ...]\n"
" apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
" apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
"\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
+"apt-cache is a low-level tool used to query information\n"
+"from APT's binary cache files\n"
"\n"
"Commands:\n"
-" add - Add a package file to the source cache\n"
" gencaches - Build both the package and source cache\n"
" showpkg - Show some general information for a single package\n"
" showsrc - Show source records\n"
" unmet - Show unmet dependencies\n"
" search - Search the package list for a regex pattern\n"
" show - Show a readable record for the package\n"
-" showauto - Display a list of automatically installed packages\n"
" depends - Show raw dependency information for a package\n"
" rdepends - Show reverse dependency information for a package\n"
" pkgnames - List the names of all packages in the system\n"
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
-#: cmdline/apt-cdrom.cc:77
+#. }}}
+#: cmdline/apt-cdrom.cc:45
+msgid ""
+"No CD-ROM could be auto-detected or found using the default mount point.\n"
+"You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
+"cdrom' for more information about the CD-ROM auto-detection and mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:89
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
msgstr ""
-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:104
#, fuzzy
msgid "Please insert a Disc in the drive and press enter"
msgstr ""
" '%s'\n"
"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: cmdline/apt-cdrom.cc:127
+#: 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:162
+#: cmdline/apt-cdrom.cc:196
msgid "Repeat this process for the rest of the CDs in your set."
msgstr ""
-#: cmdline/apt-config.cc:41
+#: cmdline/apt-config.cc:48
msgid "Arguments not in pairs"
msgstr "Nid yw ymresymiadau mewn parau"
-#: cmdline/apt-config.cc:76
+#: cmdline/apt-config.cc:89
#, fuzzy
msgid ""
"Usage: apt-config [options] command\n"
" -c=? Darllen y ffeil cyfluniad\n"
" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: cmdline/apt-extracttemplates.cc:98
-#, c-format
-msgid "%s not a valid DEB package."
-msgstr "Nid yw %s yn becyn DEB dilys."
-
-# FIXME: "debian"
-#: cmdline/apt-extracttemplates.cc:232
-#, fuzzy
-msgid ""
-"Usage: apt-extracttemplates file1 [file2 ...]\n"
-"\n"
-"apt-extracttemplates is a tool to extract config and template info\n"
-"from debian packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -t Set the temp dir\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-msgstr ""
-"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
-"templed o becynnau Debian.\n"
-"\n"
-"Opsiynnau:\n"
-" -h Dangos y testun cymorth hwn\n"
-" -t Gosod y cyfeiriadur dros dro\n"
-" -c=? Darllen y ffeil cyfluniad hwn\n"
-" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
-#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
+#: cmdline/apt-get.cc:244
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-extracttemplates.cc:309
-msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+#: cmdline/apt-get.cc:326
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Methwyd canfod pecyn %s"
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
-msgid "Package extension list is too long"
-msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
+#: cmdline/apt-get.cc:329
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Methwyd canfod pecyn %s"
-#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
-#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
-#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
+#: cmdline/apt-get.cc:366
#, fuzzy, c-format
-msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: ftparchive/apt-ftparchive.cc:260
-msgid "Source extension list is too long"
-msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+#: cmdline/apt-get.cc:422
+#, c-format
+msgid "Can not find version '%s' of package '%s'"
+msgstr ""
-#: ftparchive/apt-ftparchive.cc:377
-msgid "Error writing header to contents file"
-msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
+#: cmdline/apt-get.cc:453
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Methwyd canfod pecyn %s"
-#: ftparchive/apt-ftparchive.cc:407
+#: cmdline/apt-get.cc:458 cmdline/apt-mark.cc:70
#, fuzzy, c-format
-msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
-# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:595
-#, fuzzy
+#: 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:468 cmdline/apt-mark.cc:116
msgid ""
-"Usage: apt-ftparchive [options] command\n"
-"Commands: packages binarypath [overridefile [pathprefix]]\n"
-" sources srcpath [overridefile [pathprefix]]\n"
-" contents path\n"
-" release path\n"
-" generate config [groups]\n"
-" clean config\n"
-"\n"
-"apt-ftparchive generates index files for Debian archives. It supports\n"
-"many styles of generation from fully automated to functional replacements\n"
-"for dpkg-scanpackages and dpkg-scansources\n"
-"\n"
-"apt-ftparchive generates Package files from a tree of .debs. The\n"
-"Package file contains the contents of all the control fields from\n"
-"each package as well as the MD5 hash and filesize. An override file\n"
-"is supported to force the value of Priority and Section.\n"
-"\n"
-"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
-"The --source-override option can be used to specify a src override file\n"
-"\n"
-"The 'packages' and 'sources' command should be run in the root of the\n"
-"tree. BinaryPath should point to the base of the recursive search and \n"
-"override file should contain the override flags. Pathprefix is\n"
-"appended to the filename fields if present. Example usage from the \n"
-"Debian archive:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" --md5 Control MD5 generation\n"
-" -s=? Source override file\n"
-" -q Quiet\n"
-" -d=? Select the optional caching database\n"
-" --no-delink Enable delinking debug mode\n"
-" --contents Control contents file generation\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option"
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
msgstr ""
-"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
-"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
-" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
-" contents llwybr\n"
-" release llwybr\n"
-" generate cyfluniad [grŵpiau]\n"
-" clean cyfluniad\n"
-"\n"
-"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
-"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
-"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
-"\n"
-"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
-"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
-"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
-"gorfodi'r gwerthoedd Priority a Section.\n"
-"\n"
-"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
-".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
-"gwrthwneud ffynhonell.\n"
-"\n"
-"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
-"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
-"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
-"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
-"defnydd o'r archif Debian:\n"
-" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
-" dists/potato/main/binary-i386/Packages\n"
-"\n"
-"Opsiynnau:\n"
-" -h Y testun cymorth hwn\n"
-" --md5 Rheoli cynhyrchiad stwnch MD5\n"
-" -s=? Ffeil gwrthwneud ffynhonell\n"
-" -q Tawel\n"
-" -d=? Dewis cronda data storfa opsiynnol\n"
-" --no-delink Galluogi'r modd datgysylltu datnamu\n"
-" --contents Rheoli cynhyrchiad ffeil cynnwys\n"
-" -c=? Darllen y ffeil cyfluniad hwn\n"
-" -o=? Gosod opsiwn cyfluniad mympwyol"
-#: ftparchive/apt-ftparchive.cc:801
-msgid "No selections matched"
-msgstr "Dim dewisiadau'n cyfateb"
+#: cmdline/apt-get.cc:537 cmdline/apt-get.cc:545
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: ftparchive/apt-ftparchive.cc:879
-#, c-format
-msgid "Some files are missing in the package file group `%s'"
-msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'"
+#: cmdline/apt-get.cc:573 cmdline/apt-get.cc:610
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: ftparchive/cachedb.cc:43
-#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+#: 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"
-#: ftparchive/cachedb.cc:61
+#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1060
#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: ftparchive/cachedb.cc:72
+#: cmdline/apt-get.cc:782
+#, c-format
msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
msgstr ""
-#: ftparchive/cachedb.cc:77
+#: cmdline/apt-get.cc:787
#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni ellir agor y ffeil DB2 %s: %s"
+msgid ""
+"Please use:\n"
+"bzr branch %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
+#: 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"
-#: ftparchive/cachedb.cc:242
-msgid "Archive has no control record"
-msgstr "Does dim cofnod rheoli gan yr archif"
+#: 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"
-#: ftparchive/cachedb.cc:448
-msgid "Unable to get a cursor"
-msgstr "Ni ellir cael cyrchydd"
+#: 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"
-#: ftparchive/writer.cc:73
+#. 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:886
#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: ftparchive/writer.cc:78
+#. 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:891
#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Rh: Ni ellir gwneud stat() o %s\n"
+msgid "Need to get %sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: ftparchive/writer.cc:134
-msgid "E: "
-msgstr "G: "
+#: cmdline/apt-get.cc:897
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
+msgstr "Cyrchu Ffynhonell %s\n"
-#: ftparchive/writer.cc:136
-msgid "W: "
-msgstr "Rh: "
+#: cmdline/apt-get.cc:918
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."
-#: ftparchive/writer.cc:143
-msgid "E: Errors apply to file "
-msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+#: 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"
-#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
+#: cmdline/apt-get.cc:949
#, c-format
-msgid "Failed to resolve %s"
-msgstr "Methwyd datrys %s"
-
-#: ftparchive/writer.cc:174
-msgid "Tree walking failed"
-msgstr "Methwyd cerdded y goeden"
+msgid "Skipping unpack of already unpacked source in %s\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: ftparchive/writer.cc:201
+#: cmdline/apt-get.cc:961
#, c-format
-msgid "Failed to open %s"
-msgstr "Methwyd agor %s"
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-# FIXME
-#: ftparchive/writer.cc:260
+#: cmdline/apt-get.cc:962
#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
-#: ftparchive/writer.cc:268
+#: cmdline/apt-get.cc:984
#, c-format
-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
+msgid "Build command '%s' failed.\n"
+msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: ftparchive/writer.cc:272
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
+#: cmdline/apt-get.cc:1004
+msgid "Child process failed"
+msgstr "Methodd proses plentyn"
+
+#: 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"
-#: ftparchive/writer.cc:279
+#: cmdline/apt-get.cc:1048
#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
-#: ftparchive/writer.cc:289
+#: cmdline/apt-get.cc:1072 cmdline/apt-get.cc:1075
#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Tarwyd y terfyn cyswllt %sB.\n"
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: ftparchive/writer.cc:393
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
+#: 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:1265
+#, fuzzy, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
-#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
+#: cmdline/apt-get.cc:1283
#, c-format
-msgid " %s has no override entry\n"
-msgstr " Does dim cofnod gwrthwneud gan %s\n"
+msgid ""
+"%s dependency for %s cannot be satisfied because the package %s cannot be "
+"found"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
-#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
+#: cmdline/apt-get.cc:1306
#, c-format
-msgid " %s maintainer is %s not %s\n"
-msgstr " Cynaliwr %s yw %s nid %s\n"
+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"
-#: ftparchive/writer.cc:698
+#: cmdline/apt-get.cc:1345
#, fuzzy, c-format
-msgid " %s has no source override entry\n"
-msgstr " Does dim cofnod gwrthwneud gan %s\n"
+msgid ""
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"
+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"
-#: ftparchive/writer.cc:702
+#: cmdline/apt-get.cc:1351
#, fuzzy, c-format
-msgid " %s has no binary override entry either\n"
-msgstr " Does dim cofnod gwrthwneud gan %s\n"
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"
+msgstr ""
+"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
+"%s"
+
+#: 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:1389
+#, c-format
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: ftparchive/contents.cc:321
+#: cmdline/apt-get.cc:1394
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
+
+#: cmdline/apt-get.cc:1487 cmdline/apt-get.cc:1499
#, fuzzy, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
+msgid "Changelog for %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
+#: cmdline/apt-get.cc:1585
+#, fuzzy
+msgid "Supported modules:"
+msgstr "Modylau a Gynhelir:"
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
-#, c-format
-msgid "Unable to open %s"
-msgstr "Ni ellir agor %s"
+# FIXME: split
+#: cmdline/apt-get.cc:1626
+#, fuzzy
+msgid ""
+"Usage: apt-get [options] command\n"
+" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
+" apt-get [options] source pkg1 [pkg2 ...]\n"
+"\n"
+"apt-get is a simple command line interface for downloading and\n"
+"installing packages. The most frequently used commands are update\n"
+"and install.\n"
+"\n"
+"Commands:\n"
+" update - Retrieve new lists of packages\n"
+" upgrade - Perform an upgrade\n"
+" install - Install new packages (pkg is libc6 not libc6.deb)\n"
+" remove - Remove packages\n"
+" autoremove - Remove automatically all unused packages\n"
+" purge - Remove packages and config files\n"
+" source - Download source archives\n"
+" build-dep - Configure build-dependencies for source packages\n"
+" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
+" dselect-upgrade - Follow dselect selections\n"
+" clean - Erase downloaded archive files\n"
+" autoclean - Erase old downloaded archive files\n"
+" check - Verify that there are no broken dependencies\n"
+" changelog - Download and display the changelog for the given package\n"
+" download - Download the binary package into the current directory\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -d Download only - do NOT install or unpack archives\n"
+" -s No-act. Perform ordering simulation\n"
+" -y Assume Yes to all queries and do not prompt\n"
+" -f Attempt to correct a system with broken dependencies in place\n"
+" -m Attempt to continue if archives are unlocatable\n"
+" -u Show a list of upgraded packages as well\n"
+" -b Build the source package after fetching it\n"
+" -V Show verbose version numbers\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
+"pages for more information and options.\n"
+" This APT has Super Cow Powers.\n"
+msgstr ""
+"Defnydd: apt-get [opsiynnau] gorchymyn\n"
+" apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
+" apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
+"\n"
+"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
+"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
+"ddefnyddir amlaf.\n"
+"\n"
+"Gorchmynion:\n"
+" update - Cyrchu rhestrau pecynnau newydd\n"
+" update - Uwchraddio pecynnau wedi sefydlu\n"
+" install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
+" remove - Tynnu pecynnau\n"
+" source - Lawrlwytho archifau ffynhonell\n"
+" build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
+" dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
+" dselect-upgrade - Dilyn dewisiadau dselect\n"
+" clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
+" autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
+" check - Gwirio fod dim dibyniaethau torredig\n"
+"\n"
+"Opsiynnau:\n"
+" -h Y testun cymorth hwn.\n"
+" -q Allbwn cofnodadwy - dim dangosydd cynydd\n"
+" -qq Dim allbwn ar wahan i wallau\n"
+" -d Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
+" -s Peidio gweithredu. Gwneir efelychiad trefn.\n"
+" -y Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
+" -f Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
+" -m Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
+" -u Dangos rhestr o archifau a uwchraddir hefyd\n"
+" -b Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
+" -V Dangos rhifau fersiwn cyflawn\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
+"\n"
+"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
+"fwy o wybodaeth ac opsiynnau.\n"
+"\n"
+" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
-#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+#: cmdline/apt-helper.cc:39
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: ftparchive/override.cc:74 ftparchive/override.cc:178
-#, c-format
-msgid "Malformed override %s line %lu #2"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+#: cmdline/apt-helper.cc:52
+msgid "Download Failed"
+msgstr ""
-#: ftparchive/override.cc:88 ftparchive/override.cc:191
-#, c-format
-msgid "Malformed override %s line %lu #3"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+#: cmdline/apt-helper.cc:67
+msgid ""
+"Usage: apt-helper [options] command\n"
+" apt-helper [options] download-file uri target-path\n"
+"\n"
+"apt-helper is a internal helper for apt\n"
+"\n"
+"Commands:\n"
+" download-file - download the given uri to the target-path\n"
+"\n"
+" This APT helper has Super Meep Powers.\n"
+msgstr ""
-#: ftparchive/override.cc:127 ftparchive/override.cc:201
-#, c-format
-msgid "Failed to read the override file %s"
-msgstr "Methwydd darllen y ffeil dargyfeirio %s"
+#: cmdline/apt-mark.cc:57
+#, fuzzy, c-format
+msgid "%s can not be marked as it is not installed.\n"
+msgstr "ond nid yw wedi ei sefydlu"
-#: ftparchive/multicompress.cc:72
+#: cmdline/apt-mark.cc:63
#, fuzzy, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
+msgid "%s was already set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc:65
+#, fuzzy, c-format
+msgid "%s was already set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc:230
+#, fuzzy, c-format
+msgid "%s was already set on hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+
+#: cmdline/apt-mark.cc:232
+#, fuzzy, c-format
+msgid "%s was already not hold.\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: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"
+
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
+#, fuzzy, c-format
+msgid "%s set on hold.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
+#, fuzzy, c-format
+msgid "Canceled hold on %s.\n"
+msgstr "Methwyd agor %s"
+
+#: cmdline/apt-mark.cc:334
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+
+#: cmdline/apt-mark.cc:381
+msgid ""
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manually or automatically installed. It can also list marks.\n"
+"\n"
+"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"
+" -q Loggable output - no progress indicator\n"
+" -qq No output except for errors\n"
+" -s No-act. Just prints what would be done.\n"
+" -f read/write auto/manual marking in the given file\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-mark(8) and apt.conf(5) manual pages for more information."
+msgstr ""
+
+#: cmdline/apt.cc:71
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"CLI for apt.\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"
+" 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 ""
-#: ftparchive/multicompress.cc:102
+#: methods/cdrom.cc:203
#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+msgid "Unable to read the cdrom database %s"
+msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Methwyd creu pibell cyfathrebu at isbroses"
+#: methods/cdrom.cc:212
+#, fuzzy
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
+msgstr ""
+"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
+"get update i ychwanegu CDau newydd."
-#: ftparchive/multicompress.cc:195
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
+#: methods/cdrom.cc:222
+#, fuzzy
+msgid "Wrong CD-ROM"
+msgstr "CD Anghywir"
-#: ftparchive/multicompress.cc:198
-msgid "Failed to fork"
-msgstr "Methodd fork()"
+#: methods/cdrom.cc:249
+#, c-format
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgstr ""
+"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
-#: ftparchive/multicompress.cc:212
+#: methods/cdrom.cc:254
#, fuzzy
-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"
-#: ftparchive/multicompress.cc:235
-#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:274
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"
-#: ftparchive/multicompress.cc:286
-msgid "Failed to create subprocess IPC"
-msgstr "Methwyd creu isbroses IPC"
+#: methods/copy.cc:46 methods/gzip.cc:106 methods/rred.cc:599
+#: methods/rred.cc:609
+msgid "Failed to stat"
+msgstr "Methwyd stat()"
-#: ftparchive/multicompress.cc:321
-msgid "Failed to exec compressor "
-msgstr "Methwyd gweithredu cywasgydd "
+#: methods/copy.cc:82 methods/gzip.cc:113 methods/rred.cc:606
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"
-#: ftparchive/multicompress.cc:360
-msgid "decompressor"
-msgstr "datgywasgydd"
+#: methods/file.cc:47
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
-#: ftparchive/multicompress.cc:403
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:172
+msgid "Logging in"
+msgstr "Yn mewngofnodi"
-#: ftparchive/multicompress.cc:455
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
+#: methods/ftp.cc:178
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"
+
+#: methods/ftp.cc:183
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"
+
+#: 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"
-#: ftparchive/multicompress.cc:472
+#: methods/ftp.cc:220
#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
+#: methods/ftp.cc:227
#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:247
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
+msgstr ""
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
+"ProxyLogin yn wag.)"
+
+# FIXME
+#: 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:301
+#, c-format
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+
+#: 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:345
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"
+
+#: 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:355 methods/rsh.cc:205
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."
+
+#: methods/ftp.cc:372 methods/ftp.cc:384
+msgid "Protocol corruption"
+msgstr "Llygr protocol"
+
+#: 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:696 methods/ftp.cc:702 methods/ftp.cc:737
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"
+
+#: methods/ftp.cc:707
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+
+#: methods/ftp.cc:711 methods/connect.cc:116 apt-private/private-upgrade.cc:22
+msgid "Failed"
+msgstr "Methwyd"
+
+#: methods/ftp.cc:713
+#, fuzzy
+msgid "Could not connect passive socket."
+msgstr "Methwyd cysylltu soced goddefol"
+
+# FIXME
+#: methods/ftp.cc:730
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"
-#: cmdline/apt-get.cc:135
-msgid "Y"
-msgstr "I"
+#: methods/ftp.cc:744
+msgid "Could not bind a socket"
+msgstr "Methwyd rhwymo soced"
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
+#: methods/ftp.cc:748
+msgid "Could not listen on the socket"
+msgstr "Methwyd gwrando ar y soced"
-#: cmdline/apt-get.cc:252
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+#: methods/ftp.cc:755
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"
-#: cmdline/apt-get.cc:342
-#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
+#: methods/ftp.cc:787
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"
-#: cmdline/apt-get.cc:344
+#: methods/ftp.cc:797
#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+msgid "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
-#: cmdline/apt-get.cc:351
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
+#: methods/ftp.cc:806
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
-#: cmdline/apt-get.cc:353
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
+#: methods/ftp.cc:826
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"
-#: cmdline/apt-get.cc:356
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
+#: methods/ftp.cc:833
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"
-#: cmdline/apt-get.cc:356
-msgid "but it is not going to be installed"
-msgstr "ond nid yw'n mynd i gael ei sefydlu"
+#: methods/ftp.cc:872 methods/server.cc:357 methods/rsh.cc:312
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"
-#: cmdline/apt-get.cc:361
-msgid " or"
-msgstr " neu"
+#: methods/ftp.cc:885
+#, c-format
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
-#: cmdline/apt-get.cc:392
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+#: methods/ftp.cc:900 methods/rsh.cc:331
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"
-#: cmdline/apt-get.cc:420
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+#: methods/ftp.cc:930
+#, c-format
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
-#: cmdline/apt-get.cc:442
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+#. Get the files information
+#: methods/ftp.cc:1009
+msgid "Query"
+msgstr "Ymholiad"
-#: cmdline/apt-get.cc:465
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+# FIXME
+#: methods/ftp.cc:1123
+msgid "Unable to invoke "
+msgstr "Methwyd gweithredu "
-#: cmdline/apt-get.cc:488
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+#: methods/connect.cc:76
+#, c-format
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:508
-msgid "The following held packages will be changed:"
-msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+#: methods/connect.cc:87
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
-#: cmdline/apt-get.cc:563
+#: methods/connect.cc:94
#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
-#: cmdline/apt-get.cc:571
-#, fuzzy
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
-"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
-"ei wneud!"
+#: methods/connect.cc:100
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
+msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
-#: cmdline/apt-get.cc:605
+#: methods/connect.cc:108
#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+msgid "Could not connect to %s:%s (%s), connection timed out"
+msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-#: cmdline/apt-get.cc:609
+#: methods/connect.cc:126
#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."
-#: cmdline/apt-get.cc:611
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:154 methods/rsh.cc:435
#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"
-#: cmdline/apt-get.cc:613
+#: methods/connect.cc:180 methods/connect.cc:199
#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"
-#: cmdline/apt-get.cc:617
+#: methods/connect.cc:205
#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"
-#: cmdline/apt-get.cc:639
+#: methods/connect.cc:209
#, fuzzy, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+msgid "System error resolving '%s:%s'"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: cmdline/apt-get.cc:645
+#: methods/connect.cc:211
#, fuzzy, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-
-#: cmdline/apt-get.cc:662
-#, 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:673
-msgid " [Installed]"
-msgstr " [Sefydliwyd]"
-
-#: cmdline/apt-get.cc:682
-#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Fersiynau Posib"
-
-#: cmdline/apt-get.cc:684
-msgid "You should explicitly select one to install."
-msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-# FIXME: punctuation
-#: cmdline/apt-get.cc:687
+#: methods/connect.cc:258
#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Methwyd cysylltu i %s %s:"
+
+#: methods/gpgv.cc:166
msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-"Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
-"Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond heb\n"
-"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
-"ffeil sources.list.\n"
-#: cmdline/apt-get.cc:705
-msgid "However the following packages replace it:"
-msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+#: methods/gpgv.cc:170
+msgid "At least one invalid signature was encountered."
+msgstr ""
-#: cmdline/apt-get.cc:717
-#, fuzzy, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+#: methods/gpgv.cc:172
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+msgstr ""
-#: cmdline/apt-get.cc:728
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:178
#, c-format
-msgid "Virtual packages like '%s' can't be removed\n"
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
msgstr ""
-#: cmdline/apt-get.cc:759
-#, fuzzy, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-
-#: cmdline/apt-get.cc:789
-#, 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"
+#: methods/gpgv.cc:182
+msgid "Unknown error executing gpgv"
+msgstr ""
-#: cmdline/apt-get.cc:793
-#, fuzzy, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+#: methods/gpgv.cc:215 methods/gpgv.cc:222
+#, fuzzy
+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:803
-#, 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"
+#: methods/gpgv.cc:229
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
-#: cmdline/apt-get.cc:808
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+#: methods/gzip.cc:65
+msgid "Empty files can't be valid archives"
+msgstr ""
-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: methods/http.cc:516
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: cmdline/apt-get.cc:853
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+#: 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"
-#: cmdline/apt-get.cc:858
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+#: methods/http.cc:532
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: cmdline/apt-get.cc:898
-#, 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"
+#: methods/http.cc:568
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"
-#: cmdline/apt-get.cc:973
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
+#: methods/http.cc:628
+msgid "Select failed"
+msgstr "Methwyd dewis"
-#: cmdline/apt-get.cc:976
-msgid " failed."
-msgstr " wedi methu."
+#: methods/http.cc:633
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"
-#: cmdline/apt-get.cc:979
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
+#: methods/http.cc:656
+msgid "Error writing to output file"
+msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: cmdline/apt-get.cc:982
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
+#: methods/server.cc:56
+msgid "Waiting for headers"
+msgstr "Yn aros am benawdau"
-#: cmdline/apt-get.cc:984
-msgid " Done"
-msgstr " Wedi Gorffen"
+#: methods/server.cc:114
+msgid "Bad header line"
+msgstr "Llinell pennawd gwael"
-#: cmdline/apt-get.cc:988
-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."
+#: methods/server.cc:139 methods/server.cc:146
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: cmdline/apt-get.cc:991
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+#: methods/server.cc:176
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: cmdline/apt-get.cc:1016
+#: methods/server.cc:199
#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: cmdline/apt-get.cc:1020
-msgid "Authentication warning overridden.\n"
-msgstr ""
+#: methods/server.cc:201
+#, fuzzy
+msgid "This HTTP server has broken range support"
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: cmdline/apt-get.cc:1027
-msgid "Install these packages without verification [y/N]? "
-msgstr ""
+#: methods/server.cc:225
+msgid "Unknown date format"
+msgstr "Fformat dyddiad anhysbys"
-#: cmdline/apt-get.cc:1029
+#: methods/server.cc:494
#, fuzzy
-msgid "Some packages could not be authenticated"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+msgid "Bad header data"
+msgstr "Data pennawd gwael"
-#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+#: methods/server.cc:511 methods/server.cc:567
+msgid "Connection failed"
+msgstr "Methodd y cysylltiad"
+
+#: methods/server.cc:659
+msgid "Internal error"
+msgstr "Gwall mewnol"
+
+#: apt-private/private-list.cc:147
+msgid "Listing"
+msgstr ""
-#: cmdline/apt-get.cc:1079
+#: apt-private/private-install.cc:93
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:1088
+#: apt-private/private-install.cc:102
#, fuzzy
msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: cmdline/apt-get.cc:1099
+#: apt-private/private-install.cc:121
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:1137
+#: apt-private/private-install.cc:159
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1144
+#: apt-private/private-install.cc:166
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
msgstr "Mae angeyn cyrchu %sB/%sB o archifau.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1149
+#: apt-private/private-install.cc:171
#, c-format
msgid "Need to get %sB of archives.\n"
msgstr "Mae angen cyrchu %sB o archifau.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1156
+#: apt-private/private-install.cc:178
#, fuzzy, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1161
+#: apt-private/private-install.cc:183
#, fuzzy, c-format
msgid "After this operation, %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
-#: cmdline/apt-get.cc:2370
-#, 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:1189
+#: apt-private/private-install.cc:211
#, 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:1205 cmdline/apt-get.cc:1225
+#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
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:1207
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc:231
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:1209
+#: apt-private/private-install.cc:233
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
+#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:1230
-#, fuzzy
-msgid "Do you want to continue [Y/n]? "
-msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-
-#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
-#, c-format
-msgid "Failed to fetch %s %s\n"
-msgstr "Methwyd cyrchu %s %s\n"
+#: apt-private/private-install.cc:254
+msgid "Do you want to continue?"
+msgstr "Ydych chi eisiau mynd ymlaen?"
-#: cmdline/apt-get.cc:1320
+#: apt-private/private-install.cc:324
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
-msgid "Download complete and in download only mode"
-msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-
-#: cmdline/apt-get.cc:1327
+#: apt-private/private-install.cc:331
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:1331
+#: apt-private/private-install.cc:335
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:1336
+#: apt-private/private-install.cc:340
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:1337
+#: apt-private/private-install.cc:341
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1365
+#: apt-private/private-install.cc:377
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1369
-msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
-
-#: cmdline/apt-get.cc:1499
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1531
-#, fuzzy, c-format
-msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1569
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1585
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-
-#: cmdline/apt-get.cc:1647
+#: apt-private/private-install.cc:381
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr ""
+
+#: apt-private/private-install.cc:402
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1699
+#: apt-private/private-install.cc:510
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
#.
#. if (Packages == 1)
#. {
-#. c1out << endl;
+#. c1out << std::endl;
#. c1out <<
#. _("Since you only requested a single operation it is extremely likely that\n"
#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
+#. "that package should be filed.") << std::endl;
#. }
#.
-#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
+#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1706
+#: apt-private/private-install.cc:517
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1713
+#: apt-private/private-install.cc:524
#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1717
+#: apt-private/private-install.cc:528
#, fuzzy, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1719
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1738
-#, fuzzy
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+#: apt-private/private-install.cc:530
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
-#: cmdline/apt-get.cc:1828
+#: apt-private/private-install.cc:624
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:1831
+#: apt-private/private-install.cc:626
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1843
+#: apt-private/private-install.cc:639
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"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
-"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
-"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
-"heb gael eu symud allan o Incoming."
-
-#: cmdline/apt-get.cc:1861
-msgid "Broken packages"
-msgstr "Pecynnau wedi torri"
-
-#: cmdline/apt-get.cc:1889
-msgid "The following extra packages will be installed:"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-
-#: cmdline/apt-get.cc:1979
-msgid "Suggested packages:"
-msgstr "Pecynnau a awgrymmir:"
-
-#: cmdline/apt-get.cc:1980
-msgid "Recommended packages:"
-msgstr "Pecynnau a argymhellir:"
-
-#: cmdline/apt-get.cc:2022
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Methwyd canfod pecyn %s"
-
-#: cmdline/apt-get.cc:2029
-#, fuzzy, c-format
-msgid "%s set to automatically installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: cmdline/apt-get.cc:2050
-#, fuzzy
-msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
-
-#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
-msgid "Failed"
-msgstr "Methwyd"
-
-#: cmdline/apt-get.cc:2058
-msgid "Done"
-msgstr "Wedi Gorffen"
-
-#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
-#, fuzzy
-msgid "Internal error, problem resolver broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-
-#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
-msgid "Unable to lock the download directory"
-msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-
-#: cmdline/apt-get.cc:2233
-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:2273 cmdline/apt-get.cc:2554
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-
-#: cmdline/apt-get.cc:2289
-#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2294
-#, c-format
-msgid ""
-"Please use:\n"
-"bzr get %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2345
-#, 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:2380
-#, 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:2388
-#, 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:2393
-#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-
-#: cmdline/apt-get.cc:2399
-#, fuzzy, c-format
-msgid "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
-
-#: cmdline/apt-get.cc:2432
-msgid "Failed to fetch some archives."
-msgstr "Methwyd cyrchu rhai archifau."
-
-#: cmdline/apt-get.cc:2462
-#, 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:2474
-#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-
-#: cmdline/apt-get.cc:2475
-#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:2492
-#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-
-#: cmdline/apt-get.cc:2512
-msgid "Child process failed"
-msgstr "Methodd proses plentyn"
-
-#: cmdline/apt-get.cc:2528
-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:2559
-#, 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:2579
-#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-
-#: cmdline/apt-get.cc:2630
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because the package %s cannot be "
-"found"
-msgstr ""
-"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
-"%s"
-
-#: cmdline/apt-get.cc:2683
-#, c-format
-msgid ""
-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
-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:2719
-#, 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:2746
-#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-
-#: cmdline/apt-get.cc:2762
-#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-
-#: cmdline/apt-get.cc:2767
-msgid "Failed to process build dependencies"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
-
-#: cmdline/apt-get.cc:2798
-#, fuzzy
-msgid "Supported modules:"
-msgstr "Modylau a Gynhelir:"
-
-# FIXME: split
-#: cmdline/apt-get.cc:2839
-#, fuzzy
-msgid ""
-"Usage: apt-get [options] command\n"
-" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
-" apt-get [options] source pkg1 [pkg2 ...]\n"
-"\n"
-"apt-get is a simple command line interface for downloading and\n"
-"installing packages. The most frequently used commands are update\n"
-"and install.\n"
-"\n"
-"Commands:\n"
-" update - Retrieve new lists of packages\n"
-" upgrade - Perform an upgrade\n"
-" install - Install new packages (pkg is libc6 not libc6.deb)\n"
-" remove - Remove packages\n"
-" autoremove - Remove automatically all unused packages\n"
-" purge - Remove packages and config files\n"
-" source - Download source archives\n"
-" build-dep - Configure build-dependencies for source packages\n"
-" dist-upgrade - Distribution upgrade, see apt-get(8)\n"
-" dselect-upgrade - Follow dselect selections\n"
-" clean - Erase downloaded archive files\n"
-" autoclean - Erase old downloaded archive files\n"
-" check - Verify that there are no broken dependencies\n"
-" markauto - Mark the given packages as automatically installed\n"
-" unmarkauto - Mark the given packages as manually installed\n"
-"\n"
-"Options:\n"
-" -h This help text.\n"
-" -q Loggable output - no progress indicator\n"
-" -qq No output except for errors\n"
-" -d Download only - do NOT install or unpack archives\n"
-" -s No-act. Perform ordering simulation\n"
-" -y Assume Yes to all queries and do not prompt\n"
-" -f Attempt to correct a system with broken dependencies in place\n"
-" -m Attempt to continue if archives are unlocatable\n"
-" -u Show a list of upgraded packages as well\n"
-" -b Build the source package after fetching it\n"
-" -V Show verbose version numbers\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
-"pages for more information and options.\n"
-" This APT has Super Cow Powers.\n"
-msgstr ""
-"Defnydd: apt-get [opsiynnau] gorchymyn\n"
-" apt-get [opsiynnau] install|remove pecyn1 [pecyn2 ...]\n"
-" apt-get [opsiynnau] source pecyn1 [pecyn2 ...]\n"
-"\n"
-"Mae apt-get yn rhyngwyneb llinell orchymyn syml ar gyfer lawrlwytho a\n"
-"sefydlu pecynnau. Y gorchmynion \"update\" a \"install\" yw'r rhai a\n"
-"ddefnyddir amlaf.\n"
-"\n"
-"Gorchmynion:\n"
-" update - Cyrchu rhestrau pecynnau newydd\n"
-" update - Uwchraddio pecynnau wedi sefydlu\n"
-" install - Sefydlu pecynnau newydd (defnyddiwch libc6 nid libc6.deb)\n"
-" remove - Tynnu pecynnau\n"
-" source - Lawrlwytho archifau ffynhonell\n"
-" build-dep - Cyflunio dibyniaethau adeiladu ar gyfer pecynnau ffynhonell\n"
-" dist-upgrade - Uwchraddio dosraniad, gweler apt-get(8)\n"
-" dselect-upgrade - Dilyn dewisiadau dselect\n"
-" clean - Dileu ffeiliau archif wedi eu lawrlwytho\n"
-" autoclean - Dileu hen ffeiliau archif wedi eu lawrlwytho\n"
-" check - Gwirio fod dim dibyniaethau torredig\n"
-"\n"
-"Opsiynnau:\n"
-" -h Y testun cymorth hwn.\n"
-" -q Allbwn cofnodadwy - dim dangosydd cynydd\n"
-" -qq Dim allbwn ar wahan i wallau\n"
-" -d Lawrlwytho yn unig - peidio a sefydlu na dadbacio archifau\n"
-" -s Peidio gweithredu. Gwneir efelychiad trefn.\n"
-" -y Peidio a gofyn cwestiynnau a chymryd yn ganiataol mai 'Ie' yw'r ateb\n"
-" -f Ceisio mynd ymlaen os mae'r prawf integredd yn methu\n"
-" -m Ceisio mynd ymlaen os methir dod o hyd i archifau\n"
-" -u Dangos rhestr o archifau a uwchraddir hefyd\n"
-" -b Adeiladu'r pecyn ffynhonell ar ôl ei lawrlwytho\n"
-" -V Dangos rhifau fersiwn cyflawn\n"
-" -c=? Darllen y ffeil cyfluniad hwn\n"
-" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-"\n"
-"Gweler y tudalenau llawlyfr apt-get(8) sources.list(5) a apt.conf(5) am\n"
-"fwy o wybodaeth ac opsiynnau.\n"
-"\n"
-" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-
-#: cmdline/apt-get.cc:2995
-msgid ""
-"NOTE: This is only a simulation!\n"
-" apt-get needs root privileges for real execution.\n"
-" Keep also in mind that locking is deactivated,\n"
-" so don't depend on the relevance to the real current situation!"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
msgstr ""
+"Methwyd sefydlu rhai pecynnau. Gall hyn olygu eich bod chi wedi gofyn\n"
+"am sefyllfa amhosib neu, os ydych chi'n defnyddio'r dosraniad\n"
+"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
+"heb gael eu symud allan o Incoming."
-#: cmdline/acqprogress.cc:57
-msgid "Hit "
-msgstr "Presennol "
+#: apt-private/private-install.cc:660
+msgid "Broken packages"
+msgstr "Pecynnau wedi torri"
-#: cmdline/acqprogress.cc:81
-msgid "Get:"
-msgstr "Cyrchu:"
+#: apt-private/private-install.cc:713
+msgid "The following extra packages will be installed:"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/acqprogress.cc:112
-msgid "Ign "
-msgstr "Anwybyddu "
+#: apt-private/private-install.cc:803
+msgid "Suggested packages:"
+msgstr "Pecynnau a awgrymmir:"
-#: cmdline/acqprogress.cc:116
-msgid "Err "
-msgstr "Gwall "
+#: apt-private/private-install.cc:804
+msgid "Recommended packages:"
+msgstr "Pecynnau a argymhellir:"
-#: cmdline/acqprogress.cc:137
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
+#: apt-private/private-download.cc:32
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/acqprogress.cc:227
-#, c-format
-msgid " [Working]"
-msgstr " [Gweithio]"
+#: apt-private/private-download.cc:36
+msgid "Authentication warning overridden.\n"
+msgstr ""
-#: cmdline/acqprogress.cc:283
-#, fuzzy, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
+#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc:46
+msgid "Install these packages without verification?"
msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: cmdline/apt-sortpkgs.cc:86
-msgid "Unknown package record!"
-msgstr "Cofnod pecyn anhysbys!"
+#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-sortpkgs.cc:150
-#, fuzzy
-msgid ""
-"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
-"\n"
-"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
-"to indicate what kind of file it is.\n"
-"\n"
-"Options:\n"
-" -h This help text\n"
-" -s Use source file sorting\n"
-" -c=? Read this configuration file\n"
-" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+#: apt-private/private-output.cc:75 apt-private/private-show.cc:81
+#: apt-private/private-show.cc:86
+msgid "unknown"
msgstr ""
-"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
-"\n"
-"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
-"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
-"\n"
-"Opsiynnau:\n"
-" -h Y testun cymorth hwn\n"
-" -s Defnyddio trefnu ffeil ffynhonell\n"
-" -c=? Darllen y ffeil cyfluniad hwn\n"
-" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: dselect/install:32
-msgid "Bad default setting!"
-msgstr "Rhagosodiad gwael!"
+#: apt-private/private-output.cc:201
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
-msgid "Press enter to continue."
-msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
+#: apt-private/private-output.cc:205
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
+#: apt-private/private-output.cc:208
+msgid "[installed,auto-removable]"
msgstr ""
-#: dselect/install:101
+#: apt-private/private-output.cc:210
#, fuzzy
-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"
-#: dselect/install:102
+#: apt-private/private-output.cc:212
#, fuzzy
-msgid "will be configured. This may result in duplicate errors"
-msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+msgid "[installed]"
+msgstr " [Sefydliwyd]"
-#: dselect/install:103
-msgid "or errors caused by missing dependencies. This is OK, only the errors"
-msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"
+#: apt-private/private-output.cc:216
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
-#: dselect/install:104
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+#: apt-private/private-output.cc:220
+msgid "[residual-config]"
msgstr ""
-"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
-"eto."
-#: dselect/update:30
-#, fuzzy
-msgid "Merging available information"
-msgstr "Yn cyfuno manylion Ar Gael"
+#: apt-private/private-output.cc:320
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
-#: apt-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
+#: apt-private/private-output.cc:410
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"
-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip"
+#: 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-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
+#: apt-private/private-output.cc:419
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"
-#: apt-inst/contrib/extracttar.cc:193
-#, fuzzy
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Methodd swm gwirio Tar, archif llygredig"
+#: apt-private/private-output.cc:421
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
-#: apt-inst/contrib/extracttar.cc:296
-#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
+#: apt-private/private-output.cc:424
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
+#: 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-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
+#: apt-private/private-output.cc:429
+msgid " or"
+msgstr " neu"
-#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
+#: apt-private/private-output.cc:458
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
+#: apt-private/private-output.cc:484
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
+#: 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-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
+#: apt-private/private-output.cc:527
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
+#: apt-private/private-output.cc:548
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
+#: 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-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
+#: apt-private/private-output.cc:623
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (oherwydd %s) "
-#: apt-inst/filelist.cc:464
+#: apt-private/private-output.cc:631
#, fuzzy
-msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"RHYBUDD: Caiff y pecynnau hanfodol canlynol eu tynnu\n"
+"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
+"ei wneud!"
-#: apt-inst/filelist.cc:477
+#: apt-private/private-output.cc:662
#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-# FIXME: "the"
-#: apt-inst/filelist.cc:506
+#: apt-private/private-output.cc:666
#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
-#: apt-inst/filelist.cc:549
+#: apt-private/private-output.cc:668
#, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Ffeil cyfluniad dyblyg %s/%s"
-
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#: apt-private/private-output.cc:670
#, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-private/private-output.cc:674
#, c-format
-msgid "The path %s is too long"
-msgstr "Mae'r llwybr %s yn rhy hir"
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "Yn dadbacio %s mwy nag unwaith"
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:696
+msgid "[Y/n]"
+msgstr ""
-#: apt-inst/extract.cc:134
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: 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:713
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:719
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:741 apt-pkg/cachefilter.cc:33
#, c-format
-msgid "The directory %s is diverted"
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: apt-private/private-cachefile.cc:87
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:90
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:93
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:98
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:102
+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."
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-update.cc:45
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-upgrade.cc:19
+#, fuzzy
+msgid "Calculating upgrade... "
+msgstr "Yn Cyfrifo'r Uwchraddiad... "
+
+#: apt-private/private-upgrade.cc:24
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+
+#: apt-private/private-upgrade.cc:26
+msgid "Done"
+msgstr "Wedi Gorffen"
+
+#: apt-private/private-search.cc:61
+msgid "Full Text Search"
+msgstr ""
-#: apt-inst/extract.cc:144
+#: apt-private/private-show.cc:152
#, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
+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-inst/extract.cc:154 apt-inst/extract.cc:297
-msgid "The diversion path is too long"
-msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
+#: apt-private/private-show.cc:159
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:19
+msgid ""
+"NOTE: This is only a simulation!\n"
+" apt-get needs root privileges for real execution.\n"
+" Keep also in mind that locking is deactivated,\n"
+" so don't depend on the relevance to the real current situation!"
+msgstr ""
-#: apt-inst/extract.cc:240
+#: 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:57
#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "Your '%s' file changed, please run 'apt-get update'."
msgstr ""
-"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
-#: apt-inst/extract.cc:280
-msgid "Failed to locate node in its hash bucket"
-msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
+#: apt-private/acqprogress.cc:63
+msgid "Hit "
+msgstr "Presennol "
-#: apt-inst/extract.cc:284
-msgid "The path is too long"
-msgstr "Mae'r llwybr yn rhy hir"
+#: apt-private/acqprogress.cc:87
+msgid "Get:"
+msgstr "Cyrchu:"
-# FIXME: wtf?
-#: apt-inst/extract.cc:414
+#: apt-private/acqprogress.cc:118
+msgid "Ign "
+msgstr "Anwybyddu "
+
+#: apt-private/acqprogress.cc:122
+msgid "Err "
+msgstr "Gwall "
+
+#: apt-private/acqprogress.cc:143
#, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
-#: apt-inst/extract.cc:431
+#: apt-private/acqprogress.cc:233
#, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
+msgid " [Working]"
+msgstr " [Gweithio]"
+
+#: apt-private/acqprogress.cc:294
+#, fuzzy, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
#. 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/cdromutl.cc:179
-#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
-#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
-#: methods/mirror.cc:87
+#: 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: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"
msgstr "Ni ellir darllen %s"
-#: apt-inst/extract.cc:491
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/contrib/cdromutl.cc:180
+#: apt-pkg/contrib/cdromutl.cc:214 apt-pkg/acquire.cc:491
+#: apt-pkg/acquire.cc:516 apt-pkg/clean.cc:42 apt-pkg/clean.cc:60
+#: apt-pkg/clean.cc:123
#, c-format
-msgid "Unable to stat %s"
-msgstr "Ni ellir gwneud stat() o %s"
+msgid "Unable to change to %s"
+msgstr "Ni ellir newid i %s"
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:280
#, c-format
-msgid "Failed to remove %s"
-msgstr "Methwyd dileu %s"
+msgid "No mirror file '%s' found "
+msgstr ""
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
-#, c-format
-msgid "Unable to create %s"
-msgstr "Ni ellir creu %s"
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:287
+#, fuzzy, c-format
+msgid "Can not read mirror file '%s'"
+msgstr "Methwyd agor ffeil %s"
+
+#: methods/mirror.cc:315
+#, fuzzy, c-format
+msgid "No entry found in mirror file '%s'"
+msgstr "Methwyd agor ffeil %s"
-#: apt-inst/deb/dpkgdb.cc:114
+#: methods/mirror.cc:445
#, c-format
-msgid "Failed to stat %sinfo"
-msgstr "Methwyd stat() ar %sinfo"
+msgid "[Mirror: %s]"
+msgstr ""
-#: apt-inst/deb/dpkgdb.cc:119
-msgid "The info and temp directories need to be on the same filesystem"
-msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
+#: methods/rsh.cc:98 ftparchive/multicompress.cc:169
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Methwyd creu pibell cyfathrebu at isbroses"
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
-#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
-#: apt-pkg/pkgcachegen.cc:1326
-#, fuzzy
-msgid "Reading package lists"
-msgstr "Yn Darllen Rhestrau Pecynnau"
+#: methods/rsh.cc:339
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"
-#: apt-inst/deb/dpkgdb.cc:176
-#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
+#: dselect/install:33
+msgid "Bad default setting!"
+msgstr "Rhagosodiad gwael!"
-# FIXME
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
+#: dselect/install:106 dselect/update:45
+msgid "Press enter to continue."
+msgstr "Gwasgwch Enter er mwyn mynd ymlaen."
+
+#: dselect/install:92
+msgid "Do you want to erase any previously downloaded .deb files?"
+msgstr ""
+
+#: dselect/install:102
#, fuzzy
-msgid "Internal error getting a package name"
-msgstr "Gwall mewnol wrth gyrchu enw pecyn"
+msgid "Some errors occurred while unpacking. Packages that were installed"
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: dselect/install:103
#, fuzzy
-msgid "Reading file listing"
-msgstr "Yn Darllen Rhestr Ffeiliau"
+msgid "will be configured. This may result in duplicate errors"
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
-#: apt-inst/deb/dpkgdb.cc:212
-#, c-format
+#: dselect/install:104
+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr "wallau a achosir gan ddibyniaethau coll. Mae hyn yn iawn, dim ond y"
+
+#: dselect/install:105
msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
+"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn yna "
-"gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
-
-# FIXME
-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
-#, c-format
-msgid "Failed reading the list file %sinfo/%s"
-msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+"gwallau uwchben y neges hwn sy'n bwysig. Trwsiwch nhw a rhedwch [S]efydlu "
+"eto."
-#: apt-inst/deb/dpkgdb.cc:262
+#: dselect/update:30
#, fuzzy
-msgid "Internal error getting a node"
-msgstr "Gwall Mewnol wrth gael Nôd"
-
-# FIXME: literal
-#: apt-inst/deb/dpkgdb.cc:305
-#, c-format
-msgid "Failed to open the diversions file %sdiversions"
-msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
+msgid "Merging available information"
+msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc:224
+#, fuzzy
+msgid ""
+"Usage: apt-extracttemplates file1 [file2 ...]\n"
+"\n"
+"apt-extracttemplates is a tool to extract config and template info\n"
+"from debian packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -t Set the temp dir\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+" -h Dangos y testun cymorth hwn\n"
+" -t Gosod y cyfeiriadur dros dro\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: cmdline/apt-extracttemplates.cc:256 apt-pkg/pkgcachegen.cc:1388
#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"
-#: apt-inst/deb/dpkgdb.cc:358
-#, fuzzy
-msgid "Internal error adding a diversion"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+#: cmdline/apt-extracttemplates.cc:298
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
-#: apt-inst/deb/dpkgdb.cc:379
-#, fuzzy
-msgid "The pkg cache must be initialized first"
-msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:349
+msgid "Package extension list is too long"
+msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
-#: apt-inst/deb/dpkgdb.cc:439
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:264
+#: ftparchive/apt-ftparchive.cc:278 ftparchive/apt-ftparchive.cc:300
#, fuzzy, c-format
-msgid "Failed to find a Package: header, offset %lu"
-msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
-
-#: apt-inst/deb/dpkgdb.cc:461
-#, c-format
-msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+msgid "Error processing directory %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
-#: apt-inst/deb/dpkgdb.cc:466
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+#: ftparchive/apt-ftparchive.cc:262
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
-#, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
+#: ftparchive/apt-ftparchive.cc:379
+msgid "Error writing header to contents file"
+msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
-#: apt-inst/deb/debfile.cc:50
+#: ftparchive/apt-ftparchive.cc:409
#, fuzzy, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-
-#: apt-inst/deb/debfile.cc:110
-#, c-format
-msgid "Couldn't change to %s"
-msgstr "Methwyd newid i %s"
+msgid "Error processing contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"
-#: apt-inst/deb/debfile.cc:140
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc:597
#, fuzzy
-msgid "Internal error, could not locate member"
-msgstr "Gwall Methwyd, methwyd lleoli aelod"
+msgid ""
+"Usage: apt-ftparchive [options] command\n"
+"Commands: packages binarypath [overridefile [pathprefix]]\n"
+" sources srcpath [overridefile [pathprefix]]\n"
+" contents path\n"
+" release path\n"
+" generate config [groups]\n"
+" clean config\n"
+"\n"
+"apt-ftparchive generates index files for Debian archives. It supports\n"
+"many styles of generation from fully automated to functional replacements\n"
+"for dpkg-scanpackages and dpkg-scansources\n"
+"\n"
+"apt-ftparchive generates Package files from a tree of .debs. The\n"
+"Package file contains the contents of all the control fields from\n"
+"each package as well as the MD5 hash and filesize. An override file\n"
+"is supported to force the value of Priority and Section.\n"
+"\n"
+"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+"The --source-override option can be used to specify a src override file\n"
+"\n"
+"The 'packages' and 'sources' command should be run in the root of the\n"
+"tree. BinaryPath should point to the base of the recursive search and \n"
+"override file should contain the override flags. Pathprefix is\n"
+"appended to the filename fields if present. Example usage from the \n"
+"Debian archive:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" --md5 Control MD5 generation\n"
+" -s=? Source override file\n"
+" -q Quiet\n"
+" -d=? Select the optional caching database\n"
+" --no-delink Enable delinking debug mode\n"
+" --contents Control contents file generation\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option"
+msgstr ""
+"Defnydd: apt-ftparchive [opsiynnau] gorchymyn\n"
+"Gorchmynion: packages llwybrdeuol [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+" sources llwybrffynhonell [ffeilgwrthwneud [cynddodiadllwybr]]\n"
+" contents llwybr\n"
+" release llwybr\n"
+" generate cyfluniad [grŵpiau]\n"
+" clean cyfluniad\n"
+"\n"
+"Mae apt-ftparchive yn cynhyrchu ffeiliau mynegai ar gyfer archifau Debian.\n"
+"Mae'n cynnal nifer o arddulliau o gynhyrchiad, yn cynnwys modd wedi\n"
+"awtomeiddio'n llwyr a modd yn debyg i dpkg-scanpackages a dpkg-scansources.\n"
+"\n"
+"Gall apt-ftparchive gynhyrchu ffeil Package o goeden o ffeiliau .deb.\n"
+"Mae'r ffeil Package yn cynnwys yr holl feysydd rheoli o bob pecyn yn\n"
+"ogystal a'r stwnsh MD5 a maint y ffeil. Cynhelir ffeil gwrthwneud er mwyn\n"
+"gorfodi'r gwerthoedd Priority a Section.\n"
+"\n"
+"Yn debyg, gall apt-ftparchive gynhyrchu ffeil Sources o goeden o ffeiliau\n"
+".dsc. Gellir defnyddio'r opsiwn --source-override er mwyn penodi ffeil\n"
+"gwrthwneud ffynhonell.\n"
+"\n"
+"Dylid rhedeg y gorchmynion 'packages' a 'sources' yng ngwraidd y goeden.\n"
+"Fe ddylai llwybrdeuol bwyntio at sail y chwilio ailadroddus a fe ddylai\n"
+"ffeilgwrthwneud gynnwys y gosodiadau gwrthwneud. Ychwanegir\n"
+"cynddodiadllwybr i'r meysydd enw ffeil os ydynt yn bresennol. Esiampl\n"
+"defnydd o'r archif Debian:\n"
+" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+" dists/potato/main/binary-i386/Packages\n"
+"\n"
+"Opsiynnau:\n"
+" -h Y testun cymorth hwn\n"
+" --md5 Rheoli cynhyrchiad stwnch MD5\n"
+" -s=? Ffeil gwrthwneud ffynhonell\n"
+" -q Tawel\n"
+" -d=? Dewis cronda data storfa opsiynnol\n"
+" --no-delink Galluogi'r modd datgysylltu datnamu\n"
+" --contents Rheoli cynhyrchiad ffeil cynnwys\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol"
-#: apt-inst/deb/debfile.cc:173
-msgid "Failed to locate a valid control file"
-msgstr "Methwyd lleoli ffeil rheoli dilys"
+#: ftparchive/apt-ftparchive.cc:803
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"
-#: apt-inst/deb/debfile.cc:258
-#, fuzzy
-msgid "Unparsable control file"
-msgstr "Ffeil rheoli ni ellir ei ramadegu"
+#: ftparchive/apt-ftparchive.cc:881
+#, c-format
+msgid "Some files are missing in the package file group `%s'"
+msgstr "Mae rhai ffeiliau ar goll yn y grŵp ffeiliau pecyn `%s'"
-#: methods/bzip2.cc:65
+#: ftparchive/cachedb.cc:47
#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Methwyd agor pibell ar gyfer %s"
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
-#: methods/bzip2.cc:109
+#: ftparchive/cachedb.cc:65
#, c-format
-msgid "Read error from %s process"
-msgstr "Gwall darllen o broses %s"
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
-#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
-#: methods/rred.cc:495
-msgid "Failed to stat"
-msgstr "Methwyd stat()"
+#: ftparchive/cachedb.cc:76
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
-#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
-#: methods/rred.cc:492
-msgid "Failed to set modification time"
-msgstr "Methwyd gosod amser newid"
+#: ftparchive/cachedb.cc:81
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"
-#: methods/cdrom.cc:199
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:179 apt-inst/extract.cc:192
+#: apt-inst/extract.cc:209
#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"
-#: methods/cdrom.cc:208
-#, fuzzy
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
-msgstr ""
-"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
-"get update i ychwanegu CDau newydd."
+#: ftparchive/cachedb.cc:249
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"
-#: methods/cdrom.cc:218
-#, fuzzy
-msgid "Wrong CD-ROM"
-msgstr "CD Anghywir"
+#: ftparchive/cachedb.cc:490
+msgid "Unable to get a cursor"
+msgstr "Ni ellir cael cyrchydd"
-#: methods/cdrom.cc:245
+#: ftparchive/writer.cc:82
#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
-msgstr ""
-"Ni ellir datglymu'r CD-ROM yn %s. Efallai ei fod e'n cael ei ddefnyddio."
-
-#: methods/cdrom.cc:250
-#, fuzzy
-msgid "Disk not found."
-msgstr "Ffeil heb ei ganfod"
+msgid "W: Unable to read directory %s\n"
+msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
-msgstr "Ffeil heb ei ganfod"
+#: ftparchive/writer.cc:87
+#, c-format
+msgid "W: Unable to stat %s\n"
+msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
+#: ftparchive/writer.cc:143
+msgid "E: "
+msgstr "G: "
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
-msgid "Logging in"
-msgstr "Yn mewngofnodi"
+#: ftparchive/writer.cc:145
+msgid "W: "
+msgstr "Rh: "
-#: methods/ftp.cc:174
-msgid "Unable to determine the peer name"
-msgstr "Ni ellir darganfod enw'r cymar"
+#: ftparchive/writer.cc:152
+msgid "E: Errors apply to file "
+msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#: methods/ftp.cc:179
-msgid "Unable to determine the local name"
-msgstr "Ni ellir darganfod yr enw lleol"
+#: ftparchive/writer.cc:170 ftparchive/writer.cc:202
+#, c-format
+msgid "Failed to resolve %s"
+msgstr "Methwyd datrys %s"
-#: methods/ftp.cc:210 methods/ftp.cc:238
-#, fuzzy, c-format
-msgid "The server refused the connection and said: %s"
-msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %s"
+#: ftparchive/writer.cc:183
+msgid "Tree walking failed"
+msgstr "Methwyd cerdded y goeden"
-#: methods/ftp.cc:216
+#: ftparchive/writer.cc:210
#, c-format
-msgid "USER failed, server said: %s"
-msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+msgid "Failed to open %s"
+msgstr "Methwyd agor %s"
-#: methods/ftp.cc:223
+# FIXME
+#: ftparchive/writer.cc:269
#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
+msgid " DeLink %s [%s]\n"
+msgstr " DatGysylltu %s [%s]\n"
-#: methods/ftp.cc:243
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
-msgstr ""
-"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
-"ProxyLogin yn wag.)"
+#: ftparchive/writer.cc:277
+#, c-format
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"
-# FIXME
-#: methods/ftp.cc:271
+#: ftparchive/writer.cc:281
#, c-format
-msgid "Login script command '%s' failed, server said: %s"
-msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
+msgid "Failed to unlink %s"
+msgstr "Methwyd datgysylltu %s"
-#: methods/ftp.cc:297
+#: ftparchive/writer.cc:289
#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Methwyd cysylltu %s at %s"
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr "Goramser cysylltu"
+#: ftparchive/writer.cc:299
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: methods/ftp.cc:341
-msgid "Server closed the connection"
-msgstr "Caeodd y gweinydd y cysylltiad"
+#: ftparchive/writer.cc:404
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
-msgid "Read error"
-msgstr "Gwall darllen"
+#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
+#, c-format
+msgid " %s has no override entry\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: methods/ftp.cc:351 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr "Gorlifodd ateb y byffer."
+#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
+#, c-format
+msgid " %s maintainer is %s not %s\n"
+msgstr " Cynaliwr %s yw %s nid %s\n"
-#: methods/ftp.cc:368 methods/ftp.cc:380
-msgid "Protocol corruption"
-msgstr "Llygr protocol"
+#: ftparchive/writer.cc:712
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
+#: ftparchive/writer.cc:716
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
-msgid "Could not create a socket"
-msgstr "Methwyd creu soced"
+#: ftparchive/contents.cc:341 ftparchive/contents.cc:372
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"
-#: methods/ftp.cc:703
-msgid "Could not connect data socket, connection timed out"
-msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+#: ftparchive/override.cc:35 ftparchive/override.cc:139
+#, c-format
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"
-#: methods/ftp.cc:709
-#, fuzzy
-msgid "Could not connect passive socket."
-msgstr "Methwyd cysylltu soced goddefol"
+#. 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"
-# FIXME
-#: methods/ftp.cc:727
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Methodd getaddrinfo gael soced gwrando"
+#: 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"
-#: methods/ftp.cc:741
-msgid "Could not bind a socket"
-msgstr "Methwyd rhwymo soced"
+#: ftparchive/override.cc:163
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-#: methods/ftp.cc:745
-msgid "Could not listen on the socket"
-msgstr "Methwyd gwrando ar y soced"
+#: ftparchive/override.cc:175
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
-#: methods/ftp.cc:752
-msgid "Could not determine the socket's name"
-msgstr "Methwyd canfod enw'r soced"
+#: ftparchive/override.cc:188
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
-#: methods/ftp.cc:784
-msgid "Unable to send PORT command"
-msgstr "Methwyd danfod gorchymyn PORT"
+#: ftparchive/multicompress.cc:71
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"
-#: methods/ftp.cc:794
+#: ftparchive/multicompress.cc:101
#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+msgid "Compressed output %s needs a compression set"
+msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
-#: methods/ftp.cc:803
-#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+#: ftparchive/multicompress.cc:190
+msgid "Failed to create FILE*"
+msgstr "Methwyd creu FILE*"
-#: methods/ftp.cc:823
-msgid "Data socket connect timed out"
-msgstr "Goramserodd cysylltiad y soced data"
+#: ftparchive/multicompress.cc:193
+msgid "Failed to fork"
+msgstr "Methodd fork()"
-#: methods/ftp.cc:830
-msgid "Unable to accept connection"
-msgstr "Methwyd derbyn cysylltiad"
+#: ftparchive/multicompress.cc:207
+#, fuzzy
+msgid "Compress child"
+msgstr "Plentyn Cywasgu"
-#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
-msgid "Problem hashing file"
-msgstr "Problem wrth stwnshio ffeil"
+#: ftparchive/multicompress.cc:230
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"
-#: methods/ftp.cc:882
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+#: ftparchive/multicompress.cc:303
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"
-#: methods/ftp.cc:897 methods/rsh.cc:321
-msgid "Data socket timed out"
-msgstr "Goramserodd soced data"
+#: ftparchive/multicompress.cc:341
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"
-#: methods/ftp.cc:927
+#: ftparchive/multicompress.cc:357
#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
+msgid "Problem unlinking %s"
+msgstr "Gwall wrth datgysylltu %s"
-#. Get the files information
-#: methods/ftp.cc:1004
-msgid "Query"
-msgstr "Ymholiad"
+#: ftparchive/multicompress.cc:372 apt-inst/extract.cc:187
+#, c-format
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"
-# FIXME
-#: methods/ftp.cc:1116
-msgid "Unable to invoke "
-msgstr "Methwyd gweithredu "
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc:38
+#, fuzzy
+msgid ""
+"Usage: apt-internal-solver\n"
+"\n"
+"apt-internal-solver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+" -h This help text.\n"
+" -q Loggable output - no progress indicator\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-extracttemplates ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-extracttemplates yn erfyn ar gyfer echdynnu manylion cyfluniad a\n"
+"templed o becynnau Debian.\n"
+"\n"
+"Opsiynnau:\n"
+" -h Dangos y testun cymorth hwn\n"
+" -t Gosod y cyfeiriadur dros dro\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n"
-#: methods/connect.cc:71
-#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+#: cmdline/apt-sortpkgs.cc:89
+msgid "Unknown package record!"
+msgstr "Cofnod pecyn anhysbys!"
-#: methods/connect.cc:82
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+#: cmdline/apt-sortpkgs.cc:153
+#, fuzzy
+msgid ""
+"Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
+"\n"
+"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n"
+"to indicate what kind of file it is.\n"
+"\n"
+"Options:\n"
+" -h This help text\n"
+" -s Use source file sorting\n"
+" -c=? Read this configuration file\n"
+" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+msgstr ""
+"Defnydd: apt-sortpkgs [opsiynnau] ffeil1 [ffeil2 ...]\n"
+"\n"
+"Mae apt-sortpkgs yn erfyn syml er mwyn trefnu ffeiliau pecyn. Defnyddir yr\n"
+"opsiwn -s er mwyn penodi pa fath o ffeil ydyw.\n"
+"\n"
+"Opsiynnau:\n"
+" -h Y testun cymorth hwn\n"
+" -s Defnyddio trefnu ffeil ffynhonell\n"
+" -c=? Darllen y ffeil cyfluniad hwn\n"
+" -o=? Gosod opsiwn cyfluniad mympwyol, ee -o dir::cache=/tmp\n"
-#: methods/connect.cc:89
-#, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Methwyd creu soced ar gyfer %s (f=%u t=%u p=%u)"
+#: apt-inst/contrib/extracttar.cc:122
+msgid "Failed to create pipes"
+msgstr "Methwyd creu pibau"
-#: methods/connect.cc:95
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+#: apt-inst/contrib/extracttar.cc:149
+msgid "Failed to exec gzip "
+msgstr "Methwyd gweithredu gzip"
-#: methods/connect.cc:103
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+#: apt-inst/contrib/extracttar.cc:186 apt-inst/contrib/extracttar.cc:216
+msgid "Corrupted archive"
+msgstr "Archif llygredig"
-#: methods/connect.cc:121
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "Methwyd cysylltu i %s:%s (%s)."
+#: apt-inst/contrib/extracttar.cc:201
+#, fuzzy
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:149 methods/rsh.cc:424
+#: apt-inst/contrib/extracttar.cc:306
#, c-format
-msgid "Connecting to %s"
-msgstr "Yn cysylltu i %s"
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"
-#: methods/connect.cc:168 methods/connect.cc:187
-#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Methwyd datrys '%s'"
+#: apt-inst/contrib/arfile.cc:74
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"
-#: methods/connect.cc:193
-#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr "Methiant dros dro yn datrys '%s'"
+#: apt-inst/contrib/arfile.cc:82
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"
-#: methods/connect.cc:196
+#: apt-inst/contrib/arfile.cc:94
#, fuzzy, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"
-#: methods/connect.cc:243
-#, fuzzy, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "Methwyd cysylltu i %s %s:"
+#: apt-inst/contrib/arfile.cc:106
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:71
-#, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Yn Erthylu'r Sefydliad."
+#: apt-inst/contrib/arfile.cc:135
+msgid "Archive is too short"
+msgstr "Mae'r archif yn rhy fyr"
-#: methods/gpgv.cc:163
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr ""
+#: apt-inst/contrib/arfile.cc:139
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"
-#: methods/gpgv.cc:168
-msgid "At least one invalid signature was encountered."
-msgstr ""
+#: apt-inst/filelist.cc:382
+msgid "DropNode called on still linked node"
+msgstr "Galwyd DropNode ar nôd sydd o hyd wedi ei gysylltu"
-#: methods/gpgv.cc:172
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
-msgstr ""
+#: apt-inst/filelist.cc:414
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"
-#: methods/gpgv.cc:177
-msgid "Unknown error executing gpgv"
-msgstr ""
+#: apt-inst/filelist.cc:461
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"
-#: methods/gpgv.cc:211 methods/gpgv.cc:218
+#: apt-inst/filelist.cc:466
#, fuzzy
-msgid "The following signatures were invalid:\n"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-
-#: methods/gpgv.cc:225
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
-msgstr ""
+msgid "Internal error in AddDiversion"
+msgstr "Gwall Mewnol yn AddDiversion"
-#: methods/http.cc:385
-msgid "Waiting for headers"
-msgstr "Yn aros am benawdau"
+#: apt-inst/filelist.cc:479
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
-#: methods/http.cc:531
+# FIXME: "the"
+#: apt-inst/filelist.cc:508
#, c-format
-msgid "Got a single header line over %u chars"
-msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
-#: methods/http.cc:539
-msgid "Bad header line"
-msgstr "Llinell pennawd gwael"
+#: apt-inst/filelist.cc:551
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"
-#: methods/http.cc:564 methods/http.cc:571
-#, fuzzy
-msgid "The HTTP server sent an invalid reply header"
-msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:55
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
-#: methods/http.cc:600
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+#: apt-inst/dirstream.cc:106
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"
-#: methods/http.cc:615
-#, fuzzy
-msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+#: apt-inst/extract.cc:94 apt-inst/extract.cc:165
+#, c-format
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"
-#: methods/http.cc:617
-#, fuzzy
-msgid "This HTTP server has broken range support"
-msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+#: apt-inst/extract.cc:125
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"
-#: methods/http.cc:641
-msgid "Unknown date format"
-msgstr "Fformat dyddiad anhysbys"
+#: apt-inst/extract.cc:135
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-#: methods/http.cc:799
-msgid "Select failed"
-msgstr "Methwyd dewis"
+#: apt-inst/extract.cc:145
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Mae'r pecyn yn ceisio ysgrifennu i'r targed dargyfeiriad %s/%s"
-#: methods/http.cc:804
-msgid "Connection timed out"
-msgstr "Goramserodd y cysylltiad"
+#: apt-inst/extract.cc:155 apt-inst/extract.cc:299
+msgid "The diversion path is too long"
+msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
-#: methods/http.cc:827
-msgid "Error writing to output file"
-msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+#: apt-inst/extract.cc:242
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr ""
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
-#: methods/http.cc:858
-msgid "Error writing to file"
-msgstr "Gwall wrth ysgrifennu at ffeil"
+#: apt-inst/extract.cc:282
+msgid "Failed to locate node in its hash bucket"
+msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
-#: methods/http.cc:886
-msgid "Error writing to the file"
-msgstr "Gwall wrth ysgrifennu at y ffeil"
+#: apt-inst/extract.cc:286
+msgid "The path is too long"
+msgstr "Mae'r llwybr yn rhy hir"
-#: methods/http.cc:900
-#, fuzzy
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+# FIXME: wtf?
+#: apt-inst/extract.cc:414
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
-#: methods/http.cc:902
-msgid "Error reading from server"
-msgstr "Gwall wrth ddarllen o'r gweinydd"
+#: apt-inst/extract.cc:431
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s"
-#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: apt-inst/extract.cc:491
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Ni ellir gwneud stat() o %s"
-#: methods/http.cc:1160
-#, fuzzy
-msgid "Bad header data"
-msgstr "Data pennawd gwael"
+#: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:48
+#: apt-inst/deb/debfile.cc:57
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
-#: methods/http.cc:1177 methods/http.cc:1232
-msgid "Connection failed"
-msgstr "Methodd y cysylltiad"
+#: apt-inst/deb/debfile.cc:124
+#, fuzzy, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
-#: methods/http.cc:1324
-msgid "Internal error"
-msgstr "Gwall mewnol"
+#: apt-inst/deb/debfile.cc:219
+#, fuzzy
+msgid "Unparsable control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79
msgid "Can't mmap an empty file"
msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:111
#, fuzzy, c-format
msgid "Couldn't duplicate file descriptor %i"
msgstr "Methwyd agor pibell ar gyfer %s"
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
-#, c-format
-msgid "Couldn't make mmap of %lu bytes"
+#: apt-pkg/contrib/mmap.cc:119
+#, fuzzy, c-format
+msgid "Couldn't make mmap of %llu bytes"
msgstr "Methwyd gwneud mmap() efo %lu beit"
-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:146
#, fuzzy
msgid "Unable to close mmap"
msgstr "Ni ellir agor %s"
# FIXME
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:174 apt-pkg/contrib/mmap.cc:202
#, fuzzy
msgid "Unable to synchronize mmap"
msgstr "Methwyd gweithredu "
-#: apt-pkg/contrib/mmap.cc:300
+#: apt-pkg/contrib/mmap.cc:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
+
+#: apt-pkg/contrib/mmap.cc:322
+#, fuzzy
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"
+
+#: apt-pkg/contrib/mmap.cc:341
#, c-format
msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:399
+#: 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:402
+#: apt-pkg/contrib/mmap.cc:449
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
+#: apt-pkg/contrib/strutl.cc:401
#, c-format
msgid "%lid %lih %limin %lis"
msgstr ""
#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:408
#, c-format
msgid "%lih %limin %lis"
msgstr ""
#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:415
#, c-format
msgid "%limin %lis"
msgstr ""
#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
+#: apt-pkg/contrib/strutl.cc:420
#, c-format
msgid "%lis"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1119
+#: apt-pkg/contrib/strutl.cc:1229
#, c-format
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
-#: apt-pkg/contrib/configuration.cc:452
+#: apt-pkg/contrib/configuration.cc:503
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:510
+#: apt-pkg/contrib/configuration.cc:617
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:678
+#: apt-pkg/contrib/configuration.cc:785
#, 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:697
+#: apt-pkg/contrib/configuration.cc:804
#, fuzzy, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
-#: apt-pkg/contrib/configuration.cc:714
+#: apt-pkg/contrib/configuration.cc:821
#, 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:754
+#: apt-pkg/contrib/configuration.cc:861
#, 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:761
+#: apt-pkg/contrib/configuration.cc:868
#, 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:765 apt-pkg/contrib/configuration.cc:770
+#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:881
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:777
+#: apt-pkg/contrib/configuration.cc:884
#, fuzzy, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/contrib/configuration.cc:827
+#: apt-pkg/contrib/configuration.cc:934
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146
#, c-format
msgid "%c%s... Error!"
msgstr "%c%s... Gwall!"
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148
#, c-format
msgid "%c%s... Done"
msgstr "%c%s... Wedi Gorffen"
+#: apt-pkg/contrib/progress.cc:179
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:195
+#, fuzzy, c-format
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"
+
# FIXME
-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:116
#, c-format
msgid "Command line option '%c' [from %s] is not known."
msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
+#: apt-pkg/contrib/cmndline.cc:158
#, c-format
msgid "Command line option %s is not understood"
msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:163
#, c-format
msgid "Command line option %s is not boolean"
msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
#, c-format
msgid "Option %s requires an argument."
msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
+#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
#, c-format
msgid "Option %s: Configuration item specification must have an =<val>."
msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:273
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:304
#, c-format
msgid "Option '%s' is too long"
msgstr "Opsiwn '%s' yn rhy hir"
# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:336
#, c-format
msgid "Sense %s is not understood, try true or false."
msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:386
#, c-format
msgid "Invalid operation %s"
msgstr "Gweithred annilys %s"
-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56
#, c-format
msgid "Unable to stat the mount point %s"
msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
-#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
-#: methods/mirror.cc:93
-#, c-format
-msgid "Unable to change to %s"
-msgstr "Ni ellir newid i %s"
-
-#: apt-pkg/contrib/cdromutl.cc:217
+#: apt-pkg/contrib/cdromutl.cc:225
msgid "Failed to stat the cdrom"
msgstr "Methwyd gwneud stat() o'r CD-ROM"
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:95
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gwall wrth gau'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:228
#, c-format
msgid "Not using locking for read only lock file %s"
msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
-#: apt-pkg/contrib/fileutl.cc:159
+#: apt-pkg/contrib/fileutl.cc:233
#, c-format
msgid "Could not open lock file %s"
msgstr "Methwyd agor y ffeil clo %s"
-#: apt-pkg/contrib/fileutl.cc:177
+#: apt-pkg/contrib/fileutl.cc:256
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
-#: apt-pkg/contrib/fileutl.cc:181
+#: apt-pkg/contrib/fileutl.cc:261
#, c-format
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:321
+#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
#, c-format
msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-#: apt-pkg/contrib/fileutl.cc:661
-#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
+#: apt-pkg/contrib/fileutl.cc:432
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:450
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:459
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:673
+#: apt-pkg/contrib/fileutl.cc:862
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:864
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:679
+#: 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:681
+#: 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"
-#: apt-pkg/contrib/fileutl.cc:746
+#: apt-pkg/contrib/fileutl.cc:1016
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/contrib/fileutl.cc:763
+#: apt-pkg/contrib/fileutl.cc:1093
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Methwyd agor pibell ar gyfer %s"
+#: apt-pkg/contrib/fileutl.cc:1178
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1233
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "
+
# FIXME
-#: apt-pkg/contrib/fileutl.cc:823
-#, c-format
-msgid "read, still have %lu to read but none left"
+#: apt-pkg/contrib/fileutl.cc:1326
+#, fuzzy, c-format
+msgid "read, still have %llu to read but none left"
msgstr "o hyd %lu i ddarllen ond dim ar ôl"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:856
-#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr "o hyd %lu i ysgrifennu ond methwyd"
-
-#: apt-pkg/contrib/fileutl.cc:985
+#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
#, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgid "write, still have %llu to write but couldn't"
+msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:988
+#: apt-pkg/contrib/fileutl.cc:1723
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:993
+#: apt-pkg/contrib/fileutl.cc:1735
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1004
+#: apt-pkg/contrib/fileutl.cc:1746
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:1017
+#: apt-pkg/contrib/fileutl.cc:1759
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/pkgcache.cc:145
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/contrib/gpgv.cc:70
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Yn Erthylu'r Sefydliad."
+
+#: apt-pkg/pkgcache.cc:148
msgid "Empty package cache"
msgstr "Storfa pecyn gwag"
-#: apt-pkg/pkgcache.cc:151
+#: apt-pkg/pkgcache.cc:154
msgid "The package cache file is corrupted"
msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-#: apt-pkg/pkgcache.cc:156
+#: apt-pkg/pkgcache.cc:159
msgid "The package cache file is an incompatible version"
msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+#: apt-pkg/pkgcache.cc:162
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/pkgcache.cc:167
#, fuzzy, c-format
msgid "This APT does not support the versioning system '%s'"
msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
-#: apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:172
msgid "The package cache was built for a different architecture"
msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-#: apt-pkg/pkgcache.cc:293
+#: apt-pkg/pkgcache.cc:314
msgid "Depends"
msgstr "Dibynnu"
-#: apt-pkg/pkgcache.cc:293
+#: apt-pkg/pkgcache.cc:314
msgid "PreDepends"
msgstr "CynDdibynnu"
-#: apt-pkg/pkgcache.cc:293
+#: apt-pkg/pkgcache.cc:314
msgid "Suggests"
msgstr "Awgrymu"
-#: apt-pkg/pkgcache.cc:294
+#: apt-pkg/pkgcache.cc:315
msgid "Recommends"
msgstr "Argymell"
-#: apt-pkg/pkgcache.cc:294
+#: apt-pkg/pkgcache.cc:315
msgid "Conflicts"
msgstr "Gwrthdaro"
-#: apt-pkg/pkgcache.cc:294
+#: apt-pkg/pkgcache.cc:315
msgid "Replaces"
msgstr "Amnewid"
-#: apt-pkg/pkgcache.cc:295
+#: apt-pkg/pkgcache.cc:316
msgid "Obsoletes"
msgstr "Darfodi"
-#: apt-pkg/pkgcache.cc:295
+#: apt-pkg/pkgcache.cc:316
msgid "Breaks"
msgstr ""
-#: apt-pkg/pkgcache.cc:295
+#: apt-pkg/pkgcache.cc:316
msgid "Enhances"
msgstr ""
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:327
msgid "important"
msgstr "pwysig"
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:327
msgid "required"
msgstr "angenrheidiol"
-#: apt-pkg/pkgcache.cc:306
+#: apt-pkg/pkgcache.cc:327
msgid "standard"
msgstr "safonnol"
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:328
msgid "optional"
msgstr "opsiynnol"
-#: apt-pkg/pkgcache.cc:307
+#: apt-pkg/pkgcache.cc:328
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161
#, fuzzy
msgid "Building dependency tree"
msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/depcache.cc:126
+#: apt-pkg/depcache.cc:133
#, fuzzy
msgid "Candidate versions"
msgstr "Fersiynau Posib"
-#: apt-pkg/depcache.cc:155
+#: apt-pkg/depcache.cc:162
#, fuzzy
msgid "Dependency generation"
msgstr "Cynhyrchaid Dibyniaeth"
-#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219
#, fuzzy
msgid "Reading state information"
msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-pkg/depcache.cc:237
+#: apt-pkg/depcache.cc:244
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Methwyd agor %s"
-#: apt-pkg/depcache.cc:243
+#: apt-pkg/depcache.cc:250
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-pkg/depcache.cc:922
-#, c-format
-msgid "Internal error, group '%s' has no installable pseudo package"
-msgstr ""
-
# FIXME: number?
-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:138
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/tagfile.cc:189
+#: 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:92
+#: 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:95
+#: 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:106
+#: 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:112
+#: 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:115
+#: 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:128
+#: 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:130
+#: 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:133
+#: 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:139
+#: 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:146
+#: 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:244
+#: apt-pkg/sourcelist.cc:326
#, c-format
msgid "Opening %s"
msgstr "Yn agor %s"
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
+#: 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:281
+#: 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:285
+#: 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 line %u in source list %s"
+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:331 apt-pkg/packagemanager.cc:616
+#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
#, c-format
msgid ""
"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"
+
# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:452
+#: apt-pkg/packagemanager.cc:570
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
"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:495
-#, 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
+#: apt-pkg/pkgrecords.cc:34
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: apt-pkg/algorithms.cc:292
+#: apt-pkg/algorithms.cc:266
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1218
+#: apt-pkg/algorithms.cc:1068
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1220
+#: apt-pkg/algorithms.cc:1070
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
-"rai eu defnyddio yn lle."
-
-#: apt-pkg/acquire.cc:79
+#: 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."
-#: apt-pkg/acquire.cc:83
+#: apt-pkg/acquire.cc:85
#, fuzzy, c-format
msgid "Archives directory %spartial is missing."
msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/acquire.cc:93
#, fuzzy, c-format
msgid "Unable to lock directory %s"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
#. only show the ETA if it makes sense
#. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/acquire.cc:893
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
msgstr ""
-#: apt-pkg/acquire.cc:859
+#: apt-pkg/acquire.cc:895
#, fuzzy, c-format
msgid "Retrieving file %li of %li"
msgstr "Yn Darllen Rhestr Ffeiliau"
-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
msgstr "Methwyd canfod y gyrrydd dull %s."
-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:115
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:166
#, c-format
msgid "Method %s did not start correctly"
msgstr "Ni gychwynodd y dull %s yn gywir"
-#: apt-pkg/acquire-worker.cc:413
+#: apt-pkg/acquire-worker.cc:452
#, fuzzy, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
msgstr ""
msgid "Unable to determine a suitable packaging system type"
msgstr "Ni ellir canfod math system addas"
-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:57
#, c-format
msgid "Unable to stat %s."
msgstr "Ni ellir gwneud stat() o %s."
# FIXME: ...file
-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47
msgid "You must put some 'source' URIs in your sources.list"
msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
-#: apt-pkg/cachefile.cc:84
+#: apt-pkg/cachefile.cc:87
msgid "The package lists or status file could not be parsed or opened."
msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
-#: apt-pkg/cachefile.cc:88
+#: apt-pkg/cachefile.cc:91
msgid "You may want to run apt-get update to correct these problems"
msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn."
-#: apt-pkg/cachefile.cc:106
+#: apt-pkg/cachefile.cc:109
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
+#: apt-pkg/policy.cc:75
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
# FIXME: literal
-#: apt-pkg/policy.cc:344
+#: 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:366
+#: 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:374
+#: apt-pkg/policy.cc:444
msgid "No priority (or zero) specified for pin"
msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
-#: apt-pkg/pkgcachegen.cc:80
+#: apt-pkg/pkgcachegen.cc:87
msgid "Cache has an incompatible versioning system"
msgstr "Mae can y storfa system fersiwn anghyfaddas"
-#: apt-pkg/pkgcachegen.cc:198
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
-
-#: apt-pkg/pkgcachegen.cc:215
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
-
-#: apt-pkg/pkgcachegen.cc:253
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:285
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
-
-#: apt-pkg/pkgcachegen.cc:289
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
-#: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
-
-#: apt-pkg/pkgcachegen.cc:320
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
-
-#: apt-pkg/pkgcachegen.cc:353
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:218 apt-pkg/pkgcachegen.cc:228
+#: apt-pkg/pkgcachegen.cc:294 apt-pkg/pkgcachegen.cc:321
+#: apt-pkg/pkgcachegen.cc:334 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:380 apt-pkg/pkgcachegen.cc:397
+#: apt-pkg/pkgcachegen.cc:405 apt-pkg/pkgcachegen.cc:409
+#: apt-pkg/pkgcachegen.cc:413 apt-pkg/pkgcachegen.cc:434
+#: apt-pkg/pkgcachegen.cc:473 apt-pkg/pkgcachegen.cc:511
+#: apt-pkg/pkgcachegen.cc:518 apt-pkg/pkgcachegen.cc:549
+#: apt-pkg/pkgcachegen.cc:563
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-#: apt-pkg/pkgcachegen.cc:360
+#: apt-pkg/pkgcachegen.cc:251
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:363
+#: apt-pkg/pkgcachegen.cc:254
msgid "Wow, you exceeded the number of versions this APT is capable of."
msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:366
+#: apt-pkg/pkgcachegen.cc:257
#, fuzzy
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
msgstr "Jiw, rhagoroch chi'r nifer o fersiynau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:369
+#: apt-pkg/pkgcachegen.cc:260
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
"Jiw, rhagoroch chi'r nifer o ddibyniaethau mae'r APT hwn yn gallu ei drin."
-#: apt-pkg/pkgcachegen.cc:398
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:412
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
-
-#: apt-pkg/pkgcachegen.cc:418
+#: apt-pkg/pkgcachegen.cc:570
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-#: apt-pkg/pkgcachegen.cc:982
+#: apt-pkg/pkgcachegen.cc:1199
#, c-format
msgid "Couldn't stat source package list %s"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: apt-pkg/pkgcachegen.cc:1087
+#: apt-pkg/pkgcachegen.cc:1287 apt-pkg/pkgcachegen.cc:1391
+#: apt-pkg/pkgcachegen.cc:1397 apt-pkg/pkgcachegen.cc:1554
+#, fuzzy
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
+
+#: apt-pkg/pkgcachegen.cc:1304
msgid "Collecting File Provides"
msgstr "Yn Casglu Darpariaethau Ffeil"
-#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
+#: apt-pkg/pkgcachegen.cc:1496 apt-pkg/pkgcachegen.cc:1503
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
-#: apt-pkg/acquire-item.cc:136
+#: apt-pkg/acquire-item.cc:139
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:484
-msgid "MD5Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
-
-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
-#: apt-pkg/acquire-item.cc:1717
+#: apt-pkg/acquire-item.cc:154
#, fuzzy
msgid "Hash Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:1244
+#: apt-pkg/acquire-item.cc:159
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"
+
+#: apt-pkg/acquire-item.cc:164
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Gweithred annilys %s"
+
+#: apt-pkg/acquire-item.cc:1570
+#, c-format
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
+
+# FIXME: number?
+#: 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:1628
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
-#. the time since then the file is invalid - formated in the same way as in
-#. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1281
+#: apt-pkg/acquire-item.cc:1666
#, c-format
-msgid "Release file expired, ignoring %s (invalid since %s)"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
msgstr ""
-#: apt-pkg/acquire-item.cc:1302
+#: apt-pkg/acquire-item.cc:1688
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
msgstr ""
-#: apt-pkg/acquire-item.cc:1328
+#: apt-pkg/acquire-item.cc:1718
#, c-format
msgid ""
-"A error occurred during the signature verification. The repository is not "
+"An error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used. GPG error: %s: %s\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:1337
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: 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:1365
+#: 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:1424
+#: apt-pkg/acquire-item.cc:1922
#, c-format
-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
+msgid "Can't find a source to download version '%s' of '%s'"
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:1479
+#: apt-pkg/acquire-item.cc:1980
#, 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:1566
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
-
# FIXME: number?
-#: apt-pkg/indexrecords.cc:53
+#: apt-pkg/indexrecords.cc:73
#, fuzzy, c-format
msgid "Unable to parse Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/indexrecords.cc:60
+#: apt-pkg/indexrecords.cc:81
#, fuzzy, c-format
msgid "No sections in Release file %s"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/indexrecords.cc:94
+#: apt-pkg/indexrecords.cc:112
#, c-format
msgid "No Hash entry in Release file %s"
msgstr ""
-#: apt-pkg/indexrecords.cc:107
+#: apt-pkg/indexrecords.cc:125
#, fuzzy, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
# FIXME: number?
-#: apt-pkg/indexrecords.cc:122
+#: apt-pkg/indexrecords.cc:144
#, fuzzy, c-format
msgid "Invalid 'Date' entry in Release file %s"
msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/vendorlist.cc:66
+#: apt-pkg/vendorlist.cc:78
#, c-format
msgid "Vendor block %s contains no fingerprint"
msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: apt-pkg/cdrom.cc:518
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
-msgid "Identifying.. "
-msgstr ""
-
-#: apt-pkg/cdrom.cc:552
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
-#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
-
-#: apt-pkg/cdrom.cc:578
+#: apt-pkg/cdrom.cc:575
#, c-format
msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/cdrom.cc:596
+#: apt-pkg/cdrom.cc:583
msgid "Unmounting CD-ROM\n"
msgstr ""
-#: apt-pkg/cdrom.cc:600
+#: apt-pkg/cdrom.cc:588
#, fuzzy
msgid "Waiting for disc...\n"
msgstr "Yn aros am benawdau"
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:597
msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/cdrom.cc:626
+#: 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:666
+#: 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:677
+#: 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:703
+#: apt-pkg/cdrom.cc:755
#, c-format
msgid "Found label '%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:732
+#: apt-pkg/cdrom.cc:784
msgid "That is not a valid name, try again.\n"
msgstr ""
-#: apt-pkg/cdrom.cc:748
+#: apt-pkg/cdrom.cc:801
#, c-format
msgid ""
"This disc is called: \n"
"'%s'\n"
msgstr ""
-#: apt-pkg/cdrom.cc:752
+#: apt-pkg/cdrom.cc:803
#, fuzzy
msgid "Copying package lists..."
msgstr "Yn Darllen Rhestrau Pecynnau"
-#: apt-pkg/cdrom.cc:778
+#: 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:787
+#: apt-pkg/cdrom.cc:846
msgid "Source list entries for this disc are:\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
#, c-format
msgid "Wrote %i records.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
#, c-format
msgid "Wrote %i records with %i missing files.\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
#, c-format
msgid "Wrote %i records with %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
#, c-format
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/indexcopy.cc:537
-#, fuzzy, c-format
-msgid "Skipping nonexistent file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
-
-#: apt-pkg/indexcopy.cc:543
+#: apt-pkg/indexcopy.cc:515
#, c-format
msgid "Can't find authentication record for: %s"
msgstr ""
-#: apt-pkg/indexcopy.cc:549
+#: apt-pkg/indexcopy.cc:521
#, fuzzy, c-format
msgid "Hash mismatch for: %s"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/cacheset.cc:337
+#: apt-pkg/cacheset.cc:479
#, c-format
msgid "Release '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-#: apt-pkg/cacheset.cc:340
+#: apt-pkg/cacheset.cc:482
#, c-format
msgid "Version '%s' for '%s' was not found"
msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: apt-pkg/cacheset.cc:447
+#: apt-pkg/cacheset.cc:593
#, fuzzy, c-format
msgid "Couldn't find task '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:454
+#: apt-pkg/cacheset.cc:599
#, fuzzy, c-format
msgid "Couldn't find any package by regex '%s'"
msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/cacheset.cc:467
+#: apt-pkg/cacheset.cc:605
+#, fuzzy, c-format
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: apt-pkg/cacheset.cc:616
#, c-format
msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
+#: apt-pkg/cacheset.cc:623 apt-pkg/cacheset.cc:630
#, c-format
msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
-#: apt-pkg/cacheset.cc:491
+#: apt-pkg/cacheset.cc:637
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
-#: apt-pkg/cacheset.cc:499
+#: apt-pkg/cacheset.cc:645
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
-#: apt-pkg/cacheset.cc:507
+#: apt-pkg/cacheset.cc:653
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:52
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:209
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:279
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:286
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:556 apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:564
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:51
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:85 apt-pkg/install-progress.cc:168
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Methwodd rhai ffeiliau mynegai lawrlwytho: maent wedi eu anwybyddu, neu hen "
+"rai eu defnyddio yn lle."
+
+#: apt-pkg/deb/dpkgpm.cc:91
#, fuzzy, c-format
msgid "Installing %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
+#: 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:54 apt-pkg/deb/dpkgpm.cc:830
+#: 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:55
+#: apt-pkg/deb/dpkgpm.cc:94
#, fuzzy, c-format
msgid "Completely removing %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:56
+#: apt-pkg/deb/dpkgpm.cc:95
#, c-format
msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:57
+#: apt-pkg/deb/dpkgpm.cc:96
#, c-format
msgid "Running post-installation trigger %s"
msgstr ""
#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:646
+#: 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:661 apt-pkg/deb/dpkgpm.cc:675
+#: 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:816
+#: apt-pkg/deb/dpkgpm.cc:970
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:817
+#: apt-pkg/deb/dpkgpm.cc:971
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:822
+#: 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:824
+#: apt-pkg/deb/dpkgpm.cc:978
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:829
+#: apt-pkg/deb/dpkgpm.cc:983
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:831
+#: apt-pkg/deb/dpkgpm.cc:985
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:836
+#: 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:837
+#: apt-pkg/deb/dpkgpm.cc:991
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1043
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: apt-pkg/deb/dpkgpm.cc:1046
+msgid "ioctl(TIOCGWINSZ) failed"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1074
-msgid "Running dpkg"
+#: 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:1049
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1070
+msgid "Is stdout a terminal?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1558
+msgid "Operation was interrupted before it could finish"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1277
+#: 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:1282
+#: apt-pkg/deb/dpkgpm.cc:1625
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1284
+#: 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:1290
+#: 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:1296
+#: 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:1303
+#: 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:1674
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:69
+#: apt-pkg/deb/debsystem.cc:84
#, c-format
msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
-#: apt-pkg/deb/debsystem.cc:72
+#: apt-pkg/deb/debsystem.cc:87
#, fuzzy, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
+#: apt-pkg/deb/debsystem.cc:103
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
-#: apt-pkg/deb/debsystem.cc:106
+#: apt-pkg/deb/debsystem.cc:121
msgid "Not locked"
msgstr ""
-#. FIXME: fallback to a default mirror here instead
-#. and provide a config option to define that default
-#: methods/mirror.cc:200
-#, c-format
-msgid "No mirror file '%s' found "
-msgstr ""
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "Nid yw %s yn becyn DEB dilys."
-#: methods/mirror.cc:343
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
+#, fuzzy
+#~ msgid "Note, selecting '%s' for task '%s'\n"
+#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: 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 ""
+#, fuzzy
+#~ msgid "Note, selecting '%s' for regex '%s'\n"
+#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: 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 ""
+#~ msgid "Package %s is a virtual package provided by:\n"
+#~ msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-#: methods/rsh.cc:329
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
+#, fuzzy
+#~ msgid " [Not candidate version]"
+#~ msgstr "Fersiynau Posib"
+
+#~ msgid "You should explicitly select one to install."
+#~ msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+
+# FIXME: punctuation
+#, fuzzy
+#~ msgid ""
+#~ "Package %s is not available, but is referred to by another package.\n"
+#~ "This may mean that the package is missing, has been obsoleted, or\n"
+#~ "is only available from another source\n"
+#~ msgstr ""
+#~ "Does dim fersiwn gan y pecyn %s, ond mae'n bodoli yn y cronfa data.\n"
+#~ "Mae hyn fel arfer yn golygu y crybwyllwyd y pecyn mewn dibyniaeth ond "
+#~ "heb\n"
+#~ "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
+#~ "ffeil sources.list.\n"
+
+#~ msgid "However the following packages replace it:"
+#~ msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+
+#, fuzzy
+#~ msgid "Package '%s' has no installation candidate"
+#~ msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+
+#, fuzzy
+#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+#~ msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Note, selecting '%s' instead of '%s'\n"
+#~ msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+#~ msgstr ""
+#~ "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
+
+#~ 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"
+
+#~ msgid "%s is already the newest version.\n"
+#~ msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+
+#, fuzzy
+#~ msgid "Selected version '%s' (%s) for '%s'\n"
+#~ msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#, fuzzy
+#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+#~ msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#, fuzzy
+#~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+#~ msgstr "Nid yw hyn yn archif DEB dilys, aelod '%s' ar goll"
+
+#~ msgid "MD5Sum mismatch"
+#~ msgstr "Camgyfatebiaeth swm MD5"
+
+#~ msgid ""
+#~ "I wasn't able to locate a file for the %s package. This might mean you "
+#~ "need to manually fix this package."
+#~ msgstr ""
+#~ "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i "
+#~ "chi drwsio'r pecyn hyn a law."
+
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Yn agor y ffeil cyfluniad %s"
+
+#~ msgid "Failed to remove %s"
+#~ msgstr "Methwyd dileu %s"
+
+#~ msgid "Unable to create %s"
+#~ msgstr "Ni ellir creu %s"
+
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Methwyd stat() ar %sinfo"
+
+#~ msgid "The info and temp directories need to be on the same filesystem"
+#~ msgstr ""
+#~ "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau"
+
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
+
+# FIXME
+#, fuzzy
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Gwall mewnol wrth gyrchu enw pecyn"
+
+#, fuzzy
+#~ msgid "Reading file listing"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
+
+#~ msgid ""
+#~ "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
+#~ "then make it empty and immediately re-install the same version of the "
+#~ "package!"
+#~ msgstr ""
+#~ "Methwyd agor y ffeil rhestr '%sinfo/%s'. Os na allwch adfer y ffeil hwn "
+#~ "yna gwnewch e'n wag ac yna ail sefydlwch yr un ferswin o'r pecyn yn syth!"
+
+# FIXME
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
+
+#, fuzzy
+#~ msgid "Internal error getting a node"
+#~ msgstr "Gwall Mewnol wrth gael Nôd"
+
+# FIXME: literal
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
+
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+
+#, fuzzy
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+
+#, fuzzy
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
+
+#, fuzzy
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
+
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
+
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
+
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Methwyd newid i %s"
+
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Methwyd lleoli ffeil rheoli dilys"
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Methwyd agor pibell ar gyfer %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Gwall darllen o broses %s"
+
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
+
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
+
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
+
+#~ msgid "decompressor"
+#~ msgstr "datgywasgydd"
+
+# FIXME
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+
+# FIXME
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "o hyd %lu i ysgrifennu ond methwyd"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+
+#, fuzzy
+#~ msgid "Error occurred while processing %s (CollectFileProvides)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+
+#, fuzzy
+#~ msgid "Internal error, could not locate member"
+#~ msgstr "Gwall Methwyd, methwyd lleoli aelod"
#, fuzzy
#~ msgid "Error occurred while processing %s (NewVersion2)"
projects / apt.git / blobdiff