sync with code

1 files changed, 31 insertions, 21 deletions

diff --git a/po/cy.po b/po/cy.po
index b9efa2db..1056123f 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-15 14:22+0100\n"
+"POT-Creation-Date: 2007-01-18 15:22+0100\n"
 "PO-Revision-Date: 2007-01-14 17:35-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -180,16 +180,6 @@ msgstr ""
 "%s\n"
 "Parhau beth bynnag?"
 
-#: ../gurpmi2:210
-#, 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:\n"
-"%s\n"
-
 #: ../gurpmi2:217
 #, c-format
 msgid "Package installation..."
@@ -2150,14 +2140,13 @@ msgstr[1] ""
 msgid "(test only, removal will not be actually done)"
 msgstr "(prawf yn unig, ni fydd yn cael ei ddadosod)"
 
-#: ../urpmi:578 ../urpmi:589
-#, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed"
+#: ../urpmi:578
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package is going to be installed"
 msgid_plural ""
-"To satisfy dependencies, the following package is going to be installed"
+"To satisfy dependencies, the following packages are going to be installed"
 msgstr[0] "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
-msgstr[1] "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
+msgstr[1] "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
 
 #: ../urpmi:580
 #, c-format
@@ -2173,6 +2162,15 @@ msgstr ""
 "Rhaid eich bod yn wraidd i osod y dibyniaethau canlynol:\n"
 "%s\n"
 
+#: ../urpmi:589 ../gurpmi2:209
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
+msgid_plural ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr[0] "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
+msgstr[1] "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
+
 #: ../urpmi:592
 #, c-format
 msgid "(test only, installation will not be actually done)"
@@ -2917,6 +2915,22 @@ msgstr "Heb ganfod filelist\n"
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#~ 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:\n"
+#~ "%s\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following packages are going to be installed"
+#~ msgid_plural ""
+#~ "To satisfy dependencies, the following package is going to be installed"
+#~ msgstr[0] "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
+#~ msgstr[1] ""
+#~ "I fodloni dibyniaethau, bydd y pecynnau canlynol yn cael eu gosod"
+
 #~ msgid "skipping media %s: no hdlist"
 #~ msgstr "hepgor cyfrwng %s: dim hdliist"
 
@@ -2971,10 +2985,6 @@ msgstr "Heb ganfod changelog\n"
 #~ msgid "Preparing install on %s..."
 #~ msgstr "Paratoi gosod ar %s..."
 
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr "I fodloni dibyniaethau, bydd y pecyn canlynol yn cael ei osod"
-
 #~ msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 #~ msgstr "  --probe-synthesis - ceisio canfod a defnyddio ffeil synthesis.\n"