From 40af2cc63d02eaa5220fceec55ea9d736f9bbf2f Mon Sep 17 00:00:00 2001 From: Doublestrike Date: Sun, 15 Jan 2012 10:42:54 +0000 Subject: [PATCH] Changed "removed" to "exiled" for consistency --- res/lang/de.properties | 12 +++++------ res/lang/en.properties | 12 +++++------ .../forge/control/match/ControlField.java | 4 ++-- .../java/forge/properties/NewConstants.java | 20 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/res/lang/de.properties b/res/lang/de.properties index 3b3b50752b6..64795b46783 100644 --- a/res/lang/de.properties +++ b/res/lang/de.properties @@ -18,9 +18,9 @@ Display/dev/title=Developer Display/human/title=Spieler Display/human/hand/title=Hand: -Display/human/removed/menu=Spieler - Entfernte Karten ansehen -Display/human/removed/button=Entfernt: -Display/human/removed/title=Deine entfernten Karten +Display/human/exiled/menu=Spieler - Entfernte Karten ansehen +Display/human/exiled/button=Entfernt: +Display/human/exiled/title=Deine entfernten Karten Display/human/library/title=Bibliothek: Display/human/graveyard/menu=Spieler - Friedhof ansehen Display/human/graveyard/button=Friedhof: @@ -33,9 +33,9 @@ Display/combat/title=Kampf Display/computer/title=Computer Display/computer/hand/title=Hand: -Display/computer/removed/menu=Computer - Entfernte Karten ansehen -Display/computer/removed/button=Entfernt: -Display/computer/removed/title=Computer's entfernte Karten +Display/computer/exiled/menu=Computer - Entfernte Karten ansehen +Display/computer/exiled/button=Entfernt: +Display/computer/exiled/title=Computer's entfernte Karten Display/computer/library/title=Bibliothek: Display/computer/graveyard/menu=Computer - Friedhof ansehen Display/computer/graveyard/button=Friedhof: diff --git a/res/lang/en.properties b/res/lang/en.properties index d4e1716079e..742999a642e 100644 --- a/res/lang/en.properties +++ b/res/lang/en.properties @@ -20,9 +20,9 @@ Display/human/title=Player Display/human/hand/menu=Player - View Hand Display/human/hand/button=Hand: Display/human/hand/title=Player's Hand -Display/human/removed/menu=Player - View Exile -Display/human/removed/button=Exile: -Display/human/removed/title=Player's Exile +Display/human/exiled/menu=Player - View Exile +Display/human/exiled/button=Exile: +Display/human/exiled/title=Player's Exile Display/human/library/menu=Player - View Library Display/human/library/button=Library: Display/human/library/title=Player's Library @@ -41,9 +41,9 @@ Display/computer/title=Computer Display/computer/hand/menu=Computer - View Hand Display/computer/hand/button=Hand: Display/computer/hand/title=Computer's Hand -Display/computer/removed/menu=Computer - View Exile -Display/computer/removed/button=Exile: -Display/computer/removed/title=Computer's Exile +Display/computer/exiled/menu=Computer - View Exile +Display/computer/exiled/button=Exile: +Display/computer/exiled/title=Computer's Exile Display/computer/library/menu=Computer - View Library Display/computer/library/button=Library: Display/computer/library/title=Computer's Library diff --git a/src/main/java/forge/control/match/ControlField.java b/src/main/java/forge/control/match/ControlField.java index c73632de321..a4dae521e28 100644 --- a/src/main/java/forge/control/match/ControlField.java +++ b/src/main/java/forge/control/match/ControlField.java @@ -398,10 +398,10 @@ public class ControlField { public void mousePressed(final MouseEvent e) { if (ControlField.this.player.isComputer()) { new ZoneAction(ControlField.this.player.getZone(Zone.Exile), - NewConstants.Lang.GuiDisplay.COMPUTER_REMOVED).actionPerformed(null); + NewConstants.Lang.GuiDisplay.COMPUTER_EXILED).actionPerformed(null); } else { new ZoneAction(ControlField.this.player.getZone(Zone.Exile), - NewConstants.Lang.GuiDisplay.HUMAN_REMOVED).actionPerformed(null); + NewConstants.Lang.GuiDisplay.HUMAN_EXILED).actionPerformed(null); } } }; diff --git a/src/main/java/forge/properties/NewConstants.java b/src/main/java/forge/properties/NewConstants.java index 2d0344b5113..18fdca9b3de 100644 --- a/src/main/java/forge/properties/NewConstants.java +++ b/src/main/java/forge/properties/NewConstants.java @@ -420,8 +420,8 @@ public final class NewConstants { public static final String MENU = "%s/Display/human/graveyard/menu"; } - /** The HUMAN_REMOVED. */ - public static final String HUMAN_REMOVED = "%s/Display/human/removed"; + /** The HUMAN_EXILED. */ + public static final String HUMAN_EXILED = "%s/Display/human/exiled"; /** * The Interface HumanRemoved. @@ -429,13 +429,13 @@ public final class NewConstants { public static class HumanRemoved { /** The TITLE. */ - public static final String TITLE = "%s/Display/human/removed/title"; + public static final String TITLE = "%s/Display/human/exiled/title"; /** The BUTTON. */ - public static final String BUTTON = "%s/Display/human/removed/button"; + public static final String BUTTON = "%s/Display/human/exiled/button"; /** The MENU. */ - public static final String MENU = "%s/Display/human/removed/menu"; + public static final String MENU = "%s/Display/human/exiled/menu"; } /** The COMBAT. */ @@ -534,8 +534,8 @@ public final class NewConstants { public static final String MENU = "%s/Display/computer/graveyard/menu"; } - /** The COMPUTER_REMOVED. */ - public static final String COMPUTER_REMOVED = "%s/Display/computer/removed"; + /** The COMPUTER_EXILED. */ + public static final String COMPUTER_EXILED = "%s/Display/computer/exiled"; /** * The Interface CopmuterRemoved. @@ -543,13 +543,13 @@ public final class NewConstants { public static class ComputerRemoved { /** The TITLE. */ - public static final String TITLE = "%s/Display/computer/removed/title"; + public static final String TITLE = "%s/Display/computer/exiled/title"; /** The BUTTON. */ - public static final String BUTTON = "%s/Display/computer/removed/button"; + public static final String BUTTON = "%s/Display/computer/exiled/button"; /** The MENU. */ - public static final String MENU = "%s/Display/computer/removed/menu"; + public static final String MENU = "%s/Display/computer/exiled/menu"; } /** The CONCEDE. */