Merge pull request #28 from hakssung/master

Completed the Korean translation of OpenChain Curriculum 1.1.
OpenChain-KWG · Nov 20, 2018 · cb502c1 · cb502c1
2 parents 12213df + 0570490
commit cb502c1
Show file tree

Hide file tree

Showing 22 changed files with 534 additions and 519 deletions.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -1,4 +1,13 @@
-Maintainer: Haksung Jang, LG Electronics, [email protected]
+# Maintainer
+
+| Name | Company | Email |
+|--|--|--|
+| Haksung Jang | LG Electronics | [email protected] |
+| Jongbaek Park | BKL | [email protected] |
+
+
+# Contributor(s):
+
+| Name | Company | Email |
+|--|--|--|
 
-Contributor(s):
-Jongbaek Park, BKL, [email protected]
diff --git a/glossary/glossary.txt b/glossary/glossary.txt
@@ -10,7 +10,7 @@ Conformance	준수
 Introduction	소개
 Definition	정의
 artifacts	결과물
-organization	조직
+organization	기관
 Disclaimer	면책
 policy	정책
 process	프로세스
@@ -104,7 +104,7 @@ Translation	번역
 Integrating	통합
 Merging	병합
 Pasting	붙여넣기
-Adapting	개작	Adapting
+Adapting	각색
 Inserting	삽입
 Pairing	페어링
 Combining	결합
@@ -138,15 +138,15 @@ Registration	등록
 Notice	고지
 verification	검증
 Outcome	결과
-issue	문제
+issue	이슈
 template	템플릿
 report	보고서
 Proprietary	독점
 Legend	범례
 User Space	사용자 영역
 Kernel Space	커널 영역
 Architecture	아키텍처
-accompanying	수반하는
+accompanying	동반하는
 Avoidance	방지
 staff	직원
 end to end	전과정
@@ -179,3 +179,5 @@ Application	애플리케이션
 mobile device	모바일 기기
 JavaScript	자바스크립트
 Disjunctive	선택형
+term of art	전문 용어
+attribution or notice information	고지 정보
diff --git a/omegat/last_entry.properties b/omegat/last_entry.properties
@@ -1,4 +1,4 @@
-#Thu May 31 21:15:45 KST 2018
+#Wed Nov 21 00:43:08 KST 2018
 LAST_ENTRY_FILE=slides/openchain-curriculum-for-1-1.pptx
-LAST_ENTRY_SRC=Templates such as these may be created by engineering teams to help educate the FOSS review team about planned FOSS usage.
-LAST_ENTRY_NUMBER=1228
+LAST_ENTRY_SRC=This is the situation where more than set of license terms can apply to a piece of software.<t0/>Conjunctive<t1/> \= Multiple licenses apply
+LAST_ENTRY_NUMBER=1038
diff --git a/omegat/project_save.tmx b/omegat/project_save.tmx
diff --git a/omegat/project_stats.txt b/omegat/project_stats.txt
@@ -1,4 +1,4 @@
-18. 5. 31 오후 9:15
+18. 11. 21 오전 12:43
 프로젝트 통계
 
       	  부분	   단어	문자 (공백 없이)	문자 (공백 포함)	#Files	

diff --git a/openchain-curriculum-kr-level1.tmx b/openchain-curriculum-kr-level1.tmx
diff --git a/openchain-curriculum-kr-level2.tmx b/openchain-curriculum-kr-level2.tmx
diff --git a/openchain-curriculum-kr-omegat.tmx b/openchain-curriculum-kr-omegat.tmx
diff --git a/1.0-kr/Chapter01.md → release/1.0/Chapter01.md b/1.0-kr/Chapter01.md → release/1.0/Chapter01.md
diff --git a/1.0-kr/Chapter02.md → release/1.0/Chapter02.md b/1.0-kr/Chapter02.md → release/1.0/Chapter02.md
diff --git a/1.0-kr/Chapter03.md → release/1.0/Chapter03.md b/1.0-kr/Chapter03.md → release/1.0/Chapter03.md
diff --git a/1.0-kr/Chapter04.md → release/1.0/Chapter04.md b/1.0-kr/Chapter04.md → release/1.0/Chapter04.md
diff --git a/1.0-kr/Chapter05.md → release/1.0/Chapter05.md b/1.0-kr/Chapter05.md → release/1.0/Chapter05.md
diff --git a/1.0-kr/Chapter06.md → release/1.0/Chapter06.md b/1.0-kr/Chapter06.md → release/1.0/Chapter06.md
diff --git a/1.0-kr/Chapter07.md → release/1.0/Chapter07.md b/1.0-kr/Chapter07.md → release/1.0/Chapter07.md
diff --git a/1.0-kr/README.md → release/1.0/README.md b/1.0-kr/README.md → release/1.0/README.md
diff --git a/...e/openchain-curriculum-release-1-kor.pptx → ...e/openchain-curriculum-release-1-kor.pptx b/...e/openchain-curriculum-release-1-kor.pptx → ...e/openchain-curriculum-release-1-kor.pptx
diff --git a/release/1.1/openchain-curriculum-for-1-1-Kor.pptx b/release/1.1/openchain-curriculum-for-1-1-Kor.pptx
diff --git a/target/checklists/Checklists.docx b/target/checklists/Checklists.docx
diff --git a/target/practices/recommendedcompliancepractices.docx b/target/practices/recommendedcompliancepractices.docx
diff --git a/target/practices/recommendedengineeringpractices.docx b/target/practices/recommendedengineeringpractices.docx
diff --git a/target/slides/openchain-curriculum-for-1-1.pptx b/target/slides/openchain-curriculum-for-1-1.pptx