diff --git a/Wox.Core/Resource/AvailableLanguages.cs b/Wox.Core/Resource/AvailableLanguages.cs
index 97157965c1..b30f2e73b8 100644
--- a/Wox.Core/Resource/AvailableLanguages.cs
+++ b/Wox.Core/Resource/AvailableLanguages.cs
@@ -15,6 +15,7 @@ namespace Wox.Core.Resource
         public static Language Polish = new Language("pl", "Polski");
         public static Language Danish = new Language("da", "Dansk");
         public static Language German = new Language("de", "Deutsch");
+        public static Language Korean = new Language("ko", "한국어");
 
         public static List<Language> GetAvailableLanguages()
         {
@@ -30,8 +31,8 @@ namespace Wox.Core.Resource
                 Dutch,
                 Polish,
                 Danish,
-                German
-
+                German,
+                Korean
             };
             return languages;
         }
diff --git a/Wox/Languages/ko.xaml b/Wox/Languages/ko.xaml
new file mode 100644
index 0000000000..5a206622df
--- /dev/null
+++ b/Wox/Languages/ko.xaml
@@ -0,0 +1,136 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+    <!--MainWindow-->
+    <system:String x:Key="registerHotkeyFailed">핫키 등록 실패: {0}</system:String>
+    <system:String x:Key="couldnotStartCmd">{0}을 실행할 수 없습니다.</system:String>
+    <system:String x:Key="invalidWoxPluginFileFormat">Wox 플러그인 파일 형식이 유효하지 않습니다.</system:String>
+    <system:String x:Key="setAsTopMostInThisQuery">이 쿼리의 최상위로 설정</system:String>
+    <system:String x:Key="cancelTopMostInThisQuery">이 쿼리의 최상위 설정 취소</system:String>
+    <system:String x:Key="executeQuery">쿼리 실행: {0}</system:String>
+    <system:String x:Key="lastExecuteTime">마지막 실행 시간: {0}</system:String>
+    <system:String x:Key="iconTrayOpen">열기</system:String>
+    <system:String x:Key="iconTraySettings">설정</system:String>
+    <system:String x:Key="iconTrayAbout">정보</system:String>
+    <system:String x:Key="iconTrayExit">종료</system:String>
+
+    <!--Setting General-->
+    <system:String x:Key="wox_settings">Wox 설정</system:String>
+    <system:String x:Key="general">일반</system:String>
+    <system:String x:Key="startWoxOnSystemStartup">시스템 시작 시 Wox 실행</system:String>
+    <system:String x:Key="hideWoxWhenLoseFocus">포커스 잃으면 Wox 숨김</system:String>
+    <system:String x:Key="dontPromptUpdateMsg">새 버전 알림 끄기</system:String>
+    <system:String x:Key="rememberLastLocation">마지막 실행 위치 기억</system:String>
+    <system:String x:Key="language">언어</system:String>
+    <system:String x:Key="lastQueryMode">마지막 쿼리 스타일</system:String>
+    <system:String x:Key="LastQueryPreserved">직전 쿼리에 계속 입력</system:String>
+    <system:String x:Key="LastQuerySelected">직전 쿼리 내용 선택</system:String>
+    <system:String x:Key="LastQueryEmpty">직전 쿼리 지우기</system:String>
+    <system:String x:Key="maxShowResults">표시할 결과 수</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreen">전체화면 모드에서는 핫키 무시</system:String>
+    <system:String x:Key="pythonDirectory">Python 디렉토리</system:String>
+    <system:String x:Key="autoUpdates">자동 업데이트</system:String>
+    <system:String x:Key="selectPythonDirectory">선택</system:String>
+    <system:String x:Key="hideOnStartup">시작 시 Wox 숨김</system:String>
+
+    <!--Setting Plugin-->
+    <system:String x:Key="plugin">플러그인</system:String>
+    <system:String x:Key="browserMorePlugins">플러그인 더 찾아보기</system:String>
+    <system:String x:Key="disable">비활성화</system:String>
+    <system:String x:Key="actionKeywords">액션 키워드</system:String>
+    <system:String x:Key="pluginDirectory">플러그인 디렉토리</system:String>
+    <system:String x:Key="author">저자</system:String>
+    <system:String x:Key="plugin_init_time">초기화 시간: {0}ms</system:String>
+    <system:String x:Key="plugin_query_time">쿼리 시간: {0}ms</system:String>
+
+    <!--Setting Theme-->
+    <system:String x:Key="theme">테마</system:String>
+    <system:String x:Key="browserMoreThemes">테마 더 찾아보기</system:String>
+    <system:String x:Key="helloWox">Hello Wox</system:String>
+    <system:String x:Key="queryBoxFont">쿼리 상자 글꼴</system:String>
+    <system:String x:Key="resultItemFont">결과 항목 글꼴</system:String>
+    <system:String x:Key="windowMode">윈도우 모드</system:String>
+    <system:String x:Key="opacity">투명도</system:String>
+
+    <!--Setting Hotkey-->
+    <system:String x:Key="hotkey">핫키</system:String>
+    <system:String x:Key="woxHotkey">Wox 핫키</system:String>
+    <system:String x:Key="customQueryHotkey">사용자지정 쿼리 핫키</system:String>
+    <system:String x:Key="delete">삭제</system:String>
+    <system:String x:Key="edit">편집</system:String>
+    <system:String x:Key="add">추가</system:String>
+    <system:String x:Key="pleaseSelectAnItem">항목을 선택하세요.</system:String>
+    <system:String x:Key="deleteCustomHotkeyWarning">{0} 플러그인 핫키를 삭제하시겠습니까?</system:String>
+
+    <!--Setting Proxy-->
+    <system:String x:Key="proxy">HTTP 프록시</system:String>
+    <system:String x:Key="enableProxy">HTTP 프록시 켜기</system:String>
+    <system:String x:Key="server">HTTP 서버</system:String>
+    <system:String x:Key="port">포트</system:String>
+    <system:String x:Key="userName">사용자명</system:String>
+    <system:String x:Key="password">패스워드</system:String>
+    <system:String x:Key="testProxy">프록시 테스트</system:String>
+    <system:String x:Key="save">저장</system:String>
+    <system:String x:Key="serverCantBeEmpty">서버를 입력하세요.</system:String>
+    <system:String x:Key="portCantBeEmpty">포트를 입력하세요.</system:String>
+    <system:String x:Key="invalidPortFormat">유효하지 않은 포트 형식</system:String>
+    <system:String x:Key="saveProxySuccessfully">프록시 설정이 저장되었습니다.</system:String>
+    <system:String x:Key="proxyIsCorrect">프록시 설정 정상</system:String>
+    <system:String x:Key="proxyConnectFailed">프록시 연결 실패</system:String>
+
+    <!--Setting About-->
+    <system:String x:Key="about">정보</system:String>
+    <system:String x:Key="website">웹사이트</system:String>
+    <system:String x:Key="version">버전</system:String>
+    <system:String x:Key="about_activate_times">Wox를 {0}번 실행했습니다.</system:String>
+    <system:String x:Key="checkUpdates">업데이트 확인</system:String>
+    <system:String x:Key="newVersionTips">새 버전({0})이 있습니다. Wox를 재시작하세요.</system:String>
+    <system:String x:Key="releaseNotes">릴리즈 노트:</system:String>
+
+    <!--Action Keyword Setting Dialog-->
+    <system:String x:Key="oldActionKeywords">예전 액션 키워드</system:String>
+    <system:String x:Key="newActionKeywords">새 액션 키워드</system:String>
+    <system:String x:Key="cancel">취소</system:String>
+    <system:String x:Key="done">완료</system:String>
+    <system:String x:Key="cannotFindSpecifiedPlugin">플러그인을 찾을 수 없습니다.</system:String>
+    <system:String x:Key="newActionKeywordsCannotBeEmpty">새 액션 키워드를 입력하세요.</system:String>
+    <system:String x:Key="newActionKeywordsHasBeenAssigned">새 액션 키워드가 할당된 플러그인이 이미 있습니다. 다른 액션 키워드를 입력하세요.</system:String>
+    <system:String x:Key="succeed">성공</system:String>
+    <system:String x:Key="actionkeyword_tips">액션 키워드를 지정하지 않으려면 *를 사용하세요.</system:String>
+
+    <!--Custom Query Hotkey Dialog-->
+    <system:String x:Key="preview">미리보기</system:String>
+    <system:String x:Key="hotkeyIsNotUnavailable">핫키를 사용할 수 없습니다. 다른 핫키를 입력하세요.</system:String>
+    <system:String x:Key="invalidPluginHotkey">플러그인 핫키가 유효하지 않습니다.</system:String>
+    <system:String x:Key="update">업데이트</system:String>
+
+    <!--Hotkey Control-->
+    <system:String x:Key="hotkeyUnavailable">핫키를 사용할 수 없습니다.</system:String>
+
+    <!--Crash Reporter-->
+    <system:String x:Key="reportWindow_version">버전</system:String>
+    <system:String x:Key="reportWindow_time">시간</system:String>
+    <system:String x:Key="reportWindow_reproduce">수정을 위해 애플리케이션이 어떻게 충돌했는지 알려주세요.</system:String>
+    <system:String x:Key="reportWindow_send_report">보고서 보내기</system:String>
+    <system:String x:Key="reportWindow_cancel">취소</system:String>
+    <system:String x:Key="reportWindow_general">일반</system:String>
+    <system:String x:Key="reportWindow_exceptions">예외</system:String>
+    <system:String x:Key="reportWindow_exception_type">예외 유형</system:String>
+    <system:String x:Key="reportWindow_source">소스</system:String>
+    <system:String x:Key="reportWindow_stack_trace">스택 추적</system:String>
+    <system:String x:Key="reportWindow_sending">보내는 중</system:String>
+    <system:String x:Key="reportWindow_report_succeed">보고서를 정상적으로 보냈습니다.</system:String>
+    <system:String x:Key="reportWindow_report_failed">보고서를 보내지 못했습니다.</system:String>
+    <system:String x:Key="reportWindow_wox_got_an_error">Wox에 문제가 발생했습니다.</system:String>
+
+    <!--update-->
+    <system:String x:Key="update_wox_update_new_version_available">새 Wox 버전({0})을 사용할 수 있습니다.</system:String>
+    <system:String x:Key="update_wox_update_error">소프트웨어 업데이트를 설치하는 중에 오류가 발생했습니다.</system:String>
+    <system:String x:Key="update_wox_update">업데이트</system:String>
+    <system:String x:Key="update_wox_update_cancel">취소</system:String>
+    <system:String x:Key="update_wox_update_restart_wox_tip">업데이트를 위해 Wox를 재시작합니다.</system:String>
+    <system:String x:Key="update_wox_update_upadte_files">아래 파일들이 업데이트됩니다.</system:String>
+    <system:String x:Key="update_wox_update_files">업데이트 파일</system:String>
+    <system:String x:Key="update_wox_update_upadte_description">업데이트 설명</system:String>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Wox/Wox.csproj b/Wox/Wox.csproj
index 748c11a5cd..e254ff2c09 100644
--- a/Wox/Wox.csproj
+++ b/Wox/Wox.csproj
@@ -283,6 +283,11 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Languages\ko.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>