msgid ""
msgstr ""
"Project-Id-Version: APT\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-28 17:23+0200\n"
+"Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
+"POT-Creation-Date: 2014-11-06 09:45+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:149
#, 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:317
#, fuzzy
msgid "Total package names: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:319
#, fuzzy
msgid "Total package structures: "
msgstr "Cyfanswm Enwau Pecynnau : "
-#: cmdline/apt-cache.cc:326
+#: cmdline/apt-cache.cc:359
#, fuzzy
msgid " Normal packages: "
msgstr " Pecynnau Normal: "
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:360
#, fuzzy
msgid " Pure virtual packages: "
msgstr " Pecynnau Cwbl Rhithwir: "
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:361
#, fuzzy
msgid " Single virtual packages: "
msgstr " Pecynnau Rhithwir Sengl: "
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:362
#, fuzzy
msgid " Mixed virtual packages: "
msgstr " Pecynnau Rhithwir Cymysg: "
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:363
msgid " Missing: "
msgstr " Ar Goll: "
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:365
#, fuzzy
msgid "Total distinct versions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:367
#, fuzzy
msgid "Total distinct descriptions: "
msgstr "Cyfanswm Fersiynau Gwahanol: "
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:369
#, fuzzy
msgid "Total dependencies: "
msgstr "Cyfanswm Dibyniaethau: "
-#: cmdline/apt-cache.cc:339
+#: cmdline/apt-cache.cc:372
#, fuzzy
msgid "Total ver/file relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:374
#, fuzzy
msgid "Total Desc/File relations: "
msgstr "Cyfanswm perthyniadau fersiwn/ffeil: "
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:376
#, fuzzy
msgid "Total Provides mappings: "
msgstr "Cyfanswm Mapiau Darpariath: "
-#: cmdline/apt-cache.cc:355
+#: cmdline/apt-cache.cc:428
#, fuzzy
msgid "Total globbed strings: "
msgstr "Cyfanswm Llinynau Glob: "
-#: cmdline/apt-cache.cc:369
-#, fuzzy
-msgid "Total dependency version space: "
-msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:434
#, fuzzy
msgid "Total slack space: "
msgstr "Cyfanswm gofod Slac: "
-#: cmdline/apt-cache.cc:382
+#: cmdline/apt-cache.cc:449
#, fuzzy
msgid "Total space accounted for: "
msgstr "Cyfanswm Gofod Cyfrifwyd: "
-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
+#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: apt-private/private-show.cc:58
#, 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:663 cmdline/apt-cache.cc:1521
+#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
+#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: apt-private/private-show.cc:171 apt-private/private-show.cc:173
+msgid "No packages found"
+msgstr "Canfuwyd dim pecyn"
+
+#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
#, 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:1500
+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:1595 apt-pkg/cacheset.cc:658
#, c-format
msgid "Unable to locate package %s"
msgstr "Ni ellir lleoli'r pecyn %s"
-#: cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1625
#, fuzzy
msgid "Package files:"
msgstr "Ffeiliau Pecynnau:"
-#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
+#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
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:1646
#, fuzzy
msgid "Pinned packages:"
msgstr "Pecynnau wedi eu Pinio:"
-#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
msgid "(not found)"
msgstr "(heb ganfod)"
-#: cmdline/apt-cache.cc:1575
+#: cmdline/apt-cache.cc:1666
msgid " Installed: "
msgstr " Wedi Sefydlu: "
-#: cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1667
msgid " Candidate: "
msgstr " Ymgeisydd: "
-#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
msgid "(none)"
msgstr "(dim)"
-#: cmdline/apt-cache.cc:1615
+#: cmdline/apt-cache.cc:1700
#, fuzzy
msgid " Package pin: "
msgstr " Pin Pecyn: "
#. Show the priority tables
-#: cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1709
#, 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:2758 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
+#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
+#: 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:1829
#, 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:76
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:91
#, 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:139
#, 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:178
+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.\n"
+"See 'man apt-cdrom' for more information about the CD-ROM auto-detection and "
+"mount point."
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:182
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."
+#: cmdline/apt-get.cc:246
+#, fuzzy, c-format
+msgid "Can not find a package for architecture '%s'"
+msgstr "Methwyd canfod pecyn %s"
-# 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-get.cc:322
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with version '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:325
+#, fuzzy, c-format
+msgid "Can not find a package '%s' with release '%s'"
+msgstr "Methwyd canfod pecyn %s"
+
+#: cmdline/apt-get.cc:362
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
+#: cmdline/apt-get.cc:418
#, c-format
-msgid "Unable to write to %s"
-msgstr "Ni ellir ysgrifennu i %s"
+msgid "Can not find version '%s' of package '%s'"
+msgstr ""
-#: 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:449
+#, c-format
+msgid "Couldn't find package %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:454 cmdline/apt-mark.cc:81
+#: apt-private/private-install.cc:863
+#, fuzzy, c-format
+msgid "%s set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: 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:456 cmdline/apt-mark.cc:83
#, fuzzy, c-format
-msgid "Error processing directory %s"
-msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+msgid "%s set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: 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:464 cmdline/apt-mark.cc:127
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+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:533 cmdline/apt-get.cc:541
+#, fuzzy
+msgid "Internal error, problem resolver broke stuff"
+msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: ftparchive/apt-ftparchive.cc:407
+#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
#, fuzzy, c-format
-msgid "Error processing contents %s"
-msgstr "Gwall wrth Brosesu Cynnwys %s"
+msgid "Unable to lock directory %s"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-# FIXME: full stops
-#: ftparchive/apt-ftparchive.cc:595
-#, fuzzy
-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"
+#: cmdline/apt-get.cc:620
+msgid "Unable to lock the download directory"
+msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: ftparchive/apt-ftparchive.cc:801
-msgid "No selections matched"
-msgstr "Dim dewisiadau'n cyfateb"
+#: cmdline/apt-get.cc:738
+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/apt-ftparchive.cc:879
+#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
#, 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'"
+msgid "Unable to find a source package for %s"
+msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: ftparchive/cachedb.cc:43
+#: cmdline/apt-get.cc:796
#, c-format
-msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
-#: ftparchive/cachedb.cc:61
+#: cmdline/apt-get.cc:801
#, c-format
-msgid "DB is old, attempting to upgrade %s"
-msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
-
-#: ftparchive/cachedb.cc:72
msgid ""
-"DB format is invalid. If you upgraded from an older version of apt, please "
-"remove and re-create the database."
+"Please use:\n"
+"bzr branch %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: ftparchive/cachedb.cc:77
+#: cmdline/apt-get.cc:849
+#, fuzzy, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+
+#. 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:879
#, c-format
-msgid "Unable to open DB file %s: %s"
-msgstr "Ni ellir agor y ffeil DB2 %s: %s"
+msgid "Need to get %sB/%sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: 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
+#. 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:884
#, c-format
-msgid "Failed to stat %s"
-msgstr "Methodd stat() o %s"
+msgid "Need to get %sB of source archives.\n"
+msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: ftparchive/cachedb.cc:242
-msgid "Archive has no control record"
-msgstr "Does dim cofnod rheoli gan yr archif"
+#: cmdline/apt-get.cc:890
+#, fuzzy, c-format
+msgid "Fetch source %s\n"
+msgstr "Cyrchu Ffynhonell %s\n"
-#: ftparchive/cachedb.cc:448
-msgid "Unable to get a cursor"
-msgstr "Ni ellir cael cyrchydd"
+#: cmdline/apt-get.cc:915
+msgid "Failed to fetch some archives."
+msgstr "Methwyd cyrchu rhai archifau."
-#: ftparchive/writer.cc:73
-#, c-format
-msgid "W: Unable to read directory %s\n"
-msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
+#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+msgid "Download complete and in download only mode"
+msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: ftparchive/writer.cc:78
+#: cmdline/apt-get.cc:945
#, c-format
-msgid "W: Unable to stat %s\n"
-msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-
-#: ftparchive/writer.cc:134
-msgid "E: "
-msgstr "G: "
+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:136
-msgid "W: "
-msgstr "Rh: "
+#: cmdline/apt-get.cc:958
+#, c-format
+msgid "Unpack command '%s' failed.\n"
+msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: ftparchive/writer.cc:143
-msgid "E: Errors apply to file "
-msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
+#: cmdline/apt-get.cc:959
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
-#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
+#: cmdline/apt-get.cc:987
#, c-format
-msgid "Failed to resolve %s"
-msgstr "Methwyd datrys %s"
+msgid "Build command '%s' failed.\n"
+msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: ftparchive/writer.cc:174
-msgid "Tree walking failed"
-msgstr "Methwyd cerdded y goeden"
+#: cmdline/apt-get.cc:1006
+msgid "Child process failed"
+msgstr "Methodd proses plentyn"
-#: ftparchive/writer.cc:201
-#, c-format
-msgid "Failed to open %s"
-msgstr "Methwyd agor %s"
+#: cmdline/apt-get.cc:1025
+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"
-# FIXME
-#: ftparchive/writer.cc:260
+#: cmdline/apt-get.cc:1043
#, c-format
-msgid " DeLink %s [%s]\n"
-msgstr " DatGysylltu %s [%s]\n"
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
-#: ftparchive/writer.cc:268
+#: cmdline/apt-get.cc:1060
#, c-format
-msgid "Failed to readlink %s"
-msgstr "Methwyd darllen y cyswllt %s"
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
-#: ftparchive/writer.cc:272
-#, c-format
-msgid "Failed to unlink %s"
-msgstr "Methwyd datgysylltu %s"
+#: cmdline/apt-get.cc:1070
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: ftparchive/writer.cc:279
+#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
#, c-format
-msgid "*** Failed to link %s to %s"
-msgstr "*** Methwyd cysylltu %s at %s"
+msgid "Unable to get build-dependency information for %s"
+msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: ftparchive/writer.cc:289
+#: cmdline/apt-get.cc:1118
#, c-format
-msgid " DeLink limit of %sB hit.\n"
-msgstr " Tarwyd y terfyn cyswllt %sB.\n"
+msgid "%s has no build depends.\n"
+msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: ftparchive/writer.cc:393
-msgid "Archive had no package field"
-msgstr "Doedd dim maes pecyn gan yr archif"
+#: cmdline/apt-get.cc:1288
+#, 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:1306
#, 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:1329
#, c-format
-msgid " %s maintainer is %s not %s\n"
-msgstr " Cynaliwr %s yw %s nid %s\n"
-
-#: ftparchive/writer.cc:698
-#, fuzzy, c-format
-msgid " %s has no source override entry\n"
-msgstr " Does dim cofnod gwrthwneud gan %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:702
+#: cmdline/apt-get.cc:1368
#, 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 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/contents.cc:321
+#: cmdline/apt-get.cc:1374
#, fuzzy, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
-
-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
-msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Methwyd neilltuo cof"
+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"
-#: ftparchive/override.cc:34 ftparchive/override.cc:142
+#: cmdline/apt-get.cc:1397
#, c-format
-msgid "Unable to open %s"
-msgstr "Ni ellir agor %s"
+msgid "Failed to satisfy %s dependency for %s: %s"
+msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: ftparchive/override.cc:60 ftparchive/override.cc:166
+#: cmdline/apt-get.cc:1412
#, c-format
-msgid "Malformed override %s line %lu #1"
-msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
+msgid "Build-dependencies for %s could not be satisfied."
+msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: 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-get.cc:1417
+msgid "Failed to process build dependencies"
+msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: 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-get.cc:1501 cmdline/apt-get.cc:1516
+#, fuzzy, c-format
+msgid "Changelog for %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
-#: 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-get.cc:1615
+#, fuzzy
+msgid "Supported modules:"
+msgstr "Modylau a Gynhelir:"
-#: ftparchive/multicompress.cc:72
-#, fuzzy, c-format
-msgid "Unknown compression algorithm '%s'"
-msgstr "Dull Cywasgu Anhysbys '%s'"
+# FIXME: split
+#: cmdline/apt-get.cc:1656
+#, 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/multicompress.cc:102
-#, c-format
-msgid "Compressed output %s needs a compression set"
-msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
-msgid "Failed to create IPC pipe to subprocess"
-msgstr "Methwyd creu pibell cyfathrebu at isbroses"
+#: cmdline/apt-helper.cc:49
+#, fuzzy
+msgid "Must specify at least one pair url/filename"
+msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: ftparchive/multicompress.cc:195
-msgid "Failed to create FILE*"
-msgstr "Methwyd creu FILE*"
+#: cmdline/apt-helper.cc:69
+msgid "Download Failed"
+msgstr ""
-#: ftparchive/multicompress.cc:198
-msgid "Failed to fork"
-msgstr "Methodd fork()"
+#: cmdline/apt-helper.cc:82
+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"
+" auto-detect-proxy - detect proxy using apt.conf\n"
+"\n"
+" This APT helper has Super Meep Powers.\n"
+msgstr ""
-#: ftparchive/multicompress.cc:212
-#, fuzzy
-msgid "Compress child"
-msgstr "Plentyn Cywasgu"
+#: cmdline/apt-mark.cc:68
+#, 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:235
+#: cmdline/apt-mark.cc:74
#, fuzzy, c-format
-msgid "Internal error, failed to create %s"
-msgstr "Gwall Mewnol, Methwyd creu %s"
+msgid "%s was already set to manually installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: ftparchive/multicompress.cc:286
-msgid "Failed to create subprocess IPC"
-msgstr "Methwyd creu isbroses IPC"
+#: cmdline/apt-mark.cc:76
+#, fuzzy, c-format
+msgid "%s was already set to automatically installed.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: ftparchive/multicompress.cc:321
-msgid "Failed to exec compressor "
-msgstr "Methwyd gweithredu cywasgydd "
+#: cmdline/apt-mark.cc:241
+#, fuzzy, c-format
+msgid "%s was already set on hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: ftparchive/multicompress.cc:360
-msgid "decompressor"
-msgstr "datgywasgydd"
+#: cmdline/apt-mark.cc:243
+#, fuzzy, c-format
+msgid "%s was already not hold.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: ftparchive/multicompress.cc:403
-msgid "IO to subprocess/file failed"
-msgstr "Methodd MA i isbroses/ffeil"
+#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#, fuzzy, c-format
+msgid "Waited for %s but it wasn't there"
+msgstr "Arhoswyd am %s ond nid oedd e yna"
-#: ftparchive/multicompress.cc:455
-msgid "Failed to read while computing MD5"
-msgstr "Methwyd darllen wrth gyfrifo MD5"
+#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#, fuzzy, c-format
+msgid "%s set on hold.\n"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: ftparchive/multicompress.cc:472
-#, c-format
-msgid "Problem unlinking %s"
-msgstr "Gwall wrth datgysylltu %s"
+#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#, fuzzy, c-format
+msgid "Canceled hold on %s.\n"
+msgstr "Methwyd agor %s"
-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
-#, c-format
-msgid "Failed to rename %s to %s"
-msgstr "Methwyd ailenwi %s at %s"
+#: cmdline/apt-mark.cc:345
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
-#: cmdline/apt-get.cc:135
-msgid "Y"
-msgstr "I"
+#: cmdline/apt-mark.cc:392
+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:47
+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 ""
-#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
+#: methods/cdrom.cc:203
#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Gwall crynhoi patrwm - %s"
+msgid "Unable to read the cdrom database %s"
+msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
-#: cmdline/apt-get.cc:252
-msgid "The following packages have unmet dependencies:"
-msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+#: 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."
+
+#: methods/cdrom.cc:222
+#, fuzzy
+msgid "Wrong CD-ROM"
+msgstr "CD Anghywir"
-#: cmdline/apt-get.cc:342
+#: methods/cdrom.cc:249
#, c-format
-msgid "but %s is installed"
-msgstr "ond mae %s wedi ei sefydlu"
-
-#: cmdline/apt-get.cc:344
-#, c-format
-msgid "but %s is to be installed"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
-
-#: cmdline/apt-get.cc:351
-msgid "but it is not installable"
-msgstr "ond ni ellir ei sefydlu"
+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."
-#: cmdline/apt-get.cc:353
-msgid "but it is a virtual package"
-msgstr "ond mae'n becyn rhithwir"
+#: methods/cdrom.cc:254
+#, fuzzy
+msgid "Disk not found."
+msgstr "Ffeil heb ei ganfod"
-#: cmdline/apt-get.cc:356
-msgid "but it is not installed"
-msgstr "ond nid yw wedi ei sefydlu"
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281
+msgid "File not found"
+msgstr "Ffeil heb ei ganfod"
-#: 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/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
+#: methods/rred.cc:608
+msgid "Failed to stat"
+msgstr "Methwyd stat()"
-#: cmdline/apt-get.cc:361
-msgid " or"
-msgstr " neu"
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
+msgid "Failed to set modification time"
+msgstr "Methwyd gosod amser newid"
-#: cmdline/apt-get.cc:392
-msgid "The following NEW packages will be installed:"
-msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+#: methods/file.cc:48
+msgid "Invalid URI, local URIS must not start with //"
+msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
-#: cmdline/apt-get.cc:420
-msgid "The following packages will be REMOVED:"
-msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:178
+msgid "Logging in"
+msgstr "Yn mewngofnodi"
-#: cmdline/apt-get.cc:442
-#, fuzzy
-msgid "The following packages have been kept back:"
-msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+#: methods/ftp.cc:184
+msgid "Unable to determine the peer name"
+msgstr "Ni ellir darganfod enw'r cymar"
-#: cmdline/apt-get.cc:465
-#, fuzzy
-msgid "The following packages will be upgraded:"
-msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+#: methods/ftp.cc:189
+msgid "Unable to determine the local name"
+msgstr "Ni ellir darganfod yr enw lleol"
-#: cmdline/apt-get.cc:488
-#, fuzzy
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+#: methods/ftp.cc:220 methods/ftp.cc:248
+#, fuzzy, c-format
+msgid "The server refused the connection and said: %s"
+msgstr "Gwrthodwyd y gweinydd ein cysyllriad, a dwedodd: %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/ftp.cc:226
+#, c-format
+msgid "USER failed, server said: %s"
+msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
-#: cmdline/apt-get.cc:561
+#: methods/ftp.cc:233
#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (oherwydd %s) "
+msgid "PASS failed, server said: %s"
+msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
-#: cmdline/apt-get.cc:569
-#, fuzzy
+#: methods/ftp.cc:253
msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
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!"
+"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
+"ProxyLogin yn wag.)"
-#: cmdline/apt-get.cc:603
+# FIXME
+#: methods/ftp.cc:281
#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+msgid "Login script command '%s' failed, server said: %s"
+msgstr "Methodd y gorchymyn sgript mewngofnodi '%s'; meddai'r gweinydd: %s"
-#: cmdline/apt-get.cc:607
+#: methods/ftp.cc:307
#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu wedi ailsefydlu, "
+msgid "TYPE failed, server said: %s"
+msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
-#: cmdline/apt-get.cc:609
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu wedi eu israddio, "
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
+msgid "Connection timeout"
+msgstr "Goramser cysylltu"
-#: cmdline/apt-get.cc:611
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+#: methods/ftp.cc:351
+msgid "Server closed the connection"
+msgstr "Caeodd y gweinydd y cysylltiad"
-#: cmdline/apt-get.cc:615
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
+#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
+#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
+#: apt-pkg/contrib/fileutl.cc:1531
+msgid "Read error"
+msgstr "Gwall darllen"
-#: cmdline/apt-get.cc:635
-#, fuzzy, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+#: methods/ftp.cc:361 methods/rsh.cc:209
+msgid "A response overflowed the buffer."
+msgstr "Gorlifodd ateb y byffer."
-#: cmdline/apt-get.cc:641
-#, fuzzy, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
+#: methods/ftp.cc:378 methods/ftp.cc:390
+msgid "Protocol corruption"
+msgstr "Llygr protocol"
-#: cmdline/apt-get.cc:648
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
+#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
+#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
+#: apt-pkg/contrib/fileutl.cc:1678
+msgid "Write error"
+msgstr "Gwall ysgrifennu"
-#: cmdline/apt-get.cc:658
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
+msgid "Could not create a socket"
+msgstr "Methwyd creu soced"
-#: cmdline/apt-get.cc:669
-msgid " [Installed]"
-msgstr " [Sefydliwyd]"
+#: methods/ftp.cc:713
+msgid "Could not connect data socket, connection timed out"
+msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+
+#: methods/ftp.cc:717 methods/connect.cc:116
+msgid "Failed"
+msgstr "Methwyd"
-#: cmdline/apt-get.cc:678
+#: methods/ftp.cc:719
#, fuzzy
-msgid " [Not candidate version]"
-msgstr "Fersiynau Posib"
+msgid "Could not connect passive socket."
+msgstr "Methwyd cysylltu soced goddefol"
-#: cmdline/apt-get.cc:680
-msgid "You should explicitly select one to install."
-msgstr "Dylech ddewis un yn benodol i'w sefydlu."
+# FIXME
+#: methods/ftp.cc:736
+msgid "getaddrinfo was unable to get a listening socket"
+msgstr "Methodd getaddrinfo gael soced gwrando"
-# FIXME: punctuation
-#: cmdline/apt-get.cc:683
-#, fuzzy, c-format
-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"
+#: methods/ftp.cc:750
+msgid "Could not bind a socket"
+msgstr "Methwyd rhwymo soced"
-#: cmdline/apt-get.cc:701
-msgid "However the following packages replace it:"
-msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
+#: methods/ftp.cc:754
+msgid "Could not listen on the socket"
+msgstr "Methwyd gwrando ar y soced"
-#: cmdline/apt-get.cc:713
-#, fuzzy, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
+#: methods/ftp.cc:761
+msgid "Could not determine the socket's name"
+msgstr "Methwyd canfod enw'r soced"
+
+#: methods/ftp.cc:793
+msgid "Unable to send PORT command"
+msgstr "Methwyd danfod gorchymyn PORT"
-#: cmdline/apt-get.cc:724
+#: methods/ftp.cc:803
#, c-format
-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgid "Unknown address family %u (AF_*)"
+msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
-#: cmdline/apt-get.cc:755
-#, fuzzy, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+#: methods/ftp.cc:812
+#, c-format
+msgid "EPRT failed, server said: %s"
+msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+
+#: methods/ftp.cc:832
+msgid "Data socket connect timed out"
+msgstr "Goramserodd cysylltiad y soced data"
+
+#: methods/ftp.cc:839
+msgid "Unable to accept connection"
+msgstr "Methwyd derbyn cysylltiad"
-#: cmdline/apt-get.cc:785
+#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+msgid "Problem hashing file"
+msgstr "Problem wrth stwnshio ffeil"
+
+#: methods/ftp.cc:892
#, 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"
+msgid "Unable to fetch file, server said '%s'"
+msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
-#: cmdline/apt-get.cc:789
-#, 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/ftp.cc:907 methods/rsh.cc:338
+msgid "Data socket timed out"
+msgstr "Goramserodd soced data"
-#: cmdline/apt-get.cc:799
+#: methods/ftp.cc:944
#, 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"
+msgid "Data transfer failed, server said '%s'"
+msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
+
+#. Get the files information
+#: methods/ftp.cc:1027
+msgid "Query"
+msgstr "Ymholiad"
+
+# FIXME
+#: methods/ftp.cc:1141
+msgid "Unable to invoke "
+msgstr "Methwyd gweithredu "
-#: cmdline/apt-get.cc:804
+#: methods/connect.cc:76
#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+msgid "Connecting to %s (%s)"
+msgstr "Yn cysylltu i %s (%s)"
-#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
-#, fuzzy, c-format
-msgid "%s set to manually installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+#: methods/connect.cc:87
+#, c-format
+msgid "[IP: %s %s]"
+msgstr "[IP: %s %s]"
-#: cmdline/apt-get.cc:863
+#: methods/connect.cc:94
#, 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"
+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:938
-msgid "Correcting dependencies..."
-msgstr "Yn cywiro dibyniaethau..."
+#: 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:941
-msgid " failed."
-msgstr " wedi methu."
+#: methods/connect.cc:108
+#, c-format
+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:944
-msgid "Unable to correct dependencies"
-msgstr "Ni ellir cywiro dibyniaethau"
+#: methods/connect.cc:126
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
+msgstr "Methwyd cysylltu i %s:%s (%s)."
-#: cmdline/apt-get.cc:947
-msgid "Unable to minimize the upgrade set"
-msgstr "Ni ellir bychanu y set uwchraddio"
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:154 methods/rsh.cc:442
+#, c-format
+msgid "Connecting to %s"
+msgstr "Yn cysylltu i %s"
-#: cmdline/apt-get.cc:949
-msgid " Done"
-msgstr " Wedi Gorffen"
+#: methods/connect.cc:180 methods/connect.cc:199
+#, c-format
+msgid "Could not resolve '%s'"
+msgstr "Methwyd datrys '%s'"
-#: cmdline/apt-get.cc:953
-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/connect.cc:205
+#, c-format
+msgid "Temporary failure resolving '%s'"
+msgstr "Methiant dros dro yn datrys '%s'"
-#: cmdline/apt-get.cc:956
-msgid "Unmet dependencies. Try using -f."
-msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+#: methods/connect.cc:209
+#, fuzzy, c-format
+msgid "System error resolving '%s:%s'"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: cmdline/apt-get.cc:981
-#, fuzzy
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+#: methods/connect.cc:211
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
+msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-#: cmdline/apt-get.cc:985
-msgid "Authentication warning overridden.\n"
+#: methods/connect.cc:258
+#, fuzzy, c-format
+msgid "Unable to connect to %s:%s:"
+msgstr "Methwyd cysylltu i %s %s:"
+
+#: methods/gpgv.cc:179
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-#: cmdline/apt-get.cc:992
-msgid "Install these packages without verification [y/N]? "
+#: methods/gpgv.cc:183
+msgid "At least one invalid signature was encountered."
msgstr ""
-#: cmdline/apt-get.cc:994
-#, fuzzy
-msgid "Some packages could not be authenticated"
-msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+#: methods/gpgv.cc:185
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
+msgstr ""
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc:191
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr ""
-#: cmdline/apt-get.cc:1044
-msgid "Internal error, InstallPackages was called with broken packages!"
+#: methods/gpgv.cc:195
+msgid "Unknown error executing apt-key"
msgstr ""
-#: cmdline/apt-get.cc:1053
+#: methods/gpgv.cc:228 methods/gpgv.cc:235
#, fuzzy
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
+msgid "The following signatures were invalid:\n"
+msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1064
-#, fuzzy
-msgid "Internal error, Ordering didn't finish"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+#: methods/gpgv.cc:242
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+
+#: methods/gzip.cc:79
+msgid "Empty files can't be valid archives"
+msgstr ""
+
+#: methods/http.cc:515
+msgid "Error writing to the file"
+msgstr "Gwall wrth ysgrifennu at y ffeil"
+
+#: methods/http.cc:529
+#, fuzzy
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+
+#: methods/http.cc:531
+msgid "Error reading from server"
+msgstr "Gwall wrth ddarllen o'r gweinydd"
+
+#: methods/http.cc:567
+msgid "Error writing to file"
+msgstr "Gwall wrth ysgrifennu at ffeil"
+
+#: methods/http.cc:627
+msgid "Select failed"
+msgstr "Methwyd dewis"
+
+#: methods/http.cc:632
+msgid "Connection timed out"
+msgstr "Goramserodd y cysylltiad"
+
+#: methods/http.cc:655
+msgid "Error writing to output file"
+msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+
+#: methods/server.cc:52
+msgid "Waiting for headers"
+msgstr "Yn aros am benawdau"
+
+#: methods/server.cc:110
+msgid "Bad header line"
+msgstr "Llinell pennawd gwael"
+
+#: methods/server.cc:135 methods/server.cc:142
+#, fuzzy
+msgid "The HTTP server sent an invalid reply header"
+msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
+
+#: methods/server.cc:172
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Length header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+
+#: methods/server.cc:195
+#, fuzzy
+msgid "The HTTP server sent an invalid Content-Range header"
+msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
+
+#: methods/server.cc:197
+#, fuzzy
+msgid "This HTTP server has broken range support"
+msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+
+#: methods/server.cc:221
+msgid "Unknown date format"
+msgstr "Fformat dyddiad anhysbys"
+
+#: methods/server.cc:497
+#, fuzzy
+msgid "Bad header data"
+msgstr "Data pennawd gwael"
+
+#: methods/server.cc:514 methods/server.cc:608
+msgid "Connection failed"
+msgstr "Methodd y cysylltiad"
+
+#: methods/server.cc:580
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
+msgstr ""
+
+#: methods/server.cc:703
+msgid "Internal error"
+msgstr "Gwall mewnol"
+
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-install.cc:81
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
+#: apt-private/private-install.cc:90
+#, fuzzy
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
+
+#: apt-private/private-install.cc:109
+#, fuzzy
+msgid "Internal error, Ordering didn't finish"
+msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:1104
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+#: apt-private/private-install.cc:147
+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:1111
+#: apt-private/private-install.cc:154
#, 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:1116
+#: apt-private/private-install.cc:159
#, 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:1123
+#: apt-private/private-install.cc:166
#, 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:1128
+#: apt-private/private-install.cc:171
#, 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:1143 cmdline/apt-get.cc:1146 cmdline/apt-get.cc:2332
-#: cmdline/apt-get.cc:2335
-#, 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:1156
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Does dim digon o le rhydd gennych yn %s."
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
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:1174
+#. 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:195
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:1176
+#: apt-private/private-install.cc:197
#, 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:1182 cmdline/apt-get.cc:1201
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:1197
-#, fuzzy
-msgid "Do you want to continue [Y/n]? "
-msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-
-#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
-#, c-format
-msgid "Failed to fetch %s %s\n"
-msgstr "Methwyd cyrchu %s %s\n"
+#: apt-private/private-install.cc:218
+msgid "Do you want to continue?"
+msgstr "Ydych chi eisiau mynd ymlaen?"
-#: cmdline/apt-get.cc:1287
+#: apt-private/private-install.cc:288
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
-msgid "Download complete and in download only mode"
-msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-
-#: cmdline/apt-get.cc:1294
+#: apt-private/private-install.cc:295
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:1298
+#: apt-private/private-install.cc:299
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:1303
+#: apt-private/private-install.cc:304
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:1304
+#: apt-private/private-install.cc:305
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1332
+#: apt-private/private-install.cc:341
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:1336
-msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
-
-#: cmdline/apt-get.cc:1466
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:1498
-#, 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:1536
-#, c-format
-msgid "Ignore unavailable version '%s' of package '%s'"
+#: apt-private/private-install.cc:345
+msgid "Note: This is done automatically and on purpose by dpkg."
msgstr ""
-#: cmdline/apt-get.cc:1552
-msgid "The update command takes no arguments"
-msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-
-#: cmdline/apt-get.cc:1618
+#: apt-private/private-install.cc:366
msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr ""
-#: cmdline/apt-get.cc:1666
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are 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:1670
-#, fuzzy, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-
-#: cmdline/apt-get.cc:1672
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1677
+#: apt-private/private-install.cc:474
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:1680 cmdline/apt-get.cc:1822
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
-#: cmdline/apt-get.cc:1684
+#: apt-private/private-install.cc:481
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1703
+#: apt-private/private-install.cc:488
#, fuzzy
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-install.cc:492
+#, fuzzy, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+msgstr[1] "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
-#: cmdline/apt-get.cc:1792
+#: apt-private/private-install.cc:494
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-install.cc:587
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:1795
+#: apt-private/private-install.cc:589
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:1807
+#: apt-private/private-install.cc:612
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"
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: cmdline/apt-get.cc:1825
+#: apt-private/private-install.cc:633
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1854
+#: apt-private/private-install.cc:710
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1944
+#: apt-private/private-install.cc:800
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1945
+#: apt-private/private-install.cc:801
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1987
+#: apt-private/private-install.cc:823
#, c-format
-msgid "Couldn't find package %s"
-msgstr "Methwyd canfod pecyn %s"
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: cmdline/apt-get.cc:1994
+#: apt-private/private-install.cc:827
#, fuzzy, c-format
-msgid "%s set to automatically installed.\n"
-msgstr "ond mae %s yn mynd i gael ei sefydlu"
+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"
+
+#: apt-private/private-install.cc:839
+#, 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"
+
+#: apt-private/private-install.cc:844
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
+
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, fuzzy, c-format
+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"
+
+#: apt-private/private-install.cc:945
+#, fuzzy, 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"
+
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr "Yn cywiro dibyniaethau..."
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr " wedi methu."
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr "Ni ellir cywiro dibyniaethau"
-#: cmdline/apt-get.cc:2015
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr "Ni ellir bychanu y set uwchraddio"
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr " Wedi Gorffen"
+
+#: apt-private/private-cachefile.cc:110
+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:113
+msgid "Unmet dependencies. Try using -f."
+msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:268
#, fuzzy
-msgid "Calculating upgrade... "
-msgstr "Yn Cyfrifo'r Uwchraddiad... "
+msgid "[installed,local]"
+msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
-msgid "Failed"
-msgstr "Methwyd"
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
-#: cmdline/apt-get.cc:2023
-msgid "Done"
-msgstr "Wedi Gorffen"
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
+#: apt-private/private-output.cc:274
#, fuzzy
-msgid "Internal error, problem resolver broke stuff"
-msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
+msgid "[installed]"
+msgstr " [Sefydliwyd]"
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr "ond mae %s wedi ei sefydlu"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "ond mae %s yn mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "ond ni ellir ei sefydlu"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "ond mae'n becyn rhithwir"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "ond nid yw wedi ei sefydlu"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "ond nid yw'n mynd i gael ei sefydlu"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " neu"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Mae gan y pecynnau canlynol ddibyniaethau heb eu bodloni:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Caiff y pecynnau canlynol eu TYNNU:"
+
+#: apt-private/private-output.cc:571
+#, fuzzy
+msgid "The following packages have been kept back:"
+msgstr "Mae'r pecynnau canlynol wedi eu dal yn ôl"
+
+#: apt-private/private-output.cc:592
+#, fuzzy
+msgid "The following packages will be upgraded:"
+msgstr "Caiff y pecynnau canlynol eu uwchraddio"
+
+#: apt-private/private-output.cc:613
+#, fuzzy
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (oherwydd %s) "
+
+#: apt-private/private-output.cc:696
+#, 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!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu wedi ailsefydlu, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu wedi eu israddio, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
+
+#. 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:761
+msgid "[Y/n]"
+msgstr ""
+
+#. 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:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr "I"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Gwall crynhoi patrwm - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+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-private/private-download.cc:62
+#, c-format
+msgid ""
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
+msgstr ""
+
+#: apt-private/private-download.cc:94
+#, fuzzy
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+#, fuzzy
+msgid "Some packages could not be authenticated"
+msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
+
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr ""
+
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
+#, c-format
+msgid "Failed to fetch %s %s\n"
+msgstr "Methwyd cyrchu %s %s\n"
+
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Does dim digon o le rhydd yn %s gennych"
+
+#: apt-private/private-download.cc:188
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Does dim digon o le rhydd gennych yn %s."
+
+#: apt-private/private-sources.cc:58
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Methwyd ailenwi %s at %s"
+
+#: apt-private/private-sources.cc:70
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Presennol "
+
+#: apt-private/acqprogress.cc:88
+msgid "Get:"
+msgstr "Cyrchu:"
+
+#: apt-private/acqprogress.cc:119
+msgid "Ign "
+msgstr "Anwybyddu "
+
+#: apt-private/acqprogress.cc:126
+msgid "Err "
+msgstr "Gwall "
+
+#: apt-private/acqprogress.cc:150
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
+
+#: apt-private/acqprogress.cc:240
+#, c-format
+msgid " [Working]"
+msgstr " [Gweithio]"
+
+#: apt-private/acqprogress.cc:301
+#, 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.
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
+#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
+#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#, c-format
+msgid "Unable to read %s"
+msgstr "Ni ellir darllen %s"
+
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
+#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
+#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: apt-pkg/contrib/cdromutl.cc:235
+#, c-format
+msgid "Unable to change to %s"
+msgstr "Ni ellir newid i %s"
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:280
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr ""
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc: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"
+
+#: methods/mirror.cc:445
+#, c-format
+msgid "[Mirror: %s]"
+msgstr ""
+
+#: methods/rsh.cc:102 ftparchive/multicompress.cc:171
+msgid "Failed to create IPC pipe to subprocess"
+msgstr "Methwyd creu pibell cyfathrebu at isbroses"
+
+#: methods/rsh.cc:346
+msgid "Connection closed prematurely"
+msgstr "Caewyd y cysylltiad yn gynnar"
+
+#: dselect/install:33
+msgid "Bad default setting!"
+msgstr "Rhagosodiad gwael!"
+
+#: 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 "Some errors occurred while unpacking. Packages that were installed"
+msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
+
+#: dselect/install:103
+#, fuzzy
+msgid "will be configured. This may result in duplicate errors"
+msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
+
+#: dselect/install: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 ""
+"above this message are important. Please fix them and run [I]nstall again"
+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"
+
+# FIXME: "debian"
+#: cmdline/apt-extracttemplates.cc:227
+#, 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:257 apt-pkg/contrib/fileutl.cc:2092
+#, fuzzy, c-format
+msgid "Unable to mkstemp %s"
+msgstr "Ni ellir gwneud stat() o %s"
+
+#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: apt-pkg/contrib/fileutl.cc:2097
+#, c-format
+msgid "Unable to write to %s"
+msgstr "Ni ellir ysgrifennu i %s"
+
+#: cmdline/apt-extracttemplates.cc:303
+msgid "Cannot get debconf version. Is debconf installed?"
+msgstr "Ni ellir cael fersiwn debconf. Ydi debconf wedi ei sefydlu?"
+
+#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+msgid "Package extension list is too long"
+msgstr "Mae'r rhestr estyniad pecyn yn rhy hir."
+
+#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
+#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
+#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#, fuzzy, c-format
+msgid "Error processing directory %s"
+msgstr "Gwall wrth brosesu'r cyfeiriadur %s"
+
+#: ftparchive/apt-ftparchive.cc:281
+msgid "Source extension list is too long"
+msgstr "Mae'r rhestr estyniad ffynhonell yn rhy hir"
+
+#: ftparchive/apt-ftparchive.cc:401
+msgid "Error writing header to contents file"
+msgstr "Gwall wrth ysgrifennu pennawd i'r ffeil cynnwys"
+
+#: ftparchive/apt-ftparchive.cc:431
+#, fuzzy, c-format
+msgid "Error processing contents %s"
+msgstr "Gwall wrth Brosesu Cynnwys %s"
+
+# FIXME: full stops
+#: ftparchive/apt-ftparchive.cc:626
+#, fuzzy
+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"
+
+#: ftparchive/apt-ftparchive.cc:822
+msgid "No selections matched"
+msgstr "Dim dewisiadau'n cyfateb"
+
+#: ftparchive/apt-ftparchive.cc:907
+#, 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'"
+
+#: ftparchive/cachedb.cc:67
+#, c-format
+msgid "DB was corrupted, file renamed to %s.old"
+msgstr "Llygrwyd y cronfa data, ailenwyd y ffeil i %s.old"
+
+#: ftparchive/cachedb.cc:85
+#, c-format
+msgid "DB is old, attempting to upgrade %s"
+msgstr "Hen gronfa data, yn ceisio uwchraddio %s"
+
+#: ftparchive/cachedb.cc:96
+msgid ""
+"DB format is invalid. If you upgraded from an older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc:101
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr "Ni ellir agor y ffeil DB2 %s: %s"
+
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: apt-inst/extract.cc:216
+#, c-format
+msgid "Failed to stat %s"
+msgstr "Methodd stat() o %s"
-#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
-msgid "Unable to lock the download directory"
-msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Methwyd darllen y cyswllt %s"
-#: cmdline/apt-get.cc:2198
-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:359
+msgid "Archive has no control record"
+msgstr "Does dim cofnod rheoli gan yr archif"
-#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
-#, c-format
-msgid "Unable to find a source package for %s"
-msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
+#: ftparchive/cachedb.cc:526
+msgid "Unable to get a cursor"
+msgstr "Ni ellir cael cyrchydd"
-#: cmdline/apt-get.cc:2254
+#: ftparchive/writer.cc:104
#, c-format
-msgid ""
-"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
-"%s\n"
-msgstr ""
+msgid "W: Unable to read directory %s\n"
+msgstr "Rh: Ni ellir darllen y cyfeiriadur %s\n"
-#: cmdline/apt-get.cc:2259
+#: ftparchive/writer.cc:109
#, c-format
-msgid ""
-"Please use:\n"
-"bzr get %s\n"
-"to retrieve the latest (possibly unreleased) updates to the package.\n"
-msgstr ""
+msgid "W: Unable to stat %s\n"
+msgstr "Rh: Ni ellir gwneud stat() o %s\n"
-#: cmdline/apt-get.cc:2310
-#, fuzzy, c-format
-msgid "Skipping already downloaded file '%s'\n"
-msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
+#: ftparchive/writer.cc:165
+msgid "E: "
+msgstr "G: "
-#: cmdline/apt-get.cc:2345
-#, 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:167
+msgid "W: "
+msgstr "Rh: "
-#. 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:2353
-#, c-format
-msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
+#: ftparchive/writer.cc:174
+msgid "E: Errors apply to file "
+msgstr "G: Mae gwallau yn cymhwyso i'r ffeil "
-#. 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:2358
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
#, c-format
-msgid "Need to get %sB of source archives.\n"
-msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
+msgid "Failed to resolve %s"
+msgstr "Methwyd datrys %s"
-#: cmdline/apt-get.cc:2364
-#, fuzzy, c-format
-msgid "Fetch source %s\n"
-msgstr "Cyrchu Ffynhonell %s\n"
+#: ftparchive/writer.cc:205
+msgid "Tree walking failed"
+msgstr "Methwyd cerdded y goeden"
-#: cmdline/apt-get.cc:2397
-msgid "Failed to fetch some archives."
-msgstr "Methwyd cyrchu rhai archifau."
+#: ftparchive/writer.cc:232
+#, c-format
+msgid "Failed to open %s"
+msgstr "Methwyd agor %s"
-#: cmdline/apt-get.cc:2427
+# FIXME
+#: ftparchive/writer.cc:291
#, 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"
+msgid " DeLink %s [%s]\n"
+msgstr " DatGysylltu %s [%s]\n"
-#: cmdline/apt-get.cc:2439
+#: ftparchive/writer.cc:299
#, c-format
-msgid "Unpack command '%s' failed.\n"
-msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
+msgid "Failed to readlink %s"
+msgstr "Methwyd darllen y cyswllt %s"
-#: cmdline/apt-get.cc:2440
+#: ftparchive/writer.cc:303
#, c-format
-msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr ""
+msgid "Failed to unlink %s"
+msgstr "Methwyd datgysylltu %s"
-#: cmdline/apt-get.cc:2457
+#: ftparchive/writer.cc:311
#, c-format
-msgid "Build command '%s' failed.\n"
-msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
+msgid "*** Failed to link %s to %s"
+msgstr "*** Methwyd cysylltu %s at %s"
-#: cmdline/apt-get.cc:2477
-msgid "Child process failed"
-msgstr "Methodd proses plentyn"
+#: ftparchive/writer.cc:321
+#, c-format
+msgid " DeLink limit of %sB hit.\n"
+msgstr " Tarwyd y terfyn cyswllt %sB.\n"
-#: cmdline/apt-get.cc:2493
-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:427
+msgid "Archive had no package field"
+msgstr "Doedd dim maes pecyn gan yr archif"
-#: cmdline/apt-get.cc:2524
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
#, c-format
-msgid "Unable to get build-dependency information for %s"
-msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
+msgid " %s has no override entry\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: cmdline/apt-get.cc:2544
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
#, c-format
-msgid "%s has no build depends.\n"
-msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
+msgid " %s maintainer is %s not %s\n"
+msgstr " Cynaliwr %s yw %s nid %s\n"
-#: cmdline/apt-get.cc:2595
-#, 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"
+#: ftparchive/writer.cc:720
+#, fuzzy, c-format
+msgid " %s has no source override entry\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: cmdline/apt-get.cc:2648
-#, 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"
+#: ftparchive/writer.cc:724
+#, fuzzy, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " Does dim cofnod gwrthwneud gan %s\n"
-#: cmdline/apt-get.cc:2684
-#, 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"
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
+msgid "realloc - Failed to allocate memory"
+msgstr "realloc - Methwyd neilltuo cof"
-#: cmdline/apt-get.cc:2711
+#: ftparchive/override.cc:38 ftparchive/override.cc:142
#, c-format
-msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
+msgid "Unable to open %s"
+msgstr "Ni ellir agor %s"
+
+#. skip spaces
+#. find end of word
+#: ftparchive/override.cc:68
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu (%s)"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-#: cmdline/apt-get.cc:2727
+#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
-msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
+msgid "Failed to read the override file %s"
+msgstr "Methwydd darllen y ffeil dargyfeirio %s"
-#: cmdline/apt-get.cc:2732
-msgid "Failed to process build dependencies"
-msgstr "Methwyd prosesu dibyniaethau adeiladu"
+#: ftparchive/override.cc:166
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #1"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-#: cmdline/apt-get.cc:2763
-#, fuzzy
-msgid "Supported modules:"
-msgstr "Modylau a Gynhelir:"
+#: ftparchive/override.cc:178
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #2"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
-# FIXME: split
-#: cmdline/apt-get.cc:2804
-#, 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"
+#: ftparchive/override.cc:191
+#, fuzzy, c-format
+msgid "Malformed override %s line %llu #3"
+msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
-#: cmdline/apt-get.cc:2960
-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 ""
+#: ftparchive/multicompress.cc:73
+#, fuzzy, c-format
+msgid "Unknown compression algorithm '%s'"
+msgstr "Dull Cywasgu Anhysbys '%s'"
-#: cmdline/acqprogress.cc:55
-msgid "Hit "
-msgstr "Presennol "
+#: ftparchive/multicompress.cc:103
+#, c-format
+msgid "Compressed output %s needs a compression set"
+msgstr "Mae'r allbwn cywasgiedig %s angen cywasgiad wedi ei osod"
-#: cmdline/acqprogress.cc:79
-msgid "Get:"
-msgstr "Cyrchu:"
+#: ftparchive/multicompress.cc:192
+msgid "Failed to create FILE*"
+msgstr "Methwyd creu FILE*"
-#: cmdline/acqprogress.cc:110
-msgid "Ign "
-msgstr "Anwybyddu "
+#: ftparchive/multicompress.cc:195
+msgid "Failed to fork"
+msgstr "Methodd fork()"
+
+#: ftparchive/multicompress.cc:209
+#, fuzzy
+msgid "Compress child"
+msgstr "Plentyn Cywasgu"
+
+#: ftparchive/multicompress.cc:232
+#, fuzzy, c-format
+msgid "Internal error, failed to create %s"
+msgstr "Gwall Mewnol, Methwyd creu %s"
-#: cmdline/acqprogress.cc:114
-msgid "Err "
-msgstr "Gwall "
+#: ftparchive/multicompress.cc:305
+msgid "IO to subprocess/file failed"
+msgstr "Methodd MA i isbroses/ffeil"
-#: cmdline/acqprogress.cc:135
+#: ftparchive/multicompress.cc:343
+msgid "Failed to read while computing MD5"
+msgstr "Methwyd darllen wrth gyfrifo MD5"
+
+#: ftparchive/multicompress.cc:359
#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
+msgid "Problem unlinking %s"
+msgstr "Gwall wrth datgysylltu %s"
-#: cmdline/acqprogress.cc:225
+#: ftparchive/multicompress.cc:374 apt-inst/extract.cc:194
#, c-format
-msgid " [Working]"
-msgstr " [Gweithio]"
+msgid "Failed to rename %s to %s"
+msgstr "Methwyd ailenwi %s at %s"
-#: cmdline/acqprogress.cc:271
-#, fuzzy, c-format
+# FIXME: "debian"
+#: cmdline/apt-internal-solver.cc:49
+#, fuzzy
msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
+"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 ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
+"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-sortpkgs.cc:86
+#: cmdline/apt-sortpkgs.cc:89
msgid "Unknown package record!"
msgstr "Cofnod pecyn anhysbys!"
-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153
#, fuzzy
msgid ""
"Usage: apt-sortpkgs [options] file1 [file2 ...]\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!"
-
-#: 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."
-
-#: dselect/install:91
-msgid "Do you want to erase any previously downloaded .deb files?"
+#: apt-pkg/install-progress.cc:59
+#, c-format
+msgid "Progress: [%3i%%]"
msgstr ""
-#: dselect/install:101
-#, fuzzy
-msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Digwyddod rhau gwallau wrth dadbacio. Rydw i'n mynd i gyflunio'r"
-
-#: dselect/install:102
-#, fuzzy
-msgid "will be configured. This may result in duplicate errors"
-msgstr "pecynnau a gafwyd eu sefydlu. Gall hyn achosi gwallau dyblyg neu"
-
-#: dselect/install:103
-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:104
-msgid ""
-"above this message are important. Please fix them and run [I]nstall again"
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+msgid "Running dpkg"
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-inst/contrib/extracttar.cc:114
-msgid "Failed to create pipes"
-msgstr "Methwyd creu pibau"
-
-#: apt-inst/contrib/extracttar.cc:141
-msgid "Failed to exec gzip "
-msgstr "Methwyd gweithredu gzip"
-
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
-msgid "Corrupted archive"
-msgstr "Archif llygredig"
-
-#: apt-inst/contrib/extracttar.cc:193
-#, fuzzy
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Methodd swm gwirio Tar, archif llygredig"
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-pkg/init.cc:156
#, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Math pennawd TAR anhysbys %u, aelod %s"
-
-#: apt-inst/contrib/arfile.cc:70
-msgid "Invalid archive signature"
-msgstr "Llofnod archif annilys"
-
-#: apt-inst/contrib/arfile.cc:78
-msgid "Error reading archive member header"
-msgstr "Gwall wrth ddarllen pennawd aelod archif"
-
-#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Pennawd aelod archif annilys"
-
-#: apt-inst/contrib/arfile.cc:102
-msgid "Invalid archive member header"
-msgstr "Pennawd aelod archif annilys"
-
-#: apt-inst/contrib/arfile.cc:128
-msgid "Archive is too short"
-msgstr "Mae'r archif yn rhy fyr"
-
-#: apt-inst/contrib/arfile.cc:132
-msgid "Failed to read the archive headers"
-msgstr "Methwyd darllen pennawdau'r archif"
-
-#: 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-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Methyd lleoli yr elfen <hash>!"
-
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Methwyd neilltuo dargyfeiriad"
+msgid "Packaging system '%s' is not supported"
+msgstr "Ni chynhelir y system pecynnu '%s'"
-#: apt-inst/filelist.cc:464
+#: apt-pkg/init.cc:172
#, fuzzy
-msgid "Internal error in AddDiversion"
-msgstr "Gwall Mewnol yn AddDiversion"
-
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
-
-# FIXME: "the"
-#: apt-inst/filelist.cc:506
-#, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
-
-#: apt-inst/filelist.cc:549
-#, 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"
-
-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
-#, c-format
-msgid "Failed to close file %s"
-msgstr "Methwyd cau ffeil %s"
-
-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
-#, c-format
-msgid "The path %s is too long"
-msgstr "Mae'r llwybr %s yn rhy hir"
-
-#: apt-inst/extract.cc:124
-#, c-format
-msgid "Unpacking %s more than once"
-msgstr "Yn dadbacio %s mwy nag unwaith"
-
-#: apt-inst/extract.cc:134
-#, c-format
-msgid "The directory %s is diverted"
-msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-
-#: apt-inst/extract.cc:144
-#, 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"
-
-#: 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"
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Ni ellir canfod math system addas"
-#: apt-inst/extract.cc:240
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
#, c-format
-msgid "The directory %s is being replaced by a non-directory"
+msgid "Wrote %i records.\n"
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-inst/extract.cc:284
-msgid "The path is too long"
-msgstr "Mae'r llwybr yn rhy hir"
-
-# 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"
-
-#: 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"
-
-#. 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:311 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
-#, c-format
-msgid "Unable to read %s"
-msgstr "Ni ellir darllen %s"
-
-#: apt-inst/extract.cc:491
-#, c-format
-msgid "Unable to stat %s"
-msgstr "Ni ellir gwneud stat() o %s"
-
-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
-#, c-format
-msgid "Failed to remove %s"
-msgstr "Methwyd dileu %s"
-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
#, c-format
-msgid "Unable to create %s"
-msgstr "Ni ellir creu %s"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
#, c-format
-msgid "Failed to stat %sinfo"
-msgstr "Methwyd stat() ar %sinfo"
-
-#: 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"
-
-#: 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"
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
#, c-format
-msgid "Failed to change to the admin dir %sinfo"
-msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
-
-# FIXME
-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
-#, fuzzy
-msgid "Internal error getting a package name"
-msgstr "Gwall mewnol wrth gyrchu enw pecyn"
-
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
-#, fuzzy
-msgid "Reading file listing"
-msgstr "Yn Darllen Rhestr Ffeiliau"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-pkg/indexcopy.cc:515
#, c-format
-msgid ""
-"Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
-"then make it empty and immediately re-install the same version of the "
-"package!"
+msgid "Can't find authentication record for: %s"
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"
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Camgyfatebiaeth swm MD5"
-#: apt-inst/deb/dpkgdb.cc:262
-#, fuzzy
-msgid "Internal error getting a node"
-msgstr "Gwall Mewnol wrth gael Nôd"
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Methwyd agor neu ramadegu'r ffeil rhestrau neu statws."
-# 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"
+#: apt-pkg/cachefile.cc:98
+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-inst/deb/dpkgdb.cc:320
-msgid "The diversion file is corrupted"
-msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Methwyd darllen y rhestr ffynhonellau."
-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
-#, c-format
-msgid "Invalid line in the diversion file: %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+#: apt-pkg/pkgcache.cc:149
+msgid "Empty package cache"
+msgstr "Storfa pecyn gwag"
-#: apt-inst/deb/dpkgdb.cc:358
-#, fuzzy
-msgid "Internal error adding a diversion"
-msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
+#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+msgid "The package cache file is corrupted"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+
+#: apt-pkg/pkgcache.cc:160
+msgid "The package cache file is an incompatible version"
+msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-pkg/pkgcache.cc:163
#, fuzzy
-msgid "The pkg cache must be initialized first"
-msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Mae'r ffeil storfa pecyn yn llygredig"
-#: apt-inst/deb/dpkgdb.cc:439
+# FIXME: capitalisation?
+#: apt-pkg/pkgcache.cc:170
#, 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"
-
-#: apt-inst/deb/dpkgdb.cc:466
-#, c-format
-msgid "Error parsing MD5. Offset %lu"
-msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
-
-#: 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"
+msgid "This APT does not support the versioning system '%s'"
+msgstr "Nid yw'r APT yma yn cefnogi'r system fersiwn '%s'"
-#: apt-inst/deb/debfile.cc:50
+#: apt-pkg/pkgcache.cc:180
#, 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"
-
-#: apt-inst/deb/debfile.cc:140
-#, fuzzy
-msgid "Internal error, could not locate member"
-msgstr "Gwall Methwyd, methwyd lleoli aelod"
+msgid "The package cache was built for different architectures: %s vs %s"
+msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-#: apt-inst/deb/debfile.cc:173
-msgid "Failed to locate a valid control file"
-msgstr "Methwyd lleoli ffeil rheoli dilys"
+#: apt-pkg/pkgcache.cc:317
+msgid "Depends"
+msgstr "Dibynnu"
-#: apt-inst/deb/debfile.cc:258
-#, fuzzy
-msgid "Unparsable control file"
-msgstr "Ffeil rheoli ni ellir ei ramadegu"
+#: apt-pkg/pkgcache.cc:317
+msgid "PreDepends"
+msgstr "CynDdibynnu"
-#: methods/bzip2.cc:65
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr "Methwyd agor pibell ar gyfer %s"
+#: apt-pkg/pkgcache.cc:317
+msgid "Suggests"
+msgstr "Awgrymu"
-#: methods/bzip2.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr "Gwall darllen o broses %s"
+#: apt-pkg/pkgcache.cc:318
+msgid "Recommends"
+msgstr "Argymell"
-#: 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()"
+#: apt-pkg/pkgcache.cc:318
+msgid "Conflicts"
+msgstr "Gwrthdaro"
-#: 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"
+#: apt-pkg/pkgcache.cc:318
+msgid "Replaces"
+msgstr "Amnewid"
-#: methods/cdrom.cc:199
-#, c-format
-msgid "Unable to read the cdrom database %s"
-msgstr "Methwyd darllen y cronfa ddata CD-ROM %s"
+#: apt-pkg/pkgcache.cc:319
+msgid "Obsoletes"
+msgstr "Darfodi"
-#: 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"
+#: apt-pkg/pkgcache.cc:319
+msgid "Breaks"
msgstr ""
-"Defnyddiwch apt-cdrom fel bo APT yn adnabod y CD hwn. Ni ellir defnyddio apt-"
-"get update i ychwanegu CDau newydd."
-#: methods/cdrom.cc:218
-#, fuzzy
-msgid "Wrong CD-ROM"
-msgstr "CD Anghywir"
-
-#: methods/cdrom.cc:245
-#, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+#: apt-pkg/pkgcache.cc:319
+msgid "Enhances"
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"
-
-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
-msgid "File not found"
-msgstr "Ffeil heb ei ganfod"
+#: apt-pkg/pkgcache.cc:330
+msgid "important"
+msgstr "pwysig"
-#: methods/file.cc:44
-msgid "Invalid URI, local URIS must not start with //"
-msgstr "URI annilys: rhaid i URIs lleol beidio a cychwyn efo \"//\""
+#: apt-pkg/pkgcache.cc:330
+msgid "required"
+msgstr "angenrheidiol"
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:168
-msgid "Logging in"
-msgstr "Yn mewngofnodi"
+#: apt-pkg/pkgcache.cc:330
+msgid "standard"
+msgstr "safonnol"
-#: methods/ftp.cc:174
-msgid "Unable to determine the peer name"
-msgstr "Ni ellir darganfod enw'r cymar"
+#: apt-pkg/pkgcache.cc:331
+msgid "optional"
+msgstr "opsiynnol"
-#: methods/ftp.cc:179
-msgid "Unable to determine the local name"
-msgstr "Ni ellir darganfod yr enw lleol"
+#: apt-pkg/pkgcache.cc:331
+msgid "extra"
+msgstr "ychwanegol"
-#: 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"
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#, fuzzy
+msgid "Calculating upgrade"
+msgstr "Yn Cyfrifo'r Uwchraddiad"
-#: methods/ftp.cc:216
+#: apt-pkg/acquire-worker.cc:133
#, c-format
-msgid "USER failed, server said: %s"
-msgstr "Methodd gorchymyn USER; meddai'r gweinydd: %s"
+msgid "The method driver %s could not be found."
+msgstr "Methwyd canfod y gyrrydd dull %s."
-#: methods/ftp.cc:223
+#: apt-pkg/acquire-worker.cc:135
#, c-format
-msgid "PASS failed, server said: %s"
-msgstr "Methodd gorchymyn PASS; meddai'r gweinydd: %s"
-
-#: methods/ftp.cc:243
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+msgid "Is the package %s installed?"
msgstr ""
-"Penodwyd gweinydd dirprwy ond dim sgript mengofnodi. (Mae Acquire::ftp::"
-"ProxyLogin yn wag.)"
-
-# FIXME
-#: methods/ftp.cc:271
-#, 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:297
+#: apt-pkg/acquire-worker.cc:186
#, c-format
-msgid "TYPE failed, server said: %s"
-msgstr "Methodd gorchymyn TYPE; meddai'r gweinydd: %s"
-
-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
-msgstr "Goramser cysylltu"
-
-#: methods/ftp.cc:341
-msgid "Server closed the connection"
-msgstr "Caeodd y gweinydd y cysylltiad"
-
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:784 methods/rsh.cc:190
-msgid "Read error"
-msgstr "Gwall darllen"
-
-#: methods/ftp.cc:351 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
-msgstr "Gorlifodd ateb y byffer."
-
-#: methods/ftp.cc:368 methods/ftp.cc:380
-msgid "Protocol corruption"
-msgstr "Llygr protocol"
-
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
-msgid "Write error"
-msgstr "Gwall ysgrifennu"
+msgid "Method %s did not start correctly"
+msgstr "Ni gychwynodd y dull %s yn gywir"
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
-msgid "Could not create a socket"
-msgstr "Methwyd creu soced"
+#: apt-pkg/acquire-worker.cc:485
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
+" '%s'\n"
+"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: methods/ftp.cc:703
-msgid "Could not connect data socket, connection timed out"
-msgstr "Methwyd cysylltu soced data, goramserodd y cyslltiad"
+#: apt-pkg/pkgrecords.cc:38
+#, c-format
+msgid "Index file type '%s' is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: methods/ftp.cc:709
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
#, fuzzy
-msgid "Could not connect passive socket."
-msgstr "Methwyd cysylltu soced goddefol"
+msgid "Building dependency tree"
+msgstr "Yn Aideladu Coeden Dibyniaeth"
-# FIXME
-#: methods/ftp.cc:727
-msgid "getaddrinfo was unable to get a listening socket"
-msgstr "Methodd getaddrinfo gael soced gwrando"
+#: apt-pkg/depcache.cc:139
+#, fuzzy
+msgid "Candidate versions"
+msgstr "Fersiynau Posib"
-#: methods/ftp.cc:741
-msgid "Could not bind a socket"
-msgstr "Methwyd rhwymo soced"
+#: apt-pkg/depcache.cc:168
+#, fuzzy
+msgid "Dependency generation"
+msgstr "Cynhyrchaid Dibyniaeth"
-#: methods/ftp.cc:745
-msgid "Could not listen on the socket"
-msgstr "Methwyd gwrando ar y soced"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#, fuzzy
+msgid "Reading state information"
+msgstr "Yn cyfuno manylion Ar Gael"
-#: methods/ftp.cc:752
-msgid "Could not determine the socket's name"
-msgstr "Methwyd canfod enw'r soced"
+#: apt-pkg/depcache.cc:250
+#, fuzzy, c-format
+msgid "Failed to open StateFile %s"
+msgstr "Methwyd agor %s"
-#: methods/ftp.cc:784
-msgid "Unable to send PORT command"
-msgstr "Methwyd danfod gorchymyn PORT"
+#: apt-pkg/depcache.cc:256
+#, fuzzy, c-format
+msgid "Failed to write temporary StateFile %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
-#: methods/ftp.cc:794
-#, c-format
-msgid "Unknown address family %u (AF_*)"
-msgstr "Teulu cyfeiriad anhysbys %u (AF_*)"
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
-#: methods/ftp.cc:803
+#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
#, c-format
-msgid "EPRT failed, server said: %s"
-msgstr "Methodd gorchymyn EPRT; meddai'r gweinydd: %s"
+msgid "rename failed, %s (%s -> %s)."
+msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: methods/ftp.cc:823
-msgid "Data socket connect timed out"
-msgstr "Goramserodd cysylltiad y soced data"
+#: apt-pkg/acquire-item.cc:245
+#, fuzzy
+msgid "Hash Sum mismatch"
+msgstr "Camgyfatebiaeth swm MD5"
-#: methods/ftp.cc:830
-msgid "Unable to accept connection"
-msgstr "Methwyd derbyn cysylltiad"
+#: apt-pkg/acquire-item.cc:250
+msgid "Size mismatch"
+msgstr "Camgyfatebiaeth maint"
-#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
-msgid "Problem hashing file"
-msgstr "Problem wrth stwnshio ffeil"
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Gweithred annilys %s"
-#: methods/ftp.cc:882
-#, c-format
-msgid "Unable to fetch file, server said '%s'"
-msgstr "Methwyd cyrchu ffeil; meddai'r gweinydd '%s'"
+#: apt-pkg/acquire-item.cc:260
+#, fuzzy
+msgid "Signature error"
+msgstr "Gwall ysgrifennu"
-#: methods/ftp.cc:897 methods/rsh.cc:321
-msgid "Data socket timed out"
-msgstr "Goramserodd soced data"
+#: apt-pkg/acquire-item.cc:264
+msgid "Does not start with a cleartext signature"
+msgstr ""
-#: methods/ftp.cc:927
+#: apt-pkg/acquire-item.cc:1588
#, c-format
-msgid "Data transfer failed, server said '%s'"
-msgstr "Methodd trosgludiad data; meddai'r gweinydd '%s'"
-
-#. Get the files information
-#: methods/ftp.cc:1004
-msgid "Query"
-msgstr "Ymholiad"
-
-# FIXME
-#: methods/ftp.cc:1116
-msgid "Unable to invoke "
-msgstr "Methwyd gweithredu "
+msgid ""
+"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 ""
-#: methods/connect.cc:71
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
#, c-format
-msgid "Connecting to %s (%s)"
-msgstr "Yn cysylltu i %s (%s)"
+msgid "GPG error: %s: %s"
+msgstr ""
-#: methods/connect.cc:82
-#, c-format
-msgid "[IP: %s %s]"
-msgstr "[IP: %s %s]"
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-#: 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-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
-#: methods/connect.cc:95
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
+msgstr ""
-#: methods/connect.cc:103
+#: apt-pkg/acquire-item.cc:1952
#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"
+msgstr ""
-#: methods/connect.cc:121
-#, c-format
-msgid "Could not connect to %s:%s (%s)."
-msgstr "Methwyd cysylltu i %s:%s (%s)."
+# FIXME: number?
+#: apt-pkg/acquire-item.cc:1971
+#, fuzzy, c-format
+msgid "Unable to find hash sum for '%s' in Release file"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#. 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
-#, c-format
-msgid "Connecting to %s"
-msgstr "Yn cysylltu i %s"
+#: apt-pkg/acquire-item.cc:1995
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
-#: methods/connect.cc:168 methods/connect.cc:187
+#: apt-pkg/acquire-item.cc:2033
#, c-format
-msgid "Could not resolve '%s'"
-msgstr "Methwyd datrys '%s'"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."
+msgstr ""
-#: methods/connect.cc:193
+#: apt-pkg/acquire-item.cc:2055
#, c-format
-msgid "Temporary failure resolving '%s'"
-msgstr "Methiant dros dro yn datrys '%s'"
-
-#: methods/connect.cc:196
-#, fuzzy, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
-
-#: methods/connect.cc:243
-#, fuzzy, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr "Methwyd cysylltu i %s %s:"
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
-#. 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-pkg/acquire-item.cc:2074
+#, c-format
+msgid ""
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
+msgstr ""
-#: methods/gpgv.cc:163
+# FIXME: case
+#: apt-pkg/acquire-item.cc:2241
+#, c-format
msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
msgstr ""
+"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
+"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: methods/gpgv.cc:168
-msgid "At least one invalid signature was encountered."
+#: apt-pkg/acquire-item.cc:2307
+#, c-format
+msgid "Can't find a source to download version '%s' of '%s'"
msgstr ""
-#: methods/gpgv.cc:172
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: apt-pkg/acquire-item.cc:2343
+#, 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/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Mae can y storfa system fersiwn anghyfaddas"
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-#: methods/gpgv.cc:177
-msgid "Unknown error executing gpgv"
+#: apt-pkg/pkgcachegen.cc:273
+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:276
+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."
-#: methods/gpgv.cc:211 methods/gpgv.cc:218
+#: apt-pkg/pkgcachegen.cc:279
#, fuzzy
-msgid "The following signatures were invalid:\n"
-msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
+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."
-#: methods/gpgv.cc:225
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
+#: apt-pkg/pkgcachegen.cc:282
+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."
-#: methods/http.cc:385
-msgid "Waiting for headers"
-msgstr "Yn aros am benawdau"
-
-#: methods/http.cc:531
+#: apt-pkg/pkgcachegen.cc:591
#, c-format
-msgid "Got a single header line over %u chars"
-msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-
-#: methods/http.cc:539
-msgid "Bad header line"
-msgstr "Llinell pennawd gwael"
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
-#: 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-pkg/pkgcachegen.cc:1203
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
-#: methods/http.cc:600
+#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
+#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
#, fuzzy
-msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
+msgid "Reading package lists"
+msgstr "Yn Darllen Rhestrau Pecynnau"
-#: 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-pkg/pkgcachegen.cc:1308
+msgid "Collecting File Provides"
+msgstr "Yn Casglu Darpariaethau Ffeil"
-#: methods/http.cc:617
-#, fuzzy
-msgid "This HTTP server has broken range support"
-msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
+#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
+msgid "IO Error saving source cache"
+msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
-#: methods/http.cc:641
-msgid "Unknown date format"
-msgstr "Fformat dyddiad anhysbys"
+#: apt-pkg/vendorlist.cc:85
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
-#: methods/http.cc:799
-msgid "Select failed"
-msgstr "Methwyd dewis"
+#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: methods/http.cc:804
-msgid "Connection timed out"
-msgstr "Goramserodd y cysylltiad"
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
-#: methods/http.cc:827
-msgid "Error writing to output file"
-msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
+#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#, fuzzy, c-format
+msgid "Clean of %s is not supported"
+msgstr "Ni chynhelir y math ffeil mynegai '%s'"
-#: methods/http.cc:858
-msgid "Error writing to file"
-msgstr "Gwall wrth ysgrifennu at ffeil"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:976
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
-#: methods/http.cc:886
-msgid "Error writing to the file"
-msgstr "Gwall wrth ysgrifennu at y ffeil"
+#: apt-pkg/acquire.cc:978
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Yn Darllen Rhestr Ffeiliau"
-#: methods/http.cc:900
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
#, fuzzy
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
+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."
-#: methods/http.cc:902
-msgid "Error reading from server"
-msgstr "Gwall wrth ddarllen o'r gweinydd"
+# FIXME: ...file
+#: apt-pkg/srcrecords.cc:52
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
-#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
-#, fuzzy
-msgid "Failed to truncate file"
-msgstr "Methwyd ysgrifennu ffeil %s"
+#: apt-pkg/clean.cc:64
+#, 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-pkg/policy.cc:83
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
-#: methods/http.cc:1177 methods/http.cc:1232
-msgid "Connection failed"
-msgstr "Methodd y cysylltiad"
+# FIXME: literal
+#: apt-pkg/policy.cc:422
+#, fuzzy, c-format
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
-#: methods/http.cc:1324
-msgid "Internal error"
-msgstr "Gwall mewnol"
+# FIXME: tense
+#: apt-pkg/policy.cc:444
+#, c-format
+msgid "Did not understand pin type %s"
+msgstr "Methwyd daeall y math pin %s"
-#: apt-pkg/contrib/mmap.cc:77
-msgid "Can't mmap an empty file"
-msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
+
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#, 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/contrib/mmap.cc:89
+#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
#, fuzzy, c-format
-msgid "Couldn't duplicate file descriptor %i"
-msgstr "Methwyd agor pibell ar gyfer %s"
+msgid "Could not configure '%s'. "
+msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
+# FIXME: %s may have an arbirrary length
+#: apt-pkg/packagemanager.cc:631
#, c-format
-msgid "Couldn't make mmap of %lu bytes"
-msgstr "Methwyd gwneud mmap() efo %lu beit"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
+msgstr ""
+"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
+"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/contrib/mmap.cc:124
-#, fuzzy
-msgid "Unable to close mmap"
-msgstr "Ni ellir agor %s"
+#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-# FIXME
-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/cdrom.cc:571
#, fuzzy
-msgid "Unable to synchronize mmap"
-msgstr "Methwyd gweithredu "
+msgid "Unmounting CD-ROM...\n"
+msgstr "CD Anghywir"
-#: apt-pkg/contrib/mmap.cc:300
+#: apt-pkg/cdrom.cc:586
#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
+msgid "Using CD-ROM mount point %s\n"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:399
-#, c-format
-msgid ""
-"Unable to increase the size of the MMap as the limit of %lu bytes is already "
-"reached."
+#: apt-pkg/cdrom.cc:599
+#, fuzzy
+msgid "Waiting for disc...\n"
+msgstr "Yn aros am benawdau"
+
+#: apt-pkg/cdrom.cc:609
+msgid "Mounting CD-ROM...\n"
msgstr ""
-#: apt-pkg/contrib/mmap.cc:402
-msgid ""
-"Unable to increase size of the MMap as automatic growing is disabled by user."
+#: apt-pkg/cdrom.cc:620
+msgid "Identifying... "
msgstr ""
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:371
+#: apt-pkg/cdrom.cc:662
#, c-format
-msgid "%lid %lih %limin %lis"
+msgid "Stored label: %s\n"
msgstr ""
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
-#, c-format
-msgid "%lih %limin %lis"
+#: apt-pkg/cdrom.cc:680
+msgid "Scanning disc for index files...\n"
msgstr ""
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/cdrom.cc:734
#, c-format
-msgid "%limin %lis"
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"
msgstr ""
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:390
-#, c-format
-msgid "%lis"
+#: apt-pkg/cdrom.cc:744
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
msgstr ""
-#: apt-pkg/contrib/strutl.cc:1119
+#: apt-pkg/cdrom.cc:771
#, c-format
-msgid "Selection %s not found"
-msgstr "Ni chanfuwyd y dewis %s"
+msgid "Found label '%s'\n"
+msgstr ""
-#: apt-pkg/contrib/configuration.cc:452
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Talgryniad math anhysbys: '%c'"
+#: apt-pkg/cdrom.cc:800
+msgid "That is not a valid name, try again.\n"
+msgstr ""
-#: apt-pkg/contrib/configuration.cc:510
+#: apt-pkg/cdrom.cc:817
#, c-format
-msgid "Opening configuration file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
-#: apt-pkg/contrib/configuration.cc:678
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
+#: apt-pkg/cdrom.cc:819
+#, fuzzy
+msgid "Copying package lists..."
+msgstr "Yn Darllen Rhestrau Pecynnau"
-# FIXME
-#: apt-pkg/contrib/configuration.cc:697
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
+#: apt-pkg/cdrom.cc:863
+#, fuzzy
+msgid "Writing new source list\n"
+msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
-#: apt-pkg/contrib/configuration.cc:714
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
+#: apt-pkg/cdrom.cc:874
+msgid "Source list entries for this disc are:\n"
+msgstr ""
-#: apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/algorithms.cc:265
#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
+"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
+"ei gyfer."
-#: apt-pkg/contrib/configuration.cc:761
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
+#: apt-pkg/algorithms.cc:1084
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
+"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
+#: apt-pkg/algorithms.cc:1086
+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/contrib/configuration.cc:774
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
-#: apt-pkg/contrib/configuration.cc:777
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+#: apt-pkg/edsp.cc:237
+msgid "Send request to solver"
msgstr ""
-"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/contrib/configuration.cc:827
-#, 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/edsp.cc:316
+msgid "Prepare for receiving solution"
+msgstr ""
-#: apt-pkg/contrib/progress.cc:153
-#, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s... Gwall!"
+#: apt-pkg/edsp.cc:323
+msgid "External solver failed without a proper error message"
+msgstr ""
-#: apt-pkg/contrib/progress.cc:155
-#, c-format
-msgid "%c%s... Done"
-msgstr "%c%s... Wedi Gorffen"
+#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
+msgid "Execute external solver"
+msgstr ""
-# FIXME
-#: apt-pkg/contrib/cmndline.cc:77
+# FIXME: number?
+#: apt-pkg/tagfile.cc:169
#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
+msgid "Unable to parse package file %s (1)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/tagfile.cc:269
#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
+msgid "Unable to parse package file %s (2)"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
-#: apt-pkg/contrib/cmndline.cc:124
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:83
+#, fuzzy, c-format
+msgid "Unable to parse Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
+#: apt-pkg/indexrecords.cc:91
+#, fuzzy, c-format
+msgid "No sections in Release file %s"
+msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206
+#: apt-pkg/indexrecords.cc:139
#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
+msgid "No Hash entry in Release file %s"
+msgstr ""
-#: apt-pkg/contrib/cmndline.cc:236
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
+#: apt-pkg/indexrecords.cc:152
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-#: apt-pkg/contrib/cmndline.cc:267
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Opsiwn '%s' yn rhy hir"
+# FIXME: number?
+#: apt-pkg/indexrecords.cc:171
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
-# FIXME: 'Sense'?
-#: apt-pkg/contrib/cmndline.cc:300
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
+#: apt-pkg/sourcelist.cc:127
+#, 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/contrib/cmndline.cc:350
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Gweithred annilys %s"
+#: apt-pkg/sourcelist.cc:170
+#, 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/contrib/cdromutl.cc:52
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
+#: apt-pkg/sourcelist.cc:173
+#, 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/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/sourcelist.cc:184
+#, 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/contrib/cdromutl.cc:217
-msgid "Failed to stat the cdrom"
-msgstr "Methwyd gwneud stat() o'r CD-ROM"
+#: apt-pkg/sourcelist.cc:190
+#, 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/contrib/fileutl.cc:154
-#, 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/sourcelist.cc:193
+#, 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/contrib/fileutl.cc:159
+#: apt-pkg/sourcelist.cc:206
#, c-format
-msgid "Could not open lock file %s"
-msgstr "Methwyd agor y ffeil clo %s"
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
-#: apt-pkg/contrib/fileutl.cc:177
+#: apt-pkg/sourcelist.cc:208
#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
-#: apt-pkg/contrib/fileutl.cc:181
+#: apt-pkg/sourcelist.cc:211
#, c-format
-msgid "Could not get lock %s"
-msgstr "Methwyd cael y clo %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
-#: apt-pkg/contrib/fileutl.cc:643
+#: apt-pkg/sourcelist.cc:217
#, fuzzy, c-format
-msgid "Waited for %s but it wasn't there"
-msgstr "Arhoswyd am %s ond nid oedd e yna"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
-#: apt-pkg/contrib/fileutl.cc:655
+#: apt-pkg/sourcelist.cc:224
#, c-format
-msgid "Sub-process %s received a segmentation fault."
-msgstr "Derbyniodd is-broses %s wall segmentu."
-
-#: apt-pkg/contrib/fileutl.cc:657
-#, fuzzy, c-format
-msgid "Sub-process %s received signal %u."
-msgstr "Derbyniodd is-broses %s wall segmentu."
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/contrib/fileutl.cc:661
+#: apt-pkg/sourcelist.cc:335
#, c-format
-msgid "Sub-process %s returned an error code (%u)"
-msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
+msgid "Opening %s"
+msgstr "Yn agor %s"
-#: apt-pkg/contrib/fileutl.cc:663
+#: apt-pkg/sourcelist.cc:371
#, c-format
-msgid "Sub-process %s exited unexpectedly"
-msgstr "Gorffenodd is-broses %s yn annisgwyl"
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
-#: apt-pkg/contrib/fileutl.cc:728
-#, c-format
-msgid "Could not open file %s"
-msgstr "Methwyd agor ffeil %s"
+#: apt-pkg/sourcelist.cc:375
+#, 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/contrib/fileutl.cc:745
+#: apt-pkg/sourcelist.cc:416
#, fuzzy, c-format
-msgid "Could not open file descriptor %d"
-msgstr "Methwyd agor pibell ar gyfer %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"
-# FIXME
-#: apt-pkg/contrib/fileutl.cc:805
+#: apt-pkg/cacheset.cc:501
#, c-format
-msgid "read, still have %lu to read but none left"
-msgstr "o hyd %lu i ddarllen ond dim ar ôl"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
-# FIXME
-#: apt-pkg/contrib/fileutl.cc:838
+#: apt-pkg/cacheset.cc:504
#, c-format
-msgid "write, still have %lu to write but couldn't"
-msgstr "o hyd %lu i ysgrifennu ond methwyd"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
-#: apt-pkg/contrib/fileutl.cc:937
+#: apt-pkg/cacheset.cc:634
#, fuzzy, c-format
-msgid "Problem closing the gzip file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgid "Couldn't find task '%s'"
+msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/contrib/fileutl.cc:940
+#: apt-pkg/cacheset.cc:640
#, fuzzy, c-format
-msgid "Problem closing the file %s"
-msgstr "Gwall wrth gau'r ffeil"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/contrib/fileutl.cc:945
+#: apt-pkg/cacheset.cc:646
#, fuzzy, c-format
-msgid "Problem renaming the file %s to %s"
-msgstr "Gwall wrth gyfamseru'r ffeil"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Methwyd canfod pecyn %s"
-#: apt-pkg/contrib/fileutl.cc:956
-#, fuzzy, c-format
-msgid "Problem unlinking the file %s"
-msgstr "Gwall wrth dadgysylltu'r ffeil"
+#: apt-pkg/cacheset.cc:690
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
-#: apt-pkg/contrib/fileutl.cc:969
-msgid "Problem syncing the file"
-msgstr "Gwall wrth gyfamseru'r ffeil"
+#: apt-pkg/cacheset.cc:734
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
-#: apt-pkg/pkgcache.cc:145
-msgid "Empty package cache"
-msgstr "Storfa pecyn gwag"
+#: apt-pkg/cacheset.cc:742
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
-#: apt-pkg/pkgcache.cc:151
-msgid "The package cache file is corrupted"
-msgstr "Mae'r ffeil storfa pecyn yn llygredig"
+#: apt-pkg/cacheset.cc:750
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
-#: apt-pkg/pkgcache.cc:156
-msgid "The package cache file is an incompatible version"
-msgstr "Mae'r ffeil storfa pecyn yn fersiwn anghyflawn"
+#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
-# FIXME: capitalisation?
-#: apt-pkg/pkgcache.cc:161
+#: apt-pkg/deb/dpkgpm.cc:107
#, 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
-msgid "The package cache was built for a different architecture"
-msgstr "Adeiladwyd y storfa pecyn ar gyfer pernsaerniaeth gwahanol"
-
-#: apt-pkg/pkgcache.cc:293
-msgid "Depends"
-msgstr "Dibynnu"
-
-#: apt-pkg/pkgcache.cc:293
-msgid "PreDepends"
-msgstr "CynDdibynnu"
-
-#: apt-pkg/pkgcache.cc:293
-msgid "Suggests"
-msgstr "Awgrymu"
-
-#: apt-pkg/pkgcache.cc:294
-msgid "Recommends"
-msgstr "Argymell"
+msgid "Installing %s"
+msgstr " Wedi Sefydlu: "
-#: apt-pkg/pkgcache.cc:294
-msgid "Conflicts"
-msgstr "Gwrthdaro"
+#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
+#, fuzzy, c-format
+msgid "Configuring %s"
+msgstr "Yn cysylltu i %s"
-#: apt-pkg/pkgcache.cc:294
-msgid "Replaces"
-msgstr "Amnewid"
+#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
+#, fuzzy, c-format
+msgid "Removing %s"
+msgstr "Yn agor %s"
-#: apt-pkg/pkgcache.cc:295
-msgid "Obsoletes"
-msgstr "Darfodi"
+#: apt-pkg/deb/dpkgpm.cc:110
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Methwyd dileu %s"
-#: apt-pkg/pkgcache.cc:295
-msgid "Breaks"
+#: apt-pkg/deb/dpkgpm.cc:111
+#, c-format
+msgid "Noting disappearance of %s"
msgstr ""
-#: apt-pkg/pkgcache.cc:295
-msgid "Enhances"
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Running post-installation trigger %s"
msgstr ""
-#: apt-pkg/pkgcache.cc:306
-msgid "important"
-msgstr "pwysig"
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:842
+#, fuzzy, c-format
+msgid "Directory '%s' missing"
+msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/pkgcache.cc:306
-msgid "required"
-msgstr "angenrheidiol"
+#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/pkgcache.cc:306
-msgid "standard"
-msgstr "safonnol"
+#: apt-pkg/deb/dpkgpm.cc:1004
+#, fuzzy, c-format
+msgid "Preparing %s"
+msgstr "Yn agor %s"
-#: apt-pkg/pkgcache.cc:307
-msgid "optional"
-msgstr "opsiynnol"
+#: apt-pkg/deb/dpkgpm.cc:1005
+#, fuzzy, c-format
+msgid "Unpacking %s"
+msgstr "Yn agor %s"
-#: apt-pkg/pkgcache.cc:307
-msgid "extra"
-msgstr "ychwanegol"
+#: apt-pkg/deb/dpkgpm.cc:1010
+#, fuzzy, c-format
+msgid "Preparing to configure %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
-#, fuzzy
-msgid "Building dependency tree"
-msgstr "Yn Aideladu Coeden Dibyniaeth"
+#: apt-pkg/deb/dpkgpm.cc:1012
+#, fuzzy, c-format
+msgid "Installed %s"
+msgstr " Wedi Sefydlu: "
-#: apt-pkg/depcache.cc:125
-#, fuzzy
-msgid "Candidate versions"
-msgstr "Fersiynau Posib"
+#: apt-pkg/deb/dpkgpm.cc:1017
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
-#: apt-pkg/depcache.cc:154
-#, fuzzy
-msgid "Dependency generation"
-msgstr "Cynhyrchaid Dibyniaeth"
+#: apt-pkg/deb/dpkgpm.cc:1019
+#, fuzzy, c-format
+msgid "Removed %s"
+msgstr "Argymell"
-#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
-#, fuzzy
-msgid "Reading state information"
-msgstr "Yn cyfuno manylion Ar Gael"
+#: apt-pkg/deb/dpkgpm.cc:1024
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/depcache.cc:236
+#: apt-pkg/deb/dpkgpm.cc:1025
#, fuzzy, c-format
-msgid "Failed to open StateFile %s"
-msgstr "Methwyd agor %s"
+msgid "Completely removed %s"
+msgstr "Methwyd dileu %s"
-#: apt-pkg/depcache.cc:242
+#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
+#: apt-pkg/deb/dpkgpm.cc:1160
#, fuzzy, c-format
-msgid "Failed to write temporary StateFile %s"
-msgstr "Methwyd ysgrifennu ffeil %s"
+msgid "Can not write log (%s)"
+msgstr "Ni ellir ysgrifennu i %s"
-#: apt-pkg/depcache.cc:921
-#, c-format
-msgid "Internal error, group '%s' has no installable pseudo package"
+#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
+msgid "Is /dev/pts mounted?"
msgstr ""
-# FIXME: number?
-#: apt-pkg/tagfile.cc:102
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+#: apt-pkg/deb/dpkgpm.cc:1134
+msgid "Is stdout a terminal?"
+msgstr ""
-#: apt-pkg/tagfile.cc:189
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (2)"
+#: apt-pkg/deb/dpkgpm.cc:1638
+msgid "Operation was interrupted before it could finish"
+msgstr ""
-#: apt-pkg/sourcelist.cc:92
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
+#: apt-pkg/deb/dpkgpm.cc:1700
+msgid "No apport report written because MaxReports is reached already"
msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1705
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
-#: apt-pkg/sourcelist.cc:106
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+#: apt-pkg/deb/dpkgpm.cc:1707
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:112
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
+#: apt-pkg/deb/dpkgpm.cc:1713
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+#: apt-pkg/deb/dpkgpm.cc:1720
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:128
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)"
+#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
-#: apt-pkg/sourcelist.cc:130
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
+#: apt-pkg/deb/dpkgpm.cc:1755
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
-#: apt-pkg/sourcelist.cc:133
+#: apt-pkg/deb/debsystem.cc:91
#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
-#: apt-pkg/sourcelist.cc:139
+#: apt-pkg/deb/debsystem.cc:94
#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)"
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
-#: apt-pkg/sourcelist.cc:146
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
msgstr ""
-"Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)"
-#: apt-pkg/sourcelist.cc:244
+#: apt-pkg/contrib/fileutl.cc:196
#, c-format
-msgid "Opening %s"
-msgstr "Yn agor %s"
+msgid "Not using locking for read only lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s"
-#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
+#: apt-pkg/contrib/fileutl.cc:201
#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+msgid "Could not open lock file %s"
+msgstr "Methwyd agor y ffeil clo %s"
-#: apt-pkg/sourcelist.cc:281
+#: apt-pkg/contrib/fileutl.cc:224
#, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)"
+msgid "Not using locking for nfs mounted lock file %s"
+msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
-#: apt-pkg/sourcelist.cc:285
-#, 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/contrib/fileutl.cc:229
+#, c-format
+msgid "Could not get lock %s"
+msgstr "Methwyd cael y clo %s"
-#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
+#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "List of files can't be created as '%s' is not a directory"
msgstr ""
-# FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:452
+#: apt-pkg/contrib/fileutl.cc:400
#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:418
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
msgstr ""
-"Bydd y rhediad sefydlu hwn yn gorfodi tynnu'r pecyn angenrheidiol %s "
-"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
+#: apt-pkg/contrib/fileutl.cc:427
#, c-format
msgid ""
-"Could not perform immediate configuration on already unpacked '%s'. Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
msgstr ""
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/contrib/fileutl.cc:846
#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Ni chynhelir y math ffeil mynegai '%s'"
+msgid "Sub-process %s received a segmentation fault."
+msgstr "Derbyniodd is-broses %s wall segmentu."
+
+#: apt-pkg/contrib/fileutl.cc:848
+#, fuzzy, c-format
+msgid "Sub-process %s received signal %u."
+msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/algorithms.cc:292
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr ""
-"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
-"ei gyfer."
+msgid "Sub-process %s returned an error code (%u)"
+msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-#: apt-pkg/algorithms.cc:1210
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
-"ei achosi gan pecynnau wedi eu dal."
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
+#, c-format
+msgid "Sub-process %s exited unexpectedly"
+msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/algorithms.cc:1212
-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/contrib/fileutl.cc:952
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
-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/contrib/fileutl.cc:1140
+#, c-format
+msgid "Could not open file %s"
+msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/acquire.cc:79
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
#, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+msgid "Could not open file descriptor %d"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
+msgid "Failed to create subprocess IPC"
+msgstr "Methwyd creu isbroses IPC"
+
+#: apt-pkg/contrib/fileutl.cc:1412
+msgid "Failed to exec compressor "
+msgstr "Methwyd gweithredu cywasgydd "
-#: apt-pkg/acquire.cc:83
+# FIXME
+#: apt-pkg/contrib/fileutl.cc:1553
#, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Mae'r cyfeiriadur archif %spartial ar goll."
+msgid "read, still have %llu to read but none left"
+msgstr "o hyd %lu i ddarllen ond dim ar ôl"
-#: apt-pkg/acquire.cc:91
+# FIXME
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
#, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+msgid "write, still have %llu to write but couldn't"
+msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:857
+#: apt-pkg/contrib/fileutl.cc:1954
+#, fuzzy, c-format
+msgid "Problem closing the file %s"
+msgstr "Gwall wrth gau'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1965
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Gwall wrth gyfamseru'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1976
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"
+msgstr "Gwall wrth dadgysylltu'r ffeil"
+
+#: apt-pkg/contrib/fileutl.cc:1989
+msgid "Problem syncing the file"
+msgstr "Gwall wrth gyfamseru'r ffeil"
+
+#: apt-pkg/contrib/progress.cc:148
#, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
+msgid "%c%s... Error!"
+msgstr "%c%s... Gwall!"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s... Wedi Gorffen"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
msgstr ""
-#: apt-pkg/acquire.cc:859
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
#, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Yn Darllen Rhestr Ffeiliau"
+msgid "%c%s... %u%%"
+msgstr "%c%s... Wedi Gorffen"
-#: apt-pkg/acquire-worker.cc:110
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
#, c-format
-msgid "The method driver %s could not be found."
-msgstr "Methwyd canfod y gyrrydd dull %s."
+msgid "%lid %lih %limin %lis"
+msgstr ""
-#: apt-pkg/acquire-worker.cc:159
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Ni gychwynodd y dull %s yn gywir"
+msgid "%lih %limin %lis"
+msgstr ""
-#: apt-pkg/acquire-worker.cc:413
-#, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
+#, c-format
+msgid "%limin %lis"
msgstr ""
-"Newid Cyfrwng: Os gwelwch yn dda, rhowch y disg a'r label\n"
-" '%s'\n"
-"yn y gyrriant '%s' a gwasgwch Enter\n"
-#: apt-pkg/init.cc:143
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Ni chynhelir y system pecynnu '%s'"
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1290
+#, c-format
+msgid "Selection %s not found"
+msgstr "Ni chanfuwyd y dewis %s"
+
+#: 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:111
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Methwyd agor pibell ar gyfer %s"
+
+#: 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:146
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Ni ellir agor %s"
+
+# FIXME
+#: 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:290
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr "Methwyd gwneud mmap() efo %lu beit"
-#: apt-pkg/init.cc:159
+#: apt-pkg/contrib/mmap.cc:322
#, fuzzy
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Ni ellir canfod math system addas"
+msgid "Failed to truncate file"
+msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-pkg/clean.cc:56
+#: apt-pkg/contrib/mmap.cc:341
#, c-format
-msgid "Unable to stat %s."
-msgstr "Ni ellir gwneud stat() o %s."
-
-# FIXME: ...file
-#: apt-pkg/srcrecords.cc:44
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Rhaid i chi rhoi rhai URI 'source' yn eich ffeil sources.list"
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
-#: apt-pkg/cachefile.cc:84
-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/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/cachefile.cc:88
-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/contrib/mmap.cc:449
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."
+msgstr ""
-#: apt-pkg/cachefile.cc:106
-msgid "The list of sources could not be read."
-msgstr "Methwyd darllen y rhestr ffynhonellau."
+#: apt-pkg/contrib/cdromutl.cc:65
+#, c-format
+msgid "Unable to stat the mount point %s"
+msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
-# FIXME: literal
-#: apt-pkg/policy.cc:344
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'"
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Methwyd gwneud stat() o'r CD-ROM"
-# FIXME: tense
-#: apt-pkg/policy.cc:366
+#: apt-pkg/contrib/configuration.cc:516
#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Methwyd daeall y math pin %s"
-
-#: apt-pkg/policy.cc:374
-msgid "No priority (or zero) specified for pin"
-msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/pkgcachegen.cc:80
-msgid "Cache has an incompatible versioning system"
-msgstr "Mae can y storfa system fersiwn anghyfaddas"
+#: apt-pkg/contrib/configuration.cc:630
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/pkgcachegen.cc:198
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
+#: apt-pkg/contrib/configuration.cc:798
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
-#: apt-pkg/pkgcachegen.cc:215
+# FIXME
+#: apt-pkg/contrib/configuration.cc:817
#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
-#: apt-pkg/pkgcachegen.cc:253
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+#: apt-pkg/contrib/configuration.cc:834
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
-#: apt-pkg/pkgcachegen.cc:285
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
+#: apt-pkg/contrib/configuration.cc:874
+#, 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/pkgcachegen.cc:289
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
+#: apt-pkg/contrib/configuration.cc:881
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
-#: 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/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/pkgcachegen.cc:320
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
-msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
+#: apt-pkg/contrib/configuration.cc:894
+#, c-format
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/pkgcachegen.cc:353
+#: apt-pkg/contrib/configuration.cc:897
#, fuzzy, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
-msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-
-#: apt-pkg/pkgcachegen.cc:360
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
msgstr ""
-"Jiw, rhagoroch chi'r nifer o enwau pecyn mae'r APT hwn yn gallu ei drin."
+"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/pkgcachegen.cc:363
-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/contrib/configuration.cc:947
+#, 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/pkgcachegen.cc:366
-#, 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."
+# FIXME
+#: apt-pkg/contrib/cmndline.cc:124
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn '%c' (o %s)."
-#: apt-pkg/pkgcachegen.cc:369
-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/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
+#: apt-pkg/contrib/cmndline.cc:166
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Ni adnabyddir yr opsiwn llinell orchymyn %s"
-#: apt-pkg/pkgcachegen.cc:398
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (FindPkg)"
-msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
+#: apt-pkg/contrib/cmndline.cc:171
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Nid yw'r opsiwn llinell orchymyn %s yn fŵleaidd"
-#: apt-pkg/pkgcachegen.cc:412
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
-msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)"
+#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad."
-#: apt-pkg/pkgcachegen.cc:418
+#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil"
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Opsiwn %s: Rhaid i benodiad eitem cyfluniad gael =<gwerth>."
-#: apt-pkg/pkgcachegen.cc:982
+#: apt-pkg/contrib/cmndline.cc:281
#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Mae'r opsiwn %s yn mynnu ymresymiad cyfanrif, nid '%s'"
-#: apt-pkg/pkgcachegen.cc:1087
-msgid "Collecting File Provides"
-msgstr "Yn Casglu Darpariaethau Ffeil"
+#: apt-pkg/contrib/cmndline.cc:312
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Opsiwn '%s' yn rhy hir"
-#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
-msgid "IO Error saving source cache"
-msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
+# FIXME: 'Sense'?
+#: apt-pkg/contrib/cmndline.cc:344
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Ni ddeallir %s, ceiswich ddefnyddio 'true' neu 'false'."
-#: apt-pkg/acquire-item.cc:136
+#: apt-pkg/contrib/cmndline.cc:394
#, c-format
-msgid "rename failed, %s (%s -> %s)."
-msgstr "methwyd ailenwi, %s (%s -> %s)."
+msgid "Invalid operation %s"
+msgstr "Gweithred annilys %s"
-#: apt-pkg/acquire-item.cc:484
-msgid "MD5Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
+#: 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-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Methyd lleoli yr elfen <hash>!"
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Methwyd neilltuo dargyfeiriad"
-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
-#: apt-pkg/acquire-item.cc:1717
+#: apt-inst/filelist.cc:464
#, fuzzy
-msgid "Hash Sum mismatch"
-msgstr "Camgyfatebiaeth swm MD5"
+msgid "Internal error in AddDiversion"
+msgstr "Gwall Mewnol yn AddDiversion"
-#: apt-pkg/acquire-item.cc:1244
-msgid "There is no public key available for the following key IDs:\n"
-msgstr ""
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Yn ceisio trosysgrifo dargyfeiriad, %s -> %s a %s/%s"
-#. 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
+# FIXME: "the"
+#: apt-inst/filelist.cc:506
#, c-format
-msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
+msgid "Double add of diversion %s -> %s"
+msgstr "Ychwanegiad dwbl o'r dargyfeiriad %s -> %s"
-#: apt-pkg/acquire-item.cc:1302
+#: apt-inst/filelist.cc:549
#, c-format
-msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgid "Duplicate conf file %s/%s"
+msgstr "Ffeil cyfluniad dyblyg %s/%s"
-#: apt-pkg/acquire-item.cc:1328
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
#, c-format
-msgid ""
-"A 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 ""
+msgid "The path %s is too long"
+msgstr "Mae'r llwybr %s yn rhy hir"
-#: apt-pkg/acquire-item.cc:1337
+#: apt-inst/extract.cc:132
#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
+msgid "Unpacking %s more than once"
+msgstr "Yn dadbacio %s mwy nag unwaith"
-# FIXME: case
-#: apt-pkg/acquire-item.cc:1365
+#: apt-inst/extract.cc:142
#, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
-msgstr ""
-"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
-"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
+msgid "The directory %s is diverted"
+msgstr "Mae'r cyfeiriadur %s wedi ei ddargyfeirio"
-#: apt-pkg/acquire-item.cc:1424
+#: apt-inst/extract.cc:152
#, c-format
-msgid ""
-"I wasn't able to locate 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."
+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"
+
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Mae llwybr y dargyfeiriad yn rhy hir"
-#: apt-pkg/acquire-item.cc:1479
+#: apt-inst/extract.cc:249
#, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "The directory %s is being replaced by a non-directory"
msgstr ""
-"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
+"Mae'r cyfeiriadur %s yn cael ei amnewid efo rhywbeth nid cyfeiriadur ydyw"
-#: apt-pkg/acquire-item.cc:1566
-msgid "Size mismatch"
-msgstr "Camgyfatebiaeth maint"
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Methwyd lleoli nôd yn ei fwced stwnsh"
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:53
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Mae'r llwybr yn rhy hir"
+
+# FIXME: wtf?
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
+
+#: apt-inst/extract.cc:438
+#, 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"
-#: apt-pkg/indexrecords.cc:60
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Ni ellir gwneud stat() o %s"
+
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
#, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
+msgid "Failed to write file %s"
+msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-pkg/indexrecords.cc:94
+#: apt-inst/dirstream.cc:104
#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
+msgid "Failed to close file %s"
+msgstr "Methwyd cau ffeil %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, 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"
-#: apt-pkg/indexrecords.cc:107
+#: apt-inst/deb/debfile.cc:132
#, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
+msgid "Internal error, could not locate member %s"
+msgstr "Gwall Mewnol, methwyd lleoli aelod %s"
-# FIXME: number?
-#: apt-pkg/indexrecords.cc:122
+#: apt-inst/deb/debfile.cc:227
+#, fuzzy
+msgid "Unparsable control file"
+msgstr "Ffeil rheoli ni ellir ei ramadegu"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Llofnod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Gwall wrth ddarllen pennawd aelod archif"
+
+#: apt-inst/contrib/arfile.cc:96
#, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Ni ellir gramadegu ffeil becynnau %s (1)"
+msgid "Invalid archive member header %s"
+msgstr "Pennawd aelod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Pennawd aelod archif annilys"
+
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Mae'r archif yn rhy fyr"
-#: apt-pkg/vendorlist.cc:66
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Nid yw'r bloc darparwr %s yn cynnwys ôl bys"
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Methwyd darllen pennawdau'r archif"
-#: apt-pkg/cdrom.cc:518
-#, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:123
+msgid "Failed to create pipes"
+msgstr "Methwyd creu pibau"
-#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615
-msgid "Identifying.. "
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:150
+msgid "Failed to exec gzip "
+msgstr "Methwyd gweithredu gzip"
-#: apt-pkg/cdrom.cc:552
-#, c-format
-msgid "Stored label: %s\n"
-msgstr ""
+#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+msgid "Corrupted archive"
+msgstr "Archif llygredig"
-#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
+#: apt-inst/contrib/extracttar.cc:202
#, fuzzy
-msgid "Unmounting CD-ROM...\n"
-msgstr "CD Anghywir"
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Methodd swm gwirio Tar, archif llygredig"
-#: apt-pkg/cdrom.cc:578
+#: apt-inst/contrib/extracttar.cc:307
#, c-format
-msgid "Using CD-ROM mount point %s\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:596
-msgid "Unmounting CD-ROM\n"
-msgstr ""
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Math pennawd TAR anhysbys %u, aelod %s"
-#: apt-pkg/cdrom.cc:600
#, fuzzy
-msgid "Waiting for disc...\n"
-msgstr "Yn aros am benawdau"
-
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:608
-msgid "Mounting CD-ROM...\n"
-msgstr ""
-
-#: apt-pkg/cdrom.cc:626
-msgid "Scanning disc for index files..\n"
-msgstr ""
+#~ msgid "Total dependency version space: "
+#~ msgstr "Cyfanswm gofod Fersiwn Dibyniaeth: "
-#: apt-pkg/cdrom.cc:666
-#, c-format
-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
-"%zu signatures\n"
-msgstr ""
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Does dim digon o le rhydd yn %s gennych"
-#: apt-pkg/cdrom.cc:677
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
-msgstr ""
+#~ msgid "Done"
+#~ msgstr "Wedi Gorffen"
-#: apt-pkg/cdrom.cc:703
-#, c-format
-msgid "Found label '%s'\n"
-msgstr ""
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Yn Erthylu'r Sefydliad."
-#: apt-pkg/cdrom.cc:732
-msgid "That is not a valid name, try again.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: apt-pkg/cdrom.cc:748
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
-msgstr ""
+#~ msgid "%s not a valid DEB package."
+#~ msgstr "Nid yw %s yn becyn DEB dilys."
-#: apt-pkg/cdrom.cc:752
#, fuzzy
-msgid "Copying package lists..."
-msgstr "Yn Darllen Rhestrau Pecynnau"
+#~ msgid "Note, selecting '%s' for task '%s'\n"
+#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: apt-pkg/cdrom.cc:778
#, fuzzy
-msgid "Writing new source list\n"
-msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s."
+#~ msgid "Note, selecting '%s' for regex '%s'\n"
+#~ msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: apt-pkg/cdrom.cc:787
-msgid "Source list entries for this disc are:\n"
-msgstr ""
+#~ msgid "Package %s is a virtual package provided by:\n"
+#~ msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr ""
+#, fuzzy
+#~ msgid " [Not candidate version]"
+#~ msgstr "Fersiynau Posib"
-#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr ""
+#~ msgid "You should explicitly select one to install."
+#~ msgstr "Dylech ddewis un yn benodol i'w sefydlu."
-#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr ""
+# 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"
-#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr ""
+#~ msgid "However the following packages replace it:"
+#~ msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: apt-pkg/indexcopy.cc:537
-#, fuzzy, c-format
-msgid "Skipping nonexistent file %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#, fuzzy
+#~ msgid "Package '%s' has no installation candidate"
+#~ msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-#: apt-pkg/indexcopy.cc:543
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
+#, fuzzy
+#~ msgid "Note, selecting '%s' instead of '%s'\n"
+#~ msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: apt-pkg/indexcopy.cc:549
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Camgyfatebiaeth swm MD5"
+#, 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"
-#: apt-pkg/cacheset.cc:337
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
+#~ msgid "MD5Sum mismatch"
+#~ msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/cacheset.cc:340
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
+#~ 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."
-#: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#, fuzzy
+#~ msgid "Skipping nonexistent file %s"
+#~ msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Methwyd canfod pecyn %s"
+#~ msgid "Failed to remove %s"
+#~ msgstr "Methwyd dileu %s"
-#: apt-pkg/cacheset.cc:467
-#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
-msgstr ""
+#~ msgid "Unable to create %s"
+#~ msgstr "Ni ellir creu %s"
-#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
-#, c-format
-msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
-msgstr ""
+#~ msgid "Failed to stat %sinfo"
+#~ msgstr "Methwyd stat() ar %sinfo"
-#: apt-pkg/cacheset.cc:491
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+#~ 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"
-#: apt-pkg/cacheset.cc:499
-#, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
-msgstr ""
+#~ msgid "Failed to change to the admin dir %sinfo"
+#~ msgstr "Methwyd newid i'r cyfeiriadur gweinyddiaeth %sinfo"
-#: apt-pkg/cacheset.cc:507
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
-msgstr ""
+# FIXME
+#, fuzzy
+#~ msgid "Internal error getting a package name"
+#~ msgstr "Gwall mewnol wrth gyrchu enw pecyn"
-#: apt-pkg/deb/dpkgpm.cc:52
-#, fuzzy, c-format
-msgid "Installing %s"
-msgstr " Wedi Sefydlu: "
+#, fuzzy
+#~ msgid "Reading file listing"
+#~ msgstr "Yn Darllen Rhestr Ffeiliau"
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822
-#, fuzzy, c-format
-msgid "Configuring %s"
-msgstr "Yn cysylltu i %s"
+#~ 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!"
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829
-#, fuzzy, c-format
-msgid "Removing %s"
-msgstr "Yn agor %s"
+# FIXME
+#~ msgid "Failed reading the list file %sinfo/%s"
+#~ msgstr "Methwyd darllen y ffeil rhestr %sinfo/%s"
-#: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
-msgid "Completely removing %s"
-msgstr "Methwyd dileu %s"
+#, fuzzy
+#~ msgid "Internal error getting a node"
+#~ msgstr "Gwall Mewnol wrth gael Nôd"
-#: apt-pkg/deb/dpkgpm.cc:56
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
+# FIXME: literal
+#~ msgid "Failed to open the diversions file %sdiversions"
+#~ msgstr "Methwyd agor y ffeil dargyfeirio %sdiversions"
-#: apt-pkg/deb/dpkgpm.cc:57
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
+#~ msgid "The diversion file is corrupted"
+#~ msgstr "Mae'r ffeil dargyfeirio wed ei lygru"
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:646
-#, fuzzy, c-format
-msgid "Directory '%s' missing"
-msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
+#~ msgid "Invalid line in the diversion file: %s"
+#~ msgstr "Llinell annilys yn y ffeil dargyfeirio: %s"
-#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674
-#, fuzzy, c-format
-msgid "Could not open file '%s'"
-msgstr "Methwyd agor ffeil %s"
+#, fuzzy
+#~ msgid "Internal error adding a diversion"
+#~ msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: apt-pkg/deb/dpkgpm.cc:815
-#, fuzzy, c-format
-msgid "Preparing %s"
-msgstr "Yn agor %s"
+#, fuzzy
+#~ msgid "The pkg cache must be initialized first"
+#~ msgstr "Rhaid i'r storfa pecynnau gael ei ymgychwyn yn gyntaf"
-#: apt-pkg/deb/dpkgpm.cc:816
-#, fuzzy, c-format
-msgid "Unpacking %s"
-msgstr "Yn agor %s"
+#, fuzzy
+#~ msgid "Failed to find a Package: header, offset %lu"
+#~ msgstr "Methwyd canfod pennawd \"Package:\". Atred: %lu"
-#: apt-pkg/deb/dpkgpm.cc:821
-#, fuzzy, c-format
-msgid "Preparing to configure %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#~ msgid "Bad ConfFile section in the status file. Offset %lu"
+#~ msgstr "Adrean \"ConfFile\" gwael yn y ffeil statws. Atred: %lu"
-#: apt-pkg/deb/dpkgpm.cc:823
-#, fuzzy, c-format
-msgid "Installed %s"
-msgstr " Wedi Sefydlu: "
+#~ msgid "Error parsing MD5. Offset %lu"
+#~ msgstr "Gwall wrth ramadegu MD5. Atred: %lu"
-#: apt-pkg/deb/dpkgpm.cc:828
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
+#~ msgid "Couldn't change to %s"
+#~ msgstr "Methwyd newid i %s"
-#: apt-pkg/deb/dpkgpm.cc:830
-#, fuzzy, c-format
-msgid "Removed %s"
-msgstr "Argymell"
+#~ msgid "Failed to locate a valid control file"
+#~ msgstr "Methwyd lleoli ffeil rheoli dilys"
-#: apt-pkg/deb/dpkgpm.cc:835
-#, fuzzy, c-format
-msgid "Preparing to completely remove %s"
-msgstr "Yn agor y ffeil cyfluniad %s"
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Methwyd agor pibell ar gyfer %s"
-#: apt-pkg/deb/dpkgpm.cc:836
-#, fuzzy, c-format
-msgid "Completely removed %s"
-msgstr "Methwyd dileu %s"
+#~ msgid "Read error from %s process"
+#~ msgstr "Gwall darllen o broses %s"
-#: apt-pkg/deb/dpkgpm.cc:1042
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
+#~ msgid "Got a single header line over %u chars"
+#~ msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: apt-pkg/deb/dpkgpm.cc:1073
-msgid "Running dpkg"
-msgstr ""
+#~ msgid "Malformed override %s line %lu #1"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #1"
-#: apt-pkg/deb/dpkgpm.cc:1276
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+#~ msgid "Malformed override %s line %lu #2"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #2"
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1281
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
+#~ msgid "Malformed override %s line %lu #3"
+#~ msgstr "Gwrthwneud camffurfiol %s llinell %lu #3"
-#: apt-pkg/deb/dpkgpm.cc:1283
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
+#~ msgid "decompressor"
+#~ msgstr "datgywasgydd"
-#: apt-pkg/deb/dpkgpm.cc:1289
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
+# FIXME
+#~ msgid "read, still have %lu to read but none left"
+#~ msgstr "o hyd %lu i ddarllen ond dim ar ôl"
-#: apt-pkg/deb/dpkgpm.cc:1295
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
+# FIXME
+#~ msgid "write, still have %lu to write but couldn't"
+#~ msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/deb/dpkgpm.cc:1302
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewPackage)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewPackage)"
-#: apt-pkg/deb/debsystem.cc:69
-#, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
-#: apt-pkg/deb/debsystem.cc:72
-#, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileDesc1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:88
-#, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage2)"
-#: apt-pkg/deb/debsystem.cc:106
-msgid "Not locked"
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewFileVer1)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-#. 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 ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (NewVersion%d)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion1)"
-#: methods/mirror.cc:343
-#, c-format
-msgid "[Mirror: %s]"
-msgstr ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (UsePackage3)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage3)"
-#: 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 "Error occurred while processing %s (NewFileDesc2)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
-#: 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 ""
+#, fuzzy
+#~ msgid "Error occurred while processing %s (FindPkg)"
+#~ msgstr "Digwyddod gwall wrth brosesu %s (FindPkg)"
-#: methods/rsh.cc:329
-msgid "Connection closed prematurely"
-msgstr "Caewyd y cysylltiad yn gynnar"
+#, 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