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/eo.po | 49 ++++++++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

(limited to 'po/eo.po')

diff --git a/po/eo.po b/po/eo.po
index a75ea100..124e5a87 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,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-03-11 21:40-0400\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: esperanto <eo@li.org>\n"
@@ -565,6 +565,21 @@ msgstr ""
 msgid "Unable to create medium."
 msgstr "Ne povis krei raportdosieron, ĉesigas.\n"
 
+#: ../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 ""
+"La sekva dosiero ne validas:\n"
+"\n"
+"%s\n"
+"\n"
+"Ĉu vi deziras tamen daŭrigi (saltante tiun pakaĵon)?"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
@@ -780,6 +795,14 @@ msgstr "Preparas pakaĵojn por instalado..."
 msgid "Some packages can't be removed"
 msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Finland"
@@ -956,18 +979,6 @@ msgstr "normaj ĝisdatigoj"
 msgid "Removable device"
 msgstr ""
 
-#: ../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 ""
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1182,18 +1193,6 @@ msgstr "Priskriboj"
 msgid "%s KB"
 msgstr "%.1f KB"
 
-#: ../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 ""
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1