From ff22a7409558e70eefbc30aacdd54ada47fe7c52 Mon Sep 17 00:00:00 2001
From: 221V <221v92@gmail.com>
Date: Wed, 11 Dec 2024 15:44:50 +0200
Subject: [PATCH] tr -- rm dublicates

---
 GameEngine/Lang/en.php    | 2 --
 GameEngine/Lang/zh_tw.php | 2 --
 Templates/Build/16.tpl    | 8 ++++----
 Templates/troops.tpl      | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/GameEngine/Lang/en.php b/GameEngine/Lang/en.php
index 0de506d8..5f589338 100755
--- a/GameEngine/Lang/en.php
+++ b/GameEngine/Lang/en.php
@@ -680,7 +680,6 @@ define("ARRIVING_REINF_TROOPS_SHORT","Reinf.");
 define("OWN_ATTACKING_TROOPS","Own attacking troops");
 define("ATTACK","Attack");
 define("OWN_REINFORCING_TROOPS","Own reinforcing troops");
-define("TROOPS_DORF","Troops:");
 define("NEWVILLAGE","New village.");
 define("FOUNDNEWVILLAGE","Founding New village");
 define("UNDERATTACK","The village is under attack");
@@ -695,7 +694,6 @@ define("PRISONERS","Prisoners");
 define("PRISONERSIN","Prisoners in");
 define("PRISONERSFROM","Prisoners from");
 define("TROOPS","Troops");
-define("TROOPSFROM","Troops");
 define("BOUNTY","Bounty");
 define("ARRIVAL","Arrival");
 define("CATAPULT_TARGET","Catapult target(s)");
diff --git a/GameEngine/Lang/zh_tw.php b/GameEngine/Lang/zh_tw.php
index 78ce5bef..8843b857 100644
--- a/GameEngine/Lang/zh_tw.php
+++ b/GameEngine/Lang/zh_tw.php
@@ -680,7 +680,6 @@ define("ARRIVING_REINF_TROOPS_SHORT","增援");
 define("OWN_ATTACKING_TROOPS","己方进攻部队");
 define("ATTACK","进攻");
 define("OWN_REINFORCING_TROOPS","己方增援部队");
-define("TROOPS_DORF","部队:");
 define("NEWVILLAGE","新村庄");
 define("FOUNDNEWVILLAGE","建立新村庄");
 define("UNDERATTACK","村庄遭受攻击");
@@ -695,7 +694,6 @@ define("PRISONERS","俘虏");
 define("PRISONERSIN","俘虏在");
 define("PRISONERSFROM","俘虏从");
 define("TROOPS","部队");
-define("TROOPSFROM","部队");
 define("BOUNTY","赏金");
 define("ARRIVAL","抵达");
 define("CATAPULT_TARGET","攻城器目标");
diff --git a/Templates/Build/16.tpl b/Templates/Build/16.tpl
index cdaa2729..015b9ab0 100644
--- a/Templates/Build/16.tpl
+++ b/Templates/Build/16.tpl
@@ -62,9 +62,9 @@ if($village->resarray['f39'] > 0){
 <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a></td>
 <td colspan=\"$colspan\">";
 				if(LANG == "es"){
-					echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".TROOPSFROM." ".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." </a>";
+					echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".TROOPS." ".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." </a>";
 				}else{
-					echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." ".TROOPSFROM."</a>";
+					echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." ".TROOPS."</a>";
 				}
 				echo "</td></tr></thead><tbody class=\"units\">";
 				$tribe = $database->getUserField($database->getVillageField($enforce['from'], "owner"), "tribe", 0);
@@ -190,9 +190,9 @@ if($village->resarray['f39'] > 0){
 <a href=\"karte.php?d=".$enforce['vref']."&c=".$generator->getMapCheck($enforce['vref'])."\">".$database->getVillageField($enforce['conqured'], "name")."</a></td>
 <td colspan=\"$colspan\">";
 			if(LANG == "es"){
-				echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".TROOPSFROM." ".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." </a> ".FROM." <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a>";
+				echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".TROOPS." ".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." </a> ".FROM." <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a>";
 			}else{
-				echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." ".TROOPSFROM."</a> ".FROM." <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a>";
+				echo "<a href=\"spieler.php?uid=".$database->getVillageField($enforce['from'], "owner")."\">".$database->getUserField($database->getVillageField($enforce['from'], "owner"), "username", 0)." ".TROOPS."</a> ".FROM." <a href=\"karte.php?d=".$enforce['from']."&c=".$generator->getMapCheck($enforce['from'])."\">".$database->getVillageField($enforce['from'], "name")."</a>";
 			}
 			echo "</td></tr></thead><tbody class=\"units\">";
 			$tribe = $database->getUserField($database->getVillageField($enforce['from'], "owner"), "tribe", 0);
diff --git a/Templates/troops.tpl b/Templates/troops.tpl
index bb419396..fe7a1ee5 100644
--- a/Templates/troops.tpl
+++ b/Templates/troops.tpl
@@ -11,7 +11,7 @@
 ?>
 <table id="troops" cellpadding="1" cellspacing="1">
 <thead><tr>
-	<th colspan="3"><?php echo TROOPS_DORF; ?></th>
+	<th colspan="3"><?php echo TROOPS; ?></th>
 </tr></thead><tbody>
 <?php
 $troops = $technology->getAllUnits($village->wid,True,1);