From 064818b6d2397a712ee0ce9cc7a3cfb1f78a4fe5 Mon Sep 17 00:00:00 2001
From: Sven Strickroth <email@cs-ware.de>
Date: Sat, 25 Mar 2017 00:38:30 +0100
Subject: [PATCH] Allow to directly set a language when installing a language
 pack

Based on TortoiseSVN rev. 27757 and 27758.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
---
 Languages/LanguagePack.wxs                         | 10 +++++++-
 src/TortoiseGit.sln                                | 28 ++++++++++++++++++++++
 .../CustomActions/CustomActions.cpp                | 15 ++++++++++--
 .../CustomActions/CustomActions.def                |  1 +
 .../CustomActions/CustomActions.vcxproj            |  1 +
 src/TortoiseProc/FirstStartWizardLanguage.cpp      |  6 ++---
 6 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/Languages/LanguagePack.wxs b/Languages/LanguagePack.wxs
index 258551983..45ffdfa6a 100644
--- a/Languages/LanguagePack.wxs
+++ b/Languages/LanguagePack.wxs
@@ -28,6 +28,8 @@
 
 	<Property Id="ALLUSERS" Secure="yes">1</Property>
 
+    <Property Id="COUNTRYID" Value="$(var.COUNTRYID)" />
+
     <?if $(var.Platform) = "x86" ?>
         <Condition Message="You are attempting to run the 32-bit installer on a 64-bit version of Windows. Please install the 64-bit version of the TortoiseGit language pack instead.">NOT Msix64</Condition>
     <?endif ?>
@@ -37,6 +39,9 @@
     </Property>
     <Condition Message="TortoiseGit is not installed. Please install TortoiseGit before installing the language pack">INSTALLDIR</Condition>
 
+    <CustomAction Id="SetLanguage" BinaryKey="CustomActionsDLL" DllEntry="SetLanguage" />
+    <Binary Id="CustomActionsDLL" SourceFile="..\bin\$(var.ReleasePath)\bin\CustomActions.dll" />
+
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='D__ProgramFilesFolder' ShortName="PFiles" Name="Program Files">
         <Directory Id='INSTALLDIR' Name='TortoiseGit'>
@@ -81,7 +86,10 @@
     <WixVariable Id="WixUIBannerBmp" Value="Banner.jpg" />
     <WixVariable Id="WixUIDialogBmp" Value="Dialog.jpg" />
 
-
+    <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Configure TortoiseGit to use this language" />
+    <UI>
+      <Publish Dialog="MyExitDialog" Control="Finish" Event="DoAction" Value="SetLanguage">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+    </UI>
 
     <InstallExecuteSequence>
       <!-- These 'Suppress' statements prevent the installer from getting
