From a75bcc7c2b0fc98bd3a8abc100a4ad4ec11b9c26 Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 화, 28 12월 2021 15:54:35 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/i18n/ko/global.json |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/i18n/ko/global.json b/src/main/webapp/i18n/ko/global.json
index 661618c..e6ec15c 100644
--- a/src/main/webapp/i18n/ko/global.json
+++ b/src/main/webapp/i18n/ko/global.json
@@ -562,7 +562,10 @@
         "failedNoticeRegistration": "怨듭��궗�빆 �벑濡� �떎�뙣",
         "failedToLookupNotificationList": "怨듭� �궗�빆 紐⑸줉 議고쉶 �떎�뙣",
         "failedToModifyNotice": "怨듭� �궗�빆 �닔�젙 �떎�뙣",
-        "failedToLookupNotificationDetails": "怨듭��궗�빆 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+        "failedToLookupNotificationDetails": "怨듭��궗�빆 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
+        "delete": "怨듭��궗�빆 �궘�젣",
+        "wantToDeleteSelectNotice": "�꽑�깮�븳 怨듭��궗�빆�쓣 �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 怨듭��궗�빆�� 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "notHaveDeletePermissionExists": "�궘�젣 沅뚰븳�씠 �뾾�뒗 怨듭��궗�빆�씠 議댁옱�빀�땲�떎."
     },
     "manageUser": {
         "manageUser": "�궗�슜�옄 沅뚰븳 愿�由�",
@@ -597,7 +600,10 @@
         "failedToModifyFAQ": "FAQ �닔�젙 �떎�뙣",
         "failedToLookupFAQDetails": "FAQ �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
         "failedToActivation": "FAQ �솢�꽦 �떎�뙣",
-        "activation": "�솢�꽦�솕"
+        "activation": "�솢�꽦�솕",
+        "delete": "FAQ �궘�젣",
+        "wantToDeleteSelect": "�꽑�깮�븳 FAQ瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 FAQ�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "notHaveDeletePermissionExists": "�궘�젣 沅뚰븳�씠 �뾾�뒗 FAQ媛� 議댁옱�빀�땲�떎."
     },
     "QNA": {
         "QNA": "QnA",
@@ -608,7 +614,10 @@
         "failedQNARegistration": "QnA �벑濡� �떎�뙣.",
         "failedToLookupQNAList": "QnA 紐⑸줉 議고쉶 �떎�뙣",
         "failedToModifyQNA": "QnA �닔�젙 �떎�뙣",
-        "failedToLookupQNADetails": "QnA �긽�꽭 �젙蹂� 議고쉶 �떎�뙣"
+        "failedToLookupQNADetails": "QnA �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
+        "delete": "QnA �궘�젣",
+        "wantToDeleteSelect": "�꽑�깮�븳 QnA瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 QnA�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "notHaveDeletePermissionExists": "�궘�젣 沅뚰븳�씠 �뾾�뒗 QnA媛� 議댁옱�빀�땲�떎."
     },
     "event": {
         "event": "�씠踰ㅽ듃",
@@ -634,7 +643,10 @@
         "failedToModifyGuide": "媛��씠�뱶 �닔�젙 �떎�뙣",
         "failedToLookupGuideDetails": "媛��씠�뱶 �긽�꽭 �젙蹂� 議고쉶 �떎�뙣",
         "failedToActivation": "媛��씠�뱶 �솢�꽕 �떎�뙣",
-        "activation": "�솢�꽦�솕"
+        "activation": "�솢�꽦�솕",
+        "delete": "媛��씠�뱶 �궘�젣",
+        "wantToDeleteSelect": "�꽑�깮�븳 媛��씠�뱶瑜� �궘�젣�븯寃좎뒿�땲源�? �궘�젣�맂 媛��씠�뱶�뒗 蹂듦뎄�븷 �닔 �뾾�뒿�땲�떎.",
+        "notHaveDeletePermissionExists": "�궘�젣 沅뚰븳�씠 �뾾�뒗 媛��씠�뱶媛� 議댁옱�빀�땲�떎."
     },
     "inquiry": {
         "toInquiry": "臾몄쓽�븯湲�",
@@ -798,6 +810,7 @@
         "disableParticipationWorkspace": "李몄뿬 �뾽臾� 怨듦컙 鍮꾪솢�꽦�솕 �븣由�",
         "disableParticipationWorkspaceMessage": "�쁽�옱 �씠�슜�븯怨� �엳�뒗 �뾽臾� 怨듦컙�뿉�꽌 �젣�쇅�릺�뿀�뒿�땲�떎.",
         "alertsAboutSystem": "�떆�뒪�뀥 �븣由� �젙蹂�",
+        "alertSystem": "�떆�뒪�뀥 �븣由�",
         "newAlert": "�깉濡쒖슫 �븣由쇱씠 �솕�뒿�땲�떎.",
         "pleaseWait": "�옞�떆留� 湲곕떎�젮二쇱꽭�슂...",
         "createIssue": "�씠�뒋 �깮�꽦",

--
Gitblit v1.8.0