remove .ps from nsis again

[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 ed255c1e77e45814164d2bde5fb5a038d7db0c90..3b24f8eb122977e6fae3209bc0089fe3b3f7a009 100644 (file)
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -132,6 +132,7 @@ RequestExecutionLevel user
   !insertmacro MUI_LANGUAGE "Catalan"
   !insertmacro MUI_LANGUAGE "Bulgarian"
   !insertmacro MUI_LANGUAGE "Estonian"
+  !insertmacro MUI_LANGUAGE "Lithuanian"
 
 ; Reserve files for solid compression
   !insertmacro MUI_RESERVEFILE_LANGDLL
@@ -338,7 +339,6 @@ FunctionEnd
   !insertmacro ${_action} ".ogm"
   !insertmacro ${_action} ".ogx"
   !insertmacro ${_action} ".ogv"
-  !insertmacro ${_action} ".ps"
   !insertmacro ${_action} ".rec"
   !insertmacro ${_action} ".rm"
   !insertmacro ${_action} ".rmvb"
@@ -607,8 +607,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}"
@@ -626,8 +626,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
@@ -797,6 +797,7 @@ UAC_Success:
   StrCmp $LANGUAGE ${LANG_SLOVAK} Slovak 0
   StrCmp $LANGUAGE ${LANG_POLISH} Polish 0
   StrCmp $LANGUAGE ${LANG_DUTCH} Dutch 0
+  StrCmp $LANGUAGE ${LANG_DANISH} Danish 0
   StrCmp $LANGUAGE ${LANG_SIMPCHINESE} SChinese 0
   StrCmp $LANGUAGE ${LANG_FINNISH} Finnish 0
   StrCmp $LANGUAGE ${LANG_JAPANESE} Japanese 0
@@ -804,7 +805,8 @@ UAC_Success:
 ;  StrCmp $LANGUAGE ${LANG_PUNJABI} Punjabi 0
 ;  StrCmp $LANGUAGE ${LANG_SLOVENIAN} Slovenian 0
   StrCmp $LANGUAGE ${LANG_SPANISH} Spanish 0
-  StrCmp $LANGUAGE ${LANG_SPANISH} Estonian 0
+  StrCmp $LANGUAGE ${LANG_ESTONIAN} Estonian 0
+  StrCmp $LANGUAGE ${LANG_LITHUANIAN} Lithuanian 0
   StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} Brazilian EndLanguageCmp
   French:
   !include "languages\french.nsh"
@@ -836,6 +838,9 @@ UAC_Success:
   Dutch:
   !include "languages\dutch.nsh"
   Goto EndLanguageCmp
+  Danish:
+  !include "languages\danish.nsh"
+  Goto EndLanguageCmp
   Schinese:
   !include "languages\schinese.nsh"
   Goto EndLanguageCmp
@@ -860,6 +865,9 @@ UAC_Success:
   Estonian:
   !include "languages\estonian.nsh"
   Goto EndLanguageCmp
+  Lithuanian:
+  !include "languages\lithuanian.nsh"
+  Goto EndLanguageCmp
   Brazilian:
   !include "languages\brazilian_portuguese.nsh"
   EndLanguageCmp:
@@ -1131,6 +1139,7 @@ UAC_Success:
   StrCmp $LANGUAGE ${LANG_SLOVAK} Slovak 0
   StrCmp $LANGUAGE ${LANG_POLISH} Polish 0
   StrCmp $LANGUAGE ${LANG_DUTCH} Dutch 0
+  StrCmp $LANGUAGE ${LANG_DANISH} Danish 0
   StrCmp $LANGUAGE ${LANG_SIMPCHINESE} SChinese 0
   StrCmp $LANGUAGE ${LANG_FINNISH} Finnish 0
   StrCmp $LANGUAGE ${LANG_JAPANESE} Japanese 0
@@ -1139,6 +1148,7 @@ UAC_Success:
 ;  StrCmp $LANGUAGE ${LANG_SLOVENIAN} Slovenian 0
   StrCmp $LANGUAGE ${LANG_SPANISH} Spanish 0
   StrCmp $LANGUAGE ${LANG_ESTONIAN} Estonian 0
+  StrCmp $LANGUAGE ${LANG_LITHUANIAN} Lithuanian 0
   StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} Brazilian EndLanguageCmp
   French:
   !include "languages\french.nsh"
@@ -1170,6 +1180,9 @@ UAC_Success:
   Dutch:
   !include "languages\dutch.nsh"
   Goto EndLanguageCmp
+  Danish:
+  !include "languages\danish.nsh"
+  Goto EndLanguageCmp
   Schinese:
   !include "languages\schinese.nsh"
   Goto EndLanguageCmp
@@ -1194,6 +1207,9 @@ UAC_Success:
   Estonian:
   !include "languages\estonian.nsh"
   Goto EndLanguageCmp
+  Lithuanian:
+  !include "languages\lithuanian.nsh"
+  Goto EndLanguageCmp
   Brazilian:
   !include "languages\brazilian_portuguese.nsh"
   EndLanguageCmp: