From afea9f23bd47b71e45bc0b1ee689be5c6230ff87 Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 18 Jun 2003 17:08:29 +0000
Subject: merge

---
 po/wa.po | 74 +++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

(limited to 'po/wa.po')

diff --git a/po/wa.po b/po/wa.po
index d25dba1d..2a2c9add 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-13 21:08+0200\n"
+"POT-Creation-Date: 2003-06-18 19:02+0200\n"
 "PO-Revision-Date: 2003-05-13 13:32+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -600,6 +600,24 @@ msgstr "Imp
 msgid "Unable to create medium."
 msgstr "Dji n' sai askepyî l' sopoirt."
 
+#: ../rpmdrake:1
+#, fuzzy, 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 ""
+"Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
+"djoû:\n"
+"\n"
+"%s\n"
+"\n"
+"(dji ratind li sorroutine d' urpmi po des esplikêyes)\n"
+"\n"
+"C' est bon di continuwer?"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
@@ -830,6 +848,21 @@ msgstr "Aroke moirt: nou pacaedje n'
 msgid "Some packages can't be removed"
 msgstr "Des pacaedjes k' i gn a n' polèt nén esse oistés"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Dji rgrete, les pacaedjes ki shuvèt n' polèt nén esse tchoezis:\n"
+"\n"
+"%s\n"
+"\n"
+"Vo ndè la les råjhons:\n"
+"\n"
+"%s"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -1019,26 +1052,6 @@ msgstr "Inform
 msgid "Removable device"
 msgstr "Bodjåve sopoirt"
 
-#: ../rpmdrake:1
-#, 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 ""
-"Les pacaedjes ki shuvèt dvèt esse oistés po ds ôtes poleur esse metous a "
-"djoû:\n"
-"\n"
-"%s\n"
-"\n"
-"(dji ratind li sorroutine d' urpmi po des esplikêyes)\n"
-"\n"
-"C' est bon di continuwer?"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1253,25 +1266,6 @@ msgstr "Discrijhaedje: "
 msgid "%s KB"
 msgstr "%s Ko"
 
-#: ../rpmdrake:1
-#, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Dji rgrete, les pacaedjes ki shuvèt n' polèt nén esse tchoezis:\n"
-"\n"
-"%s\n"
-"\n"
-"Vo ndè la les råjhons:\n"
-"\n"
-"%s"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1