Index: src/rc2lng/rc.cpp
===================================================================
diff -u -N -r2ea239cf20965118cf7bca9a48c2cec670be5738 -ref66618c03735e362f78ddd3822a3f5c40efa366
--- src/rc2lng/rc.cpp	(.../rc.cpp)	(revision 2ea239cf20965118cf7bca9a48c2cec670be5738)
+++ src/rc2lng/rc.cpp	(.../rc.cpp)	(revision ef66618c03735e362f78ddd3822a3f5c40efa366)
@@ -525,7 +525,7 @@
 		CString strLine = *it;
 		strLine.Trim();
 
-		if ( (iPos=strLine.Find(_T(" MENU"))) == (strLine.GetLength() - (int)_tcslen(_T(" MENU"))) )
+		if ( (iPos=strLine.Find(_T(" MENU"))) >= 0 && iPos == (strLine.GetLength() - (int)_tcslen(_T(" MENU"))) )
 		{
 			// add the line to the output rc with no change
 			m_vOutRCFile.push_back(*it);
@@ -548,7 +548,7 @@
 			it++;
 			ProcessDialog(uiID, &it);
 		}
-		else if ( (iPos=strLine.Find(_T("STRINGTABLE"))) == (strLine.GetLength() - (int)_tcslen(_T("STRINGTABLE"))))
+		else if ( (iPos=strLine.Find(_T("STRINGTABLE"))) >= 0 && iPos == (strLine.GetLength() - (int)_tcslen(_T("STRINGTABLE"))))
 		{
 			// begin of the string table
 			it++;
Index: src/rc2lng/rc2lng.rc
===================================================================
diff -u -N -rbee51aca3d5d9b67ecac4f528a3203738cc63455 -ref66618c03735e362f78ddd3822a3f5c40efa366
--- src/rc2lng/rc2lng.rc	(.../rc2lng.rc)	(revision bee51aca3d5d9b67ecac4f528a3203738cc63455)
+++ src/rc2lng/rc2lng.rc	(.../rc2lng.rc)	(revision ef66618c03735e362f78ddd3822a3f5c40efa366)
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -13,15 +13,12 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Polish resources
+// English (United States) resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_PLK)
-#ifdef _WIN32
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-#pragma code_page(1250)
-#endif //_WIN32
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -42,84 +39,54 @@
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "041504b0"
+        BLOCK "000904b0"
         BEGIN
-            VALUE "Comments", "\0"
-            VALUE "CompanyName", "Kamufleon\0"
-            VALUE "FileDescription", "CHExe2Lng\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "CHExe2Lng\0"
-            VALUE "LegalCopyright", "Copyright � 2003\0"
-            VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "CHExe2Lng.exe\0"
-            VALUE "PrivateBuild", "\0"
-            VALUE "ProductName", "Kamufleon CHExe2Lng\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-            VALUE "SpecialBuild", "\0"
+            VALUE "CompanyName", "J�zef Starosczyk"
+            VALUE "FileDescription", "Rc2Lng"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "Rc2Lng"
+            VALUE "LegalCopyright", "Copyright � 2003-2016"
+            VALUE "OriginalFilename", "Rc2Lng.exe"
+            VALUE "ProductName", "Rc2Lng"
+            VALUE "ProductVersion", "1, 0, 0, 1"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x415, 1200
+        VALUE "Translation", 0x9, 1200
     END
 END
 
-#endif    // !_MAC
 
-#endif    // Polish resources
-/////////////////////////////////////////////////////////////////////////////
+#ifdef APSTUDIO_INVOKED
 
-
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
 //
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
 END
 
 #endif    // APSTUDIO_INVOKED
 
-
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
 
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_HELLO               "Hello from MFC!"
-END
-
-#endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
 #ifndef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
Index: src/rc2lng/rc2lng.vc140.vcxproj
===================================================================
diff -u -N -r81d00c8750af3e3193a82bf90566d59d8381782e -ref66618c03735e362f78ddd3822a3f5c40efa366
--- src/rc2lng/rc2lng.vc140.vcxproj	(.../rc2lng.vc140.vcxproj)	(revision 81d00c8750af3e3193a82bf90566d59d8381782e)
+++ src/rc2lng/rc2lng.vc140.vcxproj	(.../rc2lng.vc140.vcxproj)	(revision ef66618c03735e362f78ddd3822a3f5c40efa366)
@@ -28,25 +28,25 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <UseOfMfc>Dynamic</UseOfMfc>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -226,9 +226,6 @@
     <ProjectReference Include="..\libicpf\libicpf.vc140.vcxproj">
       <Project>{5510b933-046f-4f75-8b46-5e8279c8ccde}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\libictranslate\libictranslate.vc140.vcxproj">
-      <Project>{dd1f3242-7ee4-4f41-8b8d-d833300c445f}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="rc.cpp" />
Index: src/rc2lng/resource.h
===================================================================
diff -u -N -r8443d0d98d380facaf07b540c8d98da08365b816 -ref66618c03735e362f78ddd3822a3f5c40efa366
--- src/rc2lng/resource.h	(.../resource.h)	(revision 8443d0d98d380facaf07b540c8d98da08365b816)
+++ src/rc2lng/resource.h	(.../resource.h)	(revision ef66618c03735e362f78ddd3822a3f5c40efa366)
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by CHExe2Lng.rc
+// Used by rc2lng.rc
 //
 #define IDS_HELLO                       1
 
Index: tools.sln
===================================================================
diff -u -N -r3ce97595f1867bfb53e7609d8a10e2c1d94a89a0 -ref66618c03735e362f78ddd3822a3f5c40efa366
--- tools.sln	(.../tools.sln)	(revision 3ce97595f1867bfb53e7609d8a10e2c1d94a89a0)
+++ tools.sln	(.../tools.sln)	(revision ef66618c03735e362f78ddd3822a3f5c40efa366)
@@ -9,8 +9,6 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_runner", "tests\test_runner\test_runner.vcxproj", "{2AF37846-09E7-46EB-83AE-1E4C67742EE7}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libictranslate", "src\libictranslate\libictranslate.vc140.vcxproj", "{DD1F3242-7EE4-4F41-8B8D-D833300C445F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -71,22 +69,6 @@
 		{2AF37846-09E7-46EB-83AE-1E4C67742EE7}.Testing Release|Win32.Build.0 = Testing Release|Win32
 		{2AF37846-09E7-46EB-83AE-1E4C67742EE7}.Testing Release|x64.ActiveCfg = Testing Release|x64
 		{2AF37846-09E7-46EB-83AE-1E4C67742EE7}.Testing Release|x64.Build.0 = Testing Release|x64
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Debug|Win32.Build.0 = Debug|Win32
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Debug|x64.ActiveCfg = Debug|x64
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Debug|x64.Build.0 = Debug|x64
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Release|Win32.ActiveCfg = Release|Win32
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Release|Win32.Build.0 = Release|Win32
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Release|x64.ActiveCfg = Release|x64
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Release|x64.Build.0 = Release|x64
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Debug|Win32.ActiveCfg = Testing Debug|Win32
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Debug|Win32.Build.0 = Testing Debug|Win32
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Debug|x64.ActiveCfg = Testing Debug|x64
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Debug|x64.Build.0 = Testing Debug|x64
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Release|Win32.ActiveCfg = Testing Release|Win32
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Release|Win32.Build.0 = Testing Release|Win32
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Release|x64.ActiveCfg = Testing Release|x64
-		{DD1F3242-7EE4-4F41-8B8D-D833300C445F}.Testing Release|x64.Build.0 = Testing Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
Index: tools/libicpf32u.dll
===================================================================
diff -u -N -r3ce97595f1867bfb53e7609d8a10e2c1d94a89a0 -ref66618c03735e362f78ddd3822a3f5c40efa366
Binary files differ
Index: tools/rc2lng.exe
===================================================================
diff -u -N -r3ce97595f1867bfb53e7609d8a10e2c1d94a89a0 -ref66618c03735e362f78ddd3822a3f5c40efa366
Binary files differ