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

(limited to 'po/ko.po')

diff --git a/po/ko.po b/po/ko.po
index ca2f9f37..be819e65 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -11,7 +11,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-25 14:32+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -595,6 +595,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 ""
@@ -826,6 +841,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"
@@ -1009,23 +1034,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"
@@ -1236,20 +1244,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