Skip to content

Commit 898b852

Browse files
committed
chore(i18n): 补充翻译并修复翻译未被使用
- 新增一些没有被翻译的内容 - 确保一些已经翻译的内容被正常使用 - 将 LangDownloadModpackTypeCook 重命名为 LangDownloadModpackTypeSink 以确保准确描述 - 删除了 LangPageOtherDialogVoteBtn1,因为它的内容与 LangSelectOpen 相同
1 parent 05a53a3 commit 898b852

File tree

24 files changed

+231
-125
lines changed

24 files changed

+231
-125
lines changed

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

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -360,33 +360,33 @@
360360
Case 4481 : Tags.Add(GetLang("LangDownloadModpackTypeLightWeight"))
361361
Case 4482 : Tags.Add(GetLang("LangDownloadModpackTypeHeavyWeight"))
362362
'资源包
363-
Case 403 : Tags.Add("原版风")
364-
Case 400 : Tags.Add("写实风")
365-
Case 401 : Tags.Add("现代风")
366-
Case 402 : Tags.Add("中世纪")
367-
Case 399 : Tags.Add("蒸汽朋克")
368-
Case 5244 : Tags.Add("含字体")
369-
Case 404 : Tags.Add("动态效果")
370-
Case 4465 : Tags.Add("兼容 Mod")
363+
Case 403 : Tags.Add(GetLang("LangDownloadResourcepackTypeVanillaLike"))
364+
Case 400 : Tags.Add(GetLang("LangDownloadResourcepackTypeRealistic"))
365+
Case 401 : Tags.Add(GetLang("LangDownloadResourcepackTypeModern"))
366+
Case 402 : Tags.Add(GetLang("LangDownloadResourcepackTypeMedieval"))
367+
Case 399 : Tags.Add(GetLang("LangDownloadResourcepackTypeSteampunk"))
368+
Case 5244 : Tags.Add(GetLang("LangDownloadResourcepackTypeFonts"))
369+
Case 404 : Tags.Add(GetLang("LangDownloadResourcepackTypeDynamic"))
370+
Case 4465 : Tags.Add(GetLang("LangDownloadResourcepackTypeModed"))
371371
Case 393 : Tags.Add("16x")
372372
Case 394 : Tags.Add("32x")
373373
Case 395 : Tags.Add("64x")
374374
Case 396 : Tags.Add("128x")
375375
Case 397 : Tags.Add("256x")
376-
Case 398 : Tags.Add("超高清")
376+
Case 398 : Tags.Add(GetLang("LangDownloadResourcepackTypeHigherThan512x"))
377377
Case 5193 : Tags.Add("数据包") '有这个 Tag 的项会从资源包请求中被移除
378378
'光影包
379-
Case 6553 : Tags.Add("写实风")
380-
Case 6554 : Tags.Add("幻想风")
381-
Case 6555 : Tags.Add("原版风")
379+
Case 6553 : Tags.Add(GetLang("LangDownloadShaderTypeRealistic"))
380+
Case 6554 : Tags.Add(GetLang("LangDownloadShaderTypeFantasy"))
381+
Case 6555 : Tags.Add(GetLang("LangDownloadShaderTypeVanillaLike"))
382382
'数据包
383-
Case 6948 : Tags.Add("冒险")
384-
Case 6949 : Tags.Add("幻想")
385-
Case 6950 : Tags.Add("支持库")
386-
Case 6952 : Tags.Add("魔法")
387-
Case 6946 : Tags.Add("Mod 相关")
388-
Case 6951 : Tags.Add("科技")
389-
Case 6953 : Tags.Add("实用")
383+
Case 6948 : Tags.Add(GetLang("LangDownloadDatapackTypeAdventure"))
384+
Case 6949 : Tags.Add(GetLang("LangDownloadDatapackTypeFantasy"))
385+
Case 6950 : Tags.Add(GetLang("LangDownloadDatapackTypeLibrary"))
386+
Case 6952 : Tags.Add(GetLang("LangDownloadDatapackTypeMagic"))
387+
Case 6946 : Tags.Add(GetLang("LangDownloadDatapackTypeMod"))
388+
Case 6951 : Tags.Add(GetLang("LangDownloadDatapackTypeTechnology"))
389+
Case 6953 : Tags.Add(GetLang("LangDownloadDatapackTypeUtility"))
390390
End Select
391391
Next
392392
#End Region
@@ -435,69 +435,69 @@
435435
Case "neoforge" : ModLoaders.Add(CompModLoaderType.NeoForge)
436436
Case "datapack" : Type = CompType.DataPack '若包含数据包版本,则优先标为 DataPack
437437
'共用
438-
Case "technology" : Tags.Add("科技")
439-
Case "magic" : Tags.Add("魔法")
440-
Case "adventure" : Tags.Add("冒险")
441-
Case "utility" : Tags.Add("实用")
442-
Case "optimization" : Tags.Add("性能优化")
443-
Case "vanilla-like" : Tags.Add("原版风")
444-
Case "realistic" : Tags.Add("写实风")
438+
Case "technology" : Tags.Add(GetLang("LangDownloadModTypeTech"))
439+
Case "magic" : Tags.Add(GetLang("LangDownloadModTypeMagic"))
440+
Case "adventure" : Tags.Add(GetLang("LangDownloadModTypeAdventure"))
441+
Case "utility" : Tags.Add(GetLang("LangDownloadModTypeUtility"))
442+
Case "optimization" : Tags.Add(GetLang("LangDownloadModTypeOptimization"))
443+
Case "vanilla-like" : Tags.Add(GetLang("LangDownloadResourcepackTypeVanillaLike"))
444+
Case "realistic" : Tags.Add(GetLang("LangDownloadResourcepackTypeRealistic"))
445445
'Mod/数据包
446-
Case "worldgen" : Tags.Add("世界元素")
447-
Case "food" : Tags.Add("食物/烹饪")
448-
Case "game-mechanics" : Tags.Add("游戏机制")
449-
Case "transportation" : Tags.Add("运输")
450-
Case "storage" : Tags.Add("仓储")
451-
Case "decoration" : If Type <> CompType.ResourcePack Then Tags.Add("装饰")
452-
Case "mobs" : If Type <> CompType.ResourcePack Then Tags.Add("生物")
453-
Case "equipment" : If Type <> CompType.ResourcePack Then Tags.Add("装备")
454-
Case "social" : Tags.Add("服务器")
455-
Case "library" : Tags.Add("支持库")
446+
Case "worldgen" : Tags.Add(GetLang("LangDownloadModTypeWorldElement"))
447+
Case "food" : Tags.Add(GetLang("LangDownloadModTypeFood"))
448+
Case "game-mechanics" : Tags.Add(GetLang("LangDownloadModTypeGameMechanics"))
449+
Case "transportation" : Tags.Add(GetLang("LangDownloadModTypeTransportation"))
450+
Case "storage" : Tags.Add(GetLang("LangDownloadModTypeStorage"))
451+
Case "decoration" : If Type <> CompType.ResourcePack Then Tags.Add(GetLang("LangDownloadModTypeDecoration"))
452+
Case "mobs" : If Type <> CompType.ResourcePack Then Tags.Add(GetLang("LangDownloadModTypeMobs"))
453+
Case "equipment" : If Type <> CompType.ResourcePack Then Tags.Add(GetLang("LangDownloadModTypeEquipment"))
454+
Case "social" : Tags.Add(GetLang("LangDownloadModTypeServer"))
455+
Case "library" : Tags.Add(GetLang("LangDownloadModTypeLib"))
456456
'整合包
457-
Case "multiplayer" : Tags.Add("多人")
458-
Case "challenging" : Tags.Add("硬核")
459-
Case "combat" : Tags.Add("战斗")
460-
Case "quests" : Tags.Add("任务")
461-
Case "kitchen-sink" : Tags.Add("水槽包")
462-
Case "lightweight" : Tags.Add("轻量")
457+
Case "multiplayer" : Tags.Add(GetLang("LangDownloadModpackTypeMulti"))
458+
Case "challenging" : Tags.Add(GetLang("LangDownloadModpackTypeChallenging"))
459+
Case "combat" : Tags.Add(GetLang("LangDownloadModpackTypeCombat"))
460+
Case "quests" : Tags.Add(GetLang("LangDownloadModpackTypeQuests"))
461+
Case "kitchen-sink" : Tags.Add(GetLang("LangDownloadModpackTypeSink"))
462+
Case "lightweight" : Tags.Add(GetLang("LangDownloadModpackTypeLightWeight"))
463463
'资源包
464-
Case "simplistic" : Tags.Add("简洁")
465-
Case "combat" : Tags.Add("战斗")
466-
Case "tweaks" : Tags.Add("改良")
464+
Case "simplistic" : Tags.Add(GetLang("LangDownloadResourcepackTypeSimplistic"))
465+
Case "combat" : Tags.Add(GetLang("LangDownloadResourcepackTypeCombat"))
466+
Case "tweaks" : Tags.Add(GetLang("LangDownloadResourcepackTypeTweaks"))
467467

