Activate Russian l10n in NSIS installer

[vlc] / extras / package / win32 / vlc.win32.nsi.in

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 60d6f2338805e5df9ab3bac1c4a4ec7814e95b1d..e787a5a3090c853c6742f53fe8ab2bf2ca6cef0f 100644 (file)
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -20,8 +20,8 @@
 !define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_DIR_REGKEY}"
 !define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
 
-@BUILD_ACTIVEX_TRUE@ !define INSTALL_ACTIVEX
-@BUILD_MOZILLA_TRUE@ !define INSTALL_MOZILLA
+@HAVE_WIN64_FALSE@ !define INSTALL_ACTIVEX
+@HAVE_WIN64_FALSE@ !define INSTALL_MOZILLA
 
 @FILE_LIBVLCCORE_DLL@
 @FILE_LIBVLC_DLL@
@@ -32,7 +32,7 @@
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
 OutFile ..\vlc-${VERSION}-win32.exe
-InstallDir "$PROGRAMFILES\VideoLAN\VLC"
+InstallDir "$@PROGRAMFILES@\VideoLAN\VLC"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 !ifdef NSIS_LZMA_COMPRESS_WHOLE
 SetCompressor lzma
@@ -72,6 +72,7 @@ RequestExecutionLevel user
     !insertmacro MUI_PAGE_WELCOME
   ; License page
     !define MUI_LICENSEPAGE_BUTTON $(^NextBtn)
+    !define MUI_LICENSEPAGE_TEXT_BOTTOM $License_NextText
     !insertmacro MUI_PAGE_LICENSE "COPYING.txt"
   ; Components page
     !insertmacro MUI_PAGE_COMPONENTS
@@ -127,12 +128,14 @@ RequestExecutionLevel user
   !insertmacro MUI_LANGUAGE "Polish"
   !insertmacro MUI_LANGUAGE "Romanian"
   !insertmacro MUI_LANGUAGE "Slovak"
+  !insertmacro MUI_LANGUAGE "Serbian"
   !insertmacro MUI_LANGUAGE "Czech"
   !insertmacro MUI_LANGUAGE "Hungarian"
   !insertmacro MUI_LANGUAGE "Catalan"
   !insertmacro MUI_LANGUAGE "Bulgarian"
   !insertmacro MUI_LANGUAGE "Estonian"
   !insertmacro MUI_LANGUAGE "Lithuanian"
+  !insertmacro MUI_LANGUAGE "Basque"
 
 ; Reserve files for solid compression
   !insertmacro MUI_RESERVEFILE_LANGDLL
@@ -269,6 +272,7 @@ FunctionEnd
   !insertmacro ${_action} ".amr"
   !insertmacro ${_action} ".aob"
   !insertmacro ${_action} ".ape"
+  !insertmacro ${_action} ".caf"
   !insertmacro ${_action} ".cda"
   !insertmacro ${_action} ".dts"
   !insertmacro ${_action} ".flac"
@@ -310,6 +314,7 @@ FunctionEnd
   !insertmacro ${_action} ".avi"
   !insertmacro ${_action} ".divx"
   !insertmacro ${_action} ".dv"
+  !insertmacro ${_action} ".f4v"
   !insertmacro ${_action} ".flv"
   !insertmacro ${_action} ".gxf"
   !insertmacro ${_action} ".m1v"
@@ -332,6 +337,7 @@ FunctionEnd
   !insertmacro ${_action} ".mpg"
   !insertmacro ${_action} ".mpv2"
   !insertmacro ${_action} ".mts"
+  !insertmacro ${_action} ".mtv"
   !insertmacro ${_action} ".mxf"
   !insertmacro ${_action} ".nsv"
   !insertmacro ${_action} ".nuv"
@@ -339,7 +345,6 @@ FunctionEnd
   !insertmacro ${_action} ".ogm"
   !insertmacro ${_action} ".ogx"
   !insertmacro ${_action} ".ogv"
-  !insertmacro ${_action} ".ps"
   !insertmacro ${_action} ".rec"
   !insertmacro ${_action} ".rm"
   !insertmacro ${_action} ".rmvb"
