Finish localization support

Vanilla development commit:

33c6cafbcb

SQF/dayz_code/Configs/CfgMagazines/Consumables/Canteen.hpp

@@ -23,7 +23,7 @@ class ItemCanteen : FoodDrink
 		
 		class Empty
 		{
-			text = "Empty";//TODO: move to stringtable
+			text = $STR_ITEM_CANTEEN_EMPTY;
 			script = "spawn player_emptyContainer";
 		};
 	};

SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp

@@ -250,8 +250,8 @@ class ItemSherbet : ItemSoda
 	
 	model = "z\addons\dayz_communityassets\models\soda_sherbet_clean_full.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_soda_sherbet_clean_full_ca.paa";
-	displayName = "Sherbet";//TODO: move to stringtable
+	displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15;
-	descriptionShort = "Sherbet";
+	descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15;
 	
 	Nutrition[] = {90,0,500,0};
 	

SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp

@@ -23,7 +23,7 @@ class ItemWaterBottle : FoodDrink
 		
 		class Empty
 		{
-			text = "Empty";//TODO: move to stringtable
+			text = $STR_EQUIP_NAME_13_EMPTY;
 			script = "spawn player_emptyContainer";
 		};
 	};

SQF/dayz_code/Configs/CfgMagazines/Items/equip_brick.hpp

@@ -7,13 +7,13 @@ class equip_brick : CA_Magazine
 	model = "\z\addons\dayz_communityassets\models\brick.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_brick.paa";
 	displayName = $STR_ITEM_NAME_equip_brick;
-	descriptionShort = "Maybe this could be used to sharpen a knife."; //TODO: move to stringtable
+	descriptionShort = $STR_ITEM_DESC_equip_brick;
 	
 	class ItemActions
 	{
 		class FixKnife
 		{
-			text = "Sharpen Knife";
+			text = $STR_ACTIONS_FIX_KNIFE;
 			script = "; ['ItemKnifeBlunt','ItemKnife'] spawn player_sharpen;";
 		};
 	};

SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp

@@ -11,7 +11,7 @@ class 7Rnd_45ACP_1911: CA_Magazine
 		
 		class ReloadMag
 		{
-			text = "Combine for Revolver"; //TODO: move to stringtable
+			text = $STR_MAG_CONV_45ACP_Revolver;
 			script = "spawn player_reloadMag;";
 			use[] = {"7Rnd_45ACP_1911"};
 			output[] = {"6Rnd_45ACP"};
@@ -32,7 +32,7 @@ class 6Rnd_45ACP: CA_Magazine
 		
 		class ReloadMag
 		{
-			text = "Combine for M1911"; //TODO: move to stringtable
+			text = $STR_MAG_CONV_45ACP_M1911;
 			script = "spawn player_reloadMag;";
 			use[] = {"6Rnd_45ACP"};
 			output[] = {"7Rnd_45ACP_1911"};

SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp

@@ -31,11 +31,9 @@ class ItemAntibiotic : ItemAntibiotic_base
 	};
 };
 
