From 2d250282ee08abcdd4b1d35d7aa1359162ff2a07 Mon Sep 17 00:00:00 2001
From: David Sparer <sparerd@gmail.com>
Date: Sun, 15 May 2016 13:09:19 -0600
Subject: [PATCH] Added localization files for the languages we will be able to
 have translated the soonest

---
 Installer/Includes/Config.wxi     |  5 +++++
 Installer/Installer.wixproj       | 18 ++++++++++++++++--
 Installer/Localizations/cs-CZ.wxl | 23 +++++++++++++++++++++++
 Installer/Localizations/de-DE.wxl | 21 ++++++++++++++++++++-
 Installer/Localizations/en-us.wxl | 23 +++++++++++++++++++++--
 Installer/Localizations/ja-JP.wxl | 23 +++++++++++++++++++++++
 Installer/Localizations/ru-RU.wxl | 23 +++++++++++++++++++++++
 Installer/mRemoteNGV1.wxs         | 12 ++++++------
 8 files changed, 137 insertions(+), 11 deletions(-)
 create mode 100644 Installer/Localizations/cs-CZ.wxl
 create mode 100644 Installer/Localizations/ja-JP.wxl
 create mode 100644 Installer/Localizations/ru-RU.wxl

diff --git a/Installer/Includes/Config.wxi b/Installer/Includes/Config.wxi
index 4451a537e..bad8cab4c 100644
--- a/Installer/Includes/Config.wxi
+++ b/Installer/Includes/Config.wxi
@@ -11,6 +11,11 @@
   <?define ProductLanguage = 1033 ?>
   <?define ExeProcessName = "$(var.ProductName).exe" ?>
   
+  <?define RequiredDotNetFrameworkMajorVersion = "4" ?>
+  <?define RequiredDotNetFrameworkMinorVersion = "0" ?>
+  <?define RequiredDotNetFrameworkServicePackLevel = "" ?>
+  <?define RequiredDotNetFrameworkVersion = "$(var.RequiredDotNetFrameworkMajorVersion).$(var.RequiredDotNetFrameworkMinorVersion)" ?>
+  
   <?if $(var.Platform) = x64 ?>
     <?define ProductNameWithPlatform = "$(var.ProductName) (64 bit)" ?>
     <?define Win64 = "yes" ?>
diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
index 863bb67e6..a964daa88 100644
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@@ -65,8 +65,21 @@
     <Folder Include="Resources" />
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Localizations\ru-RU.wxl" />
+    <EmbeddedResource Include="Localizations\ja-JP.wxl" />
+    <EmbeddedResource Include="Localizations\cs-CZ.wxl" />
     <EmbeddedResource Include="Localizations\de-DE.wxl" />
-    <EmbeddedResource Include="Localizations\en-us.wxl" />
+    <EmbeddedResource Include="Localizations\en-US.wxl" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
@@ -78,7 +91,8 @@
   <Target Name="AfterBuild">
   </Target>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <LinkerAdditionalOptions>-ext WixUIExtension</LinkerAdditionalOptions>
+    <LinkerAdditionalOptions>
+    </LinkerAdditionalOptions>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>REM Harvest bin directory of the mRemoteV1 project
diff --git a/Installer/Localizations/cs-CZ.wxl b/Installer/Localizations/cs-CZ.wxl
new file mode 100644
index 000000000..437d03091
--- /dev/null
+++ b/Installer/Localizations/cs-CZ.wxl
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="cs-CZ" Language="1029" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  
+  <!-- Install Conditions -->
+  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
+  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
+  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
+  
+  <!-- Directories and File names -->
+  <String Id="Folders_Desktop">Desktop</String>
+  <String Id="File_Credits">Credits</String>
+  <String Id="File_License">License</String>
+  <String Id="File_VersionHistory">Version History</String>
+  
+  <!-- Features and install options -->
+  <String Id="Feature_Complete">Complete</String>
+  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
+  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
+  
+  <!-- GUI Page Text -->
+  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
+  
+</WixLocalization>
\ No newline at end of file
diff --git a/Installer/Localizations/de-DE.wxl b/Installer/Localizations/de-DE.wxl
index a25d4b6b3..c37fdc48c 100644
--- a/Installer/Localizations/de-DE.wxl
+++ b/Installer/Localizations/de-DE.wxl
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WixLocalization Culture="de-DE" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+<WixLocalization Culture="de-DE" Language="1031" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  
+  <!-- Install Conditions -->
+  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
+  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
+  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
+
+  <!-- Directories and File names -->
+  <String Id="Folders_Desktop">Desktop</String>
+  <String Id="File_Credits">Credits</String>
+  <String Id="File_License">License</String>
+  <String Id="File_VersionHistory">Version History</String>
+
+  <!-- Features and install options -->
+  <String Id="Feature_Complete">Complete</String>
+  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
+  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
+
+  <!-- GUI Page Text -->
   <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
index c6ca399a3..1feb4a241 100644
--- a/Installer/Localizations/en-us.wxl
+++ b/Installer/Localizations/en-us.wxl
@@ -1,4 +1,23 @@
 <?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 Culture="en-US" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  
+  <!-- Install Conditions -->
+  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
+  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
+  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
+  
+  <!-- Directories and File names -->
+  <String Id="Folders_Desktop">Desktop</String>
+  <String Id="File_Credits">Credits</String>
+  <String Id="File_License">License</String>
+  <String Id="File_VersionHistory">Version History</String>
+  
+  <!-- Features and install options -->
+  <String Id="Feature_Complete">Complete</String>
+  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
+  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
+  
+  <!-- GUI Page Text -->
+  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
+  
 </WixLocalization>
