Revert "Revert "added Jongbaek Park""

This reverts commit 466e22203ec3bb25d05d40cff4a839288270454b.
OpenChain-KWG · Nov 20, 2018 · 0570490 · 0570490
1 parent 22144dc
commit 0570490
Show file tree

Hide file tree

Showing 20 changed files with 144 additions and 143 deletions.
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
@@ -3969,8 +3969,8 @@
       <tuv lang="EN-US">
         <seg>Prioritizing compliance promotes:</seg>
       </tuv>
-      <tuv lang="KO" changeid="Jang" changedate="20180525T124726Z" creationid="Jang" creationdate="20171205T140244Z">
-        <seg>컴플라이언스에 우선순위를 부여함으로 다음이 촉진된다..:</seg>
+      <tuv lang="KO" changeid="Jang" changedate="20181120T154156Z" creationid="Jang" creationdate="20171205T140244Z">
+        <seg>컴플라이언스에 우선순위를 부여함으로 다음이 촉진된다 :</seg>
       </tuv>
     </tu>
     <tu>
@@ -5453,8 +5453,8 @@
       <tuv lang="EN-US">
         <seg>This is the situation where more than set of license terms can apply to a piece of software.Conjunctive = Multiple licenses apply</seg>
       </tuv>
-      <tuv lang="KO" changeid="Jang" changedate="20180528T132702Z" creationid="Jang" creationdate="20180528T131802Z">
-        <seg>여러 라이선스 조항이 하나의 소프트웨어에 적용될 수 있는 상황입니다..결합형 (Conjunctive) =여러 라이선스가 적용됩니다.</seg>
+      <tuv lang="KO" changeid="Jang" changedate="20181120T154205Z" creationid="Jang" creationdate="20180528T131802Z">
+        <seg>여러 라이선스 조항이 하나의 소프트웨어에 적용될 수 있는 상황입니다.결합형 (Conjunctive) =여러 라이선스가 적용됩니다.</seg>
       </tuv>
     </tu>
     <tu>

diff --git a/openchain-curriculum-kr-level2.tmx b/openchain-curriculum-kr-level2.tmx
@@ -3969,8 +3969,8 @@
       <tuv xml:lang="EN-US">
         <seg>Prioritizing compliance promotes:</seg>
       </tuv>
-      <tuv xml:lang="KO" changeid="Jang" changedate="20180525T124726Z" creationid="Jang" creationdate="20171205T140244Z">
-        <seg>컴플라이언스에 우선순위를 부여함으로 다음이 촉진된다..:</seg>
+      <tuv xml:lang="KO" changeid="Jang" changedate="20181120T154156Z" creationid="Jang" creationdate="20171205T140244Z">
+        <seg>컴플라이언스에 우선순위를 부여함으로 다음이 촉진된다 :</seg>
       </tuv>
     </tu>
     <tu>
@@ -5453,8 +5453,8 @@
       <tuv xml:lang="EN-US">
         <seg>This is the situation where more than set of license terms can apply to a piece of software.<ph x="0">&lt;t0/&gt;</ph>Conjunctive<ph x="1">&lt;t1/&gt;</ph> = Multiple licenses apply</seg>
       </tuv>
-      <tuv xml:lang="KO" changeid="Jang" changedate="20180528T132702Z" creationid="Jang" creationdate="20180528T131802Z">
-        <seg>여러 라이선스 조항이 하나의 소프트웨어에 적용될 수 있는 상황입니다..<ph x="0">&lt;t0/&gt;</ph>결합형 (Conjunctive)<ph x="1">&lt;t1/&gt;</ph> =여러 라이선스가 적용됩니다.</seg>
+      <tuv xml:lang="KO" changeid="Jang" changedate="20181120T154205Z" creationid="Jang" creationdate="20180528T131802Z">
+        <seg>여러 라이선스 조항이 하나의 소프트웨어에 적용될 수 있는 상황입니다.<ph x="0">&lt;t0/&gt;</ph>결합형 (Conjunctive)<ph x="1">&lt;t1/&gt;</ph> =여러 라이선스가 적용됩니다.</seg>
       </tuv>
     </tu>
     <tu>

diff --git a/openchain-curriculum-kr-omegat.tmx b/openchain-curriculum-kr-omegat.tmx
@@ -3969,8 +3969,8 @@
       <tuv lang="EN-US">
         <seg>Prioritizing compliance promotes:</seg>
       </tuv>
-      <tuv lang="KO" changeid="Jang" changedate="20180525T124726Z" creationid="Jang" creationdate="20171205T140244Z">
-        <seg>컴플라이언스에 우선순위를 부여함으로 다음이 촉진된다..:</seg>
+      <tuv lang="KO" changeid="Jang" changedate="20181120T154156Z" creationid="Jang" creationdate="20171205T140244Z">
+        <seg>컴플라이언스에 우선순위를 부여함으로 다음이 촉진된다 :</seg>
       </tuv>
     </tu>
     <tu>
@@ -5453,8 +5453,8 @@
       <tuv lang="EN-US">
         <seg>This is the situation where more than set of license terms can apply to a piece of software.&lt;t0/&gt;Conjunctive&lt;t1/&gt; = Multiple licenses apply</seg>
       </tuv>
-      <tuv lang="KO" changeid="Jang" changedate="20180528T132702Z" creationid="Jang" creationdate="20180528T131802Z">
-        <seg>여러 라이선스 조항이 하나의 소프트웨어에 적용될 수 있는 상황입니다..&lt;t0/&gt;결합형 (Conjunctive)&lt;t1/&gt; =여러 라이선스가 적용됩니다.</seg>
+      <tuv lang="KO" changeid="Jang" changedate="20181120T154205Z" creationid="Jang" creationdate="20180528T131802Z">
+        <seg>여러 라이선스 조항이 하나의 소프트웨어에 적용될 수 있는 상황입니다.&lt;t0/&gt;결합형 (Conjunctive)&lt;t1/&gt; =여러 라이선스가 적용됩니다.</seg>
       </tuv>
     </tu>
     <tu>

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