external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
update translation

See merge request core-developers/forge!2433
This commit is contained in:
swordshine
2020-01-15 11:31:57 +00:00
parent f79e3cad2a 38d614a567
commit 57f445b791
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/card/GameEntityPicker.java
View File

@@ -27,7 +27,7 @@ public class GameEntityPicker extends TabPageScreen<GameEntityPicker> {
public GameEntityPicker(String title, Collection<? extends GameEntityView> choiceList, Collection<CardView> revealList, String revealListCaption, FImage revealListImage, boolean isOptional, final Callback<GameEntityView> callback) {
super(new PickerTab[] {
new PickerTab(choiceList, Localizer.getInstance().getMessage("Choices"), FSkinImage.DECKLIST, 1),
new PickerTab(choiceList, Localizer.getInstance().getMessage("lblChoices"), FSkinImage.DECKLIST, 1),
new PickerTab(revealList, revealListCaption, revealListImage, 0)
}, false);

2
forge-gui/res/languages/zh-CN.properties
View File

@@ -1898,7 +1898,7 @@ lblRemoveYield=移除让过
lblNoActiveAutoYield=没有有效的自动让过
lblNoAutoYield=没有自动让过
#GameEntityPicker.java
lblChoices=选择项
lblChoices=可选项
#ConquestRewardDialog.java
lblSkip=保留
#ConquestChaosBattle.java