From 9686c078f95e530e2d378aea86041a0fe31e0610 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Thu, 13 Mar 2014 08:53:17 +0000
Subject: [PATCH] Merged r12961 from trunk to 2.5-stable (#16334)

Korean Translation updated by Jong-Ha Ahn.

git-svn-id: http://svn.redmine.org/redmine/branches/2.5-stable@12962 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/locales/ko.yml | 45 +++++++++++++++++++------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index de1d36873..af5adfc1b 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1131,33 +1131,28 @@ ko:
   permission_add_documents: 문서 추가
   permission_edit_documents: 문서 편집
   permission_delete_documents: 문서 삭제
-  label_gantt_progress_line: Progress line
+  label_gantt_progress_line: 진행 선
   setting_jsonp_enabled: JSONP 허용
   field_inherit_members: 상위 프로젝트로부터 구성원을 상속
   field_closed_on: 완료일
-  field_generate_password: Generate password
+  field_generate_password: 비밀번호 생성
   setting_default_projects_tracker_ids: 새 프로젝트에 기본적으로 추가할 일감 유형
   label_total_time: 합계
-  notice_account_not_activated_yet: You haven't activated your account yet. If you want
-    to receive a new activation email, please <a href="%{url}">click this link</a>.
-  notice_account_locked: Your account is locked.
-  label_hidden: Hidden
-  label_visibility_private: to me only
-  label_visibility_roles: to these roles only
-  label_visibility_public: to any users
-  field_must_change_passwd: Must change password at next logon
-  notice_new_password_must_be_different: The new password must be different from the
-    current password
-  setting_mail_handler_excluded_filenames: Exclude attachments by name
-  text_convert_available: ImageMagick convert available (optional)
-  label_link: Link
-  label_only: only
-  label_drop_down_list: drop-down list
-  label_checkboxes: checkboxes
-  label_link_values_to: Link values to URL
-  setting_force_default_language_for_anonymous: Force default language for anonymous
-    users
-  setting_force_default_language_for_loggedin: Force default language for logged-in
-    users
-  label_custom_field_select_type: Select the type of object to which the custom field
-    is to be attached
+  notice_account_not_activated_yet: 계정이 활성화되지 않았습니다. 계정을 활성화하기 위해 메일을 다시 수신하려면 <a href="%{url}">여기를 클릭해 주세요</a>.
+  notice_account_locked: 계정이 잠겨 있습니다.
+  label_hidden: 숨김
+  label_visibility_private: 자신 만
+  label_visibility_roles: 다음 역할 만
+  label_visibility_public: 모든 사용자
+  field_must_change_passwd: 다음 로그온 시 반드시 암호를 변경해야 함
+  notice_new_password_must_be_different: 새 암호는 현재 암호와 달라야 합니다.
+  setting_mail_handler_excluded_filenames: 제외할 첨부 파일명
+  text_convert_available: ImageMagick 변환 사용 가능 (옵션)
+  label_link: 링크
+  label_only: 다음의 것만
+  label_drop_down_list: 드롭다운 목록
+  label_checkboxes: 체크박스
+  label_link_values_to: URL 링크 값
+  setting_force_default_language_for_anonymous: 익명 사용자의 기본 언어 강제
+  setting_force_default_language_for_loggedin: 로그인 사용자의 기본 언어 강제
+  label_custom_field_select_type: 사용자 정의 필드에 추가할 대상을 선택해주세요.
-- 
2.39.5