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 | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index c647a9a..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": "�씠�뒋 踰덊샇",
@@ -558,8 +559,7 @@
},
"manageUser": {
"manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
- "manageAllIssuePerm": "�쟾泥� �씠�뒋 蹂닿린",
- "manageAllProjectPerm": "�쟾泥� �봽濡쒖젥�듃 蹂닿린",
+ "manageAllIssueAndProjectPerm": "�쟾泥� �씠�뒋 �봽濡쒖젥�듃 蹂닿린",
"managePartnerPerm" : "�뾽泥�/ISP/�샇�뒪�똿 愿�由�",
"manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
"manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
@@ -701,13 +701,16 @@
"add": "異붽�",
"addFunction": "異붽�湲곕뒫",
"downloadExcel": "�뿊�� �떎�슫濡쒕뱶",
+ "allDownloadExcel": "�뿊�� �쟾泥� �떎�슫濡쒕뱶",
"importExcel": "Excel Import",
"registerExcelUploadIssue": "�뿊�� �뾽濡쒕뱶 �씠�뒋 �벑濡�",
"delete": "�궘�젣",
+ "selectDelete": "�꽑�깮 �빆紐� 紐⑤몢 �궘�젣",
"checkPurgingTargets": "�궘�젣 ���긽 �솗�씤",
"selectDestinationDeletion": "�궘�젣 ���긽�쓣 �꽑�깮�븯�꽭�슂.",
"deleteFailed": "�궘�젣 �떎�뙣",
"deleteSucceeded": "�궘�젣 �꽦怨�",
+ "emailTemplate": "�씠硫붿씪 �뀥�뵆由�",
"content": "�궡�슜",
"selectTarget": "���긽 �꽑�깮",
"period": "湲곌컙",
@@ -926,6 +929,7 @@
},
"ispField" : {
"info": "ISP�젙蹂�",
+ "select": "ISP �꽑�깮",
"add" : "ISP�깮�꽦",
"name" : "ISP�씠由�",
"ispName" : "ISP紐�",
@@ -945,6 +949,7 @@
},
"hostingField" : {
"info": "�샇�뒪�똿�젙蹂�",
+ "select": "�샇�뒪�똿 �꽑�깮",
"add" : "�샇�뒪�똿�깮�꽦",
"name" : "�샇�뒪�똿�씠由�",
"manager" : "�샇�뒪�똿�씠由�",
--
Gitblit v1.8.0