Update Korean templates

CVS version numbers

korean/po/bugs.ko.po: 1.9 -> 1.10 
korean/po/countries.ko.po: 1.15 -> 1.16 
korean/po/distrib.ko.po: 1.7 -> 1.8 
korean/po/l10n.ko.po: 1.8 -> 1.9 
korean/po/mailinglists.ko.po: 1.5 -> 1.6 
korean/po/organization.ko.po: 1.14 -> 1.15 
korean/po/others.ko.po: 1.16 -> 1.17 
korean/po/ports.ko.po: 1.9 -> 1.10 
korean/po/templates.ko.po: 1.26 -> 1.27 
korean/po/vendors.ko.po: 1.10 -> 1.11

10 files changed, 202 insertions, 186 deletions

diff --git a/korean/po/bugs.ko.po b/korean/po/bugs.ko.po
index d21415f3943..b38719ce768 100644
--- a/korean/po/bugs.ko.po
+++ b/korean/po/bugs.ko.po
@@ -161,17 +161,17 @@ msgstr ""
 msgid "Archived and Unarchived"
 msgstr ""
 
-#~ msgid "security"
-#~ msgstr "보안"
+#~ msgid "bugs"
+#~ msgstr "버그"
 
-#~ msgid "patch"
-#~ msgstr "패치"
+#~ msgid "l10n"
+#~ msgstr "지역화"
 
 #~ msgid "moreinfo"
 #~ msgstr "추가 정보"
 
-#~ msgid "l10n"
-#~ msgstr "지역화"
+#~ msgid "patch"
+#~ msgstr "패치"
 
-#~ msgid "bugs"
-#~ msgstr "버그"
+#~ msgid "security"
+#~ msgstr "보안"
diff --git a/korean/po/countries.ko.po b/korean/po/countries.ko.po
index ca417d401d7..f08fb8ab586 100644
--- a/korean/po/countries.ko.po
+++ b/korean/po/countries.ko.po
@@ -435,8 +435,8 @@ msgstr "남아프리카 공화국"
 msgid "Zimbabwe"
 msgstr "짐바브웨"
 
-#~ msgid "Great Britain"
-#~ msgstr "영국"
-
 #~ msgid "Yugoslavia"
 #~ msgstr "Jugoslavia"
+
+#~ msgid "Great Britain"
+#~ msgstr "영국"
diff --git a/korean/po/distrib.ko.po b/korean/po/distrib.ko.po
index 0ad0768942a..d1d2a0d620a 100644
--- a/korean/po/distrib.ko.po
+++ b/korean/po/distrib.ko.po
@@ -208,17 +208,17 @@ msgstr ""
 msgid "SPARC"
 msgstr ""
 
-#~ msgid "Search case sensitive"
-#~ msgstr "대소문자 구분 검색"
+#~ msgid "Case sensitive"
+#~ msgstr "대소문자 구분"
 
-#~ msgid "Intel x86"
-#~ msgstr "인텔 x86"
+#~ msgid "no"
+#~ msgstr "아니오"
 
 #~ msgid "yes"
 #~ msgstr "예"
 
-#~ msgid "no"
-#~ msgstr "아니오"
+#~ msgid "Intel x86"
+#~ msgstr "인텔 x86"
 
-#~ msgid "Case sensitive"
-#~ msgstr "대소문자 구분"
+#~ msgid "Search case sensitive"
+#~ msgstr "대소문자 구분 검색"
diff --git a/korean/po/l10n.ko.po b/korean/po/l10n.ko.po
index 3895e32a853..c8aacbf1367 100644
--- a/korean/po/l10n.ko.po
+++ b/korean/po/l10n.ko.po
@@ -97,8 +97,8 @@ msgstr "POT 파일"
 msgid "Hints for translators"
 msgstr "번역자를 위한 힌트"
 
-#~ msgid "Original templates"
-#~ msgstr "원 서식"
-
 #~ msgid "Translated templates"
 #~ msgstr "번역된 서식"
+
+#~ msgid "Original templates"
+#~ msgstr "원 서식"
diff --git a/korean/po/mailinglists.ko.po b/korean/po/mailinglists.ko.po
index 449a1c12522..2fa4a8218ff 100644
--- a/korean/po/mailinglists.ko.po
+++ b/korean/po/mailinglists.ko.po
@@ -112,8 +112,8 @@ msgstr ""
 msgid "closed"
 msgstr ""
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "해지하려는 리스트를 선택하세요."
-
 #~ msgid "Please select which lists you want to subscribe to:"
 #~ msgstr "가입하려는 리스트를 선택하세요."
