Merge branch 'master' into 'master'

update simplified chinese translation

See merge request core-developers/forge!5674

forge-gui/res/languages/zh-CN.properties

@@ -888,11 +888,11 @@ lblasavatar=作为头像
 lblfromschemedeck=从魔王套牌
 lblfromplanardeck=从时空竞逐套牌
 lblfromconspiracydeck=从诡局套牌
-lblfromdungeondeck=from dungeon deck
+lblfromdungeondeck=从地牢套牌
 lbltoschemedeck=到魔王套牌
 lbltoplanardeck=到时空竞逐套牌
 lbltoconspiracydeck=到诡局套牌
-lbltodungeondeck=to dungeon deck
+lbltodungeondeck=到地牢套牌
 lblMove=移到
 #VDock.java
 lblDock=停靠栏
@@ -1614,12 +1614,12 @@ btnQuit=退出
 btnContinue=继续
 btnRestart=重新开始
 #LimitedPoolType.java
-lblLimitedPoolFull=Full Cardpool
-lblLimitedBlock=Block / Set
-lblLimitedPrerelease=Prerelease
-lblLimitedFantasy=Fantasy Block
-lblLimitedCustom=Custom Cube
-lblLimitedChaos=Chaos Draft
+lblLimitedPoolFull=全牌池
+lblLimitedBlock=环境/系列
+lblLimitedPrerelease=预售
+lblLimitedFantasy=幻想环境
+lblLimitedCustom=自定义Cube
+lblLimitedChaos=混沌轮抓
 #TournamentWinLoseController.java
 btnSaveQuit=保存并退出
 lblCongratulations=恭喜！
@@ -1941,12 +1941,12 @@ lblCallCoinFlip=掷骰子
 lblWin=赢
 lblLose=输
 #FlipOntoBattlefieldEffect.java
-lblChooseDesiredLocation=Choose a card to represent the center of the desired card landing location.
-lblDidNotFlipOver=The card did not turn over.
-lblFlippedOver=The card turned over {0} time(s).
-lblDidNotLandOnCards=The card did not land on any cards.
-lblLandedOnOneCard=The card landed on {0}.
-lblLandedOnTwoCards=The card landed on {0} and {1}.
+lblChooseDesiredLocation=选择一张牌来指定牌张将要降落的位置。
+lblDidNotFlipOver=牌张未翻转。
+lblFlippedOver=牌张翻转了{0}次。
+lblDidNotLandOnCards=牌张没有落到任何卡上。
+lblLandedOnOneCard=牌张落在了{0}上。
+lblLandedOnTwoCards=牌张落在了{0}和{1}上。
 #InvestigateEffect.java
 lblWouldYouLikeInvestigate=你想要探查吗？
 #LifeSetEffect.java
@@ -2151,8 +2151,8 @@ lblGameplayResults=游戏结果
 lblResultIs=结果为：{0}
 lblPlayerRandomChosenNumberIs={0}随机选择的数字为{1}
 lblPlayerChoosesNumberIs={0}选择的数字为：{1}
-lblRandomColorChosen=Randomly chosen color: {0}
-lblRandomTypeChosen=Randomly chosen type: {0}
+lblRandomColorChosen=随机选择的颜色为{0}
+lblRandomTypeChosen=随机选择的类型为{0}
 lblPlayerChooseValueOfEffectOfCard={0}选择{2}对{1}生效
 lblPlayerFlipComesUpValue={0}掷到了{1}
 lblPlayerActionFlip={0}{1}了骰子