fix: num error

Author: tangge233

Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb

@@ -1393,12 +1393,12 @@ Retry:
             If Title <> FileName.BeforeLast(".") Then Info.Add(FileName.BeforeLast("."))
             Select Case Type
                 Case CompType.Mod
-                    If Dependencies.Any Then Info.Add(GetLangByNumIsPlural(Dependencies.Count, "LangModCompModDependentCount", Dependencies.Count))
+                    If Dependencies.Any Then Info.Add(GetLocationNum(Dependencies.Count) & " " & GetLangByNumIsPlural(Dependencies.Count, "LangModCompModDependentCount"))
                 Case CompType.ModPack
                     If GameVersions.All(Function(v) v.Contains("w")) Then Info.Add($"{GetLang("LangModCompModGameVersion")} {Join(GameVersions, GetLang("LangComma"))}")
             End Select
             If DownloadCount > 0 Then 'CurseForge 的下载次数经常错误地返回 0
-                Info.Add(GetLocationNum(DownloadCount) & GetLangByNumIsPlural(DownloadCount, "LangModCompModDownload"))
+                Info.Add(GetLocationNum(DownloadCount) & " " & GetLangByNumIsPlural(DownloadCount, "LangModCompModDownload"))
             End If
             Info.Add(GetLang("LangModCompModUpdateTime", GetTimeSpanString(ReleaseDate - Date.Now, False)))
             If Status <> CompFileStatus.Release Then Info.Add(StatusDescription)

Plain Craft Launcher 2/Modules/Modi18n.vb

