diff --git a/etc/Deployment/_build.bat b/etc/Deployment/_build.bat index 060174bf..24eab900 100644 --- a/etc/Deployment/_build.bat +++ b/etc/Deployment/_build.bat @@ -8,7 +8,8 @@ call "%~dp0\_paths.bat" if not "%LAMEXP_ERROR%"=="0" GOTO:EOF REM ----------------------------------------------------------------- call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86 -call "%PATH_QTMSVC%\bin\qtenv2.bat" +if exist "%PATH_QTMSVC%\bin\qtenv2.bat" call "%PATH_QTMSVC%\bin\qtenv2.bat" +if exist "%PATH_QTMSVC%\bin\qtvars.bat" call "%PATH_QTMSVC%\bin\qtvars.bat" REM ----------------------------------------------------------------- set "LAMEXP_ERROR=1" msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Clean /verbosity:normal %1 diff --git a/etc/Deployment/_lupdate.bat b/etc/Deployment/_lupdate.bat index e35755f1..2db61d95 100644 --- a/etc/Deployment/_lupdate.bat +++ b/etc/Deployment/_lupdate.bat @@ -9,7 +9,8 @@ REM ----------------------------------------------------------------- set "LAMEXP_ERROR=1" REM ----------------------------------------------------------------- call "%PATH_MSVC90%\VC\bin\vcvars32.bat" x86 -call "%PATH_QTMSVC%\bin\qtenv2.bat" +if exist "%PATH_QTMSVC%\bin\qtenv2.bat" call "%PATH_QTMSVC%\bin\qtenv2.bat" +if exist "%PATH_QTMSVC%\bin\qtvars.bat" call "%PATH_QTMSVC%\bin\qtvars.bat" REM ----------------------------------------------------------------- set "LAMEXP_ERROR=1" set "LST_FILE=%TEMP%\~list.%RANDOM%%RANDOM%.tmp" diff --git a/etc/Deployment/_paths.bat b/etc/Deployment/_paths.bat index 7ef0898f..fd6b2f91 100644 --- a/etc/Deployment/_paths.bat +++ b/etc/Deployment/_paths.bat @@ -56,7 +56,6 @@ if not exist "%PATH_UPXBIN%\upx.exe" GOTO:EOF if not exist "%PATH_MKNSIS%\makensis.exe" GOTO:EOF if not exist "%PATH_MSVC90%\VC\vcvarsall.bat" GOTO:EOF if not exist "%PATH_MSVC90%\VC\bin\cl.exe" GOTO:EOF -if not exist "%PATH_QTMSVC%\bin\qtenv2.bat" GOTO:EOF if not exist "%PATH_QTMSVC%\bin\uic.exe" GOTO:EOF if not exist "%PATH_QTMSVC%\bin\moc.exe" GOTO:EOF if not exist "%PATH_QTMSVC%\bin\rcc.exe" GOTO:EOF @@ -64,4 +63,9 @@ if not exist "%PATH_GNUPG1%\gpg.exe" GOTO:EOF if not exist "%PATH_GNUPG1%\gpg.exe" GOTO:EOF if not exist "%~dp0\..\..\%PATH_VCPROJ%" GOTO:EOF REM ------------------------------------------ +if exist "%PATH_QTMSVC%\bin\qtvars.bat" goto qtvars_found +if exist "%PATH_QTMSVC%\bin\qtenv2.bat" goto qtvars_found +GOTO:EOF +:qtvars_found +REM ------------------------------------------ set "LAMEXP_ERROR=0" diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 087de2ee..543acf76 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -3079,22 +3079,22 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. - + Executable '%1' requires Qt v%2, but found Qt v%3. - + Executable '%1' was built for Qt '%2', but found Qt '%3'. - + Executable '%1' requires Windows 2000 or later. diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts index 6f831d33..d3a5e529 100644 --- a/etc/Translation/LameXP_PL.ts +++ b/etc/Translation/LameXP_PL.ts @@ -3080,22 +3080,22 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. Plik wykonywalny '%1' nie działa w trybie kompatybilności z Windows. - + Executable '%1' requires Qt v%2, but found Qt v%3. Plik wykonywalny '%1' wymaga Qt v%2, znaleziono jednak Qt v%3. - + Executable '%1' was built for Qt '%2', but found Qt '%3'. Plik wykonywalny "%1" został skompilowany dla Qt "%2", znaleziono "%3". - + Executable '%1' requires Windows 2000 or later. Plik wykonywalny '%1' wymaga do uruchomienia Windows 2000 lub nowszego. diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts index b00d49b6..fa216a19 100644 --- a/etc/Translation/LameXP_SV.ts +++ b/etc/Translation/LameXP_SV.ts @@ -3081,22 +3081,22 @@ QApplication - + Executable '%1' doesn't support Windows compatibility mode. EXE-filen '%1' stöder inte Windows kompatibilitetsläge. - + Executable '%1' requires Qt v%2, but found Qt v%3. EXE-filen '%1' kräver Qt v%2, du har Qt v%3. - + Executable '%1' was built for Qt '%2', but found Qt '%3'. EXE-filen '%1' är byggd för Qt '%2', du har Qt '%3'. - + Executable '%1' requires Windows 2000 or later. EXE-filen '%1' kräver Windows 2000 eller senare. diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts index dccdd830..db134ab2 100644 --- a/etc/Translation/LameXP_ZH.ts +++ b/etc/Translation/LameXP_ZH.ts @@ -272,7 +272,7 @@ Encoder - + 编码器 @@ -419,7 +419,7 @@ New Folder - 新文件夹 + 新文件夹 @@ -1839,67 +1839,67 @@ MP3 - + MP3 Ogg/Vorbis - + Ogg/Vorbis AAC/MP4 - + AAC/MP4 PCM/Wave - + PCM/Wave A/52 - + A/52 DCA - + DCA Opus - + Opus Opus Encoder Options - + Opus 编码器选项 Optimize for Signal Type: - + 优化信号类型: Encoding Complexity: - + 编码复杂度: Music - + 音乐 (Undefined) - + (未定义) Frame Size: - + 帧大小: Use Experimental Encoder Perceptual Tuning - + 使用实验编码调整感知 OpusEnc: - + OpusEnc: Show Help - + 显示帮助 diff --git a/etc/Translation/release.bat b/etc/Translation/release.bat index 8f76a23f..bceb6d6a 100644 --- a/etc/Translation/release.bat +++ b/etc/Translation/release.bat @@ -1,7 +1,8 @@ @echo off REM --------------------------- call "..\Deployment\_paths.bat" -call "%PATH_QTMSVC%\bin\qtenv2.bat" +if exist "%PATH_QTMSVC%\bin\qtenv2.bat" call "%PATH_QTMSVC%\bin\qtenv2.bat" +if exist "%PATH_QTMSVC%\bin\qtvars.bat" call "%PATH_QTMSVC%\bin\qtvars.bat" REM --------------------------- for %%f in (LameXP_??.ts) do ( lrelease.exe %%f -qm ..\..\res\localization\%%~nf.qm diff --git a/etc/Translation/update.bat b/etc/Translation/update.bat index 4509cc34..81734b1b 100644 --- a/etc/Translation/update.bat +++ b/etc/Translation/update.bat @@ -1,7 +1,8 @@ @echo off REM --------------------------- call "..\Deployment\_paths.bat" -call "%PATH_QTMSVC%\bin\qtenv2.bat" +if exist "%PATH_QTMSVC%\bin\qtenv2.bat" call "%PATH_QTMSVC%\bin\qtenv2.bat" +if exist "%PATH_QTMSVC%\bin\qtvars.bat" call "%PATH_QTMSVC%\bin\qtvars.bat" REM --------------------------- del update.lst > NUL REM --------------------------- diff --git a/res/localization/LameXP_ZH.qm b/res/localization/LameXP_ZH.qm index 80245fbc..051cadfc 100644 Binary files a/res/localization/LameXP_ZH.qm and b/res/localization/LameXP_ZH.qm differ diff --git a/src/Config.h b/src/Config.h index 20a3c23c..8dd4a88c 100644 --- a/src/Config.h +++ b/src/Config.h @@ -30,7 +30,7 @@ #define VER_LAMEXP_MINOR_LO 5 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 3 -#define VER_LAMEXP_BUILD 1083 +#define VER_LAMEXP_BUILD 1084 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!)