fix #608

Wox/Languages/de.xaml

@@ -15,7 +15,7 @@
     <system:String x:Key="iconTrayExit">Schließen</system:String>
 
     <!--Setting General-->
-    <system:String x:Key="woxsettings">Wox Einstellungen</system:String>
+    <system:String x:Key="wox_settings">Wox Einstellungen</system:String>
     <system:String x:Key="general">Allgemein</system:String>
     <system:String x:Key="startWoxOnSystemStartup">Starte Wox bei Systemstart</system:String>
     <system:String x:Key="hideWoxWhenLoseFocus">Verstecke Wox wenn der Focus verloren geht</system:String>
@@ -25,7 +25,10 @@
     <system:String x:Key="maxShowResults">Maximale Anzahl Ergebnisse</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignoriere Tastenkombination wenn Fenster im Vollbildmodus ist</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
-
+    <system:String x:Key="autoUpdates">Auto Update</system:String>
+    <system:String x:Key="selectPythonDirectory">Select</system:String>
+    <system:String x:Key="hideOnStartup">Hide Wox on startup</system:String>
+    
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Suche weitere Plugins</system:String>
@@ -45,7 +48,6 @@
     <system:String x:Key="windowMode">Fenstermodus</system:String>
     <system:String x:Key="opacity">Druchsichtigkeit</system:String>
     
-    
     <!--Setting Hotkey-->
     <system:String x:Key="hotkey">Tastenkombination</system:String>
     <system:String x:Key="woxHotkey">Wox Tastenkombination</system:String>
@@ -77,6 +79,9 @@
     <system:String x:Key="website">Webseite</system:String>
     <system:String x:Key="version">Version</system:String>
     <system:String x:Key="about_activate_times">Du hast Wox {0} mal aktiviert</system:String>
+    <system:String x:Key="checkUpdates">Check for Updates</system:String>
+    <system:String x:Key="newVersionTips">New version {0} avaiable, please restart wox</system:String>
+    <system:String x:Key="releaseNotes">Release Notes:</system:String>
 
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">Altes Aktionsschlüsselwort</system:String>
@@ -89,7 +94,6 @@
     <system:String x:Key="succeed">Erfolgreich</system:String>
     <system:String x:Key="actionkeyword_tips">Benutze * wenn du ein Aktionsschlüsselwort definieren willst</system:String>
     
-    
     <!--Custom Query Hotkey Dialog-->
     <system:String x:Key="preview">Vorschau</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">Tastenkombination ist nicht verfügbar, bitte wähle eine andere Tastenkombination</system:String>
@@ -99,7 +103,6 @@
     <!--Hotkey Control-->
     <system:String x:Key="hotkeyUnavailable">Tastenkombination nicht verfügbar</system:String>
     
-    
     <!--Crash Reporter-->
     <system:String x:Key="reportWindow_version">Version</system:String>
     <system:String x:Key="reportWindow_time">Zeit</system:String>
@@ -126,5 +129,4 @@
     <system:String x:Key="update_wox_update_files">Aktualisiere Dateien</system:String>
     <system:String x:Key="update_wox_update_upadte_description">Aktualisierungbeschreibung</system:String>
     
-
 </ResourceDictionary>

Wox/Languages/en.xaml

@@ -18,7 +18,6 @@
     <system:String x:Key="wox_settings">Wox Settings</system:String>
     <system:String x:Key="general">General</system:String>
     <system:String x:Key="startWoxOnSystemStartup">Start Wox on system startup</system:String>
-    <system:String x:Key="hideOnStartup">Hide Wox on startup</system:String>
     <system:String x:Key="hideWoxWhenLoseFocus">Hide Wox when focus lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
     <system:String x:Key="rememberLastLocation">Remember last launch location</system:String>
@@ -26,10 +25,10 @@
     <system:String x:Key="maxShowResults">Maximum results shown</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
-    <system:String x:Key="selectPythonDirectory">Select</system:String>
     <system:String x:Key="autoUpdates">Auto Update</system:String>
-    
-    
+    <system:String x:Key="selectPythonDirectory">Select</system:String>
+    <system:String x:Key="hideOnStartup">Hide Wox on startup</system:String>
+
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
@@ -48,8 +47,7 @@
     <system:String x:Key="resultItemFont">Result Item Font</system:String>
     <system:String x:Key="windowMode">Window Mode</system:String>
     <system:String x:Key="opacity">Opacity</system:String>
-    
-    
+
     <!--Setting Hotkey-->
     <system:String x:Key="hotkey">Hotkey</system:String>
     <system:String x:Key="woxHotkey">Wox Hotkey</system:String>
@@ -80,10 +78,10 @@
     <system:String x:Key="about">About</system:String>
     <system:String x:Key="website">Website</system:String>
     <system:String x:Key="version">Version</system:String>
-    <system:String x:Key="checkUpdates">Check for Updates</system:String>
-    <system:String x:Key="newVersionTips">New version {0} avaiable, please restart</system:String>
-    <system:String x:Key="releaseNotes">Release Notes:</system:String>
     <system:String x:Key="about_activate_times">You have activated Wox for {0} times</system:String>
+    <system:String x:Key="checkUpdates">Check for Updates</system:String>
+    <system:String x:Key="newVersionTips">New version {0} avaiable, please restart wox</system:String>
+    <system:String x:Key="releaseNotes">Release Notes:</system:String>
 
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">Old Action Keyword</system:String>
@@ -95,18 +93,16 @@
     <system:String x:Key="newActionKeywordsHasBeenAssigned">New ActionKeywords has been assigned to other plugin, please assign another new action keyword</system:String>
     <system:String x:Key="succeed">Succeed</system:String>
     <system:String x:Key="actionkeyword_tips">Use * if you don't want to specify a action keyword</system:String>
-    
-    
+
     <!--Custom Query Hotkey Dialog-->
     <system:String x:Key="preview">Preview</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">Hotkey is unavailable, please select a new hotkey</system:String>
     <system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
     <system:String x:Key="update">Update</system:String>
-    
+
     <!--Hotkey Control-->
     <system:String x:Key="hotkeyUnavailable">Hotkey unavailable</system:String>
-    
-    
+
     <!--Crash Reporter-->
     <system:String x:Key="reportWindow_version">Version</system:String>
     <system:String x:Key="reportWindow_time">Time</system:String>
@@ -132,6 +128,5 @@
     <system:String x:Key="update_wox_update_upadte_files">Following files will be updated</system:String>
     <system:String x:Key="update_wox_update_files">Update files</system:String>
     <system:String x:Key="update_wox_update_upadte_description">Update description</system:String>
-    
 
-</ResourceDictionary>
+</ResourceDictionary>

Wox/Languages/fr.xaml

@@ -15,7 +15,7 @@
     <system:String x:Key="iconTrayExit">Quitter</system:String>
 
     <!--Setting General-->
-    <system:String x:Key="woxsettings">Paramètres - Wox</system:String>
+    <system:String x:Key="wox_settings">Paramètres - Wox</system:String>
     <system:String x:Key="general">Général</system:String>
     <system:String x:Key="startWoxOnSystemStartup">Lancer Wox au démarrage du système</system:String>
     <system:String x:Key="hideWoxWhenLoseFocus">Cacher Wox lors de la perte de focus</system:String>
@@ -25,7 +25,10 @@
     <system:String x:Key="maxShowResults">Résultats à afficher</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Ignore les raccourcis lorsqu'une application est en plein écran</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
-
+    <system:String x:Key="autoUpdates">Auto Update</system:String>
+    <system:String x:Key="selectPythonDirectory">Select</system:String>
+    <system:String x:Key="hideOnStartup">Hide Wox on startup</system:String>
+    
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Modules</system:String>
     <system:String x:Key="browserMorePlugins">Trouver plus de modules</system:String>
@@ -76,6 +79,9 @@
     <system:String x:Key="website">Site Web</system:String>
     <system:String x:Key="version">Version</system:String>
     <system:String x:Key="about_activate_times">Vous avez utilisé Wox {0} fois</system:String>
+    <system:String x:Key="checkUpdates">Check for Updates</system:String>
+    <system:String x:Key="newVersionTips">New version {0} avaiable, please restart wox</system:String>
+    <system:String x:Key="releaseNotes">Release Notes:</system:String>
 
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">Ancien mot-clé d'action</system:String>
@@ -88,7 +94,6 @@
     <system:String x:Key="succeed">Ajouté</system:String>
     <system:String x:Key="actionkeyword_tips">Utilisez * si vous ne souhaitez pas utiliser de mot-clé spécifique</system:String>
     
