From 7b4b71ee33c7a42383d3e6a69885d521fd7b6688 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 수, 08 12월 2021 17:25:23 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

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

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 3b3f8a4..c0a6a8d 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -870,7 +870,7 @@
         "create" : "�넗�겙 �깮�꽦",
         "example" : "�궗�슜 �삁�떆",
         "columnSetting" : "湲곕낯媛� �꽕�젙",
-        "overlapSetting" : "以묐났 �븘�뱶 �꽕�젙",
+        "overlapSetting" : "�븯�쐞 �씠�뒋 �꽕�젙",
         "addOverlapField" : "以묐났 �븘�뱶 異붽�",
         "failedToApiTokenFind" : "API �넗�겙 議고쉶 �떎�뙣",
         "failedToApiTokenRemove" : "API �넗�겙 �궘�젣 �떎�뙣",
@@ -885,7 +885,12 @@
         "failedToApiMonitor": "API 湲곕줉 議고쉶 �떎�뙣",
         "requestSample": "API �슂泥� �깦�뵆",
         "requestSampleAdd": "�씠�뒋 異붽�",
-        "requestSampleModify": "�씠�뒋 �닔�젙"
+        "requestSampleModify": "�씠�뒋 �닔�젙",
+        "downIssueOverlapSetting" : "�븯�쐞 �씠�뒋 泥섎━ 湲곗� �빆紐�",
+        "upIssueCompleteIssueStatus" : "�긽�쐞 �씠�뒋 �옄�룞醫낅즺 �씠�뒋 �긽�깭 �꽕�젙",
+        "autoCompleteIssueStatus" : "�옄�룞 醫낅즺 �꽕�젙�븷 �씠�뒋 �긽�깭",
+        "successToApiAutoCompleteIssueStatus" : "�옄�룞 醫낅즺 �씠�뒋 �긽�깭 �꽕�젙 �셿猷�",
+        "failedToApiAutoCompleteIssueStatus" : "�옄�룞 醫낅즺 �씠�뒋 �긽�깭 �꽕�젙 �떎�뙣"
     },
     "companyField" : {
         "info": "�뾽泥댁젙蹂�",

--
Gitblit v1.8.0