From ad7e60c5d5a090160c6b9be63c02a75a6c369b91 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 07 1월 2022 14:10: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 7064eb4..01a1d9d 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -222,7 +222,8 @@
         "selectProjectAndIssueTypeDownloadExcel": "�봽濡쒖젥�듃, �씠�뒋 �쑀�삎�쓣 �꽑�깮�븯硫� �빐�떦 �븯�뒗 �뼇�떇�쓽 �뿊���쓣 �떎�슫濡쒕뱶 �븷 �닔 �엳�뒿�땲�떎.",
         "settingTableDisplay": "�뀒�씠釉� �몴�떆 �꽕�젙",
         "deleteIssue": "�씠�뒋 �궘�젣",
-        "wantToDeleteSelectIssue": "�꽑�깮�븳 �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
+        "wantToDeleteSelectIssue": "�꽑�깮�븳 �씠�뒋瑜� �뿰愿� �씠�뒋 由ъ뒪�듃�뿉�꽌 �젣�쇅�떆�궎寃좎뒿�땲源�? \n �뿰愿� �씠�뒋 由ъ뒪�듃�뿉�꽌留� �젣�쇅�릺硫�, �떎�젣濡� �궘�젣�릺吏� �븡�뒿�땲�떎.",
+        "wantToDeleteSelectDownIssueInList": "�꽑�깮�븳 �씠�뒋瑜� �븯�쐞 �씠�뒋 由ъ뒪�듃�뿉�꽌 �젣�쇅�떆�궎寃좎뒿�땲源�? \n �븯�쐞 �씠�뒋 由ъ뒪�듃�뿉�꽌留� �젣�쇅�릺硫�, �떎�젣濡� �궘�젣�릺吏� �븡�뒿�땲�떎.",
         "wantToDeleteOnlySelectIssue": "�꽑�깮�븳 �씠�뒋留� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
         "wantToDeleteSelectDownIssue": "�꽑�깮�븳 �씠�뒋�쓽 �븯�쐞 �씠�뒋媛� 議댁옱 �빀�땲�떎. \n �꽑�깮�븳 �씠�뒋�� �븯�쐞 �씠�뒋 紐⑤몢 �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �씠�뒋�뒗 �뼱�뼚�븳 寃쎌슦�뿉�룄 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
         "wantToDeleteSelectRelationIssue": "�꽑�깮�븳 �뿰愿� �씠�뒋瑜� �궘�젣�븯寃좎뒿�땲源�? \n �궗�슜�옄媛� 吏곸젒 �궘�젣�븳 �뿰愿� �씠�뒋�뒗 蹂듦뎄媛� 遺덇��뒫�빀�땲�떎.",
@@ -280,12 +281,16 @@
         "setIssueRelationTableDisplay": "�뿰愿� �씠�뒋 �뀒�씠釉� �몴�떆 �꽕�젙",
         "setIssueDownTableDisplay": "�븯�쐞 �씠�뒋 �뀒�씠釉� �몴�떆 �꽕�젙",
         "columnName": "而щ읆紐�",
+        "selectPartners": "�뾽泥� �꽑�깮",
+        "partners" : "�뾽泥� �씠硫붿씪",
         "area": "�꼻�씠",
         "displayed": "�몴�떆 �뿬遺�",
         "sequence": "�닚�꽌",
         "cannotChangedIssueTitle": "�씠�뒋 �젣紐⑹� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.",
         "cannotChangedIssueType": "�씠�뒋 援щ텇�� 蹂�寃쏀븷 �닔 �뾾�뒿�땲�떎.",
-        "selectSendIssueMail": "�씠�뒋 硫붿씪 諛쒖넚 ���긽�옄 �꽑�깮",
+        "selectSendIssueMail": "�뾽泥� 硫붿씪 諛쒖넚",
+        "CommonSendIssueMail": "�씪諛� 硫붿씪 諛쒖넚",
+        "SendIssueMail": "硫붿씪 諛쒖넚 �엯�젰",
         "sendIssueSelectedUsers": "�봽濡쒖젥�듃�뿉 李몄뿬�븯怨� �엳�뒗 �떎瑜� �궗�슜�옄�뿉寃� �씠�뒋 �젙蹂대�� 蹂대깄�땲�떎.",
         "sendMail": "�씠硫붿씪 諛쒖넚",
         "changedHistory": "�씠�뒋 蹂�寃� �씠�젰 �긽�꽭�젙蹂�",
@@ -326,6 +331,10 @@
         "succeededIssueMail": "�씠�뒋 硫붿씪 諛쒖넚 �셿猷�",
         "sentToTheSelectedUser": "�꽑�깮�븳 �궗�슜�옄�뿉寃� �씠硫붿씪�씠 諛쒖넚�릺�뿀�뒿�땲�떎.",
         "failedIssueMail": "�씠�뒋 硫붿씪 諛쒖넚 �떎�뙣",
+        "selectedPartnersMail": "�뾽泥� �씠硫붿씪�쓣 �꽑�깮�븯�꽭�슂.",
+        "selectedPartnersTemplate": "�뾽泥� �씠硫붿씪 �뀥�뵆由우쓣 �꽑�깮�빐二쇱꽭�슂.",
+        "writeIssueMail": "�씠硫붿씪�쓣 �엯�젰�빐二쇱꽭�슂.",
+        "writeMail": "�씠硫붿씪�쓣 �엯�젰�븯�뀛�빞 異붽��븷�닔 �엳�뒿�땲�떎.",
         "issueVersionLookupFailed": "�씠�뒋 踰꾩쟾 議고쉶 �떎�뙣",
         "relationIssueType1" : "�떎�쓬 �씠�뒋�� 愿��젴�맖",
         "relationIssueType2" : "�떎�쓬 �씠�뒋�뿉 以묐났�맖",
