Merge branch 'master' into 'master'

update simplified chinese translation

See merge request core-developers/forge!2264

forge-gui/res/languages/de-DE.properties

@@ -548,6 +548,7 @@ lblPreconstructedDecks=Vorkonstruiertes Deck
 lblQuestOpponentDecks=Quest-Gegner-Deck
 lblRandomColorDecks=Decks - zufällige Farben
 lblRandomStandardArchetypeDecks=Decks - zufälliger Standard-Archetyp
+lblRandomPioneerArchetypeDecks=Random Pioneer Archetype Decks
 lblRandomModernArchetypeDecks=Decks - zufälliger Modern-Archetyp
 lblRandomLegacyArchetypeDecks=Decks - zufälliger Legacy-Archetyp
 lblRandomVintageArchetypeDecks=Decks - zufälliger Vintage-Archetyp

forge-gui/res/languages/es-ES.properties

@@ -548,6 +548,7 @@ lblPreconstructedDecks=Mazos Preconstruidos
 lblQuestOpponentDecks=Mazos de los Oponentes de la Aventura
 lblRandomColorDecks=Mazos Aleatorios por Color
 lblRandomStandardArchetypeDecks=Mazos Standard por Arquetipo
+lblRandomPioneerArchetypeDecks=Random Pioneer Archetype Decks
 lblRandomModernArchetypeDecks=Mazos Modern por Arquetipo
 lblRandomLegacyArchetypeDecks=Mazos Legacy por Arquetipo
 lblRandomVintageArchetypeDecks=Mazos Vintage por Arquetipo

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

@@ -548,6 +548,7 @@ lblPreconstructedDecks=预组套牌
 lblQuestOpponentDecks=冒险之旅套牌
 lblRandomColorDecks=随机颜色套牌
 lblRandomStandardArchetypeDecks=随机标准原型套牌
+lblRandomPioneerArchetypeDecks=随机先驱原型套牌
 lblRandomModernArchetypeDecks=随机摩登原型套牌
 lblRandomLegacyArchetypeDecks=随机薪传原型套牌
 lblRandomVintageArchetypeDecks=随机特选原型套牌
@@ -883,7 +884,7 @@ lblQty=数量
 lblQuantity=数量
 lblSide=备牌
 lblSideboard=备牌
-lblNew=新建
+lblNew=新获得
 lblOwned=拥有
 lblPower=力量
 ttPower=力量
@@ -992,7 +993,7 @@ lblOathbreakers=破誓者
 lblLoadingFonts=加载字体中
 lblLoadingCardTranslations=加载卡牌翻译中
 lblFinishingStartup=完成启动
-lblPreloadExtendedArt=Preload Extended Art...
+lblPreloadExtendedArt=预加载拉伸卡图
 #LobbyScreen.java
 lblMore=更多
 lblLoadingNewGame=载入新游戏中
@@ -1147,28 +1148,28 @@ lblArrangeCardsToBePutOnTopOfYourLibrary=为放于牌库顶的卡牌排序
 lblTopOfLibrary=牌库顶
 lblSelectCardsToBePutIntoTheGraveyard=选择要放于坟场的卡牌
 lblCardsToPutInTheGraveyard=放于坟场的卡牌