@@ -162,13 +162,12 @@ Module Modi18n
     ''' </summary>
     ''' <param name="Count">数量</param>
     ''' <param name="Key">调用的键名</param>
-    ''' <param name="Param">字段中对应要展示的内容</param>
     ''' <returns>对应单复数形式的译文</returns>
-    Public Function GetLangByNumIsPlural(Count As Int32, Key As String, ParamArray Param As String()) As String
+    Public Function GetLangByNumIsPlural(Count As Int32, Key As String) As String
         If Count <= 1 Then
-            Return GetLang(Key, Param)
+            Return GetLang(Key)
         Else
-            Return GetLang(Key & "P", Param)
+            Return GetLang(Key & "P")
         End If
     End Function
 

Plain Craft Launcher 2/Resources/Language/en-US.xaml

@@ -1354,10 +1354,10 @@ Please check whether the event type is filled in correctly and whether the PCL i
     <s:String x:Key="LangModMinecraftExceptionNoAssetsIndexInfo">Assets Index for this instance does not exist.</s:String>
     <s:String x:Key="LangModMinecraftExceptionAssetsIndexFileNotFound">Assets Index not found.</s:String>
     <s:String x:Key="LangModMinecraftExceptionUnexpectedResult">Unexpected result ({0})</s:String>
-    <s:String x:Key="LangModCompModDependentCount">{0} dependency</s:String>
-    <s:String x:Key="LangModCompModDependentCountP">{0} dependencies</s:String>
-    <s:String x:Key="LangModCompModDownload">{0} download</s:String>
-    <s:String x:Key="LangModCompModDownloadP">{0} downloads</s:String>
+    <s:String x:Key="LangModCompModDependentCount">dependency</s:String>
+    <s:String x:Key="LangModCompModDependentCountP">dependencies</s:String>
+    <s:String x:Key="LangModCompModDownload">download</s:String>
+    <s:String x:Key="LangModCompModDownloadP">downloads</s:String>
     <s:String x:Key="LangModCompModGameVersion">game version</s:String>
     <s:String x:Key="LangModCompModUpdateTime">updated {0}</s:String>
     <s:String x:Key="LangModCompModSaveAs">Save as</s:String>

Plain Craft Launcher 2/Resources/Language/zh-CN.xaml

@@ -597,7 +597,7 @@ PCL 推荐你在开始下载前，在 设置 → 版本隔离 中开启版本隔
     <s:String x:Key="LangDownloadModpackTypeTech">科技</s:String>
     <s:String x:Key="LangDownloadModpackTypeMagic">魔法</s:String>
     <s:String x:Key="LangDownloadModpackTypeAdventure">冒险</s:String>
-    <s:String x:Key="LangDownloadModpackTypeCook">大杂烩</s:String>
+    <s:String x:Key="LangDownloadModpackTypeCook">水槽包/大杂烩</s:String>
     <s:String x:Key="LangDownloadModpackTypeExplore">探索</s:String>
     <s:String x:Key="LangDownloadModpackTypeGame">小游戏</s:String>
     <s:String x:Key="LangDownloadModpackTypeScienceFiction">科幻</s:String>
@@ -803,7 +803,7 @@ PCL 推荐你在开始下载前，在 设置 → 版本隔离 中开启版本隔
     <s:String x:Key="LangPageOtherAboutThanksUsersTitle">PCL 内群的各位</s:String>
     <s:String x:Key="LangPageOtherAboutThanksUsers">感谢内群的沙雕网友们这么久以来对我和 PCL 的支持与鼓励！</s:String>
     <s:String x:Key="LangPageOtherAboutSponsors">赞助者</s:String>
-    <s:String x:Key="LangPageOtherAboutSponsorsSubtitle">以下是 2024 年 12 月的高级赞助者们！感谢各位对 PCL 和伟大的咕咕咕事业的支持！</s:String>
+    <s:String x:Key="LangPageOtherAboutSponsorsSubtitle">以下是 2025 年 1 月的高级赞助者们！感谢各位对 PCL 和伟大的咕咕咕事业的支持！</s:String>
     <s:String x:Key="LangPageOtherAboutSponsorsCreateUnlockCode">生成解锁码</s:String>
     <s:String x:Key="LangPageOtherAboutSponsorsDonate">赞助作者</s:String>
     <s:String x:Key="LangPageOtherAboutSponsorsCopyUUID">复制识别码</s:String>
@@ -1156,7 +1156,7 @@ PCL 推荐你在开始下载前，在 设置 → 版本隔离 中开启版本隔
     <s:String x:Key="LangPageVersionOverallIconCommandBlock">命令方块</s:String>
     <s:String x:Key="LangPageVersionOverallIconGoldBlock">金块</s:String>
     <s:String x:Key="LangPageVersionOverallIconGrass">草方块</s:String>
-    <s:String x:Key="LangPageVersionOverallIconGrassPath">草径</s:String>
+    <s:String x:Key="LangPageVersionOverallIconGrassPath">土径</s:String>
     <s:String x:Key="LangPageVersionOverallIconAnvil">铁砧</s:String>
     <s:String x:Key="LangPageVersionOverallIconRedstoneBlock">红石块</s:String>
     <s:String x:Key="LangPageVersionOverallIconRedstoneLampOn">红石灯（开）</s:String>
@@ -1365,7 +1365,11 @@ PCL 不支持其他乱七八糟的下载协议。</s:String>
     <s:String x:Key="LangModMinecraftDialogNewVersionBtnDownload">下载</s:String>
     <s:String x:Key="LangModMinecraftDialogNewVersionBtnLog">更新日志</s:String>
     <s:String x:Key="LangModMinecraftVersionVanilla">原版</s:String>
-    <s:String x:Key="LangModMinecraftInvalidMcFolder">无法访问 Minecraft 文件夹：{0}</s:String>
+    <s:String x:Key="LangModMinecraftInvalidMcFolder">失效的 Minecraft 文件夹：
+{0}
+
+{1}</s:String>
+    <s:String x:Key="LangModMinecraftDialogTitleInvalidMcFolder">Minecraft 文件夹失效</s:String>
     <s:String x:Key="LangModMinecraftNotLoaded">该版本未被加载，请向作者反馈此问题</s:String>
     <s:String x:Key="LangModMinecraftUnableGetVersion">PCL 无法识别该版本的 MC 版本号</s:String>
     <s:String x:Key="LangModMinecraftGetVersionFail">无法识别：{0}</s:String>
@@ -1692,7 +1696,7 @@ PCL 不支持其他乱七八糟的下载协议。</s:String>
     <s:String x:Key="LangModModpackTaskGetModDownloadInfo">获取 Mod 下载信息</s:String>
     <s:String x:Key="LangModModpackExceptionOnlineModDeleted">整合包中的部分 Mod 版本已被 Mod 作者删除，所以没法继续安装了，请向整合包作者反馈该问题</s:String>
     <s:String x:Key="LangModModpackTaskInitModDownloadInfo">构造 Mod 下载信息</s:String>
-    <s:String x:Key="LangModModpackDialogContentDownloadOptionalFile">是否要下载整合包中的可选文件 {0}？</s:String>
+    <s:String x:Key="LangModModpackDialogContentDownloadOptionalFile">是否要下载可选文件 {0}？</s:String>
     <s:String x:Key="LangModModpackDialogTitleDownloadOptionalFile">下载可选文件</s:String>
     <s:String x:Key="LangModModpackTaskDownloadMod">下载 Mod</s:String>
     <s:String x:Key="LangModModpackTaskDownloadModMainLoader">下载 Mod（主加载器）</s:String>
@@ -1736,9 +1740,10 @@ PCL 不支持其他乱七八糟的下载协议。</s:String>
     <s:String x:Key="LangModModpackExceptionMMCModpackError">MMC 整合包安装信息存在问题</s:String>
     <s:String x:Key="LangModModpackExceptionMCBBSModpackError">MCBBS 整合包安装信息存在问题</s:String>
     <s:String x:Key="LangModModpackDialogTitleAnotherLauncher">换用整合包启动器？</s:String>
-    <s:String x:Key="LangModModpackDialogContentAnotherLauncher">整合包中似乎自带了启动器，是否换用它继续安装？
-通常推荐这样做，以获得最佳体验。
+    <s:String x:Key="LangModModpackDialogContentAnotherLauncher">整合包里似乎自带了启动器，是否换用它继续安装？
 即将打开：{0}</s:String>
+    <s:String x:Key="LangModModpackDialogBtnAnotherLauncher1">换用</s:String>
+    <s:String x:Key="LangModModpackDialogBtnAnotherLauncher2">不换用</s:String>
     <s:String x:Key="LangModModpackExceptionNoModpackFound">未能找到适合的文件结构，这可能不是一个 MC 压缩包</s:String>
     <!--ModWatcher-->
     <s:String x:Key="LangModWatcherMcCrashed">检测到 Minecraft 出现错误，错误分析已开始……</s:String>