From b1ae6c4a60437ced42ca5531d6623666cff9d89c Mon Sep 17 00:00:00 2001
From: ebaydayz <ebaydayz@openmailbox.org>
Date: Fri, 29 Jul 2016 14:34:45 -0400
Subject: [PATCH] Fix unknown entity RPT error for Padlock and Frank&Beans

Vanilla development commit:

https://github.com/DayZMod/DayZ/commit/955c7a263ca4d1069c340c074c76181aade24ce4
---
 SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp      | 2 +-
 .../actions/AdvancedTrading/functions/z_at_sellItems.sqf  | 2 +-
 SQF/dayz_code/stringtable.xml                             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp
index ffe7a73df..fa2fcca23 100644
--- a/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Items/Padlock.hpp
@@ -6,5 +6,5 @@ class ItemPadlock: CA_Magazine
 	displayName = $STR_BLD_name_ItemPadlock;//"Padlock"
 	picture = "\z\addons\dayz_buildings\equip\padlock.paa";
 	model = "z\addons\dayz_buildings\models\padlock.p3d";
-	descriptionShort = $STR_BLD_desc_ItemPadlock;//"Padlock - Used for securing Workshop's & Houses."
+	descriptionShort = $STR_BLD_desc_ItemPadlock;//"Padlock - Used for securing Workshop's and Houses."
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
index 3492877dc..59dfef2a1 100644
--- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
+++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_sellItems.sqf
@@ -16,7 +16,7 @@ _itemsCheckArray = [];
 _itemsToLog = [[],[],[],"sell"];
 
 _sellVehicle = {
-	private ["_distance","_damage","_tireDmg","_tires","_okToSell","_returnInfo","_textPartIn","_obj","_hitpoints","_objectID","_objectUID","_objectCharacterId","_notSetup","_part_in","_qty_in","_activatingPlayer","_objects","_qty","_vehicle"];
+	private ["_distance","_damage","_tireDmg","_tires","_okToSell","_returnInfo","_obj","_hitpoints","_objectID","_objectUID","_objectCharacterId","_notSetup","_part_in","_qty_in","_activatingPlayer","_objects","_qty","_vehicle"];
 	_vehicle = _this select 0;
 	_sellType = _this select 1;
 	_part_in = typeOf _vehicle;
diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml
index 4e50df179..07be83543 100644
--- a/SQF/dayz_code/stringtable.xml
+++ b/SQF/dayz_code/stringtable.xml
@@ -3938,12 +3938,12 @@
 			<Czech>Konzervované sardinky. Při správném skladování vydrží i pět let.</Czech>
 		</Key>
 		<Key ID="STR_EQUIP_NAME_28">
-			<English>Can (Frank &amp; Beans)</English>
+			<English>Can (Frank and Beans)</English>
 			<German>Dose (Bohnen und Würste)</German>
 			<Russian>Банка (Фасоль с мясом)</Russian>
-			<Spanish>Lata (Frank &amp; Beans)</Spanish>
+			<Spanish>Lata (Frank and Beans)</Spanish>
 			<French>Conserve (William Saurien)</French>
-			<Czech>Plechovka (Frank &amp; Beans)</Czech>
+			<Czech>Plechovka (Frank and Beans)</Czech>
 		</Key>
 		<Key ID="STR_EQUIP_DESC_28">
 			<English>Canned Beans and Sausages used for sustenance. Lasts well over five years if stored correctly.</English>
@@ -8966,7 +8966,7 @@
 			<German>Zahlenschloss</German>
 		</Key>
 		<Key ID="STR_BLD_desc_ItemPadlock">
-			<English>Padlock - Used for securing Workshop&apos;s &amp; Houses.</English>
+			<English>Padlock - Used for securing Workshop&apos;s and Houses.</English>
 			<Russian>Используется для запирания зданий.</Russian>
 			<French>Un cadenas pour protéger portes/portails</French>
 			<Czech>Tento visací zámek lze využít pro zabezpečení dílen a domů.</Czech>