From 1f0c0022ac45e1e9005c54d4815dbcfa0288df9d 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: Mon, 29 Mar 2021 14:24:20 +0800
Subject: [PATCH 1/5] Increase the default width and allow user to resize
 setting window, and reduce the margin for PluginDirectory

	modified:   Flow.Launcher/SettingWindow.xaml

	modified:   Flow.Launcher/SettingWindow.xaml
---
 Flow.Launcher/SettingWindow.xaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index cb0ef2def..9f811e322 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -13,9 +13,9 @@
         mc:Ignorable="d"
         Icon="Images\app.ico"
         Title="{DynamicResource flowlauncher_settings}"
-        ResizeMode="NoResize"
+        ResizeMode="CanResizeWithGrip"
         WindowStartupLocation="CenterScreen"
-        Height="600" Width="800" 
+        Height="600" Width="850"
         Closed="OnClosed"
         d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
     <Window.InputBindings>
@@ -191,7 +191,7 @@
                                     <TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
                                     <TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
                                     <TextBlock Text="{DynamicResource pluginDirectory}"
-                                               MaxWidth="100" Cursor="Hand" Margin="40 0 0 0"
+                                               MaxWidth="120" Cursor="Hand" Margin="20 0 0 0"
                                                MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
                                 </DockPanel>
                             </Grid>

From db6e53f2a75fd7d4bd304a3600c99a2253e8ff33 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: Tue, 30 Mar 2021 15:34:19 +0800
Subject: [PATCH 2/5] span the third row with two columes, and set a minWidth
 for resizing

---
 Flow.Launcher/SettingWindow.xaml | 105 +++++++++++++++----------------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 9f811e322..33d88fc42 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -15,7 +15,8 @@
         Title="{DynamicResource flowlauncher_settings}"
         ResizeMode="CanResizeWithGrip"
         WindowStartupLocation="CenterScreen"
-        Height="600" Width="850"
+        Height="600" Width="900"
+        MinWidth="850"
         Closed="OnClosed"
         d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
     <Window.InputBindings>
@@ -141,60 +142,58 @@
                                 <ColumnDefinition Width="48" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                                <RowDefinition/>
+                            </Grid.RowDefinitions>
                             <Image Source="{Binding Image, IsAsync=True}"
-                                   Width="48" Height="48" HorizontalAlignment="Left" VerticalAlignment="Top" />
-                            <Grid Margin="10,0,0,0" Grid.Column="1" HorizontalAlignment="Stretch">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <Grid Grid.Row="0">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition />
-                                        <ColumnDefinition />
-                                    </Grid.ColumnDefinitions>
-                                    <TextBlock Text="{Binding PluginPair.Metadata.Name}"
-                                               Grid.Column="0"
-                                               Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
-                                               HorizontalAlignment="Left">
-                                            <ToolTipService.ToolTip>
-                                                <TextBlock>
-                                                    <Run Text="{DynamicResource author}" />
-                                                    <Run Text=": " />
-                                                    <Run Text="{Binding PluginPair.Metadata.Author}" />
-                                                </TextBlock>
-                                            </ToolTipService.ToolTip>
-                                     </TextBlock>
-                                    <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" 
-                                                     MaxWidth="110" HorizontalAlignment="Right"
-                                                     IsOn="{Binding PluginState}"/>
-                                </Grid>
-                                <TextBlock Text="{Binding PluginPair.Metadata.Description}"
-                                           Grid.Row="1" Opacity="0.5" />
-                                <DockPanel Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
-                                    <TextBlock Text="Priority" Margin="20,0,0,0"/>
-                                    <TextBlock Text="{Binding Priority}"
-                                               ToolTip="Change Plugin Results Priority"
-                                               Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
-                                               MouseUp="OnPluginPriorityClick"/>
-                                    <TextBlock Text="{DynamicResource actionKeywords}"
-                                               Visibility="{Binding ActionKeywordsVisibility}"
-                                               Margin="5 0 0 0"/>
-                                    <TextBlock Text="{Binding ActionKeywordsText}"
-                                               Visibility="{Binding ActionKeywordsVisibility}"
-                                               ToolTip="Change Action Keywords"
-                                               Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
-                                               MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
-                                    <TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
-                                    <TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
-                                    <TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
-                                    <TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
-                                    <TextBlock Text="{DynamicResource pluginDirectory}"
-                                               MaxWidth="120" Cursor="Hand" Margin="20 0 0 0"
-                                               MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
-                                </DockPanel>
+                                   Width="48" Height="48" 
+                                   HorizontalAlignment="Left" VerticalAlignment="Top"
+                                   Grid.RowSpan="2"/>
+                            <Grid Grid.Row="0" Grid.Column="1"
+                                  Margin="20,0,0,0">
+                                <TextBlock Text="{Binding PluginPair.Metadata.Name}"
+                                            Grid.Column="0"
+                                            Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
+                                            HorizontalAlignment="Left">
+                                        <ToolTipService.ToolTip>
+                                            <TextBlock>
+                                                <Run Text="{DynamicResource author}" />
+                                                <Run Text=": " />
+                                                <Run Text="{Binding PluginPair.Metadata.Author}" />
+                                            </TextBlock>
+                                        </ToolTipService.ToolTip>
+                                    </TextBlock>
+                                <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" 
+                                                    MaxWidth="110" HorizontalAlignment="Right"
+                                                    IsOn="{Binding PluginState}"/>
                             </Grid>
