From 41ab8033e7c3d1eb0b653bd79c6451a2bca33dd5 Mon Sep 17 00:00:00 2001
From: David Sparer <sparerd@gmail.com>
Date: Sun, 15 May 2016 07:52:14 -0600
Subject: [PATCH] began the slow process of supporting localizations

---
 Installer/Installer.wixproj       | 9 ++++-----
 Installer/Localizations/de-DE.wxl | 4 ++++
 Installer/Localizations/en-us.wxl | 4 ++++
 Installer/mRemoteNGV1.wxs         | 1 -
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 Installer/Localizations/de-DE.wxl
 create mode 100644 Installer/Localizations/en-us.wxl

diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
index 854aee1c2..863bb67e6 100644
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@@ -59,12 +59,15 @@
     <Folder Include="Fragments" />
     <Folder Include="Includes" />
     <Folder Include="Localizations" />
-    <Folder Include="Localizations\en-us" />
     <Folder Include="Filters" />
     <Folder Include="bin" />
     <Folder Include="Dependencies" />
     <Folder Include="Resources" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Localizations\de-DE.wxl" />
+    <EmbeddedResource Include="Localizations\en-us.wxl" />
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
@@ -73,10 +76,6 @@
   <Target Name="BeforeBuild">
   </Target>
   <Target Name="AfterBuild">
-    <CallTarget Targets="CopyToDeploy" />
-  </Target>
-  <Target Name="CopyToDeploy" Condition="'$(Configuration)' == 'Release'">
-    <Copy SourceFiles="$(OutputPath)$(OutputName).msi" DestinationFiles="..\Deploy\Setup\$(OutputName) $(AssemblyFileVersion)_$(Platform).msi" />
   </Target>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <LinkerAdditionalOptions>-ext WixUIExtension</LinkerAdditionalOptions>
diff --git a/Installer/Localizations/de-DE.wxl b/Installer/Localizations/de-DE.wxl
new file mode 100644
index 000000000..a25d4b6b3
--- /dev/null
+++ b/Installer/Localizations/de-DE.wxl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="de-DE" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">mRemoteNG jetzt Starten</String>
+</WixLocalization>
\ No newline at end of file
diff --git a/Installer/Localizations/en-us.wxl b/Installer/Localizations/en-us.wxl
new file mode 100644
index 000000000..c6ca399a3
--- /dev/null
+++ b/Installer/Localizations/en-us.wxl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+	<String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch mRemoteNG Now</String>
+</WixLocalization>
\ No newline at end of file
diff --git a/Installer/mRemoteNGV1.wxs b/Installer/mRemoteNGV1.wxs
index d2d1f705c..450ef6140 100644
--- a/Installer/mRemoteNGV1.wxs
+++ b/Installer/mRemoteNGV1.wxs
@@ -50,7 +50,6 @@
 
     
     <UIRef Id="WixUI_FeatureTree"/>
-    <UIRef Id="WixUI_ErrorProgressText" />
     <WixVariable Id="WixUILicenseRtf" Value="Resources\License.rtf" />
     <WixVariable Id="WixUIDialogBmp" Value="Resources\welcome.bmp" />
     <WixVariable Id="WixUIBannerBmp" Value="Resources\header.bmp" />