Fix build failure of ShellExtension

diff --git a/ShellExtension/Languages/ShellExtensionBasque.rc b/ShellExtension/Languages/ShellExtensionBasque.rc
index 560422e..3b90978 100644 (file)
--- a/ShellExtension/Languages/ShellExtensionBasque.rc
+++ b/ShellExtension/Languages/ShellExtensionBasque.rc
@@ -1,54 +1,54 @@
-//Microsoft Developer Studio generated resource script.
-//
-// This is an *automatic* generated file for the ShellExtension translation.
-// Please edit the PO file instead of this RC file for translation updates:
-//   ..\..\Translations\ShellExtension\<Languagename>.po
-//
-// $Id: ShellExtensionBasque.rc 7554 2011-08-19 14:50:47Z sdottaka $
-
-#include "../resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_EUQ)
-#ifdef _WIN32
-LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT
-#pragma code_page(1252)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-//
-//  ***  TRANSLATED STRINGS ***
-// Translate strings  below
-// 
-STRINGTABLE 
-BEGIN
-    IDS_PROJNAME            "ShellExtension"
-    IDS_CONTEXT_MENU        "WinMerge"
-    IDS_CONTEXT_HELP        "Ireki WinMergerekin"
-    IDS_CONTEXT_HELP_MANYITEMS "Mesedez ez hautatu 2 gai baino gehiago"
-    IDS_COMPARE             "Alderatu"
-    IDS_COMPARE_ELLIPSIS    "Alderatu..."
-    IDS_COMPARE_TO          "Alderatu Honekin"
-    IDS_HELP_SAVETHIS       "Gorde helburu hau. Hautatu beste helburu bat helburu honekin alderatzeko."
-    IDS_HELP_COMPARESAVED   "Alderatu gordetako helburuarekin (%1)"
-    IDS_RESELECT_FIRST      "Bir-hautatu Lehenengoa"
-END
-
-#endif    // Resources
-/////////////////////////////////////////////////////////////////////////////
+//Microsoft Developer Studio generated resource script.\r
+//\r
+// This is an *automatic* generated file for the ShellExtension translation.\r
+// Please edit the PO file instead of this RC file for translation updates:\r
+//   ..\..\Translations\ShellExtension\<Languagename>.po\r
+//\r
+// $Id$\r
+\r
+#include "../resource.h"\r
+\r
+#define APSTUDIO_READONLY_SYMBOLS\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 2 resource.\r
+//\r
+#include "afxres.h"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#undef APSTUDIO_READONLY_SYMBOLS\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// Resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_EUQ)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// String Table\r
+//\r
+\r
+//\r
+//  ***  TRANSLATED STRINGS ***\r
+// Translate strings  below\r
+// \r
+STRINGTABLE \r
+BEGIN\r
+    IDS_PROJNAME            "ShellExtension"\r
+    IDS_CONTEXT_MENU        "WinMerge"\r
+    IDS_CONTEXT_HELP        "Ireki WinMergerekin"\r
+    IDS_CONTEXT_HELP_MANYITEMS "Mesedez ez hautatu 2 gai baino gehiago"\r
+    IDS_COMPARE             "Alderatu"\r
+    IDS_COMPARE_ELLIPSIS    "Alderatu..."\r
+    IDS_COMPARE_TO          "Alderatu Honekin"\r
+    IDS_HELP_SAVETHIS       "Gorde helburu hau. Hautatu beste helburu bat helburu honekin alderatzeko."\r
+    IDS_HELP_COMPARESAVED   "Alderatu gordetako helburuarekin (%1)"\r
+    IDS_RESELECT_FIRST      "Bir-hautatu Lehenengoa"\r
+END\r
+\r
+#endif    // Resources\r
+/////////////////////////////////////////////////////////////////////////////\r

diff --git a/ShellExtension/Languages/ShellExtensionChineseSimplified.rc b/ShellExtension/Languages/ShellExtensionChineseSimplified.rc
index 997b40c..36fd8b7 100644 (file)
--- a/ShellExtension/Languages/ShellExtensionChineseSimplified.rc
+++ b/ShellExtension/Languages/ShellExtensionChineseSimplified.rc
@@ -45,8 +45,8 @@ BEGIN
     IDS_COMPARE             "¶Ô±È"\r
     IDS_COMPARE_ELLIPSIS    "¶Ô±È..."\r
     IDS_COMPARE_TO          "ºÍÁíÍâÒ»¸ö¶Ô±È"\r
-    IDS_HELP_SAVETHIS       "±£´æÕâ¸ö·¾¶¡£Ñ¡ÔñÁíÍâÒ»¸ö·¾¶ÓëÖ®½øÐжԱȡ£ "
-    IDS_HELP_COMPARESAVED   "Óë±£´æµÄ·¾¶(%1)½øÐÐ¶Ô±È "
+    IDS_HELP_SAVETHIS       "±£´æÕâ¸ö·¾¶¡£Ñ¡ÔñÁíÍâÒ»¸ö·¾¶ÓëÖ®½øÐжԱȡ£ "\r
+    IDS_HELP_COMPARESAVED   "Óë±£´æµÄ·¾¶(%1)½øÐÐ¶Ô±È "\r
     IDS_RESELECT_FIRST      "ÖØÐÂÑ¡ÔñµÚÒ»¸ö·¾¶"\r
 END\r
 \r

