From 49a02aa2071bcaf94f0f8c19e2578cd7650160a4 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 금, 10 12월 2021 19:22:13 +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 3c091ba..1a16158 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -558,6 +558,7 @@
     },
     "manageUser": {
         "manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
+        "manageAllIssueAndProjectPerm": "�쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린",
         "managePartnerPerm" : "�뾽泥�/ISP/�샇�뒪�똿 愿�由�",
         "manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
         "manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
@@ -888,12 +889,13 @@
         "failedToApiMonitor": "API 湲곕줉 議고쉶 �떎�뙣",
         "requestSample": "API �슂泥� �깦�뵆",
         "requestSampleAdd": "�씠�뒋 異붽�",
-        "requestSampleModify": "�씠�뒋 �닔�젙",
+        "requestSampleModify": "�씠�뒋 �긽�깭 �닔�젙",
         "downIssueOverlapSetting" : "�븯�쐞 �씠�뒋 泥섎━ 湲곗� �빆紐�",
         "upIssueCompleteIssueStatus" : "�긽�쐞 �씠�뒋 �옄�룞醫낅즺 �씠�뒋 �긽�깭 �꽕�젙",
         "autoCompleteIssueStatus" : "�옄�룞 醫낅즺 �꽕�젙�븷 �씠�뒋 �긽�깭",
         "successToApiAutoCompleteIssueStatus" : "�옄�룞 醫낅즺 �씠�뒋 �긽�깭 �꽕�젙 �셿猷�",
-        "failedToApiAutoCompleteIssueStatus" : "�옄�룞 醫낅즺 �씠�뒋 �긽�깭 �꽕�젙 �떎�뙣"
+        "failedToApiAutoCompleteIssueStatus" : "�옄�룞 醫낅즺 �씠�뒋 �긽�깭 �꽕�젙 �떎�뙣",
+        "requestSampleModifyDesc" : "(�닔�젙�떆 customField �빆紐⑹� 寃��깋 �슜�룄濡� �궗�슜�맖)"
     },
     "companyField" : {
         "info": "�뾽泥댁젙蹂�",
@@ -923,6 +925,7 @@
     },
     "ispField" : {
         "info": "ISP�젙蹂�",
+        "select": "ISP �꽑�깮",
         "add" : "ISP�깮�꽦",
         "name" : "ISP�씠由�",
         "ispName" : "ISP紐�",
@@ -942,6 +945,7 @@
     },
     "hostingField" : {
         "info": "�샇�뒪�똿�젙蹂�",
+        "select": "�샇�뒪�똿 �꽑�깮",
         "add" : "�샇�뒪�똿�깮�꽦",
         "name" : "�샇�뒪�똿�씠由�",
         "manager" : "�샇�뒪�똿�씠由�",

--
Gitblit v1.8.0