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/et.po | 72 +++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 33 insertions(+), 39 deletions(-)

(limited to 'po/et.po')

diff --git a/po/et.po b/po/et.po
index 0385d9a9..6bb8b3ac 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,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-06-14 17:54+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -592,6 +592,23 @@ msgstr "Tähtsus: "
 msgid "Unable to create medium."
 msgstr "Andmekandja loomine ebaõnnestus."
 
+#: ../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 ""
+"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
+"\n"
+"%s\n"
+"\n"
+"(urpmi alamprogrammilt oodatakse seletust)\n"
+"\n"
+"Kas jätkata?"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
@@ -820,6 +837,21 @@ msgstr "Parandamatu viga: kahjuks ei leitud paigaldamiseks ühtegi paketti."
 msgid "Some packages can't be removed"
 msgstr "Mõnda paketti ei saa eemaldada"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Kahjuks ei saa järgmisi pakette valida:\n"
+"\n"
+"%s\n"
+"\n"
+"Põhjused:\n"
+"\n"
+"%s"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -1006,25 +1038,6 @@ msgstr "Tavainfo"
 msgid "Removable device"
 msgstr "Eemaldatav seade"
 
-#: ../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 ""
-"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
-"\n"
-"%s\n"
-"\n"
-"(urpmi alamprogrammilt oodatakse seletust)\n"
-"\n"
-"Kas jätkata?"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1239,25 +1252,6 @@ msgstr "Kirjeldus: "
 msgid "%s KB"
 msgstr "%s 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 ""
-"Kahjuks ei saa järgmisi pakette valida:\n"
-"\n"
-"%s\n"
-"\n"
-"Põhjused:\n"
-"\n"
-"%s"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1