Merge branch 'master' into dev

Source commit: e2647e53566034679ab93d8b538b026629cba308

source/core/Terminal.cpp

@@ -4862,7 +4862,7 @@ bool TTerminal::DoRenameOrCopyFile(
   std::unique_ptr<TRemoteFile> DuplicateFile;
   if (UnixSamePath(AbsoluteFileName, AbsoluteNewName))
   {
-    LogEvent(FORMAT(L"Tartget \"%s\" is same as source \"%s\" - skipping.", (AbsoluteNewName, AbsoluteFileName)));
+    LogEvent(FORMAT(L"Target \"%s\" is same as source \"%s\" - skipping.", (AbsoluteNewName, AbsoluteFileName)));
     Result = false;
   }
   else if (BatchOverwrite == boNone)

source/forms/CustomScpExplorer.cpp

@@ -9896,6 +9896,8 @@ void __fastcall TCustomScpExplorerForm::ThemeChanged()
   ResetSysDarkTheme();
   ConfigurationChanged();
   ConfigureInterface();
+  // To update references to recreated/destroyed themes in SessionsPageControl
+  UpdateControls();
   // Should be called for all controls
   RemoteDirView->Perform(WM_THEMECHANGED, 0, 0);
 }

source/forms/Login.dfm

@@ -174,7 +174,7 @@ object LoginDialog: TLoginDialog
           object S3CredentialsEnvCheck3: TCheckBox
             Left = 2
             Top = 3
-            Width = 374
+            Width = 245
             Height = 17
             Anchors = [akLeft, akTop, akRight]
             Caption = '&Credentials from AWS environment:'