From fa1d927285d1a406d5717b0bde813768dba636be Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 화, 28 12월 2021 13:55:10 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/i18n/ko/global.json |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 58a1002..00d1919 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -26,8 +26,10 @@
         "issueName": "�씠�뒋�씠由�",
         "managementRisk": "�쐞�뿕 愿�由�",
         "updateIssueAndStatusUpdate": "鍮덈쾲�븳 �떞�떦�옄 蹂�寃�, �옦�� �긽�깭 蹂�寃� �벑 �씠�뒋 泥섎━�뿉 �쐞�뿕 �슂�냼媛� �엳�떎怨� 蹂댁뿬吏��뒗 �씠�뒋 紐⑸줉",
+        "updateIssueDepartmentAndStatusUpdate": "鍮덈쾲�븳 �떞�떦遺��꽌 蹂�寃�, �옦�� �긽�깭 蹂�寃� �벑 �씠�뒋 泥섎━�뿉 �쐞�뿕 �슂�냼媛� �엳�떎怨� 蹂댁뿬吏��뒗 �씠�뒋 紐⑸줉",
         "reversalStatusUpdate": "踰덈났�릺�뒗 �긽�깭 蹂�寃�",
         "reversalAssigneeUpdate": "鍮덈쾲�븳 �떞�떦�옄 蹂�寃�",
+        "reversalAssigneeTeamUpdate": "鍮덈쾲�븳 �떞�떦遺��꽌 蹂�寃�",
         "division": "援щ텇",
         "registeredByMeIssue": "�궡媛� �벑濡앺븳 �씠�뒋 �쁽�솴",
         "registeredTodayIssue": "�삤�뒛 �벑濡앺븳 �씠�뒋",
@@ -161,6 +163,7 @@
         "issueContent": "�씠�뒋 �궡�슜",
         "issueTitle": "�씠�뒋 �젣紐�",
         "issueInfo": "�씠�뒋 �젙蹂�",
+        "parentIssue": "�긽�쐞 �씠�뒋",
         "relationIssue": "�뿰愿� �씠�뒋",
         "addRelationIssue": "�뿰愿� �씠�뒋 異붽�",
         "relationIssueTitle": "�뿰愿� �씠�뒋 �젣紐�",
@@ -664,7 +667,6 @@
         "workspace": "�뾽臾닿났媛�",
         "project": "�봽濡쒖젥�듃",
         "issue": "�씠�뒋",
-        "parentIssue": "�긽�쐞 �씠�뒋",
         "setting": "�꽕�젙",
         "user": "�궗�슜�옄",
         "workflow": "�썙�겕�뵆濡쒖슦",
@@ -796,6 +798,7 @@
         "disableParticipationWorkspace": "李몄뿬 �뾽臾� 怨듦컙 鍮꾪솢�꽦�솕 �븣由�",
         "disableParticipationWorkspaceMessage": "�쁽�옱 �씠�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�뿉�꽌 �젣�쇅�릺�뿀�뒿�땲�떎.",
         "alertsAboutSystem": "�떆�뒪�뀥 �븣由� �젙蹂�",
+        "alertSystem": "�떆�뒪�뀥 �븣由�",
         "newAlert": "�깉濡쒖슫 �븣由쇱씠 �솕�뒿�땲�떎.",
         "pleaseWait": "�옞�떆留� 湲곕떎�젮二쇱꽭�슂...",
         "createIssue": "�씠�뒋 �깮�꽦",
@@ -837,8 +840,9 @@
         "emptyUser": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄媛� �뾾�뒿�땲�떎.",
         "emptyProject": "�꽑�깮�븷 �닔 �엳�뒗 �봽濡쒖젥�듃媛� �뾾�뒿�땲�떎.",
         "emptyDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
-        "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �썙�겕�뵆濡쒖슦�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br> 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
+        "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �썙�겕�뵆濡쒖슦�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br>遺��꽌 愿�由ъ뿉�꽌 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
         "noDepartment": "�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.",
+        "emptyCompanyPartners": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥� �젙蹂닿� �뾾�뒿�땲�떎.",
         "emptyCompany": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥닿� �뾾�뒿�땲�떎.",
         "emptyIssue": "�꽑�깮�븷 �닔 �엳�뒗 �씠�뒋媛� �뾾�뒿�땲�떎.",
         "emptyIsp": "�꽑�깮�븷 �닔 �엳�뒗 ISP媛� �뾾�뒿�땲�떎.",

--
Gitblit v1.8.0