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/uk.po | 70 +++++++++++++++++++++++++++++-----------------------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

(limited to 'po/uk.po')

diff --git a/po/uk.po b/po/uk.po
index 7a6ac337..aaf5f0b4 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-uk\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-15 04:00+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -600,6 +600,22 @@ 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"
+"(оч╕ку╓ться п╕дпрограма urpmi)\n"
+"Продовжити?"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
@@ -831,6 +847,21 @@ msgstr "
 msgid "Some packages can't be removed"
 msgstr "Деяк╕ пакунки неможливо вилучити"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Вибачте, наступн╕ пакунки не можуть бути вибран╕:\n"
+"\n"
+"%s\n"
+"\n"
+"Можлив╕ причини:\n"
+"\n"
+"%s"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
@@ -1020,24 +1051,6 @@ msgstr "
 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 ""
-"Наступн╕ пакунки повинн╕ бути видален╕, щоб ╕нш╕ можна було поновити:\n"
-"\n"
-"%s\n"
-"\n"
-"(оч╕ку╓ться п╕дпрограма urpmi)\n"
-"Продовжити?"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Graphical desktop/Icewm"
@@ -1252,25 +1265,6 @@ msgstr "
 msgid "%s KB"
 msgstr "%s кб"
 
-#: ../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 ""
-"Вибачте, наступн╕ пакунки не можуть бути вибран╕:\n"
-"\n"
-"%s\n"
-"\n"
-"Можлив╕ причини:\n"
-"\n"
-"%s"
-
 #: ../rpmdrake:1
 #, c-format
 msgid "Sciences/Chemistry"
-- 
cgit v1.2.1