From e74a0c99b68160be83c4e897195c8f6daaeae6c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Sat, 23 Jan 2021 12:05:23 +0800
Subject: [PATCH 1/5] fix most untranslated string in Setting window

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml | 19 ++++++++++---------
 Flow.Launcher/Languages/en.xaml             |  3 +++
 Flow.Launcher/SettingWindow.xaml            |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 5f4cdff19e4..bf6a35dffac 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -5,7 +5,7 @@
         Icon="Images\app.png"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
-        Title="Custom Plugin Hotkey" Height="200" Width="674.766">
+        Title="{DynamicResource customeQueryHotkeyTitle}" Height="200" Width="674.766">
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="Close"/>
     </Window.InputBindings>
@@ -19,22 +19,23 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="150" />
+            <ColumnDefinition Width="102.124" />
+            <ColumnDefinition Width="47.876"/>
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
-        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" />
+        <TextBlock Margin="92,0,0,0" FontSize="14" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Left" Text="{DynamicResource hotkey}" Grid.ColumnSpan="2" />
+        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="2" VerticalAlignment="Center" Height="32" />
 
-        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
+        <TextBlock Margin="38,0,0,0" FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
+                   HorizontalAlignment="Left" Text="{DynamicResource actionKeyword}" />
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="2">
             <TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
             <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
                     Content="{DynamicResource preview}" />
         </StackPanel>
 
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="2" Margin="325,61,0,0" Grid.RowSpan="2">
             <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="32"
                     Content="{DynamicResource cancel}" />
             <Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="32" Click="btnAdd_OnClick">
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 1e0e6a7e0fb..b1cf6a1f73c 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -17,6 +17,7 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
     <system:String x:Key="general">General</system:String>
+    <system:String x:Key="portableMode">Portable Mode</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
@@ -39,6 +40,7 @@
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
+    <system:String x:Key="enable">Enable</system:String>
     <system:String x:Key="disable">Disable</system:String>
     <system:String x:Key="actionKeywords">Action keyword:</system:String>
     <system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
@@ -122,6 +124,7 @@
     <system:String x:Key="actionkeyword_tips">Use * if you don't want to specify an action keyword</system:String>
 
     <!--Custom Query Hotkey Dialog-->
+    <system:String x:Key="customeQueryHotkeyTitle">Custom Plugin Hotkey</system:String>
     <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>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 21d7e88f756..4c7eac114dd 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -37,7 +37,7 @@
             <ScrollViewer ui:ScrollViewerHelper.AutoHideScrollBars="True" Margin="60,30,0,30">
                 <StackPanel Orientation="Vertical">
                     <ui:ToggleSwitch Margin="10" IsOn="{Binding PortableMode}">
-                        <TextBlock Text="Portable Mode" />
+                        <TextBlock Text="{DynamicResource portableMode}" />
                     </ui:ToggleSwitch>
                     <CheckBox Margin="10" IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
                           Checked="OnAutoStartupChecked" Unchecked="OnAutoStartupUncheck">
@@ -166,7 +166,7 @@
                                                 </TextBlock>
                                             </ToolTipService.ToolTip>
                                      </TextBlock>
-                                    <ui:ToggleSwitch Grid.Column="1" OffContent="Disabled" OnContent="Enabled" 
+                                    <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" 
                                                      MaxWidth="110" HorizontalAlignment="Right"
                                                      IsOn="{Binding PluginState}"/>
                                 </Grid>

From c5791b838d19d891f4f809787bc8290236182b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Sat, 23 Jan 2021 12:20:52 +0800
Subject: [PATCH 2/5] fix untranslaed string in updator

---
 Flow.Launcher.Core/Updater.cs   | 18 +++++++++++-------
 Flow.Launcher/Languages/en.xaml | 18 +++++++++++++++---
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
index b203967de6a..44c34968c55 100644
--- a/Flow.Launcher.Core/Updater.cs
+++ b/Flow.Launcher.Core/Updater.cs
@@ -35,7 +35,8 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                 UpdateInfo newUpdateInfo;
 
                 if (!silentUpdate)
-                    api.ShowMsg("Please wait...", "Checking for new update");
+                    api.ShowMsg(api.GetTranslation("pleaseWait"),
+                                api.GetTranslation("update_flowlauncher_update_check"));
 
                 using var updateManager = await GitHubUpdateManager(GitHubRepository).ConfigureAwait(false);
 
@@ -51,12 +52,13 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                 if (newReleaseVersion <= currentVersion)
                 {
                     if (!silentUpdate)
-                        MessageBox.Show("You already have the latest Flow Launcher version");
+                        MessageBox.Show(api.GetTranslation("update_flowlauncher_already_on_latest"));
                     return;
                 }
 
                 if (!silentUpdate)
