Merge branch 'master' into 'german-translation'

# Conflicts:
#   forge-gui/res/languages/de-DE.properties

forge-gui/res/languages/en-US.properties

@@ -1113,14 +1113,14 @@ lblSelectBlocker=Select creatures to block
 lblOrSelectBlockTarget= or select another attacker to declare blockers for.
 lblMorph=Morph
 #PlayerControllerHuman.java
-lblYouHaveWonTheCoinToss=%s, you have won the coin toss.
-lblYouLostTheLastGame=%s, you lost the last game.
+lblYouHaveWonTheCoinToss={0}, you have won the coin toss.
+lblYouLostTheLastGame={0}, you lost the last game.
 lblWouldYouLiketoPlayorDraw=Would you like to play or draw?
 lblWhoWouldYouLiketoStartthisGame=Who would you like to start this game? (Click on the portrait.)
 lblPlay=Play
 lblDraw=Draw
-lblTooFewCardsMainDeck=Too few cards in your main deck (minimum %s), please make modifications to your deck again.
-lblTooManyCardsSideboard=Too many cards in your sideboard (maximum %s), please make modifications to your deck again.
+lblTooFewCardsMainDeck=Too few cards in your main deck (minimum {0}), please make modifications to your deck again.
+lblTooManyCardsSideboard=Too many cards in your sideboard (maximum {0}), please make modifications to your deck again.
 lblAssignCombatDamageWerentBlocked=Do you want to assign its combat damage as though it weren't blocked?
 lblChosenCards=Chosen Cards
 lblAttacker=Attacker
@@ -1169,15 +1169,15 @@ lblSelectCardsToBePutIntoTheGraveyard=Select cards to be put into the graveyard
 lblCardsToPutInTheGraveyard=Cards to put in the graveyard
 lblDiscardUpToNCards=Discard up to %d card(s)
 lblDiscardNCards=Discard %d card(s)
-lblSelectNCardsToDiscardUnlessDiscarduType=Select %d card(s) to discard, unless you discard a %s.
+lblSelectNCardsToDiscardUnlessDiscarduType=Select %d card(s) to discard, unless you discard a {0}.
 lblCleanupPhase=Cleanup Phase
-lblSelectCardsToDiscardHandDownMaximum=Select %d card(s) to discard to bring your hand down to the maximum of %max cards.
+lblSelectCardsToDiscardHandDownMaximum=Select {0} card(s) to discard to bring your hand down to the maximum of {1} cards.
 lblChooseMinCardToDiscard=Choose %d card(s) to discard
 lblDiscarded=Discarded
-lblChooseDamageOrderFor=Choose Damage Order for %s
+lblChooseDamageOrderFor=Choose Damage Order for {0}
 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?
+lblChooseBlockerAfterWhichToPlaceAttackert=Choose blocker after which to place {0} in damage order; cancel to place it first
+lblPutCardOnTopOrBottomLibrary=Put {0} 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
@@ -1190,20 +1190,20 @@ lblChooseOrderCopiesCast=Choose order of copies to cast
 lblDelveHowManyCards=Delve how many cards?
 lblExileWhichCard=Exile which card?
 lblDestroy=destroy
-lblUpTo=up to
+lblSelectUpToNumTargetToAction=Select up to %d {0}(s) to {1}.
+lblSelectNumTargetToAction=Select %d {0}(s) to {1}.
 lblHighestBidder=Highest Bidder
 lblUseTriggeredAbilityOf=Use triggered ability of
 lblExertAttackersConfirm=Exert Attackers?
-lblThereNoCardIn=There are no cards in
-lblPut=Put
-lblOnTheTopLibraryOrGraveyard=on the top of library or graveyard?
+lblThereNoCardInPlayerZone=There are no cards in {0} {1}
+lblPutCardsOnTheTopLibraryOrGraveyard=Put {0} on the top of library or graveyard?
 lblLibrary=Library
 lblGraveyard=Graveyard
 lblTop=Top
 lblBottom=Bottom
-lblManaFrom=mana from
+lblNColorManaFromCard={0} {1} mana from {2}
 lblPayManaFromManaPool=Pay Mana from Mana Pool
-lblChooseATargetType=Choose a %s type
+lblChooseATargetType=Choose a {0} type
 lblUntap=Untap
 lblOdds=Odds
 lblEvens=Evens
@@ -1217,21 +1217,17 @@ lblWinTheFlip=win the flip
 lblLoseTheFlip=lose the flip
 lblChooseAResult=Choose a result
 lblSelectPreventionShieldToUse=select which prevention shield to use
-lblChooseAMode=Choose a mode
-lblActivated=activated
+lblPlayerActivatedCardChooseMode={0} activated {1} - Choose a mode
 lblNoPlayerHasPriorityCannotAddedManaToPool=No player has priority at the moment, so mana cannot be added to their pool.
 lblOverwriteExistFileConfirm=Overwrite existing file?
 lblFileExists=File exists!
 lblSelectGameStateFile=Select Game State File
 lblFileNotFound=File not found
-lblIn=in
-lblOnTheBattlefield=on the battlefield
-lblOnTheStackOrInPlay=on the stack / in play
-lblPutCard=Put card
-lblForWhichPlayer=for which player?
-lblShould=Should
-lblAffectedWithSummoningSickness=be affected with Summoning Sickness?
-lblBeAddedToLibraryTopOrBottom=be added to the top or to the bottom of the library?
+lblPutCardInWhichPlayerZone=Put card in {0} for which player?
+lblPutCardInWhichPlayerBattlefield=Put card on the battlefield for which player?
+lblPutCardInWhichPlayerPlayOrStack=Put card on the stack / in play for which player?
+lblCardShouldBeSummoningSicknessConfirm=Should {0} be affected with Summoning Sickness?
+lblCardShouldBeAddedToLibraryTopOrBottom=Should {0} be added to the top or to the bottom of the library?
 lblExileCardsFromPlayerHandConfirm=Exile card(s) from which player's hand?
 lblChooseCardsExile=Choose cards to exile
 lblExileCardsFromPlayerBattlefieldConfirm=Exile card(s) from which player's battlefield?
@@ -1245,7 +1241,11 @@ lblRestartingActionSequence=Restarting action sequence.
 lblErrorPleaseCheckID=Error: Check IDs and ensure they're separated by spaces and/or commas.
 lblErrorEntityWithId=Error: Entity with ID
 lblNotFound=not found
-lblChooseAnnounceFor=Choose %s for %name
+lblChooseAnnounceForCard=Choose {0} for {1}
+lblSacrifice=Sacrifice
+lblLookCardInPlayerZone=Looking at cards in {0} {1}
+lblPlayerZone={0} {1}
+lblActionFromPlayerDeck={0} from {1} Deck
 #AbstractGuiGame.java
 lblConcedeCurrentGame=This will concede the current game and you will lose.\n\nConcede anyway?
 lblConcedeTitle=Concede Game?
@@ -1591,24 +1591,22 @@ lblSelectOrder=Select Order
 lblIfYouDo=if you do
 lblOr=or
 lblDoYouWantPay=Do you want to pay
+lblDoYouWantPayNLife=Do you want to pay {0} life?
 lblDoyouWantTo=Do you want to
-lblDoYouWantMill=Do you want to mill
-lblDoYouWantFlip=Do you want to flip
-lblDoYouWantRemove=Do you want to remove
-lblDoYouWantRemoveCounters=Do you want to remove counters from
-lblDoYouWantExile=Do you want to exile
+lblDoYouWantMillNCardsOrDoAction=Do you want to mill {0} card(s)? {1}
+lblDoYouWantFlipNCoinOrDoAction=Do you want to flip {0} coin(s)? {1}
+lblDoYouWantRemoveNTargetTypeCounterFromCard=Do you want to remove {0} {1} counter from {2}?
+lblDoYouWantRemoveCountersFromCard=Do you want to remove counters from {0}?
+lblDoYouWantExileNCardsFromYourLibrary=Do you want to exile {0} card(s) from your library?
 lblDoYouWantExileAllCardYouGraveyard=Do you want to exile all cards in your graveyard?
 lblDoYouWantDiscardYourHand=Do you want to discard your hand?
-lblDoYouWantSpend=Do you want to spend
-lblLetThatPlayer=let that player
-lblCoin=coin
-lblCounterOfPointer=counter
-lblFrom=from
-lblFromYourLibrary=from your library?
+lblDoYouWantSpendNTargetTypeCounter=Do you want to spend {0} {1} counter?
+lblDoYouWantLetThatPlayerDrawNCardOrDoAction=Do you want to let that player draw {0} card(s)?{1}
+lblDoYouWantDrawNCardOrDoAction=Do you want to draw {0} card(s)?{1}
 lblSelectRemoveCounterCard=Select a card to remove a counter
 lblSelectRemoveCounterType=Select type counters to remove
-lblExileFrom=Exile from 
-lblPutCardFromWhose=Put cards from whose
+lblExileFromZone=Exile from {0}
+lblPutCardFromWhoseZone=Put cards from whose {0}?
 lblPutCardToLibrary=Put cards to Library
 lblPutIntoLibrary=put into library.
 lblGainControl=gain control.
@@ -1617,62 +1615,60 @@ lbldiscard=discard.
 lblReveal=reveal
 lblTap=tap
 lblCurrentCard=Current Card
