sync with code

1 files changed, 135 insertions, 119 deletions

diff --git a/po/cy.po b/po/cy.po
index 5a6109fa..b89be68d 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-01 22:05+0200\n"
+"POT-Creation-Date: 2008-09-20 18:52+0200\n"
 "PO-Revision-Date: 2008-03-17 22:18+0100\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Poedit-Country: UK\n"
 "Plural-Forms: nplurals=2; plural=(n == 2) ? 1 : 0;\n"
 
-#: ../MandrivaUpdate:86 ../Rpmdrake/gui.pm:793
+#: ../MandrivaUpdate:104 ../Rpmdrake/gui.pm:858
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -826,34 +826,7 @@ msgstr ""
 msgid "Edit"
 msgstr "Golygu"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1134 ../Rpmdrake/init.pm:156
-#: ../gurpmi.addmedia:103
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"Parhau?"
-
-#: ../Rpmdrake/edit_urpm_sources.pm:1137
-#, c-format
-msgid ""
-"Welcome to the Software Media Manager!\n"
-"\n"
-"This tool will help you configure the packages media you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Croeso i'r Rheolwr Cyfrwng Pecynnau!\n"
-"\n"
-"Bydd yr offeryn yn eich cynorthwyo i ffurfweddu cyfrwng y pecynnau\n"
-"rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod fel\n"
-"pecynnau newydd neu er mwyn diweddaru."
-
-#: ../Rpmdrake/edit_urpm_sources.pm:1154
+#: ../Rpmdrake/edit_urpm_sources.pm:1142
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -907,22 +880,22 @@ msgstr "Diweddariadau diogelwch"
 msgid "No description"
 msgstr "Dim disgrifiad"
 
-#: ../Rpmdrake/gui.pm:140
-#, c-format
-msgid "Details:"
-msgstr "Manylion:"
-
-#: ../Rpmdrake/gui.pm:143 ../Rpmdrake/gui.pm:192
+#: ../Rpmdrake/gui.pm:169 ../Rpmdrake/gui.pm:236
 #, c-format
 msgid "Version: "
 msgstr "Fersiwn: "
 
-#: ../Rpmdrake/gui.pm:146 ../Rpmdrake/gui.pm:187
+#: ../Rpmdrake/gui.pm:172 ../Rpmdrake/gui.pm:231
 #, c-format
 msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
-#: ../Rpmdrake/gui.pm:149 ../Rpmdrake/gui.pm:193
+#: ../Rpmdrake/gui.pm:175
+#, fuzzy, c-format
+msgid "Group: "
+msgstr "Grŵp"
+
+#: ../Rpmdrake/gui.pm:176 ../Rpmdrake/gui.pm:237
 #, c-format
 msgid "Architecture: "
 msgstr "Pensaernïaeth:"
@@ -942,7 +915,17 @@ msgstr "%s KB"
 msgid "Medium: "
 msgstr "Cyfrwng:"
 
-#: ../Rpmdrake/gui.pm:157
+#: ../Rpmdrake/gui.pm:189
+#, fuzzy, c-format
+msgid "URL: "
+msgstr "URL:"
+
+#: ../Rpmdrake/gui.pm:197
+#, c-format
+msgid "Details:"
+msgstr "Manylion:"
+
+#: ../Rpmdrake/gui.pm:201
 #, c-format
 msgid "Files:"
 msgstr "Ffeiliau:"
@@ -1219,7 +1202,12 @@ msgstr "Popeth"
 msgid "Upgradable"
 msgstr "Diweddariadwy"
 
-#: ../Rpmdrake/gui.pm:825 ../rpmdrake:187
+#: ../Rpmdrake/gui.pm:894 ../rpmdrake:355
+#, c-format
+msgid "Installed"
+msgstr "Gosodwyd"
+
+#: ../Rpmdrake/gui.pm:895 ../rpmdrake:193
 #, c-format
 msgid "Addable"
 msgstr "Ychwanegadwy"
@@ -1888,7 +1876,14 @@ msgstr ""
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update    peidio diweddaru cyfrwng wrth gychwyn"
 
-#: ../Rpmdrake/init.pm:57
+#: ../Rpmdrake/init.pm:58
+#, fuzzy, c-format
+msgid ""
+"  --no-splash            don't ask first confirmation question in update mode"
+msgstr ""
+"  --no-confirmation      peidio gofyn cwestiwn cadarnhau ym modd diweddaru"
+
+#: ../Rpmdrake/init.pm:59
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        peidio gwirio llofnod pecynnau"
@@ -1968,52 +1963,7 @@ msgstr ""
 msgid "Welcome"
 msgstr "Croeso"
 