468-
Case "8x-" : Tags.Add("极简")
468+
Case "8x-" : Tags.Add(GetLang("LangDownloadResourcepackTypeLowerThan8x"))
469469
Case "16x" : Tags.Add("16x")
470470
Case "32x" : Tags.Add("32x")
471471
Case "48x" : Tags.Add("48x")
472472
Case "64x" : Tags.Add("64x")
473473
Case "128x" : Tags.Add("128x")
474474
Case "256x" : Tags.Add("256x")
475-
Case "512x+" : Tags.Add("超高清")
476-
477-
Case "audio" : Tags.Add("含声音")
478-
Case "fonts" : Tags.Add("含字体")
479-
Case "models" : Tags.Add("含模型")
480-
Case "gui" : Tags.Add("含 UI")
481-
Case "locale" : Tags.Add("含语言")
482-
Case "core-shaders" : Tags.Add("核心着色器")
483-
Case "modded" : Tags.Add("兼容 Mod")
475+
Case "512x+" : Tags.Add(GetLang("LangDownloadResourcepackTypeHigherThan512x"))
476+
477+
Case "audio" : Tags.Add(GetLang("LangDownloadResourcepackTypeAudio"))
478+
Case "fonts" : Tags.Add(GetLang("LangDownloadResourcepackTypeFonts"))
479+
Case "models" : Tags.Add(GetLang("LangDownloadResourcepackTypeModels"))
480+
Case "gui" : Tags.Add(GetLang("LangDownloadResourcepackTypeGUI"))
481+
Case "locale" : Tags.Add(GetLang("LangDownloadResourcepackTypeLocale"))
482+
Case "core-shaders" : Tags.Add(GetLang("LangDownloadResourcepackTypeCoreShader"))
483+
Case "modded" : Tags.Add(GetLang("LangDownloadResourcepackTypeModed"))
484484
'光影包
485-
Case "fantasy" : Tags.Add("幻想风")
486-
Case "semi-realistic" : Tags.Add("半写实风")
487-
Case "cartoon" : Tags.Add("卡通风")
485+
Case "fantasy" : Tags.Add(GetLang("LangDownloadShaderTypeFantasy"))
486+
Case "semi-realistic" : Tags.Add(GetLang("LangDownloadShaderTypeSemiRealistic"))
487+
Case "cartoon" : Tags.Add(GetLang("LangDownloadShaderTypeCartoon"))
488488
'暂时不添加性能负荷 Tag
489-
'Case "potato" : Tags.Add("极低")
490-
'Case "low" : Tags.Add("低")
491-
'Case "medium" : Tags.Add("中")
492-
'Case "high" : Tags.Add("高")
493-
Case "colored-lighting" : Tags.Add("彩色光照")
494-
Case "path-tracing" : Tags.Add("路径追踪")
495-
Case "pbr" : Tags.Add("PBR")
496-
Case "reflections" : Tags.Add("反射")
489+
'Case "potato" : Tags.Add(GetLang("LangDownloadShaderTypePotato"))
490+
'Case "low" : Tags.Add(GetLang("LangDownloadShaderTypeLow"))
491+
'Case "medium" : Tags.Add(GetLang("LangDownloadShaderTypeMedium"))
492+
'Case "high" : Tags.Add(GetLang("LangDownloadShaderTypeHigh"))
493+
Case "colored-lighting" : Tags.Add(GetLang("LangDownloadShaderTypeColoredLighting"))
494+
Case "path-tracing" : Tags.Add(GetLang("LangDownloadShaderTypePathTracing"))
495+
Case "pbr" : Tags.Add(GetLang("LangDownloadShaderTypePBR"))
496+
Case "reflections" : Tags.Add(GetLang("LangDownloadShaderTypeReflections"))
497497