-lblSelectOfCardsTo=Select
-lblCardsTo=card(s) to
+lblSelectNSpecifyTypeCardsToAction=Select %d {0} card(s) to {1}
 #AbandonEffect.java
-lblWouldYoulikeAbandon=Would you like to abandon the scheme
+lblWouldYoulikeAbandonSource=Would you like to abandon the scheme {0}?
 #ActivateAbilityEffect.java
 lblChooseManaAbility=Choose a mana ability:
 #AddTurnEffect.java
-lblTakesExtraTurn=takes an extra turn.
+lblPlayerTakesExtraTurn={0} takes an extra turn.
 #AmassEffect.java.
 lblChooseAnArmy=Choose an army to put counters on
 #AssignGroupEffect.java
-lblChooseAbilityFor=Choose ability for
+lblChooseAbilityForObject=Choose ability for {0}
 #AttachEffect.java
-lblDoYouWantAttach=Do you want to attach
-lblSelectAPlayerAttachTo=Select a player to attach to.
-lblSelectACardAttachTo=Select a card to attach to.
+lblDoYouWantAttachSourceToTarget=Do you want to attach {0} to {1}?
+lblSelectAPlayerAttachSourceTo={0} - Select a player to attach to.
+lblSelectACardAttachSourceTo={0} - Select a card to attach to.
 #BidLifeEffect.java
 lblChooseStartingBid=Choose a starting bid
 lblDoYouWantTopBid=Do you want to top bid? Current Bid \=
-lblTopBidWith=topped bid with
+lblTopBidWithValueLife=topped bid with {0} life
 #BondEffect.java
 lblSelectACardPair=Select a card to pair with
 #ChangeCombatantsEffect.java
-lblChooseDefenderToAttackWith=Choose which defender to attack with
+lblChooseDefenderToAttackWithCard=Choose which defender to attack with {0}
 #ChangeTargetsEffect.java
-lblDoYouWantChangeTargets=Do you want to change targets of
+lblDoYouWantChangeAbilityTargets=Do you want to change targets of {0}?
 #ChangeTextEffect.java
 lblChooseColorReplace=Choose a color word to replace
 lblChooseNewColor=Choose a new color word
 #ChangeZoneEffect.java
-lblDoYouWantMove=Do you want to move
-lblDeclareDefenderFor=Declare a defender for
+lblDoYouWantMoveTargetFromOriToDest=Do you want to move {0} from {1} to {2}?
+lblPutThatCardFromPlayerOriginToDestination=Put that card from for {0} {1} to {2}
+lblSearchPlayerZoneConfirm=Search {0} {1}?
 lblCardMatchSearchingTypeInAlternateZones=cards match your searching type in Alternate Zones.
-lblPutThatCardFrom=Put that card from
 lblLookingCardIn=Looking at cards in
-lblDoYouWantPlay=Do you want to play
-lblSelectCardFrom=Select a card from
-lblSelectUpTo=Select up to
-lblCardsFrom=cards from
-lblSelectCardsFrom=Select cards from
-lblCancelSearchUpTo=Cancel Search? Up to
-lblMoreCard=more card
-lblCanBeSelected=can be selected.
+lblDoYouWantPlayCard=Do you want to play {0}?
+lblSelectCardFromPlayerZone=Select a card from {0} {1}
+lblSelectUpToNumCardFromPlayerZone=Select up to {0} cards from {1} {2}
+lblSelectCardsFromPlayerZone=Select cards from {0} {1}
+lblCancelSearchUpToSelectNumCards=Cancel Search? Up to {0} more card(s) can be selected.
+#ChangeZoneAllEffect.java
+lblMoveTargetFromOriginToDestination=Move {0} from {1} to {2}?
 #ChooseCardEffect.java
-lblSelectCreatureWithTotalPowerLessOrEqualTo=Select creature(s) with total power less than or equal to
-lblTotalPower=Total Power
+lblChoose=Choose
+lblSelectCreatureWithTotalPowerLessOrEqualTo=Select creature(s) with total power less than or equal to {0}
+lblTotalPowerNum=Total Power: {0}
 lblCancelChooseConfirm=Cancel Choose?
 #ChooseCardNameEffect.java
 lblChooseACardName=Choose a card name
-lblChooseA=Choose a
-lblCardName=card name
-lblPicked=picked
+lblChooseASpecificCard=Choose a {0} card name.
+lblPlayerPickedChosen={0} picked {1}
 #ChooseColorEffect.java
 lblChooseAColor=Choose a color
-lblChoose=Choose
-lblOrMore=or more
+lblAtLastChooseNumColors=Choose {0} or more color
+lblChooseSpecifiedRangeColors=Choose {0} to {1} color
 #ChooseDirectionEffect.java
 lblLeftClockwise=Left (clockwise)
 lblRightAntiClockwise=Right (anticlockwise)
@@ -1681,7 +1677,7 @@ lblChooseDirection=Choose a direction
 lblChooseOne=Choose one
 #ChooseNumberEffect.java
 lblChooseNumber=Choose a number
-lblChose=chose
+lblPlayerChoseNum={0} chose {1}
 #ChoosePlayerEffect.java
 lblChoosePlayer=Choose a player
 #ChooseSourceEffect.java
@@ -1692,26 +1688,24 @@ lblReveals=reveals
 lblWinsClash=wins clash
 lblLosesClash=loses clash
 #CloneEffect.java
-lblDoYouWantCopy=Do you want to copy
+lblDoYouWantCopy=Do you want to copy {0}?
 #ControlExchangeVariantEffect.java
 lblChooseCards=Choose cards
 #CopyPermanentEffect.java
 lblCopyPermanentConfirm=Copy this permanent?
 lblDefender=defender
 #CopySpellAbilityEffect.java
-lblDoyouWantCopyTheSpell=Do you want to copy the spell
-lblSelectMultiSpellCopyToStack=Select %d spell to copy to stack
+lblDoyouWantCopyTheSpell=Do you want to copy the spell {0}?
+lblSelectMultiSpellCopyToStack=Select {0} spell to copy to stack
 lblSelectASpellCopy=Select a spell to copy
 #CounterEffect.java
 lblRemoveDestination=a destination to remove
 #CountersMoveEffect.java
-lblChooseTakeCountersCard=Choose card to take %s counters from
-lblTakeHowMany=Take how many
-lblCountersFrom=counters from
-lblChooseCardToGet=Choose cards to get
-lblPutHowMany=Put how many
-lblCountersOn=counters on
-lblCounters=counters
+lblChooseTakeCountersCard=Choose card to take {0} counters from
+lblTakeHowManyTargetCounterFromCard=Take how many {0} counters from {1}?
+lblChooseCardToGetCountersFrom=Choose cards to get {0} counters from {1}.
+lblPutHowManyTargetCounterOnCard=Put how many {0} counters on {1}?
+lblTakeHowManyTargetCounters=Take how many {0} counters?
 #CountersProliferateEffect.java
 lblChooseProliferateTarget=Choose any number of permanents and/or players for proliferate
 #CountersPutEffect.java
@@ -1719,41 +1713,40 @@ lblChooseACreatureWithLeastToughness=Choose a creature with the least toughness
 lblSelectCounterTypeAddTo=Select counter type to add to
 lblHowManyCounters=How many counters?
 lblChooseAnOpponent=Choose an opponent
-lblDoYouWantPutTargetP1P1CountersOn=Do you want to put %d +1/+1 counters on
+lblDoYouWantPutTargetP1P1CountersOnCard=Do you want to put {0} +1/+1 counters on {1}?
 #CountersPutOrRemoveEffect.java
 lblSelectCounterTypeToAddOrRemove=Select type of counters to add or remove
-lblWhatToDoWithTargetCounter=What to do with that '%s' counter
+lblWhatToDoWithTargetCounter=What to do with that '{0}' counter
 #CountersRemoveEffect.java
 lblAllCounters=all counters
 lblACounters=a counter
-lblChooseCardtoTakeTargetCounters=Choose cards to take %s counters from
-lblSelectRemoveCountersNumberOfTarget=Select the number of %s counters to remove
+lblCounters=counters
+lblChooseCardsToTakeTargetCounters=Choose cards to take {0} counters from
+lblSelectRemoveCountersNumberOfTarget=Select the number of {0} counters to remove
 lblSelectCountersTypeToRemove=Select type of counters to remove
 #DamageDealEffect.java
-lblDoyouWantDealTargetDamageTo=Do you want to deal %d damage to
+lblDoyouWantDealTargetDamageToTarget=Do you want to deal {0} damage to {1}?
 #DigEffect.java
 lblWouldYouLikeProceedWithOptionalAbility=Would you like to proceed with the optional ability for
-lblChooseACardToLeaveTargetLibraryTop=Choose a card to leave on top of %s library
-lblChooseACardLeaveTarget=Choose a card to leave in %s
-lblChooseCardsPutInto=Choose card(s) to put into
-lblChooseCardPutOnTargetLibarayBottom=Choose card(s) to put on the bottom of %s library
-lblChooseCardPutOnTargetLibarayTop=Choose card(s) to put on top of %s library
+lblChooseACardToLeaveTargetLibraryTop=Choose a card to leave on top of {0} library
+lblChooseACardLeaveTarget=Choose a card to leave in {0} {1}
+lblChooseCardsPutIntoZone=Choose card(s) to put into {0}
+lblChooseCardPutOnTargetLibarayBottom=Choose card(s) to put on the bottom of {0} library
+lblChooseCardPutOnTargetLibarayTop=Choose card(s) to put on top of {0} library
+lblPlayerPickedCardFrom={0} picked card(s) from
 lblNoValidCards=No valid cards
