2 files changed, 22 insertions, 59 deletions
diff --git a/plugins/VersionInfo/res/resource.rc b/plugins/VersionInfo/res/resource.rc
index 770540d99a..9af9a50df0 100644
--- a/plugins/VersionInfo/res/resource.rc
+++ b/plugins/VersionInfo/res/resource.rc
@@ -47,46 +47,6 @@ BEGIN
     COMBOBOX        IDC_ASK_BOLDCOMBOBOX,167,104,54,47,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
-BEGIN
-    IDD_ASKDIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 224
-        VERTGUIDE, 15
-        VERTGUIDE, 221
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 139
-        HORZGUIDE, 116
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Italian (Italy) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ITA)
-#ifdef _WIN32
-LANGUAGE LANG_ITALIAN, SUBLANG_ITALIAN
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
 IDD_OPT_VERSIONINFO DIALOGEX 0, 0, 315, 222
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
 EXSTYLE WS_EX_CONTROLPARENT
@@ -148,6 +108,17 @@ END
 #ifdef APSTUDIO_INVOKED
 GUIDELINES DESIGNINFO 
 BEGIN
+    IDD_ASKDIALOG, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 224
+        VERTGUIDE, 15
+        VERTGUIDE, 221
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 139
+        HORZGUIDE, 116
+    END
+
     IDD_OPT_VERSIONINFO, DIALOG
     BEGIN
         LEFTMARGIN, 5
@@ -208,7 +179,7 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_MAIN                ICON                    "VersionInfo.ico"
-#endif    // Italian (Italy) resources
+#endif    // English (U.S.) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/plugins/VersionInfo/res/version.rc b/plugins/VersionInfo/res/version.rc
index f691628164..5bfbab4754 100644
--- a/plugins/VersionInfo/res/version.rc
+++ b/plugins/VersionInfo/res/version.rc
@@ -4,17 +4,12 @@
 #error this file is not editable by Microsoft Visual C++
 #endif //APSTUDIO_INVOKED
 
-#include "..\src\version.h"
 #include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
+#include "..\src\version.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION __PLUGINVERSION_STRING
- PRODUCTVERSION __PLUGINVERSION_STRING
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -22,25 +17,22 @@ VS_VERSION_INFO VERSIONINFO
  FILEFLAGS 0x0L
 #endif
  FILEOS 0x4L
- FILETYPE 0x2L
+ FILETYPE 0x0L
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "040904b0"
+        BLOCK "000004b0"
         BEGIN
-            VALUE "Author", __AUTHOR
-            VALUE "FileDescription", __DESC
-            VALUE "FileVersion", __VERSION_STRING
-            VALUE "InternalName", __PLUGIN_DISPLAY_NAME
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "InternalName", __PLUGIN_NAME
             VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x409, 1200
+        VALUE "Translation", 0x0, 1200
     END
 END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////