Merge branch 'dev'

Plugins/Wox.Plugin.CMD/CMD.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Windows.Forms;
 using WindowsInput;
 using WindowsInput.Native;
-using Wox.Infrastructure;
 using Wox.Infrastructure.Hotkey;
 using Wox.Infrastructure.Logger;
 using Control = System.Windows.Controls.Control;
@@ -200,11 +199,6 @@ namespace Wox.Plugin.CMD
             return new CMDSetting();
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_cmd_plugin_name");

Plugins/Wox.Plugin.Caculator/Calculator.cs

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Windows;
-using Wox.Infrastructure;
 using YAMP;
 
 namespace Wox.Plugin.Caculator
@@ -93,12 +91,6 @@ namespace Wox.Plugin.Caculator
             this.context = context;
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_caculator_plugin_name");

Plugins/Wox.Plugin.Color/Color.cs

@@ -5,7 +5,6 @@ using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Windows;
-using Wox.Infrastructure;
 
 namespace Wox.Plugin.Color
 {
@@ -109,11 +108,6 @@ namespace Wox.Plugin.Color
         }
 
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_color_plugin_name");

Plugins/Wox.Plugin.ControlPanel/ControlPanel.cs

@@ -82,11 +82,6 @@ namespace Wox.Plugin.ControlPanel
             return false;
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_controlpanel_plugin_name");

Plugins/Wox.Plugin.Everything/Main.cs

@@ -6,7 +6,6 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.ServiceProcess;
 using System.Windows;
-using Wox.Infrastructure;
 using Wox.Plugin.Everything.Everything;
 
 namespace Wox.Plugin.Everything
@@ -256,11 +255,6 @@ namespace Wox.Plugin.Everything
             return directory;
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return _context.API.GetTranslation("wox_plugin_everything_plugin_name");

Plugins/Wox.Plugin.Folder/FolderPlugin.cs