+                            <TextBlock Margin="20,0,0,0"
+                                       Text="{Binding PluginPair.Metadata.Description}"
+                                       Grid.Row="1" Opacity="0.5" Grid.Column="2" />
+                            <DockPanel Grid.ColumnSpan="2" Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
+                                <TextBlock Text="Priority" Margin="15,0,0,0" MaxWidth="100"/>
+                                <TextBlock Text="{Binding Priority}"
+                                            ToolTip="Change Plugin Results Priority"
+                                            Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
+                                            MouseUp="OnPluginPriorityClick"/>
+                                <TextBlock Text="{DynamicResource actionKeywords}"
+                                            Visibility="{Binding ActionKeywordsVisibility}"
+                                            Margin="5 0 0 0"/>
+                                <TextBlock Text="{Binding ActionKeywordsText}"
+                                            Visibility="{Binding ActionKeywordsVisibility}"
+                                            ToolTip="Change Action Keywords"
+                                            Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
+                                            MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
+                                <TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
+                                <TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
+                                <TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
+                                <TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
+                                <TextBlock Text="{DynamicResource pluginDirectory}"
+                                            MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
+                                            MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
+                            </DockPanel>
                         </Grid>
                     </ContentControl>
 

From 953b50d1f2e648168f4ceb71feae25a66b24da31 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Wed, 31 Mar 2021 06:21:18 +1100
Subject: [PATCH 3/5] add min height to settings page resize

---
 Flow.Launcher/SettingWindow.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index 99061e353..23b741575 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -17,6 +17,7 @@
         WindowStartupLocation="CenterScreen"
         Height="600" Width="900"
         MinWidth="850"
+        MinHeight="500"
         Closed="OnClosed"
         d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}">
     <Window.InputBindings>

From 3ab3010000d9e49da58296e7d66a654ab75a9d20 Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Wed, 31 Mar 2021 06:28:25 +1100
Subject: [PATCH 4/5] fix Sys plugin translation

---
 Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml | 2 ++
 Plugins/Flow.Launcher.Plugin.Sys/Main.cs           | 4 ++--
 Plugins/Flow.Launcher.Plugin.Sys/plugin.json       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
index ec05b621d..4f841c07f 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml
@@ -18,6 +18,8 @@
     <system:String x:Key="flowlauncher_plugin_sys_hibernate">Hibernate computer</system:String>
     <system:String x:Key="flowlauncher_plugin_sys_save_all_settings">Save all Flow Launcher settings</system:String>
     <system:String x:Key="flowlauncher_plugin_sys_reload_plugin_data">Refreshes plugin data with new content</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_open_log_location">Open Flow Launcher's log location</system:String>
+    <system:String x:Key="flowlauncher_plugin_sys_check_for_update">Check for new Flow Launcher update</system:String>
 
     <!--Dialogs-->
     <system:String x:Key="flowlauncher_plugin_sys_dlgtitle_success">Success</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
index 8828f3cef..380782650 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
+++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -261,7 +261,7 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Check For Update",
-                    SubTitle = "Check for new Flow Launcher update",
+                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_check_for_update"),
                     IcoPath = "Images\\checkupdate.png",
                     Action = c =>
                     {
@@ -273,7 +273,7 @@ namespace Flow.Launcher.Plugin.Sys
                 new Result
                 {
                     Title = "Open Log Location",
-                    SubTitle = "Open Log Position",
+                    SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_open_log_location"),
                     IcoPath = "Images\\app.png",
                     Action = c =>
                     {
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
index 844bcfb53..61dbd73f3 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
@@ -4,7 +4,7 @@
   "Name": "System Commands",
   "Description": "Provide System related commands. e.g. shutdown,lock,setting etc.",
   "Author": "qianlifeng",
-  "Version": "1.2.2",
+  "Version": "1.2.3",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",

From eae3b1e4bf96fe8278d88c04d77db60b4935239c Mon Sep 17 00:00:00 2001
From: Jeremy Wu <jeremy24wu@gmail.com>
Date: Wed, 31 Mar 2021 06:40:39 +1100
Subject: [PATCH 5/5] update plugin text

---
 Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json | 2 +-
 Plugins/Flow.Launcher.Plugin.Shell/plugin.json         | 2 +-
 Plugins/Flow.Launcher.Plugin.Sys/plugin.json           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json b/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json
index 2bb40c644..7c6efaae4 100644
--- a/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json
@@ -2,7 +2,7 @@
     "ID":"b64d0a79-329a-48b0-b53f-d658318a1bf6",
     "ActionKeyword":"kill",
     "Name":"Process Killer",
-    "Description":"kill running processes from Flow",
+    "Description":"Kill running processes from Flow",
     "Author":"Flow-Launcher",
     "Version":"1.2.2",
     "Language":"csharp",
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
index b38db70ed..592dbdbbd 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json
@@ -2,7 +2,7 @@
   "ID": "D409510CD0D2481F853690A07E6DC426",
   "ActionKeyword": ">",
   "Name": "Shell",
-  "Description": "Provide executing commands from Flow Launcher. Commands should start with >",
+  "Description": "Provide executing commands from Flow Launcher",
   "Author": "qianlifeng",
   "Version": "1.2.0",
   "Language": "csharp",
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
index 61dbd73f3..40cab074e 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
+++ b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json
@@ -2,7 +2,7 @@
   "ID": "CEA08895D2544B019B2E9C5009600DF4",
   "ActionKeyword": "*",
   "Name": "System Commands",
-  "Description": "Provide System related commands. e.g. shutdown,lock,setting etc.",
+  "Description": "Provide System related commands. e.g. shutdown,lock, setting etc.",
   "Author": "qianlifeng",
   "Version": "1.2.3",
   "Language": "csharp",