Merge branch 'Aleksoid1978:master' into master

.github/workflows/main.yml

@@ -42,12 +42,12 @@ jobs:
 
       - name: Clean
         run: |
-          .\\build.bat Clean All
+          .\\build.bat Clean All NoWait
         shell: pwsh
 
       - name: Build MPC-BE
         run: |
-          .\\build.bat Build Packages
+          .\\build.bat Build Packages NoWait
         shell: pwsh
 
       - name: Upload Installer x64

build.bat

@@ -37,6 +37,7 @@ SET ARGZI=0
 SET ARGPDB=0
 SET INPUT=0
 SET ARGSIGN=0
+SET "Wait=True"
 
 IF /I "%ARG%" == "?"          GOTO ShowHelp
 
@@ -66,6 +67,7 @@ FOR %%A IN (%ARG%) DO (
   IF /I "%%A" == "Zip"        SET "ZIP=True"            & SET /A ARGZI+=1 & SET /A ARGCL+=1 & SET /A ARGM+=1
   IF /I "%%A" == "PDB"        SET "PDB=True"            & SET /A ARGPDB+=1
   IF /I "%%A" == "Sign"       SET "SIGN=True"           & SET /A ARGSIGN+=1
+  IF /I "%%A" == "NoWait"     SET "Wait=False"
 )
 
 REM pre-build checks
@@ -77,7 +79,9 @@ IF EXIST "environments.bat" CALL "environments.bat"
 IF NOT DEFINED MPCBE_MINGW GOTO MissingVar
 IF NOT DEFINED MPCBE_MSYS  GOTO MissingVar
 
-FOR %%X IN (%*) DO SET /A INPUT+=1
+FOR %%X IN (%*) DO (
+  IF /I "%%X" NEQ "NoWait" SET /A INPUT+=1
+)
 SET /A VALID=%ARGB%+%ARGPL%+%ARGC%+%ARGBC%+%ARGPA%+%ARGIN%+%ARGZI%+%ARGSIGN%+%ARGCOMP%+%ARGPDB%
 
 IF %VALID% NEQ %INPUT% GOTO UnsupportedSwitch
@@ -145,23 +149,29 @@ CD /D %~dp0
 
 IF /I "%CONFIG%" == "Filters" (
   CALL :SubFilters Win32
+  IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
   IF /I "%ZIP%" == "True" CALL :SubCreatePackages Filters Win32
   GOTO x64
 )
 
 IF /I "%CONFIG%" == "Resources" CALL :SubResources Win32 && GOTO x64
 
 CALL :SubMPCBE Win32
+IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 
 IF /I "%CONFIG%" == "Main" GOTO x64
 
 CALL :SubResources Win32
+IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 
 IF /I "%INSTALLER%" == "True" CALL :SubCreateInstaller Win32
+IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 IF /I "%ZIP%" == "True"       CALL :SubCreatePackages MPC-BE Win32
+IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 
 IF /I "%CONFIG%" == "All" (
   CALL :SubFilters Win32
+  IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
   IF /I "%ZIP%" == "True" CALL :SubCreatePackages Filters Win32
 )
 
@@ -174,23 +184,29 @@ CD /D %~dp0
 
 IF /I "%CONFIG%" == "Filters" (
   CALL :SubFilters x64
+  IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
   IF /I "%ZIP%" == "True" CALL :SubCreatePackages Filters x64
   GOTO END
 )
 
 IF /I "%CONFIG%" == "Resources" CALL :SubResources x64 && GOTO END
 
 CALL :SubMPCBE x64
+IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 
 IF /I "%CONFIG%" == "Main" GOTO End
 
 CALL :SubResources x64
+IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 
 IF /I "%INSTALLER%" == "True" CALL :SubCreateInstaller x64
+IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 IF /I "%ZIP%" == "True"       CALL :SubCreatePackages MPC-BE x64
+IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
 
 IF /I "%CONFIG%" == "All" (
   CALL :SubFilters x64
+  IF !ERRORLEVEL! NEQ 0 EXIT /B !ERRORLEVEL!
   IF /I "%ZIP%" == "True" CALL :SubCreatePackages Filters x64
 )
 
