Merge branch 'master' into dev

# Conflicts:
#	source/WinSCP.cbproj
#	source/resource/Propagation.rc
#	source/windows/GUITools.cpp

Source commit: 54f5c5cec4b31bf661815d81e7c4f5b9ccbe1f64

source/resource/Propagation.rc

@@ -28,7 +28,6 @@ BEGIN
   FUNCTIONS_DOCUMENTATION, "A comprehensive WinSCP documentation and an active user forum are freely accessible at WinSCP site"
 
   STORE_BUYING, "By buying official WinSCP from Microsoft Store you support WinSCP development. Thank you!"
-  STORE_TITLE, "WinSCP – SFTP, FTP, WebDAV, SCP and S3 client"
 
   KEYWORD_SFTP_CLIENT, "sftp client"
   KEYWORD_FTP_CLIENT, "ftp client"

source/windows/GUITools.cpp

@@ -2336,6 +2336,7 @@ bool __fastcall TSystemRequiredThread::WaitForEvent()
     if (!FTerminated && FRequired &&
         (MilliSecondsBetween(Now(), FLastRequired) > ExpireInterval))
     {
+      AppLog("System is not required");
       SetThreadExecutionState(ES_CONTINUOUS);
       FLastRequired = TDateTime();
       FRequired = false;
@@ -2350,6 +2351,7 @@ void __fastcall TSystemRequiredThread::ProcessEvent()
   if (!FRequired &&
       (FLastRequired != TDateTime()))
   {
+    AppLog("System is required");
     SetThreadExecutionState(ES_SYSTEM_REQUIRED | ES_CONTINUOUS);
     FRequired = true;
   }
@@ -2362,6 +2364,7 @@ void SystemRequired()
     TGuard Guard(SystemRequiredThreadSection.get());
     if (SystemRequiredThread == NULL)
     {
+      AppLog("Starting system required thread");
       SystemRequiredThread = new TSystemRequiredThread();
       SystemRequiredThread->Start();
     }
@@ -2386,6 +2389,7 @@ void GUIFinalize()
 
   if (Thread != NULL)
   {
+    AppLog("Stopping system required thread");
     Thread->Terminate();
     Thread->WaitFor();
     delete Thread;