From b31979feb926bad9e0070332fb5ed7a896fd378d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 15 11월 2021 17:09:21 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 386b178..7f4d968 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -767,7 +767,10 @@
         "departmentName": "遺��꽌紐�",
         "departmentEx": "遺��꽌�꽕紐�",
         "departmentCount": "遺��꽌�씤�썝",
-        "departmentUser": "遺��꽌 ���썝"
+        "departmentUser": "遺��꽌 ���썝",
+        "detectingInfo": "�깘吏��젙蹂�",
+        "detectingData": "�깘吏��씪�떆",
+        "import": "媛��졇�삤湲�"
     },
     "tasks": {
         "agileBoardTitle": "移몃컲 蹂대뱶"
@@ -798,12 +801,14 @@
         "successToApiTokenAdd" : "API �넗�겙 �깮�꽦 �꽦怨�"
     },
     "companyField" : {
+        "info": "�뾽泥� �젙蹂�",
         "add" : "�뾽泥� �깮�꽦",
         "name" : "�뾽泥� �씠由�",
         "company" : "�뾽泥� 遺꾨쪟",
         "profitYN" : "�쁺由�/鍮꾩쁺由�",
         "industry" : "�궛�뾽 遺꾨쪟",
         "domain" : "�룄硫붿씤",
+        "ipAdress" : "ip二쇱냼",
         "manager" : "�떞�떦�옄",
         "tel" : "�쟾�솕踰덊샇",
         "code" : "肄붾뱶",
@@ -819,6 +824,7 @@
         "invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂."
     },
     "ispField" : {
+        "info": "ISP �젙蹂�",
         "add" : "ISP �깮�꽦",
         "name" : "ISP �씠由�",
         "manager" : "�떞�떦�옄",
@@ -836,6 +842,7 @@
         "invalidCodeFormat": "肄붾뱶紐낆뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎."
     },
     "hostingField" : {
+        "info": "�샇�뒪�똿 �젙蹂�",
         "add" : "�샇�뒪�똿 �깮�꽦",
         "name" : "�샇�뒪�똿 �씠由�",
         "manager" : "�떞�떦�옄",

--
Gitblit v1.8.0