Try to improve wording

[vlc] / vlc.win32.nsi.in

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index 4b0b0e63fa7123f93a9a9ccc9769e76881987516..6206b4877c6e6cb5b0687b5c60944994abbb24fb 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -13,7 +13,12 @@
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
 !define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}"\r
 \r
+!define MUI_LANGDLL_REGISTRY_ROOT "HKLM"\r
+!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_DIR_REGKEY}"\r
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Language"\r
+\r
 @FILE_LIBVLC_DLL@\r
+@FILE_LIBVLC_CONTROL_DLL@\r
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; General configuration ;\r
@@ -96,6 +101,7 @@ InstType "Full"
   !insertmacro MUI_LANGUAGE "Russian"\r
   !insertmacro MUI_LANGUAGE "Portuguese"\r
   !insertmacro MUI_LANGUAGE "Arabic"\r
+  !insertmacro MUI_LANGUAGE "Polish"\r
 \r
 !insertmacro MUI_RESERVEFILE_LANGDLL\r
 \r
@@ -139,6 +145,7 @@ InstType "Full"
   !insertmacro ${_action} ".mpeg2"\r
   !insertmacro ${_action} ".mpeg4"\r
   !insertmacro ${_action} ".mpg"\r
+  !insertmacro ${_action} ".mxf"\r
   !insertmacro ${_action} ".ps"\r
   !insertmacro ${_action} ".ts"\r
   !insertmacro ${_action} ".ogm"\r
@@ -220,7 +227,7 @@ FunctionEnd
 ; Context menu entries ;\r
 ;;;;;;;;;;;;;;;;;;;;;;;;\r
 \r
-!macro AddContextMenu EXT\r
+!macro AddContextMenuExt EXT\r
   WriteRegStr HKCR ${EXT}\shell\PlayWithVLC "" "Play with VLC media player"\r
   WriteRegStr HKCR ${EXT}\shell\PlayWithVLC\command "" '$INSTDIR\vlc.exe --started-from-file --no-playlist-enqueue "%1"'\r
 \r
@@ -228,11 +235,25 @@ FunctionEnd
   WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC\command "" '$INSTDIR\vlc.exe --started-from-file --playlist-enqueue "%1"'\r
 !macroend\r
 \r
-!macro DeleteContextMenu EXT\r
+!macro AddContextMenu EXT\r
+  Push $R0\r
+  ReadRegStr $R0 HKCR ${EXT} ""\r
+  !insertmacro AddContextMenuExt $R0\r
+  Pop $R0\r
+!macroend\r
+\r
+!macro DeleteContextMenuExt EXT\r
   DeleteRegKey HKCR ${EXT}\shell\PlayWithVLC\r
   DeleteRegKey HKCR ${EXT}\shell\AddToPlaylistVLC\r
 !macroend\r
 \r
+!macro DeleteContextMenu EXT\r
+  Push $R0\r
+  ReadRegStr $R0 HKCR ${EXT} ""\r
+  !insertmacro DeleteContextMenuExt $R0\r
+  Pop $R0\r
+!macroend\r
+\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;\r
 ; Delete prefs and cache ;\r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;\r
@@ -331,6 +352,9 @@ Section "Media player (required)" SEC01
   !ifdef LIBVLC_DLL\r
   !insertmacro InstallFile ${LIBVLC_DLL}\r
   !endif\r
+  !ifdef LIBVLC_CONTROL_DLL\r
+  !insertmacro InstallFile ${LIBVLC_CONTROL_DLL}\r
+  !endif\r
   !insertmacro InstallFile *.txt\r
 \r
   !insertmacro InstallFolder plugins\r
@@ -338,6 +362,7 @@ Section "Media player (required)" SEC01
   !insertmacro InstallFolder osdmenu\r
   !insertmacro InstallFolder skins\r
   !insertmacro InstallFolder http\r
+  !insertmacro InstallFolder share\r
 \r
   WriteIniStr "$INSTDIR\${PRODUCT_GROUP} Website.url" "InternetShortcut" "URL" \\r
     "${PRODUCT_WEB_SITE}"\r
@@ -471,6 +496,9 @@ Section /o "Mozilla plugin" SEC03
  ;  !ifdef LIBVLC_DLL\r
  ;  CopyFiles ${LIBVLC_DLL} "$R2"\r
  ;  !endif\r
+ ;  !ifdef LIBVLC_CONTROL_DLL\r
+ ;  CopyFiles ${LIBVLC_CONTROL_DLL} "$R2"\r
+ ;  !endif\r
  ;  Goto "${Index}-Loop"\r
 \r
  ;"${Index}-End:"\r
@@ -487,12 +515,6 @@ Section "ActiveX plugin" SEC04
   RegDLL "$INSTDIR\axvlc.dll"\r
 SectionEnd\r
 \r
-Section /o "Context Menus" SEC05\r
-  SectionIn 3\r
-  !insertmacro MacroAllExtensions AddContextMenu\r
-  !insertmacro AddContextMenu "Directory"\r
-SectionEnd\r
-\r
 SectionGroup "File type associations" SEC06\r
   SectionGroup "Audio Files"\r
     !insertmacro MacroAudioExtensions RegisterExtensionSection\r
@@ -505,6 +527,12 @@ SectionGroup "File type associations" SEC06
   SectionGroupEnd\r
 SectionGroupEnd\r
 \r
+Section /o "Context Menus" SEC05\r
+  SectionIn 3\r
+  !insertmacro MacroAllExtensions AddContextMenu\r
+  !insertmacro AddContextMenuExt "Directory"\r
+SectionEnd\r
+\r
 Section /o "Delete preferences and cache" SEC07\r
   !insertmacro delprefs\r
 SectionEnd\r
@@ -630,7 +658,7 @@ Section "Uninstall" SEC91
 \r
   !insertmacro MacroAllExtensions DeleteContextMenu\r
   !insertmacro MacroAllExtensions UnRegisterExtensionSection\r
-  !insertmacro DeleteContextMenu "Directory"\r
+  !insertmacro DeleteContextMenuExt "Directory"\r
 \r
   ;remove activex plugin\r
   UnRegDLL "$INSTDIR\axvlc.dll"\r
@@ -727,5 +755,5 @@ SectionEnd
 ;FunctionEnd\r
 \r
 Function un.onInit\r
-  !insertmacro MUI_LANGDLL_DISPLAY\r
+  !insertmacro MUI_UNGETLANGUAGE\r
 FunctionEnd\r