Index: ps/trunk/binaries/data/mods/public/globalscripts/Templates.js
===================================================================
--- ps/trunk/binaries/data/mods/public/globalscripts/Templates.js
+++ ps/trunk/binaries/data/mods/public/globalscripts/Templates.js
@@ -214,9 +214,13 @@
 			};
 
 			ret.attack[type] = {
+				"attackName": {
+					"name": template.Attack[type].AttackName._string || template.Attack[type].AttackName,
+					"context": template.Attack[type].AttackName["@context"]
+				},
 				"minRange": getAttackStat("MinRange"),
 				"maxRange": getAttackStat("MaxRange"),
-				"elevationBonus": getAttackStat("ElevationBonus"),
+				"elevationBonus": getAttackStat("ElevationBonus")
 			};
 
 			ret.attack[type].elevationAdaptedRange = Math.sqrt(ret.attack[type].maxRange *
Index: ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
+++ ps/trunk/binaries/data/mods/public/gui/common/tooltips.js
@@ -420,10 +420,12 @@
 		if (attackType == "Slaughter")
 			continue;
 
+		let attackTypeTemplate = template.attack[attackType];
 		let attackLabel = sprintf(headerFont(translate("%(attackType)s")), {
-			"attackType": attackType
+			"attackType": attackTypeTemplate.attackName.context ?
+				translateWithContext(attackTypeTemplate.attackName.context || "Name of an attack, usually the weapon.", attackTypeTemplate.attackName.name) :
+				translate(attackTypeTemplate.attackName.name)
 		});
-		let attackTypeTemplate = template.attack[attackType];
 
 		let projectiles;
 		// Use either current rate from simulation or default count if the sim is not running.
Index: ps/trunk/binaries/data/mods/public/l10n/messages.json
===================================================================
--- ps/trunk/binaries/data/mods/public/l10n/messages.json
+++ ps/trunk/binaries/data/mods/public/l10n/messages.json
@@ -400,6 +400,9 @@
                 ],
                 "options": {
                     "keywords": {
+                        "AttackName": {
+                            "customContext": "Name of an attack, usually the weapon."
+                        },
                         "StatusName": {
                             "customContext": "status effect"
                         },
@@ -441,6 +444,9 @@
                 ],
                 "options": {
                     "keywords": {
+                        "AttackName": {
+                            "customContext": "Name of an attack, usually the weapon."
+                        },
                         "StatusName": {
                             "customContext": "status effect"
                         },
@@ -489,6 +495,9 @@
                 },
                 "options": {
                     "keywords": {
+                        "AttackName": {
+                            "customContext": "Name of an attack, usually the weapon."
+                        },
                         "GenericName": {},
                         "SpecificName": {},
                         "History": {},
Index: ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Attack.js
@@ -26,6 +26,7 @@
 	"<a:help>Controls the attack abilities and strengths of the unit.</a:help>" +
 	"<a:example>" +
 		"<Melee>" +
+			"<AttackName>Spear</AttackName>" +
 			"<Damage>" +
 				"<Hack>10.0</Hack>" +
 				"<Pierce>0.0</Pierce>" +
@@ -48,6 +49,7 @@
 			"<PreferredClasses datatype=\"tokens\">Cavalry Infantry</PreferredClasses>" +
 		"</Melee>" +
 		"<Ranged>" +
+			"<AttackName>Bow</AttackName>" +
 			"<Damage>" +
 				"<Hack>0.0</Hack>" +
 				"<Pierce>10.0</Pierce>" +
@@ -97,6 +99,14 @@
 	"<optional>" +
 		"<element name='Melee'>" +
 			"<interleave>" +
+				"<element name='AttackName' a:help='Name of the attack, to be displayed in the GUI. Optionally includes a translate context attribute.'>" +
+					"<optional>" +
+						"<attribute name='context'>" +
+							"<text/>" +
+						"</attribute>" +
+					"</optional>" +
+					"<text/>" +
+				"</element>" +
 				Attacking.BuildAttackEffectsSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='PrepareTime' a:help='Time from the start of the attack command until the attack actually occurs (in milliseconds). This value relative to RepeatTime should closely match the \"event\" point in the actor&apos;s attack animation'>" +
@@ -113,6 +123,14 @@
 	"<optional>" +
 		"<element name='Ranged'>" +
 			"<interleave>" +
+				"<element name='AttackName' a:help='Name of the attack, to be displayed in the GUI. Optionally includes a translate context attribute.'>" +
+					"<optional>" +
+						"<attribute name='context'>" +
+							"<text/>" +
+						"</attribute>" +
+					"</optional>" +
+					"<text/>" +
+				"</element>" +
 				Attacking.BuildAttackEffectsSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='MinRange' a:help='Minimum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
@@ -185,6 +203,14 @@
 	"<optional>" +
 		"<element name='Capture'>" +
 			"<interleave>" +
+				"<element name='AttackName' a:help='Name of the attack, to be displayed in the GUI. Optionally includes a translate context attribute.'>" +
+					"<optional>" +
+						"<attribute name='context'>" +
+							"<text/>" +
+						"</attribute>" +
+					"</optional>" +
+					"<text/>" +
+				"</element>" +
 				Attacking.BuildAttackEffectsSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in meters)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='RepeatTime' a:help='Time between attacks (in milliseconds). The attack animation will be stretched to match this time'>" + // TODO: it shouldn't be stretched
@@ -198,6 +224,14 @@
 	"<optional>" +
 		"<element name='Slaughter' a:help='A special attack to kill domestic animals'>" +
 			"<interleave>" +
+				"<element name='AttackName' a:help='Name of the attack, to be displayed in the GUI. Optionally includes a translate context attribute.'>" +
+					"<optional>" +
+						"<attribute name='context'>" +
+							"<text/>" +
+						"</attribute>" +
+					"</optional>" +
+					"<text/>" +
+				"</element>" +
 				Attacking.BuildAttackEffectsSchema() +
 				"<element name='MaxRange'><ref name='nonNegativeDecimal'/></element>" + // TODO: how do these work?
 				Attack.prototype.preferredClassesSchema +
@@ -403,6 +437,14 @@
 	return aPreference - bPreference;
 };
 
+Attack.prototype.GetAttackName = function(type)
+{
+	return {
+		"name": this.template[type].AttackName._string || this.template[type].AttackName,
+		"context": this.template[type].AttackName["@context"]
+	};
+};
+
 Attack.prototype.GetRepeatTime = function(type)
 {
 	let repeatTime = 1000;
Index: ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -423,6 +423,8 @@
 
 			Object.assign(ret.attack[type], cmpAttack.GetAttackEffectsData(type));
 
+			ret.attack[type].attackName = cmpAttack.GetAttackName(type);
+
 			ret.attack[type].splash = cmpAttack.GetSplashData(type);
 			if (ret.attack[type].splash)
 				Object.assign(ret.attack[type].splash, cmpAttack.GetAttackEffectsData(type, true));
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Tusks</AttackName>
       <Damage>
         <Hack>12.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Teeth</AttackName>
       <Damage>
         <Hack>30.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Tusks</AttackName>
       <Damage>
         <Hack>12</Hack>
         <Pierce>12</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
+      <AttackName>Paws</AttackName>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Horn</AttackName>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
+      <AttackName>Paws</AttackName>
       <Damage>
         <Hack>30.0</Hack>
         <Pierce>20.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
+      <AttackName>Tusks</AttackName>
       <Damage>
         <Hack>15.0</Hack>
         <Pierce>10.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
+  <Attack>
+    <Melee>
+      <AttackName>Melee</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
+  <Attack>
+    <Ranged>
+      <AttackName>Ranged</AttackName>
+    </Ranged>
+  </Attack>
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_special">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>25.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -8,6 +8,7 @@
   </AlertRaiser>
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>12.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_defensive">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_defensive_tower">
   <Attack>
     <Ranged>
+      <AttackName>Stone</AttackName>
       <Damage>
         <Pierce>35</Pierce>
         <Crush>25</Crush>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_defensive_tower">
   <Attack>
     <Ranged>
+      <AttackName>Bolt</AttackName>
       <Damage>
         <Pierce>55</Pierce>
         <Crush>5</Crush>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_defensive_wall">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>8.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_military">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>16.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -2,12 +2,14 @@
 <Entity parent="template_unit">
   <Attack>
     <Capture>
+      <AttackName>Capture</AttackName>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
+      <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>100.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>6.9</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>4</Hack>
         <Pierce>3</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>6.5</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>7.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>18.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit">
   <Attack>
     <Capture>
+      <AttackName>Capture</AttackName>
       <Capture>5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>14.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>13.8</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>36.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>8</Hack>
         <Pierce>6</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>13.0</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_elephant">
   <Attack replace="">
     <Melee>
+      <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>20</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>6.5</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>12</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>26.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName>Mace</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName>Pike</AttackName>
       <Damage>
         <Hack>2.0</Hack>
         <Pierce>6.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>6.0</Hack>
         <Pierce>5.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>11.0</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit">
   <Attack>
     <Melee>
+      <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Paws</AttackName>
       <Damage>
         <Hack>20</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
+      <AttackName>Horns</AttackName>
       <Damage>
         <Hack>1</Hack>
         <Pierce>5</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
+      <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>10.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_aggressive_wolf">
   <Attack>
     <Melee>
+      <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>10.0</Hack>
         <Pierce>10.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_defensive">
   <Attack>
     <Melee>
+      <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>2.5</Hack>
         <Pierce>5.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit">
   <Attack>
     <Capture>
+      <AttackName>Capture</AttackName>
       <Capture>10</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>35</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>27.6</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>60.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>16</Hack>
         <Pierce>12</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>26.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero">
   <Attack replace="">
     <Melee>
+      <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>8.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>24</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>50.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
+      <AttackName>Pike</AttackName>
       <Damage>
         <Hack>4.0</Hack>
         <Pierce>20.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>12.0</Hack>
         <Pierce>10.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>22.0</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -2,12 +2,14 @@
 <Entity parent="template_unit">
   <Attack>
     <Capture>
+      <AttackName>Capture</AttackName>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
+      <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>6</Hack>
         <Crush>2</Crush>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Attack>
     <Melee>
+      <AttackName>Pike</AttackName>
       <Damage>
         <Hack>1</Hack>
         <Pierce>3</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>3.0</Hack>
         <Pierce>2.5</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>5.5</Hack>
         <Pierce>0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>6.7</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>16.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Sling</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>9.2</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>35.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Melee>
+      <AttackName>Fire</AttackName>
       <Damage>
         <Hack>10.0</Hack>
         <Pierce>10.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Melee>
+      <AttackName>Harpoon</AttackName>
       <Damage>
         <Hack>10.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
+      <AttackName>Stone</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>10.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>35.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
+      <AttackName>Bolt</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>150.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Melee>
+      <AttackName>Ram</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
+      <AttackName>Stone</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>10.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>12.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_support">
   <Attack>
     <Melee>
+      <AttackName>Dagger</AttackName>
       <Damage>
         <Hack>2.0</Hack>
         <Pierce>0</Pierce>
@@ -12,6 +13,7 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Slaughter>
+      <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>0.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Cost>
     <Resources>
       <food op="add">-25</food>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Auras datatype="tokens">
     units/heroes/cart_hero_hamilcar_1
     units/heroes/cart_hero_hamilcar_2
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Leial Ezpatari</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/iber_monument
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Attack>
     <Melee>
+      <AttackName>Mace</AttackName>
       <Damage>
         <Hack>3.0</Hack>
         <Crush>2.5</Crush>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry_archer">
   <Attack>
     <Ranged>
+      <AttackName>Crossbow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>6.5</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry_swordsman">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
       <Bonuses>
         <Herocide>
           <Classes>Hero</Classes>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Auras datatype="tokens">
     units/heroes/mace_hero_craterus
   </Auras>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Auras datatype="tokens">
     units/heroes/mace_hero_demetrius
   </Auras>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/maur_elephant_stables
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/plane.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/plane.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/plane.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit">
   <Attack>
     <Ranged>
+      <AttackName>Machine Guns</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>100.0</Pierce>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
+    </Melee>
+  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/sele_library
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
+      <AttackName>Fire</AttackName>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>