+
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "해지하려는 리스트를 선택하세요."
diff --git a/korean/po/organization.ko.po b/korean/po/organization.ko.po
index 8132513b03e..0113c7332d8 100644
--- a/korean/po/organization.ko.po
+++ b/korean/po/organization.ko.po
@@ -384,31 +384,31 @@ msgstr "장애우를 위한 데비안"
 msgid "Debian for science and related research"
 msgstr "의학 실습과 연구를 위한 데비안"
 
-#, fuzzy
-#~| msgid "Security Team"
-#~ msgid "Testing Security Team"
-#~ msgstr "보안 팀"
+#~ msgid "Custom Debian Distributions"
+#~ msgstr "커스텀 데비안 배포판"
 
-#~ msgid "Security Audit Project"
-#~ msgstr "보안 감사 프로젝트"
+#~ msgid "Release Managers for ``stable''"
+#~ msgstr "``stable'' 릴리스 관리자"
 
-#~ msgid "Mailing List Archives"
-#~ msgstr "메일링 리스트 모음"
+#~ msgid "Security Testing Team"
+#~ msgstr "보안 테스팅 팀"
 
-#~ msgid "Debian Multimedia Distribution"
-#~ msgstr "데비안 멀티미디어 배포판"
+#~ msgid "Accountant"
+#~ msgstr "계정"
 
 #~ msgid "Debian for non-profit organisations"
 #~ msgstr "비영리 조직을 위한 데비안"
 
-#~ msgid "Accountant"
-#~ msgstr "계정"
+#~ msgid "Debian Multimedia Distribution"
+#~ msgstr "데비안 멀티미디어 배포판"
 
-#~ msgid "Security Testing Team"
-#~ msgstr "보안 테스팅 팀"
+#~ msgid "Mailing List Archives"
+#~ msgstr "메일링 리스트 모음"
 
-#~ msgid "Release Managers for ``stable''"
-#~ msgstr "``stable'' 릴리스 관리자"
+#~ msgid "Security Audit Project"
+#~ msgstr "보안 감사 프로젝트"
 
-#~ msgid "Custom Debian Distributions"
-#~ msgstr "커스텀 데비안 배포판"
+#, fuzzy
+#~| msgid "Security Team"
+#~ msgid "Testing Security Team"
+#~ msgstr "보안 팀"
diff --git a/korean/po/others.ko.po b/korean/po/others.ko.po
index 85d6d2dc833..4ac9a0ae158 100644
--- a/korean/po/others.ko.po
+++ b/korean/po/others.ko.po
@@ -234,10 +234,26 @@ msgstr ""
 msgid "Swiss army knives"
 msgstr ""
 
-#: ../../english/misc/merchandise.def:61
+#: ../../english/misc/merchandise.def:60
 msgid "USB-Sticks"
 msgstr ""
 
+#: ../../english/misc/merchandise.def:75
+msgid "lanyards"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:78
+msgid "others"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:98
+msgid "Donates money to Debian"
+msgstr ""
+
+#: ../../english/misc/merchandise.def:102
+msgid "Money is used to organize local free software events"
+msgstr ""
+
 #: ../../english/women/profiles/profiles.def:24
 msgid "How long have you been using Debian?"
 msgstr ""
@@ -313,26 +329,26 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
-#~ msgid "Email:"
-#~ msgstr "전자우편:"
-
-#~ msgid "Mailing List Subscription"
-#~ msgstr "메일링 리스트 가입"
+#~ msgid "Languages:"
+#~ msgstr "언어:"
 
-#~ msgid "Please select which lists you want to subscribe to:"
-#~ msgstr "가입하려는 리스트를 선택하세요."
+#~ msgid "Topics:"
+#~ msgstr "주제:"
 
-#~ msgid "Subscription:"
-#~ msgstr "가입:"
+#~ msgid "Please select which lists you want to unsubscribe from:"
+#~ msgstr "해지하려는 리스트를 선택하세요."
 
 #~ msgid "Mailing List Unsubscription"
 #~ msgstr "메일링 리스트 해지"
 
-#~ msgid "Please select which lists you want to unsubscribe from:"
-#~ msgstr "해지하려는 리스트를 선택하세요."
+#~ msgid "Subscription:"
+#~ msgstr "가입:"
 
