From fbd12eb96b1f37140dbde8e7608b7e38d712e384 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 3 Feb 2023 12:21:25 +0800
Subject: [PATCH 1/2] Add missing translation

---
 Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
index 2ed421ca9..15456079a 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -9,6 +9,7 @@
     <system:String x:Key="plugin_explorer_delete_folder_link">Are you sure you want to delete {0}?</system:String>
     <system:String x:Key="plugin_explorer_deletefolderconfirm">Are you sure you want to permanently delete this folder?</system:String>
     <system:String x:Key="plugin_explorer_deletefileconfirm">Are you sure you want to permanently delete this file?</system:String>
+    <system:String x:Key="plugin_explorer_deletefilefolderconfirm">Are you sure you want to permanently delete this file/folder?</system:String>
     <system:String x:Key="plugin_explorer_deletefilefoldersuccess">Deletion successful</system:String>
     <system:String x:Key="plugin_explorer_deletefilefoldersuccess_detail">Successfully deleted {0}</system:String>
     <system:String x:Key="plugin_explorer_globalActionKeywordInvalid">Assigning the global action keyword could bring up too many results during search. Please choose a specific action keyword</system:String>

From f941655d6434a882ddbb9301553500e0f239aec8 Mon Sep 17 00:00:00 2001
From: Vic <10308169+VictoriousRaptor@users.noreply.github.com>
Date: Fri, 3 Feb 2023 12:34:42 +0800
Subject: [PATCH 2/2] Fix null reference when hotkey is invalid

---
 Flow.Launcher/HotkeyControl.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Flow.Launcher/HotkeyControl.xaml.cs b/Flow.Launcher/HotkeyControl.xaml.cs
index 15feae6cc..b71df9758 100644
--- a/Flow.Launcher/HotkeyControl.xaml.cs
+++ b/Flow.Launcher/HotkeyControl.xaml.cs
@@ -103,7 +103,7 @@ namespace Flow.Launcher
 
         private void tbHotkey_LostFocus(object sender, RoutedEventArgs e)
         {
-            tbHotkey.Text = CurrentHotkey.ToString();
+            tbHotkey.Text = CurrentHotkey?.ToString() ?? "";
             tbHotkey.Select(tbHotkey.Text.Length, 0);
         }