498498
Case "iris" : Tags.Add("Iris")
499499
Case "optifine" : Tags.Add("OptiFine")
500-
Case "vanilla" : Tags.Add("原版可用")
500+
Case "vanilla" : Tags.Add(GetLang("LangDownloadShaderTypeVanilla"))
501501
End Select
502502
Next
503503
#End Region

Plain Craft Launcher 2/Pages/PageDownload/Comp/PageDownloadPack.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<local:MyComboBoxItem Tag="4472/technology" Content="{StaticResource LangDownloadModpackTypeTech}" />
1515
<local:MyComboBoxItem Tag="4473/magic" Content="{StaticResource LangDownloadModpackTypeMagic}" />
1616
<local:MyComboBoxItem Tag="4475/adventure" Content="{StaticResource LangDownloadModpackTypeAdventure}" />
17-
<local:MyComboBoxItem Tag="/kitchen-sink" Content="{StaticResource LangDownloadModpackTypeCook}" />
17+
<local:MyComboBoxItem Tag="/kitchen-sink" Content="{StaticResource LangDownloadModpackTypeSink}" />
1818
<local:MyComboBoxItem Tag="4476/" Content="{StaticResource LangDownloadModpackTypeExplore}" />
1919
<local:MyComboBoxItem Tag="4477/" Content="{StaticResource LangDownloadModpackTypeGame}" />
2020
<local:MyComboBoxItem Tag="4474/" Content="{StaticResource LangDownloadModpackTypeScienceFiction}" />

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</x:Array>
1414
</local:MyListItem.Buttons>
1515
</local:MyListItem>
16-
<TextBlock Text="社区资源" Margin="13,20,5,4" Opacity="0.6" FontSize="12" />
16+
<TextBlock Text="{StaticResource LangDownloadPageLeftResource}" Margin="13,20,5,4" Opacity="0.6" FontSize="12" />
1717
<local:MyListItem x:Name="ItemMod" Type="RadioBox" IsScaleAnimationEnabled="False" Tag="2" MinPaddingRight="35" Height="36" VerticalAlignment="Top" Title="Mod"
1818
LogoScale="0.97" Logo="M789.504 912.896h-195.072a35.328 35.328 0 0 1-34.816-35.328v-77.312a39.936 39.936 0 0 0-40.448-39.936H481.28a40.448 40.448 0 0 0-40.448 39.936v77.312a34.816 34.816 0 0 1-34.816 35.328H204.8a41.984 41.984 0 0 1-40.448-42.496v-200.192a35.328 35.328 0 0 1 35.328-35.328h72.704a39.936 39.936 0 0 0 39.936-39.936v-37.888a39.936 39.936 0 0 0-39.936-40.448H199.68a35.328 35.328 0 0 1-35.328-35.328V287.744A41.984 41.984 0 0 1 204.8 245.76h176.64v-32.768a102.4 102.4 0 0 1 102.4-102.4h33.792a102.4 102.4 0 0 1 102.4 102.4v32.768h170.496a41.984 41.984 0 0 1 41.984 41.984V460.8h28.672a102.4 102.4 0 0 1 102.4 102.4v33.792a102.4 102.4 0 0 1-102.4 102.4h-28.672V870.4a41.984 41.984 0 0 1-43.008 42.496z m-159.744-70.144h131.584V665.6a34.304 34.304 0 0 1 34.816-34.816h64a31.744 31.744 0 0 0 31.744-31.744V563.2a31.744 31.744 0 0 0-31.744-31.744h-64a34.816 34.816 0 0 1-34.816-35.328V316.416h-177.152a35.328 35.328 0 0 1-35.328-35.328V212.992a31.744 31.744 0 0 0-31.744-31.744h-33.792a31.744 31.744 0 0 0-31.744 31.744v68.096a35.328 35.328 0 0 1-34.816 35.328H234.496v130.048h37.888a110.592 110.592 0 0 1 110.08 110.592v37.888a110.592 110.592 0 0 1-110.08 110.592h-37.888v137.216h136.192v-42.496a110.592 110.592 0 0 1 110.592-110.08h37.888a110.592 110.592 0 0 1 110.592 110.08z">
1919
<local:MyListItem.Buttons>