-#~ msgid "Topics:"
-#~ msgstr "주제:"
+#~ msgid "Please select which lists you want to subscribe to:"
+#~ msgstr "가입하려는 리스트를 선택하세요."
 
-#~ msgid "Languages:"
-#~ msgstr "언어:"
+#~ msgid "Mailing List Subscription"
+#~ msgstr "메일링 리스트 가입"
+
+#~ msgid "Email:"
+#~ msgstr "전자우편:"
diff --git a/korean/po/ports.ko.po b/korean/po/ports.ko.po
index a29c27a69dd..b1fa8e16b42 100644
--- a/korean/po/ports.ko.po
+++ b/korean/po/ports.ko.po
@@ -117,11 +117,11 @@ msgstr ""
 msgid "Debian for Sparc"
 msgstr ""
 
-#~ msgid "libc5-based Debian GNU/FreeBSD"
-#~ msgstr "libc5 기반 데비안 GNU/FreeBSD"
+#~ msgid "Debian GNU/FreeBSD"
+#~ msgstr "데비안 GNU/FreeBSD"
 
 #~ msgid "Date announced"
 #~ msgstr "발표 날짜"
 
-#~ msgid "Debian GNU/FreeBSD"
-#~ msgstr "데비안 GNU/FreeBSD"
+#~ msgid "libc5-based Debian GNU/FreeBSD"
+#~ msgstr "libc5 기반 데비안 GNU/FreeBSD"
diff --git a/korean/po/templates.ko.po b/korean/po/templates.ko.po
index c40695c95c0..03d84593721 100644
--- a/korean/po/templates.ko.po
+++ b/korean/po/templates.ko.po
@@ -525,86 +525,49 @@ msgstr ""
 msgid "Back to the <a href=\"../\">Who's using Debian? page</a>."
 msgstr "<a href=\"../\">Who's using Debian 페이지</a>로 돌아갑니다."
 
-#~ msgid "Select a server near you"
-#~ msgstr "가까운 곳을 선택하세요"
+#~ msgid "Visit the site sponsor"
+#~ msgstr "이 사이트의 후원자"
 
-#~ msgid "More information:"
+#~ msgid "More information"
 #~ msgstr "추가 정보"
 
-#~ msgid "List of Consultants"
-#~ msgstr "컨설턴트 명단"
-
-#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
-#~ msgstr "<a href=\"./\">Debian 컨설턴트 페이지</a>로"
-
-#~ msgid "Download with Jigdo"
-#~ msgstr "jigdo를 이용한 다운로드"
-
-#~ msgid "Download via HTTP/FTP"
-#~ msgstr "http/ftp를 통한 다운로드"
+#~ msgid "Upcoming Attractions"
+#~ msgstr "곧 개최될 이벤트"
 
-#~ msgid "Buy CDs or DVDs"
-#~ msgstr "CD 또는 DVD 구입"
+#~ msgid "link may no longer be valid"
+#~ msgstr "연결이 유효하지 않을 수 있습니다"
 
-#~ msgid "Network Install"
-#~ msgstr "네트워크 설치"
+#~ msgid "When"
+#~ msgstr "때"
 
-#~ msgid "Debian CD team"
-#~ msgstr "데비안 CD 팀"
+#~ msgid "Where"
+#~ msgstr "장소"
 
-#~ msgid "buy"
-#~ msgstr "구입"
+#~ msgid "More Info"
+#~ msgstr "추가 정보"
 
-#~ msgid "Vote"
-#~ msgstr "투표"
+#~ msgid "Debian Involvement"
+#~ msgstr "데비안 관련 정보"
 
-#~ msgid "network install"
-#~ msgstr "네트워크 설치"
+#~ msgid "Main Coordinator"
+#~ msgstr "메인 코디네이터"
 
-#~ msgid ""
-#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
-#~ "information on contacting us."
-#~ msgstr ""
-#~ "우리와 연락하고자 한다면 <a href=\"m4_HOME/contact\">우리에게 연락하기</a>"
-#~ "를 참고하세요."
+#~ msgid "<th>Project</th><th>Coordinator</th>"
+#~ msgstr "<th>프로젝트</th><th>코디네이터</th>"
 
-#~ msgid "Vulnerable"
-#~ msgstr "위험성"
+#~ msgid "Related Links"
+#~ msgstr "관련 링크"
 
-#~ msgid "Fixed in"
-#~ msgstr "수정"
+#~ msgid "Latest News"
+#~ msgstr "최신 소식"
 
 #, fuzzy
