diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf index 97f9c39f4..e396eb119 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_buyItems.sqf @@ -140,11 +140,11 @@ if(_enoughMoney) then { { if( _x select 1 == "trade_weapons")then{ _backpack addWeaponCargoGlobal [_x select 0, _x select 9]; - diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; + diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"]; }; if( _x select 1 == "trade_items")then{ _backpack addMagazineCargoGlobal [_x select 0, _x select 9]; - diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; + diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"]; }; if((_x select 1) in ["trade_any_vehicle", "trade_any_vehicle_free", "trade_any_vehicle_old", "trade_any_bicycle", "trade_any_bicycle_old", "trade_any_boat", "trade_any_boat_old"])then{ _item2Add = [(_x select 0), (_x select 1)] call _buyVehicle; @@ -161,15 +161,15 @@ if(_enoughMoney) then { systemChat format["Adding %1 items in %2",count (Z_BuyingArray), typeOf Z_vehicle]; if( _x select 1 == "trade_weapons")then{ Z_vehicle addWeaponCargoGlobal [_x select 0, _x select 9]; - diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; + diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"]; }; if( _x select 1 == "trade_items")then{ Z_vehicle addMagazineCargoGlobal [_x select 0, _x select 9]; - diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; + diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"]; }; if( _x select 1 == "trade_backpacks")then{ Z_vehicle addBackpackCargoGlobal [_x select 0, _x select 9]; - diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9]; + diag_log format [localize "STR_EPOCH_TRADE_ADDED_QTY", _x select 0, _x select 9, localize "STR_EPOCH_PLAYER_289"]; }; if((_x select 1) in ["trade_any_vehicle", "trade_any_vehicle_free", "trade_any_vehicle_old", "trade_any_bicycle", "trade_any_bicycle_old", "trade_any_boat", "trade_any_boat_old"])then{ _item2Add = [(_x select 0), (_x select 1)] call _buyVehicle; @@ -188,7 +188,7 @@ if(_enoughMoney) then { _count = 0; while{ _count < (_x select 9)}do{ player addWeapon (_x select 0); - diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0]; + diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0, localize "STR_EPOCH_PLAYER_289"]; _count = _count + 1; }; }; @@ -196,7 +196,7 @@ if(_enoughMoney) then { _count = 0; while{ _count < (_x select 9)} do { player addMagazine (_x select 0); - diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0]; + diag_log format [localize "STR_EPOCH_TRADE_ADDED", _x select 0, localize "STR_EPOCH_PLAYER_289"]; _count = _count + 1; }; }; diff --git a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf index eee025253..4e305ec8d 100644 --- a/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf +++ b/SQF/dayz_code/actions/AdvancedTrading/functions/z_at_checkCloseVehicle.sqf @@ -11,9 +11,9 @@ _list = nearestObjects [_pos, ["Air","LandVehicle","Ship"], Z_VehicleDistance]; _result = false; if(!isNull _vehicle)then{ Z_vehicle = _vehicle; - systemChat format[localize "STR_EPOCH_TRADE_SELECTED",typeOf Z_vehicle]; _result = true; if (_this) then { // Set trade title, don't set on menu start up since gear is selected initially. + systemChat format[localize "STR_EPOCH_TRADE_SELECTED",typeOf Z_vehicle]; if (Z_Selling) then { [format[localize "STR_EPOCH_TRADE_SELLING_FROM", typeOf Z_vehicle]] call Z_filleTradeTitle; } else { diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 42bb06d34..b515aaaf4 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -15747,12 +15747,12 @@ Добавлено: %1 предметов в рюкзак - %1 x %2 added - %1 x %2 добавлено + %3: %1 x %2 added + %3: %1 x %2 добавлено - %1 added - %1 добавлено + %2: %1 added + %2: %1 добавлено Trade successfull.