Merge new strings

1 files changed, 217 insertions, 52 deletions

diff --git a/po/cy.po b/po/cy.po
index 14cfd69d..f6862f80 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-03 13:52+0100\n"
+"POT-Creation-Date: 2005-01-06 15:42+0100\n"
 "PO-Revision-Date: 2005-01-03 19:18-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -79,6 +79,217 @@ msgstr " (Y/n) "
 msgid "%s: command not found\n"
 msgstr "%s: heb ganfod gorchymyn\n"
 
+#: ../gurpmi:99
+#, c-format
+msgid "Please wait..."
+msgstr ""
+
+#: ../gurpmi:110
+#, fuzzy, c-format
+msgid "Unknown option %s"
+msgstr ""
+"\n"
+"dewisiadau anhysbys '%s'\n"
+
+#: ../gurpmi:114
+#, fuzzy, c-format
+msgid "No packages specified"
+msgstr "heb enwi pecyn %s"
+
+#: ../gurpmi:118
+#, c-format
+msgid "Must be root"
+msgstr ""
+
+#: ../gurpmi:128
+#, fuzzy, c-format
+msgid "RPM installation"
+msgstr "Methodd y gosod"
+
+#: ../gurpmi:141
+#, c-format
+msgid ""
+"You have selected a source package:\n"
+"\n"
+"%s\n"
+"\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
+"\n"
+"What would you like to do?"
+msgstr ""
+
+#: ../gurpmi:149
+#, c-format
+msgid ""
+"You are about to install the following software package on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"You may prefer to just save it. What is your choice?"
+msgstr ""
+
+#: ../gurpmi:154
+#, fuzzy, c-format
+msgid ""
+"You are about to install the following software packages on your computer:\n"
+"\n"
+"%s\n"
+"\n"
+"Proceed?"
+msgstr ""
+"Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
+"%s\n"
+
+#: ../gurpmi:164
+#, c-format
+msgid "_Install"
+msgstr ""
+
+#: ../gurpmi:165
+#, c-format
+msgid "_Save"
+msgstr ""
+
+#: ../gurpmi:166 ../gurpmi:229
+#, fuzzy, c-format
+msgid "_Cancel"
+msgstr "Dileu"
+
+#: ../gurpmi:170
+#, c-format
+msgid "Choose location to save file"
+msgstr ""
+
+#: ../gurpmi:220
+#, c-format
+msgid " (to upgrade)"
+msgstr ""
+
+#: ../gurpmi:221
+#, fuzzy, c-format
+msgid " (to install)"
+msgstr "er mwyn gosod %s"
+
+#: ../gurpmi:225 ../urpmi:350
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Mae angen un o'r pecynnau canlynol:"
+
+#: ../gurpmi:230 ../gurpmi:246
+#, fuzzy, c-format
+msgid "_Ok"
+msgstr "Iawn"
+
+#: ../gurpmi:247
+#, c-format
+msgid "_Abort"
+msgstr ""
+
+#: ../gurpmi:276
+#, fuzzy, c-format
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"Nid oes modd gosod rhai pecynnau gofynnwyd amdanynt:\n"
+"%s"
+
+#: ../gurpmi:287
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s\n"
+"Continue?"
+msgstr ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"%s"
+
+#: ../gurpmi:300
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
+"%s\n"
+msgstr ""
+"I fodloni dibyniaethau, bydd y %d pecynnau canlynol yn cael eu gosod (%d MB)"
+
+#: ../gurpmi:307
+#, c-format
+msgid "Package installation..."
+msgstr ""
+
+#: ../gurpmi:309 ../urpmi:483 ../urpmq:302
+#, c-format
+msgid "unable to get source packages, aborting"
+msgstr "methu estyn pecynnau ffynhonnell, atal"
+
+#: ../gurpmi:323 ../urpmi:494
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
+
+#: ../gurpmi:350
+#, fuzzy, c-format
+msgid "Downloading package `%s'..."
+msgstr "tynnu pecyn %s."
+
+#: ../gurpmi:365
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"%s\n"
+"\n"
+"Do you want to continue installation ?"
+msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
+
+#: ../gurpmi:372 ../gurpmi:421 ../urpmi:556 ../urpmi:672
+#, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"Methodd y gosod, mae rhai ffeiliau ar goll:\n"
+"%s\n"
+"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
+
+#: ../gurpmi:379 ../urpme:111 ../urpmi:597
+#, c-format
+msgid "removing %s"
+msgstr "tynnu %s"
+
+#: ../gurpmi:387 ../urpm.pm:2751
+#, c-format
+msgid "Preparing..."
+msgstr "Paratoi..."
+
+#: ../gurpmi:389
+#, c-format
+msgid "Installing package `%s' (%s/%s)..."
+msgstr ""
+
+#: ../gurpmi:407 ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosod"
+
+#: ../gurpmi:416
+#, c-format
+msgid "_Done"
+msgstr ""
+
+#: ../gurpmi:424 ../urpmi:688
+#, c-format
+msgid "The package(s) are already installed"
+msgstr "Popeth wedi eu gosod eisoes"
+
+#: ../gurpmi:426
+#, fuzzy, c-format
+msgid "Installation finished"
+msgstr "Methodd y gosod"
+
 #: ../rpm-find-leaves:12
 #, c-format
 msgid ""