+#~| msgid ""
+#~| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
+#~| "list</a>."
 #~ msgid ""
-#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
-#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
-#~ msgstr ""
-#~ "데비안 주간 뉴스는 <a href=\"mailto:dwn@debian.org\">Joey Hess</a>가 편집"
-#~ "하고 있습니다."
-
-#~ msgid "Summary"
-#~ msgstr "요약"
-
-#~ msgid "Version"
-#~ msgstr "버전"
-
-#~ msgid "DLS Index"
-#~ msgstr "DLS 인덱스"
-
-#~ msgid "License Information"
-#~ msgstr "라이선스 정보"
-
-#~ msgid "package info"
-#~ msgstr "패키지 정보"
-
-#~ msgid "No packages waiting to be adopted"
-#~ msgstr "입양을 기다리는 패키지 없음"
-
-#~ msgid "No orphaned packages"
-#~ msgstr "고아 패키지 없음"
-
-#~ msgid ""
-#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
+#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
 #~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
 #~ "list</a>."
 #~ msgstr ""
@@ -613,7 +576,7 @@ msgstr "<a href=\"../\">Who's using Debian 페이지</a>로 돌아갑니다."
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
 #~ "debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "데비안 주간 뉴스는 <a href=\"mailto:dwn@debian.org\">Joey Hess</a>가 편집"
@@ -621,57 +584,94 @@ msgstr "<a href=\"../\">Who's using Debian 페이지</a>로 돌아갑니다."
 
 #, fuzzy
 #~ msgid ""
-#~ "<void id=\"singular\" />Debian Project News is edited by <a href=\"mailto:"
+#~ "<void id=\"plural\" />Debian Project News is edited by <a href=\"mailto:"
 #~ "debian-publicity@lists.debian.org\">%s</a>."
 #~ msgstr ""
 #~ "데비안 주간 뉴스는 <a href=\"mailto:dwn@debian.org\">Joey Hess</a>가 편집"
 #~ "하고 있습니다."
 
-#, fuzzy
-#~| msgid ""
-#~| "To receive this newsletter weekly in your mailbox, <a href=\"https://"
-#~| "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
-#~| "list</a>."
 #~ msgid ""
-#~ "To receive this newsletter bi-weekly in your mailbox, <a href=\"https://"
+#~ "To receive this newsletter weekly in your mailbox, <a href=\"https://"
 #~ "lists.debian.org/debian-news/\">subscribe to the debian-news mailing "
 #~ "list</a>."
 #~ msgstr ""
 #~ "이 뉴스를 매주 받아 보려면, <a href=\"https://lists.debian.org/debian-"
 #~ "news/\">debian-news 메일링 리스트에 가입</a>하세요."
 
-#~ msgid "Latest News"
-#~ msgstr "최신 소식"
+#~ msgid "No orphaned packages"
+#~ msgstr "고아 패키지 없음"
 
-#~ msgid "Related Links"
-#~ msgstr "관련 링크"
+#~ msgid "No packages waiting to be adopted"
+#~ msgstr "입양을 기다리는 패키지 없음"
 
-#~ msgid "<th>Project</th><th>Coordinator</th>"
-#~ msgstr "<th>프로젝트</th><th>코디네이터</th>"
+#~ msgid "package info"
+#~ msgstr "패키지 정보"
 
-#~ msgid "Main Coordinator"
-#~ msgstr "메인 코디네이터"
+#~ msgid "License Information"
+#~ msgstr "라이선스 정보"
 
-#~ msgid "Debian Involvement"
-#~ msgstr "데비안 관련 정보"
+#~ msgid "DLS Index"
+#~ msgstr "DLS 인덱스"
 
-#~ msgid "More Info"
-#~ msgstr "추가 정보"
+#~ msgid "Version"
+#~ msgstr "버전"
 
-#~ msgid "Where"
-#~ msgstr "장소"
+#~ msgid "Summary"
+#~ msgstr "요약"
 
-#~ msgid "When"
-#~ msgstr "때"
+#, fuzzy
+#~ msgid ""
+#~ "Debian Weekly News is edited by <a href=\"mailto:dwn@debian.org"
+#~ "\">Yooseong Yang and Martin 'Joey' Schulze</a>."
+#~ msgstr ""
+#~ "데비안 주간 뉴스는 <a href=\"mailto:dwn@debian.org\">Joey Hess</a>가 편집"
+#~ "하고 있습니다."
 
