Merge strings

1 files changed, 10 insertions, 11 deletions

diff --git a/po/wa.po b/po/wa.po
index ee96e08a..bacbcc52 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,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: 2004-08-08 20:26+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
 "Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -1486,7 +1486,7 @@ msgid "  --no-install   - don't install packages (only download)\n"
 msgstr ""
 "  --install-src  - astaler seulmint pacaedjes sourdant (nén les binaires).\n"
 
-#: ../urpmi:88
+#: ../urpmi:88 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -2187,15 +2187,6 @@ msgstr ""
 "\n"
 "Po s' è siervi:\n"
 
-#: ../urpmq:52
-#, fuzzy, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - wårder les pacaedjes k' i gn a si c' est possibe,\n"
-"                   rifuzer les dmandes ki oistêyrént des pacaedjes.\n"
-
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2356,6 +2347,14 @@ msgstr "Nole djivêye di fitchîs di trovêye\n"
 msgid "No changelog found\n"
 msgstr "Nou djournå des candjmints di trové\n"
 
+#, fuzzy
+#~ msgid ""
+#~ "  --keep         - keep existing packages if possible, reject requested\n"
+#~ "                   packages that leads to remove.\n"
+#~ msgstr ""
+#~ "  --keep         - wårder les pacaedjes k' i gn a si c' est possibe,\n"
+#~ "                   rifuzer les dmandes ki oistêyrént des pacaedjes.\n"
+
 #~ msgid "unable to write file [%s]"
 #~ msgstr "dji n' sai scrire li fitchî [%s]"