From ab7e04765622b7ef31bb891a91e89abcf203c31d Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 목, 09 12월 2021 14:35:15 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/webapp/i18n/ko/global.json | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 70c9614..af1d697 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -35,7 +35,7 @@
"delayDate": "吏��뿰�씪",
"statusOfIssues": "�긽�깭蹂� �씠�뒋 �쁽�솴",
"doesNotExistWorkflow": "�썙�겕�뵆濡쒖슦媛� �뾾�뒿�땲�떎.",
- "progressByMember": "硫ㅻ쾭蹂� 吏꾪뻾瑜�",
+ "progressByMember": "遺��꽌蹂� 吏꾪뻾瑜�",
"assignedIssue": "�떞�떦 �씠�뒋",
"delaying": "吏��뿰以�",
"myIssueStatus": "�굹�쓽 �씠�뒋 �쁽�솴",
@@ -207,6 +207,7 @@
"initializedIssueStatus": "�씠�뒋 �쑀�삎�쓣 蹂�寃쏀븷 寃쎌슦 �궗�슜�옄 �젙�쓽 �븘�뱶, �씠�뒋 �긽�깭媛� 珥덇린�솕 �맗�땲�떎.",
"clickToSelectDate": "�겢由��븯硫� �궇吏쒕�� �꽑�깮�븷 �닔 �엳�뒿�땲�떎.",
"notIssueTypeCustomFields": "�씠�뒋 �쑀�삎�뿉 �뿰寃곕맂 �궗�슜�옄 �젙�쓽 �븘�뱶媛� �뾾�뒿�땲�떎.",
+ "pleaseEnterIssueTypeCustomFields": "�빐�떦 �궗�슜�옄�젙�쓽�븘�뱶�뒗 �븘�닔 �엯�젰 媛� �엯�땲�떎.",
"attachOnlyFiles": "hwp, jpg, png, txt, pptx, ppt, pdf, xlsx, xls, docx, zip, gif, jpeg, doc, tif, bmp, wmv, avi, mp4, mkv, mov �뙆�씪留� 泥⑤��븷 �닔 �엳�뒿�땲�떎.",
"registerExcelIssues": "�뿊��濡� �씠�뒋 �벑濡앺븯湲�",
"videoExample": "�룞�쁺�긽 �삁�젣",
@@ -217,6 +218,8 @@
"settingTableDisplay": "�뀒�씠釉� �몴�떆 �꽕�젙",
"deleteIssue": "�씠�뒋 �궘�젣",
"wantToDeleteSelectIssue": "�꽑�깮�븳 �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
+ "wantToDeleteOnlySelectIssue": "�꽑�깮�븳 �씠�뒋留� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
+ "wantToDeleteSelectDownIssue": "�꽑�깮�븳 �씠�뒋�쓽 �븯�쐞 �씠�뒋媛� 議댁옱 �빀�땲�떎. \n �꽑�깮�븳 �씠�뒋�� �븯�쐞 �씠�뒋 紐⑤몢 �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
"wantToDeleteSelectRelationIssue": "�꽑�깮�븳 �뿰愿� �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �뿰愿� �씠�뒋�뒗 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
"failedToSaveFieldConditions": "寃��깋 �븘�뱶 議곌굔 ���옣 �떎�뙣",
"failedToGetSearchFieldCondition": "寃��깋 �븘�뱶 議곌굔 媛��졇�삤湲� �떎�뙣",
@@ -782,6 +785,7 @@
"createIssue": "�씠�뒋 �깮�꽦",
"updateIssue": "�씠�뒋 蹂�寃�",
"deleteIssue": "�씠�뒋 �궘�젣",
+ "deleteDownIssue": "�븯�쐞 �씠�뒋 �궘�젣",
"sendMailIssue": "�씠�뒋 硫붿씪 �쟾�넚",
"updateTitle": "�젣紐⑹씠 蹂�寃쎈릺�뿀�뒿�땲�떎.",
"updateContent": "�궡�슜�씠 蹂�寃쎈릺�뿀�뒿�땲�떎.",
@@ -815,7 +819,7 @@
"emptyUser": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄媛� �뾾�뒿�땲�떎.",
"emptyProject": "�꽑�깮�븷 �닔 �엳�뒗 �봽濡쒖젥�듃媛� �뾾�뒿�땲�떎.",
"emptyDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
- "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �봽濡쒖젥�듃 �꽕�젙�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br> 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
+ "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �썙�겕�뵆濡쒖슦�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br> 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
"noDepartment": "�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.",
"emptyCompany": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥닿� �뾾�뒿�땲�떎.",
"emptyIssue": "�꽑�깮�븷 �닔 �엳�뒗 �씠�뒋媛� �뾾�뒿�땲�떎.",
@@ -830,6 +834,7 @@
"departmentCount": "遺��꽌�씤�썝",
"departmentUser": "遺��꽌 ���썝",
"detectingInfo": "�깘吏��젙蹂�",
+ "notExistDetectingInfo": "�궗�슜 媛��뒫�븳 �깘吏� �젙蹂닿� �뾾�뒿�땲�떎.",
"detectingData": "�깘吏��씪�떆",
"import": "媛��졇�삤湲�",
"diffuserURL": "�쑀�룷�옄URL",
@@ -860,6 +865,7 @@
"auth" : "API �씤利�",
"setting" : "API �꽕�젙",
"monitor" : "API 紐⑤땲�꽣留�",
+ "spec" : "API 臾몄꽌",
"application" : "�뼱�뵆由ъ��씠�뀡 �씠由�",
"token" : "�넗�겙",
"apiKey": "API �넗�겙 �벑濡�",
@@ -867,18 +873,28 @@
"create" : "�넗�겙 �깮�꽦",
"example" : "�궗�슜 �삁�떆",
"columnSetting" : "湲곕낯媛� �꽕�젙",
- "overlapSetting" : "以묐났 �븘�뱶 �꽕�젙",
+ "overlapSetting" : "�븯�쐞 �씠�뒋 �꽕�젙",
"addOverlapField" : "以묐났 �븘�뱶 異붽�",
"failedToApiTokenFind" : "API �넗�겙 議고쉶 �떎�뙣",
"failedToApiTokenRemove" : "API �넗�겙 �궘�젣 �떎�뙣",
"failedToApiTokenAdd" : "API �넗�겙 �깮�꽦 �떎�뙣",
+ "useIssueStatus" : "�궗�슜 媛��뒫�븳 �씠�뒋 �긽�깭",
"successToApiTokenRemove" : "API �넗�겙 �궘�젣 �꽦怨�",
"successToApiTokenAdd" : "API �넗�겙 �깮�꽦 �꽦怨�",
"successToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �셿猷�",
"failedToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �떎�뙣",
"successToApiIssueOverlap" : "以묐났媛� �꽕�젙 �셿猷�",
"failedToApiIssueOverlap" : "以묐났媛� �꽕�젙 �떎�뙣",
- "failedToApiMonitor": "API 湲곕줉 議고쉶 �떎�뙣"
+ "failedToApiMonitor": "API 湲곕줉 議고쉶 �떎�뙣",
+ "requestSample": "API �슂泥� �깦�뵆",
+ "requestSampleAdd": "�씠�뒋 異붽�",
+ "requestSampleModify": "�씠�뒋 �긽�깭 �닔�젙",
+ "downIssueOverlapSetting" : "�븯�쐞 �씠�뒋 泥섎━ 湲곗� �빆紐�",
+ "upIssueCompleteIssueStatus" : "�긽�쐞 �씠�뒋 �옄�룞醫낅즺 �씠�뒋 �긽�깭 �꽕�젙",
+ "autoCompleteIssueStatus" : "�옄�룞 醫낅즺 �꽕�젙�븷 �씠�뒋 �긽�깭",
+ "successToApiAutoCompleteIssueStatus" : "�옄�룞 醫낅즺 �씠�뒋 �긽�깭 �꽕�젙 �셿猷�",
+ "failedToApiAutoCompleteIssueStatus" : "�옄�룞 醫낅즺 �씠�뒋 �긽�깭 �꽕�젙 �떎�뙣",
+ "requestSampleModifyDesc" : "(�닔�젙�떆 customField �빆紐⑹� 寃��깋 �슜�룄濡� �궗�슜�맖)"
},
"companyField" : {
"info": "�뾽泥댁젙蹂�",
@@ -890,6 +906,7 @@
"profitYN" : "�쁺由�/鍮꾩쁺由�",
"industry" : "�궛�뾽 遺꾨쪟",
"domain" : "�룄硫붿씤",
+ "url" : "url",
"ipAdress" : "ip二쇱냼",
"manager" : "�떞�떦�옄",
"tel" : "�쟾�솕踰덊샇",
--
Gitblit v1.8.0