From 398a4927e195755bd6a46be99337efd8dacc3dc2 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:08:13 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa

---
 src/main/webapp/i18n/ko/global.json |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 72f798b..045c675 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -263,6 +263,7 @@
         "notAllowedAttachment": "泥⑤�媛� �뿀�슜�릺吏� �븡�뒗 �뙆�씪�엯�땲�떎.",
         "nameErrorAttachment": "泥⑤� �뙆�씪紐� �삤瑜�",
         "succeededIssueRegistration": "�씠�뒋 �벑濡� �꽦怨�",
+        "succeededDownIssueRegistration": "�븯�쐞 �씠�뒋 �벑濡� �꽦怨�",
         "failedIssueRegistration": "�씠�뒋 �벑濡� �떎�뙣",
         "failedIssueModify": "�씠�뒋 �닔�젙 �떎�뙣",
         "failedToProjectDetails": "�봽濡쒖젥�듃 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
@@ -362,11 +363,15 @@
         "downIssueTitle": "�븯�쐞 �씠�뒋 �젣紐�",
         "downIssueType": "�븯�쐞 �씠�뒋 援щ텇",
         "addDownIssue": "�븯�쐞 �씠�뒋 異붽�",
+        "modifyDownIssue": "�븯�쐞 �씠�뒋 蹂�寃�",
         "downIssueRemove" : "�븯�쐞 �씠�뒋 �궘�젣",
         "failedToIssueAddIssueDown": "�븯�쐞 �씠�뒋 異붽� �떎�뙣",
         "failedToIssueDeleteIssueDown": "�븯�쐞 �씠�뒋 �궘�젣 �떎�뙣",
         "errorSelectDownIssue" : "�븯�쐞 �씠�뒋媛� �꽑�깮�릺吏� �븡�븯�뒿�땲�떎.",
-        "failedToIssueTypeDefault": "�씠�뒋 �쑀�삎 湲곕낯媛� 議고쉶 �떎�뙣"
+        "failedToIssueTypeDefault": "�씠�뒋 �쑀�삎 湲곕낯媛� 議고쉶 �떎�뙣",
+        "inheritPartners": "�뾽泥�/ISP/�샇�뒪�똿 �젙蹂� �긽�냽 �뿬遺�",
+        "wantToInheritPartnersOfParentIssue": "�긽�쐞�씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� �쁽�옱 �씠�뒋�뿉 �쟻�슜�떆�궎寃좎뒿�땲源�?",
+        "wantToInheritPartnersOfIssue": "�쁽�옱 �씠�뒋�쓽 �뙆�듃�꼫 �젙蹂�(�뾽泥�/ISP/�샇�뒪�똿)瑜� 紐⑤뱺 �븯�쐞�씠�뒋�뿉 �씪愿� �쟻�슜�떆�궎寃좎뒿�땲源�?"
     },
     "project": {
         "createProject": "�봽濡쒖젥�듃 留뚮뱾湲�",
@@ -678,6 +683,8 @@
         "failedToReceiveEnquiry": "臾몄쓽 �젒�닔 �떎�뙣"
     },
     "common": {
+        "ok" : "�꽕",
+        "no" : "�븘�땲�삤",
         "allIssueList" : "�쟾泥� �씠�뒋",
         "urgent": "湲닿툒",
         "high": "�넂�쓬",
@@ -989,7 +996,7 @@
         "industry" : "�궛�뾽 遺꾨쪟",
         "domain" : "�룄硫붿씤",
         "url"   : "url",
-        "ipAdress" : "ip二쇱냼",
+        "ipRange" : "ip ���뿭��",
         "tel" : "�뿰�씫泥�",
         "code" : "肄붾뱶",
         "email" : "�씠硫붿씪",
@@ -1012,7 +1019,8 @@
         "writeTel": "�쟾�솕踰덊샇瑜� �엯�젰�븯�뀛�빞 異붽��븷�닔 �엳�뒿�땲�떎.",
         "registerExcelCompanyFields": "�뿊��濡� �뾽泥� �벑濡앺븯湲�",
         "registerExcelUploadCompanyField": "�뿊�� �뾽濡쒕뱶 �뾽泥� �벑濡�",
-        "succeededCompanyFieldRegistration": "�뾽泥� �벑濡� �꽦怨�"
+        "succeededCompanyFieldRegistration": "�뾽泥� �벑濡� �꽦怨�",
+        "multiUrlWithComma": "�뿬�윭媛쒖쓽 url�쓣 �엯�젰 �븷 �닔 �엳�뒿�땲�떎. (援щ텇: 肄ㅻ쭏 ',') ex: www.test.com, www.test2.com"
     },
     "ispField" : {
         "info": "ISP�젙蹂�",

--
Gitblit v1.8.0