From cf362cbfd4a92b5e42f0d3992baad3a7d3295366 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 04 11월 2021 12:52:36 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

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

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 0eafed8..2bdc5d8 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -138,7 +138,8 @@
         "failedToModifyWorkspaceName": "�뾽臾� 怨듦컙 紐� �닔�젙 �떎�뙣",
         "failedToRegularPaymentChange": "�젙湲� 寃곗젣 蹂�寃� �떎�뙣",
         "failedToParticipationStatusChange": "李몄뿬 �긽�깭 蹂�寃� �떎�뙣",
-        "failedToSelectWorkspaceFullUserList": "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣"
+        "failedToSelectWorkspaceFullUserList": "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣",
+        "failedToModifyUserLevel": "�궗�슜�옄 �벑湲� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
     },
     "issue": {
         "issueType": "�씠�뒋 �쑀�삎",
@@ -290,6 +291,7 @@
         "projectType": "�봽濡쒖젥�듃 ���엯",
         "projectAdmin": "�봽濡쒖젥�듃 愿�由ъ옄",
         "projectTeam": "�봽濡쒖젥�듃 ���썝",
+        "projectDepartment": "�봽濡쒖젥�듃 �떞�떦遺��꽌",
         "modifyProject": "�봽濡쒖젥�듃 �닔�젙",
         "settingCustomFields": "�궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙",
         "selectCustomField": "�궗�슜�옄 �젙�쓽 �븘�뱶 �꽑�깮",
@@ -496,9 +498,11 @@
     },
     "manageUser": {
         "manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
+        "manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
         "manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
         "manageIssueSystemPerm": "�씠�뒋 �떆�뒪�뀥 愿�由�",
         "manageUserPerm": "�궗�슜�옄 愿�由�",
+        "manageApiPerm" : "API 愿�由�",
         "manageNoticePerm": "怨듭��궗�빆 愿�由�",
         "manageFAQPerm": "FAQ 愿�由�",
         "manageQnAPerm": "QnA 愿�由�",
@@ -599,6 +603,9 @@
         "changeReason": "蹂�寃� �궗�쑀",
         "failedToIssueStatusListLookup": "�씠�뒋 �긽�깭 紐⑸줉 議고쉶 �떎�뙣",
         "customField": "�궗�슜�옄 �젙�쓽 �븘�뱶",
+        "customCompanyField" : "�뾽泥� 愿�由�",
+        "customIspField" : "ISP 愿�由�",
+        "customHostingField" : "�샇�뒪�똿 愿�由�",
         "select": "�꽑�깮",
         "checkAll": "�쟾泥� �꽑�깮",
         "unCheckAll": "�쟾泥� �빐�젣",
@@ -770,5 +777,29 @@
         "create" : "�넗�겙 �깮�꽦",
         "example" : "�궗�슜 �삁�떆",
         "columnSetting" : "湲곕낯媛� �꽕�젙"
+    },
+    "companyField" : {
+        "add" : "�뾽泥� �깮�꽦",
+        "name" : "�뾽泥� �씠由�",
+        "manager" : "�떞�떦�옄",
+        "tel" : "�쟾�솕踰덊샇",
+        "email" : "�씠硫붿씪",
+        "desc" : "鍮꾧퀬"
+    },
+    "ispField" : {
+        "add" : "ISP �깮�꽦",
+        "name" : "ISP �씠由�",
+        "manager" : "�떞�떦�옄",
+        "tel" : "�쟾�솕踰덊샇",
+        "email" : "�씠硫붿씪",
+        "desc" : "鍮꾧퀬"
+    },
+    "hostingField" : {
+        "add" : "�샇�뒪�똿 �깮�꽦",
+        "name" : "�샇�뒪�똿 �씠由�",
+        "manager" : "�떞�떦�옄",
+        "tel" : "�쟾�솕踰덊샇",
+        "email" : "�씠硫붿씪",
+        "desc" : "鍮꾧퀬"
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0