3.4.2

WinSCP3.bpr

@@ -97,8 +97,8 @@ IncludeVerInfo=1
 AutoIncBuild=1
 MajorVer=3
 MinorVer=4
-Release=1
-Build=194
+Release=2
+Build=197
 Debug=0
 PreRelease=1
 Special=0
@@ -110,7 +110,7 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=Martin Prikryl
 FileDescription=Windows SCP/SFTP client
-FileVersion=3.4.1.194
+FileVersion=3.4.2.197
 InternalName=winscp3
 LegalCopyright=(c) 2000-2003 Martin Prikryl
 LegalTrademarks=

core/Common.h

@@ -49,5 +49,6 @@ void __fastcall ProcessLocalDirectory(AnsiString DirName,
 #undef assert
 #define assert(p)   ((void)0)
 #endif
+#define USEDPARAM(p) ((p) == (p))
 //---------------------------------------------------------------------------
 #endif

core/SftpFileSystem.cpp

@@ -773,7 +773,7 @@ protected:
       Request->AddData(BlockBuf.Data, BlockBuf.Size);
       FLastBlockSize = BlockBuf.Size;
 
-      FTransfered += FBlockSize;
+      FTransfered += BlockBuf.Size;
     }
 
     return Result;

forms/Cleanup.cpp

@@ -4,6 +4,7 @@
 
 #include <VCLCommon.h>
 #include "Cleanup.h"
+#include "TextsWin.h"
 //---------------------------------------------------------------------
 #pragma resource "*.dfm"
 //---------------------------------------------------------------------
@@ -44,15 +45,14 @@ __fastcall TCleanupDialog::TCleanupDialog(TComponent* AOwner)
   UseSystemSettings(this);
 }
 //---------------------------------------------------------------------
