From ebfd37816a332308519b30af5bfb017c5052be69 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 13 1월 2022 17:34:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

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

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index e6ec15c..0aba0af 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -223,6 +223,8 @@
         "settingTableDisplay": "�뀒�씠釉� �몴�떆 �꽕�젙",
         "deleteIssue": "�씠�뒋 �궘�젣",
         "wantToDeleteSelectIssue": "�꽑�깮�븳 �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
+        "wantToDeleteSelectRelIssueInList": "�꽑�깮�븳 �씠�뒋瑜� �뿰愿� �씠�뒋 由ъ뒪�듃�뿉�꽌 �젣�쇅�떆�궎寃좎뒿�땲源�? \n �뿰愿� �씠�뒋 由ъ뒪�듃�뿉�꽌留� �젣�쇅�릺硫�, �떎�젣濡� �궘�젣�릺吏� �븡�뒿�땲�떎.",
+        "wantToDeleteSelectDownIssueInList": "�꽑�깮�븳 �씠�뒋瑜� �븯�쐞 �씠�뒋 由ъ뒪�듃�뿉�꽌 �젣�쇅�떆�궎寃좎뒿�땲源�? \n �븯�쐞 �씠�뒋 由ъ뒪�듃�뿉�꽌留� �젣�쇅�릺硫�, �떎�젣濡� �궘�젣�릺吏� �븡�뒿�땲�떎.",
         "wantToDeleteOnlySelectIssue": "�꽑�깮�븳 �씠�뒋留� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
         "wantToDeleteSelectDownIssue": "�꽑�깮�븳 �씠�뒋�쓽 �븯�쐞 �씠�뒋媛� 議댁옱 �빀�땲�떎. \n �꽑�깮�븳 �씠�뒋�� �븯�쐞 �씠�뒋 紐⑤몢 �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
         "wantToDeleteSelectRelationIssue": "�꽑�깮�븳 �뿰愿� �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �뿰愿� �씠�뒋�뒗 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
@@ -280,12 +282,16 @@
         "setIssueRelationTableDisplay": "�뿰愿� �씠�뒋 �뀒�씠釉� �몴�떆 �꽕�젙",
         "setIssueDownTableDisplay": "�븯�쐞 �씠�뒋 �뀒�씠釉� �몴�떆 �꽕�젙",
         "columnName": "而щ읆紐�",
+        "selectPartners": "�뾽泥� �꽑�깮",
+        "partners" : "�뾽泥� �씠硫붿씪",
         "area": "�꼻�씠",
         "displayed": "�몴�떆 �뿬遺�",
         "sequence": "�닚�꽌",
         "cannotChangedIssueTitle": "�씠�뒋 �젣紐⑹� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.",
         "cannotChangedIssueType": "�씠�뒋 援щ텇�� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.",
-        "selectSendIssueMail": "�씠�뒋 硫붿씪 諛쒖넚 ���긽�옄 �꽑�깮",
+        "selectSendIssueMail": "�뾽泥� 硫붿씪 諛쒖넚",
+        "CommonSendIssueMail": "�씪諛� 硫붿씪 諛쒖넚",
+        "SendIssueMail": "硫붿씪 諛쒖넚 �엯�젰",
         "sendIssueSelectedUsers": "�봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳�뒗 �떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.",
         "sendMail": "�씠硫붿씪 諛쒖넚",
         "changedHistory": "�씠�뒋 蹂�寃� �씠�젰 �긽�꽭�젙蹂�",
@@ -326,6 +332,10 @@
         "succeededIssueMail": "�씠�뒋 硫붿씪 諛쒖넚 �셿猷�",
         "sentToTheSelectedUser": "�꽑�깮�븳 �궗�슜�옄�뿉寃� �씠硫붿씪�씠 諛쒖넚�릺�뿀�뒿�땲�떎.",
         "failedIssueMail": "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣",
