summaryrefslogtreecommitdiff
path: root/po/cy.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po240
1 files changed, 128 insertions, 112 deletions
diff --git a/po/cy.po b/po/cy.po
index c882106df..f0485cca9 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: APT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-12 21:41+0200\n"
+"POT-Creation-Date: 2007-07-09 17:17+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"
@@ -174,7 +174,7 @@ msgstr " %4i %s\n"
#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2583 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2614 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
@@ -680,7 +680,7 @@ msgstr "Methwyd ailenwi %s at %s"
msgid "Y"
msgstr "I"
-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
#, c-format
msgid "Regex compilation error - %s"
msgstr "Gwall crynhoi patrwm - %s"
@@ -850,11 +850,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2009 cmdline/apt-get.cc:2042
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2331
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2362
#: apt-pkg/cachefile.cc:63
msgid "The list of sources could not be read."
msgstr "Methwyd darllen y rhestr ffynhonellau."
@@ -883,7 +883,7 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2216
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
@@ -912,7 +912,7 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908 cmdline/apt-get.cc:2143
msgid "Abort."
msgstr "Erthylu."
@@ -921,7 +921,7 @@ msgstr "Erthylu."
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2228
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2259
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
@@ -930,7 +930,7 @@ msgstr "Methwyd cyrchu %s %s\n"
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2268
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
@@ -1067,7 +1067,7 @@ msgid ""
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
msgid "The following information may help to resolve the situation:"
msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
@@ -1081,32 +1081,32 @@ msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1544
#, fuzzy, c-format
msgid "Couldn't find task %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1658 cmdline/apt-get.cc:1694
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1682
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1712
#, fuzzy, c-format
msgid "%s set to manual installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:1724
+#: cmdline/apt-get.cc:1725
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:1727
+#: cmdline/apt-get.cc:1728
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1115,7 +1115,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1739
+#: cmdline/apt-get.cc:1740
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"
@@ -1128,7 +1128,7 @@ msgstr ""
"heb gael eu symud allan o Incoming."
# FIXME: commas, wrapping
-#: cmdline/apt-get.cc:1747
+#: cmdline/apt-get.cc:1748
msgid ""
"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"
@@ -1137,118 +1137,133 @@ msgstr ""
"Gan y gofynnoch am weithred syml yn unig, mae'n debygol nad yw'r pecyn\n"
"yn sefydladwy a dylid cyflwyno adroddiad nam yn erbyn y pecyn hwnnw."
-#: cmdline/apt-get.cc:1755
+#: cmdline/apt-get.cc:1756
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1784
+#: cmdline/apt-get.cc:1785
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1873
+#: cmdline/apt-get.cc:1874
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1874
+#: cmdline/apt-get.cc:1875
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1902
+#: cmdline/apt-get.cc:1903
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:1905 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:100
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:1910
+#: cmdline/apt-get.cc:1911
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:1977 cmdline/apt-get.cc:1985
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2086
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:2115 cmdline/apt-get.cc:2349
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2380
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2164
+#: cmdline/apt-get.cc:2132
+#, c-format
+msgid ""
+"WARNING: '%s' is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2137
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to modify the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2195
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2219
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:2193
+#: cmdline/apt-get.cc:2224
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2196
+#: cmdline/apt-get.cc:2227
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2202
+#: cmdline/apt-get.cc:2233
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2233
+#: cmdline/apt-get.cc:2264
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2261
+#: cmdline/apt-get.cc:2292
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2304
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2274
+#: cmdline/apt-get.cc:2305
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2322
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2341
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2326
+#: cmdline/apt-get.cc:2357
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2354
+#: cmdline/apt-get.cc:2385
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2374
+#: cmdline/apt-get.cc:2405
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2426
+#: cmdline/apt-get.cc:2457
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1257,7 +1272,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
"s"
-#: cmdline/apt-get.cc:2478
+#: cmdline/apt-get.cc:2509
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1266,34 +1281,34 @@ msgstr ""
"Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
"ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
-#: cmdline/apt-get.cc:2513
+#: cmdline/apt-get.cc:2544
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2538
+#: cmdline/apt-get.cc:2569
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2552
+#: cmdline/apt-get.cc:2583
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2556
+#: cmdline/apt-get.cc:2587
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2588
+#: cmdline/apt-get.cc:2619
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2629
+#: cmdline/apt-get.cc:2660
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1610,9 +1625,9 @@ msgstr "Cyfatebiad pecyn trosysgrifo gyda dim fersiwn am %s"
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-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:747
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34 methods/mirror.cc:82
#, c-format
msgid "Unable to read %s"
msgstr "Ni ellir darllen %s"
@@ -1928,7 +1943,7 @@ msgstr "Goramserodd cysylltiad y soced data"
msgid "Unable to accept connection"
msgstr "Methwyd derbyn cysylltiad"
-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:961 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem wrth stwnshio ffeil"
@@ -1956,39 +1971,39 @@ msgstr "Ymholiad"
msgid "Unable to invoke "
msgstr "Methwyd gweithredu "
-#: methods/connect.cc:64
+#: methods/connect.cc:65
#, c-format
msgid "Connecting to %s (%s)"
msgstr "Yn cysylltu i %s (%s)"
-#: methods/connect.cc:71
+#: methods/connect.cc:72
#, c-format
msgid "[IP: %s %s]"
msgstr "[IP: %s %s]"
-#: methods/connect.cc:80
+#: methods/connect.cc:79
#, 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)"
-#: methods/connect.cc:86
+#: methods/connect.cc:85
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
msgstr "Ni ellir cychwyn y cysylltiad i %s:%s (%s)."
-#: methods/connect.cc:93
+#: methods/connect.cc:92
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Methwyd cysylltu i %s:%s (%s), goramserodd y cysylltiad"
-#: methods/connect.cc:108
+#: methods/connect.cc:107
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Methwyd cysylltu i %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:136 methods/rsh.cc:425
+#: methods/connect.cc:135 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Yn cysylltu i %s"
@@ -2061,82 +2076,82 @@ msgstr "Methwyd agor pibell ar gyfer %s"
msgid "Read error from %s process"
msgstr "Gwall darllen o broses %s"
-#: methods/http.cc:377
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Yn aros am benawdau"
-#: methods/http.cc:523
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Derbynnwyd llinell pennaws sengl dros %u nod"
-#: methods/http.cc:531
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Llinell pennawd gwael"
-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:549 methods/http.cc:556
#, fuzzy
msgid "The HTTP server sent an invalid reply header"
msgstr "Danfonodd y gweinydd HTTP bennawd ateb annilys"
-#: methods/http.cc:586
+#: methods/http.cc:585
#, fuzzy
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Length annilys"
-#: methods/http.cc:601
+#: methods/http.cc:600
#, fuzzy
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "Danfonodd y gweinydd HTTP bennawd Content-Range annilys"
-#: methods/http.cc:603
+#: methods/http.cc:602
#, fuzzy
msgid "This HTTP server has broken range support"
msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
-#: methods/http.cc:627
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Fformat dyddiad anhysbys"
-#: methods/http.cc:774
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Methwyd dewis"
-#: methods/http.cc:779
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Goramserodd y cysylltiad"
-#: methods/http.cc:802
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
-#: methods/http.cc:833
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Gwall wrth ysgrifennu at ffeil"
-#: methods/http.cc:861
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Gwall wrth ysgrifennu at y ffeil"
-#: methods/http.cc:875
+#: methods/http.cc:874
#, 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:877
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Gwall wrth ddarllen o'r gweinydd"
-#: methods/http.cc:1108
+#: methods/http.cc:1110
#, fuzzy
msgid "Bad header data"
msgstr "Data pennawd gwael"
-#: methods/http.cc:1125
+#: methods/http.cc:1127
msgid "Connection failed"
msgstr "Methodd y cysylltiad"
-#: methods/http.cc:1216
+#: methods/http.cc:1218
msgid "Internal error"
msgstr "Gwall mewnol"
@@ -2154,59 +2169,59 @@ msgstr "Methwyd gwneud mmap() efo %lu beit"
msgid "Selection %s not found"
msgstr "Ni chanfuwyd y dewis %s"
-#: apt-pkg/contrib/configuration.cc:433
+#: apt-pkg/contrib/configuration.cc:434
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
msgstr "Talgryniad math anhysbys: '%c'"
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:492
#, c-format
msgid "Opening configuration file %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/contrib/configuration.cc:509
-#, c-format
-msgid "Line %d too long (max %d)"
+#: apt-pkg/contrib/configuration.cc:510
+#, fuzzy, c-format
+msgid "Line %d too long (max %lu)"
msgstr "Linell %d yn rhy hir (uchaf %d)"
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:606
#, c-format
msgid "Syntax error %s:%u: Block starts with no name."
msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw."
# FIXME
-#: apt-pkg/contrib/configuration.cc:624
+#: apt-pkg/contrib/configuration.cc:625
#, fuzzy, c-format
msgid "Syntax error %s:%u: Malformed tag"
msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio"
-#: apt-pkg/contrib/configuration.cc:641
+#: apt-pkg/contrib/configuration.cc:642
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth"
-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
msgstr ""
"Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig"
-#: apt-pkg/contrib/configuration.cc:688
+#: apt-pkg/contrib/configuration.cc:689
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol"
-#: apt-pkg/contrib/configuration.cc:692 apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
#, c-format
msgid "Syntax error %s:%u: Included from here"
msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn"
-#: apt-pkg/contrib/configuration.cc:701
+#: apt-pkg/contrib/configuration.cc:702
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'"
-#: apt-pkg/contrib/configuration.cc:735
+#: apt-pkg/contrib/configuration.cc:736
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil"
@@ -2275,6 +2290,7 @@ msgid "Unable to stat the mount point %s"
msgstr "Ni ellir gwneud stat() o'r pwynt clymu %s"
#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: methods/mirror.cc:88
#, c-format
msgid "Unable to change to %s"
msgstr "Ni ellir newid i %s"
@@ -2530,7 +2546,7 @@ msgstr ""
"oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
"eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
-#: apt-pkg/pkgrecords.cc:34
+#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
msgstr "Ni chynhelir y math ffeil mynegai '%s'"
@@ -2655,7 +2671,7 @@ msgstr "Digwyddod gwall wrth brosesu %s (UsePackage1)"
#: apt-pkg/pkgcachegen.cc:153
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
+msgid "Error occurred while processing %s (NewFileDesc1)"
msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:178
@@ -2685,7 +2701,7 @@ msgstr "Digwyddod gwall wrth brosesu %s (NewVersion2)"
#: apt-pkg/pkgcachegen.cc:245
#, fuzzy, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
+msgid "Error occurred while processing %s (NewFileDesc2)"
msgstr "Digwyddod gwall wrth brosesu %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:251
@@ -2735,22 +2751,22 @@ msgstr "Yn Casglu Darpariaethau Ffeil"
msgid "IO Error saving source cache"
msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
-#: apt-pkg/acquire-item.cc:127
+#: apt-pkg/acquire-item.cc:134
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "methwyd ailenwi, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
-#: apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:456 apt-pkg/acquire-item.cc:710
+#: apt-pkg/acquire-item.cc:1462
msgid "MD5Sum mismatch"
msgstr "Camgyfatebiaeth swm MD5"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1156
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
# FIXME: case
-#: apt-pkg/acquire-item.cc:1219
+#: apt-pkg/acquire-item.cc:1270
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2759,7 +2775,7 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
-#: apt-pkg/acquire-item.cc:1278
+#: apt-pkg/acquire-item.cc:1329
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2768,14 +2784,14 @@ msgstr ""
"Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
"drwsio'r pecyn hyn a law."
-#: apt-pkg/acquire-item.cc:1314
+#: apt-pkg/acquire-item.cc:1365
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
msgstr ""
"Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
-#: apt-pkg/acquire-item.cc:1401
+#: apt-pkg/acquire-item.cc:1452
msgid "Size mismatch"
msgstr "Camgyfatebiaeth maint"
@@ -2885,52 +2901,52 @@ msgstr ""
msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:355
+#: apt-pkg/deb/dpkgpm.cc:357
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:356
+#: apt-pkg/deb/dpkgpm.cc:358
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:361
+#: apt-pkg/deb/dpkgpm.cc:363
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:362
+#: apt-pkg/deb/dpkgpm.cc:364
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:363
+#: apt-pkg/deb/dpkgpm.cc:365
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:368
+#: apt-pkg/deb/dpkgpm.cc:370
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:369
+#: apt-pkg/deb/dpkgpm.cc:371
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:370
+#: apt-pkg/deb/dpkgpm.cc:372
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:375
+#: apt-pkg/deb/dpkgpm.cc:377
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:376
+#: apt-pkg/deb/dpkgpm.cc:378
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"