From e13780214d7911af890e8014617789d0b273509a Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 수, 15 12월 2021 09:56:37 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

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

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index ca941f2..8ee3ce8 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -154,6 +154,7 @@
     "issue": {
         "issueType": "�씠�뒋 �쑀�삎",
         "managementIssue": "�씠�뒋 愿�由�",
+        "searchIssue": "�씠�뒋 寃��깋",
         "createIssue": "�씠�뒋 留뚮뱾湲�",
         "issueStatus": "�씠�뒋 �긽�깭",
         "issueNumber": "�씠�뒋 踰덊샇",
@@ -218,6 +219,8 @@
         "settingTableDisplay": "�뀒�씠釉� �몴�떆 �꽕�젙",
         "deleteIssue": "�씠�뒋 �궘�젣",
         "wantToDeleteSelectIssue": "�꽑�깮�븳 �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
+        "wantToDeleteOnlySelectIssue": "�꽑�깮�븳 �씠�뒋留� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
+        "wantToDeleteSelectDownIssue": "�꽑�깮�븳 �씠�뒋�쓽 �븯�쐞 �씠�뒋媛� 議댁옱 �빀�땲�떎. \n �꽑�깮�븳 �씠�뒋�� �븯�쐞 �씠�뒋 紐⑤몢 �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
         "wantToDeleteSelectRelationIssue": "�꽑�깮�븳 �뿰愿� �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �뿰愿� �씠�뒋�뒗 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
         "failedToSaveFieldConditions": "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣",
         "failedToGetSearchFieldCondition": "寃��깋 �븘�뱶 議곌굔 媛��졇�삤湲� �떎�뙣",
@@ -556,6 +559,7 @@
     },
     "manageUser": {
         "manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
+        "manageAllIssueAndProjectPerm": "�쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린",
         "managePartnerPerm" : "�뾽泥�/ISP/�샇�뒪�똿 愿�由�",
         "manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
         "manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
@@ -697,13 +701,16 @@
         "add": "異붽�",
         "addFunction": "異붽�湲곕뒫",
         "downloadExcel": "�뿊�� �떎�슫濡쒕뱶",
+        "allDownloadExcel": "�뿊�� �쟾泥� �떎�슫濡쒕뱶",
         "importExcel": "Excel Import",
         "registerExcelUploadIssue": "�뿊�� �뾽濡쒕뱶 �씠�뒋 �벑濡�",
         "delete": "�궘�젣",
+        "selectDelete": "�꽑�깮 �빆紐� 紐⑤몢 �궘�젣",
         "checkPurgingTargets": "�궘�젣 ���긽 �솗�씤",
         "selectDestinationDeletion": "�궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.",
         "deleteFailed": "�궘�젣 �떎�뙣",
         "deleteSucceeded": "�궘�젣 �꽦怨�",
+        "emailTemplate": "�씠硫붿씪 �뀥�뵆由�",
         "content": "�궡�슜",
         "selectTarget": "���긽 �꽑�깮",
         "period": "湲곌컙",
@@ -783,6 +790,7 @@
         "createIssue": "�씠�뒋 �깮�꽦",
         "updateIssue": "�씠�뒋 蹂�寃�",
         "deleteIssue": "�씠�뒋 �궘�젣",
+        "deleteDownIssue": "�븯�쐞 �씠�뒋 �궘�젣",
         "sendMailIssue": "�씠�뒋 硫붿씪 �쟾�넚",
         "updateTitle": "�젣紐⑹씠 蹂�寃쎈릺�뿀�뒿�땲�떎.",
         "updateContent": "�궡�슜�씠 蹂�寃쎈릺�뿀�뒿�땲�떎.",
@@ -921,6 +929,7 @@
     },
     "ispField" : {
         "info": "ISP�젙蹂�",
+        "select": "ISP �꽑�깮",
         "add" : "ISP�깮�꽦",
         "name" : "ISP�씠由�",
         "ispName" : "ISP紐�",
@@ -940,6 +949,7 @@
     },
     "hostingField" : {
         "info": "�샇�뒪�똿�젙蹂�",
+        "select": "�샇�뒪�똿 �꽑�깮",
         "add" : "�샇�뒪�똿�깮�꽦",
         "name" : "�샇�뒪�똿�씠由�",
         "manager" : "�샇�뒪�똿�씠由�",

--
Gitblit v1.8.0