@@ -528,7 +533,6 @@ Section $Name_Section01 SEC01
   !insertmacro InstallFolder locale
 @BUILD_OSDMENU_TRUE@ !insertmacro InstallFolder osdmenu
 @BUILD_SKINS_TRUE@   !insertmacro InstallFolder skins
-@BUILD_HTTPD_TRUE@   !insertmacro InstallFolder http
 @BUILD_LUA_TRUE@     !insertmacro InstallFolder lua
 
   ; Generate the cache and add it to uninstall.log
@@ -608,8 +612,8 @@ Section /o $Name_Section03 SEC03
 
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
-  !insertmacro InstallFile mozilla\npvlc.dll
-  !insertmacro InstallFile mozilla\npvlc.dll.manifest
+  !insertmacro InstallFile npvlc.dll
+  !insertmacro InstallFile npvlc.dll.manifest
   !insertmacro CloseUninstallLog
 
   !define Moz "SOFTWARE\MozillaPlugins\@videolan.org/vlc,version=${VERSION}"
@@ -627,8 +631,8 @@ Section $Name_Section04 SEC04
 
   SetOutPath "$INSTDIR"
   !insertmacro OpenUninstallLog
-  !insertmacro InstallFile activex\axvlc.dll
-  !insertmacro InstallFile activex\axvlc.dll.manifest
+  !insertmacro InstallFile axvlc.dll
+  !insertmacro InstallFile axvlc.dll.manifest
   !insertmacro CloseUninstallLog
   RegDLL "$INSTDIR\axvlc.dll"
 SectionEnd
@@ -639,10 +643,10 @@ Section $Name_Section05 SEC05
   SectionIn 1 2 3
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC" "" $ContextMenuEntry_PlayWith
   WriteRegStr HKCR "AudioCD\shell\PlayWithVLC\command" "" \
-    '"$INSTDIR\vlc.exe" --started-from-file cdda://%1'
+    '"$INSTDIR\vlc.exe" --started-from-file cdda:///%1'
   WriteRegStr HKCR "DVD\shell\PlayWithVLC" "" $ContextMenuEntry_PlayWith
   WriteRegStr HKCR "DVD\shell\PlayWithVLC\command" "" \
-    '"$INSTDIR\vlc.exe" --started-from-file dvd://%1'
+    '"$INSTDIR\vlc.exe" --started-from-file dvd:///%1'
 
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlers\PlayDVDMovieOnArrival" "VLCPlayDVDMovieOnArrival" ""
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\Handlers\VLCPlayDVDMovieOnArrival" "Action" $Action_OnArrivalDVD
@@ -696,25 +700,25 @@ Section $Name_Section05 SEC05
   WriteRegStr HKCR "VLC.DVDMovie" "" "VLC DVD Movie"
   WriteRegStr HKCR "VLC.DVDMovie\shell" "" "Open"
   WriteRegStr HKCR "VLC.DVDMovie\shell\Open\command" "" \
-    '"$INSTDIR\vlc.exe" --started-from-file dvd://%1'
+    '"$INSTDIR\vlc.exe" --started-from-file dvd:///%1'
   WriteRegStr HKCR "VLC.DVDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 
   WriteRegStr HKCR "VLC.CDAudio" "" "VLC CD Audio"
   WriteRegStr HKCR "VLC.CDAudio\shell" "" "Open"
   WriteRegStr HKCR "VLC.CDAudio\shell\Open\command" "" \
-    '"$INSTDIR\vlc.exe" --started-from-file cdda://%1'
+    '"$INSTDIR\vlc.exe" --started-from-file cdda:///%1'
   WriteRegStr HKCR "VLC.CDAudio\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 
   WriteRegStr HKCR "VLC.VCDMovie" "" "VLC VCD Movie"
   WriteRegStr HKCR "VLC.VCDMovie\shell" "" "Open"
   WriteRegStr HKCR "VLC.VCDMovie\shell\Open\command" "" \
-     '"$INSTDIR\vlc.exe" --started-from-file vcd://%1'
+     '"$INSTDIR\vlc.exe" --started-from-file vcd:///%1'
   WriteRegStr HKCR "VLC.VCDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 
   WriteRegStr HKCR "VLC.SVCDMovie" "" "VLC SVCD Movie"
   WriteRegStr HKCR "VLC.SVCDMovie\shell" "" "Open"
   WriteRegStr HKCR "VLC.SVCDMovie\shell\Open\command" "" \