-void __fastcall TCleanupDialog::UpdateControls()
+void __fastcall TCleanupDialog::InitControls()
 {
-  Boolean Checked = False, UnChecked = False;
-  for (Integer Index = 0; Index < DataListView->Items->Count; Index ++)
+  int I = 0;
+  while (I < DataListView->Items->Count)
   {
-    TListItem *Item = DataListView->Items->Item[Index];
-    if (Item->Checked) Checked = True;
-    if (!Item->Checked) UnChecked = True;
+    TListItem *Item = DataListView->Items->Item[I];
     AnsiString Location;
+    Item->Caption = LoadStr(CLEANUP_CONFIG + Item->ImageIndex - 1);
     switch (Item->ImageIndex) {
       case wdConfiguration: Location = Configuration->ConfigurationSubKey; break;
       case wdStoredSessions: Location = Configuration->StoredSessionsSubKey; break;
@@ -61,20 +61,33 @@ void __fastcall TCleanupDialog::UpdateControls()
       case wdRandomSeedFile: Location = Configuration->RandomSeedFile; break;
       default: Location = ""; break;
     }
+
     if (Item->ImageIndex < wdConfigurationIniFile)
+    {
       Location = Configuration->RootKeyStr + '\\' +
         Configuration->RegistryStorageKey + '\\' + Location;
-
-    if (Item->SubItems->Count)
-    {
-      if (Item->SubItems->Strings[0] != Location)
-        Item->SubItems->Strings[0] = Location;
     }
-      else Item->SubItems->Add(Location);
+
+    Item->SubItems->Add(Location);
+    I++;
+  }
+}
+//---------------------------------------------------------------------
+void __fastcall TCleanupDialog::UpdateControls()
+{
+  int I = 0;
+  bool Checked = false;
+  bool UnChecked = false;
+  while (I < DataListView->Items->Count)
+  {
+    TListItem *Item = DataListView->Items->Item[I];
+    if (Item->Checked) Checked = true;
+    if (!Item->Checked) UnChecked = true;
+
+    I++;
   }
   EnableControl(OKButton, Checked);
   EnableControl(CheckAllButton, UnChecked);
-//  AdjustListColumnsWidth(DataListView);
 }
 //---------------------------------------------------------------------------
 void __fastcall TCleanupDialog::DataListViewMouseDown(
@@ -92,6 +105,7 @@ void __fastcall TCleanupDialog::DataListViewKeyUp(
 //---------------------------------------------------------------------------
 void __fastcall TCleanupDialog::FormShow(TObject * /*Sender*/)
 {
+  InitControls();
   UpdateControls();
 }
 //---------------------------------------------------------------------------

forms/Cleanup.dfm

@@ -72,13 +72,13 @@ object CleanupDialog: TCleanupDialog
     ColumnClick = False
     HideSelection = False
     Items.Data = {
-      CB0000000500000001000000FFFFFFFFFFFFFFFF00000000000000001547656E
-      6572616C20636F6E66696775726174696F6E02000000FFFFFFFFFFFFFFFF0000
-      0000000000000F53746F7265642073657373696F6E7303000000FFFFFFFFFFFF
-      FFFF00000000000000001043616368656420686F7374206B65797304000000FF
-      FFFFFFFFFFFFFF000000000000000016436F6E66696775726174696F6E20494E
-      492066696C6505000000FFFFFFFFFFFFFFFF00000000000000001052616E646F
-      6D20736565642066696C65}
+      D00000000500000001000000FFFFFFFFFFFFFFFF00000000000000001647656E
+      6572616C20636F6E66696775726174696F6E5802000000FFFFFFFFFFFFFFFF00
+      000000000000001053746F7265642073657373696F6E735803000000FFFFFFFF
+      FFFFFFFF00000000000000001143616368656420686F7374206B657973580400
+      0000FFFFFFFFFFFFFFFF000000000000000017436F6E66696775726174696F6E
+      20494E492066696C655805000000FFFFFFFFFFFFFFFF00000000000000001152
+      616E646F6D20736565642066696C6558}
     ReadOnly = True
     RowSelect = True
     ParentShowHint = False

forms/Cleanup.h

@@ -40,6 +40,7 @@ __published:
 private:
   TStoredSessionList *FSessionList;
   TConfiguration * FConfiguration;
+  void __fastcall InitControls();
   void __fastcall UpdateControls();
   void __fastcall SetCleanupData(TWinSCPData Data, Boolean value);
   Boolean __fastcall GetCleanupData(TWinSCPData Data);

forms/LocationProfiles.cpp

@@ -347,8 +347,7 @@ void __fastcall TLocationProfilesDialog::BookmarkButtonClick(TObject *Sender)
 {
   TTreeNode * Node = ProfilesView->Selected;
   assert(Node);
-  TBookmark * Bookmark = (TBookmark *)Node->Data;
-  assert(Bookmark);
+  assert(Node->Data);
 
   TTreeNode * TargetNode;
   if (Sender == UpBookmarkButton)

forms/Login.cpp

@@ -226,6 +226,7 @@ void __fastcall TLoginDialog::LoadSession(TSessionData * aSessionData)
         (TObject*)aSessionData->Cipher[Index]);
     }
 
+    // Connection tab
     PingIntervalCheck->Checked = (aSessionData->PingInterval > 0);
     if (aSessionData->PingEnabled)
       PingIntervalSecEdit->AsInteger = aSessionData->PingInterval;
@@ -251,7 +252,7 @@ void __fastcall TLoginDialog::LoadSession(TSessionData * aSessionData)
     Scp1CompatibilityCheck->Checked = aSessionData->Scp1Compatibility;
     UnsetNationalVarsCheck->Checked = aSessionData->UnsetNationalVars;
     AliasGroupListCheck->Checked = aSessionData->AliasGroupList;
-    TimeDifferenceEdit->AsInteger = int(aSessionData->TimeDifference) * 24;
+    TimeDifferenceEdit->AsInteger = double(aSessionData->TimeDifference) * 24;
 
     // Proxy tab
     switch (aSessionData->ProxyMethod) {
@@ -266,8 +267,8 @@ void __fastcall TLoginDialog::LoadSession(TSessionData * aSessionData)
     ProxyUsernameEdit->Text = aSessionData->ProxyUsername;
     ProxyPasswordEdit->Text = aSessionData->ProxyPassword;
     ProxyTelnetCommandEdit->Text = aSessionData->ProxyTelnetCommand;
-    ProxyLocalhostCheck->Checked = aSessionData->ProxyDNS;
-    switch (aSessionData->ProxyLocalhost) {
+    ProxyLocalhostCheck->Checked = aSessionData->ProxyLocalhost;
+    switch (aSessionData->ProxyDNS) {
       case asOn: ProxyDNSOnButton->Checked = true; break;
       case asOff: ProxyDNSOffButton->Checked = true; break;
       default: ProxyDNSAutoButton->Checked = true; break;
@@ -359,7 +360,7 @@ void __fastcall TLoginDialog::SaveSession(TSessionData * aSessionData)
   aSessionData->AliasGroupList = AliasGroupListCheck->Checked;
   aSessionData->TimeDifference = double(TimeDifferenceEdit->AsInteger) / 24;
 
-  // proxy
+  // Proxy tab
   if (ProxyHTTPButton->Checked) aSessionData->ProxyMethod = pmHTTP;
     else
   if (ProxySocks4Button->Checked) aSessionData->ProxyMethod = pmSocks4;

forms/Login.dfm

@@ -83,11 +83,11 @@ object LoginDialog: TLoginDialog
       Top = 0
       Width = 361
       Height = 318
-      ActivePage = GeneralSheet
+      ActivePage = BugsSheet
       Align = alClient
       MultiLine = True
       Style = tsButtons
-      TabIndex = 6
+      TabIndex = 9
       TabOrder = 1
       OnChange = PageControlChange
       object SessionListSheet: TTabSheet
@@ -1370,7 +1370,7 @@ object LoginDialog: TLoginDialog
             Width = 325
             Height = 17
             Anchors = [akLeft, akTop, akRight]
-            Caption = 'Attempt '#39'keyboard-&interactive'#39' authentication (SSH2)'
+            Caption = 'Attempt ''keyboard-&interactive'' authentication (SSH2)'
             TabOrder = 2
             OnClick = DataChange
           end
@@ -1505,7 +1505,7 @@ object LoginDialog: TLoginDialog
     end
     object SendToHookAction: TAction
       Category = 'Sessions'
-      Caption = 'Explorer'#39's '#39'Send to'#39' shortcut'
+      Caption = 'Explorer''s ''Send to'' shortcut'
       OnExecute = SendToHookActionExecute
     end
     object CheckForUpdatesAction: TAction

resource/TextsWin.h

@@ -1,217 +1,222 @@
 #ifndef TextsWinH 
 #define TextsWinH 
  
-#define LICENCE         1001
-#define LICENCE_2       1002
-#define LICENCE_3       1003
-#define LICENCE_4       1004
-#define LICENCE_5       1005
-#define LICENCE_6       1006
-#define LICENCE_7       1007
-#define LICENCE_8       1008
-#define LICENCE_9       1009
-#define LICENCE_10      1010
-#define LICENCE_11      1011
-#define LICENCE_12      1012
-#define LICENCE_13      1013
-#define LICENCE_14      1014
-#define LICENCE_15      1015
-#define LICENCE_16      1016
-#define LICENCE_17      1017
-#define LICENCE_18      1018
-#define LICENCE_PUTTY   1021
-#define LICENCE_PUTTY_2 1022
+#define LICENCE         1001
+#define LICENCE_2       1002
+#define LICENCE_3       1003
+#define LICENCE_4       1004
+#define LICENCE_5       1005
+#define LICENCE_6       1006
+#define LICENCE_7       1007
+#define LICENCE_8       1008
+#define LICENCE_9       1009
+#define LICENCE_10      1010
+#define LICENCE_11      1011
+#define LICENCE_12      1012
+#define LICENCE_13      1013
+#define LICENCE_14      1014
+#define LICENCE_15      1015
+#define LICENCE_16      1016
+#define LICENCE_17      1017
+#define LICENCE_18      1018
+#define LICENCE_PUTTY   1021
+#define LICENCE_PUTTY_2 1022
  
-#define WIN_ERROR_STRINGS       1100
-#define MASK_ERROR              1101
-#define WARN_FATAL_ERROR        1102
-#define SESSION_NOT_EXISTS_ERROR 1105
-#define CREATE_SHORTCUT_ERROR   1107
-#define CANNOT_OVERWRITE_SPECIAL_SESSION 1108
-#define EXPLORE_LOCAL_DIR_ERROR 1109
-#define NO_UPLOAD_LIST_ERROR    1110
-#define CREATE_LOCAL_DIR_ERROR  1111
-#define DELETE_LOCAL_FILE_ERROR 1112
-#define DELETE_TEMP_EXECUTE_FILE_ERROR 1113
-#define EXECUTE_FILE_ERROR      1114
-#define EDITOR_ERROR            1115
-#define DOCUMENT_WAIT_ERROR     1116
-#define SYNC_DIR_BROWSE_ERROR   1117
-#define RESOLVE_SHORTCUT_ERROR  1118
-#define DUPLICATE_BOOKMARK      1119
-#define BOOKMARK_INVALID_NAME   1120
-#define BOOKMARK_FOLDER_INVALID_NAME 1121
-#define DUPLICATE_BOOKMARK_FOLDER 1122
-#define CUSTOM_COMMAND_INVALID  1123
-#define CUSTOM_COMMAND_DUPLICATE 1124
-#define CHECK_FOR_UPDATES_HTTP  1125
-#define CHECK_FOR_UPDATES_ERROR 1126
-#define EXECUTE_APP_ERROR       1127
-#define FILE_NOT_FOUND          1128
-#define WIN_CONFIRMATION_STRINGS 1300
-#define CONFIRM_OVERWRITE_SESSION 1301
-#define CREATE_LOCAL_DIRECTORY  1302
-#define CANCEL_OPERATION        1303
-#define CANCEL_OPERATION_FATAL  1304
-#define CONFIRM_DELETE_FILE     1305
-#define CONFIRM_DELETE_FILES    1306
-#define CLOSE_SESSION           1307
-#define NEVER_ASK_AGAIN         1308
-#define DD_WARN_LACK_OF_TEMP_SPACE 1309
-#define DD_WARN_UNKNOWN_TEMP_SPACE 1310
-#define ADD_BOOKMARK_CONFIRM    1311
-#define RECONNECT_BUTTON        1312
-#define CONFIRM_CREATE_SHORTCUT 1313
-#define SET_DEFAULT_SESSION_SETTINGS 1314
-#define SKIP_BUTTON             1315
-#define SAVE_CHANGES            1316
-#define CONFIRM_CREATE_SENDTO   1317
-#define CONFIRM_CREATE_ICON     1318
-#define CLOSE_SESSIONS          1319
-#define DELETE_BOOKMARK_FOLDER  1320
-#define PREV_BUTTON             1321
-#define NEXT_BUTTON             1322
-#define APPEND_BUTTON           1323
-#define WIN_INFORMATION_STRINGS 1400
-#define APP_CAPTION             1401
-#define COMPARE_NO_DIFFERENCES  1402
-#define SHORTCUT_INFO_TIP       1403
-#define DOCUMENT_WAIT           1404
-#define SESSION_SENDTO_HOOK_NAME 1405
-#define SENDTO_HOOK_NAME        1406
-#define BOOKMARK_INFO_TIP       1407
-#define CUSTOM_COMMAND_TOUCH    1408
-#define CUSTOM_COMMAND_EXECUTE  1409
-#define CUSTOM_COMMAND_MOVE     1410
-#define CUSTOM_COMMAND_MOVE_PARAM 1411
-#define ERROR_LIST_COUNT        1412
-#define ERROR_LIST_NUMBER       1413
-#define NO_NEW_VERSION          1414
-#define NEW_VERSION             1415
-#define CUSTOM_COMMANDS_PARAM_PROMPT 1416
-#define CUSTOM_COMMANDS_PARAM_TITLE 1417
-#define WIN_STATUS_STRINGS      1450
-#define STATUS_CLOSED           1451
-#define STATUS_INITWINSOCK      1452
-#define STATUS_LOOKUPHOST       1453
-#define STATUS_CONNECT          1454
-#define STATUS_AUTHENTICATE     1455
-#define STATUS_AUTHENTICATED    1456
-#define STATUS_STARTUP          1457
-#define STATUS_OPEN_DIRECTORY   1458
-#define STATUS_READY            1459
-#define WIN_FORMS_STRINGS       1500
-#define LOG_NOLOG               1501
-#define LOG_NOLOGFILE           1502
-#define LOG_NOLOGCAPTION        1503
-#define LOG_CAPTION             1504
-#define COPY_FILE               1505
-#define COPY_FILES              1506
-#define COPY_COPY               1507
-#define COPY_MOVE               1508
-#define COPY_TOLOCAL            1509
-#define COPY_TOREMOTE           1510
-#define COPY_COPY_CAPTION       1511
-#define COPY_MOVE_CAPTION       1512
-#define COPY_TODROP             1513
-#define COPY_COPY_BUTTON        1514
-#define COPY_MOVE_BUTTON        1515
-#define PROGRESS_COPY           1516
-#define PROGRESS_MOVE           1517
-#define PROGRESS_DELETE         1518
-#define PROGRESS_SETPROPERTIES  1519
-#define PROGRESS_DRAGDROP_TARGET 1520
-#define NEW_FOLDER              1521
-#define CREATE_FOLDER_PROMPT    1522
-#define CREATE_FOLDER_CAPTION   1523
-#define SELECT_MASK_DESELECT_CAPTION 1524
-#define SELECT_MASK_SELECT_CAPTION 1525
-#define PROPERTIES_FILE         1526
-#define PROPERTIES_FILES        1527
-#define PROPERTIES_DIRECTORY    1528
-#define PROPERTIES_DIRECTORIES  1529
-#define PROPERTIES_SYMLINK      1530
-#define PROPERTIES_SYMLINKS     1531
-#define PROPERTIES_FILE_CAPTION 1532
-#define PROPERTIES_FILES_CAPTION 1533
-#define PROPERTIES_INVALID_GROUP 1534
-#define PROPERTIES_INVALID_OWNER 1535
-#define EXPLORER_BACK_HINT      1536
-#define EXPLORER_FORWARD_HINT   1537
-#define STATUS_SENT_HINT        1538
-#define STATUS_RECEIVED_HINT    1539
-#define STATUS_DURATION_HINT    1540
-#define STATUS_COMPRESSION_HINT 1541
-#define STATUS_ENCRYPTION_HINT  1542
-#define STATUS_VERSION_HINT     1543
-#define STATUS_FILEINFO_HINT    1544
-#define STATUS_COMPRESSION2_HINT 1545
-#define STATUS_ENCRYPTION2_HINT 1546
-#define SAVEDSESSION_HINT       1547
-#define STATUS_FS_PROTOCOL      1548
-#define LICENCE_CAPTION         1549
-#define SYCHRONIZE_DESCRIPTION  1550
-#define SYCHRONIZE_WAITING      1551
-#define CIPHER_NAME_WARN        1552
-#define CIPHER_NAME_3DES        1553
-#define CIPHER_NAME_BLOWFISH    1554
-#define CIPHER_NAME_AES         1555
-#define CIPHER_NAME_DES         1556
-#define OPEN_DIRECTORY_BROWSE_CAPTION 1557
-#define OPEN_DIRECTORY_ADD_BOOMARK_ACTION 1558
-#define RESUME_ENABLED          1559
-#define RESUME_DISABLED         1560
-#define RESUME_NOT_AVAILABLE    1561
-#define TRANSFER_ASCII          1562
-#define TRANSFER_BINARY         1563
-#define EDITOR_LINE_STATUS      1564
-#define EDITOR_COLUMN_STATUS    1565
-#define EDITOR_CHARACTER_STATUS 1566
-#define EDITOR_MODIFIED         1567
-#define EDITOR_FIND_END         1568
-#define EDITOR_REPLACE_END      1569
-#define EDITOR_GO_TO_LINE       1570
-#define EDITOR_LINE_NUMBER      1571
-#define EDITOR_INVALID_LINE     1572
-#define LINK_EDIT_CAPTION       1573
-#define LINK_ADD_CAPTION        1574
-#define STATUS_DISCONNECTED     1575
-#define STATUS_CONNECTING       1576
-#define OPENEDSESSION_HINT      1577
-#define ADD_BOOKMARK_CAPTION    1578
-#define ADD_BOOKMARK_PROMPT     1579
-#define MOVE_BOOKMARK_CAPTION   1580
-#define MOVE_BOOKMARK_PROMPT    1581
-#define SAVE_SESSION_CAPTION    1582
-#define SAVE_SESSION_PROMPT     1583
-#define RENAME_BOOKMARK_CAPTION 1584
-#define RENAME_BOOKMARK_PROMPT  1585
-#define PROGRESS_CUSTOM_COMAND  1586
-#define CUSTOM_COMMAND_HINT     1587
-#define LOGIN_BUG_ON            1588
-#define LOGIN_BUG_OFF           1589
-#define LOGIN_BUG_AUTO          1590
-#define CUSTOM_COMMAND_PARAMFMT 1591
-#define CUSTOM_COMMAND_DIRECTORIES 1592
-#define CUSTOM_COMMAND_RECURSE  1593
-#define EDITOR_FONT_FMT         1594
-#define PROPERTIES_UNKNOWN_SIZE 1595
-#define PROGRESS_CALCULATE_SIZE 1596
-#define PASSWORD_TITLE          1597
-#define PASSPHRASE_TITLE        1598
-#define SERVER_PASSWORD_TITLE   1599
-#define WIN_VARIABLE_STRINGS    1600
-#define WINSCP_COPYRIGHT        1601
-#define HOMEPAGE_URL            1602
-#define HISTORY_URL             1603
-#define REQUIREMENTS_URL        1604
-#define FORUM_URL               1605
-#define UPDATES_URL             1606
-#define DOWNLOAD_URL            1607
-#define DONATE_URL              1608
-#define TRANSLATOR_INFO         1701
-#define MIDDLE_EAST             1702
-#define BIDI_MODE               1703
-#define FLIP_CHILDREN           1704
+#define WIN_ERROR_STRINGS       1100
+#define MASK_ERROR              1101
+#define WARN_FATAL_ERROR        1102
+#define SESSION_NOT_EXISTS_ERROR 1105
+#define CREATE_SHORTCUT_ERROR   1107
+#define CANNOT_OVERWRITE_SPECIAL_SESSION 1108
+#define EXPLORE_LOCAL_DIR_ERROR 1109
+#define NO_UPLOAD_LIST_ERROR    1110
+#define CREATE_LOCAL_DIR_ERROR  1111
+#define DELETE_LOCAL_FILE_ERROR 1112
+#define DELETE_TEMP_EXECUTE_FILE_ERROR 1113
+#define EXECUTE_FILE_ERROR      1114
+#define EDITOR_ERROR            1115
+#define DOCUMENT_WAIT_ERROR     1116
+#define SYNC_DIR_BROWSE_ERROR   1117
+#define RESOLVE_SHORTCUT_ERROR  1118
+#define DUPLICATE_BOOKMARK      1119
+#define BOOKMARK_INVALID_NAME   1120
+#define BOOKMARK_FOLDER_INVALID_NAME 1121
+#define DUPLICATE_BOOKMARK_FOLDER 1122
+#define CUSTOM_COMMAND_INVALID  1123
+#define CUSTOM_COMMAND_DUPLICATE 1124
+#define CHECK_FOR_UPDATES_HTTP  1125
+#define CHECK_FOR_UPDATES_ERROR 1126
+#define EXECUTE_APP_ERROR       1127
+#define FILE_NOT_FOUND          1128
+#define WIN_CONFIRMATION_STRINGS 1300
+#define CONFIRM_OVERWRITE_SESSION 1301
+#define CREATE_LOCAL_DIRECTORY  1302
+#define CANCEL_OPERATION        1303
+#define CANCEL_OPERATION_FATAL  1304
+#define CONFIRM_DELETE_FILE     1305
+#define CONFIRM_DELETE_FILES    1306
+#define CLOSE_SESSION           1307
+#define NEVER_ASK_AGAIN         1308
+#define DD_WARN_LACK_OF_TEMP_SPACE 1309
+#define DD_WARN_UNKNOWN_TEMP_SPACE 1310
+#define ADD_BOOKMARK_CONFIRM    1311
+#define RECONNECT_BUTTON        1312
+#define CONFIRM_CREATE_SHORTCUT 1313
+#define SET_DEFAULT_SESSION_SETTINGS 1314
+#define SKIP_BUTTON             1315
+#define SAVE_CHANGES            1316
+#define CONFIRM_CREATE_SENDTO   1317
+#define CONFIRM_CREATE_ICON     1318
+#define CLOSE_SESSIONS          1319
+#define DELETE_BOOKMARK_FOLDER  1320
+#define PREV_BUTTON             1321
+#define NEXT_BUTTON             1322
+#define APPEND_BUTTON           1323
+#define WIN_INFORMATION_STRINGS 1400
+#define APP_CAPTION             1401
+#define COMPARE_NO_DIFFERENCES  1402
+#define SHORTCUT_INFO_TIP       1403
+#define DOCUMENT_WAIT           1404
+#define SESSION_SENDTO_HOOK_NAME 1405
+#define SENDTO_HOOK_NAME        1406
+#define BOOKMARK_INFO_TIP       1407
+#define CUSTOM_COMMAND_TOUCH    1408
+#define CUSTOM_COMMAND_EXECUTE  1409
+#define CUSTOM_COMMAND_MOVE     1410
+#define CUSTOM_COMMAND_MOVE_PARAM 1411
+#define ERROR_LIST_COUNT        1412
+#define ERROR_LIST_NUMBER       1413
+#define NO_NEW_VERSION          1414
+#define NEW_VERSION             1415
+#define CUSTOM_COMMANDS_PARAM_PROMPT 1416
+#define CUSTOM_COMMANDS_PARAM_TITLE 1417
+#define WIN_STATUS_STRINGS      1450
+#define STATUS_CLOSED           1451
+#define STATUS_INITWINSOCK      1452
+#define STATUS_LOOKUPHOST       1453
+#define STATUS_CONNECT          1454
+#define STATUS_AUTHENTICATE     1455
+#define STATUS_AUTHENTICATED    1456
+#define STATUS_STARTUP          1457
+#define STATUS_OPEN_DIRECTORY   1458
+#define STATUS_READY            1459
+#define WIN_FORMS_STRINGS       1500
+#define LOG_NOLOG               1501
+#define LOG_NOLOGFILE           1502
+#define LOG_NOLOGCAPTION        1503
+#define LOG_CAPTION             1504
+#define COPY_FILE               1505
+#define COPY_FILES              1506
+#define COPY_COPY               1507
+#define COPY_MOVE               1508
+#define COPY_TOLOCAL            1509
+#define COPY_TOREMOTE           1510
+#define COPY_COPY_CAPTION       1511
+#define COPY_MOVE_CAPTION       1512
+#define COPY_TODROP             1513
+#define COPY_COPY_BUTTON        1514
+#define COPY_MOVE_BUTTON        1515
+#define PROGRESS_COPY           1516
+#define PROGRESS_MOVE           1517
+#define PROGRESS_DELETE         1518
+#define PROGRESS_SETPROPERTIES  1519
+#define PROGRESS_DRAGDROP_TARGET 1520
+#define NEW_FOLDER              1521
+#define CREATE_FOLDER_PROMPT    1522
+#define CREATE_FOLDER_CAPTION   1523
+#define SELECT_MASK_DESELECT_CAPTION 1524
+#define SELECT_MASK_SELECT_CAPTION 1525
+#define PROPERTIES_FILE         1526
+#define PROPERTIES_FILES        1527
+#define PROPERTIES_DIRECTORY    1528
+#define PROPERTIES_DIRECTORIES  1529
+#define PROPERTIES_SYMLINK      1530
+#define PROPERTIES_SYMLINKS     1531
+#define PROPERTIES_FILE_CAPTION 1532
+#define PROPERTIES_FILES_CAPTION 1533
+#define PROPERTIES_INVALID_GROUP 1534
+#define PROPERTIES_INVALID_OWNER 1535
+#define EXPLORER_BACK_HINT      1536
+#define EXPLORER_FORWARD_HINT   1537
+#define STATUS_SENT_HINT        1538
+#define STATUS_RECEIVED_HINT    1539
+#define STATUS_DURATION_HINT    1540
+#define STATUS_COMPRESSION_HINT 1541
+#define STATUS_ENCRYPTION_HINT  1542
+#define STATUS_VERSION_HINT     1543
+#define STATUS_FILEINFO_HINT    1544
+#define STATUS_COMPRESSION2_HINT 1545
+#define STATUS_ENCRYPTION2_HINT 1546
+#define SAVEDSESSION_HINT       1547
+#define STATUS_FS_PROTOCOL      1548
+#define LICENCE_CAPTION         1549
+#define SYCHRONIZE_DESCRIPTION  1550
+#define SYCHRONIZE_WAITING      1551
+#define CIPHER_NAME_WARN        1552
+#define CIPHER_NAME_3DES        1553
+#define CIPHER_NAME_BLOWFISH    1554
+#define CIPHER_NAME_AES         1555
+#define CIPHER_NAME_DES         1556
+#define OPEN_DIRECTORY_BROWSE_CAPTION 1557
+#define OPEN_DIRECTORY_ADD_BOOMARK_ACTION 1558
+#define RESUME_ENABLED          1559
+#define RESUME_DISABLED         1560
+#define RESUME_NOT_AVAILABLE    1561
+#define TRANSFER_ASCII          1562
+#define TRANSFER_BINARY         1563
+#define EDITOR_LINE_STATUS      1564
+#define EDITOR_COLUMN_STATUS    1565
+#define EDITOR_CHARACTER_STATUS 1566
+#define EDITOR_MODIFIED         1567
+#define EDITOR_FIND_END         1568
+#define EDITOR_REPLACE_END      1569
+#define EDITOR_GO_TO_LINE       1570
+#define EDITOR_LINE_NUMBER      1571
+#define EDITOR_INVALID_LINE     1572
+#define LINK_EDIT_CAPTION       1573
+#define LINK_ADD_CAPTION        1574
+#define STATUS_DISCONNECTED     1575
+#define STATUS_CONNECTING       1576
+#define OPENEDSESSION_HINT      1577
+#define ADD_BOOKMARK_CAPTION    1578
+#define ADD_BOOKMARK_PROMPT     1579
+#define MOVE_BOOKMARK_CAPTION   1580
+#define MOVE_BOOKMARK_PROMPT    1581
+#define SAVE_SESSION_CAPTION    1582
+#define SAVE_SESSION_PROMPT     1583
+#define RENAME_BOOKMARK_CAPTION 1584
+#define RENAME_BOOKMARK_PROMPT  1585
+#define PROGRESS_CUSTOM_COMAND  1586
+#define CUSTOM_COMMAND_HINT     1587
+#define LOGIN_BUG_ON            1588
+#define LOGIN_BUG_OFF           1589
+#define LOGIN_BUG_AUTO          1590
+#define CUSTOM_COMMAND_PARAMFMT 1591
+#define CUSTOM_COMMAND_DIRECTORIES 1592
+#define CUSTOM_COMMAND_RECURSE  1593
+#define EDITOR_FONT_FMT         1594
+#define PROPERTIES_UNKNOWN_SIZE 1595
+#define PROGRESS_CALCULATE_SIZE 1596
+#define PASSWORD_TITLE          1597
+#define PASSPHRASE_TITLE        1598
+#define SERVER_PASSWORD_TITLE   1599
+#define CLEANUP_CONFIG          1600
+#define CLEANUP_SESSIONS        1601
+#define CLEANUP_HOSTKEYS        1602
+#define CLEANUP_INIFILE         1603
+#define CLEANUP_SEEDFILE        1604
+#define WIN_VARIABLE_STRINGS    1700
+#define WINSCP_COPYRIGHT        1701
+#define HOMEPAGE_URL            1702
+#define HISTORY_URL             1703
+#define REQUIREMENTS_URL        1704
+#define FORUM_URL               1705
+#define UPDATES_URL             1706
+#define DOWNLOAD_URL            1707
+#define DONATE_URL              1708
+#define TRANSLATOR_INFO         1801
+#define MIDDLE_EAST             1802
+#define BIDI_MODE               1803
+#define FLIP_CHILDREN           1804
  
 #endif // TextsWin 

resource/TextsWin1.rc

@@ -180,21 +180,26 @@
 #define PASSWORD_TITLE          1597
 #define PASSPHRASE_TITLE        1598
 #define SERVER_PASSWORD_TITLE   1599
+#define CLEANUP_CONFIG          1600
+#define CLEANUP_SESSIONS        1601
+#define CLEANUP_HOSTKEYS        1602
+#define CLEANUP_INIFILE         1603
+#define CLEANUP_SEEDFILE        1604
 
-#define WIN_VARIABLE_STRINGS    1600
-#define WINSCP_COPYRIGHT        1601
-#define HOMEPAGE_URL            1602
-#define HISTORY_URL             1603
-#define REQUIREMENTS_URL        1604
-#define FORUM_URL               1605
-#define UPDATES_URL             1606
-#define DOWNLOAD_URL            1607
-#define DONATE_URL              1608
+#define WIN_VARIABLE_STRINGS    1700
+#define WINSCP_COPYRIGHT        1701
+#define HOMEPAGE_URL            1702
+#define HISTORY_URL             1703
+#define REQUIREMENTS_URL        1704
+#define FORUM_URL               1705
+#define UPDATES_URL             1706
+#define DOWNLOAD_URL            1707
+#define DONATE_URL              1708
 
-#define TRANSLATOR_INFO         1701
-#define MIDDLE_EAST             1702
-#define BIDI_MODE               1703
-#define FLIP_CHILDREN           1704
+#define TRANSLATOR_INFO         1801
+#define MIDDLE_EAST             1802
+#define BIDI_MODE               1803
+#define FLIP_CHILDREN           1804
 
 STRINGTABLE
 BEGIN
@@ -388,6 +393,11 @@ BEGIN
         PASSWORD_TITLE, "Enter password"
         PASSPHRASE_TITLE, "Enter key passphrase"
         SERVER_PASSWORD_TITLE, "Server prompt"
+        CLEANUP_CONFIG, "General configuration"
+        CLEANUP_SESSIONS, "Stored sessions"
+        CLEANUP_HOSTKEYS, "Cached host keys"
+        CLEANUP_INIFILE, "Configuration INI file"
+        CLEANUP_SEEDFILE, "Random seed file"
 
         WIN_VARIABLE_STRINGS, "WIN_VARIABLE"
         WINSCP_COPYRIGHT, "Copyright © 2000-2003 Martin Prikryl"