Reverse temporary change

[vlc] / vlc.win32.nsi.in

diff --git a/vlc.win32.nsi.in b/vlc.win32.nsi.in
index 4b0b0e63fa7123f93a9a9ccc9769e76881987516..af5bc480a7c6a66e3966fc7387b637c1d82bc78d 100644 (file)
--- a/vlc.win32.nsi.in
+++ b/vlc.win32.nsi.in
@@ -13,6 +13,10 @@
 !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
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;\r
@@ -96,6 +100,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
@@ -221,16 +226,22 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;\r
 \r
 !macro AddContextMenu 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
+  Push $R0\r
+  ReadRegStr $R0 HKCR ${EXT} ""\r
+  WriteRegStr HKCR $R0\shell\PlayWithVLC "" "Play with VLC media player"\r
+  WriteRegStr HKCR $R0\shell\PlayWithVLC\command "" '$INSTDIR\vlc.exe --started-from-file --no-playlist-enqueue "%1"'\r
 \r
-  WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC "" "Add to VLC media player's Playlist"\r
-  WriteRegStr HKCR ${EXT}\shell\AddToPlaylistVLC\command "" '$INSTDIR\vlc.exe --started-from-file --playlist-enqueue "%1"'\r
+  WriteRegStr HKCR $R0\shell\AddToPlaylistVLC "" "Add to VLC media player's Playlist"\r
+  WriteRegStr HKCR $R0\shell\AddToPlaylistVLC\command "" '$INSTDIR\vlc.exe --started-from-file --playlist-enqueue "%1"'\r
+  Pop $R0\r
 !macroend\r
 \r
 !macro DeleteContextMenu EXT\r
-  DeleteRegKey HKCR ${EXT}\shell\PlayWithVLC\r
-  DeleteRegKey HKCR ${EXT}\shell\AddToPlaylistVLC\r
+  Push $R0\r
+  ReadRegStr $R0 HKCR ${EXT} ""\r
+  DeleteRegKey HKCR $R0\shell\PlayWithVLC\r
+  DeleteRegKey HKCR $R0\shell\AddToPlaylistVLC\r
+  Pop $R0\r
 !macroend\r
 \r
 ;;;;;;;;;;;;;;;;;;;;;;;;;;\r
@@ -487,12 +498,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 +510,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 AddContextMenu "Directory"\r
+SectionEnd\r
+\r
 Section /o "Delete preferences and cache" SEC07\r
   !insertmacro delprefs\r
 SectionEnd\r
@@ -727,5 +738,5 @@ SectionEnd
 ;FunctionEnd\r
 \r
 Function un.onInit\r
-  !insertmacro MUI_LANGDLL_DISPLAY\r
+  !insertmacro MUI_UNGETLANGUAGE\r
 FunctionEnd\r