Merge strings

1 files changed, 10 insertions, 11 deletions

diff --git a/po/cy.po b/po/cy.po
index 83a8fd37..707f167f 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-04-21 14:52+0200\n"
+"POT-Creation-Date: 2005-04-21 15:09+0200\n"
 "PO-Revision-Date: 2005-02-01 20:27-0000\n"
 "Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
 "Language-Team: Cymraeg/Welsh <post@meddal.com>\n"
@@ -1447,7 +1447,7 @@ msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 "  --install-src  - gosod pecynnau ffynhonnell yn unig (dim binaries).\n"
 
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2135,15 +2135,6 @@ msgstr ""
 "\n"
 "defnydd:\n"
 
-#: ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
-"                   pecynnau sy'n arwain at dynnu.\n"
-
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2301,6 +2292,14 @@ msgstr "Heb ganfod filelist\n"
 msgid "No changelog found\n"
 msgstr "Heb ganfod changelog\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "  --keep         - keep existing packages if possible, reject requested\n"
+#~ "                   packages that leads to remove.\n"
+#~ msgstr ""
+#~ "  --keep         - cadw'r pecynnau presennol os yn bosibl, gwrthod\n"
+#~ "                   pecynnau sy'n arwain at dynnu.\n"
+
 #~ msgid "unable to write file [%s]"
 #~ msgstr "methu ysgrifennu ffeil (%s)"