diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index 2468ab50d6c..625507c801a 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -1152,6 +1152,23 @@ 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? #AbstractGuiGame.java lblConcedeCurrentGame=Das Spiel wird als verloren gewertet.\n\nTrotzdem aufgeben? lblConcedeTitle=Spiel verloren geben? diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index 2c917dfba90..24b8836ac02 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -1152,6 +1152,23 @@ 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? #AbstractGuiGame.java lblConcedeCurrentGame=This will concede the current game and you will lose.\n\nConcede anyway? lblConcedeTitle=Concede Game? diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index a6cde649e9f..e531d26be04 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -1152,6 +1152,23 @@ lblDiscardNCards=Descarta %d carta(s) lblSelectNCardsToDiscardUnlessDiscarduType=Selecciona %d carta(s) para descartar, a menos que descartes un %s. lblCleanupPhase=Fase de Limpieza lblSelectCardsToDiscardHandDownMaximum=Selecciona %d carta(s) a descartar para reducir tu mano al máximo de %max cartas. +lblChooseMinCardToDiscard=Elige %d carta(s) para descartar +lblDiscarded=Descartado +lblChooseDamageOrderFor=Selecciona el Orden de Daños para %s +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? +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 +lblPutFirst=Poner en primer lugar +lblChooseOrderCardsPutIntoGraveyard=Elige el orden de las cartas para poner en el cementerio +lblClosestToBottom=Más cerca de la parte inferior +lblChooseOrderCardsPutIntoPlanarDeck=Elige el orden de las cartas que quieres poner en el mazo planar +lblChooseOrderCardsPutIntoSchemeDeck=Elige el orden de las cartas que quieres poner en el mazo scheme +lblChooseOrderCopiesCast=Elige el orden de las copias que se van a invocar +lblDelveHowManyCards=¿Excavar cuántas cartas? +lblExileWhichCard=¿Exiliar qué carta? #AbstractGuiGame.java lblConcedeCurrentGame=Esto concederá la partida actual y perderás.\n\n¿Conceder de todos modos? lblConcedeTitle=¿Conceder Partida? diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 4e22237a4e5..970ac44b013 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -1152,6 +1152,23 @@ 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? #AbstractGuiGame.java lblConcedeCurrentGame=这局游戏认输。\n\n确认吗？ lblConcedeTitle=这局游戏认输? diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 3e3abc762c1..37bcafa370d 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -678,7 +678,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont public CardCollection orderBlockers(final Card attacker, final CardCollection blockers) { final CardView vAttacker = CardView.get(attacker); getGui().setPanelSelection(vAttacker); - return game.getCardList(getGui().order("Choose Damage Order for " + vAttacker, "Damaged First", + return game.getCardList(getGui().order(localizer.getMessage("lblChooseDamageOrderFor").replace("%s", vAttacker.toString()), localizer.getMessage("lblDamagedFirst"), CardView.getCollection(blockers), vAttacker)); } @@ -703,7 +703,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont final CardView vAttacker = CardView.get(attacker); getGui().setPanelSelection(vAttacker); return game.getCardList(getGui().insertInList( - "Choose blocker after which to place " + vAttacker + " in damage order; cancel to place it first", + localizer.getMessage("lblChooseBlockerAfterWhichToPlaceAttackert").replace("%s", vAttacker.toString()), CardView.get(blocker), CardView.getCollection(oldBlockers))); } @@ -711,7 +711,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont public CardCollection orderAttackers(final Card blocker, final CardCollection attackers) { final CardView vBlocker = CardView.get(blocker); getGui().setPanelSelection(vBlocker); - return game.getCardList(getGui().order("Choose Damage Order for " + vBlocker, "Damaged First", + return game.getCardList(getGui().order(localizer.getMessage("lblChooseDamageOrderFor").replace("%s", vBlocker.toString()), localizer.getMessage("lblDamagedFirst"), CardView.getCollection(attackers), vBlocker)); } @@ -841,7 +841,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont getGui().setCard(c.getView()); boolean result = false; - result = InputConfirm.confirm(this, view, TextUtil.concatNoSpace("Put ", view.toString(), " on the top or bottom of your library?"), + result = InputConfirm.confirm(this, view, localizer.getMessage("lblPutCardOnTopOrBottomLibrary").replace("%s", view.toString()), true, ImmutableList.of("Top", "Bottom")); endTempShowCards(); @@ -876,27 +876,27 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont tempShowCards(cards); switch (destinationZone) { case Library: - choices = getGui().order("Choose order of cards to put into the library", "Closest to top", + choices = getGui().order(localizer.getMessage("lblChooseOrderCardsPutIntoLibrary"), localizer.getMessage("lblClosestToTop"), CardView.getCollection(cards), null); break; case Battlefield: - choices = getGui().order("Choose order of cards to put onto the battlefield", "Put first", + choices = getGui().order(localizer.getMessage("lblChooseOrderCardsPutOntoBattlefield"), localizer.getMessage("lblPutFirst"), CardView.getCollection(cards), null); break; case Graveyard: - choices = getGui().order("Choose order of cards to put into the graveyard", "Closest to bottom", + choices = getGui().order(localizer.getMessage("lblChooseOrderCardsPutIntoGraveyard"), localizer.getMessage("lblClosestToBottom"), CardView.getCollection(cards), null); break; case PlanarDeck: - choices = getGui().order("Choose order of cards to put into the planar deck", "Closest to top", + choices = getGui().order(localizer.getMessage("lblChooseOrderCardsPutIntoPlanarDeck"), localizer.getMessage("lblClosestToTop"), CardView.getCollection(cards), null); break; case SchemeDeck: - choices = getGui().order("Choose order of cards to put into the scheme deck", "Closest to top", + choices = getGui().order(localizer.getMessage("lblChooseOrderCardsPutIntoSchemeDeck"), localizer.getMessage("lblClosestToTop"), CardView.getCollection(cards), null); break; case Stack: - choices = getGui().order("Choose order of copies to cast", "Put first", CardView.getCollection(cards), + choices = getGui().order(localizer.getMessage("lblChooseOrderCopiesCast"), localizer.getMessage("lblPutFirst"), CardView.getCollection(cards), null); break; default: @@ -914,8 +914,8 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont if (p != player) { tempShowCards(valid); final CardCollection choices = game - .getCardList(getGui().many("Choose " + min + " card" + (min != 1 ? "s" : "") + " to discard", - "Discarded", min, min, CardView.getCollection(valid), null)); + .getCardList(getGui().many(String.format(localizer.getMessage("lblChooseMinCardToDiscard"), min), + localizer.getMessage("lblDiscarded"), min, min, CardView.getCollection(valid), null)); endTempShowCards(); return choices; } @@ -938,9 +938,9 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont for (int i = 0; i <= cardsInGrave; i++) { cntChoice.add(Integer.valueOf(i)); } - final int chosenAmount = getGui().one("Delve how many cards?", cntChoice.build()).intValue(); + final int chosenAmount = getGui().one(localizer.getMessage("lblDelveHowManyCards"), cntChoice.build()).intValue(); for (int i = 0; i < chosenAmount; i++) { - final CardView nowChosen = getGui().oneOrNone("Exile which card?", CardView.getCollection(grave)); + final CardView nowChosen = getGui().oneOrNone(localizer.getMessage("lblExileWhichCard"), CardView.getCollection(grave)); if (nowChosen == null) { // User canceled,abort delving.