From c3b858e6974cc7cc336f7a361057a3c0908351af Mon Sep 17 00:00:00 2001
From: Northmoc <timothy.s.mocny@gmail.com>
Date: Mon, 21 Sep 2020 16:06:48 -0400
Subject: [PATCH] Fix capitalization of Combat tab in match view

---
 .../src/main/java/forge/screens/match/views/VCombat.java      | 4 ++--
 forge-gui/res/languages/de-DE.properties                      | 1 +
 forge-gui/res/languages/en-US.properties                      | 1 +
 forge-gui/res/languages/es-ES.properties                      | 1 +
 forge-gui/res/languages/it-IT.properties                      | 3 ++-
 forge-gui/res/languages/zh-CN.properties                      | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VCombat.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VCombat.java
index dfd7e67a2d7..82be2110926 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VCombat.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VCombat.java
@@ -36,7 +36,7 @@ public class VCombat implements IVDoc<CCombat> {
 
     // Fields used with interface IVDoc
     private DragCell parentCell;
-    private final DragTab tab = new DragTab(Localizer.getInstance().getMessage("lblCombat"));
+    private final DragTab tab = new DragTab(Localizer.getInstance().getMessage("lblCombatTab"));
 
     private final SkinnedTextArea tar = new SkinnedTextArea();
 
@@ -109,7 +109,7 @@ public class VCombat implements IVDoc<CCombat> {
         // No need to update this unless it's showing
         if (!this.equals(parentCell.getSelected())) { return; }
 
-        tab.setText(cntAttackers > 0 ? (Localizer.getInstance().getMessage("lblCombat") + " : " + cntAttackers) : Localizer.getInstance().getMessage("lblCombat"));
+        tab.setText(cntAttackers > 0 ? (Localizer.getInstance().getMessage("lblCombatTab") + " : " + cntAttackers) : Localizer.getInstance().getMessage("lblCombatTab"));
         tar.setText(desc);
     }
 }
diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties
index f7ef60e3d03..5af68f0a69b 100644
--- a/forge-gui/res/languages/de-DE.properties
+++ b/forge-gui/res/languages/de-DE.properties
@@ -990,6 +990,7 @@ nlExperimentalNetworkCompatibility=Forge wechselt auf kompatiblen Netzwerk-Strea
 lblPlayers=Spieler
 lblLog=Bericht
 lblDev=Entw.
+lblCombatTab=Kampf
 lblStack=Stapel
 lblMustWaitPriority=Warte auf Priorität...
 #FDeckEditor.java
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index ea286757045..2c743fb5dbb 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -990,6 +990,7 @@ nlExperimentalNetworkCompatibility=Forge switches to compatible network stream.
 lblPlayers=Players
 lblLog=Log
 lblDev=Dev
+lblCombatTab=Combat
 lblStack=Stack
 lblMustWaitPriority=Must wait for priority...
 #FDeckEditor.java
diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties
index 804e036e11d..9e5143195b8 100644
--- a/forge-gui/res/languages/es-ES.properties
+++ b/forge-gui/res/languages/es-ES.properties
@@ -990,6 +990,7 @@ nlExperimentalNetworkCompatibility=Forge switches to compatible network stream.
 lblPlayers=Jugadores
 lblLog=Log
 lblDev=Dev
+lblCombatTab=Combate
 lblStack=Pila
 lblMustWaitPriority=Debes esperar debido a la prioridad...
 #FDeckEditor.java
diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties
index a184ec1e714..535f977ad19 100644
--- a/forge-gui/res/languages/it-IT.properties
+++ b/forge-gui/res/languages/it-IT.properties
@@ -989,7 +989,8 @@ nlExperimentalNetworkCompatibility=Forge switches to compatible network stream.
 #MatchScreen.java
 lblPlayers=Giocatori
 lblLog=Login
-lblDev=dev
+lblDev=Dev
+lblCombatTab=Combat
 lblStack=Pila
 lblMustWaitPriority=Devi aspettare la priorità ...
 #FDeckEditor.java
diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties
index 1e4e6252a5f..a97d928efaf 100644
--- a/forge-gui/res/languages/zh-CN.properties
+++ b/forge-gui/res/languages/zh-CN.properties
@@ -990,6 +990,7 @@ nlExperimentalNetworkCompatibility=Forge将切换为兼容性的网络流。（
 lblPlayers=玩家列表
 lblLog=日志
 lblDev=开发者工具
+lblCombatTab=战斗
 lblStack=堆叠
 lblMustWaitPriority=等待获得优先权
 #FDeckEditor.java