-lblDiscardUpToNCards=Discard up to %d card(s)
-lblDiscardNCards=Discard %d card(s)
-lblSelectNCardsToDiscardUnlessDiscarduType=Select %d card(s) to discard, unless you discard a %s.
-lblCleanupPhase=Cleanup Phase
-lblSelectCardsToDiscardHandDownMaximum=Select %d card(s) to discard to bring your hand down to the maximum of %max cards.
-lblChooseMinCardToDiscard=Choose %d card(s) to discard
-lblDiscarded=Discarded
-lblChooseDamageOrderFor=Choose Damage Order for %s
-lblDamagedFirst=Damaged First
-lblChooseBlockerAfterWhichToPlaceAttackert=Choose blocker after which to place %s in damage order; cancel to place it first
-lblPutCardOnTopOrBottomLibrary=Put %s on the top or bottom of your library?
-lblChooseOrderCardsPutIntoLibrary=Choose order of cards to put into the library
-lblClosestToTop=Closest to top
-lblChooseOrderCardsPutOntoBattlefield=Choose order of cards to put onto the battlefield
-lblPutFirst=Put first
-lblChooseOrderCardsPutIntoGraveyard=Choose order of cards to put into the graveyard
-lblClosestToBottom=Closest to bottom
-lblChooseOrderCardsPutIntoPlanarDeck=Choose order of cards to put into the planar deck
-lblChooseOrderCardsPutIntoSchemeDeck=Choose order of cards to put into the scheme deck
-lblChooseOrderCopiesCast=Choose order of copies to cast
-lblDelveHowManyCards=Delve how many cards?
-lblExileWhichCard=Exile which card?
+lblDiscardUpToNCards=最多弃%d张牌
+lblDiscardNCards=弃%d张牌
+lblSelectNCardsToDiscardUnlessDiscarduType=选择要丢弃的%d张牌，除非你丢弃%s。
+lblCleanupPhase=清除步骤
+lblSelectCardsToDiscardHandDownMaximum=选择要丢弃的%d张牌，以使你的手牌数量减少到%max张。
+lblChooseMinCardToDiscard=选择%d张牌弃掉
+lblDiscarded=弃牌
+lblChooseDamageOrderFor=选择%s造成伤害的顺序
+lblDamagedFirst=先造成伤害
+lblChooseBlockerAfterWhichToPlaceAttackert=选择%s后造成伤害的阻挡者; cancel to place it first
+lblPutCardOnTopOrBottomLibrary=将%s放到牌库顶还是底？
+lblChooseOrderCardsPutIntoLibrary=选择要放入牌库中的牌的顺序
+lblClosestToTop=最接近顶部
+lblChooseOrderCardsPutOntoBattlefield=选择要放入战场中的牌的顺序
+lblPutFirst=放在最前
+lblChooseOrderCardsPutIntoGraveyard=选择要放入坟场中的牌的顺序
+lblClosestToBottom=最接近底部
+lblChooseOrderCardsPutIntoPlanarDeck=选择要放入时空竞逐套牌中的牌的顺序
+lblChooseOrderCardsPutIntoSchemeDeck=选择要放入魔王套牌中的牌的顺序
+lblChooseOrderCopiesCast=选择要复制品的释放顺序。
+lblDelveHowManyCards=掘穴多少张牌？
+lblExileWhichCard=放逐哪张牌?
 #AbstractGuiGame.java
 lblConcedeCurrentGame=这局游戏认输。\n\n确认吗？
 lblConcedeTitle=这局游戏认输?
@@ -1226,15 +1227,15 @@ lblPuzzleText3=当解谜开始的时候，该谜题的要求将会显示在弹
 lblChooseAPuzzle=选择一个谜题
 lblLoadingThePuzzle=加载新的谜题中
 #InputPassPriority.java
-lblCastSpell=cast spell
-lblPlayLand=play land
-lblActivateAbility=activate ability
-lblYouHaveManaFloatingInYourManaPoolCouldBeLostIfPassPriority=You have mana floating in your mana pool that could be lost if you pass priority now.
-lblYouWillTakeManaBurnDamageEqualAmountFloatingManaLostThisWay=You will take mana burn damage equal to the amount of floating mana lost this way.
-lblManaFloating=Mana Floating
+lblCastSpell=释放咒语
+lblPlayLand=使用地
+lblActivateAbility=启动式异能
+lblYouHaveManaFloatingInYourManaPoolCouldBeLostIfPassPriority=你的法术力池中还有剩余的法术力，如果现在让过优先权，这些法术力可能会丢失。
+lblYouWillTakeManaBurnDamageEqualAmountFloatingManaLostThisWay=你将受到等同于通过这种方式失去的剩余法术力数量的法术力灼烧伤害。
+lblManaFloating=剩余法术力
 #InputPayManaOfCostPayment.java
-lblPayManaCost=Pay Mana Cost:
-lblLifePaidForPhyrexianMana=(%d life paid for phyrexian mana)
-lblClickOnYourLifeTotalToPayLifeForPhyrexianMana=Click on your life total to pay life for phyrexian mana.
-lblClickOnYourLifeTotalToPayLifeForBlackMana=Click on your life total to pay life for black mana.
-lblClickOnYourLifeTotalToPayLifeForPhyrexianOrBlackMana=Click on your life total to pay life for phyrexian mana or black mana.
+lblPayManaCost=支付法术力：
+lblLifePaidForPhyrexianMana=（以%d生命支付了非瑞克西亚法术力）
+lblClickOnYourLifeTotalToPayLifeForPhyrexianMana=单击你的总生命，以生命值支付非瑞克西亚法术力。
+lblClickOnYourLifeTotalToPayLifeForBlackMana=单击你的总生命,以生命值支付黑色法术力。
+lblClickOnYourLifeTotalToPayLifeForPhyrexianOrBlackMana=单击你的总生命,以生命值支付黑色或非瑞克西亚法术力。