-#: ../Rpmdrake/init.pm:160
-#, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"Croeso i'r offeryn tynnu meddalwedd!\n"
-"\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
-"am ei dynnu oddi ar eich cyfrifiadur."
-
-#: ../Rpmdrake/init.pm:165
-#, c-format
-msgid ""
-"Welcome to %s!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Croeso i %s!\n"
-"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
-"ar eich cyfrifiadur."
-
-#: ../Rpmdrake/init.pm:170
-#, c-format
-msgid "Welcome to the software installation tool!"
-msgstr "Croeso i'r offeryn gosod meddalwedd!"
-
-#: ../Rpmdrake/init.pm:171
-#, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandriva Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"Croeso i'r offeryn gosod meddalwedd!\n"
-"\n"
-"Mae eich system Mandriva Linux yn cynnwys rhai miloedd o becynnau\n"
-"meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
-"i ddewis pa feddalwedd i osod ar eich cyfrifiadur."
-
-#: ../Rpmdrake/init.pm:182
+#: ../Rpmdrake/init.pm:166
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr "Mae'r offeryn gosod meddalwedd yn gallu gosod ffynonellau cyfryngau"
@@ -2181,7 +2131,13 @@ msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 msgid "Please wait, listing base packages..."
 msgstr "Arhoswch, rhestri pecynnau sail..."
 
-#: ../Rpmdrake/pkg.pm:371
+#: ../Rpmdrake/pkg.pm:393 ../Rpmdrake/pkg.pm:810 ../Rpmdrake/pkg.pm:833
+#: ../rpmdrake.pm:770 ../rpmdrake.pm:857 ../rpmdrake.pm:881
+#, c-format
+msgid "Error"
+msgstr "Gwall"
+
+#: ../Rpmdrake/pkg.pm:401
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Arhoswch, canfod pecynnau sydd wedi eu gosod..."
@@ -2294,7 +2250,19 @@ msgstr "Bydd %s o becynnau'n cael eu hadfer"
 msgid "Is it ok to continue?"
 msgstr "Ydi hi'n iawn parhau?"
 
-#: ../Rpmdrake/pkg.pm:657
+#: ../Rpmdrake/pkg.pm:701 ../Rpmdrake/pkg.pm:868
+#, fuzzy, c-format
+msgid "Orphan packages"
+msgstr "Pecynnau meta"
+
+#: ../Rpmdrake/pkg.pm:701
+#, fuzzy, c-format
+msgid "The following orphan package will be removed."
+msgid_plural "The following orphan packages will be removed."
+msgstr[0] "Mae angen y pecyn canlynol:"
+msgstr[1] "Mae angen y pecyn canlynol:"
+
+#: ../Rpmdrake/pkg.pm:715
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod..."
@@ -2334,13 +2302,7 @@ msgstr "Gwirio llofnodion pecynnau ..."
 msgid "%d installation transactions failed"
 msgstr "Methodd trafod gosod %d"
 
-#: ../Rpmdrake/pkg.pm:746 ../Rpmdrake/pkg.pm:769 ../rpmdrake.pm:746
-#: ../rpmdrake.pm:833 ../rpmdrake.pm:857
-#, c-format
-msgid "Error"
-msgstr "Gwall"
-
-#: ../Rpmdrake/pkg.pm:747
+#: ../Rpmdrake/pkg.pm:811
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Gwall anadferadwy: dim pecyn wedi ei ganfod ar gyfer y gosod."
@@ -2458,12 +2420,18 @@ msgstr "Arhoswch, chwilio..."
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "cyfeiriadur <url> gwallus (rhaid i'r llwybr fod yn absoliwt)"
 
-#: ../gurpmi.addmedia:93
+#: ../gurpmi.addmedia:113
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"%s\n"
+"\n"
+"Parhau?"
 
-#: ../gurpmi.addmedia:107
+#: ../gurpmi.addmedia:117
 #, c-format
 msgid ""
 "You are about to add new packages media, %s.\n"
@@ -2500,7 +2468,12 @@ msgstr "Llwyddiant wrth ychwanegu cyfrwng '%s'"
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
-#: ../rpmdrake:98
+#: ../rpmdrake:67
+#, c-format
+msgid "Search results (none)"
+msgstr "Canlyniadau'r chwilio (dim)"
+
+#: ../rpmdrake:100
 #, c-format
 msgid "Stop"
 msgstr "Atal"