-lblThisCard=this card
-lblTheseCards=these cards
 #DigUntilEffect.java
 lblDoYouWantDigYourLibrary=Do you want to dig your library?
-lblDoYouWantPutCardTo=Do you want to put that card to
+lblDoYouWantPutCardToZone=Do you want to put that card to {0}?
 #DiscardEffect.java
-lblWouldYouLikeRandomDiscardTargetCard=Would you like to discard %d random card(s)?
-lblHasChosen=has chosen
+lblWouldYouLikeRandomDiscardTargetCard=Would you like to discard {0} random card(s)?
+lblPlayerHasChosenCardsFrom={0} has chosen card(s) from
 #DrawEffect.java
-lblDoYouWantDraw=Do you want to draw
+lblDoYouWantDrawCards=Do you want to draw {0}?
 lblHowMayCardDoYouWantDraw=How may cards do you want to draw?
 #EncodeEffect.java
-lblAndEncodeOntoAYouControlCreature=and encode it onto a creature you control?
+lblDoYouWantExileCardAndEncodeOntoYouCreature=Do you want to exile {0} and encode it onto a creature you control?
 lblChooseACreatureYouControlToEncode=Choose a creature you control to encode
-lblEncoding=Encoding
 #ExploreEffect.java
 lblRevealedForExplore=Revealed for Explore
 lblPutThisCardToYourGraveyard=Put this card in your graveyard?
@@ -1768,15 +1761,15 @@ lblLifeTotal=Life Total
 #ManaEffect.java
 lblDoYouWantAddMana=Do you want to add mana?
 lblSelectManaProduce=Select Mana to Produce
-lblChooseSingleColorFrom=Choose a single color from
+lblChooseSingleColorFromTarget=Choose a single color from {0}
 #ManifestEffect.java
 lblChooseCardToManifest=Choose cards to manifest
 #MeldEffect.java
 lblChooseCardToMeld=Choose card to meld with
 #MillEffect.java
-lblDoYouWantPutLibraryCardsTo=Do you want to put card(s) from library to
+lblDoYouWantPutLibraryCardsTo=Do you want to put card(s) from library to {0}?
 #MultiplePilesEffect.java
-lblChooseCardsInPile=Choose cards in Pile
+lblChooseCardsInTargetPile=Choose cards in Pile {0}?
 #PeekAndRevealEffect.java
 lblRevealingCardFrom=Revealing cards from
 lblRevealCardToOtherPlayers=Reveal cards to other players?
@@ -1786,7 +1779,7 @@ lblSelectCardToPlay=Select a card to play
 #ProtectAllEffect.java
 lblChooseAProtection=Choose a protection
 #PumpEffect.java
-lblApplyPumpTo=Apply pump to
+lblApplyPumpToTarget=Apply pump to {0}?
 #RearrangeTopOfLibraryEffect.java
 lblDoyouWantShuffleTheLibrary=Do you want to shuffle the library?
 #RepeatEffect.java
@@ -1794,22 +1787,20 @@ lblDoYouWantRepeatProcessAgain=Do you want to repeat this process again?
 #RevealHandEffect.java
 lblDoYouWantRevealYourHand=Do you want to reveal your hand?
 #RollPlanarDiceEffect.java
-lblRolled=rolled
+lblPlayerRolledResult={0} rolled {1}
 #SacrificeEffect.java
 lblDoYouWantPayEcho=Do you want to pay Echo
 lblPayEcho=Pay Echo
 lblDoYouWantSacrifice=Do you want to sacrifice?
-lblSacrifice=Sacrifice
-lblDestroys=Destroys
 #SetStateEffect.java
 lblFaceDownCardCantTurnFaceUp=Face-down card can't turn face up
 #ShuffleEffect.java
-lblHaveTargetShuffle=Have %s shuffle?
+lblHaveTargetShuffle=Have {0} shuffle?
 #SurveilEffect.java
 lblDoYouWantSurveil=Do you want to surveil?
 #TapOrUntapAllEffect.java
 lblPermanents=Permanents
-lblTapOrUntap=Tap or Untap
+lblTapOrUntapTarget=Tap or Untap {0}?
 #TwoPilesEffect.java
 lblSelectCardForFaceDownPile=Select cards for a face down pile
 lblDivideCardIntoTwoPiles=Divide cards into two piles
@@ -1846,4 +1837,18 @@ lblCastSpellOrPlayLand=Cast Spell/Play Land
 lblRepeatAddCard=Repeat Last Add Card
 lblRemoveFromGame=Remove Card from Game
 lblRiggedRoll=Rigged Planar Roll
-lblWalkTo=Planeswalk to
+lblWalkTo=Planeswalk to
+#ZoneType.java
+lblHandZone=hand
+lblLibraryZone=library
+lblGraveyardZone=graveyard
+lblBattlefieldZone=battlefield
+lblExileZone=exile
+lblFlashbackZone=flashback
+lblCommandZone=command
+lblStackZone=stack
+lblSideboardZone=sideboard
+lblAnteZone=ante
+lblSchemeDeckZone=schemedeck
+lblPlanarDeckZone=planardeck
+lblNoneZone=none

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

@@ -1113,14 +1113,14 @@ lblSelectBlocker=Select creatures to block
 lblOrSelectBlockTarget= or select another attacker to declare blockers for.
 lblMorph=Morph
 #PlayerControllerHuman.java
-lblYouHaveWonTheCoinToss=%s, has ganado el lanzamiento de la moneda.
-lblYouLostTheLastGame=%s, perdiste la última partida.
+lblYouHaveWonTheCoinToss={0}, has ganado el lanzamiento de la moneda.
+lblYouLostTheLastGame={0}, perdiste la última partida.
 lblWouldYouLiketoPlayorDraw=¿Quieres jugar o ceder?
 lblWhoWouldYouLiketoStartthisGame=¿Quién te gustaría que empezara esta partida? (Haz clic en el retrato)
 lblPlay=Jugar
 lblDraw=Ceder
-lblTooFewCardsMainDeck=Muy pocas cartas en tu mazo principal (mínimo %s), por favor realiza modificaciones a tu mazo de nuevo.
-lblTooManyCardsSideboard=Demasiadas cartas en tu banquillo (máximo %s), por favor realiza modificaciones a tu mazo de nuevo.
+lblTooFewCardsMainDeck=Muy pocas cartas en tu mazo principal (mínimo {0}), por favor realiza modificaciones a tu mazo de nuevo.
+lblTooManyCardsSideboard=Demasiadas cartas en tu banquillo (máximo {0}), por favor realiza modificaciones a tu mazo de nuevo.
 lblAssignCombatDamageWerentBlocked=¿Quieres asignar su daño de combate como si no estuviera bloqueado?
 lblChosenCards=Cartas elegidas
 lblAttacker=Atacante
@@ -1169,15 +1169,15 @@ lblSelectCardsToBePutIntoTheGraveyard=Selecciona las cartas para ponerlas en el
 lblCardsToPutInTheGraveyard=Cartas para poner en el Cementerio
 lblDiscardUpToNCards=Descarta hasta %d carta(s)
 lblDiscardNCards=Descarta %d carta(s)
-lblSelectNCardsToDiscardUnlessDiscarduType=Selecciona %d carta(s) para descartar, a menos que descartes un %s.
+lblSelectNCardsToDiscardUnlessDiscarduType=Selecciona %d carta(s) para descartar, a menos que descartes un {0}.
 lblCleanupPhase=Fase de Limpieza
-lblSelectCardsToDiscardHandDownMaximum=Selecciona %d carta(s) a descartar para reducir tu mano al máximo de %max cartas.
+lblSelectCardsToDiscardHandDownMaximum=Selecciona {0} carta(s) a descartar para reducir tu mano al máximo de {1} cartas.
 lblChooseMinCardToDiscard=Elige %d carta(s) para descartar
 lblDiscarded=Descartado
-lblChooseDamageOrderFor=Selecciona el Orden de Daños para %s
+lblChooseDamageOrderFor=Selecciona el Orden de Daños para {0}
 lblDamagedFirst=Dañado Primero
-lblChooseBlockerAfterWhichToPlaceAttackert=Elige un bloqueador después del cual colocar %s en el orden de daño; cancela para colocarlo primero.
-lblPutCardOnTopOrBottomLibrary=¿Poner %s en la parte superior o inferior de tu biblioteca?
+lblChooseBlockerAfterWhichToPlaceAttackert=Elige un bloqueador después del cual colocar {0} en el orden de daño; cancela para colocarlo primero.
+lblPutCardOnTopOrBottomLibrary=¿Poner {0} en la parte superior o inferior de tu biblioteca?
 lblChooseOrderCardsPutIntoLibrary=Elige el orden de las cartas para poner en la biblioteca
 lblClosestToTop=Más cerca de la parte superior
 lblChooseOrderCardsPutOntoBattlefield=Elige el orden de las cartas que quieres poner en el campo de batalla
@@ -1190,20 +1190,20 @@ lblChooseOrderCopiesCast=Elige el orden de las copias que se van a invocar
 lblDelveHowManyCards=¿Excavar cuántas cartas?
 lblExileWhichCard=¿Exiliar qué carta?
 lblDestroy=destroy
