Merge pull request #1874 from VictoriousRaptor/bugfix

Fix 1861 and 1863

Author: VictoriousRaptor

Flow.Launcher/HotkeyControl.xaml.cs

@@ -103,7 +103,7 @@ public Task SetHotkeyAsync(string keyStr, bool triggerValidate = true)
 
         private void tbHotkey_LostFocus(object sender, RoutedEventArgs e)
         {
-            tbHotkey.Text = CurrentHotkey.ToString();
+            tbHotkey.Text = CurrentHotkey?.ToString() ?? "";
             tbHotkey.Select(tbHotkey.Text.Length, 0);
         }
 

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>