-                    api.ShowMsg("Update found", "Updating...");
+                    api.ShowMsg(api.GetTranslation("update_flowlauncher_update_found"),
+                                api.GetTranslation("update_flowlauncher_updating"));
 
                 await updateManager.DownloadReleases(newUpdateInfo.ReleasesToApply).ConfigureAwait(false);
 
@@ -67,8 +69,9 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                     var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion.ToString()}\\{DataLocation.PortableFolderName}";
                     FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination);
                     if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination))
-                        MessageBox.Show("Flow Launcher was not able to move your user profile data to the new update version. Please manually " +
-                            $"move your profile data folder from {DataLocation.PortableDataPath} to {targetDestination}");
+                        MessageBox.Show(string.Format(api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
+                                                      DataLocation.PortableDataPath,
+                                                      targetDestination));
                 }
                 else
                 {
@@ -79,7 +82,7 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
 
                 Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
 
-                if (MessageBox.Show(newVersionTips, "New Update", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+                if (MessageBox.Show(newVersionTips, api.GetTranslation("update_flowlauncher_new_update"), MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
                     UpdateManager.RestartApp(Constant.ApplicationFileName);
                 }
@@ -87,7 +90,8 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
             catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
             {
                 Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
-                api.ShowMsg("Update Failed", "Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.");
+                api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),
+                            api.GetTranslation("update_flowlauncher_check_connection"));
                 return;
             }
         }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index b1cf6a1f73c..b6bf76b7fc4 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -45,8 +45,8 @@
     <system:String x:Key="actionKeywords">Action keyword:</system:String>
     <system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
     <system:String x:Key="newActionKeyword">New action keyword:</system:String>
-    <system:String x:Key="currentPriority">Current Priority: </system:String>
-    <system:String x:Key="newPriority">New Priority: </system:String>
+    <system:String x:Key="currentPriority">Current Priority:</system:String>
+    <system:String x:Key="newPriority">New Priority:</system:String>
     <system:String x:Key="pluginDirectory">Plugin Directory</system:String>
     <system:String x:Key="author">Author</system:String>
     <system:String x:Key="plugin_init_time">Init time:</system:String>
@@ -111,7 +111,7 @@
     <!--Priority Setting Dialog-->
     <system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
     <system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
-    
+
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">Old Action Keyword</system:String>
     <system:String x:Key="newActionKeywords">New Action Keyword</system:String>
@@ -149,11 +149,23 @@
     <system:String x:Key="reportWindow_report_failed">Failed to send report</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher got an error</system:String>
 
+    <!--General Notice-->
+    <system:String x:Key="pleaseWait">Please wait...</system:String>
+
     <!--update-->
+    <system:String x:Key="update_flowlauncher_update_check">Checking for new update</system:String>
+    <system:String x:Key="update_flowlauncher_already_on_latest">You already have the latest Flow Launcher version</system:String>
+    <system:String x:Key="update_flowlauncher_update_found">Update found</system:String>
+    <system:String x:Key="update_flowlauncher_updating">Updating...</system:String>
+    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher was not able to move your user profile data to the new update version.
+        Please manually move your profile data folder from {0} to {1}</system:String>
+    <system:String x:Key="update_flowlauncher_new_update">New Update</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">New Flow Launcher release {0} is now available</system:String>
     <system:String x:Key="update_flowlauncher_update_error">An error occurred while trying to install software updates</system:String>
     <system:String x:Key="update_flowlauncher_update">Update</system:String>
     <system:String x:Key="update_flowlauncher_update_cancel">Cancel</system:String>
+    <system:String x:Key="update_flowlauncher_fail">Update Failed</system:String>
+    <system:String x:Key="update_flowlauncher_check_connection">Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.</system:String>
     <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">This upgrade will restart Flow Launcher</system:String>
     <system:String x:Key="update_flowlauncher_update_upadte_files">Following files will be updated</system:String>
     <system:String x:Key="update_flowlauncher_update_files">Update files</system:String>

From 98760d8aa288aa90758c09f35038c013ee36eab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Sat, 23 Jan 2021 12:24:08 +0800
Subject: [PATCH 3/5] Fix URL plugin untranslated string

---
 Plugins/Flow.Launcher.Plugin.Url/Languages/en.xaml    | 4 ++++
 Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Url/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Url/Languages/en.xaml
index 452be00ee54..eff1ac26354 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Url/Languages/en.xaml
@@ -2,6 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
+    <system:String x:Key="flowlauncher_plugin_url_open_search_in">Open search in:</system:String>
+    <system:String x:Key="flowlauncher_plugin_new_window">New Window</system:String>
+    <system:String x:Key="flowlauncher_plugin_new_tab">New Tab</system:String>
+    
     <system:String x:Key="flowlauncher_plugin_url_open_url">Open url:{0}</system:String>
     <system:String x:Key="flowlauncher_plugin_url_canot_open_url">Can't open url:{0}</system:String>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
index f54aea878b5..9219a000930 100644
--- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
@@ -10,11 +10,11 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Row="0">
-            <Label Content="Open search in:" Margin="0 10 15 0" />
+            <Label Content="{DynamicResource flowlauncher_plugin_url_open_search_in}" Margin="0 10 15 0" />
             <RadioButton x:Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" 
-                         Content="New window" Click="OnNewBrowserWindowClick" />
+                         Content="{DynamicResource flowlauncher_plugin_new_window}" Click="OnNewBrowserWindowClick" />
             <RadioButton x:Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" 
-                         Content="New tab" Click="OnNewTabClick" />
+                         Content="{DynamicResource flowlauncher_plugin_new_tab}" Click="OnNewTabClick" />
         </StackPanel>
         <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="0 20 0 0">
             <Label Content="{DynamicResource flowlauncher_plugin_url_plugin_set_tip}" Height="28" Margin="0,0,155,0"

From 27c6db288e2cfc1092b2b48435a8d8791c2bf12a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Sat, 23 Jan 2021 12:28:04 +0800
Subject: [PATCH 4/5] fix websearch plugin untranslated string

---
 .../Flow.Launcher.Plugin.WebSearch/Languages/en.xaml   |  5 +++++
 .../SettingsControl.xaml                               | 10 +++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
index c2ed7df3140..cc137c3dca2 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
@@ -2,6 +2,11 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
+    <system:String x:Key="flowlauncher_plugin_websearch_open_search_in">Open search in:</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_new_window">New Window</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_new_tab">New Tab</system:String>
+    <system:String x:Key="flowlaucnher_plugin_websearch_set_browser_path">Set browser from path:</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_choose">Choose</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_delete">Delete</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_edit">Edit</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_add">Add</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 835937efd6a..ae6f8c8005f 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -33,17 +33,17 @@
             <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
         </StackPanel>
         <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal">
-            <Label Content="Open search in:" Margin="0 15 20 0"/>
-            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" 
+            <Label Content="{DynamicResource flowlauncher_plugin_websearch_open_search_in}" Margin="0 15 20 0"/>
+            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_window}" Click="OnNewBrowserWindowClick" 
                          Margin="0 0 20 0"/>
