Merge message, new French translations

1 files changed, 228 insertions, 86 deletions

diff --git a/po/ko.pom b/po/ko.pom
index e49f17e4..93e78061 100644
--- a/po/ko.pom
+++ b/po/ko.pom
@@ -9,186 +9,280 @@ msgid "Workstation"
 msgstr "워크스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:164
+#, c-format
+msgid "Development"
+msgstr "개발"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
 #: share/compssUsers.pl:999
 msgid "Graphical Environment"
 msgstr "그래픽 환경"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:10
+#: share/compssUsers.pl:25
 #, c-format
-msgid "Web/FTP"
-msgstr "웹/FTP"
+msgid "Office Workstation"
+msgstr "오피스 워크스테이션"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:27
+#, fuzzy, c-format
+msgid ""
+"Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
+"(OpenOffice.org Calc, Kspread), PDF viewers, etc"
+msgstr ""
+"오피스 프로그램들: 워드프로세서 (kword, abiword), 스프레드쉬트 (kspread,"
+"gnumeric), pdf 뷰어, 등등"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:11
+#: share/compssUsers.pl:28
 #, c-format
-msgid "Apache, Pro-ftpd"
-msgstr "아파치와 프로FTPD"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"오피스 프로그램들: 워드프로세서 (kword, abiword), 스프레드쉬트 (kspread,"
+"gnumeric), pdf 뷰어, 등등"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:15
-#, fuzzy, c-format
-msgid "Postfix mail server"
-msgstr "포스트픽스 메일 서버"
+#: share/compssUsers.pl:33
+#, c-format
+msgid "Game station"
+msgstr "게임 스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:18
+#: share/compssUsers.pl:34
 #, c-format
-msgid "Database"
-msgstr "데이터베이스"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "장난감 프로그램: arcade, boards, strategy, 등등"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:19
+#: share/compssUsers.pl:37
 #, c-format
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
+msgid "Multimedia station"
+msgstr "멀티미디어 스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:22
+#: share/compssUsers.pl:38
 #, c-format
-msgid "Firewall/Router"
-msgstr "방화벽/라우터"
+msgid "Sound and video playing/editing programs"
+msgstr "사운드 및 비디오 연주/편집 프로그램"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:23
+#: share/compssUsers.pl:43
 #, c-format
-msgid "Internet gateway"
-msgstr "인터넷 게이트웨이"
+msgid "Internet station"
+msgstr "인터넷 스테이션"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:44
+#, fuzzy, c-format
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr "메일/뉴스를 일고 보내며 웹검색을 위한 도구모음(pine, mutt, tin...)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:26
+#: share/compssUsers.pl:49
 #, c-format
-msgid "Network Computer server"
-msgstr "네트웍 컴퓨터 서버"
+msgid "Network Computer (client)"
+msgstr "네트웍 컴퓨터 (클라이언트)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:27
+#: share/compssUsers.pl:50
 #, c-format
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS 서버, 삼바 서버, 프락시 서버, SSH 서버"
+msgid "Clients for different protocols including ssh"
+msgstr "SSH 및 다른 프로토콜의 클라이언트"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:35
+#: share/compssUsers.pl:55
+#, c-format
+msgid "Tools to ease the configuration of your computer"
+msgstr "쉬운 컴퓨터 설정을 위한 도구"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:59
+#, c-format
+msgid "Console Tools"
+msgstr "콘솔 도구"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:60
+#, c-format
+msgid "Editors, shells, file tools, terminals"
+msgstr "에디터, 쉘, 파일도구, 터미널"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:65 share/compssUsers.pl:165
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C/C++ 개발 라이브러리, 프로그램 및 헤더파일"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:38
+#: share/compssUsers.pl:69 share/compssUsers.pl:169
 #, c-format
 msgid "Documentation"
 msgstr "문서"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:39
+#: share/compssUsers.pl:70 share/compssUsers.pl:170
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "리눅스 및 자유 소프트웨어에 대한 서적과 Howto문서"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:42
+#: share/compssUsers.pl:74 share/compssUsers.pl:173
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:43
+#: share/compssUsers.pl:75 share/compssUsers.pl:174
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "리눅스 표준 기반. 외부 애플리케이션 지원"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:50
-#, c-format
-msgid "Office Workstation"
-msgstr "오피스 워크스테이션"
+#: share/compssUsers.pl:85
+#, fuzzy, c-format
+msgid "Apache"
+msgstr "경로"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:51
-#, c-format
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"오피스 프로그램들: 워드프로세서 (kword, abiword), 스프레드쉬트 (kspread,"
-"gnumeric), pdf 뷰어, 등등"
+#: share/compssUsers.pl:88
+#, fuzzy, c-format
+msgid "Groupware"
+msgstr "그룹"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:55
+#: share/compssUsers.pl:89
+#, fuzzy, c-format
+msgid "Kolab Server"
+msgstr "삼바 서비스"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:92 share/compssUsers.pl:133
 #, c-format