-lblUpTo=up to
+lblSelectUpToNumTargetToAction=Select up to %d {0}(s) to {1}.
+lblSelectNumTargetToAction=Select %d {0}(s) to {1}.
 lblHighestBidder=Highest Bidder
 lblUseTriggeredAbilityOf=Use triggered ability of
 lblExertAttackersConfirm=Exert Attackers?
-lblThereNoCardIn=There are no cards in
-lblPut=Put
-lblOnTheTopLibraryOrGraveyard=on the top of library or graveyard?
+lblThereNoCardInPlayerZone=There are no cards in {0} {1}
+lblPutCardsOnTheTopLibraryOrGraveyard=Put {0} on the top of library or graveyard?
 lblLibrary=Library
 lblGraveyard=Graveyard
 lblTop=Top
 lblBottom=Bottom
-lblManaFrom=mana from
+lblNColorManaFromCard={0} {1} mana from {2}
 lblPayManaFromManaPool=Pay Mana from Mana Pool
-lblChooseATargetType=Choose a %s type
+lblChooseATargetType=Choose a {0} type
 lblUntap=Untap
 lblOdds=Odds
 lblEvens=Evens
@@ -1217,21 +1217,17 @@ lblWinTheFlip=win the flip
 lblLoseTheFlip=lose the flip
 lblChooseAResult=Choose a result
 lblSelectPreventionShieldToUse=select which prevention shield to use
-lblChooseAMode=Choose a mode
-lblActivated=activated
+lblPlayerActivatedCardChooseMode={0} activated {1} - Choose a mode
 lblNoPlayerHasPriorityCannotAddedManaToPool=No player has priority at the moment, so mana cannot be added to their pool.
 lblOverwriteExistFileConfirm=Overwrite existing file?
 lblFileExists=File exists!
 lblSelectGameStateFile=Select Game State File
 lblFileNotFound=File not found
-lblIn=in
-lblOnTheBattlefield=on the battlefield
-lblOnTheStackOrInPlay=on the stack / in play
-lblPutCard=Put card
-lblForWhichPlayer=for which player?
-lblShould=Should
-lblAffectedWithSummoningSickness=be affected with Summoning Sickness?
-lblBeAddedToLibraryTopOrBottom=be added to the top or to the bottom of the library?
+lblPutCardInWhichPlayerZone=Put card in {0} for which player?
+lblPutCardInWhichPlayerBattlefield=Put card on the battlefield for which player?
+lblPutCardInWhichPlayerPlayOrStack=Put card on the stack / in play for which player?
+lblCardShouldBeSummoningSicknessConfirm=Should {0} be affected with Summoning Sickness?
+lblCardShouldBeAddedToLibraryTopOrBottom=Should {0} be added to the top or to the bottom of the library?
 lblExileCardsFromPlayerHandConfirm=Exile card(s) from which player's hand?
 lblChooseCardsExile=Choose cards to exile
 lblExileCardsFromPlayerBattlefieldConfirm=Exile card(s) from which player's battlefield?
@@ -1245,7 +1241,11 @@ lblRestartingActionSequence=Restarting action sequence.
 lblErrorPleaseCheckID=Error: Check IDs and ensure they're separated by spaces and/or commas.
 lblErrorEntityWithId=Error: Entity with ID
 lblNotFound=not found
-lblChooseAnnounceFor=Choose %s for %name
+lblChooseAnnounceForCard=Choose {0} for {1}
+lblSacrifice=Sacrifice
+lblLookCardInPlayerZone=Looking at cards in {0} {1}
+lblPlayerZone={0} {1}
+lblActionFromPlayerDeck={0} from {1} Deck
 #AbstractGuiGame.java
 lblConcedeCurrentGame=Esto concederá la partida actual y perderás.\n\n¿Conceder de todos modos?
 lblConcedeTitle=¿Conceder Partida?
@@ -1591,24 +1591,22 @@ lblSelectOrder=Select Order
 lblIfYouDo=if you do
 lblOr=or
 lblDoYouWantPay=Do you want to pay
+lblDoYouWantPayNLife=Do you want to pay {0} life?
 lblDoyouWantTo=Do you want to
-lblDoYouWantMill=Do you want to mill
-lblDoYouWantFlip=Do you want to flip
-lblDoYouWantRemove=Do you want to remove
-lblDoYouWantRemoveCounters=Do you want to remove counters from
-lblDoYouWantExile=Do you want to exile
+lblDoYouWantMillNCardsOrDoAction=Do you want to mill {0} card(s)? {1}
+lblDoYouWantFlipNCoinOrDoAction=Do you want to flip {0} coin(s)? {1}
+lblDoYouWantRemoveNTargetTypeCounterFromCard=Do you want to remove {0} {1} counter from {2}?
+lblDoYouWantRemoveCountersFromCard=Do you want to remove counters from {0}?
+lblDoYouWantExileNCardsFromYourLibrary=Do you want to exile {0} card(s) from your library?
 lblDoYouWantExileAllCardYouGraveyard=Do you want to exile all cards in your graveyard?
 lblDoYouWantDiscardYourHand=Do you want to discard your hand?
-lblDoYouWantSpend=Do you want to spend
-lblLetThatPlayer=let that player
-lblCoin=coin
-lblCounterOfPointer=counter
-lblFrom=from
-lblFromYourLibrary=from your library?
+lblDoYouWantSpendNTargetTypeCounter=Do you want to spend {0} {1} counter?
+lblDoYouWantLetThatPlayerDrawNCardOrDoAction=Do you want to let that player draw {0} card(s)?{1}
+lblDoYouWantDrawNCardOrDoAction=Do you want to draw {0} card(s)?{1}
 lblSelectRemoveCounterCard=Select a card to remove a counter
 lblSelectRemoveCounterType=Select type counters to remove
-lblExileFrom=Exile from 
-lblPutCardFromWhose=Put cards from whose
+lblExileFromZone=Exile from {0}
+lblPutCardFromWhoseZone=Put cards from whose {0}?
 lblPutCardToLibrary=Put cards to Library
 lblPutIntoLibrary=put into library.
 lblGainControl=gain control.
@@ -1617,62 +1615,60 @@ lbldiscard=discard.
 lblReveal=reveal
 lblTap=tap
 lblCurrentCard=Current Card
-lblSelectOfCardsTo=Select
-lblCardsTo=card(s) to
+lblSelectNSpecifyTypeCardsToAction=Select %d {0} card(s) to {1}
 #AbandonEffect.java
-lblWouldYoulikeAbandon=Would you like to abandon the scheme
+lblWouldYoulikeAbandonSource=Would you like to abandon the scheme {0}?
 #ActivateAbilityEffect.java
 lblChooseManaAbility=Choose a mana ability:
 #AddTurnEffect.java
-lblTakesExtraTurn=takes an extra turn.
+lblPlayerTakesExtraTurn={0} takes an extra turn.
 #AmassEffect.java.
 lblChooseAnArmy=Choose an army to put counters on
 #AssignGroupEffect.java
-lblChooseAbilityFor=Choose ability for
+lblChooseAbilityForObject=Choose ability for {0}
 #AttachEffect.java
-lblDoYouWantAttach=Do you want to attach
-lblSelectAPlayerAttachTo=Select a player to attach to.
-lblSelectACardAttachTo=Select a card to attach to.
+lblDoYouWantAttachSourceToTarget=Do you want to attach {0} to {1}?
+lblSelectAPlayerAttachSourceTo={0} - Select a player to attach to.
+lblSelectACardAttachSourceTo={0} - Select a card to attach to.
 #BidLifeEffect.java
 lblChooseStartingBid=Choose a starting bid
 lblDoYouWantTopBid=Do you want to top bid? Current Bid \=
-lblTopBidWith=topped bid with
+lblTopBidWithValueLife=topped bid with {0} life
 #BondEffect.java
 lblSelectACardPair=Select a card to pair with
 #ChangeCombatantsEffect.java
-lblChooseDefenderToAttackWith=Choose which defender to attack with
+lblChooseDefenderToAttackWithCard=Choose which defender to attack with {0}
 #ChangeTargetsEffect.java
-lblDoYouWantChangeTargets=Do you want to change targets of
+lblDoYouWantChangeAbilityTargets=Do you want to change targets of {0}?
 #ChangeTextEffect.java
 lblChooseColorReplace=Choose a color word to replace
 lblChooseNewColor=Choose a new color word
 #ChangeZoneEffect.java
-lblDoYouWantMove=Do you want to move
-lblDeclareDefenderFor=Declare a defender for
+lblDoYouWantMoveTargetFromOriToDest=Do you want to move {0} from {1} to {2}?
+lblPutThatCardFromPlayerOriginToDestination=Put that card from for {0} {1} to {2}
+lblSearchPlayerZoneConfirm=Search {0} {1}?
 lblCardMatchSearchingTypeInAlternateZones=cards match your searching type in Alternate Zones.
-lblPutThatCardFrom=Put that card from
 lblLookingCardIn=Looking at cards in