\ No newline at end of file
diff --git a/Installer/Localizations/ja-JP.wxl b/Installer/Localizations/ja-JP.wxl
new file mode 100644
index 000000000..bd28e07b4
--- /dev/null
+++ b/Installer/Localizations/ja-JP.wxl
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="ja-JP" Language="1041" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  
+  <!-- Install Conditions -->
+  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
+  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
+  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
+  
+  <!-- Directories and File names -->
+  <String Id="Folders_Desktop">Desktop</String>
+  <String Id="File_Credits">Credits</String>
+  <String Id="File_License">License</String>
+  <String Id="File_VersionHistory">Version History</String>
+  
+  <!-- Features and install options -->
+  <String Id="Feature_Complete">Complete</String>
+  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
+  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
+  
+  <!-- GUI Page Text -->
+  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
+  
+</WixLocalization>
\ No newline at end of file
diff --git a/Installer/Localizations/ru-RU.wxl b/Installer/Localizations/ru-RU.wxl
new file mode 100644
index 000000000..9071a7a0d
--- /dev/null
+++ b/Installer/Localizations/ru-RU.wxl
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="ru-RU" Language="1049" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+  
+  <!-- Install Conditions -->
+  <String Id="Upgrade_NewerVersionInstalled" Overridable="yes">A newer version of [ProductName] is already installed.</String>
+  <String Id="Install_NeedToBeAdminToInstall">You need to be an administrator to install this product.</String>
+  <String Id="Install_NeedDotNetFrameworkVersion">mRemoteNG requires Microsoft .NET Framework $(var.RequiredDotNetFrameworkVersion).</String>
+  
+  <!-- Directories and File names -->
+  <String Id="Folders_Desktop">Desktop</String>
+  <String Id="File_Credits">Credits</String>
+  <String Id="File_License">License</String>
+  <String Id="File_VersionHistory">Version History</String>
+  
+  <!-- Features and install options -->
+  <String Id="Feature_Complete">Complete</String>
+  <String Id="Feature_DesktopShortcut">Desktop Shortcut</String>
+  <String Id="Feature_StartMenuShortcut">Start menu shortcut</String>
+  
+  <!-- GUI Page Text -->
+  <String Id="FinishPage_LaunchMremoteNow" Overridable="yes">Launch [ProductName] Now</String>
+  
+</WixLocalization>
\ No newline at end of file
diff --git a/Installer/mRemoteNGV1.wxs b/Installer/mRemoteNGV1.wxs
index 450ef6140..968119345 100644
--- a/Installer/mRemoteNGV1.wxs
+++ b/Installer/mRemoteNGV1.wxs
@@ -6,13 +6,13 @@
            UpgradeCode="$(var.UpgradeCode)" 
            Language="$(var.ProductLanguage)">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MajorUpgrade DowngradeErrorMessage="!(loc.Upgrade_NewerVersionInstalled)" />
     <MediaTemplate EmbedCab="yes" />
     <Property Id="ARPPRODUCTICON" Value="mRemoteNG.ico" />
     <Property Id="ARPHELPLINK" Value="http://www.mremoteng.org" />
     <Property Id="MAINEXE" Value="$(var.ExeProcessName)" />
     <Property Id="APPLICATIONROOTDIRECTORY">
-      <RegistrySearch Id='AcmeFoobarRegistry' Type='raw' Root='HKLM' Key='Software\mRemoteNG' Name='InstallDir' />
+      <RegistrySearch Id='mRemoteNGRegistry' Type='raw' Root='HKLM' Key='Software\mRemoteNG' Name='InstallDir' />
     </Property>
     <Icon Id="mRemoteNG.ico" SourceFile="Resources\mRemoteNG.ico" />
     
@@ -22,14 +22,14 @@
         <Directory Id="APPLICATIONROOTDIRECTORY" Name="$(var.ProductName)" />
       </Directory>
       
-      <Directory Id="DesktopFolder" Name="Desktop" />
+      <Directory Id="DesktopFolder" Name="!(loc.Folders_Desktop)" />
       
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="$(var.ProductName)"/>
       </Directory>
     </Directory>
 
-    <Feature Id="F.Complete" Title="Complete" Display="expand" AllowAdvertise="no" Level="1">
+    <Feature Id="F.Complete" Title="!(loc.Feature_Complete)" Display="expand" AllowAdvertise="no" Level="1">
       <Feature Id="F.MinimalFeature" Title="$(var.ProductName)" Absent="disallow" ConfigurableDirectory="APPLICATIONROOTDIRECTORY" Level="1">
         <ComponentGroupRef Id="MandatoryComponents" Primary="yes" />
         <ComponentGroupRef Id="CG.ProjectInfoFiles" Primary="yes" />
@@ -39,11 +39,11 @@
         <ComponentRef Id="C.PuttyNGFile" Primary="yes" />
       </Feature>
 
-      <Feature Id="F.DesktopShortcut" Title="Desktop Shortcut" Absent="allow" AllowAdvertise="no" Level="1">
+      <Feature Id="F.DesktopShortcut" Title="!(loc.Feature_DesktopShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
         <ComponentRef Id="C.DesktopShortcut" Primary="yes" />
       </Feature>
 
-      <Feature Id="F.ApplicationStartMenuShortcut" Title="Start menu shortcut" Absent="allow" AllowAdvertise="no" Level="1">
+      <Feature Id="F.ApplicationStartMenuShortcut" Title="!(loc.Feature_StartMenuShortcut)" Absent="allow" AllowAdvertise="no" Level="1">
         <ComponentRef Id="C.ApplicationStartMenuShortcut" Primary="yes" />
       </Feature>
     </Feature>