diff --git a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java index 73304a92585..7c39571f33e 100644 --- a/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java +++ b/forge-gui-desktop/src/main/java/forge/deckchooser/FDeckChooser.java @@ -69,7 +69,7 @@ public class FDeckChooser extends JPanel implements IDecksComboBoxListener { final Dimension parentSize = JOptionPane.getRootFrame().getSize(); chooser.setMinimumSize(new Dimension((int)(parentSize.getWidth() / 2), (int)parentSize.getHeight() - 200)); final Localizer localizer = Localizer.getInstance(); - final FOptionPane optionPane = new FOptionPane(null, title, null, chooser, ImmutableList.of(localizer.getMessage("lblOk"), localizer.getMessage("lblCancel")), 0); + final FOptionPane optionPane = new FOptionPane(null, title, null, chooser, ImmutableList.of(localizer.getMessage("lblOK"), localizer.getMessage("lblCancel")), 0); optionPane.setDefaultFocus(chooser); chooser.lstDecks.setItemActivateCommand(new UiCommand() { @Override diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java index b277da7d749..c6929ebff9c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChooseFormats.java @@ -86,7 +86,7 @@ public class DialogChooseFormats { } }; - FButton btnOk = new FButton(localizer.getMessage("lblOk")); + FButton btnOk = new FButton(localizer.getMessage("lblOK")); btnOk.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent arg0) { diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java index a4e0ecd8f51..79ec735962c 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/quest/DialogChoosePoolDistribution.java @@ -48,7 +48,7 @@ public class DialogChoosePoolDistribution { private final FTextField numberOfBoostersField = new FTextField.Builder().text("0").maxLength(10).build(); - private final FButton btnOk = new FButton(localizer.getMessage("lblOk")); + private final FButton btnOk = new FButton(localizer.getMessage("lblOK")); private Runnable callback; diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java b/forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java index eede6ec80da..09537eec692 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java @@ -86,7 +86,7 @@ public class VAssignCombatDamage { private final JLabel lblTotalDamage = new FLabel.Builder().text(localizer.getMessage("lblTotalDamageText")).build(); private final JLabel lblAssignRemaining = new FLabel.Builder().text(localizer.getMessage("lblAssignRemainingText")).build(); // Label Buttons - private final FButton btnOK = new FButton(localizer.getMessage("lblOk")); + private final FButton btnOK = new FButton(localizer.getMessage("lblOK")); private final FButton btnReset = new FButton(localizer.getMessage("lblReset")); private final FButton btnAuto = new FButton(localizer.getMessage("lblAuto")); private final FButton btnSkip = new FButton(localizer.getMessage("lblSkip")); diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java b/forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java index 26b5aa5a97c..03be2f9b87a 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java @@ -73,7 +73,7 @@ public class VAssignGenericAmount { private final JLabel lblTotalAmount; private final boolean atLeastOne; // Label Buttons - private final FButton btnOK = new FButton(localizer.getMessage("lblOk")); + private final FButton btnOK = new FButton(localizer.getMessage("lblOK")); private final FButton btnReset = new FButton(localizer.getMessage("lblReset")); private static class AssignTarget { diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java index d3a7e7bd244..2fb0f440829 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VPrompt.java @@ -59,7 +59,7 @@ public class VPrompt implements IVDoc { private final DragTab tab = new DragTab(localizer.getMessage("lblPrompt")); // Various components - private final FButton btnOK = new FButton(localizer.getMessage("lblOk")); + private final FButton btnOK = new FButton(localizer.getMessage("lblOK")); private final FButton btnCancel = new FButton(localizer.getMessage("lblCancel")); private final FHtmlViewer tarMessage = new FHtmlViewer(); private final FScrollPane messageScroller = new FScrollPane(tarMessage, false, diff --git a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java index 99cd9723d68..93660cbcd28 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DeckSelectScene.java @@ -69,7 +69,7 @@ public class DeckSelectScene extends UIScene { int index = Current.player().copyDeck(); if (index == -1) { showDialog(createGenericDialog(Forge.getLocalizer().getMessage("lblCopy"), Forge.getLocalizer().getMessage("lblNoAvailableSlots"), - Forge.getLocalizer().getMessage("lblOk"), + Forge.getLocalizer().getMessage("lblOK"), null, this::removeDialog, null)); } else { @@ -82,7 +82,7 @@ public class DeckSelectScene extends UIScene { private void maybeDelete() { if (Current.player().isEmptyDeck(currentSlot)) return; Dialog deleteDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblDelete"), Forge.getLocalizer().getMessage("lblAreYouSureProceedDelete"), - Forge.getLocalizer().getMessage("lblOk"), + Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), this::delete, this::removeDialog); showDialog(deleteDialog); @@ -103,7 +103,7 @@ public class DeckSelectScene extends UIScene { private void showRenameDialog() { if (renameDialog == null) { renameDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblRenameDeck"), null, - Forge.getLocalizer().getMessage("lblOk"), + Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), () -> { this.rename(); removeDialog(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java index a8a570ea510..0a1657103f1 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SaveLoadScene.java @@ -203,7 +203,7 @@ public class SaveLoadScene extends UIScene { textInput.setText(buttons.get(currentSlot).actor.getText()); if (saveDialog == null) { saveDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblSave"), null, - Forge.getLocalizer().getMessage("lblOk"), + Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), () -> { this.save(); removeDialog(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java index 97312d203b0..784e659d85f 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/SettingsScene.java @@ -59,7 +59,7 @@ public class SettingsScene extends UIScene { if (somethingWentWrong.get()) { if (errorDialog == null) { errorDialog = createGenericDialog("Something went wrong", "Copy was not successful check your access right\n and if the folder is in use", - Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblAbort"), this::removeDialog, this::removeDialog); + Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), this::removeDialog, this::removeDialog); } showDialog(errorDialog); } else { @@ -67,7 +67,7 @@ public class SettingsScene extends UIScene { copyPlane = createGenericDialog("Copied plane", "New plane " + newPlaneName.getText() + " was created\nYou can now start the editor to change the plane\n" + "or edit it manually from the folder\n" + Config.instance().getPlanePath("" + newPlaneName.getText()), - Forge.getLocalizer().getMessage("lblOk"), Forge.getLocalizer().getMessage("lblAbort"), this::removeDialog, this::removeDialog); + Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), this::removeDialog, this::removeDialog); } Config.instance().getSettingData().plane = "" + newPlaneName.getText(); Config.instance().saveSettings(); @@ -78,7 +78,7 @@ public class SettingsScene extends UIScene { private void createNewPlane() { if (createNewPlane == null) { createNewPlane = createGenericDialog("Create your own Plane", "Select a plane to copy", - Forge.getLocalizer().getMessage("lblOk"), + Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), () -> { this.copyNewPlane(); removeDialog(); diff --git a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java index 4b383661ffb..5dad8373634 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/StartScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/StartScene.java @@ -103,7 +103,7 @@ public class StartScene extends UIScene { public boolean Exit() { if (exitDialog == null) { exitDialog = createGenericDialog(Forge.getLocalizer().getMessage("lblExitForge"), - Forge.getLocalizer().getMessage("lblAreYouSureYouWishExitForge"), Forge.getLocalizer().getMessage("lblOk"), + Forge.getLocalizer().getMessage("lblAreYouSureYouWishExitForge"), Forge.getLocalizer().getMessage("lblOK"), Forge.getLocalizer().getMessage("lblAbort"), () -> { Forge.exit(true); removeDialog(); diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java index 5eeb5f5169d..751035b40da 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineLobbyScreen.java @@ -57,7 +57,7 @@ public class OnlineLobbyScreen extends LobbyScreen implements IOnlineLobby { Forge.back(); if (msg.length() > 0) { FThreads.invokeInBackgroundThread(() -> { - final boolean callBackAlwaysTrue = SOptionPane.showOptionDialog(msg, Forge.getLocalizer().getMessage("lblError"), FSkinProp.ICO_WARNING, ImmutableList.of(Forge.getLocalizer().getMessage("lblOk")), 1) == 0; + final boolean callBackAlwaysTrue = SOptionPane.showOptionDialog(msg, Forge.getLocalizer().getMessage("lblError"), FSkinProp.ICO_WARNING, ImmutableList.of(Forge.getLocalizer().getMessage("lblOK")), 1) == 0; if (callBackAlwaysTrue) { //to activate online menu popup when player press play online GuiBase.setInterrupted(false); diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index 2accf9ee296..c1d90630ab4 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -374,7 +374,6 @@ lblYouAreGoing=Du startest lblMulligan=Mulligan lblDoYouWantToKeepYourHand=Starthand behalten? lblReturnForLondon=Lege %d Karten unter die Bibliothek -lblOk=OK lblReset=Zurück lblAuto=Auto #VAssignDamage.java diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties index 6ad6deff1cc..b27f8384046 100644 --- a/forge-gui/res/languages/en-US.properties +++ b/forge-gui/res/languages/en-US.properties @@ -374,7 +374,6 @@ lblYouAreGoing=you are going lblMulligan=Mulligan lblDoYouWantToKeepYourHand=Do you want to keep your hand? lblReturnForLondon=Return %d card(s) to the bottom of your library -lblOk=Ok lblReset=Reset lblAuto=Auto #VAssignDamage.java diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 4f5599f528c..46ad2e41fa8 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -374,7 +374,6 @@ lblYouAreGoing=juegas lblMulligan=Mulligan lblDoYouWantToKeepYourHand=¿Quieres conservar tu mano o hacer mulligan? lblReturnForLondon=Devuelve %d carta(s) en la parte inferior de tu biblioteca -lblOk=OK lblReset=Reset lblAuto=Auto #VAssignDamage.java diff --git a/forge-gui/res/languages/fr-FR.properties b/forge-gui/res/languages/fr-FR.properties index 576ca336c19..cfb28a1fde8 100644 --- a/forge-gui/res/languages/fr-FR.properties +++ b/forge-gui/res/languages/fr-FR.properties @@ -374,7 +374,6 @@ lblYouAreGoing=tu vas en lblMulligan=Mulligan lblDoYouWantToKeepYourHand=Voulez-vous garder votre main ? lblReturnForLondon=Renvoyer %d carte(s) au bas de votre bibliothèque -lblOk=Ok lblReset=Réinitialiser lblAuto=Auto #VAssignDamage.java diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index 0d1e149673b..bc9e29d03a4 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -373,7 +373,6 @@ lblYouAreGoing=stai andando lblMulligan=Mulligan lblDoYouWantToKeepYourHand=Vuoi tenere la mano? lblReturnForLondon=Poni %d carte in fondo al tuo grimorio -lblOk=Ok lblReset=Ripristina lblAuto=Auto #VAssignDamage.java diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index a20fa4a3c05..2a9c986c8dc 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -374,7 +374,6 @@ lblYouAreGoing=あなたの順番は lblMulligan=マリガン lblDoYouWantToKeepYourHand=手札をキープしますか？ lblReturnForLondon=ライブラリの一番下に %d枚カードを戻してください -lblOk=Ok lblReset=リセット lblAuto=自動 #VAssignDamage.java diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties index c5ce26ea09a..d45cf9c73e9 100644 --- a/forge-gui/res/languages/pt-BR.properties +++ b/forge-gui/res/languages/pt-BR.properties @@ -386,7 +386,6 @@ lblYouAreGoing=você está indo lblMulligan=Mulligan lblDoYouWantToKeepYourHand=Você quer manter a mão? lblReturnForLondon=Devolver %d carta(s) para o fundo do grimório -lblOk=Ok lblReset=Redefinir lblAuto=Automático #VAssignDamage.java diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index df880d97e3c..de017e6a4d2 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -374,7 +374,6 @@ lblYouAreGoing=你是 lblMulligan=调度 lblDoYouWantToKeepYourHand=你想保留这个手牌吗？ lblReturnForLondon=放回%d张牌到牌库底 -lblOk=确认 lblReset=重置 lblAuto=自动 #VAssignDamage.java diff --git a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java index a3c5554a3ab..20e6be1669e 100644 --- a/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/gauntlet/GauntletWinLoseController.java @@ -68,7 +68,7 @@ public abstract class GauntletWinLoseController { message2 = localizer.getMessage("lblGauntletTournament"); view.getBtnContinue().setVisible(false); - view.getBtnQuit().setText(localizer.getMessage("lblOk")); + view.getBtnQuit().setText(localizer.getMessage("lblOK")); // Remove save file if it's a quickie, or just reset it. if (gd.getName().startsWith(GauntletIO.PREFIX_QUICK)) { diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java index 9aa6ec454f5..70595e51f77 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputAttack.java @@ -88,7 +88,7 @@ public class InputAttack extends InputSyncronizedBase { private void updatePrompt() { Localizer localizer = Localizer.getInstance(); String alphaLabel = canCallBackAttackers() ? localizer.getMessage("lblCallBack") : localizer.getMessage("lblAlphaStrike"); - getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOk"), alphaLabel, true, true, true); + getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOK"), alphaLabel, true, true, true); } private void disablePrompt() { diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputLondonMulligan.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputLondonMulligan.java index e6901f645b1..d27c22580d5 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputLondonMulligan.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputLondonMulligan.java @@ -60,7 +60,7 @@ public class InputLondonMulligan extends InputSyncronizedBase { StringBuilder sb = new StringBuilder(); - getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOk"), localizer.getMessage("lblAuto"), cardsLeft == 0, cardsLeft != 0, true); + getController().getGui().updateButtons(getOwner(), localizer.getMessage("lblOK"), localizer.getMessage("lblAuto"), cardsLeft == 0, cardsLeft != 0, true); sb.append(String.format(localizer.getMessage("lblReturnForLondon"), cardsLeft)); diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPassPriority.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPassPriority.java index 8e3b854be3c..dd256c88166 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPassPriority.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPassPriority.java @@ -114,7 +114,7 @@ public class InputPassPriority extends InputSyncronizedBase { if (player.getManaPool().hasBurn()) { message += " " + localizer.getMessage("lblYouWillTakeManaBurnDamageEqualAmountFloatingManaLostThisWay"); } - if (getController().getGui().showConfirmDialog(message, localizer.getMessage("lblManaFloating"), localizer.getMessage("lblOk"), localizer.getMessage("lblCancel"))) { + if (getController().getGui().showConfirmDialog(message, localizer.getMessage("lblManaFloating"), localizer.getMessage("lblOK"), localizer.getMessage("lblCancel"))) { runnable.run(); } } diff --git a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java index 77171a548ea..d8941daf3bc 100644 --- a/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java +++ b/forge-gui/src/main/java/forge/gamemodes/tournament/TournamentWinLoseController.java @@ -67,7 +67,7 @@ abstract public class TournamentWinLoseController { message2 = localizer.getMessage("lblThroughTournament"); view.getBtnContinue().setVisible(false); - view.getBtnQuit().setText(localizer.getMessage("lblOk")); + view.getBtnQuit().setText(localizer.getMessage("lblOK")); // Remove save file if it's a quickie, or just reset it. if (gd.getName().startsWith(TournamentIO.PREFIX_QUICK)) { diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 4aff9aa28ec..4c6e84b4139 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1725,7 +1725,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont cardView = CardView.getCardForUi(iPaperCard); else cardView = sa.getHostCard().getView(); - getGui().confirm(cardView, message, ImmutableList.of(localizer.getMessage("lblOk"))); + getGui().confirm(cardView, message, ImmutableList.of(localizer.getMessage("lblOK"))); } else { getGui().message(message, sa == null || sa.getHostCard() == null ? "" : CardView.get(sa.getHostCard()).toString()); }