-msgid "Game station"
-msgstr "게임 스테이션"
+msgid "Firewall/Router"
+msgstr "방화벽/라우터"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:56
+#: share/compssUsers.pl:93 share/compssUsers.pl:134
 #, c-format
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "장난감 프로그램: arcade, boards, strategy, 등등"
+msgid "Internet gateway"
+msgstr "인터넷 게이트웨이"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:59
+#: share/compssUsers.pl:96
+#, fuzzy, c-format
+msgid "Mail/News"
+msgstr "/파일(F)/새로 만들기(_N)"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:97
+#, fuzzy, c-format
+msgid "Postfix mail server, Inn news server"
+msgstr "포스트픽스 메일 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:100
+#, fuzzy, c-format
+msgid "Directory Server"
+msgstr "CD로부터 복구"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:104
+#, fuzzy, c-format
+msgid "FTP Server"
+msgstr "NTP 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:105
 #, c-format
-msgid "Multimedia station"
-msgstr "멀티미디어 스테이션"
+msgid "ProFTPd"
+msgstr ""
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:60
+#: share/compssUsers.pl:108
+#, fuzzy, c-format
+msgid "DNS/NIS"
+msgstr "DNS/NIS"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:109
 #, c-format
-msgid "Sound and video playing/editing programs"
-msgstr "사운드 및 비디오 연주/편집 프로그램"
+msgid "Domain Name and Network Information Server"
+msgstr "도메인 네임 및 네트웍 정보 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:112
+#, fuzzy, c-format
+msgid "File and Printer Sharing Server"
+msgstr "프린터 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:113
+#, fuzzy, c-format
+msgid "NFS Server, Samba server"
+msgstr "삼바 서비스"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:64
+#: share/compssUsers.pl:116 share/compssUsers.pl:129
 #, c-format
-msgid "Internet station"
-msgstr "인터넷 스테이션"
+msgid "Database"
+msgstr "데이터베이스"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:65
+#: share/compssUsers.pl:117
 #, fuzzy, c-format
-msgid ""
-"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
-"Web"
-msgstr "메일/뉴스를 일고 보내며 웹검색을 위한 도구모음(pine, mutt, tin...)"
+msgid "PostgreSQL and MySQL Database Server"
+msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:69
+#: share/compssUsers.pl:121
 #, c-format
-msgid "Network Computer (client)"
-msgstr "네트웍 컴퓨터 (클라이언트)"
+msgid "Web/FTP"
+msgstr "웹/FTP"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:70
+#: share/compssUsers.pl:122
 #, c-format
-msgid "Clients for different protocols including ssh"
-msgstr "SSH 및 다른 프로토콜의 클라이언트"
+msgid "Apache, Pro-ftpd"
+msgstr "아파치와 프로FTPD"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:74
+#: share/compssUsers.pl:126
+#, fuzzy, c-format
+msgid "Postfix mail server"
+msgstr "포스트픽스 메일 서버"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:130
 #, c-format
-msgid "Tools to ease the configuration of your computer"
-msgstr "쉬운 컴퓨터 설정을 위한 도구"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL 또는 MySQL 데이터베이스 서버"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:78
+#: share/compssUsers.pl:137
 #, c-format
-msgid "Console Tools"
-msgstr "콘솔 도구"
+msgid "Network Computer server"
+msgstr "네트웍 컴퓨터 서버"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:79
+#: share/compssUsers.pl:138
 #, c-format
-msgid "Editors, shells, file tools, terminals"
-msgstr "에디터, 쉘, 파일도구, 터미널"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS 서버, 삼바 서버, 프락시 서버, SSH 서버"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:87
+#: share/compssUsers.pl:146
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE 워크스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:88
+#: share/compssUsers.pl:147
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -196,13 +290,13 @@ msgid ""
 msgstr "K Desktop 환경, 여러가지 도구를 수반한 기본 그래픽 환경"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:92
+#: share/compssUsers.pl:151
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME 워크스테이션"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:93
+#: share/compssUsers.pl:152
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -210,14 +304,62 @@ msgid ""
 msgstr "사용자 친화적 프로그램과 데스크탑 도구를 가진 그래픽 환경"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:96
+#: share/compssUsers.pl:155
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "기타 그래픽 데스크탑"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: share/compssUsers.pl:97
+#: share/compssUsers.pl:156
 #, c-format
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Icewm, 윈도우 메이커, 인라이튼먼트, Fvwm, 등등"
 
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:179
+#, fuzzy, c-format
+msgid "Utilities"
+msgstr "필리핀"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
+#, c-format
+msgid "SSH Server"
+msgstr "SSH 서비스"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:186
+#, fuzzy, c-format
+msgid "Webmin"
+msgstr "웹민 서비스"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:187
+#, fuzzy, c-format
+msgid "Webmin Remote Configuration Server"
+msgstr "맨드레이크 터미널 서버 설정"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:191
+#, fuzzy, c-format
+msgid "Network Utilities/Monitoring"
+msgstr "네트웍 환경 설정"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:192
+#, c-format
+msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:196
+#, fuzzy, c-format
+msgid "MandrakeSoft Wizards"
+msgstr "맨드레이크 제어 센터"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: share/compssUsers.pl:197
+#, fuzzy, c-format
+msgid "Wizards to configure server"
+msgstr "프린터 「%s」 설정 중 ..."
+