updated pot file

1 files changed, 39 insertions, 37 deletions

diff --git a/po/cy.po b/po/cy.po
index 8807ee82..db872482 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-30 13:33+0200\n"
+"POT-Creation-Date: 2003-06-13 21:08+0200\n"
 "PO-Revision-Date: 2003-02-17 22:21-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -553,11 +553,6 @@ msgid "Summary: "
 msgstr "Crynodeb: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " gwrthdaro gyda"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "System/Fonts/Type1"
 msgstr ""
@@ -587,21 +582,6 @@ msgstr "Pwysigrwydd: "
 msgid "Unable to create medium."
 msgstr "Methu creu cyfrwng."
 
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
-"\n"
-"%s\n"
-"\n"
-"Ydi hi'n iawn parhau?"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid ""
@@ -647,11 +627,6 @@ msgstr "Gosodwyd popeth yn llwyddiannus"
 msgid "Add a parallel group"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "unknown package "
-msgstr "Methu agor pecyn `%s'\n"
-
 #: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Update media"
@@ -1021,6 +996,23 @@ msgid "Removable device"
 msgstr "Dyfais symudol"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"(waiting for urpmi subroutine for explanation)\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
+"Rhaid i'r pecynnau canlynol gael eu tynnu i eraill gael eu diweddaru.\n"
+"\n"
+"%s\n"
+"\n"
+"Ydi hi'n iawn parhau?"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
 msgstr ""
@@ -1191,12 +1183,12 @@ msgstr "Problem wrth dynnu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help launched in background"
+msgid "Graphical desktop/Enlightenment"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "Help launched in background"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1473,15 +1465,6 @@ msgid "Development/KDE and Qt"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your media database."
-msgstr ""
-"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
-"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Books/Howtos"
 msgstr ""
@@ -1637,6 +1620,17 @@ msgid "System/Base"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"\n"
+"You may want to update your media database."
+msgstr ""
+"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
+"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -2107,6 +2101,14 @@ msgid "Software Sources Manager"
 msgstr "Rheolwr Ffynhonnell Meddalwedd"
 
 #, fuzzy
+#~ msgid "%s conflicts with %s"
+#~ msgstr " gwrthdaro gyda"
+
+#, fuzzy
+#~ msgid "unknown package "
+#~ msgstr "Methu agor pecyn `%s'\n"
+
+#, fuzzy
 #~ msgid "Update source"
 #~ msgstr "Diweddaru ffynonellau"