From 4b9d6df0bbde4b2195fe7556500348841464d668 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Thu, 28 Apr 2016 22:13:48 -0400 Subject: [PATCH] Finish localization support Vanilla development commit: https://github.com/DayZMod/DayZ/commit/33c6cafbcbffca2624ed5753d9b4882419626c70 --- .../CfgMagazines/Consumables/Canteen.hpp | 2 +- .../Configs/CfgMagazines/Consumables/Soda.hpp | 4 +- .../CfgMagazines/Consumables/WaterBottle.hpp | 2 +- .../CfgMagazines/Items/equip_brick.hpp | 4 +- .../Configs/CfgMagazines/Magazines/45ACP.hpp | 4 +- .../CfgMagazines/Medical/Antibiotic.hpp | 16 ++-- .../Configs/CfgMagazines/Trash/Misc.hpp | 8 +- .../Configs/CfgMagazines/Trash/Trash.hpp | 4 +- .../Configs/CfgVehicles/LootContainer.hpp | 10 +-- .../Configs/CfgWeapons/Tools/Hatchet.hpp | 2 +- SQF/dayz_code/actions/player_consume.sqf | 3 +- SQF/dayz_code/stringtable.xml | 84 +++++++++++++++++-- 12 files changed, 106 insertions(+), 37 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Canteen.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Canteen.hpp index 521250ba0..31fcf1bb1 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Canteen.hpp +++ b/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"; }; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp index 0010e8fea..7484acf85 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/Soda.hpp +++ b/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 - descriptionShort = "Sherbet"; + displayName = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15; + descriptionShort = $STR_ITEMSODA_FULL_CLEAN_CODE_NAME_15; Nutrition[] = {90,0,500,0}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp b/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp index b56569404..707788c6c 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Consumables/WaterBottle.hpp +++ b/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"; }; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Items/equip_brick.hpp b/SQF/dayz_code/Configs/CfgMagazines/Items/equip_brick.hpp index dfe9aac0b..174de96c4 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Items/equip_brick.hpp +++ b/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;"; }; }; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp index 1c7e1b7e1..4c0e197d3 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/45ACP.hpp +++ b/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"}; diff --git a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp b/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp index 5eb8cc1c8..19ac89946 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Medical/Antibiotic.hpp +++ b/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; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp b/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp index 8fc371f5a..0fdd1c60f 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Trash/Misc.hpp +++ b/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"; - descriptionShort = "One Pack of Kosmos Brand cigarettes"; + displayName = $STR_ITEM_NAME_KOSMOS_SMOKES; + 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 - descriptionShort = "One Opened Pack of Kosmos Brand cigarettes"; + displayName = $STR_ITEM_NAME_KOSMOS_SMOKES; + descriptionShort = $STR_ITEM_DESC_KOSMOS_SMOKES_OPENED; }; class ItemTrashPaper : CA_Magazine diff --git a/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp b/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp index 38db74796..73ac17d02 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Trash/Trash.hpp +++ b/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 { diff --git a/SQF/dayz_code/Configs/CfgVehicles/LootContainer.hpp b/SQF/dayz_code/Configs/CfgVehicles/LootContainer.hpp index 991ba0a25..092fdffb0 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LootContainer.hpp +++ b/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 diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp index cad3470dd..b8d47bd08 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Hatchet.hpp +++ b/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;"; }; }; diff --git a/SQF/dayz_code/actions/player_consume.sqf b/SQF/dayz_code/actions/player_consume.sqf index a88902dfc..cbda0d3ff 100644 --- a/SQF/dayz_code/actions/player_consume.sqf +++ b/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 - "You seem to have misplaced the foodstuff." call dayz_rollingMessages; + (localize "str_player_33") call dayz_rollingMessages; }; //close gear diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index ca413c255..5995407f1 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -1006,6 +1006,14 @@ Nalámat kámen Steine abbauen + + Fix Hatchet + Починить топор + + + Sharpen Knife + Заточить нож + Fix Pickaxe Починить кирку @@ -2407,12 +2415,8 @@ Ziegelstein - A brick used in crafting. - Кирпич, может пригодиться в мастерской. - Un ladrillo que podría ser usado para crear objetos. - Brique (Artisanat) - Cihla se používá při výrobě. - Ein Ziegelstein. Kann beim Handwerken verwendet werden. + Maybe this could be used to sharpen a knife. + Может пригодиться для заточки ножа. Gauze @@ -3660,6 +3664,10 @@ Bouteille (vide) Láhev na vodu (prázdná) + + Empty + Пустая + A bottle of water that is Empty. It might be useful to fill it with water again. Eine leere Wasserflasche. Sie könnte nützlich sein, um sie wieder mit Wasser zu füllen. @@ -3732,6 +3740,34 @@ L'azithromycine est un antibiotique à large spectre permettant le traitement des infections bactériennes. Azithromycin je širokospektré antibiotikum používané k léčbě nebo prevenci před infekcí či bakteriemi. + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 6 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 6 таблеток. + + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 5 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 5 таблеток. + + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 4 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 4 таблетки. + + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 3 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 3 таблетки. + + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 2 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталось 2 таблетки. + + + Azithromycin is a broad spectrum antibiotic used to treat or prevent certain bacterial infections. 1 Remaining. + Азитромицин это многоцелевой антибиотик, использующийся для лечения бактериальных инфекций. Осталась 1 таблетка. + + + Empty box of Azithromycin. + Пустая коробка азитромицина. + Painkillers Schmerzmittel @@ -4108,6 +4144,10 @@ Boîte de munitions Bedna s municí + + Cardboard Box + Картонная коробка + Shotgun 12 gauge Reminton 870 @@ -4172,6 +4212,14 @@ Fusil doté de 2 canons parallèles, permettant de tirer 2 coups rapprochés. Dvouhlavňová brokovnice je brokovnice s dvěma hlavněmi vedle sebe, což umožnuje vystřelit dvakrát hned za sebou. + + Combine for Revolver + в патроны для револьвера + + + Combine for M1911 + в M1911 маг. + Combine for M9 Combinar a M9 @@ -5317,6 +5365,10 @@ Армейский котелок для хранения жидкостей и еды. Eine stabile Feldflasche, um Wasser zu transportieren. + + Empty + Пустой + Canteen (empty) Котелок (Пустой) @@ -5632,6 +5684,10 @@ Une canette de soda au raisin 'Olsha' en bon état. Produit à Chernarus. Čistá a ještě neotevřená plechovka sodovky Olsha Sparkling Grape od Papa. Vyrobeno v Černarusi. + + Sherbet + Шербет + MRE EPa @@ -6240,6 +6296,18 @@ Un paquet de cartes humide Navlhlý balíček hracích karet. + + Kosmos Smokes + Сигареты "Космос" + + + One Pack of Kosmos Brand cigarettes. + Пачка сигарет "Космос". + + + One Opened Pack of Kosmos Brand cigarettes. + Открытая пачка сигарет "Космос". + Fuelcan (5L) Benzinkanister (5L) @@ -7202,6 +7270,10 @@ %1 doit être sur vous pour pouvoir le déplacer de/vers votre ceinture à outils. %1 musí být v invetáři, aby se mohl přesunout z/do panelu nástrojů. + + You seem to have misplaced the foodstuff. + Кажется вы выронили еду. + You have finished collecting stone. Вы закончили добычу камня.