From f7d765e669d771642a83d2218fce5f6aabdc4e6c Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Sun, 3 Jul 2016 12:26:56 -0400
Subject: [PATCH] Fix STR_ACTIONS_LIGHTFIRE listed twice

Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/ca8434a9b9b9c34d2734a96a8bad8519f15ce512
---
 SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp   | 2 +-
 SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp | 2 +-
 SQF/dayz_code/stringtable.xml                       | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
index 5e0144b81..6f62dbd1a 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Wood.hpp
@@ -58,7 +58,7 @@ class PartWoodPile : CA_Magazine
 	descriptionShort = $STR_EQUIP_DESC_40;
 	class ItemActions {
 		class Build {
-			text = $STR_ACTIONS_LIGHTFIRE;
+			text = $STR_ACTIONS_MAKEFIRE;
 			script = "spawn player_build;";
 			require[] = {"ItemMatchbox"};
 			create = "Land_Fire_DZ";
diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
index fd5c85277..35fb84fcb 100644
--- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Matchbox.hpp
@@ -30,7 +30,7 @@ class ItemMatchbox : ItemMatchbox_base
 	{
 		class Use
 		{
-			text = $STR_ACTIONS_LIGHTFIRE;
+			text = $STR_ACTIONS_MAKEFIRE;
 			script = "spawn player_makeFire;";
 			use[] = {"PartWoodPile"};
 		};
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 78e5e3941..7dff7c020 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -29,12 +29,11 @@
 		<Key ID="STR_ACTIONS_LIGHTFIRE">
 			<English>Light fire</English>
 			<Russian>Зажечь огонь</Russian>
-		</Key>		
+		</Key>
 		<Key ID="STR_ACTIONS_PUTOUTFIRE">
 			<English>Put out fire</English>
 			<Russian>Погасить огонь</Russian>
-		</Key>		
-
+		</Key>
 		<Key ID="STR_ACTIONS_DROP">
 			<English>Drop</English>
 			<Russian>Выбросить</Russian>
@@ -993,7 +992,7 @@
 			<Czech>Spravit láhev</Czech>
 			<German>Flasche reparieren</German>
 		</Key>
-		<Key ID="STR_ACTIONS_LIGHTFIRE">
+		<Key ID="STR_ACTIONS_MAKEFIRE">
 			<English>Make Fireplace</English>
 			<German>Feuerstelle errichten</German>
 			<Russian>Развести костер</Russian>