@@ -5,7 +5,6 @@ using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using Wox.Infrastructure;
 
 namespace Wox.Plugin.Folder
 {
@@ -244,11 +243,6 @@ namespace Wox.Plugin.Folder
             return results;
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_folder_plugin_name");

Plugins/Wox.Plugin.PluginIndicator/PluginIndicator.cs

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using Wox.Core.Plugin;
 using Wox.Core.UserSettings;
-using Wox.Infrastructure;
 
 namespace Wox.Plugin.PluginIndicator
 {
@@ -39,11 +37,6 @@ namespace Wox.Plugin.PluginIndicator
             this.context = context;
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_pluginindicator_plugin_name");

Plugins/Wox.Plugin.PluginManagement/Main.cs

@@ -7,7 +7,6 @@ using System.Text;
 using System.Threading;
 using System.Windows;
 using Newtonsoft.Json;
-using Wox.Infrastructure;
 
 namespace Wox.Plugin.PluginManagement
 {
@@ -242,11 +241,6 @@ namespace Wox.Plugin.PluginManagement
             this.context = context;
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_plugin_management_plugin_name");

Plugins/Wox.Plugin.Program/Languages/ja.xaml

@@ -0,0 +1,38 @@
+<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">
+
+    <!--Program setting-->
+    <system:String x:Key="wox_plugin_program_delete">Delete</system:String>
+    <system:String x:Key="wox_plugin_program_edit">Edit</system:String>
+    <system:String x:Key="wox_plugin_program_add">Add</system:String>
+    <system:String x:Key="wox_plugin_program_location">Location</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes">Index file suffixes</system:String>
+    <system:String x:Key="wox_plugin_program_reindex">Reindex</system:String>
+    <system:String x:Key="wox_plugin_program_indexing">Indexing</system:String>
+    <system:String x:Key="wox_plugin_program_index_start">Index Start Menu</system:String>
+    <system:String x:Key="wox_plugin_program_index_registry">Index Registry</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes_header">Suffixes</system:String>
+    <system:String x:Key="wox_plugin_program_max_depth_header">Max Depth</system:String>
+
+    <system:String x:Key="wox_plugin_program_directory">Directory:</system:String>
+    <system:String x:Key="wox_plugin_program_browse">Browse</system:String>
+    <system:String x:Key="wox_plugin_program_file_suffixes">File Suffixes:</system:String>
+    <system:String x:Key="wox_plugin_program_max_search_depth">Maximum Search Depth (-1 is unlimited):</system:String>
+
+    <system:String x:Key="wox_plugin_program_pls_select_program_source">Please select a program source</system:String>
+    <system:String x:Key="wox_plugin_program_delete_program_source">Are your sure to delete {0}?</system:String>
+
+    <system:String x:Key="wox_plugin_program_update">Update</system:String>
+    <system:String x:Key="wox_plugin_program_only_index_tip">Wox will only index files that end with following suffixes:</system:String>
+    <system:String x:Key="wox_plugin_program_split_by_tip">(Each suffix should split by ;)</system:String>
+    <system:String x:Key="wox_plugin_program_update_file_suffixes">Sucessfully update file suffixes</system:String>
+    <system:String x:Key="wox_plugin_program_suffixes_cannot_empty">File suffixes can't be empty</system:String>
+
+    <system:String x:Key="wox_plugin_program_run_as_administrator">Run As Administrator</system:String>
+    <system:String x:Key="wox_plugin_program_open_containing_folder">Open containing folder</system:String>
+
+    <system:String x:Key="wox_plugin_program_plugin_name">Program</system:String>
+    <system:String x:Key="wox_plugin_program_plugin_description">Search programs in Wox</system:String>
+
+</ResourceDictionary>

Plugins/Wox.Plugin.Program/Programs.cs

@@ -175,10 +175,6 @@ namespace Wox.Plugin.Program
 
         #endregion
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_program_plugin_name");

Plugins/Wox.Plugin.Sys/Languages/ja.xaml

@@ -0,0 +1,21 @@
+<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">
+
+    <system:String x:Key="wox_plugin_sys_command">コマンド</system:String>
+    <system:String x:Key="wox_plugin_sys_desc">説明</system:String>
+
+    <system:String x:Key="wox_plugin_sys_shutdown_computer">コンピュータをシャットダウンする</system:String>
+    <system:String x:Key="wox_plugin_sys_restart_computer">コンピュータを再起動する</system:String>
+    <system:String x:Key="wox_plugin_sys_log_off">ログオフ</system:String>
+    <system:String x:Key="wox_plugin_sys_lock">このコンピュータをロックする</system:String>
+    <system:String x:Key="wox_plugin_sys_exit">Woxを終了する</system:String>
+    <system:String x:Key="wox_plugin_sys_restart">Woxを再起動する</system:String>
+    <system:String x:Key="wox_plugin_sys_setting">このアプリの設定</system:String>
+    <system:String x:Key="wox_plugin_sys_sleep">スリープ</system:String>
+    <system:String x:Key="wox_plugin_sys_emptyrecyclebin">ゴミ箱を空にする</system:String>
+
+    <system:String x:Key="wox_plugin_sys_plugin_name">システムコマンド</system:String>
+    <system:String x:Key="wox_plugin_sys_plugin_description">システム関連のコマンドを提供します。例:シャットダウン、ロック、設定など</system:String>
+
+</ResourceDictionary>

Plugins/Wox.Plugin.Sys/Sys.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Forms;
@@ -190,11 +189,6 @@ namespace Wox.Plugin.Sys
             });
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_sys_plugin_name");

Plugins/Wox.Plugin.Url/Languages/ja.xaml

@@ -0,0 +1,11 @@
+<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">
+
+    <system:String x:Key="wox_plugin_url_open_url">次のURLを開く:{0}</system:String>
+    <system:String x:Key="wox_plugin_url_canot_open_url">次のURLを開くことができません:{0}</system:String>
+
+    <system:String x:Key="wox_plugin_url_plugin_name">URL</system:String>
+    <system:String x:Key="wox_plugin_url_plugin_description">入力したURLをWoxから開くプラグインです。</system:String>
+
+</ResourceDictionary>

Plugins/Wox.Plugin.Url/UrlPlugin.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Text.RegularExpressions;
-using Wox.Infrastructure;
 
 namespace Wox.Plugin.Url
 {
@@ -103,11 +101,6 @@ namespace Wox.Plugin.Url
             this.context = context;
         }
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return context.API.GetTranslation("wox_plugin_url_plugin_name");

Plugins/Wox.Plugin.WebSearch/Languages/ja.xaml

@@ -0,0 +1,32 @@
+<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">
+
+    <system:String x:Key="wox_plugin_websearch_delete">削除</system:String>
+    <system:String x:Key="wox_plugin_websearch_edit">編集</system:String>
+    <system:String x:Key="wox_plugin_websearch_add">追加</system:String>
+    <system:String x:Key="wox_plugin_websearch_action_keyword">キーワード</system:String>
+    <system:String x:Key="wox_plugin_websearch_url">URL</system:String>
+    <system:String x:Key="wox_plugin_websearch_search">検索</system:String>
+    <system:String x:Key="wox_plugin_websearch_enable_suggestion">検索サジェスチョンを有効にする</system:String>
+    <system:String x:Key="wox_plugin_websearch_pls_select_web_search">web検索を選択してください</system:String>
+    <system:String x:Key="wox_plugin_websearch_delete_warning">本当に{0}を削除しますか?</system:String>
+
+    
+    <!--web search edit-->
+    <system:String x:Key="wox_plugin_websearch_title">タイトル</system:String>
+    <system:String x:Key="wox_plugin_websearch_enable">有効</system:String>
+    <system:String x:Key="wox_plugin_websearch_select_icon">アイコンを選択</system:String>
+    <system:String x:Key="wox_plugin_websearch_icon">アイコン</system:String>
+    <system:String x:Key="wox_plugin_websearch_cancel">キャンセル</system:String>
+    <system:String x:Key="wox_plugin_websearch_invalid_web_search">web検索を無効にする</system:String>
+    <system:String x:Key="wox_plugin_websearch_input_title">タイトルを入力してください</system:String>
+    <system:String x:Key="wox_plugin_websearch_input_action_keyword">キーワードを入力してください</system:String>
+    <system:String x:Key="wox_plugin_websearch_input_url">URLを入力してください</system:String>
+    <system:String x:Key="wox_plugin_websearch_action_keyword_exist">キーワードはすでに存在します。違うキーワードを入力してください</system:String>
+    <system:String x:Key="wox_plugin_websearch_succeed">成功</system:String>
+
+    <system:String x:Key="wox_plugin_websearch_plugin_name">Web検索</system:String>
+    <system:String x:Key="wox_plugin_websearch_plugin_description">Web検索を提供</system:String>
+
+</ResourceDictionary>

Plugins/Wox.Plugin.WebSearch/WebSearchPlugin.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.IO;
 using System.Linq;
 using System.Windows.Controls;
-using Wox.Infrastructure;
 using Wox.Plugin.WebSearch.Annotations;
 using Wox.Plugin.WebSearch.SuggestionSources;
 
@@ -90,11 +88,6 @@ namespace Wox.Plugin.WebSearch
 
         #endregion
 
-        public string GetLanguagesFolder()
-        {
-            return Path.Combine(WoxDirectroy.Executable, "Languages");
-        }
-
         public string GetTranslatedPluginTitle()
         {
             return Context.API.GetTranslation("wox_plugin_websearch_plugin_name");

Wox.Core/Resource/AvailableLanguages.cs

@@ -9,6 +9,7 @@ namespace Wox.Core.Resource
         public static Language Chinese_TW = new Language("zh-tw", "中文（繁体）");
         public static Language Russian = new Language("ru", "Русский");
         public static Language French = new Language("fr", "Français");
+        public static Language Japanese = new Language("ja", "日本語");
 
         public static List<Language> GetAvailableLanguages()
         {
@@ -18,7 +19,8 @@ namespace Wox.Core.Resource
                 Chinese, 
                 Chinese_TW,
                 Russian,
-                French
+                French,
+                Japanese
             };
             return languages;
         }

Wox.Core/Resource/Internationalization.cs

@@ -15,10 +15,10 @@ namespace Wox.Core.Resource
         public Internationalization()
         {
             DirectoryName = "Languages";
-            MakesureThemeDirectoriesExist();
+            MakesureDirectoriesExist();
         }
 
-        private void MakesureThemeDirectoriesExist()
+        private void MakesureDirectoriesExist()
         {
             if (!Directory.Exists(DirectoryPath))
             {
@@ -73,10 +73,11 @@ namespace Wox.Core.Resource
 
         public override ResourceDictionary GetResourceDictionary()
         {
-            return new ResourceDictionary
+            var dictionary = new ResourceDictionary
             {
                 Source = new Uri(GetLanguageFile(DirectoryPath), UriKind.Absolute)
             };
+            return dictionary;
         }
 
         public List<Language> LoadAvailableLanguages()

Wox.Core/Resource/ResourceMerger.cs

@@ -1,9 +1,11 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Windows;
 using Wox.Core.Plugin;
 using Wox.Plugin;
+using Wox.Infrastructure.Exception;
 
 namespace Wox.Core.Resource
 {
@@ -33,14 +35,28 @@ namespace Wox.Core.Resource
         internal static void UpdatePluginLanguages()
         {
             RemoveResource(PluginManager.DirectoryName);
-            foreach (var languageFile in PluginManager.GetPluginsForInterface<IPluginI18n>().
+            foreach (var plugin in PluginManager.GetPluginsForInterface<IPluginI18n>())
-                Select(plugin => InternationalizationManager.Instance.GetLanguageFile(((IPluginI18n)plugin.Plugin).GetLanguagesFolder())).
-                Where(file => !string.IsNullOrEmpty(file)))
             {
-                Application.Current.Resources.MergedDictionaries.Add(new ResourceDictionary
+                var location = Assembly.GetAssembly(plugin.Plugin.GetType()).Location;
+                var directoryName = Path.GetDirectoryName(location);
+                if (directoryName != null)
                 {
-                    Source = new Uri(languageFile, UriKind.Absolute)
+                    var internationalization = InternationalizationManager.Instance;
-                });
+                    var folder = Path.Combine(directoryName, internationalization.DirectoryName);
+                    var file = internationalization.GetLanguageFile(folder);
+                    if (!string.IsNullOrEmpty(file))
+                    {
+                        Application.Current.Resources.MergedDictionaries.Add(new ResourceDictionary
+                        {
+                            Source = new Uri(file, UriKind.Absolute)
+                        });
+                    }
+                }
+                else
+                {
+                    throw new WoxPluginException(plugin.Metadata.Name, "Can't find plugin location.");
+                }
+                
             }
         }
     }

Wox.Infrastructure/Exception/WoxPluginException.cs

@@ -14,5 +14,9 @@
         {
             PluginName = pluginName;
         }
+
+        public WoxPluginException(string msg) : base(msg)
+        {
+        }
     }
 }

