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

(limited to 'po/sk.po')

diff --git a/po/sk.po b/po/sk.po
index dc085db6..dade340d 100644
--- a/po/sk.po
+++ b/po/sk.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: 2003-03-11 19:46--100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@phuture.sk>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -587,6 +587,21 @@ msgstr "Dôležitosť: "
 msgid "Unable to create medium."
 msgstr "Nemôžem vytvoriť médium."
 
+#: ../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 ""
+"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
+"\n"
+"%s\n"
+"\n"
+"Je možné pokračovať?"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid ""
@@ -817,6 +832,16 @@ msgstr "Príprava balíčkov na inštaláciu..."
 msgid "Some packages can't be removed"
 msgstr "Balíček `%s' nie je možné nainštalovať\n"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Prepáčte, tieto balíčky nie je možné vybrať:\n"
+"\n"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -999,23 +1024,6 @@ msgstr "Normálne informácie"
 msgid "Removable device"
 msgstr "Vymeniteľné zariadenie"
 
-#: ../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 ""
-"Nasledovné balíky budú odstránené aby bolo možné iné aktualizovať:\n"
-"\n"
-"%s\n"
-"\n"
-"Je možné pokračovať?"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1226,20 +1234,6 @@ msgstr "Popis:"
 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 ""
-"Prepáčte, tieto balíčky nie je možné vybrať:\n"
-"\n"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1