-lblDoYouWantPlay=Do you want to play
-lblSelectCardFrom=Select a card from
-lblSelectUpTo=Select up to
-lblCardsFrom=cards from
-lblSelectCardsFrom=Select cards from
-lblCancelSearchUpTo=Cancel Search? Up to
-lblMoreCard=more card
-lblCanBeSelected=can be selected.
+lblDoYouWantPlayCard=Do you want to play {0}?
+lblSelectCardFromPlayerZone=Select a card from {0} {1}
+lblSelectUpToNumCardFromPlayerZone=Select up to {0} cards from {1} {2}
+lblSelectCardsFromPlayerZone=Select cards from {0} {1}
+lblCancelSearchUpToSelectNumCards=Cancel Search? Up to {0} more card(s) can be selected.
+#ChangeZoneAllEffect.java
+lblMoveTargetFromOriginToDestination=Move {0} from {1} to {2}?
 #ChooseCardEffect.java
-lblSelectCreatureWithTotalPowerLessOrEqualTo=Select creature(s) with total power less than or equal to
-lblTotalPower=Total Power
+lblChoose=Choose
+lblSelectCreatureWithTotalPowerLessOrEqualTo=Select creature(s) with total power less than or equal to {0}
+lblTotalPowerNum=Total Power: {0}
 lblCancelChooseConfirm=Cancel Choose?
 #ChooseCardNameEffect.java
 lblChooseACardName=Choose a card name
-lblChooseA=Choose a
-lblCardName=card name
-lblPicked=picked
+lblChooseASpecificCard=Choose a {0} card name.
+lblPlayerPickedChosen={0} picked {1}
 #ChooseColorEffect.java
 lblChooseAColor=Choose a color
-lblChoose=Choose
-lblOrMore=or more
+lblAtLastChooseNumColors=Choose {0} or more color
+lblChooseSpecifiedRangeColors=Choose {0} to {1} color
 #ChooseDirectionEffect.java
 lblLeftClockwise=Left (clockwise)
 lblRightAntiClockwise=Right (anticlockwise)
@@ -1681,7 +1677,7 @@ lblChooseDirection=Choose a direction
 lblChooseOne=Choose one
 #ChooseNumberEffect.java
 lblChooseNumber=Choose a number
-lblChose=chose
+lblPlayerChoseNum={0} chose {1}
 #ChoosePlayerEffect.java
 lblChoosePlayer=Choose a player
 #ChooseSourceEffect.java
@@ -1692,26 +1688,24 @@ lblReveals=reveals
 lblWinsClash=wins clash
 lblLosesClash=loses clash
 #CloneEffect.java
-lblDoYouWantCopy=Do you want to copy
+lblDoYouWantCopy=Do you want to copy {0}?
 #ControlExchangeVariantEffect.java
 lblChooseCards=Choose cards
 #CopyPermanentEffect.java
 lblCopyPermanentConfirm=Copy this permanent?
 lblDefender=defender
 #CopySpellAbilityEffect.java
-lblDoyouWantCopyTheSpell=Do you want to copy the spell
-lblSelectMultiSpellCopyToStack=Select %d spell to copy to stack
+lblDoyouWantCopyTheSpell=Do you want to copy the spell {0}?
+lblSelectMultiSpellCopyToStack=Select {0} spell to copy to stack
 lblSelectASpellCopy=Select a spell to copy
 #CounterEffect.java
 lblRemoveDestination=a destination to remove
 #CountersMoveEffect.java
-lblChooseTakeCountersCard=Choose card to take %s counters from
-lblTakeHowMany=Take how many
-lblCountersFrom=counters from
-lblChooseCardToGet=Choose cards to get
-lblPutHowMany=Put how many
-lblCountersOn=counters on
-lblCounters=counters
+lblChooseTakeCountersCard=Choose card to take {0} counters from
+lblTakeHowManyTargetCounterFromCard=Take how many {0} counters from {1}?
+lblChooseCardToGetCountersFrom=Choose cards to get {0} counters from {1}.
+lblPutHowManyTargetCounterOnCard=Put how many {0} counters on {1}?
+lblTakeHowManyTargetCounters=Take how many {0} counters?
 #CountersProliferateEffect.java
 lblChooseProliferateTarget=Choose any number of permanents and/or players for proliferate
 #CountersPutEffect.java
@@ -1719,41 +1713,40 @@ lblChooseACreatureWithLeastToughness=Choose a creature with the least toughness
 lblSelectCounterTypeAddTo=Select counter type to add to
 lblHowManyCounters=How many counters?
 lblChooseAnOpponent=Choose an opponent
-lblDoYouWantPutTargetP1P1CountersOn=Do you want to put %d +1/+1 counters on
+lblDoYouWantPutTargetP1P1CountersOnCard=Do you want to put {0} +1/+1 counters on {1}?
 #CountersPutOrRemoveEffect.java
 lblSelectCounterTypeToAddOrRemove=Select type of counters to add or remove
-lblWhatToDoWithTargetCounter=What to do with that '%s' counter
+lblWhatToDoWithTargetCounter=What to do with that '{0}' counter
 #CountersRemoveEffect.java
 lblAllCounters=all counters
 lblACounters=a counter
-lblChooseCardtoTakeTargetCounters=Choose cards to take %s counters from
-lblSelectRemoveCountersNumberOfTarget=Select the number of %s counters to remove
+lblCounters=counters
+lblChooseCardsToTakeTargetCounters=Choose cards to take {0} counters from
+lblSelectRemoveCountersNumberOfTarget=Select the number of {0} counters to remove
 lblSelectCountersTypeToRemove=Select type of counters to remove
 #DamageDealEffect.java
-lblDoyouWantDealTargetDamageTo=Do you want to deal %d damage to
+lblDoyouWantDealTargetDamageToTarget=Do you want to deal {0} damage to {1}?
 #DigEffect.java
 lblWouldYouLikeProceedWithOptionalAbility=Would you like to proceed with the optional ability for
-lblChooseACardToLeaveTargetLibraryTop=Choose a card to leave on top of %s library
-lblChooseACardLeaveTarget=Choose a card to leave in %s
-lblChooseCardsPutInto=Choose card(s) to put into
-lblChooseCardPutOnTargetLibarayBottom=Choose card(s) to put on the bottom of %s library
-lblChooseCardPutOnTargetLibarayTop=Choose card(s) to put on top of %s library
+lblChooseACardToLeaveTargetLibraryTop=Choose a card to leave on top of {0} library
+lblChooseACardLeaveTarget=Choose a card to leave in {0} {1}
+lblChooseCardsPutIntoZone=Choose card(s) to put into {0}
+lblChooseCardPutOnTargetLibarayBottom=Choose card(s) to put on the bottom of {0} library
+lblChooseCardPutOnTargetLibarayTop=Choose card(s) to put on top of {0} library
+lblPlayerPickedCardFrom={0} picked card(s) from
 lblNoValidCards=No valid cards
-lblThisCard=this card
-lblTheseCards=these cards
 #DigUntilEffect.java
 lblDoYouWantDigYourLibrary=Do you want to dig your library?
-lblDoYouWantPutCardTo=Do you want to put that card to
+lblDoYouWantPutCardToZone=Do you want to put that card to {0}?
 #DiscardEffect.java
-lblWouldYouLikeRandomDiscardTargetCard=Would you like to discard %d random card(s)?
-lblHasChosen=has chosen
+lblWouldYouLikeRandomDiscardTargetCard=Would you like to discard {0} random card(s)?
+lblPlayerHasChosenCardsFrom={0} has chosen card(s) from
 #DrawEffect.java
-lblDoYouWantDraw=Do you want to draw
+lblDoYouWantDrawCards=Do you want to draw {0}?
 lblHowMayCardDoYouWantDraw=How may cards do you want to draw?
 #EncodeEffect.java
-lblAndEncodeOntoAYouControlCreature=and encode it onto a creature you control?
+lblDoYouWantExileCardAndEncodeOntoYouCreature=Do you want to exile {0} and encode it onto a creature you control?
 lblChooseACreatureYouControlToEncode=Choose a creature you control to encode
-lblEncoding=Encoding
 #ExploreEffect.java
 lblRevealedForExplore=Revealed for Explore
 lblPutThisCardToYourGraveyard=Put this card in your graveyard?
@@ -1768,15 +1761,15 @@ lblLifeTotal=Life Total
 #ManaEffect.java
 lblDoYouWantAddMana=Do you want to add mana?
 lblSelectManaProduce=Select Mana to Produce
-lblChooseSingleColorFrom=Choose a single color from
+lblChooseSingleColorFromTarget=Choose a single color from {0}
 #ManifestEffect.java
 lblChooseCardToManifest=Choose cards to manifest
 #MeldEffect.java
 lblChooseCardToMeld=Choose card to meld with
 #MillEffect.java
-lblDoYouWantPutLibraryCardsTo=Do you want to put card(s) from library to
+lblDoYouWantPutLibraryCardsTo=Do you want to put card(s) from library to {0}?
 #MultiplePilesEffect.java
-lblChooseCardsInPile=Choose cards in Pile
+lblChooseCardsInTargetPile=Choose cards in Pile {0}?
 #PeekAndRevealEffect.java
 lblRevealingCardFrom=Revealing cards from
 lblRevealCardToOtherPlayers=Reveal cards to other players?
@@ -1786,7 +1779,7 @@ lblSelectCardToPlay=Select a card to play
 #ProtectAllEffect.java
 lblChooseAProtection=Choose a protection
 #PumpEffect.java
