X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc.win32.nsi.in;h=af5bc480a7c6a66e3966fc7387b637c1d82bc78d;hb=f0d5f2d2a5d8539126c447c41e5bd5fc0c94d443;hp=4b0b0e63fa7123f93a9a9ccc9769e76881987516;hpb=ddbcb2f208c12dce8514ff5ace181e046441bbe0;p=vlc

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index 4b0b0e63fa..af5bc480a7 100644
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -13,6 +13,10 @@
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 !define PRODUCT_ID "{ea92ef52-afe4-4212-bacb-dfe9fca94cd6}"
 
+!define MUI_LANGDLL_REGISTRY_ROOT "HKLM"
+!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_DIR_REGKEY}"
+!define MUI_LANGDLL_REGISTRY_VALUENAME "Language"
+
 @FILE_LIBVLC_DLL@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -96,6 +100,7 @@ InstType "Full"
   !insertmacro MUI_LANGUAGE "Russian"
   !insertmacro MUI_LANGUAGE "Portuguese"
   !insertmacro MUI_LANGUAGE "Arabic"
+  !insertmacro MUI_LANGUAGE "Polish"
 
 !insertmacro MUI_RESERVEFILE_LANGDLL
 
@@ -221,16 +226,22 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;
 
 !macro AddContextMenu EXT
-  WriteRegStr HKCR ${EXT}\shell\PlayWithVLC "" "Play with VLC media player"
-  WriteRegStr HKCR ${EXT}\shell\PlayWithVLC\command "" '$INSTDIR\vlc.exe --started-from-file --no-playlist-enqueue "%1"'
+  Push $R0
+  ReadRegStr $R0 HKCR ${EXT} ""
+  WriteRegStr HKCR $R0\shell\PlayWithVLC "" "Play with VLC media player"
+  WriteRegStr HKCR $R0\shell\PlayWithVLC\command "" '$INSTDIR\vlc.exe --started-from-file --no-playlist-enqueue "%1"'
 
-  WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC "" "Add to VLC media player's Playlist"
-  WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC\command "" '$INSTDIR\vlc.exe --started-from-file --playlist-enqueue "%1"'
+  WriteRegStr HKCR $R0\shell\AddToPlaylistVLC "" "Add to VLC media player's Playlist"
+  WriteRegStr HKCR $R0\shell\AddToPlaylistVLC\command "" '$INSTDIR\vlc.exe --started-from-file --playlist-enqueue "%1"'
+  Pop $R0
 !macroend
 
 !macro DeleteContextMenu EXT
-  DeleteRegKey HKCR ${EXT}\shell\PlayWithVLC
-  DeleteRegKey HKCR ${EXT}\shell\AddToPlaylistVLC
+  Push $R0
+  ReadRegStr $R0 HKCR ${EXT} ""
+  DeleteRegKey HKCR $R0\shell\PlayWithVLC
+  DeleteRegKey HKCR $R0\shell\AddToPlaylistVLC
+  Pop $R0
 !macroend
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -487,12 +498,6 @@ Section "ActiveX plugin" SEC04
   RegDLL "$INSTDIR\axvlc.dll"
 SectionEnd
 
-Section /o "Context Menus" SEC05
-  SectionIn 3
-  !insertmacro MacroAllExtensions AddContextMenu
-  !insertmacro AddContextMenu "Directory"
-SectionEnd
-
 SectionGroup "File type associations" SEC06
   SectionGroup "Audio Files"
     !insertmacro MacroAudioExtensions RegisterExtensionSection
@@ -505,6 +510,12 @@ SectionGroup "File type associations" SEC06
   SectionGroupEnd
 SectionGroupEnd
 
+Section /o "Context Menus" SEC05
+  SectionIn 3
+  !insertmacro MacroAllExtensions AddContextMenu
+  !insertmacro AddContextMenu "Directory"
+SectionEnd
+
 Section /o "Delete preferences and cache" SEC07
   !insertmacro delprefs
 SectionEnd
@@ -727,5 +738,5 @@ SectionEnd
 ;FunctionEnd
 
 Function un.onInit
-  !insertmacro MUI_LANGDLL_DISPLAY
+  !insertmacro MUI_UNGETLANGUAGE
 FunctionEnd