@@ -210,6 +226,7 @@ MSBuild.exe mpc-be.sln %MSBUILD_SWITCHES%^
  /flp2:LogFile=%LOG_DIR%\filters_warnings_%BUILDCFG%_%1.log;warningsonly;Verbosity=diagnostic
 IF %ERRORLEVEL% NEQ 0 (
   CALL :SubMsg "ERROR" "mpc-be.sln %BUILDCFG% Filter %1 - Compilation failed!"
+  EXIT /B %ERRORLEVEL%
 ) ELSE (
   CALL :SubMsg "INFO" "mpc-be.sln %BUILDCFG% Filter %1 compiled successfully"
 )
@@ -234,6 +251,7 @@ MSBuild.exe mpc-be.sln %MSBUILD_SWITCHES%^
  /flp2:LogFile=%LOG_DIR%\mpc-be_warnings_%BUILDCFG%_%1.log;warningsonly;Verbosity=diagnostic
 IF %ERRORLEVEL% NEQ 0 (
   CALL :SubMsg "ERROR" "mpc-be.sln %BUILDCFG% %1 - Compilation failed!"
+  EXIT /B %ERRORLEVEL%
 ) ELSE (
   CALL :SubMsg "INFO" "mpc-be.sln %BUILDCFG% %1 compiled successfully"
 )
@@ -245,6 +263,7 @@ MSBuild.exe mpciconlib.sln %MSBUILD_SWITCHES%^
  /flp2:LogFile=%LOG_DIR%\mpciconlib_warnings_%BUILDCFG%_%1.log;warningsonly;Verbosity=diagnostic
 IF %ERRORLEVEL% NEQ 0 (
   CALL :SubMsg "ERROR" "mpciconlib.sln %BUILDCFG% %1 - Compilation failed!"
+  EXIT /B %ERRORLEVEL%
 ) ELSE (
   CALL :SubMsg "INFO" "mpciconlib.sln %BUILDCFG% %1 compiled successfully"
 )
@@ -265,6 +284,7 @@ MSBuild.exe MPCBEShellExt.sln %MSBUILD_SWITCHES%^
  /target:%BUILDTYPE% /property:Configuration=%BUILDCFG%;Platform=Win32
 IF %ERRORLEVEL% NEQ 0 (
   CALL :SubMsg "ERROR" "MPCBEShellExt.sln %BUILDCFG% Win32 - Compilation failed!"
+  EXIT /B %ERRORLEVEL%
 ) ELSE (
   CALL :SubMsg "INFO" "MPCBEShellExt.sln %BUILDCFG% Win32 compiled successfully"
 )
@@ -278,6 +298,7 @@ MSBuild.exe MPCBEShellExt.sln %MSBUILD_SWITCHES%^
  /target:%BUILDTYPE% /property:Configuration=%BUILDCFG%;Platform=x64
 IF %ERRORLEVEL% NEQ 0 (
   CALL :SubMsg "ERROR" "MPCBEShellExt.sln %BUILDCFG% x64 - Compilation failed!"
+  EXIT /B %ERRORLEVEL%
 ) ELSE (
   CALL :SubMsg "INFO" "MPCBEShellExt.sln %BUILDCFG% x64 compiled successfully"
 )