+        "selectedPartnersMail": "�뾽泥� �씠硫붿씪�쓣 �꽑�깮�븯�꽭�슂.",
+        "selectedPartnersTemplate": "�뾽泥� �씠硫붿씪 �뀥�뵆由우쓣 �꽑�깮�빐二쇱꽭�슂.",
+        "writeIssueMail": "�씠硫붿씪�쓣 �엯�젰�빐二쇱꽭�슂.",
+        "writeMail": "�씠硫붿씪�쓣 �엯�젰�븯�뀛�빞 異붽��븷�닔 �엳�뒿�땲�떎.",
         "issueVersionLookupFailed": "�씠�뒋 踰꾩쟾 議고쉶 �떎�뙣",
         "relationIssueType1" : "�떎�쓬 �씠�뒋�� 愿��젴�맖",
         "relationIssueType2" : "�떎�쓬 �씠�뒋�뿉 以묐났�맖",
@@ -513,7 +523,9 @@
         "invalidEmailFormat": "�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
         "enterYourEmailAddress": "�엯�젰�븳 �씠硫붿씪濡� �븣由쇱씠 諛쒖넚�맗�땲�떎. 瑗� �궗�슜�븯�떆�뒗 �씠硫붿씪濡� �엯�젰�븯�꽭�슂.",
         "least4CharactersPassword": "鍮꾨�踰덊샇�뒗 理쒖냼 4�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.",
+        "least8CharactersPassword": "鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 理쒖냼 8�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.",
         "enter4CharactersPassword": "鍮꾨�踰덊샇�뒗 4�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.",
+        "enter8CharactersPassword": "鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 8�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.",
         "differentPassword": "鍮꾨�踰덊샇媛� �떎由낅땲�떎.",
         "contactedEnterPhone": "�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.",
         "enterTheNameInWorkspace": "�궗�슜�븯怨� �떢�� �뾽臾닿났媛꾩쓽 �씠由꾩쓣 �엯�젰�븯�꽭�슂.",