-     '"$INSTDIR\vlc.exe" --started-from-file vcd://%1'
+     '"$INSTDIR\vlc.exe" --started-from-file vcd:///%1'
   WriteRegStr HKCR "VLC.SVCDMovie\DefaultIcon" "" '"$INSTDIR\vlc.exe",0'
 
   WriteRegStr HKCR "VLC.OPENFolder" "" "VLC Play content"
@@ -745,7 +749,7 @@ Section $Name_Section07 SEC07
   !insertmacro AddContextMenuExt "Directory"
 SectionEnd
 
-Section $Name_Section08 SEC08
+Section /o $Name_Section08 SEC08
   !insertmacro delprefs
 SectionEnd
 
@@ -754,8 +758,12 @@ SectionEnd
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} $Desc_Section01
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC02a} $Desc_Section02a
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC02b} $Desc_Section02b
-@BUILD_MOZILLA_TRUE@ !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $Desc_Section03
-@BUILD_ACTIVEX_TRUE@ !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $Desc_Section04
+!ifdef INSTALL_MOZILLA
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} $Desc_Section03
+!endif
+!ifdef INSTALL_ACTIVEX
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} $Desc_Section04
+!endif
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC05} $Desc_Section05
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC06} $Desc_Section06
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC07} $Desc_Section07
@@ -808,6 +816,9 @@ UAC_Success:
   StrCmp $LANGUAGE ${LANG_SPANISH} Spanish 0
   StrCmp $LANGUAGE ${LANG_ESTONIAN} Estonian 0
   StrCmp $LANGUAGE ${LANG_LITHUANIAN} Lithuanian 0
+  StrCmp $LANGUAGE ${LANG_BASQUE} Basque 0
+  StrCmp $LANGUAGE ${LANG_SERBIAN} Serbian 0
+  StrCmp $LANGUAGE ${LANG_RUSSSIAN} Russian 0
   StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} Brazilian EndLanguageCmp
   French:
   !include "languages\french.nsh"
@@ -869,6 +880,15 @@ UAC_Success:
   Lithuanian:
   !include "languages\lithuanian.nsh"
   Goto EndLanguageCmp
+  Basque:
+  !include "languages\basque.nsh"
+  Goto EndLanguageCmp
+  Serbian:
+  !include "languages\serbian.nsh"
+  Goto EndLanguageCmp
+  Russian:
+  !include "languages\Russian.nsh"
+  Goto EndLanguageCmp
   Brazilian:
   !include "languages\brazilian_portuguese.nsh"
   EndLanguageCmp:
@@ -877,7 +897,7 @@ UAC_Success:
   "UninstallString"
   StrCmp $R0 "" done
 
-  MessageBox MB_YESNO|MB_ICONEXCLAMATION $Message_AlreadyInstalled IDNO done
+  MessageBox MB_YESNO|MB_ICONEXCLAMATION $Message_AlreadyInstalled /SD IDNO IDNO done
 
   ;Run the uninstaller
   ;uninst:
@@ -1150,6 +1170,9 @@ UAC_Success:
   StrCmp $LANGUAGE ${LANG_SPANISH} Spanish 0
   StrCmp $LANGUAGE ${LANG_ESTONIAN} Estonian 0
   StrCmp $LANGUAGE ${LANG_LITHUANIAN} Lithuanian 0
+  StrCmp $LANGUAGE ${LANG_BASQUE} Basque 0
+  StrCmp $LANGUAGE ${LANG_SERBIAN} Serbian 0
+  StrCmp $LANGUAGE ${LANG_RUSSIAN} Russian 0
   StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} Brazilian EndLanguageCmp
   French:
   !include "languages\french.nsh"
@@ -1211,6 +1234,15 @@ UAC_Success:
   Lithuanian:
   !include "languages\lithuanian.nsh"
   Goto EndLanguageCmp
+  Basque:
+  !include "languages\basque.nsh"
+  Goto EndLanguageCmp
+  Serbian:
+  !include "languages\serbian.nsh"
+  Goto EndLanguageCmp
+  Russian:
+  !include "languages\russian.nsh"
+  Goto EndLanguageCmp
   Brazilian:
   !include "languages\brazilian_portuguese.nsh"
   EndLanguageCmp: