From d4baca463f7d9459d137c53139cf415c78642bf3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 29 11월 2021 17:03:49 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/i18n/ko/global.json | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 6501a46..97ef54f 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -556,7 +556,7 @@
"manageWorkspacePerm": "�썙�겕�뒪�럹�씠�뒪 愿�由�",
"manageProjectPerm": "�봽濡쒖젥�듃 愿�由�",
"manageIssueSystemPerm": "�씠�뒋 �떆�뒪�뀥 愿�由�",
- "manageUseCompanyPerm": "�뾽泥� 由ъ뒪�듃 愿�由�",
+ "manageUsePartnerPerm": "�뙆�듃�꼫 由ъ뒪�듃 愿�由�",
"manageUserPerm": "�궗�슜�옄 愿�由�",
"manageApiPerm" : "API 愿�由�",
"manageNoticePerm": "怨듭��궗�빆 愿�由�",
@@ -813,7 +813,8 @@
"emptyCompany": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥닿� �뾾�뒿�땲�떎.",
"emptyIssue": "�꽑�깮�븷 �닔 �엳�뒗 �씠�뒋媛� �뾾�뒿�땲�떎.",
"emptyIsp": "�꽑�깮�븷 �닔 �엳�뒗 ISP媛� �뾾�뒿�땲�떎.",
- "emptyHosting": "�꽑�깮�븷 �닔 �엳�뒗 HOSTING媛� �뾾�뒿�땲�떎.",
+ "emptyHosting": "�꽑�깮�븷 �닔 �엳�뒗 HOSTING�씠 �뾾�뒿�땲�떎.",
+ "emptyCustomField": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄 �젙�쓽 �븘�뱶媛� �뾾�뒿�땲�떎.",
"department" : "遺��꽌",
"level" : "�궗�슜�옄 �벑湲�",
"manageDepartment": "遺��꽌 愿�由�",
@@ -826,12 +827,18 @@
"import": "媛��졇�삤湲�",
"diffuserURL": "�쑀�룷�옄URL",
"country": "援�媛�",
- "numberField": "�닽�옄 �븘�뱶",
- "datetimeField": "�궇吏� �븘�뱶",
- "ipAddressField": "IP Address �븘�뱶",
- "emailField": "�씠硫붿씪 �븘�뱶",
- "siteField": "URL �븘�뱶",
- "telField": "�쟾�솕踰덊샇 �븘�뱶"
+ "numberField": "�닽�옄 �꽑�깮 �븘�뱶",
+ "datetimeField": "�궇吏� �꽑�깮 �븘�뱶",
+ "ipAddressField": "IP Address �꽑�깮 �븘�뱶",
+ "emailField": "�씠硫붿씪 �꽑�깮 �븘�뱶",
+ "siteField": "URL �꽑�깮 �븘�뱶",
+ "telField": "�쟾�솕踰덊샇 �꽑�깮 �븘�뱶",
+ "invalidipAdressFormat": "IP 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
+ "invalidNumberFormat": "�닽�옄留� �엯�젰 媛��뒫�빀�땲�떎.",
+ "invalidDateFormat": "�궇吏� �삎�떇�씠 留욎� �븡�뒿�땲�떎.(xxxx-xx-xx)",
+ "invalidEmailFormat": "�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
+ "invalidSiteFormat": "�솃�럹�씠吏� 二쇱냼 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(http://濡� �떆�옉�븯�뀛�빞�빀�땲�떎)",
+ "invalidTelFormat": "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎(xxx-xxxx-xxxx)."
},
"tasks": {
"agileBoardTitle": "移몃컲 蹂대뱶"
@@ -860,8 +867,10 @@
"failedToApiTokenAdd" : "API �넗�겙 �깮�꽦 �떎�뙣",
"successToApiTokenRemove" : "API �넗�겙 �궘�젣 �꽦怨�",
"successToApiTokenAdd" : "API �넗�겙 �깮�꽦 �꽦怨�",
- "successToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �셿猷�."
- "failedToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �떎�뙣"
+ "successToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �셿猷�",
+ "failedToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �떎�뙣",
+ "successToApiIssueOverlap" : "以묐났媛� �꽕�젙 �셿猷�",
+ "failedToApiIssueOverlap" : "以묐났媛� �꽕�젙 �떎�뙣"
},
"companyField" : {
"info": "�뾽泥댁젙蹂�",
--
Gitblit v1.8.0