diff --git a/addons/refuel/functions/fnc_connectNozzleAction.sqf b/addons/refuel/functions/fnc_connectNozzleAction.sqf
index a5827325ac..ad658492fa 100644
--- a/addons/refuel/functions/fnc_connectNozzleAction.sqf
+++ b/addons/refuel/functions/fnc_connectNozzleAction.sqf
@@ -72,7 +72,7 @@ private _attachPosModel = _sink worldToModel (ASLtoAGL _bestPosASL);
_args params [["_unit", objNull, [objNull]], ["_nozzle", objNull, [objNull]], ["_sink", objNull, [objNull]], ["_endPosTestOffset", [0,0,0], [[]], 3]];
_unit setVariable [QGVAR(nozzle), nil, true];
_unit setVariable [QGVAR(isRefueling), false];
-
+
private _source = _nozzle getVariable QGVAR(source);
detach _nozzle;
@@ -128,14 +128,14 @@ private _attachPosModel = _sink worldToModel (ASLtoAGL _bestPosASL);
if ([_unit, _nozzle, false] call FUNC(canTurnOn)) then {
[_unit, _nozzle, false] call FUNC(turnOn);
} else {
- [localize LSTRING(CouldNotTurnOn)] call EFUNC(common,displayText);
+ [localize LSTRING(CouldNotTurnOn)] call EFUNC(common,displayTextStructured);
};
};
case (!_canReceive && _isContainer): {
if ([_unit, _nozzle, true] call FUNC(canTurnOn)) then {
[_unit, _nozzle, true] call FUNC(turnOn);
} else {
- [localize LSTRING(CouldNotTurnOn)] call EFUNC(common,displayText);
+ [localize LSTRING(CouldNotTurnOn)] call EFUNC(common,displayTextStructured);
};
};
default {
@@ -144,7 +144,7 @@ private _attachPosModel = _sink worldToModel (ASLtoAGL _bestPosASL);
};
},
"",
- localize LSTRING(ConnectAction),
+ localize ([LSTRING(ConnectAction), LSTRING(ConnectFuelCanisterAction)] select (_nozzle getVariable [QGVAR(jerryCan), false])),
{true},
[INTERACT_EXCEPTIONS]
] call EFUNC(common,progressBar);
diff --git a/addons/refuel/functions/fnc_makeJerryCan.sqf b/addons/refuel/functions/fnc_makeJerryCan.sqf
index d1a662d12f..2a1bc75280 100644
--- a/addons/refuel/functions/fnc_makeJerryCan.sqf
+++ b/addons/refuel/functions/fnc_makeJerryCan.sqf
@@ -45,7 +45,7 @@ private _action = [QGVAR(Refuel),
// Add pickup
_action = [QGVAR(PickUpNozzle),
- localize LSTRING(TakeNozzle),
+ localize LSTRING(TakeFuelCanister),
QPATHTOF(ui\icon_refuel_interact.paa),
{[_player, _target] call FUNC(takeNozzle)},
{[_player, _target] call FUNC(canTakeNozzle)},
@@ -105,7 +105,7 @@ _action = [QGVAR(TurnOff),
// Add disconnect
_action = [QGVAR(Disconnect),
- localize LSTRING(Disconnect),
+ localize LSTRING(DisconnectFuelCanister),
QPATHTOF(ui\icon_refuel_interact.paa),
{[_player, _target] call FUNC(disconnect)},
{[_player, _target] call FUNC(canDisconnect)},
diff --git a/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf b/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
index 29db88dda6..d2f1e2aaa5 100644
--- a/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
+++ b/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
@@ -96,7 +96,7 @@ TRACE_2("start",_unit,_nozzle);
getCursorObjectParams params ["_cursorObject", "", "_distance"];
if (!isNull _cursorObject && {_distance < REFUEL_NOZZLE_ACTION_DISTANCE}) then {
if ([_cursorObject] call FUNC(canConnectNozzle)) then {
- _hintLMB = localize LSTRING(Connect);
+ _hintLMB = localize ([LSTRING(Connect), LSTRING(ConnectFuelCanister)] select (_nozzle getVariable [QGVAR(jerryCan), false]));
};
if ([_unit, _cursorObject] call FUNC(canReturnNozzle)) then {
_hintRMB = localize LSTRING(Return);
diff --git a/addons/refuel/functions/fnc_takeNozzle.sqf b/addons/refuel/functions/fnc_takeNozzle.sqf
index f60ec9243d..8eb0a16f1f 100644
--- a/addons/refuel/functions/fnc_takeNozzle.sqf
+++ b/addons/refuel/functions/fnc_takeNozzle.sqf
@@ -77,11 +77,11 @@ params [
[_source, "blockEngine", "ACE_Refuel", true] call EFUNC(common,statusEffect_set);
_source setVariable [QGVAR(isConnected), true, true];
_source setVariable [QGVAR(ownedNozzle), _nozzle, true];
-
+
// Prevent moving the fuel source while the hose is out
_source setVariable [QGVAR(canCarryLast), _source getVariable [QEGVAR(dragging,canCarry), false], true];
_source setVariable [QGVAR(canDragLast), _source getVariable [QEGVAR(dragging,canDrag), false], true];
-
+
_source setVariable [QEGVAR(dragging,canCarry), false, true];
_source setVariable [QEGVAR(dragging,canDrag), false, true];
};
@@ -100,7 +100,7 @@ params [
[_unit, _nozzle] call FUNC(startNozzleInHandsPFH);
},
{},
- localize LSTRING(TakeNozzleAction),
+ localize ([LSTRING(TakeNozzleAction), LSTRING(TakeFuelCanisterAction)] select (_object getVariable [QGVAR(jerryCan), false])),
{true},
[INTERACT_EXCEPTIONS_REFUELING]
] call EFUNC(common,progressBar);
diff --git a/addons/refuel/stringtable.xml b/addons/refuel/stringtable.xml
index f4c5895ba9..f8e0d431c7 100644
--- a/addons/refuel/stringtable.xml
+++ b/addons/refuel/stringtable.xml
@@ -492,6 +492,21 @@
已加入%1公升
%1 litre dolduruldu
+
+ Pick up fuel canister
+
+
+ Picking fuel canister up...
+
+
+ Connect fuel canister
+
+
+ Connecting fuel canister...
+
+
+ Disconnect fuel canister
+
Refuel hose length
Betankung Schlauchlänge