@@ -513,7 +522,9 @@
         "invalidEmailFormat": "�씠硫붿씪 �삎�떇�씠 留욎� �븡�뒿�땲�떎.",
         "enterYourEmailAddress": "�엯�젰�븳 �씠硫붿씪濡� �븣由쇱씠 諛쒖넚�맗�땲�떎. 瑗� �궗�슜�븯�떆�뒗 �씠硫붿씪濡� �엯�젰�븯�꽭�슂.",
         "least4CharactersPassword": "鍮꾨�踰덊샇�뒗 理쒖냼 4�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.",
+        "least8CharactersPassword": "鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 理쒖냼 8�옄 �씠�긽 �엯�젰�빐�빞 �빀�땲�떎.",
         "enter4CharactersPassword": "鍮꾨�踰덊샇�뒗 4�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.",
+        "enter8CharactersPassword": "鍮꾨�踰덊샇�뒗 �듅�닔臾몄옄 �룷�븿 8�옄 �씠�긽�쑝濡� �엯�젰�븯�꽭�슂.",
         "differentPassword": "鍮꾨�踰덊샇媛� �떎由낅땲�떎.",
         "contactedEnterPhone": "�뿰�씫媛��뒫�븳 �빖�뱶�룿 踰덊샇瑜� �엯�젰�븯�꽭�슂.",
         "enterTheNameInWorkspace": "�궗�슜�븯怨� �떢�� �뾽臾닿났媛꾩쓽 �씠由꾩쓣 �엯�젰�븯�꽭�슂.",
@@ -693,6 +704,10 @@
         "checkAll": "�쟾泥� �꽑�깮",
         "unCheckAll": "�쟾泥� �빐�젣",
         "send": "蹂대궡湲�",
+        "emailExplain": "諛쏅뒗 �궗�엺�쓽 �씠硫붿씪 �삎�떇�쓣 �엯�젰�븯�뀛�빞 �빀�땲�떎.",
+        "sendToPerson" : "�떎瑜� �궗�슜�옄�뿉寃� 硫붿씪�쓣 蹂대깄�땲�떎.",
+        "least10CharactersPhone" : "�빖�뱶�룿 踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(10�옄由� �씠�긽)",
+        "least9CharactersTel" : "�쟾�솕踰덊샇 �삎�떇�씠 留욎� �븡�뒿�땲�떎.(9�옄由� �씠�긽)",
         "selected": "�꽑�깮�맖",
         "selectable": "�꽑�깮 媛��뒫",
         "password": "鍮꾨�踰덊샇",
@@ -709,6 +724,7 @@
         "priority": "�슦�꽑 �닚�쐞",
         "importance": "以묒슂�룄",
         "assignee": "�떞�떦�옄",
+        "toPerson": "諛쏅뒗 �궗�엺",
         "assigneeTeam" : "�떞�떦遺��꽌",
         "register": "�벑濡앹옄",
         "startDate": "�떆�옉�씪",
@@ -762,7 +778,7 @@
         "updatableStatus": "蹂�寃� 媛��뒫�븳 �긽�깭",
         "testCase": "�뀒�뒪�듃 耳��씠�뒪",
         "updateStatus": "�긽�깭 蹂�寃�",
-        "updateDownIssueAllStatus": "�븯�쐞 �씠�뒋�긽�깭 �쟾泥� 蹂�寃�",
+        "updateDownIssueStatus": "�븯�쐞 �씠�뒋�긽�깭 蹂�寃�",
         "tcmProject": "�뀒�뒪�듃 耳��씠�뒪 愿�由� �봽濡쒖젥�듃",
         "btsProject": "�씠�뒋 愿�由� �봽濡쒖젥�듃",
         "projectName": "�봽濡쒖젥�듃紐�",
@@ -852,7 +868,7 @@
         "emptyUser": "�꽑�깮�븷 �닔 �엳�뒗 �궗�슜�옄媛� �뾾�뒿�땲�떎.",
         "emptyProject": "�꽑�깮�븷 �닔 �엳�뒗 �봽濡쒖젥�듃媛� �뾾�뒿�땲�떎.",
         "emptyDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
-        "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎. <br> �썙�겕�뵆濡쒖슦�뿉�꽌 �떞�떦遺��꽌瑜� �꽕�젙�븯嫄곕굹,<br>遺��꽌 愿�由ъ뿉�꽌 遺��꽌瑜� 異붽� �빐二쇱꽭�슂",
+        "emptyProjectDepartment": "�꽑�깮�븷 �닔 �엳�뒗 遺��꽌媛� �뾾�뒿�땲�떎.",
         "noDepartment": "�떞�떦遺��꽌媛� �뾾�뒿�땲�떎.",
         "emptyCompanyPartners": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥� �젙蹂닿� �뾾�뒿�땲�떎.",
         "emptyCompany": "�꽑�깮�븷 �닔 �엳�뒗 �뾽泥닿� �뾾�뒿�땲�떎.",
@@ -917,6 +933,7 @@
         "useIssueStatus" : "�궗�슜 媛��뒫�븳 �씠�뒋 �긽�깭",
         "successToApiTokenRemove" : "API �넗�겙 �궘�젣 �꽦怨�",
         "successToApiTokenCopy" : "API �넗�겙 蹂듭궗 �꽦怨�",
+        "failedToApiTokenCopy" : "API �넗�겙 蹂듭궗 �떎�뙣",
         "ApiTokenCopy" : "�넗�겙 蹂듭궗",
         "successToApiTokenAdd" : "API �넗�겙 �깮�꽦 �꽦怨�",
         "successToApiIssueDefault" : "湲곕낯媛� �꽕�젙 �셿猷�",

--
Gitblit v1.8.0