From 592a6f05b25bf616da6913992387ef6303208bcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20K=C3=BCpper?= <florian.kuepper@gmail.com>
Date: Mon, 5 Aug 2013 11:56:22 +0200
Subject: [PATCH] Added some language-strings.

---
 Installer/Languages/English.nsh |  8 ++++++--
 Installer/Languages/German.nsh  |  8 ++++++--
 Installer/installer.nsi         | 17 ++++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Installer/Languages/English.nsh b/Installer/Languages/English.nsh
index caa4dcdf..108a175b 100644
--- a/Installer/Languages/English.nsh
+++ b/Installer/Languages/English.nsh
@@ -1,7 +1,11 @@
   LangString DESC_main ${LANG_ENGLISH} "Main vocaluxe-files."
   LangString DESC_bg_videos ${LANG_ENGLISH} "Additional background-videos for ambient-theme."
-  LangString DESC_directx ${LANG_ENGLISH} "Installs DirectX. This is recommed for vocaluxe."
   LangString TITLE_main ${LANG_ENGLISH} "Main"
   LangString TITLE_bg_videos ${LANG_ENGLISH} "Background-videos"
-  LangString TITLE_directx ${LANG_ENGLISH} "DirectX"
   LangString FINISH_text ${LANG_ENGLISH} "Visit our site for the latest news, FAQ's and support."
+  LangString LOG_dx_setup_start ${LANG_ENGLISH} "DirectX setup starts..."
+  LangString LOG_dx_setup_finish ${LANG_ENGLISH} "DirectX setup finished."
+  LangString LOG_net_setup_start ${LANG_ENGLISH} ".NET4 setup starts..."
+  LangString LOG_net_setup_finish ${LANG_ENGLISH} ".NET4 setup finished."
+  LangString LOG_vc_setup_start ${LANG_ENGLISH} "VC++ 2012 setup starts..."
+  LangString LOG_vc_setup_finish ${LANG_ENGLISH} "VC++ 2012 setup finished."
diff --git a/Installer/Languages/German.nsh b/Installer/Languages/German.nsh
index 6149302f..cd240c39 100644
--- a/Installer/Languages/German.nsh
+++ b/Installer/Languages/German.nsh
@@ -1,7 +1,11 @@
 LangString DESC_main ${LANG_GERMAN} "Vocaluxe-Dateien."
 LangString DESC_bg_videos ${LANG_GERMAN} "Zusätzliche Hintergrund-Videos für das Ambient-Theme."
-LangString DESC_directx ${LANG_GERMAN} "Führt eine DirectX-Installation aus. DirectX wird für Vocaluxe empfohlen."
 LangString TITLE_main ${LANG_GERMAN} "Hauptprogramm"
 LangString TITLE_bg_videos ${LANG_GERMAN} "Hintergrundvideos"
-LangString TITLE_directx ${LANG_GERMAN} "DirectX"
 LangString FINISH_text ${LANG_GERMAN} "Besuch unsere Homepage für Neuigkeiten, Hilfe und FAQs."
+LangString LOG_dx_setup_start ${LANG_GERMAN} "Installation von DirectX wird gestartet..."
+LangString LOG_dx_setup_finish ${LANG_GERMAN} "Installation von DirectX wurde beendet."
+LangString LOG_net_setup_start ${LANG_GERMAN} "Installation von .NET4 wird gestartet..."
+LangString LOG_net_setup_finish ${LANG_GERMAN} "Installation von .NET wurde beendet."
+LangString LOG_vc_setup_start ${LANG_GERMAN} "Installation von VC++ 2012 wird gestartet..."
+LangString LOG_vc_setup_finish ${LANG_GERMAN} "Installation von VC++ 2012 wurde beendet."
diff --git a/Installer/installer.nsi b/Installer/installer.nsi
index f623cce7..8a492ad1 100644
--- a/Installer/installer.nsi
+++ b/Installer/installer.nsi
@@ -119,9 +119,9 @@ Section $(TITLE_MAIN) SecMain
   ${If} $1 < 9
     SetOutPath "$TEMP"
     File "Requirements\dxwebsetup.exe"
-    DetailPrint "Running DirectX Setup..."
+    DetailPrint $(LOG_dx_setup_start)
     ExecWait '"$TEMP\dxwebsetup.exe" /Q' $DirectXSetupError
-    DetailPrint "Finished DirectX Setup"
+    DetailPrint $(LOG_dx_setup_finish)
  
     Delete "$TEMP\dxwebsetup.exe"
  
@@ -132,9 +132,9 @@ Section $(TITLE_MAIN) SecMain
   ${IfNot} ${HasDotNet4.0}
     SetOutPath "$TEMP"
     File "Requirements\dotNetFx40_Full_setup.exe"
-    DetailPrint "Running .NET4 Setup..."
+    DetailPrint $(LOG_net_setup_start)
     ExecWait '"$TEMP\dotNetFx40_Full_setup.exe" /Q' $NetSetupError
-    DetailPrint "Finished .NET4 Setup"
+    DetailPrint $(LOG_net_setup_finish)
  
     Delete "$TEMP\dotNetFx40_Full_setup.exe"
  
@@ -144,16 +144,16 @@ Section $(TITLE_MAIN) SecMain
   SetOutPath "$TEMP"
   ${If} ${RunningX64}
     File "Requirements\vcredist_x64.exe"
-    DetailPrint "Running VC++ 2012 Redistributable Setup..."
+    DetailPrint $(LOG_vc_setup_start)
     ExecWait '"$TEMP\vcredist_x64.exe" /Q /norestart' $VCSetupError
-    DetailPrint "Finished VC++ 2012 Redistributable Setup"
+    DetailPrint $(LOG_vc_setup_finish)
  
     Delete "$TEMP\vcredist_x64.exe"
   ${Else}
     File "Requirements\vcredist_x86.exe"
-    DetailPrint "Running VC++ 2012 Redistributable Setup..."
+    DetailPrint $(LOG_vc_setup_start)
     ExecWait '"$TEMP\vcredist_x86.exe" /Q /norestart' $VCSetupError
-    DetailPrint "Finished VC++ 2012 Redistributable Setup"
+    DetailPrint $(LOG_vc_setup_finish)
  
     Delete "$TEMP\vcredist_x86.exe"  
   ${EndIf}
@@ -223,7 +223,6 @@ FunctionEnd
   !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
     !insertmacro MUI_DESCRIPTION_TEXT ${SecMain} $(DESC_main)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecVideos} $(DESC_bg_videos)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecDirectX} $(DESC_directx)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END