@@ -303,7 +324,10 @@ FOR %%A IN ("Armenian" "Basque" "Belarusian" "Catalan" "Chinese Simplified"
  TITLE Compiling mpcresources - %%~A^|%1...
  MSBuild.exe mpcresources.sln %MSBUILD_SWITCHES%^
  /target:%BUILDTYPE% /property:Configuration="Release %%~A";Platform=%1
- IF %ERRORLEVEL% NEQ 0 CALL :SubMsg "ERROR" "Compilation failed!"
+ IF %ERRORLEVEL% NEQ 0 (
+   CALL :SubMsg "ERROR" "Compilation failed!"
+   EXIT /B %ERRORLEVEL%
+ )
 )
 
 IF /I "%1" == "Win32" (
@@ -355,7 +379,10 @@ IF NOT DEFINED InnoSetupPath (
 TITLE Compiling %1 installer...
 
 "%InnoSetupPath%\iscc.exe" /Q /O"%BIN%" "distrib\mpc-be_setup.iss" %ISDefs% %ISDefsSign%
-IF %ERRORLEVEL% NEQ 0 CALL :SubMsg "ERROR" "Compilation failed!"
+IF %ERRORLEVEL% NEQ 0 (
+  CALL :SubMsg "ERROR" "Compilation failed!"
+  EXIT /B %ERRORLEVEL%
+)
 CALL :SubMsg "INFO" "%1 installer successfully built"
 
 CALL :SubGetVersion
@@ -444,7 +471,10 @@ IF /I "%NAME%" == "MPC-BE" (
 TITLE Creating archive %ZIP_NAME%.7z...
 START "7z" /B /WAIT "%SEVENZIP%" a -t7z "%PackagesOut%\%MPCBE_VER%\%ZIP_NAME%.7z" "%PCKG_NAME%"^
  -m0=lzma -mx9 -mmt -ms=on
-IF %ERRORLEVEL% NEQ 0 CALL :SubMsg "ERROR" "Unable to create %ZIP_NAME%.7z!"
+IF %ERRORLEVEL% NEQ 0 (
+  CALL :SubMsg "ERROR" "Unable to create %ZIP_NAME%.7z!"
+  EXIT /B %ERRORLEVEL%
+)
 CALL :SubMsg "INFO" "%ZIP_NAME%.7z successfully created"
 
 IF EXIST "%PCKG_NAME%" RD /Q /S "%PCKG_NAME%"
@@ -587,6 +617,7 @@ ECHO "build.bat %*"
 ECHO.
 ECHO Run "%~nx0 help" for details about the commandline switches.
 CALL :SubMsg "ERROR" "Compilation failed!"
+EXIT /B 1
 
 :SubInnoSetupPath
 SET InnoSetupPath=%*
@@ -607,10 +638,12 @@ IF /I "%~1" == "ERROR" (
 )
 ECHO ------------------------------ & ECHO.
 IF /I "%~1" == "ERROR" (
-  ECHO Press any key to close this window...
-  PAUSE >NUL
+  IF /I "%Wait%" == "True" (
+    ECHO Press any key to close this window...
+    PAUSE >NUL
+  )
   ENDLOCAL
-  EXIT
+  EXIT /B 1
 ) ELSE (
   EXIT /B
 )

distrib/Languages/ChineseSimplified.isl

@@ -26,11 +26,11 @@ LanguageID=$0804
 LanguageCodePage=936
 ; If the language you are translating to requires special font faces or
 ; sizes, uncomment any of the following entries and change them accordingly.
-;DialogFontName=
+DialogFontName=Microsoft YaHei UI
 ;DialogFontSize=8
-;WelcomeFontName=Verdana
+WelcomeFontName=Microsoft YaHei UI
 ;WelcomeFontSize=12
-;TitleFontName=Arial
+TitleFontName=Microsoft YaHei UI
 ;TitleFontSize=29
 ;CopyrightFontName=Arial
 ;CopyrightFontSize=8
@@ -61,11 +61,11 @@ SetupFileCorrupt=安装文件已损坏。请获取程序的新副本。
 SetupFileCorruptOrWrongVer=安装文件已损坏，或是与这个安装程序的版本不兼容。请修正这个问题或获取新的程序副本。
 InvalidParameter=无效的命令行参数：%n%n%1
 SetupAlreadyRunning=安装程序正在运行。
-WindowsVersionNotSupported=这个程序不支持当前计算机运行的Windows版本。
+WindowsVersionNotSupported=这个程序不支持当前计算机运行的 Windows 版本。
 WindowsServicePackRequired=这个程序需要 %1 服务包 %2 或更高。
 NotOnThisPlatform=这个程序将不能运行于 %1。
 OnlyOnThisPlatform=这个程序必须运行于 %1。
-OnlyOnTheseArchitectures=这个程序只能在为下列处理器结构设计的Windows版本中进行安装：%n%n%1
+OnlyOnTheseArchitectures=这个程序只能在为下列处理器架构的 Windows 版本中进行安装：%n%n%1
 WinVersionTooLowError=这个程序需要 %1 版本 %2 或更高。
 WinVersionTooHighError=这个程序不能安装于 %1 版本 %2 或更高。
 AdminPrivilegesRequired=在安装这个程序时您必须以管理员身份登录。
@@ -80,21 +80,21 @@ PrivilegesRequiredOverrideText1=%1 可以为所有用户安装(需要管理员
 PrivilegesRequiredOverrideText2=%1 只能为您安装，或为所有用户安装(需要管理员权限)。
 PrivilegesRequiredOverrideAllUsers=为所有用户安装(&A)
 PrivilegesRequiredOverrideAllUsersRecommended=为所有用户安装(&A) (建议选项)
-PrivilegesRequiredOverrideCurrentUser=只为我安装(&M)
-PrivilegesRequiredOverrideCurrentUserRecommended=只为我安装(&M) (建议选项)
+PrivilegesRequiredOverrideCurrentUser=仅为我安装(&M)
+PrivilegesRequiredOverrideCurrentUserRecommended=仅为我安装(&M) (建议选项)
 
 ; *** 其它错误
 ErrorCreatingDir=安装程序不能创建目录“%1”。
 ErrorTooManyFilesInDir=不能在目录“%1”中创建文件，因为里面的文件太多
 
 ; *** 安装程序公共消息
 ExitSetupTitle=退出安装程序
-ExitSetupMessage=安装程序还未完成安装。如果您现在退出，程序将不能安装。%n%n您可以以后再运行安装程序完成安装。%n%n现在退出安装程序吗？
+ExitSetupMessage=安装程序尚未完成安装。如果您现在退出，程序将不能安装。%n%n您可以以后再运行安装程序完成安装。%n%n现在退出安装程序吗？
 AboutSetupMenuItem=关于安装程序(&A)...
 AboutSetupTitle=关于安装程序
 AboutSetupMessage=%1 版本 %2%n%3%n%n%1 主页：%n%4
 AboutSetupNote=
-TranslatorNote=
+TranslatorNote=Translated by Zhenghan Yang.
 
 ; *** 按钮
 ButtonBack=< 上一步(&B)
@@ -138,7 +138,7 @@ WizardLicense=许可协议
 LicenseLabel=继续安装前请阅读下列重要信息。
 LicenseLabel3=请仔细阅读下列许可协议。您在继续安装前必须同意这些协议条款。
 LicenseAccepted=我同意此协议(&A)
-LicenseNotAccepted=我不同意此协议(&D)
+LicenseNotAccepted=我拒绝此协议(&D)
 
 ; *** “信息”向导页
 WizardInfoBefore=信息
@@ -204,7 +204,7 @@ SelectStartMenuFolderLabel3=安装程序现在将在下列开始菜单文件夹
 SelectStartMenuFolderBrowseLabel=点击“下一步”继续。如果您想选择其它文件夹，点击“浏览”。
 MustEnterGroupName=您必须输入一个文件夹名。
 GroupNameTooLong=文件夹名或路径太长。
-InvalidGroupName=文件夹名是无效的。
+InvalidGroupName=文件夹名无效。
 BadGroupName=文件夹名不能包含下列任何字符：%n%n%1
 NoProgramGroupCheck2=不创建开始菜单文件夹(&D)
 
@@ -228,9 +228,9 @@ ErrorDownloadAborted=下载已中止
 ErrorDownloadFailed=下载失败：%1 %2
 ErrorDownloadSizeFailed=获取下载大小失败：%1 %2
 ErrorFileHash1=校验文件哈希失败：%1
-ErrorFileHash2=无效的文件哈希：预期 %1，实际 %2
+ErrorFileHash2=无效的文件哈希：预期为 %1，实际为 %2
 ErrorProgress=无效的进度：%1，总共%2
-ErrorFileSize=文件大小错误：预期 %1，实际 %2
+ErrorFileSize=文件大小错误：预期为 %1，实际为 %2
 
 ; *** “正在准备安装”向导页
 WizardPreparing=正在准备安装