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

---
 src/main/webapp/WEB-INF/i18n/code_ko_KR.properties |   29 ++++++++++++++++++++++++++---
 1 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
index 7d511c8..31fa61b 100644
--- a/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
+++ b/src/main/webapp/WEB-INF/i18n/code_ko_KR.properties
@@ -75,6 +75,12 @@
 common.stringField=\uBB38\uC790\uC5F4 \uD544\uB4DC
 common.singleSelectionField=\uB2E8\uC77C \uC120\uD0DD \uD544\uB4DC
 common.multipleSelectionField=\uB2E4\uC911 \uC120\uD0DD \uD544\uB4DC
+common.numberField=\uC22B\uC790 \uD544\uB4DC
+common.datetimeField=\uB0A0\uC9DC \uD544\uB4DC
+common.ipAddressField=IP \uC8FC\uC18C \uD544\uB4DC
+common.emailField=\uC774\uBA54\uC77C \uD544\uB4DC
+common.siteField=\uD648\uD398\uC774\uC9C0 \uD544\uB4DC
+common.telField=\uC804\uD654\uBC88\uD638 \uD544\uB4DC
 common.customField=\uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC
 common.customFieldList=\uC0AC\uC6A9\uC790 \uC815\uC758 \uD544\uB4DC \uBAA9\uB85D
 common.fieldType=\uD544\uB4DC \uC720\uD615
@@ -109,6 +115,23 @@
 manageUser.manageFAQPerm=FAQ \uAD00\uB9AC
 manageUser.manageQnAPerm=QnA \uAD00\uB9AC
 manageUser.manageGuidePerm=\uAC00\uC774\uB4DC \uAD00\uB9AC
-departmentManage.departmentName=\uBD80\uC11C\uBA85
-departmentManage.departmentDescription=\uBD80\uC11C\uC124\uBA85
-departmentManage.departmentCount=\uBD80\uC11C\uC778\uC6D0
+department.departmentName=\uBD80\uC11C\uBA85
+department.departmentDescription=\uBD80\uC11C\uC124\uBA85
+department.departmentCount=\uBD80\uC11C\uC778\uC6D0
+companyField.companyName=\uC5C5\uCCB4\uBA85
+companyField.companyManager=\uB2F4\uB2F9\uC790
+companyField.companyTel=\uC804\uD654\uBC88\uD638
+companyField.companyEmail=\uC774\uBA54\uC77C
+companyField.companyMemo=\uBE44\uACE0
+isp.ispName=ISP \uC774\uB984
+isp.ispCode=\uCF54\uB4DC
+isp.ispManager=\uB2F4\uB2F9\uC790
+isp.ispTel=\uC804\uD654\uBC88\uD638
+isp.ispEmail=\uC774\uBA54\uC77C
+isp.ispMemo=\uBE44\uACE0
+Hosting.HostingName=\uD638\uC2A4\uD305 \uC774\uB984
+Hosting.HostingCode=\uCF54\uB4DC
+Hosting.HostingManager=\uB2F4\uB2F9\uC790
+Hosting.HostingTel=\uC804\uD654\uBC88\uD638
+Hosting.HostingEmail=\uC774\uBA54\uC77C
+Hosting.HostingMemo=\uBE44\uACE0

--
Gitblit v1.8.0