Plain Craft Launcher 2/Pages/PageInstance/MyLocalModItem.xaml.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ Public Class MyLocalModItem
335335
'更新
336336
If Entry.CanUpdate Then
337337
BtnUpdate.Visibility = Visibility.Visible
338-
BtnUpdate.ToolTip = $"{GetUpdateCompareDescription()}{vbCrLf}点击以更新,右键查看更新日志。"
338+
BtnUpdate.ToolTip = $"{GetUpdateCompareDescription()}{vbCrLf}{GetLang("LangMyLocalModItemToolTipModUpdateUpgradable")}"
339339
Else
340340
BtnUpdate.Visibility = Visibility.Collapsed
341341
End If

Plain Craft Launcher 2/Pages/PageInstance/PageInstanceExport.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,12 @@
301301
Theme="Yellow"
302302
Margin="0,2,0,8"
303303
Visibility="{Binding Checked, ElementName=CheckAdvancedInclude, Converter={StaticResource BooleanToVisibilityConverter}}"/>
304-
<local:MyCheckBox Text="打包资源文件,以避免在导入时下载"
304+
<local:MyCheckBox Text="{StaticResource LangPageVersionExportArchiveMode}"
305305
x:Name="CheckAdvancedInclude"
306-
ToolTip="将 Mod、资源包、光影包的文件直接放入整合包中,这样在导入时就无需联网下载它们。&#xa;建议仅在无法稳定连接 CurseForge 或 Modrinth 时才考虑勾选。"/>
307-
<local:MyCheckBox Text="Modrinth 上传模式"
306+
ToolTip="{StaticResource LangPageVersionExportArchiveModeDesc}"/>
307+
<local:MyCheckBox Text="{StaticResource LangPageVersionExportModrinthStandard}"
308308
x:Name="CheckAdvancedModrinth"
309-
ToolTip="如果你想要打包上传到 Modrinth,勾选此项会生成完全符合 Modrinth 要求的整合包文件。&#xa;由于 Modrinth 要求,只能从 CurseForge 下载的资源将无法联网下载,会被直接放入整合包中。&#xa;此外,勾选后也不能在整合包中包含 PCL 启动器文件。"/>
309+
ToolTip="{StaticResource LangPageVersionExportModrinthStandardDesc}"/>
310310
<local:MyHint Theme="Blue"
311311
RelativeSetup="HintExportConfig"
312312
CanClose="True"