@@ -657,6 +669,7 @@
         "failedToReceiveEnquiry": "臾몄쓽 �젒�닔 �떎�뙣"
     },
     "common": {
+        "allIssueList" : "�쟾泥� �씠�뒋",
         "urgent": "湲닿툒",
         "high": "�넂�쓬",
         "medium": "蹂댄넻",
@@ -693,6 +706,10 @@
         "checkAll": "�쟾泥� �꽑�깮",
         "unCheckAll": "�쟾泥� �빐�젣",
         "send": "蹂대궡湲�",
+        "emailExplain": "諛쏅뒗 �궗�엺�쓽 �씠硫붿씪 �삎�떇�쓣 �엯�젰�븯�뀛�빞 �빀�땲�떎.",
+        "sendToPerson" : "�떎瑜� �궗�슜�옄�뿉寃� 硫붿씪�쓣 蹂대깄�땲�떎.",
+        "least10CharactersPhone" : "�빖�뱶�룿 踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(10�옄由� �씠�긽)",
+        "least9CharactersTel" : "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)",
         "selected": "�꽑�깮�맖",
         "selectable": "�꽑�깮 媛��뒫",
         "password": "鍮꾨�踰덊샇",
@@ -709,6 +726,7 @@
         "priority": "�슦�꽑 �닚�쐞",
         "importance": "以묒슂�룄",
         "assignee": "�떞�떦�옄",
+        "toPerson": "諛쏅뒗 �궗�엺",
         "assigneeTeam" : "�떞�떦遺��꽌",
         "register": "�벑濡앹옄",
         "startDate": "�떆�옉�씪",
@@ -762,7 +780,7 @@
         "updatableStatus": "蹂�寃� 媛��뒫�븳 �긽�깭",
         "testCase": "�뀒�뒪�듃 耳��씠�뒪",
         "updateStatus": "�긽�깭 蹂�寃�",
-        "updateDownIssueAllStatus": "�븯�쐞 �씠�뒋�긽�깭 �쟾泥� 蹂�寃�",
+        "updateDownIssueStatus": "�븯�쐞 �씠�뒋�긽�깭 蹂�寃�",
         "tcmProject": "�뀒�뒪�듃 耳��씠�뒪 愿�由� �봽濡쒖젥�듃",
         "btsProject": "�씠�뒋 愿�由� �봽濡쒖젥�듃",
         "projectName": "�봽濡쒖젥�듃紐�",
@@ -809,6 +827,10 @@
         "failedToUpdateParticipatingSessions": "李몄뿬 �꽭�뀡 �뾽�뜲�씠�듃 �떎�뙣",
         "disableParticipationWorkspace": "李몄뿬 �뾽臾� 怨듦컙 鍮꾪솢�꽦�솕 �븣由�",
         "disableParticipationWorkspaceMessage": "�쁽�옱 �씠�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�뿉�꽌 �젣�쇅�릺�뿀�뒿�땲�떎.",
+        "changeUserLevel": "�궗�슜�옄 �벑湲� 蹂�寃�",
+        "logoutForLevelChange": "愿�由ъ옄�뿉 �쓽�빐 �벑湲됱씠 蹂�寃쎈릺�뼱 �꽭�뀡�씠 留뚮즺�릺�뿀�뒿�땲�떎. \n �떎�떆 濡쒓렇�씤 �빐二쇱꽭�슂.",
+        "changeUserDepartment": "�궗�슜�옄 遺��꽌 蹂�寃�",
+        "logoutForDepartmentChange": "愿�由ъ옄�뿉 �쓽�빐 遺��꽌媛� 蹂�寃쎈릺�뼱 �꽭�뀡�씠 留뚮즺�릺�뿀�뒿�땲�떎. \n �떎�떆 濡쒓렇�씤 �빐二쇱꽭�슂.",
         "alertsAboutSystem": "�떆�뒪�뀥 �븣由� �젙蹂�",
         "alertSystem": "�떆�뒪�뀥 �븣由�",
         "newAlert": "�깉濡쒖슫 �븣由쇱씠 �솕�뒿�땲�떎.",
@@ -845,6 +867,7 @@
         "failedToProjectListLookUp": "�봽濡쒖젥�듃 紐⑸줉 議고쉶 �떎�뙣",
         "failedToWorkflowListLookUp": "�썙�겕�뵆濡쒖슦 紐⑸줉 議고쉶 �떎�뙣",
         "failedToIssueListLookUp": "�씠�뒋 紐⑸줉 議고쉶 �떎�뙣",
+        "failedToCompanyCategoryListLookUp": "�뾽泥� 移댄뀒怨좊━ 紐⑸줉 議고쉶 �떎�뙣",
         "title": "�젣紐�",
         "number": "踰덊샇",
         "m": "�썡",
@@ -852,7 +875,7 @@
         "emptyUser": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄媛� �뾾�뒿�땲�떎.",
         "emptyProject": "�꽑�깮�븷 �닔 �엳�뒗 �봽濡쒖젥�듃媛� �뾾�뒿�땲�떎.",
         "emptyDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
-        "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �썙�겕�뵆濡쒖슦�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br>遺��꽌 愿�由ъ뿉�꽌 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
+        "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
         "noDepartment": "�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.",
         "emptyCompanyPartners": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥� �젙蹂닿� �뾾�뒿�땲�떎.",
         "emptyCompany": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥닿� �뾾�뒿�땲�떎.",
@@ -860,6 +883,11 @@
         "emptyIsp": "�꽑�깮�븷 �닔 �엳�뒗 ISP媛� �뾾�뒿�땲�떎.",
         "emptyHosting": "�꽑�깮�븷 �닔 �엳�뒗 HOSTING�씠 �뾾�뒿�땲�떎.",
         "emptyCustomField": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶媛� �뾾�뒿�땲�떎.",
+        "emptyCompanyType": "�꽑�깮�븷 �닔 �엳�뒗 湲곗뾽援щ텇�씠 �뾾�뒿�땲�떎.",
+        "emptyParentSector": "�꽑�깮�븷 �닔 �엳�뒗 �뾽醫�(��遺꾨쪟)�씠 �뾾�뒿�땲�떎.",
+        "emptyChildSector": "�꽑�깮�븷 �닔 �엳�뒗 �뾽醫�(以묐텇瑜�)�씠 �뾾�뒿�땲�떎.",
+        "emptyRegion": "�꽑�깮�븷 �닔 �엳�뒗 吏��뿭�씠 �뾾�뒿�땲�떎.",
+        "emptyStatus": "�꽑�깮�븷 �닔 �엳�뒗 �긽�깭媛� �뾾�뒿�땲�떎.",
         "department" : "遺��꽌",
         "level" : "�궗�슜�옄 �벑湲�",
         "manageDepartment": "遺��꽌 愿�由�",
@@ -925,7 +953,7 @@
         "successToApiIssueOverlap" : "以묐났媛� �꽕�젙 �셿猷�",
         "failedToApiIssueOverlap" : "以묐났媛� �꽕�젙 �떎�뙣",
         "failedToApiMonitor": "API 湲곕줉 議고쉶 �떎�뙣",
-        "requestSample": "API �슂泥� �깦�뵆",
+        "requestSample": "�궗�슜�옄 �젙�쓽 �븘�뱶 JSON �깦�뵆",
         "requestSampleAdd": "�씠�뒋 異붽�",
         "requestSampleModify": "�씠�뒋 �긽�깭 �닔�젙",
         "downIssueOverlapSetting" : "�븯�쐞 �씠�뒋 泥섎━ 湲곗� �빆紐�",
@@ -947,11 +975,16 @@
         "domain" : "�룄硫붿씤",
         "url"   : "url",
         "ipAdress" : "ip二쇱냼",
-        "manager" : "�떞�떦�옄",
-        "tel" : "�쟾�솕踰덊샇",
+        "tel" : "�뿰�씫泥�",
         "code" : "肄붾뱶",
         "email" : "�씠硫붿씪",
         "memo" : "鍮꾧퀬",
+        "companyType" : "湲곗뾽援щ텇",
+        "parentSector" : "�뾽醫�(��遺꾨쪟)",
+        "childSector" : "�뾽醫�(以묐텇瑜�)",
+        "region" : "吏��뿭",
+        "status" : "�긽�깭",
+        "description" : "�꽕紐�",
         "failedToSelectCompanyFieldFullList" : "�뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣",
         "delete" : "�뾽泥� �궘�젣",
         "wantToDeleteSelectCompanyField" : "�꽑�깮�븳 �뾽泥대�� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �뾽泥대뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
@@ -959,7 +992,12 @@
         "failedToDetailCompanyFieldModify" : "�뾽泥� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
         "pleaseEnterCompanyFieldName": "�뾽泥� �씠由꾩쓣 �엯�젰�븯�꽭�슂.",
         "enterSpecialCharacters": "�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎.",
-        "invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂."
+        "invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂.",
+        "writeCompanyTel": "�쟾�솕踰덊샇瑜� �엯�젰�빐二쇱꽭�슂.",
+        "writeTel": "�쟾�솕踰덊샇瑜� �엯�젰�븯�뀛�빞 異붽��븷�닔 �엳�뒿�땲�떎.",
+        "registerExcelCompanyFields": "�뿊��濡� �뾽泥� �벑濡앺븯湲�",
+        "registerExcelUploadCompanyField": "�뿊�� �뾽濡쒕뱶 �뾽泥� �벑濡�",
+        "succeededCompanyFieldRegistration": "�뾽泥� �벑濡� �꽦怨�"
     },
     "ispField" : {
         "info": "ISP�젙蹂�",
@@ -968,7 +1006,7 @@
         "name" : "ISP�씠由�",
         "ispName" : "ISP紐�",
         "manager" : "�떞�떦�옄",
-        "tel" : "�쟾�솕踰덊샇",
+        "tel" : "�뿰�씫泥�",
         "code" : "肄붾뱶",
         "email" : "�씠硫붿씪",
         "memo" : "鍮꾧퀬",
@@ -989,7 +1027,7 @@
         "manager" : "�샇�뒪�똿�씠由�",
         "hostingName" : "�샇�뒪�똿紐�",
         "manager" : "�떞�떦�옄",
-        "tel" : "�쟾�솕踰덊샇",
+        "tel" : "�뿰�씫泥�",
         "code" : "肄붾뱶",
         "email" : "�씠硫붿씪",
         "memo" : "鍮꾧퀬",

--
Gitblit v1.8.0