Martin Prikryl 17 years ago
parent
commit
c235f68ea4
12 changed files with 27 additions and 35 deletions
  1. 4 4
      Console.rc
  2. 4 4
      DragExt.rc
  3. 4 4
      DragExt64.rc
  4. 5 5
      WinSCP.rc
  5. 0 7
      forms/LogSettings.dfm
  6. 0 1
      forms/LogSettings.h
  7. 2 2
      forms/Login.dfm
  8. 1 1
      forms/Preferences.dfm
  9. 1 1
      release/winscp.u3i
  10. 2 2
      release/winscpsetup.iss
  11. 3 3
      resource/TextsCore1.rc
  12. 1 1
      resource/TextsWin1.rc

+ 4 - 4
Console.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 2,2,0,102
-PRODUCTVERSION 2,2,0,102
+FILEVERSION 2,2,0,103
+PRODUCTVERSION 2,2,0,103
 FILEOS 0x4
 FILETYPE 0x1
 {
@@ -10,13 +10,13 @@ FILETYPE 0x1
         {
             VALUE "CompanyName", "Martin Prikryl\0"
             VALUE "FileDescription", "Console interface for WinSCP\0"
-            VALUE "FileVersion", "2.2.0.102\0"
+            VALUE "FileVersion", "2.2.0.103\0"
             VALUE "InternalName", "console\0"
             VALUE "LegalCopyright", "(c) 2000-2009 Martin Prikryl\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "winscp.com\0"
             VALUE "ProductName", "WinSCP\0"
-            VALUE "ProductVersion", "4.2.0.0\0"
+            VALUE "ProductVersion", "4.2.1.0\0"
             VALUE "ReleaseType", "beta\0"
             VALUE "WWW", "http://winscp.net/\0"
         }

+ 4 - 4
DragExt.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 1,1,8,96
-PRODUCTVERSION 1,1,8,96
+FILEVERSION 1,1,8,97
+PRODUCTVERSION 1,1,8,97
 FILEOS 0x4
 FILETYPE 0x2
 {
@@ -10,13 +10,13 @@ FILETYPE 0x2
         {
             VALUE "CompanyName", "Martin Prikryl\0"
             VALUE "FileDescription", "Drag&Drop shell extension for WinSCP (32-bit)\0"
-            VALUE "FileVersion", "1.1.8.96\0"
+            VALUE "FileVersion", "1.1.8.97\0"
             VALUE "InternalName", "dragext32\0"
             VALUE "LegalCopyright", "(c) 2000-2009 Martin Prikryl\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "dragext.dll\0"
             VALUE "ProductName", "WinSCP\0"
-            VALUE "ProductVersion", "4.2.0.0\0"
+            VALUE "ProductVersion", "4.2.1.0\0"
             VALUE "ReleaseType", "beta\0"
             VALUE "WWW", "http://winscp.net/\0"
         }

+ 4 - 4
DragExt64.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 1,1,8,96
-PRODUCTVERSION 1,1,8,96
+FILEVERSION 1,1,8,97
+PRODUCTVERSION 1,1,8,97
 FILEOS 0x4
 FILETYPE 0x2
 {
@@ -10,13 +10,13 @@ FILETYPE 0x2
         {
             VALUE "CompanyName", "Martin Prikryl\0"
             VALUE "FileDescription", "Drag&Drop shell extension for WinSCP (64-bit)\0"
-            VALUE "FileVersion", "1.1.8.96\0"
+            VALUE "FileVersion", "1.1.8.97\0"
             VALUE "InternalName", "dragext64\0"
             VALUE "LegalCopyright", "(c) 2000-2009 Martin Prikryl\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "dragext64.dll\0"
             VALUE "ProductName", "WinSCP\0"
-            VALUE "ProductVersion", "4.2.0.0\0"
+            VALUE "ProductVersion", "4.2.1.0\0"
             VALUE "ReleaseType", "beta\0"
             VALUE "WWW", "http://winscp.net/\0"
         }

+ 5 - 5
WinSCP.rc

@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION 4,2,0,427
-PRODUCTVERSION 4,2,0,427
+FILEVERSION 4,2,1,428
+PRODUCTVERSION 4,2,1,428
 FILEOS 0x4
 FILETYPE 0x1
 {
@@ -10,13 +10,13 @@ FILETYPE 0x1
         {
             VALUE "CompanyName", "Martin Prikryl\0"
             VALUE "FileDescription", "SFTP, FTP and SCP client\0"
-            VALUE "FileVersion", "4.2.0.427\0"
+            VALUE "FileVersion", "4.2.1.428\0"
             VALUE "InternalName", "winscp\0"
             VALUE "LegalCopyright", "(c) 2000-2009 Martin Prikryl\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "winscp420.exe\0"
+            VALUE "OriginalFilename", "winscp421.exe\0"
             VALUE "ProductName", "WinSCP\0"
-            VALUE "ProductVersion", "4.2.0.0\0"
+            VALUE "ProductVersion", "4.2.1.0\0"
             VALUE "ReleaseType", "beta\0"
             VALUE "WWW", "http://winscp.net/\0"
         }

+ 0 - 7
forms/LogSettings.dfm

@@ -162,13 +162,6 @@ object LoggingFrame: TLoggingFrame
     Anchors = [akLeft, akTop, akRight]
     Caption = 'Log'
     TabOrder = 1
-    object Label1: TLabel
-      Left = 256
-      Top = 166
-      Width = 21
-      Height = 13
-      Caption = 'lines'
-    end
     object LoggingOffButton: TRadioButton
       Left = 16
       Top = 21

+ 0 - 1
forms/LogSettings.h

@@ -31,7 +31,6 @@ __published:
   TComboBox *LogProtocolCombo;
   TStaticText *LogFileNameHintText;
   TGroupBox *LogGroup;
-  TLabel *Label1;
   TRadioButton *LoggingOffButton;
   TRadioButton *LoggingOnButton;
   TRadioButton *LoggingActionsButton;

+ 2 - 2
forms/Login.dfm

@@ -1163,9 +1163,9 @@ object LoginDialog: TLoginDialog
           object Label5: TLabel
             Left = 12
             Top = 102
-            Width = 149
+            Width = 152
             Height = 13
-            Caption = '&Support for listing of hidden files'
+            Caption = '&Support for listing of hidden files:'
             FocusControl = FtpListAllCombo
           end
           object PostLoginCommandsMemo: TMemo

+ 1 - 1
forms/Preferences.dfm

@@ -263,7 +263,7 @@ object PreferencesDialog: TPreferencesDialog
             DesignSize = (
               357
               198)
-            inherited LogFileNameEdit: TFilenameEdit
+            inherited LogFileNameEdit2: TFilenameEdit
               Width = 303
             end
             inherited LogFilePanel: TPanel

+ 1 - 1
release/winscp.u3i

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <u3manifest version="1.0">
-  <application uuid="48b341d1-d411-4b5a-a82c-f3b5d65602fc" version="4.2">
+  <application uuid="48b341d1-d411-4b5a-a82c-f3b5d65602fc" version="4.2.1">
     <icon>winscp.ico</icon>
     <name>WinSCP</name>
     <description>Freeware SFTP (SSH File Transfer Protocol), FTP (File Transfer Protocol) and SCP (Secure CoPy) client for Windows using SSH (Secure SHell). Its main function is safe copying of files between a local and a remote computer.</description>

+ 2 - 2
release/winscpsetup.iss

@@ -799,8 +799,8 @@ begin
 
   S := S + ExpandConstant('{cm:UserSettingsOverview}') + NewLine;
   S := S + Space;
-  if CommanderRadioButton.Checked then S2 := ExpandConstant('{cm:NortonCommanderInterface}')
-    else S2 := ExpandConstant('{cm:ExplorerInterface}');
+  if CommanderRadioButton.Checked then S2 := ExpandConstant('{cm:NortonCommanderInterfaceB}')
+    else S2 := ExpandConstant('{cm:ExplorerInterfaceB}');
   StringChange(S2, '&', '');
   S := S + S2;
   S := S + NewLine;

+ 3 - 3
resource/TextsCore1.rc

@@ -164,7 +164,7 @@ BEGIN
   SPEED_INVALID, "'%s' is not a valid speed limit."
   CERT_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, "Self signed certificate."
   CERT_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD, "Format error in certificate's valid until field."
-  CERT_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD, "Format error in certificate's valid fom field."
+  CERT_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD, "Format error in certificate's valid from field."
   CERT_ERR_INVALID_CA, "Invalid CA certificate."
   CERT_ERR_INVALID_PURPOSE, "Unsupported certificate purpose."
   CERT_ERR_KEYUSAGE_NO_CERTSIGN, "Key usage does not include certificate signing."
@@ -174,7 +174,7 @@ BEGIN
   CERT_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE, "Unable to decrypt certificate signature."
   CERT_ERR_UNABLE_TO_GET_ISSUER_CERT, "Unable to get issuer certificate."
   CERT_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, "Unable to get local issuer certificate."
-  CERT_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, "Unable to verify the first certifcate."
+  CERT_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, "Unable to verify the first certificate."
   CERT_ERR_UNKNOWN, "Unknown certificate verification error."
   CERT_ERRDEPTH, "The error occured at a depth of %d in the certificate chain."
   CERT_OK, "The certificate seems to be valid."
@@ -335,7 +335,7 @@ BEGIN
   CORE_VARIABLE_STRINGS, "CORE_VARIABLE"
   PUTTY_BASED_ON, "SSH and SCP code based on PuTTY %s"
   PUTTY_VERSION, "0.60"
-  PUTTY_COPYRIGHT, "Copyright © 1997-2007 Simon Tatham"
+  PUTTY_COPYRIGHT, "Copyright © 1997-2009 Simon Tatham"
   PUTTY_URL, "http://www.chiark.greenend.org.uk/~sgtatham/putty/"
   FILEZILLA_BASED_ON, "FTP code based on FileZilla %s"
   FILEZILLA_VERSION, "2.2.32"

+ 1 - 1
resource/TextsWin1.rc

@@ -360,7 +360,7 @@ BEGIN
         PROPERTIES_UNKNOWN_TOKEN, "Current session allows changing ownership by UID only. It was not possible to resolve UID from account name \"%s\". Specify UID explicitly instead."
 
         WIN_VARIABLE_STRINGS, "WIN_VARIABLE"
-        WINSCP_COPYRIGHT, "Copyright © 2000-2008 Martin Prikryl"
+        WINSCP_COPYRIGHT, "Copyright © 2000-2009 Martin Prikryl"
         HOMEPAGE_URL, "http://winscp.net/"
         HISTORY_URL, "http://winscp.net/eng/docs/history"
         REQUIREMENTS_URL, "http://winscp.net/eng/docs/requirements"