From 10cd1d194c0d98e7ed537732b4d33a3e23e58699 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <moritz@bunkus.org>
Date: Thu, 6 May 2010 23:05:19 +0200
Subject: [PATCH] Added language choice for the installer itself

Patch by Serj (see AUTHORS) with fixes by myself.
---
 ChangeLog                        |  8 +++++++-
 installer/mkvtoolnix-unicode.nsi | 21 ++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83d5ceeb2..2531a6c50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-06  Moritz Bunkus  <moritz@bunkus.org>
+
+	* Windows installer: Added the choice to run the installer in the
+	same languages that the GUIs support. Patch by Serj (see AUTHORS)
+	with modifications by myself.
+
 2010-04-27  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: bug fix: Fixed the handling of non-spec compliant
@@ -6,7 +12,7 @@
 
 2010-04-23  Moritz Bunkus  <moritz@bunkus.org>
 
-	* all: Added a translation into Russian by rusguy6 (see AUTHORS).
+	* all: Added a translation into Russian by Serj (see AUTHORS).
 
 2010-04-19  Moritz Bunkus  <moritz@bunkus.org>
 
diff --git a/installer/mkvtoolnix-unicode.nsi b/installer/mkvtoolnix-unicode.nsi
index 2005c186d..60277c51f 100644
--- a/installer/mkvtoolnix-unicode.nsi
+++ b/installer/mkvtoolnix-unicode.nsi
@@ -19,9 +19,9 @@ SetCompressor /SOLID lzma
 !define MUI_ICON "matroskalogo_big.ico"
 
 # Language Selection Dialog Settings
-!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
-!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
-!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"
+!define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
+!define MUI_LANGDLL_REGISTRY_KEY "${MTX_REGKEY}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
 
 # Settings for the start menu group page
 var ICONS_GROUP
@@ -36,6 +36,9 @@ var ICONS_GROUP
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
 !insertmacro MUI_PAGE_INSTFILES
+
+!define MUI_FINISHPAGE_NOREBOOTSUPPORT
+
 !insertmacro MUI_PAGE_FINISH
 
 # Uninstaller pages
@@ -43,6 +46,14 @@ var ICONS_GROUP
 
 # Language files
 !insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "German"
+!insertmacro MUI_LANGUAGE "Japanese"
+!insertmacro MUI_LANGUAGE "Russian"
+!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "TradChinese"
+!define MUI_LANGDLL_ALLLANGUAGES
+
+!insertmacro MUI_RESERVEFILE_LANGDLL
 
 # MUI end ------
 
@@ -58,7 +69,11 @@ InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
 
+RequestExecutionLevel admin
+
 Function .onInit
+  !insertmacro MUI_LANGDLL_DISPLAY
+
   # Check if we're running on a Unicode capable Windows.
   # If not, abort.
   ${IfNot} ${AtLeastWinNT4}