-            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" />
+            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_tab}" Click="OnNewTabClick" />
         </StackPanel>
         <StackPanel Grid.Row="2" HorizontalAlignment="Left" Margin="0 3 0 0">
-            <Label Content="Set browser from path:" Margin="0 0 350 0" HorizontalAlignment="Left" Width="140"/>
+            <Label Content="{DynamicResource flowlaucnher_plugin_websearch_set_browser_path}" Margin="0 0 350 0" HorizontalAlignment="Left" Width="140"/>
             <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Margin="160,-22,0,0" TextChanged="OnBrowserPathTextChanged"
                      Width="214" Style="{StaticResource BrowserPathBoxStyle}"/>
             <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="400,-30,0,0"  
-                    Click="OnChooseClick" FontSize="13" Content="Choose" Width="80"/>
+                    Click="OnChooseClick" FontSize="13" Content="{DynamicResource flowlauncher_plugin_websearch_choose}" Width="80"/>
         </StackPanel>
         <ListView ItemsSource="{Binding Settings.SearchSources}"
                   SelectedItem="{Binding Settings.SelectedSearchSource}"

From fd32d4884e689d24ee51d0e02d577985520164a4 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Tue, 26 Jan 2021 15:31:21 +1100
Subject: [PATCH 5/5] revert unintended CustomQueryHotkeySetting ui change

---
 Flow.Launcher/CustomQueryHotkeySetting.xaml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index bf6a35dffac..a97f9073316 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -19,23 +19,22 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="102.124" />
-            <ColumnDefinition Width="47.876"/>
+            <ColumnDefinition Width="150" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <TextBlock Margin="92,0,0,0" FontSize="14" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource hotkey}" Grid.ColumnSpan="2" />
-        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="2" VerticalAlignment="Center" Height="32" />
+        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
+        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" />
 
-        <TextBlock Margin="38,0,0,0" FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
-                   HorizontalAlignment="Left" Text="{DynamicResource actionKeyword}" />
-        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="2">
+        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
+                   HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
             <TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
             <Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
                     Content="{DynamicResource preview}" />
         </StackPanel>
 
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Grid.Row="1" Grid.Column="2" Margin="325,61,0,0" Grid.RowSpan="2">
+        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
             <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="32"
                     Content="{DynamicResource cancel}" />
             <Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="32" Click="btnAdd_OnClick">