@@ -702,11 +913,6 @@ msgstr "allbwn gwallus: [%s]"
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "adfer ffeiliau rpm o gyfrwng [%s]"
 
-#: ../urpm.pm:2751
-#, c-format
-msgid "Preparing..."
-msgstr "Paratoi..."
-
 #: ../urpm.pm:2789
 #, c-format
 msgid "using process %d for executing transaction"
@@ -933,11 +1139,6 @@ msgstr ""
 msgid " (y/N) "
 msgstr " (y/N) "
 
-#: ../urpme:111 ../urpmi:597
-#, c-format
-msgid "removing %s"
-msgstr "tynnu %s"
-
 #: ../urpme:115
 #, c-format
 msgid "Removing failed"
@@ -1475,11 +1676,6 @@ msgstr ""
 "Gwall: %s i weld wedi ei osod fel darllen yn unig.\n"
 "Defnydd --caniatáu gorfodaeth i orfodi gweithred."
 
-#: ../urpmi:350
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "Mae angen un o'r pecynnau canlynol:"
-
 #: ../urpmi:353
 #, c-format
 msgid "What is your choice? (1-%d) "
@@ -1559,16 +1755,6 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
-#: ../urpmi:483 ../urpmq:302
-#, c-format
-msgid "unable to get source packages, aborting"
-msgstr "methu estyn pecynnau ffynhonnell, atal"
-
-#: ../urpmi:494
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
-
 #: ../urpmi:495
 #, c-format
 msgid "Press Enter when ready..."
@@ -1584,22 +1770,6 @@ msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
 msgid "Do you want to continue installation ?"
 msgstr "Ydych chi am barhau gosod?"
 
-#: ../urpmi:556 ../urpmi:672
-#, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"Methodd y gosod, mae rhai ffeiliau ar goll:\n"
-"%s\n"
-"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-
-#: ../urpmi:566 ../urpmi:610 ../urpmi:631 ../urpmi:651
-#, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
-
 #: ../urpmi:581
 #, c-format
 msgid "distributing %s"
@@ -1635,12 +1805,7 @@ msgstr "methodd trosglwyddiad gosod %d"
 msgid "Installation is possible"
 msgstr "Gosod yn bosibl"
 
-#: ../urpmi:688
-#, c-format
-msgid "The package(s) are already installed"
-msgstr "Popeth wedi eu gosod eisoes"
-
-#: ../urpmi:702
+#: ../urpmi:703
 #, c-format
 msgid "restarting urpmi"
 msgstr "ailgychwyn urpmi"
@@ -1938,10 +2103,10 @@ msgid "enabling media %s"
 msgstr "galluogi cyfrwng %s"
 
 #: ../urpmq:38
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2004 Mandrakesoft.\n"
+"Copyright (C) 2000-2005 Mandrakesoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -2100,12 +2265,12 @@ msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
 msgid "skipping media %s: no hdlist\n"
 msgstr "hepgor cyfrwng %s: dim hdliist\n"
 
-#: ../urpmq:401
+#: ../urpmq:399
 #, c-format
 msgid "No filelist found\n"
 msgstr "Heb ganfod filelist\n"
 
-#: ../urpmq:411
+#: ../urpmq:409
 #, c-format
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"