New upstream version 17.5.0~ds0

4 files changed, 33 insertions, 19 deletions

diff --git a/setup/scripts/make_pkgs.cmd b/setup/scripts/make_pkgs.cmd
index 3124c3b..7b5bc1c 100644
--- a/setup/scripts/make_pkgs.cmd
+++ b/setup/scripts/make_pkgs.cmd
@@ -194,10 +194,16 @@ REM if not exist "%PORTABLE_EXE_DIR%\smtube-portable.exe" (
 REM  echo Warning: SMTube portable EXE not found!

 REM )

 

-ren "%SMPLAYER_DIR%" "smplayer-portable-%PORTABLE_PKG_VER%"

-set SMPLAYER_PORTABLE_DIR="%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%"

+if exist "%SMPLAYER_DIR%\QtCore4.dll" (

+  set PORTABLE_DIR_NAME=smplayer-portable-%PORTABLE_PKG_VER%-Qt4

+) else (

+  set PORTABLE_DIR_NAME=smplayer-portable-%PORTABLE_PKG_VER%

+)

 

-if not exist "%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%" (

+ren "%SMPLAYER_DIR%" "%PORTABLE_DIR_NAME%"

+set SMPLAYER_PORTABLE_DIR="%TOP_LEVEL_DIR%\%PORTABLE_DIR_NAME%"

+

+if not exist "%SMPLAYER_PORTABLE_DIR%" (

   echo Oops! Unable to find renamed directory, make sure no files are opened.

   goto end

 )

@@ -237,7 +243,7 @@ copy /y "%PORTABLE_EXE_DIR%\smplayer-portable.exe" "%SMPLAYER_PORTABLE_DIR%\smpl
 REM copy /y "%PORTABLE_EXE_DIR%\smtube-portable.exe" "%SMPLAYER_PORTABLE_DIR%\smtube.exe"

 

 echo Finalizing package...

-7za a -t7z "%OUTPUT_DIR%\smplayer-portable-%PORTABLE_PKG_VER%.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mplayer64.exe -xr!mencoder.exe -xr!mencoder64.exe -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -xr!mpv64.exe -xr!mpv64.com -mx9 >nul

+7za a -t7z "%OUTPUT_DIR%\%PORTABLE_DIR_NAME%.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mplayer64.exe -xr!mencoder.exe -xr!mencoder64.exe -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -xr!mpv64.exe -xr!mpv64.com -mx9 >nul

 

 echo.

 echo Restoring source folder(s) back to its original state...

@@ -273,10 +279,12 @@ REM if not exist "%PORTABLE_EXE_DIR%\smtube-portable64.exe" (
 REM  echo Warning: SMTube portable EXE not found!

 REM )

 

-ren "%SMPLAYER_DIR64%" "smplayer-portable-%PORTABLE_PKG_VER%-x64"

-set SMPLAYER_PORTABLE_DIR="%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64"

+set PORTABLE_DIR_NAME=smplayer-portable-%PORTABLE_PKG_VER%-x64

+

+ren "%SMPLAYER_DIR64%" "%PORTABLE_DIR_NAME%"

+set SMPLAYER_PORTABLE_DIR="%TOP_LEVEL_DIR%\%PORTABLE_DIR_NAME%"

 

-if not exist "%TOP_LEVEL_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64" (

+if not exist "%SMPLAYER_PORTABLE_DIR%" (

   echo Oops! Unable to find renamed directory, make sure no files are opened.

   goto end

 )

@@ -330,7 +338,7 @@ copy /y "%PORTABLE_EXE_DIR%\smplayer-portable64.exe" "%SMPLAYER_PORTABLE_DIR%\sm
 REM copy /y "%PORTABLE_EXE_DIR%\smtube-portable64.exe" "%SMPLAYER_PORTABLE_DIR%\smtube.exe"

 

 echo Finalizing package...

-7za a -t7z "%OUTPUT_DIR%\smplayer-portable-%PORTABLE_PKG_VER%-x64.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mencoder.exe -xr!mencoder64.exe  -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!codecs -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -mx9 >nul

+7za a -t7z "%OUTPUT_DIR%\%PORTABLE_DIR_NAME%.7z" "%SMPLAYER_PORTABLE_DIR%" -xr!*.bak* -xr!qxtcore.dll -xr!mencoder.exe -xr!mencoder64.exe  -xr!mplayer64.exe.debug -xr!mencoder64.exe.debug -xr!mplayer.exe.debug -xr!mencoder.exe.debug -xr!gdb.exe -xr!gdb64.exe -xr!vfw2menc.exe -xr!codecs -xr!buildinfo -xr!buildinfo64 -xr!buildinfo-mencoder-32 -xr!buildinfo-mencoder-debug-32 -xr!buildinfo-mplayer-32 -xr!buildinfo-mplayer-debug-32 -xr!buildinfo-mencoder-64 -xr!buildinfo-mencoder-debug-64 -xr!buildinfo-mplayer-64 -xr!buildinfo-mplayer-debug-64 -mx9 >nul

 

 echo.

 echo Restoring source folder(s) back to its original state...

diff --git a/setup/smplayer.nsi b/setup/smplayer.nsi
index 9f9d620..f17299e 100644
--- a/setup/smplayer.nsi
+++ b/setup/smplayer.nsi
@@ -161,6 +161,8 @@
 

   Var YTDL_Exit_Code

 

+  Var MMEngineFlags

+

 ;--------------------------------

 ;Interface Settings

 

@@ -467,11 +469,11 @@ SectionGroup $(MPlayerMPVGroupTitle)
 

   SetOutPath "$INSTDIR\mpv"

 !ifdef WIN64

-  File /r /x mpv.exe /x mpv.com /x mpv64.exe /x mpv64.com /x fonts /x mpv "${SMPLAYER_BUILD_DIR}\mpv\*.*"

+  File /r /x mpv.exe /x mpv.com /x mpv64.exe /x mpv64.com "${SMPLAYER_BUILD_DIR}\mpv\*.*"

   File /oname=mpv.exe "${SMPLAYER_BUILD_DIR}\mpv\mpv64.exe"

   File /oname=mpv.com "${SMPLAYER_BUILD_DIR}\mpv\mpv64.com"

 !else

-  File /r /x mpv64.exe /x mpv64.com /x d3dcompiler_43.dll "${SMPLAYER_BUILD_DIR}\mpv\*.*"

+  File /r /x mpv64.exe /x mpv64.com "${SMPLAYER_BUILD_DIR}\mpv\*.*"

 !endif

 

   IfFileExists "$PLUGINSDIR\youtube-dl.exe" 0 YTDL

@@ -826,13 +828,9 @@ Function .onInit
   installoldcpu:

 !endif

 

-!ifdef WIN64

   ${Unless} ${AtLeastWinVista}

+  ${AndUnless} ${AtLeastServicePack} 2

     MessageBox MB_YESNO|MB_ICONSTOP $(OS_Not_Supported_VistaRequired) /SD IDNO IDYES installonoldwindows

-!else

-  ${Unless} ${AtLeastWinXP}

-    MessageBox MB_YESNO|MB_ICONSTOP $(OS_Not_Supported) /SD IDNO IDYES installonoldwindows

-!endif

     Abort

   installonoldwindows:

   ${EndIf}

@@ -1051,6 +1049,13 @@ Function LoadPreviousSettings
 

   ${MementoSectionRestore}

 

+  ${If} ${AtMostWinXP}

+    IntOp $MMEngineFlags ${SF_SELECTED} | ${SF_RO}

+    !insertmacro UnSelectSection ${SecMPV}

+    SectionSetFlags ${SecMPlayer} $MMEngineFlags

+    SectionSetFlags ${SecMPV} ${SF_RO}

+  ${EndIf}

+

 FunctionEnd

 

 Function PageReinstall

diff --git a/setup/translations/malay.nsh b/setup/translations/malay.nsh
index e4d97ea..94d40c6 100644
--- a/setup/translations/malay.nsh
+++ b/setup/translations/malay.nsh
@@ -15,7 +15,7 @@ ${LangFileString} Installer_Is_Running "Pemasang sudah berjalan."
 ${LangFileString} Installer_No_Admin "Anda mesti mendaftar masuk sebagai pentadbir bila memasang program ini."

 ${LangFileString} SMPlayer_Is_Running "Satu kejadian SMPlayer sedang berjalan. Sila keluar SMPlayer dan cuba lagi."

 

-${LangFileString} OS_Not_Supported "Sistem pengoperasian tidak disokong.$\nSMPlayer ${SMPLAYER_VERSION} memerlukan sekurang-kurangnya Windows XP dan tidak dapat berfungsi dengan baik pada sistem anda.$\nAnda pasti mahu teruskan pemasangan?"

+${LangFileString} OS_Not_Supported "Kesian , Sistem pengoperasian tidak disokong.$\nSMPlayer ${SMPLAYER_VERSION} memerlukan sekurang-kurangnya Windows XP dan tidak dapat berfungsi dengan baik pada sistem anda.$\nAnda pasti mahu teruskan pemasangan?"

 ${LangFileString} OS_Not_Supported_VistaRequired "Sistem pengoperasian tidak disokong.$\nSMPlayer ${SMPLAYER_VERSION} memerlukan sekurang-kurangnya Windows Vista dan tidak dapat berfungsi dengan baik pada sistem anda.$\nAnda pasti mahu teruskan pemasangan?"

 ${LangFileString} Win64_Required "Sistem pengoperasian Windows 64-bit diperlukan untuk memasang perisian ini."

 ${LangFileString} Existing_32bitInst "Pemasangan 32-bit SMPlayer sudah wujud. Anda mesti nyahpasang SMPlayer 32-bit dahulu."

diff --git a/setup/translations/po_files/malay.po b/setup/translations/po_files/malay.po
index ed08acb..6241076 100644
--- a/setup/translations/po_files/malay.po
+++ b/setup/translations/po_files/malay.po
@@ -4,11 +4,12 @@
 # 
 # Translators:
 # abuyop <abuyop@gmail.com>, 2014-2016
+# Muhd. Syah <wanmuhammadsyahmiz@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: smplayer\n"
-"PO-Revision-Date: 2016-11-09 15:55+0000\n"
-"Last-Translator: abuyop <abuyop@gmail.com>\n"
+"PO-Revision-Date: 2017-04-01 04:52+0000\n"
+"Last-Translator: Muhd. Syah <wanmuhammadsyahmiz@gmail.com>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/rvm/smplayer/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,7 +36,7 @@ msgid ""
 "Unsupported operating system.[:n:]SMPlayer ${SMPLAYER_VERSION} requires at "
 "least Windows XP and may not work correctly on your system.[:n:]Do you "
 "really want to continue with the installation?"
-msgstr "Sistem pengoperasian tidak disokong.[:n:]SMPlayer ${SMPLAYER_VERSION} memerlukan sekurang-kurangnya Windows XP dan tidak dapat berfungsi dengan baik pada sistem anda.[:n:]Anda pasti mahu teruskan pemasangan?"
+msgstr "Kesian , Sistem pengoperasian tidak disokong.[:n:]SMPlayer ${SMPLAYER_VERSION} memerlukan sekurang-kurangnya Windows XP dan tidak dapat berfungsi dengan baik pada sistem anda.[:n:]Anda pasti mahu teruskan pemasangan?"
 
 # OS_Not_Supported_VistaRequired
 msgid ""