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

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

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 2d9bbd3..39170e0 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": "�뿰愿� �씠�뒋 �젣紐�",
@@ -232,6 +235,7 @@
         "failedToIssueTypeListLookup": "�씠�뒋 �쑀�삎 紐⑸줉 議고쉶 �떎�뙣",
         "failedToPriorityListLookup": "�슦�꽑�닚�쐞 紐⑸줉 議고쉶 �떎�뙣",
         "failedToCriticalListLookup": "以묒슂�룄 紐⑸줉 議고쉶 �떎�뙣",
+        "failedToPartnerListLookup": "�뙆�듃�꼫 紐⑸줉 議고쉶 �떎�뙣",
         "failedToUserDefinedFieldListLookup": "�궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 議고쉶 �떎�뙣",
         "failedToIssueTableColumnLookup": "�씠�뒋 �뀒�씠釉� 而щ읆 議고쉶 �떎�뙣",
         "failedToIssueAddIssueRelation": "�뿰愿� �씠�뒋 異붽� �떎�뙣",
@@ -558,7 +562,10 @@
         "failedNoticeRegistration": "怨듭��궗�빆 �벑濡� �떎�뙣",
         "failedToLookupNotificationList": "怨듭� �궗�빆 紐⑸줉 議고쉶 �떎�뙣",
         "failedToModifyNotice": "怨듭� �궗�빆 �닔�젙 �떎�뙣",
-        "failedToLookupNotificationDetails": "怨듭��궗�빆 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+        "failedToLookupNotificationDetails": "怨듭��궗�빆 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
+        "delete": "怨듭��궗�빆 �궘�젣",
+        "wantToDeleteSelectNotice": "�꽑�깮�븳 怨듭��궗�빆�쓣 �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 怨듭��궗�빆�� 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "notHaveDeletePermissionExists": "�궘�젣 沅뚰븳�씠 �뾾�뒗 怨듭��궗�빆�씠 議댁옱�빀�땲�떎."
     },
     "manageUser": {
         "manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
@@ -593,7 +600,10 @@
         "failedToModifyFAQ": "FAQ �닔�젙 �떎�뙣",
         "failedToLookupFAQDetails": "FAQ �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
         "failedToActivation": "FAQ �솢�꽦 �떎�뙣",
-        "activation": "�솢�꽦�솕"
+        "activation": "�솢�꽦�솕",
+        "delete": "FAQ �궘�젣",
+        "wantToDeleteSelect": "�꽑�깮�븳 FAQ瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 FAQ�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "notHaveDeletePermissionExists": "�궘�젣 沅뚰븳�씠 �뾾�뒗 FAQ媛� 議댁옱�빀�땲�떎."
     },
     "QNA": {
         "QNA": "QnA",
@@ -604,7 +614,10 @@
         "failedQNARegistration": "QnA �벑濡� �떎�뙣.",
         "failedToLookupQNAList": "QnA 紐⑸줉 議고쉶 �떎�뙣",
         "failedToModifyQNA": "QnA �닔�젙 �떎�뙣",
-        "failedToLookupQNADetails": "QnA �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+        "failedToLookupQNADetails": "QnA �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
+        "delete": "QnA �궘�젣",
+        "wantToDeleteSelect": "�꽑�깮�븳 QnA瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 QnA�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "notHaveDeletePermissionExists": "�궘�젣 沅뚰븳�씠 �뾾�뒗 QnA媛� 議댁옱�빀�땲�떎."
     },
     "event": {
         "event": "�씠踰ㅽ듃",
@@ -630,7 +643,10 @@
         "failedToModifyGuide": "媛��씠�뱶 �닔�젙 �떎�뙣",
         "failedToLookupGuideDetails": "媛��씠�뱶 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
         "failedToActivation": "媛��씠�뱶 �솢�꽕 �떎�뙣",
-        "activation": "�솢�꽦�솕"
+        "activation": "�솢�꽦�솕",
+        "delete": "媛��씠�뱶 �궘�젣",
+        "wantToDeleteSelect": "�꽑�깮�븳 媛��씠�뱶瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 媛��씠�뱶�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "notHaveDeletePermissionExists": "�궘�젣 沅뚰븳�씠 �뾾�뒗 媛��씠�뱶媛� 議댁옱�빀�땲�떎."
     },
     "inquiry": {
         "toInquiry": "臾몄쓽�븯湲�",
@@ -697,6 +713,9 @@
         "register": "�벑濡앹옄",
         "startDate": "�떆�옉�씪",
         "endDate": "醫낅즺�씪",
+        "company": "�뾽泥�",
+        "isp": "ISP",
+        "hosting": "�샇�뒪�똿",
         "english": "�쁺�뼱",
         "korean": "�븳援��뼱",
         "japaneseLanguage": "�씪蹂몄뼱",
@@ -791,6 +810,7 @@
         "disableParticipationWorkspace": "李몄뿬 �뾽臾� 怨듦컙 鍮꾪솢�꽦�솕 �븣由�",
         "disableParticipationWorkspaceMessage": "�쁽�옱 �씠�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�뿉�꽌 �젣�쇅�릺�뿀�뒿�땲�떎.",
         "alertsAboutSystem": "�떆�뒪�뀥 �븣由� �젙蹂�",
+        "alertSystem": "�떆�뒪�뀥 �븣由�",
         "newAlert": "�깉濡쒖슫 �븣由쇱씠 �솕�뒿�땲�떎.",
         "pleaseWait": "�옞�떆留� 湲곕떎�젮二쇱꽭�슂...",
         "createIssue": "�씠�뒋 �깮�꽦",
@@ -832,8 +852,9 @@
         "emptyUser": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄媛� �뾾�뒿�땲�떎.",
         "emptyProject": "�꽑�깮�븷 �닔 �엳�뒗 �봽濡쒖젥�듃媛� �뾾�뒿�땲�떎.",
         "emptyDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
-        "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �썙�겕�뵆濡쒖슦�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br> 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
+        "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
         "noDepartment": "�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.",
+        "emptyCompanyPartners": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥� �젙蹂닿� �뾾�뒿�땲�떎.",
         "emptyCompany": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥닿� �뾾�뒿�땲�떎.",
         "emptyIssue": "�꽑�깮�븷 �닔 �엳�뒗 �씠�뒋媛� �뾾�뒿�땲�떎.",
         "emptyIsp": "�꽑�깮�븷 �닔 �엳�뒗 ISP媛� �뾾�뒿�땲�떎.",
@@ -858,12 +879,14 @@
         "emailField": "�씠硫붿씪 �꽑�깮 �븘�뱶",
         "siteField": "URL �꽑�깮 �븘�뱶",
         "telField": "�쟾�솕踰덊샇 �꽑�깮 �븘�뱶",
-        "invalidipAdressFormat": "IP 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
-        "invalidNumberFormat": "�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.",
-        "invalidDateFormat": "�궇吏� �삎�떇�씠 留욎� �븡�뒿�땲�떎.(xxxx-xx-xx)",
-        "invalidEmailFormat": "�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
-        "invalidSiteFormat": "�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)",
-        "invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎(xxx-xxxx-xxxx)."
+        "invalidipAdressFormat": "* IP 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
+        "invalidNumberFormat": "* �닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.",
+        "invalidDateFormat": "* �궇吏� �삎�떇�씠 留욎� �븡�뒿�땲�떎.(xxxx-xx-xx)",
+        "invalidEmailFormat": "* �씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
+        "invalidSiteFormat": "* �솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http:// �삉�뒗 www 濡� �떆�옉�븯�뀛�빞�빀�땲�떎)",
+        "invalidTelFormat": "* �쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎(xxx-xxxx-xxxx).",
+        "invalidUrlFormat": "* url �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
+        "notIssueType": "�씠�뒋 �쑀�삎�씠 �뾾�뒿�땲�떎."
     },
     "tasks": {
         "agileBoardTitle": "移몃컲 蹂대뱶"
@@ -894,6 +917,7 @@
         "useIssueStatus" : "�궗�슜 媛��뒫�븳 �씠�뒋 �긽�깭",
         "successToApiTokenRemove" : "API �넗�겙 �궘�젣 �꽦怨�",
         "successToApiTokenCopy" : "API �넗�겙 蹂듭궗 �꽦怨�",
+        "failedToApiTokenCopy" : "API �넗�겙 蹂듭궗 �떎�뙣",
         "ApiTokenCopy" : "�넗�겙 蹂듭궗",
         "successToApiTokenAdd" : "API �넗�겙 �깮�꽦 �꽦怨�",
         "successToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �셿猷�",

--
Gitblit v1.8.0