Plain Craft Launcher 2/Pages/PageInstance/PageInstanceSetup.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@
219219
<local:MyCheckBox Grid.Row="5" Grid.Column="1" x:Name="CheckAdvanceRunWait" Tag="VersionAdvanceRunWait" Visibility="Collapsed"
220220
Text="{StaticResource LangPageSetupLaunchLaunchAdvanceOptionsCommandStartWaitForCommand}" Margin="0,5,0,0" />
221221
<StackPanel Margin="0,12,0,4" Grid.Row="6" Grid.ColumnSpan="2" HorizontalAlignment="Left">
222-
<local:MyCheckBox Height="28" Text="禁止更新 Mod" x:Name="CheckAdvanceDisableModUpdate" Tag="VersionAdvanceDisableModUpdate"
223-
ToolTip="禁止为此版本更新 Mod,以防止整合包玩家误操作"
222+
<local:MyCheckBox Height="28" Text="{StaticResource LangPageSetupLaunchLaunchAdvanceOptionsPreventUpdateMod}" x:Name="CheckAdvanceDisableModUpdate" Tag="VersionAdvanceDisableModUpdate"
223+
ToolTip="{StaticResource LangPageSetupLaunchLaunchAdvanceOptionsPreventUpdateModToolTip}"
224224
ToolTipService.Placement="Right" />
225225
<local:MyCheckBox Height="28" Text="{StaticResource LangPageSetupLaunchLaunchAdvanceOptionsIgnoreJavaCompatibility}" x:Name="CheckAdvanceJava" Tag="VersionAdvanceJava"
226226
ToolTipService.Placement="Right"

Plain Craft Launcher 2/Pages/PageOther/PageOtherLeft.xaml.vb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@
146146
e.Handled = True
147147
End Sub
148148
Public Shared Sub TryVote()
149-
If MyMsgBox("是否要打开新功能投票网页?" & vbCrLf & "如果无法打开该网页,请使用 VPN 改善网络环境。",
150-
"新功能投票", "打开", "取消") = 2 Then Return
149+
If MyMsgBox(GetLang("LangPageOtherDialogVoteContent"),
150+
GetLang("LangPageOtherDialogVoteTitle"), GetLang("LangSelectOpen"), GetLang("LangDialogBtnCancel")) = 2 Then Return
151151
OpenWebsite("https://github.com/Meloong-Git/PCL/discussions/categories/%E5%8A%9F%E8%83%BD%E6%8A%95%E7%A5%A8?discussions_q=category%3A%E5%8A%9F%E8%83%BD%E6%8A%95%E7%A5%A8+sort%3Adate_created")
152152
End Sub
153153

0 commit comments

Comments
 (0)