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

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

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 6923aa0..238522f 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -147,7 +147,8 @@
         "failedToSelectWorkspaceFullUserList": "�뾽臾� 怨듦컙 �쟾泥� �궗�슜�옄 紐⑸줉 議고쉶 �떎�뙣",
         "failedToSelectWorkspaceFullLevelList": "�궗�슜�옄 �벑湲� 紐⑸줉 議고쉶 �떎�뙣",
         "failedToSelectWorkspaceFullDepartmentList": "遺��꽌 紐⑸줉 議고쉶 �떎�뙣",
-        "failedToModifyUserLevel": "�궗�슜�옄 �벑湲� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+        "failedToModifyUserLevel": "�궗�슜�옄 �벑湲� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
+        "failedToDepartmentsOfUserDetails": "�궗�슜�옄�쓽 遺��꽌 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
     },
     "issue": {
         "issueType": "�씠�뒋 �쑀�삎",
@@ -789,13 +790,14 @@
     },
     "companyField" : {
         "add" : "�뾽泥� �깮�꽦",
-        "name" : "�뾽泥대챸",
+        "name" : "�뾽泥� �씠由�",
         "company" : "�뾽泥� 遺꾨쪟",
         "profitYN" : "�쁺由�/鍮꾩쁺由�",
         "industry" : "�궛�뾽 遺꾨쪟",
         "domain" : "�룄硫붿씤",
         "manager" : "�떞�떦�옄",
         "tel" : "�쟾�솕踰덊샇",
+        "code" : "肄붾뱶",
         "email" : "�씠硫붿씪",
         "desc" : "鍮꾧퀬",
         "failedToSelectCompanyFieldFullList" : "�뾽泥� 愿�由� 紐⑸줉 議고쉶 �떎�뙣",
@@ -803,22 +805,42 @@
         "wantToDeleteSelectCompanyField" : "�꽑�깮�븳 �뾽泥대�� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �뾽泥대뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
         "failedCompanyFieldRegistration" : "�뾽泥� �벑濡� �떎�뙣",
         "failedToDetailCompanyFieldModify" : "�뾽泥� �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
-        "pleaseEnterCompanyFieldName": "�뾽泥대챸�쓣 �엯�젰�븯�꽭�슂."
+        "pleaseEnterCompanyFieldName": "�뾽泥� �씠由꾩쓣 �엯�젰�븯�꽭�슂.",
+        "enterSpecialCharacters": "�뾽泥� �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎.",
+        "invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎. xxx-xxx-xxxx �삎�떇�쑝濡� �엯�젰�븯�꽭�슂."
     },
     "ispField" : {
         "add" : "ISP �깮�꽦",
         "name" : "ISP �씠由�",
         "manager" : "�떞�떦�옄",
         "tel" : "�쟾�솕踰덊샇",
+        "code" : "肄붾뱶",
         "email" : "�씠硫붿씪",
-        "desc" : "鍮꾧퀬"
+        "desc" : "鍮꾧퀬",
+        "failedToSelectIspFieldFullList" : "ISP 愿�由� 紐⑸줉 議고쉶 �떎�뙣",
+        "delete" : "ISP �궘�젣",
+        "wantToDeleteSelectIspField" : "�꽑�깮�븳 ISP瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 ISP�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "failedIspFieldRegistration" : "ISP �벑濡� �떎�뙣",
+        "failedToDetailIspFieldModify" : "ISP �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
+        "pleaseEnterIspFieldName": "ISP �씠由꾩쓣 �엯�젰�븯�꽭�슂.",
+        "enterSpecialCharacters": "ISP �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎.",
+        "invalidCodeFormat": "肄붾뱶紐낆뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎."
     },
     "hostingField" : {
         "add" : "�샇�뒪�똿 �깮�꽦",
         "name" : "�샇�뒪�똿 �씠由�",
         "manager" : "�떞�떦�옄",
         "tel" : "�쟾�솕踰덊샇",
+        "code" : "肄붾뱶",
         "email" : "�씠硫붿씪",
-        "desc" : "鍮꾧퀬"
+        "desc" : "鍮꾧퀬",
+        "failedToSelectHostingFieldFullList" : "�샇�뒪�똿 愿�由� 紐⑸줉 議고쉶 �떎�뙣",
+        "delete" : "�샇�뒪�똿 �궘�젣",
+        "wantToDeleteSelectHostingField" : "�꽑�깮�븳 �샇�뒪�똿�쓣 �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 �샇�뒪�똿�� 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "failedHostingFieldRegistration" : "�샇�뒪�똿 �벑濡� �떎�뙣",
+        "failedToDetailHostingFieldModify" : "�샇�뒪�똿 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
+        "pleaseEnterHostingFieldName": "�샇�뒪�똿 �씠由꾩쓣 �엯�젰�븯�꽭�슂.",
+        "enterSpecialCharacters": "�샇�뒪�똿 �씠由꾩뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎.",
+        "invalidCodeFormat": "肄붾뱶紐낆뿉�뒗 �듅�닔 臾몄옄瑜� �엯�젰 �븷 �닔 �뾾�뒿�땲�떎."
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0