ShellExtension: context menu items were not translated on Windows XP

diff --git a/ShellExtension/ShellExtension.rc b/ShellExtension/ShellExtension.rc
index e8bf2e4..44db386 100644 (file)
--- a/ShellExtension/ShellExtension.rc
+++ b/ShellExtension/ShellExtension.rc
@@ -1,7 +1,5 @@
-//Microsoft Developer Studio generated resource script.\r
+// Microsoft Visual C++ generated resource script.\r
 //\r
-// $Id$\r
-\r
 #include "resource.h"\r
 \r
 #define APSTUDIO_READONLY_SYMBOLS\r
@@ -15,13 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
-// English (U.S.) resources\r
+// English (United States) resources\r
 \r
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
-#ifdef _WIN32\r
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
 #pragma code_page(1252)\r
-#endif //_WIN32\r
 \r
 #ifdef APSTUDIO_INVOKED\r
 /////////////////////////////////////////////////////////////////////////////\r
@@ -29,18 +25,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE\r
 //\r
 \r
-1 TEXTINCLUDE\r
+1 TEXTINCLUDE \r
 BEGIN\r
     "resource.h\0"\r
 END\r
 \r
-2 TEXTINCLUDE\r
+2 TEXTINCLUDE \r
 BEGIN\r
     "#include ""afxres.h""\r\n"\r
     "\0"\r
 END\r
 \r
-3 TEXTINCLUDE\r
+3 TEXTINCLUDE \r
 BEGIN\r
     "1 TYPELIB ""ShellExtension.tlb""\r\n"\r
     "\r\n"\r
@@ -297,15 +293,14 @@ END
 #endif    // APSTUDIO_INVOKED\r
 \r
 \r
-#ifndef _MAC\r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
 // Version\r
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,16,5,7\r
- PRODUCTVERSION 1,16,5,7\r
+ FILEVERSION 1,16,5,8\r
+ PRODUCTVERSION 1,16,5,8\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -318,21 +313,16 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN\r
     BLOCK "StringFileInfo"\r
     BEGIN\r
-        BLOCK "040904B0"\r
+        BLOCK "040904b0"\r
         BEGIN\r
-            VALUE "Comments", "\0"\r
-            VALUE "CompanyName", "http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html\0"\r
-            VALUE "FileDescription", "WinMerge Shell Integration library\0"\r
-            VALUE "FileVersion", "1.16.5.7\0"\r
-            VALUE "InternalName", "ShellExtension\0"\r
-            VALUE "LegalCopyright", "Copyright 2003-2015\0"\r
-            VALUE "LegalTrademarks", "\0"\r
-            VALUE "OLESelfRegister", "\0"\r
-            VALUE "OriginalFilename", "ShellExtension.DLL\0"\r
-            VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "WinMerge Shell Integration library\0"\r
-            VALUE "ProductVersion", "1.16.5.7\0"\r
-            VALUE "SpecialBuild", "\0"\r
+            VALUE "CompanyName", "http://www.geocities.co.jp/SiliconValley-SanJose/8165/winmerge.html"\r
+            VALUE "FileDescription", "WinMerge Shell Integration library"\r
+            VALUE "FileVersion", "1.16.5.8"\r
+            VALUE "InternalName", "ShellExtension"\r
+            VALUE "LegalCopyright", "Copyright 2003-2016"\r
+            VALUE "OriginalFilename", "ShellExtension.DLL"\r
+            VALUE "ProductName", "WinMerge Shell Integration library"\r
+            VALUE "ProductVersion", "1.16.5.8"\r
         END\r
     END\r
     BLOCK "VarFileInfo"\r
@@ -341,8 +331,6 @@ BEGIN
     END\r
 END\r
 \r
-#endif    // !_MAC\r
-\r
 \r
 /////////////////////////////////////////////////////////////////////////////\r
 //\r
@@ -380,7 +368,7 @@ BEGIN
     IDS_RESELECT_FIRST      "&Re-select First"\r
 END\r
 \r
-#endif    // English (U.S.) resources\r
+#endif    // English (United States) resources\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
 \r
@@ -563,11 +551,19 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PTG)\r
 #ifdef _WIN32\r
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE\r
-#pragma code_page(1250)\r
+#pragma code_page(1252)\r
 #include "Languages\ShellExtensionPortuguese.rc"\r
 #endif //_WIN32\r
 #endif\r
 \r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ROM)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT\r
+#pragma code_page(1250)\r
+#include "Languages\ShellExtensionRomanian.rc"\r
+#endif //_WIN32\r
+#endif\r
+\r
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)\r
 #ifdef _WIN32\r
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT\r

diff --git a/ShellExtension/WinMergeShell.cpp b/ShellExtension/WinMergeShell.cpp
index 7648b98..398a5a4 100644 (file)
--- a/ShellExtension/WinMergeShell.cpp
+++ b/ShellExtension/WinMergeShell.cpp
@@ -116,14 +116,14 @@ public:
                int iLangId = reg.ReadDword(f_LanguageId, (DWORD)-1);
                if (iLangId != -1)
                {
-                       SetThreadLocale(MAKELCID(iLangId, SORT_DEFAULT));
                        SetThreadUILanguage(iLangId);
+                       SetThreadLocale(MAKELCID(iLangId, SORT_DEFAULT));
                }
        }
        ~CWinMergeTempLocale()
        {
-               SetThreadLocale(m_lcidOld);
                SetThreadUILanguage(LANGIDFROMLCID(m_lcidOld));
+               SetThreadLocale(m_lcidOld);
        }
 };