automerging with Gnome translations

1 files changed, 12 insertions, 136 deletions

diff --git a/po/ko.po b/po/ko.po
index 50c66af3..8d2a53d5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1084,9 +1084,9 @@ msgid "Server wizards"
 msgstr ""
 
 #: ../control-center:723
-#, fuzzy, c-format
+#, c-format
 msgid "Sharing"
-msgstr "경고"
+msgstr "공유"
 
 #: ../control-center:726
 #, fuzzy, c-format
@@ -1252,9 +1252,9 @@ msgid "You don't seem to have webmin intalled. Local config is disabled"
 msgstr ""
 
 #: ../control-center:813
-#, fuzzy, c-format
+#, c-format
 msgid "Remote administration"
-msgstr "연결"
+msgstr "원격 관리"
 
 #: ../control-center:814
 #, c-format
@@ -1287,9 +1287,9 @@ msgid "Set where your CD-ROM drive is mounted"
 msgstr ""
 
 #: ../control-center:893
-#, fuzzy, c-format
+#, c-format
 msgid "DVD-ROM"
-msgstr "CD-ROM"
+msgstr "DVD-ROM"
 
 #: ../control-center:894
 #, c-format
@@ -1558,9 +1558,9 @@ msgid "About - Mandrakelinux Control Center"
 msgstr "이 프로그램은 - 맨드레이크 컨트롤 센터"
 
 #: ../control-center:1716
-#, fuzzy, c-format
+#, c-format
 msgid "Authors: "
-msgstr "제작자: "
+msgstr "저자:"
 
 #: ../control-center:1717
 #, c-format
@@ -1612,9 +1612,9 @@ msgid "Copyright (C) 1999-2004 Mandrakesoft SA"
 msgstr "Copyright (C) 1999-2004 Mandrakesoft SA"
 
 #: ../control-center:1771
-#, fuzzy, c-format
+#, c-format
 msgid "Authors"
-msgstr "제작자: "
+msgstr "저자"
 
 #: ../control-center:1772
 #, fuzzy, c-format
@@ -1724,9 +1724,8 @@ msgid "Hard Drives"
 msgstr "하드디스크"
 
 #: data/proxy.desktop.in.h:1
-#, fuzzy
 msgid "Proxy Configuration"
-msgstr "설정"
+msgstr "프록시 설정"
 
 #: data/removable.desktop.in.h:1
 #, fuzzy
@@ -1739,136 +1738,13 @@ msgid "Remove Connection"
 msgstr "연결"
 
 #: data/SystemConfig.directory.in.h:1
-#, fuzzy
 msgid "System Settings"
-msgstr "사용자 정의 파티션 나누기"
+msgstr "시스템 설정"
 
 #: data/userdrake.desktop.in.h:1
-#, fuzzy
 msgid "Users and Groups"
 msgstr "사용자와 그룹"
 
 #: data/XFDrake-Resolution.desktop.in.h:1
 msgid "Screen Resolution"
 msgstr "화면 해상도"
-
-#~ msgid "-*-helvetica-medium-r-normal-*-20-*-100-100-p-*-iso8859-1,*-r-*"
-#~ msgstr ""
-#~ "-*-helvetica-medium-r-normal-*-20-*-75-75-p-*-iso8859-1,-*-gulim-medium-r-"
-#~ "normal--20-*-75-75-*-*-ksc5601.1987-0,*-r-*"
-
-#~ msgid "/Embedded Mode"
-#~ msgstr "/임베디드 모드(E)"
-
-#~ msgid "/File"
-#~ msgstr "/파일(F)"
-
-#~ msgid "/Options"
-#~ msgstr "/옵션(O)"
-
-#~ msgid "/Themes"
-#~ msgstr "/테마(T)"
-
-#~ msgid "Boot Disk"
-#~ msgstr "부트 디스크"
-
-#~ msgid "Boot Floppy"
-#~ msgstr "부트 플로피"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "DNS"
-#~ msgstr "DNS"
-
-#~ msgid "DVD"
-#~ msgstr "DVD"
-
-#~ msgid "Date & Time"
-#~ msgstr "날짜와 시간"
-
-#~ msgid "DrakClock"
-#~ msgstr "드레이크시계"
-
-#~ msgid "FTP"
-#~ msgstr "FTP"
-
-#~ msgid "Floppy"
-#~ msgstr "플로피"
-
-#~ msgid "GMT - DrakClock"
-#~ msgstr "GMT - 드레이크시계"
-
-#~ msgid "Hardware List"
-#~ msgstr "하드웨어 목록"
-
-#~ msgid "Hostname:"
-#~ msgstr "호스트명:"
-
-#~ msgid "Internet Access"
-#~ msgstr "인터넷 액세스"
-
-#~ msgid "Internet Connection Sharing"
-#~ msgstr "인터넷 연결 공유"
-
-#~ msgid "Is your hardware clock set to GMT?"
-#~ msgstr "하드웨어 시간이 GMT에 맞춰져 있습니까?"
-
-#~ msgid "Machine:"
-#~ msgstr "기계:"
-
-#~ msgid "Mandrakelinux Control Center %s\n"
-#~ msgstr "맨드레이크 제어 센터 %s\n"
-
-#~ msgid "OK"
-#~ msgstr "확인"
-
-#~ msgid "Please wait..."
-#~ msgstr "기다려 주세요..."
-
-#~ msgid "Postfix"
-#~ msgstr "포스트픽스"
-
-#~ msgid "Previous"
-#~ msgstr "이전"
-
-#~ msgid "Reset"
-#~ msgstr "초기화"
-
-#~ msgid "Samba"
-#~ msgstr "삼바"
-
-#~ msgid "Security Level"
-#~ msgstr "보안 등급"
-
-#~ msgid ""
-#~ "Security Warning: I'm not allowed to connect to the internet as root user"
-#~ msgstr ""
-#~ "보안 경고: 루트 권한으로 인터넷에 접속하는 것이 허가되지 않았습니다."
-
-#~ msgid "System:"
-#~ msgstr "시스템:"
-
-#~ msgid "Time"
-#~ msgstr "시간"
-
-#~ msgid "Time Zone"
-#~ msgstr "지역 시간대"
-
-#~ msgid "Timezone - DrakClock"
-#~ msgstr "시간대 - 드레이크시계"
-
-#~ msgid "Warning: No browser specified"
-#~ msgstr "경고: 어떤 탐색기도 지정되지 않았습니다."
-
-#~ msgid "Web"
-#~ msgstr "웹"
-
-#~ msgid "Which is your timezone?"
-#~ msgstr "님의 시간대는 어디입니까?"
-
-#~ msgid "Zip"
-#~ msgstr "짚"
-
-#~ msgid "cannot open this file for read: %s"
-#~ msgstr "이 파일을 읽을 수 없습니다: %s"