summaryrefslogtreecommitdiff
path: root/po/cy.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2011-02-11 09:08:37 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2011-02-11 09:08:37 +0100
commit5645e8b1cebb57134df717b8339248811cb762f2 (patch)
tree8846e3f411cea65217944154e6da70c11b00dbaa /po/cy.po
parent86e2dc4dd728924d71995ebaeb83a4d9abba94d5 (diff)
parent1dda80929fcd62c287a84f1ecc1277fc39890efe (diff)
merged from debian-sid
Diffstat (limited to 'po/cy.po')
-rw-r--r--po/cy.po398
1 files changed, 204 insertions, 194 deletions
diff --git a/po/cy.po b/po/cy.po
index 3bd7e8755..b6944bdeb 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: 2010-09-28 17:23+0200\n"
+"POT-Creation-Date: 2011-01-12 17:42+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"
@@ -168,7 +168,7 @@ 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-get.cc:2793 cmdline/apt-sortpkgs.cc:144
#, 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"
@@ -746,12 +746,12 @@ msgstr "Caiff y pecynnau canlynol eu ISRADDIO"
msgid "The following held packages will be changed:"
msgstr "Caiff y pecynnau wedi eu dal canlynol eu newid:"
-#: cmdline/apt-get.cc:561
+#: cmdline/apt-get.cc:563
#, c-format
msgid "%s (due to %s) "
msgstr "%s (oherwydd %s) "
-#: cmdline/apt-get.cc:569
+#: cmdline/apt-get.cc:571
#, fuzzy
msgid ""
"WARNING: The following essential packages will be removed.\n"
@@ -761,66 +761,61 @@ msgstr ""
"NI DDYLIR gwneud hyn os nad ydych chi'n gwybod yn union beth rydych chi'n\n"
"ei wneud!"
-#: cmdline/apt-get.cc:603
+#: cmdline/apt-get.cc:605
#, c-format
msgid "%lu upgraded, %lu newly installed, "
msgstr "%lu wedi uwchraddio, %lu newydd eu sefydlu, "
-#: cmdline/apt-get.cc:607
+#: cmdline/apt-get.cc:609
#, c-format
msgid "%lu reinstalled, "
msgstr "%lu wedi ailsefydlu, "
-#: cmdline/apt-get.cc:609
+#: cmdline/apt-get.cc:611
#, c-format
msgid "%lu downgraded, "
msgstr "%lu wedi eu israddio, "
-#: cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:613
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
msgstr "%lu i'w tynnu a %lu heb eu uwchraddio.\n"
-#: cmdline/apt-get.cc:615
+#: cmdline/apt-get.cc:617
#, c-format
msgid "%lu not fully installed or removed.\n"
msgstr "%lu heb eu sefydlu na tynnu'n gyflawn.\n"
-#: cmdline/apt-get.cc:635
+#: cmdline/apt-get.cc:639
#, fuzzy, c-format
msgid "Note, selecting '%s' for task '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:641
+#: cmdline/apt-get.cc:645
#, fuzzy, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
-#: cmdline/apt-get.cc:648
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
-
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:662
#, c-format
msgid "Package %s is a virtual package provided by:\n"
msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:673
msgid " [Installed]"
msgstr " [Sefydliwyd]"
-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:682
#, fuzzy
msgid " [Not candidate version]"
msgstr "Fersiynau Posib"
-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:684
msgid "You should explicitly select one to install."
msgstr "Dylech ddewis un yn benodol i'w sefydlu."
# FIXME: punctuation
-#: cmdline/apt-get.cc:683
+#: cmdline/apt-get.cc:687
#, fuzzy, c-format
msgid ""
"Package %s is not available, but is referred to by another package.\n"
@@ -832,171 +827,181 @@ msgstr ""
"gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
"ffeil sources.list.\n"
-#: cmdline/apt-get.cc:701
+#: cmdline/apt-get.cc:705
msgid "However the following packages replace it:"
msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
-#: cmdline/apt-get.cc:713
+#: cmdline/apt-get.cc:717
#, fuzzy, c-format
msgid "Package '%s' has no installation candidate"
msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
-#: cmdline/apt-get.cc:724
+#: cmdline/apt-get.cc:728
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
msgstr ""
-#: cmdline/apt-get.cc:755
+#: cmdline/apt-get.cc:759
#, fuzzy, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
-#: cmdline/apt-get.cc:785
+#: cmdline/apt-get.cc:789
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: cmdline/apt-get.cc:789
+#: cmdline/apt-get.cc:793
#, fuzzy, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
-#: cmdline/apt-get.cc:799
+#: cmdline/apt-get.cc:803
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
-#: cmdline/apt-get.cc:804
+#: cmdline/apt-get.cc:808
#, c-format
msgid "%s is already the newest version.\n"
msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
-#: cmdline/apt-get.cc:823 cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
#, fuzzy, c-format
msgid "%s set to manually installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:863
+#: cmdline/apt-get.cc:853
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#: cmdline/apt-get.cc:858
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
+
+#: cmdline/apt-get.cc:898
#, c-format
msgid "Package %s is not installed, so not removed\n"
msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
-#: cmdline/apt-get.cc:938
+#: cmdline/apt-get.cc:973
msgid "Correcting dependencies..."
msgstr "Yn cywiro dibyniaethau..."
-#: cmdline/apt-get.cc:941
+#: cmdline/apt-get.cc:976
msgid " failed."
msgstr " wedi methu."
-#: cmdline/apt-get.cc:944
+#: cmdline/apt-get.cc:979
msgid "Unable to correct dependencies"
msgstr "Ni ellir cywiro dibyniaethau"
-#: cmdline/apt-get.cc:947
+#: cmdline/apt-get.cc:982
msgid "Unable to minimize the upgrade set"
msgstr "Ni ellir bychanu y set uwchraddio"
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:984
msgid " Done"
msgstr " Wedi Gorffen"
-#: cmdline/apt-get.cc:953
+#: cmdline/apt-get.cc:988
msgid "You might want to run 'apt-get -f install' to correct these."
msgstr "Efallai hoffech rhedeg 'apt-get -f install' er mwyn cywiro'r rhain."
-#: cmdline/apt-get.cc:956
+#: cmdline/apt-get.cc:991
msgid "Unmet dependencies. Try using -f."
msgstr "Dibyniaethau heb eu bodloni. Ceisiwch ddefnyddio -f."
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:1016
#, fuzzy
msgid "WARNING: The following packages cannot be authenticated!"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:985
+#: cmdline/apt-get.cc:1020
msgid "Authentication warning overridden.\n"
msgstr ""
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:1027
msgid "Install these packages without verification [y/N]? "
msgstr ""
-#: cmdline/apt-get.cc:994
+#: cmdline/apt-get.cc:1029
#, fuzzy
msgid "Some packages could not be authenticated"
msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199
msgid "There are problems and -y was used without --force-yes"
msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
-#: cmdline/apt-get.cc:1044
+#: cmdline/apt-get.cc:1079
msgid "Internal error, InstallPackages was called with broken packages!"
msgstr ""
-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1088
#, fuzzy
msgid "Packages need to be removed but remove is disabled."
msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
-#: cmdline/apt-get.cc:1064
+#: cmdline/apt-get.cc:1099
#, fuzzy
msgid "Internal error, Ordering didn't finish"
msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1137
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
+#: cmdline/apt-get.cc:1144
#, 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
+#: cmdline/apt-get.cc:1149
#, 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
+#: cmdline/apt-get.cc:1156
#, 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
+#: cmdline/apt-get.cc:1161
#, 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
+#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
+#: cmdline/apt-get.cc:2370
#, fuzzy, c-format
msgid "Couldn't determine free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1189
#, c-format
msgid "You don't have enough free space in %s."
msgstr "Does dim digon o le rhydd gennych yn %s."
-#: cmdline/apt-get.cc:1172 cmdline/apt-get.cc:1192
+#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225
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
+#: cmdline/apt-get.cc:1207
msgid "Yes, do as I say!"
msgstr "Ie, gwna fel rydw i'n dweud!"
-#: cmdline/apt-get.cc:1176
+#: cmdline/apt-get.cc:1209
#, fuzzy, c-format
msgid ""
"You are about to do something potentially harmful.\n"
@@ -1007,29 +1012,29 @@ msgstr ""
"Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
" ?]"
-#: cmdline/apt-get.cc:1182 cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234
msgid "Abort."
msgstr "Erthylu."
-#: cmdline/apt-get.cc:1197
+#: cmdline/apt-get.cc:1230
#, fuzzy
msgid "Do you want to continue [Y/n]? "
msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
-#: cmdline/apt-get.cc:1269 cmdline/apt-get.cc:2392 apt-pkg/algorithms.cc:1462
+#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Methwyd cyrchu %s %s\n"
-#: cmdline/apt-get.cc:1287
+#: cmdline/apt-get.cc:1320
msgid "Some files failed to download"
msgstr "Methodd rhai ffeiliau lawrlwytho"
-#: cmdline/apt-get.cc:1288 cmdline/apt-get.cc:2401
+#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436
msgid "Download complete and in download only mode"
msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
-#: cmdline/apt-get.cc:1294
+#: cmdline/apt-get.cc:1327
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
@@ -1037,20 +1042,20 @@ msgstr ""
"Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
"geidio defnyddio --fix-missing?"
-#: cmdline/apt-get.cc:1298
+#: cmdline/apt-get.cc:1331
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
+#: cmdline/apt-get.cc:1336
msgid "Unable to correct missing packages."
msgstr "Ni ellir cywiro pecynnau ar goll."
-#: cmdline/apt-get.cc:1304
+#: cmdline/apt-get.cc:1337
#, fuzzy
msgid "Aborting install."
msgstr "Yn Erthylu'r Sefydliad."
-#: cmdline/apt-get.cc:1332
+#: cmdline/apt-get.cc:1365
msgid ""
"The following package disappeared from your system as\n"
"all files have been overwritten by other packages:"
@@ -1060,57 +1065,35 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
-#: cmdline/apt-get.cc:1336
+#: cmdline/apt-get.cc:1369
msgid "Note: This is done automatic and on purpose by dpkg."
msgstr ""
-#: cmdline/apt-get.cc:1466
+#: cmdline/apt-get.cc:1499
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1531
#, fuzzy, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1536
+#: cmdline/apt-get.cc:1569
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1552
+#: cmdline/apt-get.cc:1585
msgid "The update command takes no arguments"
msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
-#: cmdline/apt-get.cc:1618
+#: cmdline/apt-get.cc:1647
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
+#: cmdline/apt-get.cc:1699
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1126,26 +1109,48 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1680 cmdline/apt-get.cc:1822
+#: cmdline/apt-get.cc:1702 cmdline/apt-get.cc:1858
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
+#: cmdline/apt-get.cc:1706
#, fuzzy
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1703
+#: cmdline/apt-get.cc:1713
+#, 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:1717
+#, 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:1719
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1738
#, fuzzy
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1828
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
+#: cmdline/apt-get.cc:1831
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1154,7 +1159,7 @@ msgstr ""
"pecyn (neu penodwch ddatrys)"
# FIXME: needs commas
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1843
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"
@@ -1166,71 +1171,71 @@ msgstr ""
"ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
"heb gael eu symud allan o Incoming."
-#: cmdline/apt-get.cc:1825
+#: cmdline/apt-get.cc:1861
msgid "Broken packages"
msgstr "Pecynnau wedi torri"
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1889
msgid "The following extra packages will be installed:"
msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
-#: cmdline/apt-get.cc:1944
+#: cmdline/apt-get.cc:1979
msgid "Suggested packages:"
msgstr "Pecynnau a awgrymmir:"
-#: cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:1980
msgid "Recommended packages:"
msgstr "Pecynnau a argymhellir:"
-#: cmdline/apt-get.cc:1987
+#: cmdline/apt-get.cc:2022
#, c-format
msgid "Couldn't find package %s"
msgstr "Methwyd canfod pecyn %s"
-#: cmdline/apt-get.cc:1994
+#: cmdline/apt-get.cc:2029
#, fuzzy, c-format
msgid "%s set to automatically installed.\n"
msgstr "ond mae %s yn mynd i gael ei sefydlu"
-#: cmdline/apt-get.cc:2015
+#: cmdline/apt-get.cc:2050
#, fuzzy
msgid "Calculating upgrade... "
msgstr "Yn Cyfrifo'r Uwchraddiad... "
-#: cmdline/apt-get.cc:2018 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111
msgid "Failed"
msgstr "Methwyd"
-#: cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:2058
msgid "Done"
msgstr "Wedi Gorffen"
-#: cmdline/apt-get.cc:2090 cmdline/apt-get.cc:2098
+#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133
#, fuzzy
msgid "Internal error, problem resolver broke stuff"
msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
-#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2155
+#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
msgid "Unable to lock the download directory"
msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
-#: cmdline/apt-get.cc:2198
+#: cmdline/apt-get.cc:2233
msgid "Must specify at least one package to fetch source for"
msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
-#: cmdline/apt-get.cc:2238 cmdline/apt-get.cc:2519
+#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2289
#, c-format
msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2294
#, c-format
msgid ""
"Please use:\n"
@@ -1238,79 +1243,79 @@ msgid ""
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2345
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2345
+#: cmdline/apt-get.cc:2380
#, c-format
msgid "You don't have enough free space in %s"
msgstr "Does dim digon o le rhydd yn %s gennych"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2353
+#: cmdline/apt-get.cc:2388
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
#. TRANSLATOR: The required space between number and unit is already included
#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2358
+#: cmdline/apt-get.cc:2393
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
-#: cmdline/apt-get.cc:2364
+#: cmdline/apt-get.cc:2399
#, fuzzy, c-format
msgid "Fetch source %s\n"
msgstr "Cyrchu Ffynhonell %s\n"
-#: cmdline/apt-get.cc:2397
+#: cmdline/apt-get.cc:2432
msgid "Failed to fetch some archives."
msgstr "Methwyd cyrchu rhai archifau."
-#: cmdline/apt-get.cc:2427
+#: cmdline/apt-get.cc:2462
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
-#: cmdline/apt-get.cc:2439
+#: cmdline/apt-get.cc:2474
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
-#: cmdline/apt-get.cc:2440
+#: cmdline/apt-get.cc:2475
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
msgstr ""
-#: cmdline/apt-get.cc:2457
+#: cmdline/apt-get.cc:2492
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
-#: cmdline/apt-get.cc:2477
+#: cmdline/apt-get.cc:2512
msgid "Child process failed"
msgstr "Methodd proses plentyn"
-#: cmdline/apt-get.cc:2493
+#: cmdline/apt-get.cc:2528
msgid "Must specify at least one package to check builddeps for"
msgstr ""
"Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
-#: cmdline/apt-get.cc:2524
+#: cmdline/apt-get.cc:2559
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
-#: cmdline/apt-get.cc:2544
+#: cmdline/apt-get.cc:2579
#, c-format
msgid "%s has no build depends.\n"
msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
-#: cmdline/apt-get.cc:2595
+#: cmdline/apt-get.cc:2630
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1319,7 +1324,7 @@ msgstr ""
"Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn "
"%s"
-#: cmdline/apt-get.cc:2648
+#: cmdline/apt-get.cc:2683
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1328,34 +1333,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:2684
+#: cmdline/apt-get.cc:2719
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
"Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
"newydd"
-#: cmdline/apt-get.cc:2711
+#: cmdline/apt-get.cc:2746
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
-#: cmdline/apt-get.cc:2727
+#: cmdline/apt-get.cc:2762
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
-#: cmdline/apt-get.cc:2732
+#: cmdline/apt-get.cc:2767
msgid "Failed to process build dependencies"
msgstr "Methwyd prosesu dibyniaethau adeiladu"
-#: cmdline/apt-get.cc:2763
+#: cmdline/apt-get.cc:2798
#, fuzzy
msgid "Supported modules:"
msgstr "Modylau a Gynhelir:"
# FIXME: split
-#: cmdline/apt-get.cc:2804
+#: cmdline/apt-get.cc:2839
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1442,7 +1447,7 @@ msgstr ""
"\n"
" Mae gan yr APT hwn bŵerau buwch hudol.\n"
-#: cmdline/apt-get.cc:2960
+#: cmdline/apt-get.cc:2995
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1450,33 +1455,33 @@ msgid ""
" so don't depend on the relevance to the real current situation!"
msgstr ""
-#: cmdline/acqprogress.cc:55
+#: cmdline/acqprogress.cc:57
msgid "Hit "
msgstr "Presennol "
-#: cmdline/acqprogress.cc:79
+#: cmdline/acqprogress.cc:81
msgid "Get:"
msgstr "Cyrchu:"
-#: cmdline/acqprogress.cc:110
+#: cmdline/acqprogress.cc:112
msgid "Ign "
msgstr "Anwybyddu "
-#: cmdline/acqprogress.cc:114
+#: cmdline/acqprogress.cc:116
msgid "Err "
msgstr "Gwall "
-#: cmdline/acqprogress.cc:135
+#: cmdline/acqprogress.cc:137
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
msgstr "Cyrchwyd %sB yn %s (%sB/s)\n"
-#: cmdline/acqprogress.cc:225
+#: cmdline/acqprogress.cc:227
#, c-format
msgid " [Working]"
msgstr " [Gweithio]"
-#: cmdline/acqprogress.cc:271
+#: cmdline/acqprogress.cc:283
#, fuzzy, c-format
msgid ""
"Media change: please insert the disc labeled\n"
@@ -1697,7 +1702,7 @@ 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/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
#: methods/mirror.cc:87
@@ -1958,7 +1963,7 @@ msgstr "Goramser cysylltu"
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
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:802 methods/rsh.cc:190
msgid "Read error"
msgstr "Gwall darllen"
@@ -1970,7 +1975,7 @@ msgstr "Gorlifodd ateb y byffer."
msgid "Protocol corruption"
msgstr "Llygr protocol"
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:826 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:844 methods/rsh.cc:232
msgid "Write error"
msgstr "Gwall ysgrifennu"
@@ -2454,74 +2459,79 @@ msgstr "Ddim yn cloi'r ffeil clo ar NFS %s"
msgid "Could not get lock %s"
msgstr "Methwyd cael y clo %s"
-#: apt-pkg/contrib/fileutl.cc:643
+#: apt-pkg/contrib/fileutl.cc:321
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:661
#, fuzzy, c-format
msgid "Waited for %s but it wasn't there"
msgstr "Arhoswyd am %s ond nid oedd e yna"
-#: apt-pkg/contrib/fileutl.cc:655
+#: apt-pkg/contrib/fileutl.cc:673
#, c-format
msgid "Sub-process %s received a segmentation fault."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:657
+#: apt-pkg/contrib/fileutl.cc:675
#, fuzzy, c-format
msgid "Sub-process %s received signal %u."
msgstr "Derbyniodd is-broses %s wall segmentu."
-#: apt-pkg/contrib/fileutl.cc:661
+#: apt-pkg/contrib/fileutl.cc:679
#, c-format
msgid "Sub-process %s returned an error code (%u)"
msgstr "Dychwelodd is-broses %s gôd gwall (%u)"
-#: apt-pkg/contrib/fileutl.cc:663
+#: apt-pkg/contrib/fileutl.cc:681
#, c-format
msgid "Sub-process %s exited unexpectedly"
msgstr "Gorffenodd is-broses %s yn annisgwyl"
-#: apt-pkg/contrib/fileutl.cc:728
+#: apt-pkg/contrib/fileutl.cc:746
#, c-format
msgid "Could not open file %s"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/contrib/fileutl.cc:745
+#: apt-pkg/contrib/fileutl.cc:763
#, fuzzy, c-format
msgid "Could not open file descriptor %d"
msgstr "Methwyd agor pibell ar gyfer %s"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:805
+#: apt-pkg/contrib/fileutl.cc:823
#, c-format
msgid "read, still have %lu to read but none left"
msgstr "o hyd %lu i ddarllen ond dim ar ôl"
# FIXME
-#: apt-pkg/contrib/fileutl.cc:838
+#: apt-pkg/contrib/fileutl.cc:856
#, c-format
msgid "write, still have %lu to write but couldn't"
msgstr "o hyd %lu i ysgrifennu ond methwyd"
-#: apt-pkg/contrib/fileutl.cc:937
+#: apt-pkg/contrib/fileutl.cc:985
#, fuzzy, c-format
msgid "Problem closing the gzip file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:940
+#: apt-pkg/contrib/fileutl.cc:988
#, fuzzy, c-format
msgid "Problem closing the file %s"
msgstr "Gwall wrth gau'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:945
+#: apt-pkg/contrib/fileutl.cc:993
#, fuzzy, c-format
msgid "Problem renaming the file %s to %s"
msgstr "Gwall wrth gyfamseru'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:956
+#: apt-pkg/contrib/fileutl.cc:1004
#, fuzzy, c-format
msgid "Problem unlinking the file %s"
msgstr "Gwall wrth dadgysylltu'r ffeil"
-#: apt-pkg/contrib/fileutl.cc:969
+#: apt-pkg/contrib/fileutl.cc:1017
msgid "Problem syncing the file"
msgstr "Gwall wrth gyfamseru'r ffeil"
@@ -2603,37 +2613,37 @@ msgstr "opsiynnol"
msgid "extra"
msgstr "ychwanegol"
-#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
#, fuzzy
msgid "Building dependency tree"
msgstr "Yn Aideladu Coeden Dibyniaeth"
-#: apt-pkg/depcache.cc:125
+#: apt-pkg/depcache.cc:126
#, fuzzy
msgid "Candidate versions"
msgstr "Fersiynau Posib"
-#: apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:155
#, fuzzy
msgid "Dependency generation"
msgstr "Cynhyrchaid Dibyniaeth"
-#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
+#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
#, fuzzy
msgid "Reading state information"
msgstr "Yn cyfuno manylion Ar Gael"
-#: apt-pkg/depcache.cc:236
+#: apt-pkg/depcache.cc:237
#, fuzzy, c-format
msgid "Failed to open StateFile %s"
msgstr "Methwyd agor %s"
-#: apt-pkg/depcache.cc:242
+#: apt-pkg/depcache.cc:243
#, fuzzy, c-format
msgid "Failed to write temporary StateFile %s"
msgstr "Methwyd ysgrifennu ffeil %s"
-#: apt-pkg/depcache.cc:921
+#: apt-pkg/depcache.cc:922
#, c-format
msgid "Internal error, group '%s' has no installable pseudo package"
msgstr ""
@@ -2763,7 +2773,7 @@ msgstr ""
"Mae angen ailsefydlu'r pecyn %s, ond dydw i ddim yn gallu canfod archif ar "
"ei gyfer."
-#: apt-pkg/algorithms.cc:1210
+#: apt-pkg/algorithms.cc:1218
msgid ""
"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
"held packages."
@@ -2771,12 +2781,12 @@ msgstr ""
"Gwall: Cynhyrchodd pkgProblemResolver::Resolve doriadau. Fe all hyn fod wedi "
"ei achosi gan pecynnau wedi eu dal."
-#: apt-pkg/algorithms.cc:1212
+#: apt-pkg/algorithms.cc:1220
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
"Ni ellir cywiro'r problemau gan eich bod chi wedi dal pecynnau torredig."
-#: apt-pkg/algorithms.cc:1488 apt-pkg/algorithms.cc:1490
+#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
@@ -3219,7 +3229,7 @@ msgstr "Methwyd canfod pecyn %s"
#: apt-pkg/cacheset.cc:467
#, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
msgstr ""
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
@@ -3249,12 +3259,12 @@ msgstr ""
msgid "Installing %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:822
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
#, fuzzy, c-format
msgid "Configuring %s"
msgstr "Yn cysylltu i %s"
-#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:829
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
#, fuzzy, c-format
msgid "Removing %s"
msgstr "Yn agor %s"
@@ -3280,87 +3290,87 @@ msgstr ""
msgid "Directory '%s' missing"
msgstr "Mae'r cyfeiriadur rhestrau %spartial ar goll."
-#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675
#, fuzzy, c-format
msgid "Could not open file '%s'"
msgstr "Methwyd agor ffeil %s"
-#: apt-pkg/deb/dpkgpm.cc:815
+#: apt-pkg/deb/dpkgpm.cc:816
#, fuzzy, c-format
msgid "Preparing %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:816
+#: apt-pkg/deb/dpkgpm.cc:817
#, fuzzy, c-format
msgid "Unpacking %s"
msgstr "Yn agor %s"
-#: apt-pkg/deb/dpkgpm.cc:821
+#: apt-pkg/deb/dpkgpm.cc:822
#, fuzzy, c-format
msgid "Preparing to configure %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:823
+#: apt-pkg/deb/dpkgpm.cc:824
#, fuzzy, c-format
msgid "Installed %s"
msgstr " Wedi Sefydlu: "
-#: apt-pkg/deb/dpkgpm.cc:828
+#: apt-pkg/deb/dpkgpm.cc:829
#, c-format
msgid "Preparing for removal of %s"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:830
+#: apt-pkg/deb/dpkgpm.cc:831
#, fuzzy, c-format
msgid "Removed %s"
msgstr "Argymell"
-#: apt-pkg/deb/dpkgpm.cc:835
+#: apt-pkg/deb/dpkgpm.cc:836
#, fuzzy, c-format
msgid "Preparing to completely remove %s"
msgstr "Yn agor y ffeil cyfluniad %s"
-#: apt-pkg/deb/dpkgpm.cc:836
+#: apt-pkg/deb/dpkgpm.cc:837
#, fuzzy, c-format
msgid "Completely removed %s"
msgstr "Methwyd dileu %s"
-#: apt-pkg/deb/dpkgpm.cc:1042
+#: apt-pkg/deb/dpkgpm.cc:1043
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1073
+#: apt-pkg/deb/dpkgpm.cc:1074
msgid "Running dpkg"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1276
+#: apt-pkg/deb/dpkgpm.cc:1277
msgid "No apport report written because MaxReports is reached already"
msgstr ""
#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1281
+#: apt-pkg/deb/dpkgpm.cc:1282
msgid "dependency problems - leaving unconfigured"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1283
+#: apt-pkg/deb/dpkgpm.cc:1284
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1289
+#: apt-pkg/deb/dpkgpm.cc:1290
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1295
+#: apt-pkg/deb/dpkgpm.cc:1296
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
-#: apt-pkg/deb/dpkgpm.cc:1302
+#: apt-pkg/deb/dpkgpm.cc:1303
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""