@@ -2525,12 +2498,7 @@ msgstr "Dewiswyd"
 msgid "Not selected"
 msgstr "Heb ei ddewis"
 
-#: ../rpmdrake:198
-#, c-format
-msgid "Search results (none)"
-msgstr "Canlyniadau'r chwilio (dim)"
-
-#: ../rpmdrake:219
+#: ../rpmdrake:231
 #, c-format
 msgid "Selected: %s / Free disk space: %s"
 msgstr "Dewiswyd: %s / Lle gwag ar ddisg: %s"
@@ -2552,12 +2520,7 @@ msgstr "Arch."
 msgid "Status"
 msgstr "Statws"
 
-#: ../rpmdrake:343
-#, c-format
-msgid "Installed"
-msgstr "Gosodwyd"
-
-#: ../rpmdrake:344
+#: ../rpmdrake:356
 #, c-format
 msgid "Not installed"
 msgstr "Heb eu gosod"
@@ -2644,12 +2607,7 @@ msgstr "Golwg"
 msgid "Filter"
 msgstr "Hidl"
 
-#: ../rpmdrake:445
-#, c-format
-msgid "Tree Mode"
-msgstr "Modd Coeden"
-
-#: ../rpmdrake:468
+#: ../rpmdrake:477
 #, c-format
 msgid "in names"
 msgstr "mewn enwau"
@@ -3252,6 +3210,64 @@ msgstr "Ychwanegu cyfrwng urpmi"
 msgid "Urpmi medium info"
 msgstr "Gwybodaeth cyfrwng urpmi"
 
+#~ msgid ""
+#~ "Welcome to the Software Media Manager!\n"
+#~ "\n"
+#~ "This tool will help you configure the packages media you wish to use on\n"
+#~ "your computer. They will then be available to install new software "
+#~ "package\n"
+#~ "or to perform updates."
+#~ msgstr ""
+#~ "Croeso i'r Rheolwr Cyfrwng Pecynnau!\n"
+#~ "\n"
+#~ "Bydd yr offeryn yn eich cynorthwyo i ffurfweddu cyfrwng y pecynnau\n"
+#~ "rydych am eu defnyddio ar eich cyfrifiadur. Byddant ar gael i'w gosod "
+#~ "fel\n"
+#~ "pecynnau newydd neu er mwyn diweddaru."
+
+#~ msgid ""
+#~ "Welcome to the software removal tool!\n"
+#~ "\n"
+#~ "This tool will help you choose which software you want to remove from\n"
+#~ "your computer."
+#~ msgstr ""
+#~ "Croeso i'r offeryn tynnu meddalwedd!\n"
+#~ "\n"
+#~ "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis pa feddalwedd rydych\n"
+#~ "am ei dynnu oddi ar eich cyfrifiadur."
+
+#~ msgid ""
+#~ "Welcome to %s!\n"
+#~ "\n"
+#~ "This tool will help you choose the updates you want to install on your\n"
+#~ "computer."
+#~ msgstr ""
+#~ "Croeso i %s!\n"
+#~ "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
+#~ "ar eich cyfrifiadur."
+
+#~ msgid "Welcome to the software installation tool!"
+#~ msgstr "Croeso i'r offeryn gosod meddalwedd!"
+
+#~ msgid ""
+#~ "Welcome to the software installation tool!\n"
+#~ "\n"
+#~ "Your Mandriva Linux system comes with several thousands of software\n"
+#~ "packages on CDROM or DVD. This tool will help you choose which software\n"
+#~ "you want to install on your computer."
+#~ msgstr ""
+#~ "Croeso i'r offeryn gosod meddalwedd!\n"
+#~ "\n"
+#~ "Mae eich system Mandriva Linux yn cynnwys rhai miloedd o becynnau\n"
+#~ "meddalwedd ar CDROM neu DVD.  Bydd yr offeryn hwn yn eich cynorthwyo\n"
+#~ "i ddewis pa feddalwedd i osod ar eich cyfrifiadur."
+
+#~ msgid "Unable to add medium, wrong or missing arguments"
+#~ msgstr "Methu ychwanegu cyfrwng, ymresymiadau anghywir neu goll."
+
+#~ msgid "Tree Mode"
+#~ msgstr "Modd Coeden"
+
 #~ msgid "%s choices"
 #~ msgstr "%s dewis"