merge two more strings

1 files changed, 59 insertions, 47 deletions

diff --git a/po/ko.po b/po/ko.po
index 69d818ed..c87d0716 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-09-09 16:17+0200\n"
+"POT-Creation-Date: 2002-09-11 15:17+0200\n"
 "PO-Revision-Date: 2002-09-09 06:57+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -106,15 +106,15 @@ msgstr "¼Ò½º À¯Çü:"
 
 #: ../edit-urpm-sources.pl_.c:123 ../edit-urpm-sources.pl_.c:182
 #: ../edit-urpm-sources.pl_.c:214 ../rpmdrake.pm_.c:85 ../rpmdrake.pm_.c:105
-#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:867
-#: ../rpmdrake_.c:894
+#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:868
+#: ../rpmdrake_.c:899
 msgid "Ok"
 msgstr "È®ÀÎ"
 
 #: ../edit-urpm-sources.pl_.c:126 ../edit-urpm-sources.pl_.c:174
 #: ../edit-urpm-sources.pl_.c:182 ../edit-urpm-sources.pl_.c:215
 #: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:340
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:899
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
@@ -212,7 +212,7 @@ msgstr "ÀúÀå ÈÄ Á¾·á"
 msgid "Quit"
 msgstr "Á¾·á"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1005
+#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014
 #, c-format
 msgid ""
 "%s\n"
@@ -747,25 +747,25 @@ msgstr "°Ë»ö"
 msgid "Install"
 msgstr "¼³Ä¡"
 
-#: ../rpmdrake_.c:690
+#: ../rpmdrake_.c:691
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 "-adobe-times-medium-r-normal--18-*-75-75-p-*-iso8859-1,-*-batang-medium-r-"
 "normal--18-*-75-75-*-*-ksc5601.1987-0,*-r-*"
 
-#: ../rpmdrake_.c:691 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:692 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®"
 
-#: ../rpmdrake_.c:691
+#: ../rpmdrake_.c:692
 msgid "Software Packages Removal"
 msgstr "¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö Á¦°Å"
 
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:693
 msgid "Software Packages Installation"
 msgstr "¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö ¼³Ä¡"
 
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:726
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -777,23 +777,23 @@ msgstr ""
 "\n"
 "°è¼ÓÇÒ±î¿ä?"
 
-#: ../rpmdrake_.c:729
+#: ../rpmdrake_.c:730
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö Á¤º¸¸¦ ¾÷µ¥ÀÌÆ®Çϱâ À§ÇØ ¹Ì·¯¿¡ Á¢¼Ó Áß..."
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:732
 msgid "Error updating medium"
 msgstr "¸Åü ¾÷µ¥ÀÌÆ® Áß ¿À·ù"
 
-#: ../rpmdrake_.c:732
+#: ../rpmdrake_.c:733
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "ÆÑÅ°Áö Á¤º¸ ¾÷µ¥ÀÌÆ® µµÁß¿¡ º¹±¸ ºÒ°¡´ÉÇÑ ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù."
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:739
 msgid "How to choose manually your mirror"
 msgstr "¼öµ¿À¸·Î ¹Ì·¯¸¦ ¼±ÅÃÇÏ´Â ¹æ¹ý"
 
-#: ../rpmdrake_.c:739
+#: ../rpmdrake_.c:740
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -807,15 +807,15 @@ msgstr ""
 "\n"
 "±×·± ÈÄ, ¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®¸¦ ´Ù½Ã ½ÇÇàÇϼ¼¿ä."
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:746
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¾÷µ¥ÀÌÆ® ÆÑÅ°Áö¸¦ ÃʱâÈ­Çϱâ À§ÇØ ¹Ì·¯¿¡ Á¢¼Ó Áß..."
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:750
 msgid "Error adding update medium"
 msgstr "¾÷µ¥ÀÌÆ® ¸Åü Ãß°¡ Áß ¿À·ù"
 
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:751
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -835,65 +835,65 @@ msgstr ""
 "\n"
 "´Ù¸¥ ¹Ì·¯¸¦ »ç¿ëÇØ º¸½Ã°Ú½À´Ï±î?"
 
-#: ../rpmdrake_.c:779
+#: ../rpmdrake_.c:780
 msgid "Please wait, finding available packages..."
 msgstr "±â´Ù·Á ÁÖ¼¼¿ä. À¯È¿ÇÑ ÆÑÅ°Áö °Ë»ö Áß..."
 
-#: ../rpmdrake_.c:808
+#: ../rpmdrake_.c:809
 msgid "Installation finished"
 msgstr "¼³Ä¡ ¿Ï·á"
 
-#: ../rpmdrake_.c:811
+#: ../rpmdrake_.c:812
 #, c-format
 msgid "Inspecting %s"
 msgstr "%s Á¶»çÁß"
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:828
 #, c-format
 msgid "Remove .%s"
 msgstr ".%s Á¦°Å"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:830
 #, c-format
 msgid "Use .%s as main file"
 msgstr ".%sÀ»(¸¦) ÁÖ ÆÄÀÏ·Î »ç¿ë"
 
-#: ../rpmdrake_.c:831
+#: ../rpmdrake_.c:832
 msgid "Do nothing"
 msgstr "±×³É µÒ"
 
-#: ../rpmdrake_.c:834
+#: ../rpmdrake_.c:835
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr ""
 "-misc-fixed-medium-r-normal--12-*-75-75-p-*-iso8859-1,-*-gulim-medium-r-"
 "normal--12-*-75-75-*-*-ksc5601.1987-0,*-r-*"
 