-lblApplyPumpTo=Apply pump to
+lblApplyPumpToTarget=Apply pump to {0}?
 #RearrangeTopOfLibraryEffect.java
 lblDoyouWantShuffleTheLibrary=Do you want to shuffle the library?
 #RepeatEffect.java
@@ -1794,22 +1787,20 @@ lblDoYouWantRepeatProcessAgain=Do you want to repeat this process again?
 #RevealHandEffect.java
 lblDoYouWantRevealYourHand=Do you want to reveal your hand?
 #RollPlanarDiceEffect.java
-lblRolled=rolled
+lblPlayerRolledResult={0} rolled {1}
 #SacrificeEffect.java
 lblDoYouWantPayEcho=Do you want to pay Echo
 lblPayEcho=Pay Echo
 lblDoYouWantSacrifice=Do you want to sacrifice?
-lblSacrifice=Sacrifice
-lblDestroys=Destroys
 #SetStateEffect.java
 lblFaceDownCardCantTurnFaceUp=Face-down card can't turn face up
 #ShuffleEffect.java
-lblHaveTargetShuffle=Have %s shuffle?
+lblHaveTargetShuffle=Have {0} shuffle?
 #SurveilEffect.java
 lblDoYouWantSurveil=Do you want to surveil?
 #TapOrUntapAllEffect.java
 lblPermanents=Permanents
-lblTapOrUntap=Tap or Untap
+lblTapOrUntapTarget=Tap or Untap {0}?
 #TwoPilesEffect.java
 lblSelectCardForFaceDownPile=Select cards for a face down pile
 lblDivideCardIntoTwoPiles=Divide cards into two piles
@@ -1846,4 +1837,18 @@ lblCastSpellOrPlayLand=Cast Spell/Play Land
 lblRepeatAddCard=Repeat Last Add Card
 lblRemoveFromGame=Remove Card from Game
 lblRiggedRoll=Rigged Planar Roll
-lblWalkTo=Planeswalk to
+lblWalkTo=Planeswalk to
+#ZoneType.java
+lblHandZone=hand
+lblLibraryZone=library
+lblGraveyardZone=graveyard
+lblBattlefieldZone=battlefield
+lblExileZone=exile
+lblFlashbackZone=flashback
+lblCommandZone=command
+lblStackZone=stack
+lblSideboardZone=sideboard
+lblAnteZone=ante
+lblSchemeDeckZone=schemedeck
+lblPlanarDeckZone=planardeck
+lblNoneZone=none

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

@@ -327,7 +327,7 @@ lblOk=确认
 lblReset=重置
 lblAuto=自动
 #VAssignDamage.java
-lbLAssignDamageDealtBy=分配对%s造成的伤害
+lbLAssignDamageDealtBy=对%s造成的伤害进行分配
 lblLClickDamageMessage=左键单击：分配一点伤害。（左键加Ctrl）：分配致命伤害。
 lblRClickDamageMessage=右键单击：取消分配一点伤害。（左键加Ctrl）：取消分配的所有伤害
 lblTotalDamageText=可用的伤害值：未知
@@ -1035,7 +1035,7 @@ lblAny=任意
 lblFantasy=幻想
 lblGeneric=通用
 #MatchController.java
-lblChooseAbilityToPlay=选择使用的能力
+lblChooseAbilityToPlay=选择要使用的异能
 lblSelected=选择
 #ItemManager.java
 lblAdvancedSearch=高级搜索
@@ -1113,14 +1113,14 @@ lblSelectBlocker=选择进行阻挡的生物
 lblOrSelectBlockTarget= 或者为其他进攻者选择阻挡者。
 lblMorph=变身
 #PlayerControllerHuman.java
-lblYouHaveWonTheCoinToss=%s，你赢得了这次掷硬币。
-lblYouLostTheLastGame=%s，最后一场比赛你输了。
+lblYouHaveWonTheCoinToss={0}，你赢得了这次掷硬币。
+lblYouLostTheLastGame={0}，最后一场比赛你输了。
 lblWouldYouLiketoPlayorDraw=你想先手还是后手？
 lblWhoWouldYouLiketoStartthisGame=你想谁先开始游戏？（单击头像）
 lblPlay=先手
 lblDraw=后手
-lblTooFewCardsMainDeck=主牌中卡牌数过少（最少为%s），请重新修改套牌。
-lblTooManyCardsSideboard=备牌中卡牌数过多（最多为%s），请重新修改套牌。
+lblTooFewCardsMainDeck=主牌中卡牌数过少（最少为{0}），请重新修改套牌。
+lblTooManyCardsSideboard=备牌中卡牌数过多（最多为{0}），请重新修改套牌。
 lblAssignCombatDamageWerentBlocked=是否要像没有被阻挡一样分配战斗伤害？
 lblChosenCards=选择牌
 lblAttacker=进攻者
@@ -1169,15 +1169,15 @@ lblSelectCardsToBePutIntoTheGraveyard=选择要放于坟场的卡牌
 lblCardsToPutInTheGraveyard=放于坟场的卡牌
 lblDiscardUpToNCards=最多弃%d张牌
 lblDiscardNCards=弃%d张牌
-lblSelectNCardsToDiscardUnlessDiscarduType=选择要丢弃的%d张牌，除非你丢弃%s。
+lblSelectNCardsToDiscardUnlessDiscarduType=选择要丢弃的%d张牌，除非你丢弃{0}。
 lblCleanupPhase=清除步骤
-lblSelectCardsToDiscardHandDownMaximum=选择要丢弃的%d张牌，以使你的手牌数量减少到%max张。
+lblSelectCardsToDiscardHandDownMaximum=选择要丢弃的{0}张牌，以使你的手牌数量减少到{1}张。
 lblChooseMinCardToDiscard=选择%d张牌弃掉
 lblDiscarded=弃牌
-lblChooseDamageOrderFor=选择%s造成伤害的顺序
+lblChooseDamageOrderFor=选择{0}造成伤害的顺序
 lblDamagedFirst=先造成伤害
-lblChooseBlockerAfterWhichToPlaceAttackert=选择%s后造成伤害的阻挡者; cancel to place it first
-lblPutCardOnTopOrBottomLibrary=将%s放到牌库顶还是底？
+lblChooseBlockerAfterWhichToPlaceAttackert=选择{0}后造成伤害的阻挡者; cancel to place it first
+lblPutCardOnTopOrBottomLibrary=将{0}放到牌库顶还是底？
 lblChooseOrderCardsPutIntoLibrary=选择要放入牌库中的牌的顺序
 lblClosestToTop=最接近顶部
 lblChooseOrderCardsPutOntoBattlefield=选择要放入战场中的牌的顺序
@@ -1190,20 +1190,20 @@ lblChooseOrderCopiesCast=选择要复制品的释放顺序。
 lblDelveHowManyCards=掘穴多少张牌？
 lblExileWhichCard=放逐哪张牌?
 lblDestroy=消灭
-lblUpTo=最多
+lblSelectUpToNumTargetToAction=选择最多%d个{0}用于{1}。
+lblSelectNumTargetToAction=选择%d个{0}用于{1}。
 lblHighestBidder=最高出价者
 lblUseTriggeredAbilityOf=使用触发异能
 lblExertAttackersConfirm=进攻者耗竭？
-lblThereNoCardIn=里面没有牌
-lblPut=放到
-lblOnTheTopLibraryOrGraveyard=牌库顶或坟场？
+lblThereNoCardInPlayerZone={0}的{1}中没有牌
+lblPutCardsOnTheTopLibraryOrGraveyard=将{0}放到牌库顶还是坟场？
 lblLibrary=牌库
 lblGraveyard=坟场
 lblTop=顶
 lblBottom=底
-lblManaFrom=法术力自
+lblNColorManaFromCard={2}产{0}个{1}法术力 
 lblPayManaFromManaPool=从法术力池支付法术力
-lblChooseATargetType=选择一个%s类型
+lblChooseATargetType=选择一个{0}类型
 lblUntap=重置
 lblOdds=赔率
 lblEvens=偶数
@@ -1217,21 +1217,17 @@ lblWinTheFlip=赢得此掷
 lblLoseTheFlip=输掉此掷
 lblChooseAResult=选择一个结果
 lblSelectPreventionShieldToUse=选择一个保护罩使用
-lblChooseAMode=选择一种模式
-lblActivated=已启动
+lblPlayerActivatedCardChooseMode={0}激活了{1} - 选择一个模式
 lblNoPlayerHasPriorityCannotAddedManaToPool=目前没有牌手具有优先权，因此无法向法术力池中加入法术力。
 lblOverwriteExistFileConfirm=覆盖已有的文件？
 lblFileExists=文件已存在！
 lblSelectGameStateFile=选择游戏状态文件
 lblFileNotFound=文件未找到
-lblIn=在
-lblOnTheBattlefield=在战场上
-lblOnTheStackOrInPlay=在堆叠/在使用
-lblPutCard=放置牌
-lblForWhichPlayer=哪个牌手？
-lblShould=应该
-lblAffectedWithSummoningSickness=被召唤失调效应影响？
-lblBeAddedToLibraryTopOrBottom=被添加到牌库顶还是底？
+lblPutCardInWhichPlayerZone=将牌放于哪个牌手的{0}中？
+lblPutCardInWhichPlayerBattlefield=将牌放于哪个牌手的战场？
+lblPutCardInWhichPlayerPlayOrStack=将牌放于哪个牌手的堆叠/使哪个牌手使用牌？
+lblCardShouldBeSummoningSicknessConfirm={0}是否应该受到召唤失调的影响?
+lblCardShouldBeAddedToLibraryTopOrBottom=将{0}添加到牌库顶还是底？
 lblExileCardsFromPlayerHandConfirm=从哪位玩家手中放逐牌？
 lblChooseCardsExile=选择要放逐的牌
 lblExileCardsFromPlayerBattlefieldConfirm=从哪个玩家的战场放逐牌？