diff --git a/ShellExtension/Languages/ShellExtensionGreek.rc b/ShellExtension/Languages/ShellExtensionGreek.rc
index 379c456..7e11cf6 100644 (file)
--- a/ShellExtension/Languages/ShellExtensionGreek.rc
+++ b/ShellExtension/Languages/ShellExtensionGreek.rc
@@ -38,16 +38,16 @@ LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 // \r
 STRINGTABLE \r
 BEGIN\r
-    IDS_PROJNAME            "ÅðÝêôáóç ÐåñéâÜëëïíôïò "\r
+    IDS_PROJNAME            "ÅðÝêôáóç ÐåñéâÜëëïíôïò"\r
     IDS_CONTEXT_MENU        "WinMerge"\r
     IDS_CONTEXT_HELP        "¢íïéãìá ìå ôï WinMerge"\r
-    IDS_CONTEXT_HELP_MANYITEMS "Ðáñáêáëþ åðéëÝîáôå ü÷é ðåñéóóüôåñá áðü 2 áíôéêåßìåíá"
-    IDS_COMPARE             "Óýãêñéóç"
+    IDS_CONTEXT_HELP_MANYITEMS "Ðáñáêáëþ åðéëÝîáôå ü÷é ðåñéóóüôåñá áðü 2 áíôéêåßìåíá"\r
+    IDS_COMPARE             "Óýãêñéóç"\r
     IDS_COMPARE_ELLIPSIS    "Óýãêñéóç..."\r
-    IDS_COMPARE_TO          "Óýãêñéóç ìå"
+    IDS_COMPARE_TO          "Óýãêñéóç ìå"\r
     IDS_HELP_SAVETHIS       "ÁðïèÞêåõóç áõôÞò ôçò äéáäñïìÞò. ÅðéëÝîáôå êÜðïéá Üëëç äéáäñïìÞ ðñïò óýãêñéóç ìå áõôÞ ôç äéáäñïìÞ."\r
     IDS_HELP_COMPARESAVED   "Óýãêñéóç ìå áðïèçêåõìÝíç äéáäñïìÞ (%1)"\r
-    IDS_RESELECT_FIRST      "ÅðáíåðéëïãÞ Ðñþôïõ "\r
+    IDS_RESELECT_FIRST      "ÅðáíåðéëïãÞ Ðñþôïõ"\r
 END\r
 \r
 #endif    // Resources\r

diff --git a/ShellExtension/ShellExtension.rc b/ShellExtension/ShellExtension.rc
index b1a6138..8694289 100644 (file)
--- a/ShellExtension/ShellExtension.rc
+++ b/ShellExtension/ShellExtension.rc
@@ -318,7 +318,7 @@ 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://winmerge.org\0"\r

diff --git a/ShellExtension/ShellExtension.vcxproj b/ShellExtension/ShellExtension.vcxproj
index 58509bc..30bb8cf 100644 (file)
--- a/ShellExtension/ShellExtension.vcxproj
+++ b/ShellExtension/ShellExtension.vcxproj
@@ -407,9 +407,24 @@ echo Warning : Cannot register Unicode DLL on Windows 95
     <ClInclude Include="WinMergeShell.h" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <ResourceCompile Include="Languages\ShellExtensionBasque.rc" />\r
-    <ResourceCompile Include="Languages\ShellExtensionSerbian.rc" />\r
-    <ResourceCompile Include="Languages\ShellExtensionSlovenian.rc" />\r
+    <ResourceCompile Include="Languages\ShellExtensionBasque.rc">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'">true</ExcludedFromBuild>\r
+    </ResourceCompile>\r
+    <ResourceCompile Include="Languages\ShellExtensionSerbian.rc">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'">true</ExcludedFromBuild>\r
+    </ResourceCompile>\r
+    <ResourceCompile Include="Languages\ShellExtensionSlovenian.rc">\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Unicode Release MinDependency|x64'">true</ExcludedFromBuild>\r
+    </ResourceCompile>\r
     <ResourceCompile Include="ShellExtension.rc">\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">_DEBUG</PreprocessorDefinitions>\r
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">_DEBUG</PreprocessorDefinitions>\r

diff --git a/Translations/ShellExtension/English.pot b/Translations/ShellExtension/English.pot
index 1032d83..a5379de 100644 (file)
--- a/Translations/ShellExtension/English.pot
+++ b/Translations/ShellExtension/English.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""\r
 "Project-Id-Version: WinMerge Shell Extension\n"\r
 "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"\r
-"POT-Creation-Date: 2011-01-03 12:23+0000\n"\r
+"POT-Creation-Date: 2011-10-11 01:08+0000\n"\r
 "PO-Revision-Date: \n"\r
 "Last-Translator: \n"\r
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"\r