Merge pull request #13 from silnrsi/BackTranslationHelperUpdates

Back translation helper updates

.gitignore

@@ -273,3 +273,6 @@ autom4te.cache
 /redist/MapsTables/PythonExamples
 /redist/MapsTables/TestEncCnvtrs
 /genericinstaller
+/.vs/config/applicationhost.config
+/.vs/SEC VS2010/v14/.suo
+/.vs/SEC VS2015/v14/.suo

Directory.Build.props

@@ -3,9 +3,9 @@
     <ApplicationName>SILConverters</ApplicationName>
     <SafeApplicationName>SILConverters</SafeApplicationName>
     <TruncatedVersion>5.1</TruncatedVersion>
-    <VersionNumber>5.1.1.0</VersionNumber>
+    <VersionNumber>5.1.3.0</VersionNumber>
     <UpgradeCode>8A50226C-84D0-4CAF-AF8F-B0284643C415</UpgradeCode>
-    <Year>2022</Year>
+    <Year>2023</Year>
     <Manufacturer>SIL International</Manufacturer>
   </PropertyGroup>
 </Project>

Installer/Converter Packages/IndicConverters/IndicConverters.wixproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" />
   <Import Project="..\..\..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\..\..\packages\WiX.3.11.2\build\wix.props')" />
-  <Import Project="..\..\..\packages\Encoding-Converters-Core.0.5.4\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.5.4\build\Encoding-Converters-Core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -81,8 +81,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.5.4\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.5.4\build\Encoding-Converters-Core.props'))" />
     <Error Condition="!Exists('..\..\..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WiX.3.11.2\build\wix.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

Installer/Converter Packages/IndicConverters/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Encoding-Converters-Core" version="0.5.4" />
+  <package id="Encoding-Converters-Core" version="0.6.0" />
   <package id="WiX" version="3.11.2" />
 </packages>

Installer/Converter Packages/IndicConverters64bit/IndicConverters64bit.wixproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" />
   <Import Project="..\..\..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\..\..\packages\WiX.3.11.2\build\wix.props')" />
-  <Import Project="..\..\..\packages\Encoding-Converters-Core.0.5.4\build\Encoding-Converters-Core.props" Condition="Exists('..\..\..\packages\Encoding-Converters-Core.0.5.4\build\Encoding-Converters-Core.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
@@ -39,8 +39,8 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.5.4\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.5.4\build\Encoding-Converters-Core.props'))" />
     <Error Condition="!Exists('..\..\..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WiX.3.11.2\build\wix.props'))" />
+    <Error Condition="!Exists('..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Encoding-Converters-Core.0.6.0\build\Encoding-Converters-Core.props'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

Installer/Converter Packages/IndicConverters64bit/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Encoding-Converters-Core" version="0.5.4" />
+  <package id="Encoding-Converters-Core" version="0.6.0" />
   <package id="WiX" version="3.11.2" />
 </packages>

Installer/SEC Setup 64bit/EcFeatures.wxs

@@ -58,32 +58,38 @@
         <MergeRef Id="SEC_EC"/>
         <MergeRef Id="SetPath"/>
       </Feature>
-      <Feature Id="Bulk_Word_Document_Converter" Title="Bulk Word Document Converter" Description="The Bulk Word document converter allows you to convert one or more Word documents using converters in the system repository. Works with Word 2003, 07, 10, 13, 16, 19, or 365." Display="expand" Level="4" AllowAdvertise="no">
+      <Feature Id="Bulk_Word_Document_Converter" Title="Bulk Word Document Converter" Description="The Bulk Word document converter allows you to convert one or more Word documents using converters in the system repository. Word 2003, 07, 10, 13, 16, 19, or 365" Display="expand" Level="4" AllowAdvertise="no">
         <Condition Level="3"><![CDATA[COMPONENTEXISTS_WORD_03_PIA OR COMPONENTEXISTS_WORD_07_PIA OR COMPONENTEXISTS_WORD_10_PIA OR COMPONENTEXISTS_WORD_13_PIA]]></Condition>
         <MergeRef Id="SEC_EC"/>
         <MergeRef Id="SILConvertersForWord"/>
       </Feature>
