Merge branch 'master' into 'master'

update simplified chinese translation

See merge request core-developers/forge!2286

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

@@ -757,7 +757,7 @@ lblcopiesof=副本
 #ItemListView.java
 lblUniqueCardsOnly=每张牌都只显示一个画
 ttUniqueCardsOnly=切换是否每张牌都只显示一个画
-lblListView=List View
+lblListView=列表视图
 #ACEditorBase.java
 lblAddcard=添加牌
 ttAddcard=将选定的牌添加到当前套牌（双击该行或者空格）
@@ -790,9 +790,9 @@ lblCollapseallgroups=折叠所有组
 lblGroupby=分组
 lblPileby=堆积
 lblColumns=行
-lblPiles=Piles:
-lblGroups=Groups:
-lblImageView=Image View
+lblPiles=柱状:
+lblGroups=分组:
+lblImageView=图片视图
 #CEditorVariant.java, CEditorConstructed.java
 lblCatalog=目录
 lblAdd=添加
@@ -812,7 +812,7 @@ lbltoplanardeck=到时空竞逐套牌
 lbltoconspiracydeck=到诡局套牌
 lblMove=移到
 #VDock.java
-lblDock=Dock
+lblDock=停靠栏
 lblViewDeckList=查看套牌列表
 lblRevertLayout=还原布局
 lblOpenLayout=打开布局
@@ -1244,138 +1244,138 @@ lblClickOnYourLifeTotalToPayLifeForPhyrexianMana=单击你的总生命，以生
 lblClickOnYourLifeTotalToPayLifeForBlackMana=单击你的总生命,以生命值支付黑色法术力。
 lblClickOnYourLifeTotalToPayLifeForPhyrexianOrBlackMana=单击你的总生命,以生命值支付黑色或非瑞克西亚法术力。
 #GameLogFormatter.java
-lblLogScryTopBottomLibrary=%s scried %top card(s) to the top of the library and %bottom card(s) to the bottom of the library
-lblLogScryTopLibrary=%s scried %top card(s) to the top of the library
-lblLogScryBottomLibrary=%s scried %bottom card(s) to the bottom of the library
-lblPlayerHasMulliganedDownToNCards=%s has mulliganed down to %d cards.
-lblPlayerDidntAttackThisTurn=%s didn't attack this turn.
+lblLogScryTopBottomLibrary=%s将%top张牌放到牌库顶和%bottom张牌放到牌库底
+lblLogScryTopLibrary=%s将%top张牌放到牌库顶
+lblLogScryBottomLibrary=%s将%top张牌放到牌库底
+lblPlayerHasMulliganedDownToNCards=%s已经调度到%d张牌。
+lblPlayerDidntAttackThisTurn=%s本回合没有进攻。
 #FormatFilter.java
-lblAllSetsFormats=All Sets/Formats
-lblOtherFormats=Other Formats...
-lblChooseSets=Choose Sets...
+lblAllSetsFormats=所有系列/赛制
+lblOtherFormats=其他赛制
+lblChooseSets=选择系列
 #HistoricFormatSelect.java
-lblChooseFormat=Choose Format
+lblChooseFormat=选择赛制
 #TriggerAdapt.java
-lblAdapt=Adapt
+lblAdapt=演化
 #TriggerAttached.java
-lblAttachee=Attachee
+lblAttachee=结附
 #TriggerAttackerBlocked.java
-lblNumberBlockers=Number Blockers
-lblBlocker=Blocker
+lblNumberBlockers=阻挡者数
+lblBlocker=阻挡者
 #TriggerAttackersDeclared.java
-lblNumberAttackers=Number Attackers
+lblNumberAttackers=攻击者数
 #TriggerAttackerUnblockedOnce.java
-lblAttackingPlayer=AttackingPlayer
-lblDefenders=Defenders
+lblAttackingPlayer=进攻牌手
+lblDefenders=阻挡者
 #TriggerBecomeMonarch.java
-lblPlayer=Player
+lblPlayer=牌手
 #TriggerBecomeMonstrous.java
-lblMonstrous=Monstrous
+lblMonstrous=已蛮化
 #TriggerBecomeRenowned.java
-lblRenowned=Renowned
+lblRenowned=已铭勇
 #TriggerBecomesTarget.java
-lblSource=Source
-lblTarget=Target
+lblSource=来源
+lblTarget=目标
 #TriggerBecomesTargetOnce.java
-lblTargets=Targets
+lblTargets=目标
 #TriggerBlockersDeclared.java
-lblBlockers=Blockers
+lblBlockers=阻挡者
 #TriggerChampioned.java
-lblChampioned=Championed
+lblChampioned=夺冠
 #TriggerChangesController.java
-lblChangedController=Changed Controller
+lblChangedController=改变操控者
 #TriggerChangesZone.java
-lblZoneChanger=Zone Changer
+lblZoneChanger=改变区域
 #TriggerChangesZoneAll.java