diff --git a/src/TortoiseGit.sln b/src/TortoiseGit.sln
index d5dfaeea9..c65fde42e 100644
--- a/src/TortoiseGit.sln
+++ b/src/TortoiseGit.sln
@@ -115,36 +115,43 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitBlameLang", "Tor
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_zh_CN", "..\Languages\Lang_zh_CN.wixproj", "{B0E79916-B2B5-464D-AB25-8269B0F40F4A}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_de", "..\Languages\Lang_de.wixproj", "{913B23F9-1138-4D39-947C-EDC5A59D3719}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_fr", "..\Languages\Lang_fr.wixproj", "{49B7A382-660B-4BF2-97FC-5D3D52741789}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_ru", "..\Languages\Lang_ru.wixproj", "{568C0F10-4558-4291-8698-CB9AEF819B04}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_zh_TW", "..\Languages\Lang_zh_TW.wixproj", "{4E8ACC21-A321-478F-8D55-C5440F41203F}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_pt_BR", "..\Languages\Lang_pt_BR.wixproj", "{B9C725A7-9727-48B2-86E5-F905F6C2B9E6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_es", "..\Languages\Lang_es.wixproj", "{AD35E207-3793-4A26-82A2-520D7C3C71BB}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
@@ -158,16 +165,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CrashHandler", "..\ext\Cras
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_ja", "..\Languages\Lang_ja.wixproj", "{2DA02430-FD59-4EE7-B8B1-E501FF390656}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_tr", "..\Languages\Lang_tr.wixproj", "{DD9A2398-7A47-48C4-9601-89856128AAC9}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_cs", "..\Languages\Lang_cs.wixproj", "{D83CB1C3-3DB4-4760-BBB7-618198180D5B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
@@ -175,11 +185,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitStub", "Tortoise
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_pl", "..\Languages\Lang_pl.wixproj", "{7A9B0E43-A97C-4771-BE30-1E7D128BAB52}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_sv", "..\Languages\Lang_sv.wixproj", "{1A015A9A-20FA-4E65-828A-B1BFB7190178}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
@@ -191,61 +203,73 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TGitMerge", "TGitMerge", "{
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_nl", "..\Languages\Lang_nl.wixproj", "{C3774955-ADE4-4CF0-92A2-71383C29CECE}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_bg", "..\Languages\Lang_bg.wixproj", "{3796A881-6668-41C7-88AE-005BB8DC6A8E}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_ko", "..\Languages\Lang_ko.wixproj", "{CE012F99-AA82-462C-8F7C-F8A946EAF4AE}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_ro", "..\Languages\Lang_ro.wixproj", "{701B5859-6F9D-451F-B30F-B9CBDBAB4C74}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_it", "..\Languages\Lang_it.wixproj", "{BDBF2BDF-5215-40CB-A06D-877833787A8D}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_pt_PT", "..\Languages\Lang_pt_PT.wixproj", "{6E1E2566-FAD3-4D07-9D81-7EEF112AF495}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_hu", "..\Languages\Lang_hu.wixproj", "{5DA76789-4B2A-45D1-8E3A-81253245C71E}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_sr-latin", "..\Languages\Lang_sr-latin.wixproj", "{7F23743B-E9E6-4DDB-97DE-74A889176808}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_ca", "..\Languages\Lang_ca.wixproj", "{9A0C8658-7F12-4C71-8BBE-CCF9C23B2EAA}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_vi", "..\Languages\Lang_vi.wixproj", "{9A6767C9-DA46-4B6C-B899-4F0DEFBA181B}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_id", "..\Languages\Lang_id.wixproj", "{925C4E4C-D427-4051-86AE-A5B1149AACB3}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_sk", "..\Languages\Lang_sk.wixproj", "{A67687EC-297B-4FDD-8240-F4C64D9A8FB6}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
@@ -263,6 +287,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoiseGitUDiffLang", "Tor
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_uk", "..\Languages\Lang_uk.wixproj", "{7111D39D-2E5B-4F1A-9F81-6438EBBBEF07}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
@@ -270,16 +295,19 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TortoisePot", "..\Languages
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_fi", "..\Languages\Lang_fi.wixproj", "{4236AEBE-79DF-40AD-8243-8228935F243D}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_da", "..\Languages\Lang_da.wixproj", "{46132EB4-193D-43F1-8702-A1B49B7CC404}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Lang_fa", "..\Languages\Lang_fa.wixproj", "{FAF866CE-31FE-44BA-9B2B-9A6FA85778A0}"
 	ProjectSection(ProjectDependencies) = postProject
+		{454D5FCC-E25A-4B45-9CA2-01ABB0FA5181} = {454D5FCC-E25A-4B45-9CA2-01ABB0FA5181}
 		{EC88E7EC-3074-4841-BA45-B938D098EFF6} = {EC88E7EC-3074-4841-BA45-B938D098EFF6}
 	EndProjectSection
 EndProject
diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.cpp b/src/TortoiseGitSetup/CustomActions/CustomActions.cpp
index cdb18d09c..2b469c941 100644
--- a/src/TortoiseGitSetup/CustomActions/CustomActions.cpp
+++ b/src/TortoiseGitSetup/CustomActions/CustomActions.cpp
@@ -1,7 +1,7 @@
 // TortoiseGit - a Windows shell extension for easy version control
 
-// Copyright (C) 2011, 2012, 2015-2016 - TortoiseGit
-// Copyright (C) 2003-2008, 2012 - TortoiseSVN
+// Copyright (C) 2011, 2012, 2015-2017 - TortoiseGit
+// Copyright (C) 2003-2008, 2012, 2017 - TortoiseSVN
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -70,6 +70,17 @@ UINT __stdcall OpenDonatePage(MSIHANDLE /*hModule*/)
 	return ERROR_SUCCESS;
 }
 
+UINT __stdcall SetLanguage(MSIHANDLE hModule)
+{
+	wchar_t codebuf[30] = { 0 };
+	DWORD count = _countof(codebuf);
+	if (MsiGetProperty(hModule, L"COUNTRYID", codebuf, &count))
+		return ERROR_SUCCESS;
+	DWORD lang = _wtol(codebuf);
+	SHRegSetUSValue(L"Software\\TortoiseGit", L"LanguageID", REG_DWORD, &lang, sizeof(DWORD), SHREGSET_FORCE_HKCU);
+	return ERROR_SUCCESS;
+}
+
 UINT __stdcall RestartExplorer(MSIHANDLE /*hModule*/)
 {
 	HMODULE hModule = nullptr;
diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.def b/src/TortoiseGitSetup/CustomActions/CustomActions.def
index f4d764a0e..f7610aa61 100644
--- a/src/TortoiseGitSetup/CustomActions/CustomActions.def
+++ b/src/TortoiseGitSetup/CustomActions/CustomActions.def
@@ -6,4 +6,5 @@ LIBRARY    "CustomActions"
 EXPORTS
     TerminateCache
     OpenDonatePage
+    SetLanguage
 	RestartExplorer
diff --git a/src/TortoiseGitSetup/CustomActions/CustomActions.vcxproj b/src/TortoiseGitSetup/CustomActions/CustomActions.vcxproj
index 188dc274c..893589d8c 100644
--- a/src/TortoiseGitSetup/CustomActions/CustomActions.vcxproj
+++ b/src/TortoiseGitSetup/CustomActions/CustomActions.vcxproj
@@ -34,6 +34,7 @@
     <Link>
       <ModuleDefinitionFile>CustomActions.def</ModuleDefinitionFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
+      <AdditionalDependencies>Msi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
diff --git a/src/TortoiseProc/FirstStartWizardLanguage.cpp b/src/TortoiseProc/FirstStartWizardLanguage.cpp
index 13f53ab75..c4b4bc069 100644
--- a/src/TortoiseProc/FirstStartWizardLanguage.cpp
+++ b/src/TortoiseProc/FirstStartWizardLanguage.cpp
@@ -1,6 +1,6 @@
 // TortoiseGit - a Windows shell extension for easy version control
 
-// Copyright (C) 2016 - TortoiseGit
+// Copyright (C) 2016-2017 - TortoiseGit
 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
@@ -76,8 +76,6 @@ BOOL CFirstStartWizardLanguage::OnInitDialog()
 	AppendStringResource(hinttext, IDS_FIRSTSTART_LANGUAGEHINT3);
 	GetDlgItem(IDC_FIRSTSTART_HINT)->SetWindowText(hinttext);
 
-	m_dwLanguage = m_regLanguage;
-
 	GetDlgItem(IDC_LINK)->SetWindowText(DOWNLOAD_URL);
 	m_link.SetURL(DOWNLOAD_URL);
 	AdjustControlSize(IDC_LINK, false);
@@ -179,6 +177,8 @@ void CFirstStartWizardLanguage::OnBnClickedRefresh()
 		}
 	}
 
+	m_regLanguage.read();
+	m_dwLanguage = m_regLanguage;
 	for (int i = 0; i < m_LanguageCombo.GetCount(); ++i)
 	{
 		if (m_LanguageCombo.GetItemData(i) == m_dwLanguage)
-- 
2.11.4.GIT