-    
     <!--Custom Query Hotkey Dialog-->
     <system:String x:Key="preview">Aperçu</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">Le raccourci n'est pas disponible, choisissez en un autre</system:String>
@@ -98,7 +103,6 @@
     <!--Hotkey Control-->
     <system:String x:Key="hotkeyUnavailable">Raccourci non disponible</system:String>
     
-    
     <!--Crash Reporter-->
     <system:String x:Key="reportWindow_version">Version</system:String>
     <system:String x:Key="reportWindow_time">Time</system:String>
@@ -125,5 +129,4 @@
     <system:String x:Key="update_wox_update_files">Fichiers mis à jour</system:String>
     <system:String x:Key="update_wox_update_upadte_description">Description de la mise à jour</system:String>
     
-
 </ResourceDictionary>

Wox/Languages/ja.xaml

@@ -15,7 +15,7 @@
     <system:String x:Key="iconTrayExit">終了</system:String>
 
     <!--Setting General-->
-    <system:String x:Key="woxsettings">Wox設定</system:String>
+    <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>
@@ -25,7 +25,9 @@
     <system:String x:Key="maxShowResults">結果の最大表示件数</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">ウィンドウがフルスクリーン時にホットキーを無効にする</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
-
+    <system:String x:Key="autoUpdates">Auto Update</system:String>
+    <system:String x:Key="selectPythonDirectory">Select</system:String>
+    <system:String x:Key="hideOnStartup">Hide Wox on startup</system:String>
     
     <!--Setting Plugin-->
     <system:String x:Key="plugin">プラグイン</system:String>
@@ -46,7 +48,6 @@
     <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>
@@ -78,6 +79,9 @@
     <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">Check for Updates</system:String>
+    <system:String x:Key="newVersionTips">New version {0} avaiable, please restart wox</system:String>
+    <system:String x:Key="releaseNotes">Release Notes:</system:String>
 
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">古いアクションキーボード</system:String>
@@ -90,7 +94,6 @@
     <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>
@@ -100,7 +103,6 @@
     <!--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>
@@ -127,5 +129,4 @@
     <system:String x:Key="update_wox_update_files">更新ファイル一覧</system:String>
     <system:String x:Key="update_wox_update_upadte_description">アップデートの詳細</system:String>
     
-
 </ResourceDictionary>

Wox/Languages/ru.xaml

@@ -15,7 +15,7 @@
     <system:String x:Key="iconTrayExit">Закрыть</system:String>
 
     <!--Setting General-->
-    <system:String x:Key="woxsettings">Настройки Wox</system:String>
+    <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>
@@ -25,7 +25,10 @@
     <system:String x:Key="maxShowResults">Максимальное количество результатов</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">Игнорировать горячие клавиши, если окно в полноэкранном режиме</system:String>
     <system:String x:Key="pythonDirectory">Python Directory</system:String>
-
+    <system:String x:Key="autoUpdates">Auto Update</system:String>
+    <system:String x:Key="selectPythonDirectory">Select</system:String>
+    <system:String x:Key="hideOnStartup">Hide Wox on startup</system:String>
+    
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Плагины</system:String>
     <system:String x:Key="browserMorePlugins">Найти больше плагинов</system:String>
@@ -76,6 +79,9 @@
     <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">Check for Updates</system:String>
+    <system:String x:Key="newVersionTips">New version {0} avaiable, please restart wox</system:String>
+    <system:String x:Key="releaseNotes">Release Notes:</system:String>
 
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">Текущая горячая клавиша</system:String>
@@ -88,7 +94,6 @@
     <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>
@@ -98,7 +103,6 @@
     <!--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>
@@ -125,5 +129,4 @@
     <system:String x:Key="update_wox_update_files">Обновить файлы</system:String>
     <system:String x:Key="update_wox_update_upadte_description">Описание обновления</system:String>
     
-
 </ResourceDictionary>

Wox/Languages/zh-cn.xaml

@@ -15,10 +15,9 @@
     <system:String x:Key="iconTrayExit">退出</system:String>
     
     <!--设置，通用-->
-    <system:String x:Key="woxsettings">Wox设置</system:String>
+    <system:String x:Key="wox_settings">Wox设置</system:String>
     <system:String x:Key="general">通用</system:String>
     <system:String x:Key="startWoxOnSystemStartup">开机启动</system:String>