-#: ../rpmdrake_.c:851
+#: ../rpmdrake_.c:852
 msgid "Inspect..."
 msgstr "Á¶»ç..."
 
-#: ../rpmdrake_.c:884
+#: ../rpmdrake_.c:889
 msgid "Unable to get source packages."
 msgstr "¼Ò½º ÆÑÅ°Áö¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
 
-#: ../rpmdrake_.c:885
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages, sorry."
 msgstr "¼Ò½º ÆÑÅ°Áö¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
 
-#: ../rpmdrake_.c:892
+#: ../rpmdrake_.c:897
 msgid "Change medium"
 msgstr "¸Åü ±³È¯"
 
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:898
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "[%s] ¸Åü¸¦ [%s]ÀåÄ¡¿¡ ³Ö¾î ÁÖ¼¼¿ä."
 
-#: ../rpmdrake_.c:901
+#: ../rpmdrake_.c:906
 msgid "Installation failed"
 msgstr "¼³Ä¡ ½ÇÆÐ"
 
-#: ../rpmdrake_.c:902
+#: ../rpmdrake_.c:907
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -901,20 +901,20 @@ msgstr ""
 "¼³Ä¡ ½ÇÆÐ. ÀϺΠÆÄÀÏÀÌ ¾ø½À´Ï´Ù.\n"
 "¼Ò½º µ¥ÀÌÅͺ£À̽º¸¦ ¾÷µ¥ÀÌÆ®ÇØ º¸¼¼¿ä."
 
-#: ../rpmdrake_.c:905
+#: ../rpmdrake_.c:910
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr ""
 "±â´Ù·Á ÁÖ¼¼¿ä. ´Ù¸¥ ÆÑÅ°Áö¸¦ ¾÷±×·¹À̵åÇϱâ À§ÇØ ÀϺΠÆÑÅ°Áö¸¦ Á¦°Å Áß..."
 
-#: ../rpmdrake_.c:916
+#: ../rpmdrake_.c:921
 msgid "Program missing"
 msgstr "ÇÁ·Î±×·¥ Á¸ÀçÇÏÁö ¾ÊÀ½"
 
-#: ../rpmdrake_.c:917
+#: ../rpmdrake_.c:922
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "¿äûÇÑ ÇÁ·Î±×·¥ÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù(grpmi). ¼³Ä¡¸¦ È®ÀÎÇϼ¼¿ä."
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -927,7 +927,7 @@ msgstr ""
 "ÀϺΠ¼³Á¤ ÆÄÀϵéÀº '.rpmnew' ¶Ç´Â '.rpmsave'·Î »ý¼ºµÇ¾ú½À´Ï´Ù.\n"
 "Á¶Ä¡¸¦ ÃëÇϱâ À§ÇØ ÀϺθ¦ Á¶»çÇØ º¼ ¼ö ÀÖ½À´Ï´Ù:"
 
-#: ../rpmdrake_.c:927
+#: ../rpmdrake_.c:932
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -935,35 +935,47 @@ msgstr ""
 "ÀϺΠÆÑÅ°Áö´Â ¿Ã¹Ù¸£°Ô ¼³Ä¡µÇÁö\n"
 "¾Ê¾Ò½À´Ï´Ù."
 
-#: ../rpmdrake_.c:928
+#: ../rpmdrake_.c:933
 msgid "everything was installed correctly"
 msgstr "¸ðµÎ ¿Ã¹Ù¸£°Ô ¼³Ä¡µÇ¾ú½À´Ï´Ù."
 
-#: ../rpmdrake_.c:930
+#: ../rpmdrake_.c:935
 msgid "Everything installed successfully"
 msgstr "¸ðµç ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
 
-#: ../rpmdrake_.c:931
+#: ../rpmdrake_.c:936
 msgid "All requested packages were installed successfully."
 msgstr "¿äûµÈ ¸ðµç ÆÑÅ°ÁöÀÇ ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
 
-#: ../rpmdrake_.c:933
+#: ../rpmdrake_.c:938
 msgid "Everything already installed."
 msgstr "ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù."
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:939
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù.(°ú¿¬ ÀÌ·± ÀÏÀÌ ÀÖÀ» ¼ö ÀÖ³ª¿ä?)"
 
-#: ../rpmdrake_.c:944
+#: ../rpmdrake_.c:942
+msgid "Problem during installation"
+msgstr ""
+
+#: ../rpmdrake_.c:943
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../rpmdrake_.c:953
 msgid "Please wait, reading packages database..."
 msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö µ¥ÀÌÅͺ£À̽º Àд Áß..."
 
-#: ../rpmdrake_.c:982
+#: ../rpmdrake_.c:991
 msgid "Please wait, removing packages..."
 msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö Á¦°Å Áß..."
 
-#: ../rpmdrake_.c:1009
+#: ../rpmdrake_.c:1018
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -975,7 +987,7 @@ msgstr ""
 "ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡¼­ Á¦°ÅÇÒ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
 "µµ¿Í ÁÝ´Ï´Ù."
 
-#: ../rpmdrake_.c:1014
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -987,7 +999,7 @@ msgstr ""
 "ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÒ ¾÷µ¥ÀÌÆ®µÈ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
 "µµ¿Í ÁÝ´Ï´Ù."
 
-#: ../rpmdrake_.c:1019
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"