Update Chinese translation. Thanks to 456Vv <123@456vv.com>.

diff --git a/etc/Deployment/_build.bat b/etc/Deployment/_build.bat
index 060174b..24eab90 100644 (file)
--- 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 e35755f..2db61d9 100644 (file)
--- 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 7ef0898..fd6b2f9 100644 (file)
--- 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 087de2e..543acf7 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -3079,22 +3079,22 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../../src/Global.cpp" line="828"/>
+        <location filename="../../src/Global.cpp" line="833"/>
         <source>Executable &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1083"/>
+        <location filename="../../src/Global.cpp" line="1088"/>
         <source>Executable &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1088"/>
+        <location filename="../../src/Global.cpp" line="1093"/>
         <source>Executable &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1101"/>
+        <location filename="../../src/Global.cpp" line="1106"/>
         <source>Executable &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index 6f831d3..d3a5e52 100644 (file)
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -3080,22 +3080,22 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../../src/Global.cpp" line="828"/>
+        <location filename="../../src/Global.cpp" line="833"/>
         <source>Executable &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; nie działa w trybie kompatybilności z Windows.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1083"/>
+        <location filename="../../src/Global.cpp" line="1088"/>
         <source>Executable &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; wymaga Qt v%2, znaleziono jednak Qt v%3.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1088"/>
+        <location filename="../../src/Global.cpp" line="1093"/>
         <source>Executable &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</source>
         <translation type="unfinished">Plik wykonywalny &quot;%1&quot; został skompilowany dla Qt &quot;%2&quot;, znaleziono &quot;%3&quot;.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1101"/>
+        <location filename="../../src/Global.cpp" line="1106"/>
         <source>Executable &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation type="unfinished">Plik wykonywalny &apos;%1&apos; wymaga do uruchomienia Windows 2000 lub nowszego.</translation>
     </message>

diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index b00d49b..fa216a1 100644 (file)
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -3081,22 +3081,22 @@
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="../../src/Global.cpp" line="828"/>
+        <location filename="../../src/Global.cpp" line="833"/>
         <source>Executable &apos;%1&apos; doesn&apos;t support Windows compatibility mode.</source>
         <translation>EXE-filen &apos;%1&apos; stöder inte Windows kompatibilitetsläge.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1083"/>
+        <location filename="../../src/Global.cpp" line="1088"/>
         <source>Executable &apos;%1&apos; requires Qt v%2, but found Qt v%3.</source>
         <translation>EXE-filen &apos;%1&apos; kräver Qt v%2, du har Qt v%3.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1088"/>
+        <location filename="../../src/Global.cpp" line="1093"/>
         <source>Executable &apos;%1&apos; was built for Qt &apos;%2&apos;, but found Qt &apos;%3&apos;.</source>
         <translation>EXE-filen &apos;%1&apos; är byggd för Qt &apos;%2&apos;, du har Qt &apos;%3&apos;.</translation>
     </message>
     <message>
-        <location filename="../../src/Global.cpp" line="1101"/>
+        <location filename="../../src/Global.cpp" line="1106"/>
         <source>Executable &apos;%1&apos; requires Windows 2000 or later.</source>
         <translation>EXE-filen &apos;%1&apos; kräver Windows 2000 eller senare.</translation>
     </message>

diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts
index dccdd83..db134ab 100644 (file)
--- a/etc/Translation/LameXP_ZH.ts
+++ b/etc/Translation/LameXP_ZH.ts
@@ -272,7 +272,7 @@
     </message>
     <message>
         <source>Encoder</source>
-        <translation type="unfinished"></translation>
+        <translation>编码器</translation>
     </message>
 </context>
 <context>
@@ -419,7 +419,7 @@
     </message>
     <message>
         <source>New Folder</source>
-        <translation type="unfinished">新文件夹</translation>
+        <translation>新文件夹</translation>
     </message>
 </context>
 <context>
@@ -1839,67 +1839,67 @@
     </message>
     <message>
         <source>MP3</source>
-        <translation type="unfinished"></translation>
+        <translation>MP3</translation>
     </message>
     <message>
         <source>Ogg/Vorbis</source>
-        <translation type="unfinished"></translation>
+        <translation>Ogg/Vorbis</translation>
     </message>
     <message>
         <source>AAC/MP4</source>
-        <translation type="unfinished"></translation>
+        <translation>AAC/MP4</translation>
     </message>
     <message>
         <source>PCM/Wave</source>
-        <translation type="unfinished"></translation>
+        <translation>PCM/Wave</translation>
     </message>
     <message>
         <source>A/52</source>
-        <translation type="unfinished"></translation>
+        <translation>A/52</translation>
     </message>
     <message>
         <source>DCA</source>
-        <translation type="unfinished"></translation>
+        <translation>DCA</translation>
     </message>
     <message>
         <source>Opus</source>
-        <translation type="unfinished"></translation>
+        <translation>Opus</translation>
     </message>
     <message>
         <source> Opus Encoder Options </source>
-        <translation type="unfinished"></translation>
+        <translation> Opus 编码器选项 </translation>
     </message>
     <message>
         <source>Optimize for Signal Type:</source>
-        <translation type="unfinished"></translation>
+        <translation>优化信号类型:</translation>
     </message>
     <message>
         <source>Encoding Complexity:</source>
-        <translation type="unfinished"></translation>
+        <translation>编码复杂度:</translation>
     </message>
     <message>
         <source>Music</source>
-        <translation type="unfinished"></translation>
+        <translation>音乐</translation>
     </message>
     <message>
         <source>(Undefined)</source>
-        <translation type="unfinished"></translation>
+        <translation>(未定义)</translation>
     </message>
     <message>
         <source>Frame Size:</source>
-        <translation type="unfinished"></translation>
+        <translation>帧大小:</translation>
     </message>
     <message>
         <source>Use Experimental Encoder Perceptual Tuning</source>
-        <translation type="unfinished"></translation>
+        <translation>使用实验编码调整感知</translation>
     </message>
     <message>
         <source>OpusEnc:</source>
-        <translation type="unfinished"></translation>
+        <translation>OpusEnc:</translation>
     </message>
     <message>
         <source>Show Help</source>
-        <translation type="unfinished"></translation>
+        <translation>显示帮助</translation>
     </message>
 </context>
 <context>

diff --git a/etc/Translation/release.bat b/etc/Translation/release.bat
index 8f76a23..bceb6d6 100644 (file)
--- 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 4509cc3..81734b1 100644 (file)
--- 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 80245fb..051cadf 100644 (file)
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 20a3c23..8dd4a88 100644 (file)
--- 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!)