Wox.Plugin/Feature.cs

@@ -32,8 +32,6 @@ namespace Wox.Plugin
     /// </summary>
     public interface IPluginI18n : IFeatures
     {
-        string GetLanguagesFolder();
-
         string GetTranslatedPluginTitle();
 
         string GetTranslatedPluginDescription();

Wox/Languages/ja.xaml

@@ -0,0 +1,129 @@
+<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">Woxについて</system:String>
+    <system:String x:Key="iconTrayExit">終了</system:String>
+
+    <!--Setting General-->
+    <system:String x:Key="woxsettings">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="maxShowResults">結果の最大表示件数</system:String>
+    <system:String x:Key="ignoreHotkeysOnFullscreen">ウィンドウがフルスクリーン時にホットキーを無効にする</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">こんにちは 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">プロキシ</system:String>
+    <system:String x:Key="enableProxy">プロキシを有効化</system:String>
+    <system:String x:Key="server">サーバ</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">Woxについて</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>
+
+    <!--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 の最新バージョン V{0} が入手可能です</system:String>
+    <system:String x:Key="update_wox_update_error">Woxのアップデート中にエラーが発生しました</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>

Wox/Wox.csproj

@@ -216,6 +216,11 @@
       <SubType>Designer</SubType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Languages\ja.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>