-    <system:String x:Key="hideOnStartup">启动时不显示主窗口</system:String>
     <system:String x:Key="hideWoxWhenLoseFocus">失去焦点时自动隐藏Wox</system:String>
     <system:String x:Key="dontPromptUpdateMsg">不显示新版本提示</system:String>
     <system:String x:Key="rememberLastLocation">记住上次启动位置</system:String>
@@ -27,6 +26,8 @@
     <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">Select</system:String>
+    <system:String x:Key="hideOnStartup">启动时不显示主窗口</system:String>
 
     <!--设置，插件-->
     <system:String x:Key="plugin">插件</system:String>
@@ -73,11 +74,14 @@
     <system:String x:Key="proxyIsCorrect">代理设置正确</system:String>
     <system:String x:Key="proxyConnectFailed">代理连接失败</system:String>
     
-    <!--设置，版本-->
+    <!--设置 关于-->
     <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 设置对话框-->
     <system:String x:Key="oldActionKeywords">旧触发关键字</system:String>
@@ -125,5 +129,4 @@
     <system:String x:Key="update_wox_update_files">更新文件</system:String>
     <system:String x:Key="update_wox_update_upadte_description">更新日志</system:String>
 
-
 </ResourceDictionary>

Wox/Languages/zh-tw.xaml

@@ -15,7 +15,7 @@
     <system:String x:Key="iconTrayExit">退出</system:String>
     
     <!--設置，通用-->
-    <system:String x:Key="woxsettings">Wox設置</system:String>
+    <system:String x:Key="wox_settings">Wox設置</system:String>
     <system:String x:Key="general">通用</system:String>
     <system:String x:Key="startWoxOnSystemStartup">開機啟動</system:String>
     <system:String x:Key="hideWoxWhenLoseFocus">失去焦點時自動隱藏Wox</system:String>
@@ -24,7 +24,10 @@
     <system:String x:Key="language">語言</system:String>
     <system:String x:Key="maxShowResults">最大結果顯示個數</system:String>
     <system:String x:Key="ignoreHotkeysOnFullscreen">全屏模式下忽略熱鍵</system:String>
-    <system:String x:Key="pythonDirectory">Python Directory</system:String>
+    <system:String x:Key="pythonDirectory">Python 路径</system:String>
+    <system:String x:Key="autoUpdates">自动更新</system:String>
+    <system:String x:Key="selectPythonDirectory">Select</system:String>
+    <system:String x:Key="hideOnStartup">启动时不显示主窗口</system:String>
 
     <!--設置，插件-->
     <system:String x:Key="plugin">插件</system:String>
@@ -71,12 +74,15 @@
     <system:String x:Key="proxyIsCorrect">代理設置正確</system:String>
     <system:String x:Key="proxyConnectFailed">代理連接失敗</system:String>
 
-    <!--設置，版本-->
+    <!--設置，關於-->
     <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 設置對話框-->
     <system:String x:Key="oldActionKeywords">舊觸發關鍵字</system:String>
     <system:String x:Key="newActionKeywords">新觸發關鍵字</system:String>

Wox/SettingWindow.xaml

@@ -6,7 +6,7 @@
     xmlns:woxPlugin="clr-namespace:Wox.Plugin;assembly=Wox.Plugin"
     xmlns:image="clr-namespace:Wox.Infrastructure.Image;assembly=Wox.Infrastructure"
     Icon="Images\app.png"
-    Title="{DynamicResource woxsettings}"
+    Title="{DynamicResource wox_settings}"
     ResizeMode="NoResize"
     WindowStartupLocation="CenterScreen"
     Height="600" Width="800" PreviewKeyDown="Window_PreviewKeyDown">

Wox/SettingWindow.xaml.cs

@@ -132,6 +132,8 @@ namespace Wox
             cbIgnoreHotkeysOnFullscreen.IsChecked = _settings.IgnoreHotkeysOnFullscreen;
             AutoUpdatesCheckBox.IsChecked = _settings.AutoUpdates;
 
+            LoadLanguages();
+
             comboMaxResultsToShow.ItemsSource = Enumerable.Range(2, 16);
             var maxResults = _settings.MaxResultsToShow;
             comboMaxResultsToShow.SelectedItem = maxResults == 0 ? 6 : maxResults;
@@ -162,7 +164,6 @@ namespace Wox
 
             #endregion
 
-            LoadLanguages();
             settingsLoaded = true;
         }