-      <Feature Id="SILConverters_for_Office10" Title="SILConverters for Office 2010" Description="Provides SILConverter support in Publisher, Excel, and Access (as well as a few developer helps in Word). Works with x64 versions of Office 2010, 13, 16, 19, or 365." Level="4" AllowAdvertise="no">
+      <Feature Id="SILConverters_for_Office10" Title="SILConverters for Office 2010" Description="Provides SILConverter support in Publisher, Excel, Access, and Word in Office 2007, 10, 13, 16, 19, or 365 (including Regex searching and translation helper dialog)." Level="4" AllowAdvertise="no">
         <Condition Level="3"><![CDATA[(OFFICE_2010_BITNESS = "x64") AND ((COMPONENTEXISTS_WORD_10_PIA) OR (COMPONENTEXISTS_EXCEL_10_PIA) OR (ACCESS_2010_PIA_EXISTS) OR (PUBLISHER_2010_PIA_EXISTS))]]></Condition>
         <Condition Level="0"><![CDATA[NOT ((COMPONENTEXISTS_WORD_10_PIA) OR (COMPONENTEXISTS_EXCEL_10_PIA) OR (ACCESS_2010_PIA_EXISTS) OR (PUBLISHER_2010_PIA_EXISTS))]]></Condition>
         <MergeRef Id="SEC_EC"/>
         <MergeRef Id="SCOffice10"/>
+        <MergeRef Id="EcTranslators"/>
+        <MergeRef Id="SpellFixerEc"/>
         <MergeRef Id="SEC_ICU"/>
         <MergeRef Id="CRT"/>
       </Feature>
-      <Feature Id="SILConverters_for_Office13" Title="SILConverters for Office 2013" Description="Provides SILConverter support in Publisher, Excel, and Access (as well as a few developer helps in Word). Works with x64 versions of Office 2010, 13, 16, 19, or 365." Level="4" AllowAdvertise="no">
+      <Feature Id="SILConverters_for_Office13" Title="SILConverters for Office 2013" Description="Provides SILConverter support in Publisher, Excel, Access, and Word in Office 2007, 10, 13, 16, 19, or 365 (including Regex searching and translation helper dialog)." Level="4" AllowAdvertise="no">
         <Condition Level="3"><![CDATA[(OFFICE_2013_BITNESS = "x64") AND ((COMPONENTEXISTS_WORD_13_PIA) OR (COMPONENTEXISTS_EXCEL_13_PIA) OR (ACCESS_2013_PIA_EXISTS) OR (PUBLISHER_2013_PIA_EXISTS))]]></Condition>
         <Condition Level="0"><![CDATA[OFFICE_2016_BITNESS OR (NOT ((COMPONENTEXISTS_WORD_13_PIA) OR (COMPONENTEXISTS_EXCEL_13_PIA) OR (ACCESS_2013_PIA_EXISTS) OR (PUBLISHER_2013_PIA_EXISTS)))]]></Condition>
         <MergeRef Id="SEC_EC"/>
         <MergeRef Id="SCOffice13"/>
+        <MergeRef Id="EcTranslators"/>
+        <MergeRef Id="SpellFixerEc"/>
         <MergeRef Id="SEC_ICU"/>
         <MergeRef Id="CRT"/>
       </Feature>
-      <Feature Id="SILConverters_for_Office16" Title="SILConverters for Office 2016/2019/365" Description="Provides SILConverter support in Publisher, Excel, and Access (as well as a few developer helps in Word). Works with x64 versions of Office 2010, 13, 16, 19, or 365." Level="4" AllowAdvertise="no">
+      <Feature Id="SILConverters_for_Office16" Title="SILConverters for Office 2016/2019/365" Description="Provides SILConverter support in Publisher, Excel, Access, and Word in Office 2007, 10, 13, 16, 19, or 365 (including Regex searching and translation helper dialog)." Level="4" AllowAdvertise="no">
         <Condition Level="3"><![CDATA[(OFFICE_2016_BITNESS = "x64") AND ((COMPONENTEXISTS_WORD_13_PIA) OR (COMPONENTEXISTS_EXCEL_13_PIA) OR (ACCESS_2013_PIA_EXISTS) OR (PUBLISHER_2013_PIA_EXISTS))]]></Condition>
         <Condition Level="0"><![CDATA[OFFICE_2013_BITNESS OR (NOT ((COMPONENTEXISTS_WORD_13_PIA) OR (COMPONENTEXISTS_EXCEL_13_PIA) OR (ACCESS_2013_PIA_EXISTS) OR (PUBLISHER_2013_PIA_EXISTS)))]]></Condition>
         <MergeRef Id="SEC_EC"/>
         <MergeRef Id="SCOffice13"/>
+        <MergeRef Id="EcTranslators"/>
+        <MergeRef Id="SpellFixerEc"/>
         <MergeRef Id="SEC_ICU"/>
         <MergeRef Id="CRT"/>
       </Feature>
@@ -104,6 +110,8 @@
         <MergeRef Id="SEC_EC"/>
         <MergeRef Id="ParatextBackTranslationHelperPlugin"/>
         <MergeRef Id="EcTranslators"/>
+        <MergeRef Id="SpellFixerEc"/>
+        <MergeRef Id="SetPath"/>
       </Feature>
     </Feature>
     <Feature Id="Transduction_Engines" Title="Transduction Engines" Description="Expand this node to select or deselect individual transduction engines" Level="3" AllowAdvertise="no">