-//TODO: move descriptions to stringtable
-
 class ItemAntibiotic6 : ItemAntibiotic
 {
-	descriptionShort = "Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 6 Remaining";
+	descriptionShort = $STR_EQUIP_DESC_48;
 	
 	class medical
 	{
@@ -46,7 +44,7 @@ class ItemAntibiotic6 : ItemAntibiotic
 
 class ItemAntibiotic5 : ItemAntibiotic
 {
-	descriptionShort = "Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 5 Remaining";
+	descriptionShort = $STR_EQUIP_DESC_49;
 	
 	class medical
 	{
@@ -57,7 +55,7 @@ class ItemAntibiotic5 : ItemAntibiotic
 
 class ItemAntibiotic4 : ItemAntibiotic
 {
-	descriptionShort = "Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 4 Remaining";
+	descriptionShort = $STR_EQUIP_DESC_50;
 	
 	class medical
 	{
@@ -68,7 +66,7 @@ class ItemAntibiotic4 : ItemAntibiotic
 
 class ItemAntibiotic3 : ItemAntibiotic
 {
-	descriptionShort = "Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 3 Remaining";
+	descriptionShort = $STR_EQUIP_DESC_51;
 	
 	class medical
 	{
@@ -79,7 +77,7 @@ class ItemAntibiotic3 : ItemAntibiotic
 
 class ItemAntibiotic2 : ItemAntibiotic
 {
-	descriptionShort = "Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 2 Remaining";
+	descriptionShort = $STR_EQUIP_DESC_52;
 	
 	class medical
 	{
@@ -90,7 +88,7 @@ class ItemAntibiotic2 : ItemAntibiotic
 
 class ItemAntibiotic1 : ItemAntibiotic
 {
-	descriptionShort = "Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 1 Remaining";
+	descriptionShort = $STR_EQUIP_DESC_53;
 	
 	class medical
 	{
@@ -102,5 +100,5 @@ class ItemAntibiotic1 : ItemAntibiotic
 class ItemAntibioticEmpty : ItemAntibiotic_base
 {
 	scope = public;
-	descriptionShort = "EmptyBox of Azithromycin.";
+	descriptionShort = $STR_EQUIP_DESC_54;
 };

SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp

@@ -42,8 +42,8 @@ class ItemKosmosSmokes : CA_Magazine
 	
 	model = "\z\addons\dayz_communityassets\models\smokes_kosmos.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_kosmos_ca.paa";
-	displayName = "Kosmos Smokes";
+	displayName = $STR_ITEM_NAME_KOSMOS_SMOKES;
-	descriptionShort = "One Pack of Kosmos Brand cigarettes";
+	descriptionShort = $STR_ITEM_DESC_KOSMOS_SMOKES;
 };
 
 class ItemKosmosSmokesOpen : CA_Magazine
@@ -54,8 +54,8 @@ class ItemKosmosSmokesOpen : CA_Magazine
 	
 	model = "\z\addons\dayz_communityassets\models\smokes_open_k.p3d";
 	picture = "\z\addons\dayz_communityassets\pictures\equip_smokes_open_k_ca.paa";
-	displayName = "Kosmos Smokes";//TODO: move to stringtable
+	displayName = $STR_ITEM_NAME_KOSMOS_SMOKES;
-	descriptionShort = "One Opened Pack of Kosmos Brand cigarettes";
+	descriptionShort = $STR_ITEM_DESC_KOSMOS_SMOKES_OPENED;
 };
 
 class ItemTrashPaper : CA_Magazine

SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp

@@ -13,7 +13,7 @@ class ItemSodaEmpty : HandGrenade
 	{
 		class Drink
 		{
-			text = "Drink";//TODO: move to stringtable
+			text = $str_player_31_drink;
 			script = "spawn player_drinkWater;";
 		};
 		class Crafting {
@@ -42,7 +42,7 @@ class TrashTinCan : HandGrenade
 	{
 		class Drink
 		{
-			text = "Drink";//TODO: move to stringtable
+			text = $str_player_31_drink;
 			script = "spawn player_drinkWater;";
 		};
 		class Crafting {

SQF/dayz_code/Configs/CfgVehicles/LootContainer.hpp

@@ -3,7 +3,7 @@ class DZ_AmmoBoxRU : ReammoBox
 	scope = public;
 	
 	model = "ca\weapons\ammoboxes\proxy_ruweaponboxlow.p3d";
-	displayName = "Ammo box"; //TODO move to stringtable
+	displayName = $STR_DAYZ_OBJ_3;
 };
 
 class DZ_ExplosiveBoxRU : ReammoBox
@@ -11,7 +11,7 @@ class DZ_ExplosiveBoxRU : ReammoBox
 	scope = public;
 	
 	model = "ca\weapons\ammoboxes\proxy_ruexplosives.p3d";
-	displayName = "Ammo box"; //TODO move to stringtable
+	displayName = $STR_DAYZ_OBJ_3;
 };
 
 class DZ_AmmoBoxUS : ReammoBox
@@ -19,7 +19,7 @@ class DZ_AmmoBoxUS : ReammoBox
 	scope = public;
 	
 	model = "ca\weapons\ammoboxes\proxy_usbasicammoboxsmall.p3d";
-	displayName = "Ammo box"; //TODO move to stringtable
+	displayName = $STR_DAYZ_OBJ_3;
 };
 
 class DZ_ExplosivesBoxUS : ReammoBox
@@ -27,7 +27,7 @@ class DZ_ExplosivesBoxUS : ReammoBox
 	scope = public;
 	
 	model = "ca\weapons\ammoboxes\proxy_usbasicexplosives.p3d";
-	displayName = "Ammo box"; //TODO move to stringtable
+	displayName = $STR_DAYZ_OBJ_3;
 };
 
 class DZ_CardboardBox : ReammoBox
@@ -35,7 +35,7 @@ class DZ_CardboardBox : ReammoBox
 	scope = public;
 	
 	model = "dayz_equip\models\cardboard_box.p3d";
-	displayName = "Cardboard box"; //TODO move to stringtable
+	displayName = $STR_DAYZ_OBJ_4;
 };
 
 class DZ_MedBox : ReammoBox

SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp

@@ -47,7 +47,7 @@ class ItemHatchetBroken : ItemCore
 	{
 		class Repair
 		{
-			text = "Fix Hatchet"; //TODO: move to stringtable
+			text = $STR_ACTIONS_FIX_HATCHET;
 			script="spawn player_fixHatchet;";
 		};
 	};

SQF/dayz_code/actions/player_consume.sqf

@@ -36,8 +36,7 @@ if ((getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> (animationState p
 //player doesn't have the consumable item
 if (!(_this in magazines player)) exitWith
 {
-	//TODO move to stringtable
+	(localize "str_player_33") call dayz_rollingMessages;
-	"You seem to have misplaced the foodstuff." call dayz_rollingMessages;
 };
 
 //close gear

SQF/dayz_code/stringtable.xml

@@ -1006,6 +1006,14 @@
 			<Czech>Nalámat kámen</Czech>
 			<German>Steine abbauen</German>
 		</Key>
+		<Key ID="STR_ACTIONS_FIX_HATCHET">
+			<English>Fix Hatchet</English>
+			<Russian>Починить топор</Russian>
+		</Key>
+		<Key ID="STR_ACTIONS_FIX_KNIFE">
+			<English>Sharpen Knife</English>
+			<Russian>Заточить нож</Russian>
+		</Key>
 		<Key ID="STR_ACTIONS_FIX_PICKAXE">
 			<English>Fix Pickaxe</English>
 			<Russian>Починить кирку</Russian>
@@ -2407,12 +2415,8 @@
 			<German>Ziegelstein</German>
 		</Key>
 		<Key ID="STR_ITEM_DESC_equip_brick">
-			<English>A brick used in crafting.</English>
+			<English>Maybe this could be used to sharpen a knife.</English>
-			<Russian>Кирпич, может пригодиться в мастерской.</Russian>
+			<Russian>Может пригодиться для заточки ножа.</Russian>
-			<Spanish>Un ladrillo que podría ser usado para crear objetos.</Spanish>
-			<French>Brique (Artisanat)</French>
-			<Czech>Cihla se používá při výrobě.</Czech>
-			<German>Ein Ziegelstein. Kann beim Handwerken verwendet werden.</German>
 		</Key>
 		<Key ID="STR_ITEM_NAME_equip_gauze">
 			<English>Gauze</English>
@@ -3660,6 +3664,10 @@
 			<French>Bouteille (vide)</French>
 			<Czech>Láhev na vodu (prázdná)</Czech>
 		</Key>
+		<Key ID="STR_EQUIP_NAME_13_EMPTY">
+			<English>Empty</English>
+			<Russian>Пустая</Russian>
+		</Key>
 		<Key ID="STR_EQUIP_DESC_13">
 			<English>A bottle of water that is Empty. It might be useful to fill it with water again.</English>
 			<German>Eine leere Wasserflasche. Sie könnte nützlich sein, um sie wieder mit Wasser zu füllen.</German>
@@ -3732,6 +3740,34 @@
 			<French>L&apos;azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes.</French>
 			<Czech>Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi.</Czech>
 		</Key>
+		<Key ID="STR_EQUIP_DESC_48">
+			<English>Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 6 Remaining.</English>
+			<Russian>Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 6 таблеток.</Russian>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_49">
+			<English>Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 5 Remaining.</English>
+			<Russian>Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 5 таблеток.</Russian>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_50">
+			<English>Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 4 Remaining.</English>
+			<Russian>Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 4 таблетки.</Russian>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_51">
+			<English>Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 3 Remaining.</English>
+			<Russian>Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 3 таблетки.</Russian>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_52">
+			<English>Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 2 Remaining.</English>
+			<Russian>Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 2 таблетки.</Russian>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_53">
+			<English>Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 1 Remaining.</English>
+			<Russian>Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталась 1 таблетка.</Russian>
+		</Key>
+		<Key ID="STR_EQUIP_DESC_54">
+			<English>Empty box of Azithromycin.</English>
+			<Russian>Пустая коробка азитромицина.</Russian>
+		</Key>
 		<Key ID="STR_EQUIP_NAME_18">
 			<English>Painkillers</English>
 			<German>Schmerzmittel</German>
@@ -4108,6 +4144,10 @@
 			<French>Boîte de munitions</French>
 			<Czech>Bedna s municí</Czech>
 		</Key>
+		<Key ID="STR_DAYZ_OBJ_4">
+			<English>Cardboard Box</English>
+			<Russian>Картонная коробка</Russian>
+		</Key>
 		<Key ID="STR_WPN_DESC_1">
 			<English>Shotgun 12 gauge</English>
 			<German>Reminton 870</German>
@@ -4172,6 +4212,14 @@
 			<French>Fusil doté de 2 canons parallèles, permettant de tirer 2 coups rapprochés.</French>
 			<Czech>Dvouhlavňová brokovnice je brokovnice s dvěma hlavněmi vedle sebe, což umožnuje vystřelit dvakrát hned za sebou.</Czech>
 		</Key>
+		<Key ID="STR_MAG_CONV_45ACP_Revolver">
+			<English>Combine for Revolver</English>
+			<Russian>в патроны для револьвера</Russian>
+		</Key>
+		<Key ID="STR_MAG_CONV_45ACP_M1911">
+			<English>Combine for M1911</English>
+			<Russian>в M1911 маг.</Russian>
+		</Key>
 		<Key ID="STR_MAG_CONV_G17_M9">
 			<English>Combine for M9</English>
 			<Spanish>Combinar a M9</Spanish>
@@ -5317,6 +5365,10 @@
 			<Russian>Армейский котелок для хранения жидкостей и еды.</Russian>
 			<German>Eine stabile Feldflasche, um Wasser zu transportieren.</German>
 		</Key>
+		<Key ID="STR_ITEM_CANTEEN_EMPTY">
+			<English>Empty</English>
+			<Russian>Пустой</Russian>
+		</Key>
 		<Key ID="STR_ITEM_CANTEEN_EMPTY_NAME">
 			<English>Canteen (empty)</English>
 			<Russian>Котелок (Пустой)</Russian>
@@ -5632,6 +5684,10 @@
 			<French>Une canette de soda au raisin &apos;Olsha&apos; en bon état. Produit à Chernarus.</French>
 			<Czech>Čistá a ještě neotevřená plechovka sodovky Olsha Sparkling Grape od Papa. Vyrobeno v Černarusi.</Czech>
 		</Key>
+		<Key ID="STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15">
+			<English>Sherbet</English>
+			<Russian>Шербет</Russian>
+		</Key>
 		<Key ID="STR_FOOD_NAME_MRE">
 			<English>MRE</English>
 			<German>EPa</German>
@@ -6240,6 +6296,18 @@
 			<French>Un paquet de cartes humide</French>
 			<Czech>Navlhlý balíček hracích karet.</Czech>
 		</Key>
+		<Key ID="STR_ITEM_NAME_KOSMOS_SMOKES">
+			<English>Kosmos Smokes</English>
+			<Russian>Сигареты "Космос"</Russian>
+		</Key>
+		<Key ID="STR_ITEM_DESC_KOSMOS_SMOKES">
+			<English>One Pack of Kosmos Brand cigarettes.</English>
+			<Russian>Пачка сигарет "Космос".</Russian>
+		</Key>
+		<Key ID="STR_ITEM_DESC_KOSMOS_SMOKES_OPENED">
+			<English>One Opened Pack of Kosmos Brand cigarettes.</English>
+			<Russian>Открытая пачка сигарет "Космос".</Russian>
+		</Key>
 		<Key ID="STR_ITEM_NAME_FUELCAN">
 			<English>Fuelcan (5L)</English>
 			<German>Benzinkanister (5L)</German>
@@ -7202,6 +7270,10 @@
 			<French>%1 doit être sur vous pour pouvoir le déplacer de/vers votre ceinture à outils.</French>
 			<Czech>%1 musí být v invetáři, aby se mohl přesunout z/do panelu nástrojů.</Czech>
 		</Key>
+		<Key ID="str_player_33">
+			<English>You seem to have misplaced the foodstuff.</English>
+			<Russian>Кажется вы выронили еду.</Russian>
+		</Key>
 		<Key ID="str_mining_finished">
 			<English>You have finished collecting stone.</English>
 			<Russian>Вы закончили добычу камня.</Russian>