@@ -1245,7 +1241,11 @@ lblRestartingActionSequence=重新启动行动序列
 lblErrorPleaseCheckID=错误：请检查ID，并确保他们之间用空格和/或逗号分隔。
 lblErrorEntityWithId=错误：实体的ID
 lblNotFound=没有找到
-lblChooseAnnounceFor=为%name选择%s
+lblChooseAnnounceForCard=为{1}选择{0}
+lblSacrifice=牺牲
+lblLookCardInPlayerZone=查看{0}的{1}中的牌
+lblPlayerZone={0}的{1}
+lblActionFromPlayerDeck=从{1}的套牌{0}
 #AbstractGuiGame.java
 lblConcedeCurrentGame=这局游戏认输。\n\n确认吗？
 lblConcedeTitle=这局游戏认输?
@@ -1588,27 +1588,25 @@ lblFinalMatch=决赛
 #DualListBox.java
 lblSelectOrder=选择顺序
 #HumanPlay.java
-lblIfYouDo=如果你
+lblIfYouDo=如果你如此做
 lblOr=或
 lblDoYouWantPay=你想要支付
+lblDoYouWantPayNLife=你想要支付{0}点生命吗？
 lblDoyouWantTo=你想要
-lblDoYouWantMill=你想要磨
-lblDoYouWantFlip=你想要抛
-lblDoYouWantRemove=你想要移除
-lblDoYouWantRemoveCounters=你想要删除指示物从
-lblDoYouWantExile=你想要放逐
+lblDoYouWantMillNCardsOrDoAction=你想要磨{0}张牌吗？ {1}
+lblDoYouWantFlipNCoinOrDoAction=你想要抛{0}个硬币吗？ {1}
+lblDoYouWantRemoveNTargetTypeCounterFromCard=你想要从{2}移除{0}个{1}指示物吗？
+lblDoYouWantRemoveCountersFromCard=你想要从{0}删除指示物吗？
+lblDoYouWantExileNCardsFromYourLibrary=你想要从你的牌库放逐{0}张牌吗？
 lblDoYouWantExileAllCardYouGraveyard=你想要放逐坟场中的所有牌吗？
 lblDoYouWantDiscardYourHand=你想要弃掉你的手牌吗？
-lblDoYouWantSpend=你想要花费
-lblLetThatPlayer=让那个牌手
-lblCoin=硬币
-lblCounterOfPointer=指示物
-lblFrom=从
-lblFromYourLibrary=从你的牌库？
+lblDoYouWantSpendNTargetTypeCounter=你想要花费{0}个{1}指示物吗？
+lblDoYouWantLetThatPlayerDrawNCardOrDoAction=你想要抓让该牌手{0}张牌吗？{1}
+lblDoYouWantDrawNCardOrDoAction=你想要抓{0}张牌吗？{1}
 lblSelectRemoveCounterCard=选择一张牌删除指示物
 lblSelectRemoveCounterType=选择一个指示物类型删除
-lblExileFrom=放逐自
-lblPutCardFromWhose=谁放置牌
+lblExileFromZone=从{0}中放逐
+lblPutCardFromWhoseZone=将牌放入谁的{0}？
 lblPutCardToLibrary=将牌放入牌库
 lblPutIntoLibrary=放入牌库。
 lblGainControl=获得控制权。
@@ -1617,62 +1615,60 @@ lbldiscard=弃牌。
 lblReveal=展示
 lblTap=横置
 lblCurrentCard=当前牌
-lblSelectOfCardsTo=选择
-lblCardsTo=牌到
+lblSelectNSpecifyTypeCardsToAction=选择%d张{0}牌用于{1}
 #AbandonEffect.java
-lblWouldYoulikeAbandon=你想要终止阴谋
+lblWouldYoulikeAbandonSource=你想要终止阴谋{0}吗？
 #ActivateAbilityEffect.java
 lblChooseManaAbility=选择一个法术力异能：
 #AddTurnEffect.java
-lblTakesExtraTurn=获得一个额外回合。
+lblPlayerTakesExtraTurn={0}获得一个额外回合。
 #AmassEffect.java.
 lblChooseAnArmy=选择一个军队将指示物放置在上面。
 #AssignGroupEffect.java
-lblChooseAbilityFor=选择一个异能
+lblChooseAbilityForObject=从{0}中选择一个异能
 #AttachEffect.java
-lblDoYouWantAttach=你想要装备
-lblSelectAPlayerAttachTo=选择一个要结附的牌手。
-lblSelectACardAttachTo=选择一个要结附的牌。
+lblDoYouWantAttachSourceToTarget=你想要将{0}装备到{1}吗？
+lblSelectAPlayerAttachSourceTo={0} - 选择一个要结附的牌手。
+lblSelectACardAttachSourceTo={0} - 选择一个要结附的牌。
 #BidLifeEffect.java
 lblChooseStartingBid=选择一个初始价钱
 lblDoYouWantTopBid=你想要喊更高的价? 现在价钱 \=
-lblTopBidWith=最高喊价
+lblTopBidWithValueLife=最高喊价为{0}生命
 #BondEffect.java
 lblSelectACardPair=选择要组成搭档的牌
 #ChangeCombatantsEffect.java
 lblChooseDefenderToAttackWith=选择守军进行进攻
 #ChangeTargetsEffect.java
-lblDoYouWantChangeTargets=你是否想要更改目标
+lblDoYouWantChangeAbilityTargets=你是否想要更改{0}的目标
 #ChangeTextEffect.java
 lblChooseColorReplace=选择一个要替换的颜色词
 lblChooseNewColor=选择一个新的颜色词
 #ChangeZoneEffect.java
-lblDoYouWantMove=你想要移动
-lblDeclareDefenderFor=声明阻挡者
+lblDoYouWantMoveTargetFromOriToDest=你想要将{0}从{1}移动到{2}吗？
+lblPutThatCardFromPlayerOriginToDestination=将这张牌从{0}的{1}放到{2}
+lblSearchPlayerZoneConfirm=搜索{0}的{1}?
 lblCardMatchSearchingTypeInAlternateZones=在你的备用区域搜索匹配类型的卡牌。
-lblPutThatCardFrom=放置这张牌从
 lblLookingCardIn=看牌自
-lblDoYouWantPlay=你想要使用
-lblSelectCardFrom=选择一张牌从
-lblSelectUpTo=最多选择
-lblCardsFrom=牌张来自
-lblSelectCardsFrom=选择牌张来自
-lblCancelSearchUpTo=取消搜索？直到
-lblMoreCard=更多牌
-lblCanBeSelected=可以选择
+lblDoYouWantPlayCard=你想要使用{0}?
+lblSelectCardFromPlayerZone=选择一张牌从{0}的{1}
+lblSelectUpToNumCardFromPlayerZone=最多选择{0}张牌来自{1}的{2}
+lblSelectCardsFromPlayerZone=选择牌张来自{0}的{1}
+lblCancelSearchUpToSelectNumCards=取消搜索？最多可以搜索{0}张牌。
+#ChangeZoneAllEffect.java
+lblMoveTargetFromOriginToDestination=将{0}从{1}移动到{2}？
 #ChooseCardEffect.java
-lblSelectCreatureWithTotalPowerLessOrEqualTo=选择一些生物其力量合小于或等于
-lblTotalPower=总力量
+lblChoose=选择
+lblSelectCreatureWithTotalPowerLessOrEqualTo=选择一些生物其力量只和需小于或等于{0}
+lblTotalPowerNum=总力量：{0}
 lblCancelChooseConfirm=取消选择？
 #ChooseCardNameEffect.java
 lblChooseACardName=选择一个牌名
-lblChooseA=选择一个
-lblCardName=牌名
-lblPicked=选取
+lblChooseASpecificCard=选择一个{0}牌名
+lblPlayerPickedChosen={0}选取了{1}
 #ChooseColorEffect.java
 lblChooseAColor=选择一个颜色
-lblChoose=选择
-lblOrMore=或更多
+lblAtLastChooseNumColors=选择{0}或更多颜色
+lblChooseSpecifiedRangeColors=选择{0}到{1}种颜色
 #ChooseDirectionEffect.java
 lblLeftClockwise=左（顺时针）
 lblRightAntiClockwise=右（逆时针）
@@ -1681,7 +1677,7 @@ lblChooseDirection=选择一个方向
 lblChooseOne=选择一个
 #ChooseNumberEffect.java
 lblChooseNumber=选择一个数
-lblChose=已选择
+lblPlayerChoseNum={0}已选择{1}
 #ChoosePlayerEffect.java
 lblChoosePlayer=选择一个牌手
 #ChooseSourceEffect.java
@@ -1692,26 +1688,24 @@ lblReveals=展示
 lblWinsClash=比点赢了
 lblLosesClash=比点输了
 #CloneEffect.java
