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/el.po | 58 ++++++++++++++++++++++++++--------------------------------
 1 file changed, 26 insertions(+), 32 deletions(-)

(limited to 'po/el.po')

diff --git a/po/el.po b/po/el.po
index 99e18401..ad6f0c58 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,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: 2002-08-30 16:19+0300\n"
 "Last-Translator: Νίκος Νύκταρης (Nick Niktaris) <niktaris@yahoo.com>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -586,6 +586,21 @@ msgstr "
 msgid "Unable to create medium."
 msgstr "Αδυναμία δημιουργίας μέσου."
 
+#: ../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 ""
+"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
+"\n"
+"%s\n"
+"\n"
+"Να συνεχιστεί;"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid ""
@@ -816,6 +831,16 @@ msgstr "
 msgid "Some packages can't be removed"
 msgstr "Το πακέτο `%s' δεν μπορεί να εγκατασταθεί\n"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Συγνώμη, τα παρακάτω πακέτα δεν μπορούν να επιλεγούν:\n"
+"\n"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -1000,23 +1025,6 @@ msgstr "
 msgid "Removable device"
 msgstr "Αφαιρούμενη συσκευή"
 
-#: ../rpmdrake:1
-#, fuzzy, 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 ""
-"Τα παρακάτω πακέτα πρέπει να αφαιρεθούν για να αναβαθμιστούν κάποια άλλα:\n"
-"\n"
-"%s\n"
-"\n"
-"Να συνεχιστεί;"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1227,20 +1235,6 @@ msgstr "
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
-msgstr ""
-"Συγνώμη, τα παρακάτω πακέτα δεν μπορούν να επιλεγούν:\n"
-"\n"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1