Merge branch 'refs/heads/dev' into duplicate-hotkey-handling

# Conflicts:
#	Flow.Launcher/SettingWindow.xaml

Author: Yusyuriv

Flow.Launcher/Languages/en.xaml

@@ -196,8 +196,8 @@
     <system:String x:Key="OpenContainFolderHotkey">Open Containing Folder</system:String>
     <system:String x:Key="RunAsAdminHotkey">Run As Admin</system:String>
     <system:String x:Key="ReloadPluginHotkey">Reload Plugins Data</system:String>
-    <system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width Size</system:String>
-    <system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height Size</system:String>
+    <system:String x:Key="QuickWidthHotkey">Quick Adjust Window Width</system:String>
+    <system:String x:Key="QuickHeightHotkey">Quick Adjust Window Height</system:String>
     <system:String x:Key="ReloadPluginHotkeyToolTip">Use when require plugins to reload and update their existing data.</system:String>
     <system:String x:Key="AdditionalHotkeyToolTip">You can add one more hotkey for this function.</system:String>
     <system:String x:Key="customQueryHotkey">Custom Query Hotkeys</system:String>

Flow.Launcher/SettingWindow.xaml

@@ -2812,22 +2812,22 @@
                                                 <cc:HotkeyDisplay Keys="F5" />
                                             </cc:Card>
                                             <cc:Card
-                                                Title="{DynamicResource SelectNextPageHotkey}"
+                                                Title="{DynamicResource SelectPrevPageHotkey}"
                                                 Icon="&#xf0ad;"
                                                 Type="Inside">
                                                 <flowlauncher:HotkeyControl
                                                     DefaultHotkey=""
-                                                    Hotkey="{Binding Settings.SelectNextPageHotkey}"
+                                                    Hotkey="{Binding Settings.SelectPrevPageHotkey}"
                                                     HotkeySettings="{Binding Settings}"
                                                     ValidateKeyGesture="False" />
                                             </cc:Card>
                                             <cc:Card
-                                                Title="{DynamicResource SelectPrevPageHotkey}"
+                                                Title="{DynamicResource SelectNextPageHotkey}"
                                                 Icon="&#xf0ae;"
                                                 Type="Inside">
                                                 <flowlauncher:HotkeyControl
                                                     DefaultHotkey=""
-                                                    Hotkey="{Binding Settings.SelectPrevPageHotkey}"
+                                                    Hotkey="{Binding Settings.SelectNextPageHotkey}"
                                                     HotkeySettings="{Binding Settings}"
                                                     ValidateKeyGesture="False" />
                                             </cc:Card>
@@ -2878,48 +2878,47 @@
                                         </cc:Card>
                                     </cc:ExCard>
 
-
                                     <cc:ExCard
-                                        Title="{DynamicResource SelectNextItemHotkey}"
+                                        Title="{DynamicResource SelectPrevItemHotkey}"
                                         Margin="0,4,0,0"
-                                        Icon="&#xe74b;">
+                                        Icon="&#xe74a;">
                                         <cc:ExCard.SideContent>
                                             <flowlauncher:HotkeyControl
-                                                DefaultHotkey="Tab"
-                                                Hotkey="{Binding Settings.SelectNextItemHotkey}"
+                                                DefaultHotkey="Shift+Tab"
+                                                Hotkey="{Binding Settings.SelectPrevItemHotkey}"
                                                 HotkeySettings="{Binding Settings}"
                                                 ValidateKeyGesture="False" />
                                         </cc:ExCard.SideContent>
                                         <cc:Card
-                                            Title="{DynamicResource SelectNextItemHotkey}"
+                                            Title="{DynamicResource SelectPrevItemHotkey}"
                                             Sub="{DynamicResource AdditionalHotkeyToolTip}"
                                             Type="InsideFit">
                                             <flowlauncher:HotkeyControl
                                                 DefaultHotkey=""
-                                                Hotkey="{Binding Settings.SelectNextItemHotkey2}"
+                                                Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
                                                 HotkeySettings="{Binding Settings}"
                                                 ValidateKeyGesture="False" />
                                         </cc:Card>
                                     </cc:ExCard>
 
                                     <cc:ExCard
-                                        Title="{DynamicResource SelectPrevItemHotkey}"
+                                        Title="{DynamicResource SelectNextItemHotkey}"
                                         Margin="0,4,0,0"
-                                        Icon="&#xe74a;">
+                                        Icon="&#xe74b;">
                                         <cc:ExCard.SideContent>
                                             <flowlauncher:HotkeyControl
-                                                DefaultHotkey="Shift+Tab"
-                                                Hotkey="{Binding Settings.SelectPrevItemHotkey}"
+                                                DefaultHotkey="Tab"
+                                                Hotkey="{Binding Settings.SelectNextItemHotkey}"
                                                 HotkeySettings="{Binding Settings}"
                                                 ValidateKeyGesture="False" />
                                         </cc:ExCard.SideContent>
                                         <cc:Card
-                                            Title="{DynamicResource SelectPrevItemHotkey}"
+                                            Title="{DynamicResource SelectNextItemHotkey}"
                                             Sub="{DynamicResource AdditionalHotkeyToolTip}"
                                             Type="InsideFit">
                                             <flowlauncher:HotkeyControl
                                                 DefaultHotkey=""
-                                                Hotkey="{Binding Settings.SelectPrevItemHotkey2}"
+                                                Hotkey="{Binding Settings.SelectNextItemHotkey2}"
                                                 HotkeySettings="{Binding Settings}"
                                                 ValidateKeyGesture="False" />
                                         </cc:Card>