-lblDoYouWantCopy=你想要复制
+lblDoYouWantCopy=你想要复制{0}吗？
 #ControlExchangeVariantEffect.java
 lblChooseCards=选择牌
 #CopyPermanentEffect.java
 lblCopyPermanentConfirm=复制这个永久物？
 lblDefender=守军
 #CopySpellAbilityEffect.java
-lblDoyouWantCopyTheSpell=你想要复制这个咒语
-lblSelectMultiSpellCopyToStack=选择%d个咒语复制到堆叠
+lblDoyouWantCopyTheSpell=你想要复制咒语{0}吗？
+lblSelectMultiSpellCopyToStack=选择{0}个咒语复制到堆叠
 lblSelectASpellCopy=选择一个咒语进行复制
 #CounterEffect.java
 lblRemoveDestination=要删除的目标
 #CountersMoveEffect.java
-lblChooseTakeCountersCard=选择牌获得%s指示物自
-lblTakeHowMany=获得几个
-lblCountersFrom=指示物自
-lblChooseCardToGet=选择牌获得
-lblPutHowMany=放置几个
-lblCountersOn=指示物在上面
-lblCounters=指示物
+lblChooseTakeCountersCard=选择牌获得{0}指示物自
+lblTakeHowManyTargetCounterFromCard={1}获得多少个{0}指示物？
+lblChooseCardToGetCountersFrom=选择牌从{1}获取{0}指示物
+lblPutHowManyTargetCounterOnCard=放置多少个{0}指示物到{1}？
+lblTakeHowManyTargetCounters=获得多少{0}指示物？
 #CountersProliferateEffect.java
 lblChooseProliferateTarget=选择任意数量的永久物和或牌手进行增殖
 #CountersPutEffect.java
@@ -1719,41 +1713,40 @@ lblChooseACreatureWithLeastToughness=选择防御力最小的生物
 lblSelectCounterTypeAddTo=选择指示物类型以添加到
 lblHowManyCounters=多少指示物？
 lblChooseAnOpponent=选择一个对手
-lblDoYouWantPutTargetP1P1CountersOn=你想要放置%d个+1+1指示物到
+lblDoYouWantPutTargetP1P1CountersOnCard=你想要放置{0}个+1+1指示物到{1}吗？
 #CountersPutOrRemoveEffect.java
 lblSelectCounterTypeToAddOrRemove=选择要添加或移除的指示物的类型
-lblWhatToDoWithTargetCounter=如何使用'%s'指示物
+lblWhatToDoWithTargetCounter=如何使用'{0}'指示物
 #CountersRemoveEffect.java
 lblAllCounters=所有指示物
 lblACounters=一个指示物
-lblChooseCardtoTakeTargetCounters=选择牌要获得%s指示物自
-lblSelectRemoveCountersNumberOfTarget=选择要删除的%s指示物的数量
+lblCounters=指示物
+lblChooseCardsToTakeTargetCounters=选择牌要获得{0}指示物自
+lblSelectRemoveCountersNumberOfTarget=选择要删除的{0}指示物的数量
 lblSelectCountersTypeToRemove=选择要删除的指示物类型
 #DamageDealEffect.java
-lblDoyouWantDealTargetDamageTo=你想造成%d伤害给
+lblDoyouWantDealTargetDamageToTarget=你想对{1}造成{0}伤害吗？
 #DigEffect.java
 lblWouldYouLikeProceedWithOptionalAbility=你想继续以下可选的异能吗
-lblChooseACardToLeaveTargetLibraryTop=选择一张牌离开%s的牌库顶
-lblChooseACardLeaveTarget=选择一张牌离开%s
-lblChooseCardsPutInto=选择牌放到
-lblChooseCardPutOnTargetLibarayBottom=选择牌放到%s的牌库底
-lblChooseCardPutOnTargetLibarayTop=选择牌放到%s的牌库顶
+lblChooseACardToLeaveTargetLibraryTop=选择一张牌离开{0}的牌库顶
+lblChooseACardLeaveTarget=选择一张牌离开{0}的{1}
+lblChooseCardsPutIntoZone=选择牌放到{0}
+lblChooseCardPutOnTargetLibarayBottom=选择牌放到{0}的牌库底
+lblChooseCardPutOnTargetLibarayTop=选择牌放到}0的牌库顶
+lblPlayerPickedCardFrom={0}选择了牌自
 lblNoValidCards=没有有效的牌
-lblThisCard=这张牌
-lblTheseCards=这些牌
 #DigUntilEffect.java
 lblDoYouWantDigYourLibrary=你想要挖掘你的牌库吗?
-lblDoYouWantPutCardTo=你想把这张牌放到
+lblDoYouWantPutCardToZone=你想把这张牌放到{0}吗？
 #DiscardEffect.java
 lblWouldYouLikeRandomDiscardTargetCard=你想随机弃掉%d张牌吗？
-lblHasChosen=选择了
+lblPlayerHasChosenCardsFrom={0}选择了牌自
 #DrawEffect.java
-lblDoYouWantDraw=你想抓
+lblDoYouWantDrawCards=你想抓{0}张牌吗？
 lblHowMayCardDoYouWantDraw=你想怎么抓牌？
 #EncodeEffect.java
-lblAndEncodeOntoAYouControlCreature=和赋码到你控制的生物？
+lblDoYouWantExileCardAndEncodeOntoYouCreature=你想放逐{0}并将之赋码到你控制的生物吗？
 lblChooseACreatureYouControlToEncode=选择你控制的生物进场赋码
-lblEncoding=已赋码
 #ExploreEffect.java
 lblRevealedForExplore=勘察所展示
 lblPutThisCardToYourGraveyard=把这张牌放到你的坟墓场？
@@ -1768,25 +1761,25 @@ lblLifeTotal=生命总数
 #ManaEffect.java
 lblDoYouWantAddMana=你想增加法术力吗？
 lblSelectManaProduce=选择要产出的法术力
-lblChooseSingleColorFrom=选择一种颜色自
+lblChooseSingleColorFromTarget=从{0}选择一种颜色
 #ManifestEffect.java
 lblChooseCardToManifest=选择要显化的牌
 #MeldEffect.java
 lblChooseCardToMeld=选择要融合的牌
 #MillEffect.java
-lblDoYouWantPutLibraryCardsTo=你想要从牌库中把牌放入
+lblDoYouWantPutLibraryCardsTo=你想要从牌库中把牌放入{0}吗？
 #MultiplePilesEffect.java
-lblChooseCardsInPile=选择一堆卡
+lblChooseCardsInTargetPile=选择堆{0}中的牌？
 #PeekAndRevealEffect.java
 lblRevealingCardFrom=展示牌自
-lblRevealCardToOtherPlayers=想其他玩家展示牌？
+lblRevealCardToOtherPlayers=向其他玩家展示牌？
 #PlayEffect.java
-lblChooseUpTo=选择最多
+lblChooseUpTo=最多选择
 lblSelectCardToPlay=选择要使用的牌
 #ProtectAllEffect.java
 lblChooseAProtection=选择一个保护
 #PumpEffect.java
-lblApplyPumpTo=将pump用于
+lblApplyPumpToTarget=将pump用于{0}？
 #RearrangeTopOfLibraryEffect.java
 lblDoyouWantShuffleTheLibrary=你想要洗这个牌库吗？
 #RepeatEffect.java
@@ -1794,22 +1787,20 @@ lblDoYouWantRepeatProcessAgain=你是否想再次重复这个过程？
 #RevealHandEffect.java
 lblDoYouWantRevealYourHand=你想展示你的手牌吗？
 #RollPlanarDiceEffect.java
-lblRolled=已掷骰
+lblPlayerRolledResult={0}掷骰结果为{1}
 #SacrificeEffect.java
 lblDoYouWantPayEcho=你想支付返响费用
 lblPayEcho=支付返响费用
 lblDoYouWantSacrifice=你想牺牲吗？
-lblSacrifice=牺牲
-lblDestroys=消灭
 #SetStateEffect.java
 lblFaceDownCardCantTurnFaceUp=面朝下的牌不能面朝上
 #ShuffleEffect.java
-lblHaveTargetShuffle=%s洗牌了吗?
+lblHaveTargetShuffle={0}洗牌了吗?
 #SurveilEffect.java
 lblDoYouWantSurveil=你想刺探吗？
 #TapOrUntapAllEffect.java
 lblPermanents=永久物
-lblTapOrUntap=横置或重置
+lblTapOrUntapTarget=横置还是重置{0}？
 #TwoPilesEffect.java
 lblSelectCardForFaceDownPile=选择一个面朝下的堆
 lblDivideCardIntoTwoPiles=将牌分为两堆
@@ -1847,3 +1838,17 @@ lblRepeatAddCard=重复上一张添加的牌
 lblRemoveFromGame=从游戏中删除牌
 lblRiggedRoll=触发时空骰
 lblWalkTo=时空换入
+#ZoneType.java
+lblHandZone=手牌
+lblLibraryZone=牌库
+lblGraveyardZone=坟场
+lblBattlefieldZone=战场
+lblExileZone=放逐区
+lblFlashbackZone=返照
+lblCommandZone=指挥官区
+lblStackZone=堆叠
+lblSideboardZone=备牌
+lblAnteZone=赌注牌区
+lblSchemeDeckZone=魔王套牌
+lblPlanarDeckZone=时空套牌
+lblNoneZone=空