-#~ msgid "link may no longer be valid"
-#~ msgstr "연결이 유효하지 않을 수 있습니다"
+#~ msgid "Fixed in"
+#~ msgstr "수정"
 
-#~ msgid "Upcoming Attractions"
-#~ msgstr "곧 개최될 이벤트"
+#~ msgid "Vulnerable"
+#~ msgstr "위험성"
 
-#~ msgid "More information"
+#~ msgid ""
+#~ "See the Debian <a href=\"m4_HOME/contact\">contact page</a> for "
+#~ "information on contacting us."
+#~ msgstr ""
+#~ "우리와 연락하고자 한다면 <a href=\"m4_HOME/contact\">우리에게 연락하기</a>"
+#~ "를 참고하세요."
+
+#~ msgid "network install"
+#~ msgstr "네트워크 설치"
+
+#~ msgid "Vote"
+#~ msgstr "투표"
+
+#~ msgid "buy"
+#~ msgstr "구입"
+
+#~ msgid "Debian CD team"
+#~ msgstr "데비안 CD 팀"
+
+#~ msgid "Network Install"
+#~ msgstr "네트워크 설치"
+
+#~ msgid "Buy CDs or DVDs"
+#~ msgstr "CD 또는 DVD 구입"
+
+#~ msgid "Download via HTTP/FTP"
+#~ msgstr "http/ftp를 통한 다운로드"
+
+#~ msgid "Download with Jigdo"
+#~ msgstr "jigdo를 이용한 다운로드"
+
+#~ msgid "Back to the <a href=\"./\">Debian consultants page</a>."
+#~ msgstr "<a href=\"./\">Debian 컨설턴트 페이지</a>로"
+
+#~ msgid "List of Consultants"
+#~ msgstr "컨설턴트 명단"
+
+#~ msgid "More information:"
 #~ msgstr "추가 정보"
 
-#~ msgid "Visit the site sponsor"
-#~ msgstr "이 사이트의 후원자"
+#~ msgid "Select a server near you"
+#~ msgstr "가까운 곳을 선택하세요"
diff --git a/korean/po/vendors.ko.po b/korean/po/vendors.ko.po
index 07d82232b0e..436df201628 100644
--- a/korean/po/vendors.ko.po
+++ b/korean/po/vendors.ko.po
@@ -67,44 +67,44 @@ msgstr "소스"
 msgid "and"
 msgstr ""
 
-#~ msgid "Vendor:"
-#~ msgstr "판매사:"
-
-#~ msgid "Country:"
-#~ msgstr "국가"
+#~ msgid "Official CD"
+#~ msgstr "공식 CD"
 
-#~ msgid "Ship International:"
-#~ msgstr "국제 배송"
+#~ msgid "Official DVD"
+#~ msgstr "공식 DVD"
 
-#~ msgid "email:"
-#~ msgstr "전자우편"
+#~ msgid "Development Snapshot"
+#~ msgstr "개발 스냅샷"
 
-#~ msgid "CD Type:"
-#~ msgstr "CD 형태"
+#~ msgid "non-US included"
+#~ msgstr "non-US 포함"
 
-#~ msgid "DVD Type:"
-#~ msgstr "DVD 형태"
+#~ msgid "non-free included"
+#~ msgstr "non-free 포함"
 
-#~ msgid "Architectures:"
-#~ msgstr "아키텍처"
+#~ msgid "contrib included"
+#~ msgstr "contrib 포함"
 
 #~ msgid "Custom Release"
 #~ msgstr "커스텀 릴리스"
 
-#~ msgid "contrib included"
-#~ msgstr "contrib 포함"
+#~ msgid "Architectures:"
+#~ msgstr "아키텍처"
 
-#~ msgid "non-free included"
-#~ msgstr "non-free 포함"
+#~ msgid "DVD Type:"
+#~ msgstr "DVD 형태"
 
-#~ msgid "non-US included"
-#~ msgstr "non-US 포함"
+#~ msgid "CD Type:"
+#~ msgstr "CD 형태"
 
-#~ msgid "Development Snapshot"
-#~ msgstr "개발 스냅샷"
+#~ msgid "email:"
+#~ msgstr "전자우편"
 
-#~ msgid "Official DVD"
-#~ msgstr "공식 DVD"
+#~ msgid "Ship International:"
+#~ msgstr "국제 배송"
 
-#~ msgid "Official CD"
-#~ msgstr "공식 CD"
+#~ msgid "Country:"
+#~ msgstr "국가"
+
+#~ msgid "Vendor:"
+#~ msgstr "판매사:"