Merge branch 'master' into dev

# Conflicts:
#	source/resource/Propagation.rc

Source commit: 9800d931c588f8093c63ed8eeef9282a05dcb4a3

dotnet/properties/AssemblyInfo.cs

@@ -35,7 +35,7 @@ namespace WinSCP
     {
         public const string UndefinedProductVersion = "9.9.9.9";
 
-        public const string Version = "1.8.3.0";
+        public const string Version = "1.9.0.0";
         public const string ProductVersion = "6.0.0.0";
     }
 }

source/resource/Propagation.rc

@@ -77,7 +77,9 @@ BEGIN
   NEW_5_18_REMOTE_SYNC, "An extension for synchronizing two remote servers"
   NEW_5_18_TLS, "Enabled TLS 1.3 and added support for SHA-256 TLS/SSL fingerprints"
 
-  NEW_5_20_TDB, "TDB"
+  NEW_5_20_S3_ACL, "Support for ACL for S3 protocol"
+  NEW_5_20_SHA2, "Support for rsa-sha2-256 and rsa-sha2-512 SSH public key algorithms"
+  NEW_5_20_OPENSSH_IMPORT, "It is possible to import sessions from OpenSSH config file"
 
   NEW_6_0_TDB, "TDB"
 END

source/resource/TextsWin.h

@@ -190,7 +190,7 @@
 #define CUSTOM_COMMAND_GREP     1471
 #define CUSTOM_COMMAND_GREP_PATTERN 1472
 #define DIRECTORY_READING_PROGRESS 1473
-#define QUEUE_CALCULATING_SIZE2 1474
+#define QUEUE_LISTING           1474
 #define UPDATE_MESSAGE          1475
 #define UPGRADE_BUTTON          1476
 #define COPY_PARAM_AUTOSELECTED 1478

source/resource/TextsWin1.rc

@@ -196,7 +196,7 @@ BEGIN
         CUSTOM_COMMAND_GREP, "&Grep..."
         CUSTOM_COMMAND_GREP_PATTERN, "&Search for pattern:"
         DIRECTORY_READING_PROGRESS, "%d Reading directory"
-        QUEUE_CALCULATING_SIZE2, "Calculating..."
+        QUEUE_LISTING, "Listing..."
         UPDATE_MESSAGE, "\n \n%s"
         UPGRADE_BUTTON, "&Upgrade"
         COPY_PARAM_AUTOSELECTED, "Transfer settings preset '%s' was automatically selected."

source/windows/QueueController.cpp

@@ -433,7 +433,7 @@ void __fastcall TQueueController::FillQueueViewItem(TListItem * Item,
       }
       else if (ProgressData->Operation == foCalculateSize)
       {
-        ProgressStr = LoadStr(QUEUE_CALCULATING_SIZE2);
+        ProgressStr = LoadStr(QUEUE_LISTING);
       }
     }
     Values[5] = ProgressStr;