-lblAmount=Amount
+lblAmount=共计
 #TriggerCounterAdded.java
-lblAddedOnce=Added once
+lblAddedOnce=添加一次
 #TriggerCountered.java
-lblCountered=Countered
-lblCause=Cause
+lblCountered=反击
+lblCause=原因
 #TriggerCounteredRemoved.java
-lblRemovedFrom=Removed from
+lblRemovedFrom=删除
 #TriggerCrewed.java
-lblVehicle=Vehicle
-lblCrew=Crew
+lblVehicle=载具
+lblCrew=搭载
 #TriggerCycled.java
-lblCycled=Cycled
+lblCycled=已循环
 #TriggerDamageDealtOnce.java
-lblDamageSource=Damage Source
-lblDamaged=Damaged
+lblDamageSource=伤害来源
+lblDamaged=造成伤害
 #TriggerDamagePrevented.java
-lblDamageTarget=Damage Target
+lblDamageTarget=伤害目标
 #TriggerDestroyed.java
-lblDestroyed=Destroyed
-lblDestroyer=Destroyer
+lblDestroyed=被消灭
+lblDestroyer=破坏者
 #TriggerDevoured.java
-lblDevoured=Devoured
+lblDevoured=已吞噬
 #TriggerDiscarded.java
-lblDiscarded=Discarded
+lblDiscarded=丢弃
 #TriggerEvolved.java
-lblEvolved=Evolved
+lblEvolved=已进化
 #TriggerExerted.java
-lblExerted=Exerted
+lblExerted=已耗竭
 #TriggerExiled.java
-lblExiled=Exiled
+lblExiled=被放逐
 #TriggerExploited.java
-lblExploited=Exploited
-lblExploiter=Exploiter
+lblExploited=被榨取
+lblExploiter=榨取者
 #TriggerExplores.java
-lblExplorer=Explorer
+lblExplorer=勘察者
 #TriggerFight.java
-lblFighter=Fighter
+lblFighter=互斗者
 #TriggerLandPlayed.java
-lblLandPlayed=Land played
+lblLandPlayed=已下地
 #TriggerLifeGained.java
-lblGainedAmount=Gained Amount
+lblGainedAmount=获得的数量
 #TriggerLifeLost.java
-lblLostAmount=Lost Amount
+lblLostAmount=失去的数量
 #TriggerPayCumulativeUpkeep.java
-lblMana=Mana
+lblMana=法术力
 #TriggerPayLife.java
-lblPaidAmount=Paid Amount
+lblPaidAmount=已支付的数量
 #TriggerPhaseIn.java
-lblPhasedIn=Phased In
+lblPhasedIn=已跃回
 #TriggerPhaseOut.java
-lblPhasedOut=Phased Out
+lblPhasedOut=已跃离
 #TriggerRoller.java
-lblRoller=Roller
+lblRoller=回滚者
 #TriggerPlaneswalkedFrom.java
-lblPlaneswalkedFrom=Planeswalked From
+lblPlaneswalkedFrom=时空旅行自
 #TriggerPlaneswalkedTo.java
-lblPlaneswalkedTo=Planeswalked To
+lblPlaneswalkedTo=时空旅行到
 #TriggerRegenerated.java
-lblRegenerated=Regenerated
+lblRegenerated=已重生
 #TriggerRevealed.java
-lblRevealed=Revealed
+lblRevealed=已展示
 #TriggerSacrificed.java
-lblSacrificed=Sacrificed
+lblSacrificed=已牺牲
 #TriggerScry.java
-lblScryer=Scryer
+lblScryer=占卜者
 #TriggerSearchLibrary.java
-lblSearcher=Searcher
+lblSearcher=搜寻者
 #TriggerShuffled.java
-lblShuffler=Shuffler
+lblShuffler=洗牌者
 #TriggerSpellAbilityCast.java
-lblActivator=Activator
+lblActivator=启动自
 #TriggerSpellAbilityCast.java
-lblSpellAbility=SpellAbility
+lblSpellAbility=咒语异能
 #TriggerTaps.java
-lblTapped=Tapped
+lblTapped=已横置
 #TriggerTapsForMana.java
-lblTappedForMana=Tapped for Mana
-lblProduced=Produced
+lblTappedForMana=为法术力横置
+lblProduced=产生
 #TriggerTransformed.java
-lblTransformed=Transformed
+lblTransformed=已转化
 #TriggerTurnFaceUp.java
-lblTurnFaceUp=Turn Face up
+lblTurnFaceUp=面朝上
 #TriggerUnattach.java
-lblObject=Object
-lblAttachment=Attachment
+lblObject=物件
+lblAttachment=装备
 #TriggerUntaps.java
-lblUntapped=Untapped
+lblUntapped=未横置
 #TriggerVote.java
-lblVoters=Voters
+lblVoters=投票
 #PermanentCreatureEffect.java
-lblCreature=Creature
+lblCreature=生物