From 763cb07629ef9cd66a4bf5830cb9fa70f79972c9 Mon Sep 17 00:00:00 2001 From: jonpas Date: Thu, 28 May 2015 21:59:04 +0200 Subject: [PATCH] Macro STRING to LSTRING --- addons/advanced_ballistics/initKeybinds.sqf | 2 +- addons/atragmx/initKeybinds.sqf | 2 +- addons/attach/functions/fnc_attach.sqf | 8 ++--- addons/attach/functions/fnc_detach.sqf | 4 +-- addons/attach/functions/fnc_placeApprove.sqf | 2 +- .../functions/fnc_doEscortCaptive.sqf | 2 +- .../captives/functions/fnc_doFriskPerson.sqf | 2 +- .../functions/fnc_moduleSurrender.sqf | 6 ++-- addons/common/functions/fnc_hashGet.sqf | 2 +- addons/dragging/functions/fnc_carryObject.sqf | 2 +- addons/dragging/functions/fnc_dragObject.sqf | 2 +- .../dragging/functions/fnc_setCarryable.sqf | 4 +-- .../dragging/functions/fnc_setDraggable.sqf | 4 +-- addons/dragging/functions/fnc_startCarry.sqf | 2 +- addons/dragging/functions/fnc_startDrag.sqf | 2 +- .../explosives/functions/fnc_addClacker.sqf | 4 +-- .../functions/fnc_openTimerSetUI.sqf | 2 +- .../functions/fnc_setupExplosive.sqf | 4 +-- .../explosives/functions/fnc_startDefuse.sqf | 2 +- addons/fcs/functions/fnc_keyUp.sqf | 2 +- addons/fcs/functions/fnc_reset.sqf | 2 +- addons/fcs/initKeybinds.sqf | 6 ++-- addons/goggles/XEH_postInit.sqf | 2 +- addons/grenades/XEH_postInit.sqf | 2 +- addons/grenades/functions/fnc_nextMode.sqf | 10 +++--- .../hearing/functions/fnc_putInEarplugs.sqf | 4 +-- .../hearing/functions/fnc_removeEarplugs.sqf | 4 +-- addons/interact_menu/XEH_clientInit.sqf | 4 +-- .../functions/fnc_compileMenuSelfAction.sqf | 4 +-- addons/interaction/XEH_postInit.sqf | 6 ++-- addons/interaction/functions/fnc_joinTeam.sqf | 6 ++-- .../functions/fnc_openMenuSelectUI.sqf | 2 +- .../functions/fnc_prepareSelectMenu.sqf | 2 +- .../interaction/functions/fnc_tapShoulder.sqf | 4 +-- addons/javelin/initKeybinds.sqf | 4 +-- addons/kestrel4500/initKeybinds.sqf | 4 +-- .../laser/functions/fnc_keyLaserCodeDown.sqf | 2 +- addons/laser/functions/fnc_keyLaserCodeUp.sqf | 2 +- .../functions/fnc_seekerFindLaserSpot.sqf | 2 +- addons/laser/initKeybinds.sqf | 4 +-- .../functions/fnc_initDesignatorActions.sqf | 4 +-- addons/laserpointer/initKeybinds.sqf | 2 +- .../functions/fnc_refuelUAV.sqf | 2 +- .../functions/fnc_cutDownFence.sqf | 2 +- .../functions/fnc_cutDownFenceCallback.sqf | 2 +- .../functions/fnc_interactEH.sqf | 2 +- .../functions/fnc_magazineRepackFinish.sqf | 6 ++-- .../functions/fnc_startRepackingMagazine.sqf | 2 +- addons/main/script_macros.hpp | 4 +-- .../functions/fnc_onSliderPosChangedAngle.sqf | 2 +- .../fnc_actionCheckBloodPressureLocal.sqf | 22 ++++++------- .../functions/fnc_actionCheckPulseLocal.sqf | 20 ++++++------ .../functions/fnc_actionCheckResponse.sqf | 4 +-- .../medical/functions/fnc_actionDiagnose.sqf | 16 +++++----- .../fnc_displayPatientInformation.sqf | 32 +++++++++---------- .../functions/fnc_displayTriageCard.sqf | 2 +- .../medical/functions/fnc_getTriageStatus.sqf | 10 +++--- .../fnc_treatmentAdvanced_bandage.sqf | 2 +- .../fnc_treatmentAdvanced_medication.sqf | 2 +- addons/medical/functions/fnc_treatmentIV.sqf | 2 +- .../functions/fnc_treatmentTourniquet.sqf | 2 +- addons/microdagr/XEH_clientInit.sqf | 4 +-- .../functions/fnc_showApplicationPage.sqf | 4 +-- .../microdagr/functions/fnc_updateDisplay.sqf | 12 +++---- .../fnc_handlePlayerVehicleChanged.sqf | 2 +- .../functions/fnc_rangeTableOpen.sqf | 2 +- addons/movement/XEH_postInit.sqf | 4 +-- addons/movement/functions/fnc_climb.sqf | 2 +- addons/nametags/XEH_postInit.sqf | 2 +- addons/nightvision/XEH_postInitClient.sqf | 4 +-- .../functions/fnc_changeNVGBrightness.sqf | 2 +- .../functions/fnc_exportSettings.sqf | 2 +- .../fnc_onListBoxShowSelectionChanged.sqf | 4 +-- ...nc_onServerListBoxShowSelectionChanged.sqf | 6 ++-- .../fnc_onServerSettingsMenuOpen.sqf | 4 +-- .../fnc_serverSettingsMenuUpdateKeyView.sqf | 12 +++---- .../fnc_serverSettingsMenuUpdateList.sqf | 2 +- .../fnc_settingsMenuUpdateKeyView.sqf | 4 +-- .../functions/fnc_settingsMenuUpdateList.sqf | 2 +- addons/overheating/XEH_postInit.sqf | 2 +- addons/overheating/functions/fnc_clearJam.sqf | 2 +- .../overheating/functions/fnc_jamWeapon.sqf | 4 +-- .../overheating/functions/fnc_swapBarrel.sqf | 2 +- .../functions/fnc_swapBarrelCallback.sqf | 2 +- addons/parachute/XEH_postInit.sqf | 2 +- addons/reload/XEH_postInit.sqf | 2 +- .../reload/functions/fnc_startLinkingBelt.sqf | 2 +- .../functions/fnc_addMissileReloadActions.sqf | 2 +- addons/reloadlaunchers/functions/fnc_load.sqf | 6 ++-- .../respawn/functions/fnc_moveRallypoint.sqf | 4 +-- .../functions/fnc_teleportToRallypoint.sqf | 2 +- addons/safemode/XEH_postInit.sqf | 2 +- addons/safemode/functions/fnc_lockSafety.sqf | 4 +-- .../safemode/functions/fnc_unlockSafety.sqf | 2 +- addons/scopes/XEH_postInit.sqf | 16 +++++----- .../switchunits/functions/fnc_switchUnit.sqf | 4 +-- addons/vector/initKeybinds.sqf | 4 +-- addons/vehiclelock/functions/fnc_lockpick.sqf | 2 +- addons/vehicles/XEH_postInit.sqf | 2 +- .../vehicles/functions/fnc_speedLimiter.sqf | 4 +-- addons/weaponselect/XEH_postInit.sqf | 28 ++++++++-------- .../functions/fnc_selectGrenadeAll.sqf | 2 +- .../functions/fnc_selectGrenadeFrag.sqf | 2 +- .../functions/fnc_selectGrenadeOther.sqf | 2 +- addons/weather/XEH_postInit.sqf | 2 +- 105 files changed, 230 insertions(+), 230 deletions(-) diff --git a/addons/advanced_ballistics/initKeybinds.sqf b/addons/advanced_ballistics/initKeybinds.sqf index c75a1561ac..102107dadc 100644 --- a/addons/advanced_ballistics/initKeybinds.sqf +++ b/addons/advanced_ballistics/initKeybinds.sqf @@ -1,4 +1,4 @@ -["ACE3 Equipment", QGVAR(ProtractorKey), localize STRING(ProtractorKey), +["ACE3 Equipment", QGVAR(ProtractorKey), localize LSTRING(ProtractorKey), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/atragmx/initKeybinds.sqf b/addons/atragmx/initKeybinds.sqf index fa3b240849..a000a106f4 100644 --- a/addons/atragmx/initKeybinds.sqf +++ b/addons/atragmx/initKeybinds.sqf @@ -1,4 +1,4 @@ -["ACE3 Equipment", QGVAR(ATragMXDialogKey), localize STRING(ATragMXDialogKey), +["ACE3 Equipment", QGVAR(ATragMXDialogKey), localize LSTRING(ATragMXDialogKey), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/attach/functions/fnc_attach.sqf b/addons/attach/functions/fnc_attach.sqf index 83e35f8a16..2a3eca5940 100644 --- a/addons/attach/functions/fnc_attach.sqf +++ b/addons/attach/functions/fnc_attach.sqf @@ -37,7 +37,7 @@ if (_itemVehClass == "") then { if (_itemVehClass == "") exitWith {ERROR("no ACE_Attachable for Item");}; -_onAtachText = format [localize STRING(Item_Attached), _onAtachText]; +_onAtachText = format [localize LSTRING(Item_Attached), _onAtachText]; if (_unit == _attachToVehicle) then { //Self Attachment _unit removeItem _itemClassname; // Remove item @@ -54,12 +54,12 @@ if (_unit == _attachToVehicle) then { //Self Attachment [_unit, QGVAR(vehAttach), true] call EFUNC(common,setForceWalkStatus); - //MenuBack isn't working for now (localize STRING(CancelAction)) - [{[localize STRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, [], 0, 0] call EFUNC(common,waitAndExecute); + //MenuBack isn't working for now (localize LSTRING(CancelAction)) + [{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, [], 0, 0] call EFUNC(common,waitAndExecute); _unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = 1;}] call EFUNC(common,AddActionEventHandler)]; // _unit setVariable [QGVAR(cancelActionEH), [_unit, "MenuBack", {true}, {GVAR(placeAction) = 0;}] call EFUNC(common,AddActionEventHandler)]; - _actionID = _unit addAction [format ["%1", localize STRING(CancelAction)], {GVAR(placeAction) = 0}]; + _actionID = _unit addAction [format ["%1", localize LSTRING(CancelAction)], {GVAR(placeAction) = 0}]; [{ private "_startingPosition"; diff --git a/addons/attach/functions/fnc_detach.sqf b/addons/attach/functions/fnc_detach.sqf index 990f151474..90c305329b 100644 --- a/addons/attach/functions/fnc_detach.sqf +++ b/addons/attach/functions/fnc_detach.sqf @@ -49,7 +49,7 @@ if (isNull _attachedObject || {_itemName == ""}) exitWith {ERROR("Could not find // Exit if can't add the item if !(_unit canAdd _itemName) exitWith { - [localize STRING(Inventory_Full)] call EFUNC(common,displayTextStructured); + [localize LSTRING(Inventory_Full)] call EFUNC(common,displayTextStructured); }; // Add item to inventory @@ -78,4 +78,4 @@ if (_itemDisplayName == "") then { _itemDisplayName = getText (configFile >> "CfgMagazines" >> _itemName >> "displayName"); }; -[format [localize STRING(Item_Detached), _itemDisplayName]] call EFUNC(common,displayTextStructured); +[format [localize LSTRING(Item_Detached), _itemDisplayName]] call EFUNC(common,displayTextStructured); diff --git a/addons/attach/functions/fnc_placeApprove.sqf b/addons/attach/functions/fnc_placeApprove.sqf index 06282b31ae..d85a65df2b 100644 --- a/addons/attach/functions/fnc_placeApprove.sqf +++ b/addons/attach/functions/fnc_placeApprove.sqf @@ -74,7 +74,7 @@ _closeInDistance = (_closeInMax + _closeInMin) / 2; //Checks (too close to center or can't attach) if (((_startDistanceFromCenter - _closeInDistance) < 0.1) || {!([_attachToVehicle, _unit, _itemClassname] call FUNC(canAttach))}) exitWith { TRACE_2("no valid spot found",_closeInDistance,_startDistanceFromCenter); - [localize STRING(Failed)] call EFUNC(common,displayTextStructured); + [localize LSTRING(Failed)] call EFUNC(common,displayTextStructured); }; //Move it out slightly, for visability sake (better to look a little funny than be embedded//sunk in the hull and be useless) diff --git a/addons/captives/functions/fnc_doEscortCaptive.sqf b/addons/captives/functions/fnc_doEscortCaptive.sqf index e7047c1cca..bc2cd97ffd 100644 --- a/addons/captives/functions/fnc_doEscortCaptive.sqf +++ b/addons/captives/functions/fnc_doEscortCaptive.sqf @@ -30,7 +30,7 @@ if (_state) then { _unit setVariable [QGVAR(escortedUnit), _target, true]; //Add Actionmenu to release captive - _actionID = _unit addAction [format ["%1", localize STRING(StopEscorting)], + _actionID = _unit addAction [format ["%1", localize LSTRING(StopEscorting)], {[(_this select 0), ((_this select 0) getVariable [QGVAR(escortedUnit), objNull]), false] call FUNC(doEscortCaptive);}, nil, 20, false, true, "", QUOTE(!isNull (GETVAR(_target,QGVAR(escortedUnit),objNull)))]; diff --git a/addons/captives/functions/fnc_doFriskPerson.sqf b/addons/captives/functions/fnc_doFriskPerson.sqf index ac3f9e57db..d79c88a5fb 100644 --- a/addons/captives/functions/fnc_doFriskPerson.sqf +++ b/addons/captives/functions/fnc_doFriskPerson.sqf @@ -27,7 +27,7 @@ if (_weapon == primaryWeapon _player && {_weapon != ""}) then { _listedItemClasses = []; -_actions = [localize STRING(FriskMenuHeader), ""] call ACE_Interaction_fnc_prepareSelectMenu; +_actions = [localize LSTRING(FriskMenuHeader), ""] call ACE_Interaction_fnc_prepareSelectMenu; _allGear = []; diff --git a/addons/captives/functions/fnc_moduleSurrender.sqf b/addons/captives/functions/fnc_moduleSurrender.sqf index 94bcb7da45..fbcbce4951 100644 --- a/addons/captives/functions/fnc_moduleSurrender.sqf +++ b/addons/captives/functions/fnc_moduleSurrender.sqf @@ -36,13 +36,13 @@ if (local _logic) then { ["SetSurrendered", [_mouseOverObject], [_mouseOverObject, false]] call EFUNC(common,targetEvent); }; } else { - [STRING(Zeus_OnlyAlive)] call EFUNC(common,displayTextStructured); + [LSTRING(Zeus_OnlyAlive)] call EFUNC(common,displayTextStructured); }; } else { - [STRING(Zeus_OnlyInfantry)] call EFUNC(common,displayTextStructured); + [LSTRING(Zeus_OnlyInfantry)] call EFUNC(common,displayTextStructured); }; } else { - [STRING(Zeus_NothingSelected)] call EFUNC(common,displayTextStructured); + [LSTRING(Zeus_NothingSelected)] call EFUNC(common,displayTextStructured); }; } else { //an editor module diff --git a/addons/common/functions/fnc_hashGet.sqf b/addons/common/functions/fnc_hashGet.sqf index 6b47b98ad9..ae1e553676 100644 --- a/addons/common/functions/fnc_hashGet.sqf +++ b/addons/common/functions/fnc_hashGet.sqf @@ -13,7 +13,7 @@ try { _index = (_hash select 0) find _key; if(_index != -1) then { _val = (_hash select 1) select _index; - if(IS_STRING(_val) && {_val == "ACREHASHREMOVEDONOTUSETHISVAL"}) then { + if(IS_LSTRING(_val) && {_val == "ACREHASHREMOVEDONOTUSETHISVAL"}) then { _val = nil; }; }; diff --git a/addons/dragging/functions/fnc_carryObject.sqf b/addons/dragging/functions/fnc_carryObject.sqf index 197e1cf274..bb413d8240 100644 --- a/addons/dragging/functions/fnc_carryObject.sqf +++ b/addons/dragging/functions/fnc_carryObject.sqf @@ -58,7 +58,7 @@ if (_actionID != -1) then { }; _actionID = _unit addAction [ - format ["%1", localize STRING(Drop)], + format ["%1", localize LSTRING(Drop)], QUOTE([ARR_2(_this select 0, (_this select 0) getVariable [ARR_2(QUOTE(QGVAR(carriedObject)),objNull)])] call FUNC(dropObject_carry)), nil, 20, diff --git a/addons/dragging/functions/fnc_dragObject.sqf b/addons/dragging/functions/fnc_dragObject.sqf index a8b99ab874..e4b200c4dd 100644 --- a/addons/dragging/functions/fnc_dragObject.sqf +++ b/addons/dragging/functions/fnc_dragObject.sqf @@ -49,7 +49,7 @@ if (_actionID != -1) then { }; _actionID = _unit addAction [ - format ["%1", localize STRING(Drop)], + format ["%1", localize LSTRING(Drop)], QUOTE([ARR_2(_this select 0, (_this select 0) getVariable [ARR_2(QUOTE(QGVAR(draggedObject)),objNull)])] call FUNC(dropObject)), nil, 20, diff --git a/addons/dragging/functions/fnc_setCarryable.sqf b/addons/dragging/functions/fnc_setCarryable.sqf index 439dc1c10b..52c6e5643a 100644 --- a/addons/dragging/functions/fnc_setCarryable.sqf +++ b/addons/dragging/functions/fnc_setCarryable.sqf @@ -49,8 +49,8 @@ if (_type in _initializedClasses) exitWith {}; _initializedClasses pushBack _type; GVAR(initializedClasses_carry) = _initializedClasses; -_carryAction = [QGVAR(carry), localize STRING(Carry), "", {[_player, _target] call FUNC(startCarry)}, {[_player, _target] call FUNC(canCarry)}] call EFUNC(interact_menu,createAction); -_dropAction = [QGVAR(drop_carry), localize STRING(Drop), "", {[_player, _target] call FUNC(dropObject_carry)}, {[_player, _target] call FUNC(canDrop_carry)}] call EFUNC(interact_menu,createAction); +_carryAction = [QGVAR(carry), localize LSTRING(Carry), "", {[_player, _target] call FUNC(startCarry)}, {[_player, _target] call FUNC(canCarry)}] call EFUNC(interact_menu,createAction); +_dropAction = [QGVAR(drop_carry), localize LSTRING(Drop), "", {[_player, _target] call FUNC(dropObject_carry)}, {[_player, _target] call FUNC(canDrop_carry)}] call EFUNC(interact_menu,createAction); [_type, 0, ["ACE_MainActions"], _carryAction] call EFUNC(interact_menu,addActionToClass); [_type, 0, [], _dropAction] call EFUNC(interact_menu,addActionToClass); diff --git a/addons/dragging/functions/fnc_setDraggable.sqf b/addons/dragging/functions/fnc_setDraggable.sqf index 5e9ba7cf3f..7745bd2d3e 100644 --- a/addons/dragging/functions/fnc_setDraggable.sqf +++ b/addons/dragging/functions/fnc_setDraggable.sqf @@ -49,8 +49,8 @@ if (_type in _initializedClasses) exitWith {}; _initializedClasses pushBack _type; GVAR(initializedClasses) = _initializedClasses; -_dragAction = [QGVAR(drag), localize STRING(Drag), "", {[_player, _target] call FUNC(startDrag)}, {[_player, _target] call FUNC(canDrag)}] call EFUNC(interact_menu,createAction); -_dropAction = [QGVAR(drop), localize STRING(Drop), "", {[_player, _target] call FUNC(dropObject)}, {[_player, _target] call FUNC(canDrop)}] call EFUNC(interact_menu,createAction); +_dragAction = [QGVAR(drag), localize LSTRING(Drag), "", {[_player, _target] call FUNC(startDrag)}, {[_player, _target] call FUNC(canDrag)}] call EFUNC(interact_menu,createAction); +_dropAction = [QGVAR(drop), localize LSTRING(Drop), "", {[_player, _target] call FUNC(dropObject)}, {[_player, _target] call FUNC(canDrop)}] call EFUNC(interact_menu,createAction); [_type, 0, ["ACE_MainActions"], _dragAction] call EFUNC(interact_menu,addActionToClass); [_type, 0, [], _dropAction] call EFUNC(interact_menu,addActionToClass); diff --git a/addons/dragging/functions/fnc_startCarry.sqf b/addons/dragging/functions/fnc_startCarry.sqf index c259213a53..842945c202 100644 --- a/addons/dragging/functions/fnc_startCarry.sqf +++ b/addons/dragging/functions/fnc_startCarry.sqf @@ -22,7 +22,7 @@ private "_weight"; _weight = [_target] call FUNC(getWeight); if (_weight > GETMVAR(ACE_maxWeightCarry,1E11)) exitWith { - [localize STRING(UnableToDrag)] call EFUNC(common,displayTextStructured); + [localize LSTRING(UnableToDrag)] call EFUNC(common,displayTextStructured); }; private "_timer"; diff --git a/addons/dragging/functions/fnc_startDrag.sqf b/addons/dragging/functions/fnc_startDrag.sqf index 81ae9a34dc..56f0ea928e 100644 --- a/addons/dragging/functions/fnc_startDrag.sqf +++ b/addons/dragging/functions/fnc_startDrag.sqf @@ -22,7 +22,7 @@ private "_weight"; _weight = [_target] call FUNC(getWeight); if (_weight > GETMVAR(ACE_maxWeightDrag,1E11)) exitWith { - [localize STRING(UnableToDrag)] call EFUNC(common,displayTextStructured); + [localize LSTRING(UnableToDrag)] call EFUNC(common,displayTextStructured); }; // add a primary weapon if the unit has none. diff --git a/addons/explosives/functions/fnc_addClacker.sqf b/addons/explosives/functions/fnc_addClacker.sqf index 14e8a41ba3..d22b15eef4 100644 --- a/addons/explosives/functions/fnc_addClacker.sqf +++ b/addons/explosives/functions/fnc_addClacker.sqf @@ -37,8 +37,8 @@ _config = ConfigFile >> "CfgMagazines" >> _magazineClass >> "ACE_Triggers" >> co _clacker = _unit getVariable [QGVAR(Clackers), []]; GVAR(PlacedCount) = GVAR(PlacedCount) + 1; -_clacker pushBack [_explosive, getNumber(_config >> "FuseTime"), format [localize STRING(DetonateCode), +_clacker pushBack [_explosive, getNumber(_config >> "FuseTime"), format [localize LSTRING(DetonateCode), GVAR(PlacedCount)], _magazineClass, configName ((_this select 3) select (count (_this select 3) - 1))]; _unit setVariable [QGVAR(Clackers), _clacker, true]; -_unit sideChat format [localize STRING(DetonateCode), GVAR(PlacedCount)]; +_unit sideChat format [localize LSTRING(DetonateCode), GVAR(PlacedCount)]; diff --git a/addons/explosives/functions/fnc_openTimerSetUI.sqf b/addons/explosives/functions/fnc_openTimerSetUI.sqf index 280dc55aaf..d08d7444dd 100644 --- a/addons/explosives/functions/fnc_openTimerSetUI.sqf +++ b/addons/explosives/functions/fnc_openTimerSetUI.sqf @@ -38,4 +38,4 @@ DFUNC(SetTimer) = { buttonSetAction [8860, QUOTE(call DFUNC(SetTimer);)]; buttonSetAction [8855, QUOTE(closeDialog 0;)]; -ctrlSetText [8870, format[localize STRING(TimerMenu),0, 30]]; +ctrlSetText [8870, format[localize LSTRING(TimerMenu),0, 30]]; diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf index d6840a28a1..566ab9c281 100644 --- a/addons/explosives/functions/fnc_setupExplosive.sqf +++ b/addons/explosives/functions/fnc_setupExplosive.sqf @@ -41,8 +41,8 @@ GVAR(TweakedAngle) = 180; }; }] call CALLSTACK(BIS_fnc_addStackedEventHandler); -[localize STRING(PlaceAction), localize STRING(CancelAction), - localize STRING(ScrollAction)] call EFUNC(interaction,showMouseHint); +[localize LSTRING(PlaceAction), localize LSTRING(CancelAction), + localize LSTRING(ScrollAction)] call EFUNC(interaction,showMouseHint); _unit setVariable [QGVAR(Place), [_unit, "DefaultAction", {GVAR(pfeh_running) AND !isNull (GVAR(Setup))}, {call FUNC(place_Approve);}] call EFUNC(common,AddActionEventHandler)]; _unit setVariable [QGVAR(Cancel), [_unit, "zoomtemp", diff --git a/addons/explosives/functions/fnc_startDefuse.sqf b/addons/explosives/functions/fnc_startDefuse.sqf index 88fda230b1..251e1e213d 100644 --- a/addons/explosives/functions/fnc_startDefuse.sqf +++ b/addons/explosives/functions/fnc_startDefuse.sqf @@ -59,6 +59,6 @@ if (ACE_player != _unit) then { _isEOD = [_unit] call EFUNC(Common,isEOD); _defuseTime = [_isEOD, _target] call _fnc_DefuseTime; if (_isEOD || {!GVAR(RequireSpecialist)}) then { - [_defuseTime, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize STRING(DefusingExplosive))] call EFUNC(common,progressBar); + [_defuseTime, [_unit,_target], {(_this select 0) call FUNC(defuseExplosive)}, {}, (localize LSTRING(DefusingExplosive))] call EFUNC(common,progressBar); }; }; diff --git a/addons/fcs/functions/fnc_keyUp.sqf b/addons/fcs/functions/fnc_keyUp.sqf index 601ea4afb5..1e831d6df3 100644 --- a/addons/fcs/functions/fnc_keyUp.sqf +++ b/addons/fcs/functions/fnc_keyUp.sqf @@ -208,5 +208,5 @@ if(_playSound) then { }; if(_showHint) then { - [format ["%1: %2", localize STRING(ZeroedTo), _distance]] call EFUNC(common,displayTextStructured); + [format ["%1: %2", localize LSTRING(ZeroedTo), _distance]] call EFUNC(common,displayTextStructured); }; \ No newline at end of file diff --git a/addons/fcs/functions/fnc_reset.sqf b/addons/fcs/functions/fnc_reset.sqf index 1940228311..48e3803c83 100644 --- a/addons/fcs/functions/fnc_reset.sqf +++ b/addons/fcs/functions/fnc_reset.sqf @@ -22,4 +22,4 @@ _turret = _this select 1; [_vehicle, format ["%1_%2", QGVAR(Elevation), _turret], 0] call EFUNC(common,setVariablePublic); [_vehicle, format ["%1_%2", QGVAR(Azimuth), _turret], 0] call EFUNC(common,setVariablePublic); -[localize STRING(HasBeenReset)] call EFUNC(common,displayTextStructured); +[localize LSTRING(HasBeenReset)] call EFUNC(common,displayTextStructured); diff --git a/addons/fcs/initKeybinds.sqf b/addons/fcs/initKeybinds.sqf index ef9c2f5731..3b22cb2262 100644 --- a/addons/fcs/initKeybinds.sqf +++ b/addons/fcs/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3 Vehicles", QGVAR(lazeTarget), localize STRING(LaseTarget), +["ACE3 Vehicles", QGVAR(lazeTarget), localize LSTRING(LaseTarget), { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -30,7 +30,7 @@ }, [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key -["ACE3 Vehicles", QGVAR(adjustRangeUp), localize STRING(AdjustRangeUp), +["ACE3 Vehicles", QGVAR(adjustRangeUp), localize LSTRING(AdjustRangeUp), { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -44,7 +44,7 @@ {false}, [201, [false, false, false]], false] call cba_fnc_addKeybind; //PageUp Key -["ACE3 Vehicles", QGVAR(adjustRangDown), localize STRING(AdjustRangeDown), +["ACE3 Vehicles", QGVAR(adjustRangDown), localize LSTRING(AdjustRangeDown), { // Conditions: canInteract if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/goggles/XEH_postInit.sqf b/addons/goggles/XEH_postInit.sqf index b9009fe8da..d52f0d30eb 100644 --- a/addons/goggles/XEH_postInit.sqf +++ b/addons/goggles/XEH_postInit.sqf @@ -17,7 +17,7 @@ #include "script_component.hpp" if (!hasInterface) exitWith {}; -["ACE3 Common", QGVAR(wipeGlasses), localize STRING(WipeGlasses), +["ACE3 Common", QGVAR(wipeGlasses), localize LSTRING(WipeGlasses), { if (!(GETVAR(ace_player,ACE_isUnconscious,false))) exitWith { call FUNC(clearGlasses); diff --git a/addons/grenades/XEH_postInit.sqf b/addons/grenades/XEH_postInit.sqf index df4c7142f3..b1559c6cfe 100644 --- a/addons/grenades/XEH_postInit.sqf +++ b/addons/grenades/XEH_postInit.sqf @@ -10,7 +10,7 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265]; GVAR(flashbangPPEffectCC) ppEffectForceInNVG true; // Add keybinds -["ACE3 Weapons", QGVAR(switchGrenadeMode), localize STRING(SwitchGrenadeMode), +["ACE3 Weapons", QGVAR(switchGrenadeMode), localize LSTRING(SwitchGrenadeMode), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/grenades/functions/fnc_nextMode.sqf b/addons/grenades/functions/fnc_nextMode.sqf index cc895e7212..913906b8f8 100644 --- a/addons/grenades/functions/fnc_nextMode.sqf +++ b/addons/grenades/functions/fnc_nextMode.sqf @@ -31,11 +31,11 @@ if (_mode == 3) then { }; _hint = [ -localize STRING(NormalThrow), -localize STRING(HighThrow), -localize STRING(PreciseThrow), -localize STRING(RollGrenade), -localize STRING(DropGrenade) +localize LSTRING(NormalThrow), +localize LSTRING(HighThrow), +localize LSTRING(PreciseThrow), +localize LSTRING(RollGrenade), +localize LSTRING(DropGrenade) ] select _mode; [_hint] call EFUNC(common,displayTextStructured); diff --git a/addons/hearing/functions/fnc_putInEarplugs.sqf b/addons/hearing/functions/fnc_putInEarplugs.sqf index 7a6a7a06bc..9d230f107b 100644 --- a/addons/hearing/functions/fnc_putInEarplugs.sqf +++ b/addons/hearing/functions/fnc_putInEarplugs.sqf @@ -22,7 +22,7 @@ _player removeItem "ACE_EarPlugs"; _player setVariable ["ACE_hasEarPlugsIn", true, true]; -[localize STRING(EarPlugs_Are_On)] call EFUNC(common,displayTextStructured); +[localize LSTRING(EarPlugs_Are_On)] call EFUNC(common,displayTextStructured); /*// No Ear Plugs in inventory, telling user -[localize STRING(NoPlugs)] call EFUNC(common,displayTextStructured);*/ +[localize LSTRING(NoPlugs)] call EFUNC(common,displayTextStructured);*/ diff --git a/addons/hearing/functions/fnc_removeEarplugs.sqf b/addons/hearing/functions/fnc_removeEarplugs.sqf index d30f5565c4..bee3517235 100644 --- a/addons/hearing/functions/fnc_removeEarplugs.sqf +++ b/addons/hearing/functions/fnc_removeEarplugs.sqf @@ -18,7 +18,7 @@ PARAMS_1(_player); if !(_player canAdd "ACE_EarPlugs") exitWith { // inventory full - [localize STRING(Inventory_Full)] call EFUNC(common,displayTextStructured); + [localize LSTRING(Inventory_Full)] call EFUNC(common,displayTextStructured); }; // Plugs already in and removing them. @@ -26,4 +26,4 @@ _player addItem "ACE_EarPlugs"; _player setVariable ["ACE_hasEarPlugsIn", false, true]; -[localize STRING(EarPlugs_Are_Off)] call EFUNC(common,displayTextStructured); +[localize LSTRING(EarPlugs_Are_Off)] call EFUNC(common,displayTextStructured); diff --git a/addons/interact_menu/XEH_clientInit.sqf b/addons/interact_menu/XEH_clientInit.sqf index ea83c44d1c..ad4179895f 100644 --- a/addons/interact_menu/XEH_clientInit.sqf +++ b/addons/interact_menu/XEH_clientInit.sqf @@ -28,7 +28,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; }; -["ACE3 Common", QGVAR(InteractKey), (localize STRING(InteractKey)), +["ACE3 Common", QGVAR(InteractKey), (localize LSTRING(InteractKey)), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -37,7 +37,7 @@ addMissionEventHandler ["Draw3D", DFUNC(render)]; },{[0,false] call FUNC(keyUp)}, [219, [false, false, false]], false] call cba_fnc_addKeybind; //Left Windows Key -["ACE3 Common", QGVAR(SelfInteractKey), (localize STRING(SelfInteractKey)), +["ACE3 Common", QGVAR(SelfInteractKey), (localize LSTRING(SelfInteractKey)), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside","isNotDragging", "isNotCarrying", "isNotSwimming", "notOnMap", "isNotEscorting", "isNotSurrendering"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf index cc254f1caf..1cbccf8a40 100644 --- a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf +++ b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf @@ -87,12 +87,12 @@ private ["_baseDisplayName", "_baseIcon"]; _baseDisplayName = ""; _baseIcon = ""; if (_objectType isKindOf "CAManBase") then { - _baseDisplayName = localize STRING(SelfActionsRoot); + _baseDisplayName = localize LSTRING(SelfActionsRoot); _baseIcon = "\a3\ui_f\data\IGUI\Cfg\Actions\eject_ca.paa"; } else { _baseDisplayName = getText (configFile >> "CfgVehicles" >> _objectType >> "displayName"); //Alt would be to just use a static text, if veh names end up being too long: - // _baseDisplayName = localize STRING(VehicleActionsRoot); + // _baseDisplayName = localize LSTRING(VehicleActionsRoot); //Pull the icon from the vehicle's config: _baseIcon = getText (configFile >> "CfgVehicles" >> _objectType >> "Icon"); diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf index 3a4ddf1336..7fe151dac1 100644 --- a/addons/interaction/XEH_postInit.sqf +++ b/addons/interaction/XEH_postInit.sqf @@ -23,7 +23,7 @@ private ["_team"]; // Add keybinds -["ACE3 Common", QGVAR(openDoor), localize STRING(OpenDoor), +["ACE3 Common", QGVAR(openDoor), localize LSTRING(OpenDoor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -43,7 +43,7 @@ private ["_team"]; [57, [false, true, false]], false] call cba_fnc_addKeybind; //Key CTRL+Space -["ACE3 Common", QGVAR(tapShoulder), localize STRING(TapShoulder), +["ACE3 Common", QGVAR(tapShoulder), localize LSTRING(TapShoulder), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -57,7 +57,7 @@ private ["_team"]; {false}, [20, [true, false, false]], false] call cba_fnc_addKeybind; -["ACE3 Common", QGVAR(modifierKey), localize STRING(ModifierKey), +["ACE3 Common", QGVAR(modifierKey), localize LSTRING(ModifierKey), { // Conditions: canInteract //if !([ACE_player, objNull, ["isNotDragging"]] call EFUNC(common,canInteractWith)) exitWith {false}; // not needed diff --git a/addons/interaction/functions/fnc_joinTeam.sqf b/addons/interaction/functions/fnc_joinTeam.sqf index 628ed3b936..c2a542d4af 100644 --- a/addons/interaction/functions/fnc_joinTeam.sqf +++ b/addons/interaction/functions/fnc_joinTeam.sqf @@ -25,10 +25,10 @@ _unit setVariable [QGVAR(assignedFireTeam), _team, true]; if (_unit == ACE_player) then { _message = if (_team == "MAIN") then { - localize STRING(LeftTeam); + localize LSTRING(LeftTeam); } else { - _team = localize format [STRING(Team%1), _team]; - format [localize STRING(JoinedTeam), _team]; + _team = localize format [LSTRING(Team%1), _team]; + format [localize LSTRING(JoinedTeam), _team]; }; [_message] call EFUNC(common,displayTextStructured); diff --git a/addons/interaction/functions/fnc_openMenuSelectUI.sqf b/addons/interaction/functions/fnc_openMenuSelectUI.sqf index cdcf632208..6141e839b8 100644 --- a/addons/interaction/functions/fnc_openMenuSelectUI.sqf +++ b/addons/interaction/functions/fnc_openMenuSelectUI.sqf @@ -29,7 +29,7 @@ if !(_unit in _cargo) exitWith {}; GVAR(InteractionMenu_Crew) = _cargo; // Prepare: add header and "OK" button to select menu -_actions = [localize STRING(InteractionMenu), localize STRING(Interact)] call FUNC(prepareSelectMenu); +_actions = [localize LSTRING(InteractionMenu), localize LSTRING(Interact)] call FUNC(prepareSelectMenu); // Prepare: add all cargo units as options to select menu { diff --git a/addons/interaction/functions/fnc_prepareSelectMenu.sqf b/addons/interaction/functions/fnc_prepareSelectMenu.sqf index 2353488e31..f42d95b75b 100644 --- a/addons/interaction/functions/fnc_prepareSelectMenu.sqf +++ b/addons/interaction/functions/fnc_prepareSelectMenu.sqf @@ -21,7 +21,7 @@ PARAMS_2(_header,_buttonText); closeDialog 0; if (isNil "_buttonText" or {_buttonText == ""}) then { - _buttonText = localize STRING(MakeSelection); + _buttonText = localize LSTRING(MakeSelection); }; createDialog "RscACE_SelectAnItem"; diff --git a/addons/interaction/functions/fnc_tapShoulder.sqf b/addons/interaction/functions/fnc_tapShoulder.sqf index 747afddf7e..b8bb591c6d 100644 --- a/addons/interaction/functions/fnc_tapShoulder.sqf +++ b/addons/interaction/functions/fnc_tapShoulder.sqf @@ -32,9 +32,9 @@ addCamShake [4, 0.5, 5]; private ["_message"]; //localize is converting the escaped <> symbols, so just add them here instead of in the stringtable if (_shoulderNum == 0) then { - _message = format ["%1 >", (localize STRING(YouWereTappedRight))]; + _message = format ["%1 >", (localize LSTRING(YouWereTappedRight))]; } else { - _message = format ["< %1", (localize STRING(YouWereTappedLeft))]; + _message = format ["< %1", (localize LSTRING(YouWereTappedLeft))]; }; [parseText _message] call EFUNC(common,displayTextStructured); diff --git a/addons/javelin/initKeybinds.sqf b/addons/javelin/initKeybinds.sqf index c164073b30..15215466e8 100644 --- a/addons/javelin/initKeybinds.sqf +++ b/addons/javelin/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3 Weapons", QGVAR(lockTarget), localize STRING(LockTarget), +["ACE3 Weapons", QGVAR(lockTarget), localize LSTRING(LockTarget), { if (GETGVAR(isLockKeyDown,false)) exitWith {false}; @@ -21,7 +21,7 @@ }, [15, [false, false, false]], false] call cba_fnc_addKeybind; //Tab Key -["ACE3 Weapons", QGVAR(cycleFireMode), localize STRING(CycleFireMode), +["ACE3 Weapons", QGVAR(cycleFireMode), localize LSTRING(CycleFireMode), { false }, { [ACE_player] call FUNC(cycleFireMode); diff --git a/addons/kestrel4500/initKeybinds.sqf b/addons/kestrel4500/initKeybinds.sqf index 4a4cb74220..f6ad1e8a17 100644 --- a/addons/kestrel4500/initKeybinds.sqf +++ b/addons/kestrel4500/initKeybinds.sqf @@ -1,4 +1,4 @@ -["ACE3 Equipment", QGVAR(KestrelDialogKey), localize STRING(KestrelDialogKey), +["ACE3 Equipment", QGVAR(KestrelDialogKey), localize LSTRING(KestrelDialogKey), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -13,7 +13,7 @@ {false}, [0, [false, false, false]], false, 0] call CBA_fnc_addKeybind; // (empty default key) -["ACE3 Equipment", QGVAR(DisplayKestrelKey), localize STRING(DisplayKestrelKey), +["ACE3 Equipment", QGVAR(DisplayKestrelKey), localize LSTRING(DisplayKestrelKey), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/laser/functions/fnc_keyLaserCodeDown.sqf b/addons/laser/functions/fnc_keyLaserCodeDown.sqf index 96f50b92d1..f833c477c6 100644 --- a/addons/laser/functions/fnc_keyLaserCodeDown.sqf +++ b/addons/laser/functions/fnc_keyLaserCodeDown.sqf @@ -8,5 +8,5 @@ if(_oldLaserCode > ACE_DEFAULT_LASER_CODE) then { ACE_player setVariable [QGVAR(code), _laserCode, false]; }; if(_laserCode != _oldLaserCode) then { - [format ["%1: %2", localize STRING(laserCode), _laserCode]] call EFUNC(common,displayTextStructured); + [format ["%1: %2", localize LSTRING(laserCode), _laserCode]] call EFUNC(common,displayTextStructured); }; \ No newline at end of file diff --git a/addons/laser/functions/fnc_keyLaserCodeUp.sqf b/addons/laser/functions/fnc_keyLaserCodeUp.sqf index e11e32389f..5357cec14c 100644 --- a/addons/laser/functions/fnc_keyLaserCodeUp.sqf +++ b/addons/laser/functions/fnc_keyLaserCodeUp.sqf @@ -6,5 +6,5 @@ _oldLaserCode = ACE_player getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE]; _laserCode = _oldLaserCode + 1; ACE_player setVariable [QGVAR(code), _laserCode, false]; if(_laserCode != _oldLaserCode) then { -[format ["%1: %2", localize STRING(laserCode), _laserCode]] call EFUNC(common,displayTextStructured); +[format ["%1: %2", localize LSTRING(laserCode), _laserCode]] call EFUNC(common,displayTextStructured); }; \ No newline at end of file diff --git a/addons/laser/functions/fnc_seekerFindLaserSpot.sqf b/addons/laser/functions/fnc_seekerFindLaserSpot.sqf index 346aec837e..c0112ab412 100644 --- a/addons/laser/functions/fnc_seekerFindLaserSpot.sqf +++ b/addons/laser/functions/fnc_seekerFindLaserSpot.sqf @@ -48,7 +48,7 @@ _finalOwner = nil; if(IS_CODE(_method)) then { _laser = _x call _method; } else { - if(IS_STRING(_method)) then { + if(IS_LSTRING(_method)) then { _laser = _x call (missionNamespace getVariable [_method, {}]); } else { if(IS_ARRAY(_method)) then { diff --git a/addons/laser/initKeybinds.sqf b/addons/laser/initKeybinds.sqf index 9d86bcb034..5e3d017103 100644 --- a/addons/laser/initKeybinds.sqf +++ b/addons/laser/initKeybinds.sqf @@ -1,4 +1,4 @@ -["ACE3 Equipment", QGVAR(LaserCodeUp), localize STRING(laserCodeUp), +["ACE3 Equipment", QGVAR(LaserCodeUp), localize LSTRING(laserCodeUp), { if( EGVAR(laser_selfdesignate,active) || @@ -12,7 +12,7 @@ {false}, [16, [false, true, true]], false, 0] call CBA_fnc_addKeybind; // (ALT+CTRL+Q) -["ACE3 Equipment", QGVAR(LaserCodeDown), localize STRING(laserCodeDown), +["ACE3 Equipment", QGVAR(LaserCodeDown), localize LSTRING(laserCodeDown), { if( EGVAR(laser_selfdesignate,active) || diff --git a/addons/laser_selfdesignate/functions/fnc_initDesignatorActions.sqf b/addons/laser_selfdesignate/functions/fnc_initDesignatorActions.sqf index 1167e0e5a6..a75e58f533 100644 --- a/addons/laser_selfdesignate/functions/fnc_initDesignatorActions.sqf +++ b/addons/laser_selfdesignate/functions/fnc_initDesignatorActions.sqf @@ -31,7 +31,7 @@ GVAR(initializedClasses) = _initializedClasses; // e.g.: _vehicle setVariable [format ["%1_%2", QGVAR(active), _x], false]; // Add actions - _onAction = [QGVAR(LaserOn), localize STRING(DesignatorOn), "", + _onAction = [QGVAR(LaserOn), localize LSTRING(DesignatorOn), "", { // Statement _this call FUNC(laserHudDesignateOn) @@ -41,7 +41,7 @@ GVAR(initializedClasses) = _initializedClasses; !GVAR(active) && {[ACE_player] call FUNC(unitTurretHasDesignator)} }] call EFUNC(interact_menu,createAction); - _offAction = [QGVAR(LaserOff), localize STRING(DesignatorOff), "", + _offAction = [QGVAR(LaserOff), localize LSTRING(DesignatorOff), "", { // Statement _this call FUNC(laserHudDesignateOff) diff --git a/addons/laserpointer/initKeybinds.sqf b/addons/laserpointer/initKeybinds.sqf index b33247e03d..da53da8a20 100644 --- a/addons/laserpointer/initKeybinds.sqf +++ b/addons/laserpointer/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3 Weapons", QGVAR(switchLaserLightMode), localize STRING(switchLaserLight), +["ACE3 Weapons", QGVAR(switchLaserLightMode), localize LSTRING(switchLaserLight), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf b/addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf index 350f9097bb..e51f17777e 100644 --- a/addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf +++ b/addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf @@ -36,4 +36,4 @@ _onFailure = { [_caller, "AinvPknlMstpSnonWnonDr_medic5", 0] call EFUNC(common,doAnimation); -[10, [_caller, _target], _onFinish, _onFailure, (localize STRING(Battery_Recharge)), {(_this select 0) call FUNC(canRefuelUAV)}] call EFUNC(common,progressBar); +[10, [_caller, _target], _onFinish, _onFailure, (localize LSTRING(Battery_Recharge)), {(_this select 0) call FUNC(canRefuelUAV)}] call EFUNC(common,progressBar); diff --git a/addons/logistics_wirecutter/functions/fnc_cutDownFence.sqf b/addons/logistics_wirecutter/functions/fnc_cutDownFence.sqf index 4cd6eba85f..f45f0c1511 100644 --- a/addons/logistics_wirecutter/functions/fnc_cutDownFence.sqf +++ b/addons/logistics_wirecutter/functions/fnc_cutDownFence.sqf @@ -38,4 +38,4 @@ _progressCheck = { ((!isNull _fenceObject) && {(damage _fenceObject) < 1} && {("ACE_wirecutter" in (items ACE_player))}) }; -[_timeToCut, [_fenceObject,0], {(_this select 0) call FUNC(cutDownFenceCallback)}, {(_this select 0) call FUNC(cutDownFenceAbort)}, localize STRING(CuttingFence), _progressCheck] call EFUNC(common,progressBar); +[_timeToCut, [_fenceObject,0], {(_this select 0) call FUNC(cutDownFenceCallback)}, {(_this select 0) call FUNC(cutDownFenceAbort)}, localize LSTRING(CuttingFence), _progressCheck] call EFUNC(common,progressBar); diff --git a/addons/logistics_wirecutter/functions/fnc_cutDownFenceCallback.sqf b/addons/logistics_wirecutter/functions/fnc_cutDownFenceCallback.sqf index 245b65bde8..57495a2a03 100644 --- a/addons/logistics_wirecutter/functions/fnc_cutDownFenceCallback.sqf +++ b/addons/logistics_wirecutter/functions/fnc_cutDownFenceCallback.sqf @@ -18,5 +18,5 @@ PARAMS_1(_fenceObject); _fenceObject setdamage 1; -// [localize STRING(FenceCut)] call EFUNC(common,displayTextStructured); +// [localize LSTRING(FenceCut)] call EFUNC(common,displayTextStructured); [ACE_player, "AmovPknlMstpSrasWrflDnon", 1] call EFUNC(common,doAnimation); diff --git a/addons/logistics_wirecutter/functions/fnc_interactEH.sqf b/addons/logistics_wirecutter/functions/fnc_interactEH.sqf index 2bcb488d42..05c47c4454 100644 --- a/addons/logistics_wirecutter/functions/fnc_interactEH.sqf +++ b/addons/logistics_wirecutter/functions/fnc_interactEH.sqf @@ -53,7 +53,7 @@ if (!("ACE_wirecutter" in (items ace_player))) exitWith {}; if ([_x] call FUNC(isFence)) then { _fencesHelped pushBack _x; _helper = "Sign_Sphere25cm_F" createVehicleLocal (getpos _x); - _action = [QGVAR(helperCutFence), (localize STRING(CutFence)), QUOTE(PATHTOF(ui\wirecutter_ca.paa)), _fncStatement, _fncCondition, {}, _x, [0,0,0], 5] call EFUNC(interact_menu,createAction); + _action = [QGVAR(helperCutFence), (localize LSTRING(CutFence)), QUOTE(PATHTOF(ui\wirecutter_ca.paa)), _fncStatement, _fncCondition, {}, _x, [0,0,0], 5] call EFUNC(interact_menu,createAction); [_helper, 0, [],_action] call EFUNC(interact_menu,addActionToObject); _helper setPosASL ((getPosASL _x) vectorAdd [0,0,1.25]); _helper hideObject true; diff --git a/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf b/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf index d47878086d..4c985e3d36 100644 --- a/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf +++ b/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf @@ -29,9 +29,9 @@ _fullMagazineCount = getNumber (configfile >> "CfgMagazines" >> _magazineClassna if (!([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith))) exitWith {}; _structuredOutputText = if (_errorCode == 0) then { - format ["%1
", (localize STRING(RepackComplete))]; + format ["%1
", (localize LSTRING(RepackComplete))]; } else { - format ["%1
", (localize STRING(RepackInterrupted))]; + format ["%1
", (localize LSTRING(RepackInterrupted))]; }; _picture = getText (configFile >> "CfgMagazines" >> _magazineClassname >> "picture"); @@ -51,6 +51,6 @@ _structuredOutputText = _structuredOutputText + format ["" + (localize STRING(RepackedMagazinesCount)) + ""), _fullMags, _partialMags]; +// _structuredOutputText = _structuredOutputText + format [("" + (localize LSTRING(RepackedMagazinesCount)) + ""), _fullMags, _partialMags]; [parseText _structuredOutputText, 2] call EFUNC(common,displayTextStructured); diff --git a/addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf b/addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf index 48c357eece..a2947a0106 100644 --- a/addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf +++ b/addons/magazinerepack/functions/fnc_startRepackingMagazine.sqf @@ -67,7 +67,7 @@ _totalTime, [_magazineClassname, _startingAmmoCounts, _simEvents], {_this call FUNC(magazineRepackFinish)}, {_this call FUNC(magazineRepackFinish)}, -(localize STRING(RepackingMagazine)), +(localize LSTRING(RepackingMagazine)), {_this call FUNC(magazineRepackProgress)}, ["isNotInside"] ] call EFUNC(common,progressBar); diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp index 9e92a2525d..e51d4450a4 100644 --- a/addons/main/script_macros.hpp +++ b/addons/main/script_macros.hpp @@ -22,8 +22,8 @@ #define PATHTOEF(var1,var2) PATHTOF_SYS(PREFIX,var1,var2) -#define STRING(var1) QUOTE(TRIPLES(STR,ADDON,var1)) -#define ESTRING(var1,var2) QUOTE(TRIPLES(STR,DOUBLES(PREFIX,var1),var2)) +#define LSTRING(var1) QUOTE(TRIPLES(STR,ADDON,var1)) +#define LESTRING(var1,var2) QUOTE(TRIPLES(STR,DOUBLES(PREFIX,var1),var2)) #define CSTRING(var1) QUOTE(TRIPLES($STR,ADDON,var1)) #define ECSTRING(var1,var2) QUOTE(TRIPLES($STR,DOUBLES(PREFIX,var1),var2)) diff --git a/addons/markers/functions/fnc_onSliderPosChangedAngle.sqf b/addons/markers/functions/fnc_onSliderPosChangedAngle.sqf index 940b84fe42..1210b8ce71 100644 --- a/addons/markers/functions/fnc_onSliderPosChangedAngle.sqf +++ b/addons/markers/functions/fnc_onSliderPosChangedAngle.sqf @@ -25,6 +25,6 @@ if (_direction < 0) then { _direction = _direction + 360; }; -((ctrlParent _ctrl) displayCtrl 1221) ctrlSetText format [localize STRING(MarkerDirection), _direction]; +((ctrlParent _ctrl) displayCtrl 1221) ctrlSetText format [localize LSTRING(MarkerDirection), _direction]; GVAR(currentMarkerAngle) = _data; diff --git a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf index 46813c585b..701be65f2d 100644 --- a/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf @@ -28,27 +28,27 @@ _bloodPressureLow = _bloodPressure select 0; _output = ""; _logOutPut = ""; if ([_caller] call FUNC(isMedic)) then { - _output = STRING(Check_Bloodpressure_Output_1); + _output = LSTRING(Check_Bloodpressure_Output_1); _logOutPut = format["%1/%2",round(_bloodPressureHigh),round(_bloodPressureLow)]; } else { if (_bloodPressureHigh > 20) then { - _output = STRING(Check_Bloodpressure_Output_2); - _logOutPut = localize STRING(Check_Bloodpressure_Low); + _output = LSTRING(Check_Bloodpressure_Output_2); + _logOutPut = localize LSTRING(Check_Bloodpressure_Low); if (_bloodPressureHigh > 100) then { - _output = STRING(Check_Bloodpressure_Output_3); - _logOutPut = localize STRING(Check_Bloodpressure_Normal); + _output = LSTRING(Check_Bloodpressure_Output_3); + _logOutPut = localize LSTRING(Check_Bloodpressure_Normal); if (_bloodPressureHigh > 160) then { - _output = STRING(Check_Bloodpressure_Output_4); - _logOutPut = localize STRING(Check_Bloodpressure_High); + _output = LSTRING(Check_Bloodpressure_Output_4); + _logOutPut = localize LSTRING(Check_Bloodpressure_High); }; }; } else { if (random(10) > 3) then { - _output = STRING(Check_Bloodpressure_Output_5); - _logOutPut = localize STRING(Check_Bloodpressure_NoBloodpressure); + _output = LSTRING(Check_Bloodpressure_Output_5); + _logOutPut = localize LSTRING(Check_Bloodpressure_NoBloodpressure); } else { - _output = STRING(Check_Bloodpressure_Output_6); + _output = LSTRING(Check_Bloodpressure_Output_6); }; }; }; @@ -56,5 +56,5 @@ if ([_caller] call FUNC(isMedic)) then { ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName), round(_bloodPressureHigh),round(_bloodPressureLow)], 1.75, _caller]] call EFUNC(common,targetEvent); if (_logOutPut != "") then { - [_target,"activity", localize STRING(Check_Bloodpressure_Log), [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); + [_target,"activity", localize LSTRING(Check_Bloodpressure_Log), [[_caller] call EFUNC(common,getName), _logOutPut]] call FUNC(addToLog); }; diff --git a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf index 7c2abdf5de..09d275d07d 100644 --- a/addons/medical/functions/fnc_actionCheckPulseLocal.sqf +++ b/addons/medical/functions/fnc_actionCheckPulseLocal.sqf @@ -23,24 +23,24 @@ _heartRate = _unit getvariable [QGVAR(heartRate), 80]; if (!alive _unit) then { _heartRate = 0; }; -_heartRateOutput = STRING(Check_Pulse_Output_5); -_logOutPut = localize STRING(Check_Pulse_None); +_heartRateOutput = LSTRING(Check_Pulse_Output_5); +_logOutPut = localize LSTRING(Check_Pulse_None); if (_heartRate > 1.0) then { if ([_caller] call FUNC(isMedic)) then { - _heartRateOutput = STRING(Check_Pulse_Output_1); + _heartRateOutput = LSTRING(Check_Pulse_Output_1); _logOutPut = format["%1",round(_heartRate)]; } else { // non medical personel will only find a pulse/HR - _heartRateOutput = STRING(Check_Pulse_Output_2); - _logOutPut = localize STRING(Check_Pulse_Weak); + _heartRateOutput = LSTRING(Check_Pulse_Output_2); + _logOutPut = localize LSTRING(Check_Pulse_Weak); if (_heartRate > 60) then { if (_heartRate > 100) then { - _heartRateOutput = STRING(Check_Pulse_Output_3); - _logOutPut = localize STRING(Check_Pulse_Strong); + _heartRateOutput = LSTRING(Check_Pulse_Output_3); + _logOutPut = localize LSTRING(Check_Pulse_Strong); } else { - _heartRateOutput = STRING(Check_Pulse_Output_4); - _logOutPut = localize STRING(Check_Pulse_Normal); + _heartRateOutput = LSTRING(Check_Pulse_Output_4); + _logOutPut = localize LSTRING(Check_Pulse_Normal); }; }; }; @@ -49,5 +49,5 @@ if (_heartRate > 1.0) then { ["displayTextStructured", [_caller], [[_heartRateOutput, [_unit] call EFUNC(common,getName), round(_heartRate)], 1.5, _caller]] call EFUNC(common,targetEvent); if (_logOutPut != "") then { - [_unit,"activity", localize STRING(Check_Pulse_Log),[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); + [_unit,"activity", localize LSTRING(Check_Pulse_Log),[[_caller] call EFUNC(common,getName),_logOutPut]] call FUNC(addToLog); }; diff --git a/addons/medical/functions/fnc_actionCheckResponse.sqf b/addons/medical/functions/fnc_actionCheckResponse.sqf index 9a0c87b6d8..2d62df12f6 100644 --- a/addons/medical/functions/fnc_actionCheckResponse.sqf +++ b/addons/medical/functions/fnc_actionCheckResponse.sqf @@ -20,9 +20,9 @@ _target = _this select 1; _output = ""; if ([_target] call EFUNC(common,isAwake)) then { - _output = STRING(Check_Response_Responsive); + _output = LSTRING(Check_Response_Responsive); } else { - _output = STRING(Check_Response_Unresponsive); + _output = LSTRING(Check_Response_Unresponsive); }; ["displayTextStructured", [_caller], [[_output, [_target] call EFUNC(common,getName)], 2, _caller]] call EFUNC(common,targetEvent); diff --git a/addons/medical/functions/fnc_actionDiagnose.sqf b/addons/medical/functions/fnc_actionDiagnose.sqf index 3158f6b844..243edbdef8 100644 --- a/addons/medical/functions/fnc_actionDiagnose.sqf +++ b/addons/medical/functions/fnc_actionDiagnose.sqf @@ -18,28 +18,28 @@ private ["_caller", "_target", "_genericMessages"]; _caller = _this select 0; _target = _this select 1; -_genericMessages = [STRING(diagnoseMessage)]; +_genericMessages = [LSTRING(diagnoseMessage)]; _genericMessages pushBack ([_target] call EFUNC(common,getName)); if (alive _target) then { - _genericMessages pushback STRING(diagnoseAlive); + _genericMessages pushback LSTRING(diagnoseAlive); } else { - _genericMessages pushback STRING(diagnoseDead); + _genericMessages pushback LSTRING(diagnoseDead); }; if (_target getvariable[QGVAR(hasLostBlood), 0] > 0) then { if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { - _genericMessages pushback STRING(lostBloodALot); + _genericMessages pushback LSTRING(lostBloodALot); } else { - _genericMessages pushback STRING(lostBlood); + _genericMessages pushback LSTRING(lostBlood); }; } else { - _genericMessages pushback STRING(noBloodloss); + _genericMessages pushback LSTRING(noBloodloss); }; if (_target getvariable[QGVAR(hasPain), false]) then { - _genericMessages pushback STRING(inPain); + _genericMessages pushback LSTRING(inPain); } else { - _genericMessages pushback STRING(noPain); + _genericMessages pushback LSTRING(noPain); }; ["displayTextStructured", [_caller], [_genericMessages, 3.0, _caller]] call EFUNC(common,targetEvent); diff --git a/addons/medical/functions/fnc_displayPatientInformation.sqf b/addons/medical/functions/fnc_displayPatientInformation.sqf index 07c49d8e0c..96b56c57f9 100644 --- a/addons/medical/functions/fnc_displayPatientInformation.sqf +++ b/addons/medical/functions/fnc_displayPatientInformation.sqf @@ -50,22 +50,22 @@ if (_show) then { _genericMessages = []; if (GVAR(level) >= 2) then { - _partText = [STRING(Head), STRING(Torso), STRING(ArmLeft) ,STRING(ArmRight) ,STRING(LegLeft), STRING(LegRight)] select _selectionN; + _partText = [LSTRING(Head), LSTRING(Torso), LSTRING(ArmLeft) ,LSTRING(ArmRight) ,LSTRING(LegLeft), LSTRING(LegRight)] select _selectionN; _genericMessages pushback [localize _partText, [1, 1, 1, 1]]; }; if (_target getvariable[QGVAR(isBleeding), false]) then { - _genericMessages pushback [localize STRING(Status_Bleeding), [1, 0.1, 0.1, 1]]; + _genericMessages pushback [localize LSTRING(Status_Bleeding), [1, 0.1, 0.1, 1]]; }; if (_target getvariable[QGVAR(hasLostBlood), 0] > 1) then { - _genericMessages pushback [localize STRING(Status_Lost_Blood), [1, 0.1, 0.1, 1]]; + _genericMessages pushback [localize LSTRING(Status_Lost_Blood), [1, 0.1, 0.1, 1]]; }; if (((_target getvariable [QGVAR(tourniquets), [0,0,0,0,0,0]]) select _selectionN) > 0) then { - _genericMessages pushback [localize STRING(Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]]; + _genericMessages pushback [localize LSTRING(Status_Tourniquet_Applied), [0.77, 0.51, 0.08, 1]]; }; if (_target getvariable[QGVAR(hasPain), false]) then { - _genericMessages pushback [localize STRING(Status_Pain), [1, 1, 1, 1]]; + _genericMessages pushback [localize LSTRING(Status_Pain), [1, 1, 1, 1]]; }; _totalIvVolume = 0; @@ -77,7 +77,7 @@ if (_show) then { }; }foreach GVAR(IVBags); if (_totalIvVolume >= 1) then { - _genericMessages pushback [format[localize STRING(receivingIvVolume), floor _totalIvVolume], [1, 1, 1, 1]]; + _genericMessages pushback [format[localize LSTRING(receivingIvVolume), floor _totalIvVolume], [1, 1, 1, 1]]; }; _damaged = [false, false, false, false, false, false]; @@ -133,17 +133,17 @@ if (_show) then { if (_target getHitPointDamage _x > 0 && {_forEachIndex == _selectionN}) then { _pointDamage = _target getHitPointDamage _x; _severity = switch (true) do { - case (_pointDamage > 0.5): {localize STRING(HeavilyWounded)}; - case (_pointDamage > 0.1): {localize STRING(LightlyWounded)}; - default {localize STRING(VeryLightlyWounded)}; + case (_pointDamage > 0.5): {localize LSTRING(HeavilyWounded)}; + case (_pointDamage > 0.1): {localize LSTRING(LightlyWounded)}; + default {localize LSTRING(VeryLightlyWounded)}; }; _part = localize ([ - STRING(Head), - STRING(Torso), - STRING(LeftArm), - STRING(RightArm), - STRING(LeftLeg), - STRING(RightLeg) + LSTRING(Head), + LSTRING(Torso), + LSTRING(LeftArm), + LSTRING(RightArm), + LSTRING(LeftLeg), + LSTRING(RightLeg) ] select _forEachIndex); _allInjuryTexts pushBack [format ["%1 %2", _severity, toLower _part], [1,1,1,1]]; }; @@ -186,7 +186,7 @@ if (_show) then { _lbCtrl lbSetColor [_foreachIndex + _amountOfGeneric, _x select 1]; }foreach _allInjuryTexts; if (count _allInjuryTexts == 0) then { - _lbCtrl lbAdd (localize STRING(NoInjuriesBodypart)); + _lbCtrl lbAdd (localize LSTRING(NoInjuriesBodypart)); }; _logCtrl = (_display displayCtrl 302); diff --git a/addons/medical/functions/fnc_displayTriageCard.sqf b/addons/medical/functions/fnc_displayTriageCard.sqf index bc6b412990..c4ed4ad829 100644 --- a/addons/medical/functions/fnc_displayTriageCard.sqf +++ b/addons/medical/functions/fnc_displayTriageCard.sqf @@ -58,7 +58,7 @@ if (_show) then { }foreach _log; if (count _triageCardTexts == 0) then { - _lbCtrl lbAdd (localize STRING(TriageCard_NoEntry)); + _lbCtrl lbAdd (localize LSTRING(TriageCard_NoEntry)); }; { _lbCtrl lbAdd _x; diff --git a/addons/medical/functions/fnc_getTriageStatus.sqf b/addons/medical/functions/fnc_getTriageStatus.sqf index 26e91882dd..812c20ed2a 100644 --- a/addons/medical/functions/fnc_getTriageStatus.sqf +++ b/addons/medical/functions/fnc_getTriageStatus.sqf @@ -17,10 +17,10 @@ private ["_unit","_return","_status"]; _unit = _this select 0; _status = _unit getvariable [QGVAR(triageLevel), -1]; _return = switch (_status) do { - case 1: {[localize STRING(Triage_Status_Minor), 1, [0, 0.5, 0, 0.9]]}; - case 2: {[localize STRING(Triage_Status_Delayed), 2, [0.7, 0.5, 0, 0.9]]}; - case 3: {[localize STRING(Triage_Status_Immediate), 3, [0.4, 0.07, 0.07, 0.9]]}; - case 4: {[localize STRING(Triage_Status_Deceased), 4, [0, 0, 0, 0.9]]}; - default {[localize STRING(Triage_Status_None), 0, [0, 0, 0, 0.9]]}; + case 1: {[localize LSTRING(Triage_Status_Minor), 1, [0, 0.5, 0, 0.9]]}; + case 2: {[localize LSTRING(Triage_Status_Delayed), 2, [0.7, 0.5, 0, 0.9]]}; + case 3: {[localize LSTRING(Triage_Status_Immediate), 3, [0.4, 0.07, 0.07, 0.9]]}; + case 4: {[localize LSTRING(Triage_Status_Deceased), 4, [0, 0, 0, 0.9]]}; + default {[localize LSTRING(Triage_Status_None), 0, [0, 0, 0, 0.9]]}; }; _return; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf b/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf index a26d9c2f99..6b6b7adb81 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf @@ -37,6 +37,6 @@ if !([_target] call FUNC(hasMedicalEnabled)) exitwith { }; }foreach _items;*/ -[_target, "activity", STRING(Activity_bandagedPatient), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); +[_target, "activity", LSTRING(Activity_bandagedPatient), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); true; diff --git a/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf b/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf index bed11fe75f..e3d07616f3 100644 --- a/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf +++ b/addons/medical/functions/fnc_treatmentAdvanced_medication.sqf @@ -32,6 +32,6 @@ _items = _this select 4; }; }foreach _items; -[_target, "activity", STRING(Activity_usedItem), [[_caller] call EFUNC(common,getName), _className]] call FUNC(addToLog); +[_target, "activity", LSTRING(Activity_usedItem), [[_caller] call EFUNC(common,getName), _className]] call FUNC(addToLog); true; diff --git a/addons/medical/functions/fnc_treatmentIV.sqf b/addons/medical/functions/fnc_treatmentIV.sqf index 81bf437033..fc6b91b057 100644 --- a/addons/medical/functions/fnc_treatmentIV.sqf +++ b/addons/medical/functions/fnc_treatmentIV.sqf @@ -29,4 +29,4 @@ if (count _items == 0) exitwith {}; _removeItem = _items select 0; [[_target, _className], QUOTE(DFUNC(treatmentIVLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ [_target, _removeItem] call FUNC(addToTriageCard); -[_target, "activity", STRING(Activity_gaveIV), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); +[_target, "activity", LSTRING(Activity_gaveIV), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); diff --git a/addons/medical/functions/fnc_treatmentTourniquet.sqf b/addons/medical/functions/fnc_treatmentTourniquet.sqf index 63e7df4f56..cab44d3295 100644 --- a/addons/medical/functions/fnc_treatmentTourniquet.sqf +++ b/addons/medical/functions/fnc_treatmentTourniquet.sqf @@ -43,7 +43,7 @@ _removeItem = _items select 0; [[_target, _removeItem, _selectionName], QUOTE(DFUNC(treatmentTourniquetLocal)), _target] call EFUNC(common,execRemoteFnc); /* TODO Replace by event system */ [_target, _removeItem] call FUNC(addToTriageCard); -[_target, "activity", STRING(Activity_appliedTourniquet), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); +[_target, "activity", LSTRING(Activity_appliedTourniquet), [[_caller] call EFUNC(common,getName)]] call FUNC(addToLog); true; diff --git a/addons/microdagr/XEH_clientInit.sqf b/addons/microdagr/XEH_clientInit.sqf index 892b8c2c46..3b77a6bc33 100644 --- a/addons/microdagr/XEH_clientInit.sqf +++ b/addons/microdagr/XEH_clientInit.sqf @@ -4,7 +4,7 @@ if (!hasInterface) exitWith {}; //Add Keybinds: -["ACE3 Equipment", QGVAR(openGPS), (localize STRING(toggleUnit)), +["ACE3 Equipment", QGVAR(openGPS), (localize LSTRING(toggleUnit)), { // canInteractWith (can use on map) if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -17,7 +17,7 @@ if (!hasInterface) exitWith {}; {false}, [0xC7, [false, false, false]], false] call cba_fnc_addKeybind; //Home Key -["ACE3 Equipment", QGVAR(closeGPS), (localize STRING(closeUnit)), +["ACE3 Equipment", QGVAR(closeGPS), (localize LSTRING(closeUnit)), { // canInteractWith (can use on map) if !([ACE_player, objNull, ["notOnMap", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/microdagr/functions/fnc_showApplicationPage.sqf b/addons/microdagr/functions/fnc_showApplicationPage.sqf index cfa364eeee..5ab054732c 100644 --- a/addons/microdagr/functions/fnc_showApplicationPage.sqf +++ b/addons/microdagr/functions/fnc_showApplicationPage.sqf @@ -88,10 +88,10 @@ if (GVAR(currentApplicationPage) == APP_MODE_MARK) then { if ((count GVAR(newWaypointPosition)) == 0) then { - (_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText (localize STRING(wpEnterCords)); + (_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText (localize LSTRING(wpEnterCords)); (_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText ""; } else { - (_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText format [(localize STRING(wpEnterName)), mapGridPosition GVAR(newWaypointPosition)]; + (_display displayCtrl IDC_MODEMARK_HEADER) ctrlSetText format [(localize LSTRING(wpEnterName)), mapGridPosition GVAR(newWaypointPosition)]; (_display displayCtrl IDC_MODEMARK_CORDSEDIT) ctrlSetText format ["[%1]", mapGridPosition GVAR(newWaypointPosition)]; }; ctrlSetFocus (_display displayCtrl IDC_MODEMARK_CORDSEDIT); diff --git a/addons/microdagr/functions/fnc_updateDisplay.sqf b/addons/microdagr/functions/fnc_updateDisplay.sqf index fca5e9ed3b..aa3a7c9379 100644 --- a/addons/microdagr/functions/fnc_updateDisplay.sqf +++ b/addons/microdagr/functions/fnc_updateDisplay.sqf @@ -181,18 +181,18 @@ case (APP_MODE_SETUP): { _settingListBox = _display displayCtrl IDC_MODESETTINGS; lbClear _settingListBox; - _settingListBox lbAdd (localize STRING(settingUseMils)); + _settingListBox lbAdd (localize LSTRING(settingUseMils)); if (GVAR(settingUseMils)) then { - _settingListBox lbSetTextRight [0, (localize STRING(settingMils))]; + _settingListBox lbSetTextRight [0, (localize LSTRING(settingMils))]; } else { - _settingListBox lbSetTextRight [0, (localize STRING(settingDegrees))]; + _settingListBox lbSetTextRight [0, (localize LSTRING(settingDegrees))]; }; - _settingListBox lbAdd (localize STRING(settingShowWP)); + _settingListBox lbAdd (localize LSTRING(settingShowWP)); if (GVAR(settingShowAllWaypointsOnMap)) then { - _settingListBox lbSetTextRight [1, (localize STRING(settingOn))]; + _settingListBox lbSetTextRight [1, (localize LSTRING(settingOn))]; } else { - _settingListBox lbSetTextRight [1, (localize STRING(settingOff))]; + _settingListBox lbSetTextRight [1, (localize LSTRING(settingOff))]; }; }; }; diff --git a/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf b/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf index 697b169d5b..e74cb315f7 100644 --- a/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf +++ b/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf @@ -51,7 +51,7 @@ _fireModes = getArray (configFile >> "CfgWeapons" >> _tubeWeaponName >> "modes") _currentFireMode = (weaponState [_mortarVeh, [0]]) select 2; _currentChargeMode = _fireModes find _currentFireMode; - _text = format ["%1: %2 ", (localize STRING(rangetable_charge)), _currentChargeMode, QUOTE(PATHTOF(UI\ui_charges.paa))]; + _text = format ["%1: %2 ", (localize LSTRING(rangetable_charge)), _currentChargeMode, QUOTE(PATHTOF(UI\ui_charges.paa))]; _chargeText ctrlSetStructuredText parseText _text; if (shownArtilleryComputer && {!GVAR(allowComputerRangefinder)}) then { //Don't like this solution, but it works diff --git a/addons/mk6mortar/functions/fnc_rangeTableOpen.sqf b/addons/mk6mortar/functions/fnc_rangeTableOpen.sqf index 8f9fea3dcb..07e0536d24 100644 --- a/addons/mk6mortar/functions/fnc_rangeTableOpen.sqf +++ b/addons/mk6mortar/functions/fnc_rangeTableOpen.sqf @@ -39,7 +39,7 @@ _muzzleVelocities = []; _showToPlayer = getNumber (configFile >> "CfgWeapons" >> _weaponName >> _x >> "showToPlayer"); if (_showToPlayer == 1) then { _artilleryCharge = getNumber (configFile >> "CfgWeapons" >> _weaponName >> _x >> "artilleryCharge"); - LIST_CHARGE lbAdd format ["%1: %2", (localize STRING(rangetable_charge)), (count _muzzleVelocities)]; + LIST_CHARGE lbAdd format ["%1: %2", (localize LSTRING(rangetable_charge)), (count _muzzleVelocities)]; LIST_CHARGE lbSetData [(count _muzzleVelocities), str (_artilleryCharge * _initSpeed)]; _muzzleVelocities pushBack _artilleryCharge; }; diff --git a/addons/movement/XEH_postInit.sqf b/addons/movement/XEH_postInit.sqf index 7925727b85..ebe97e879d 100644 --- a/addons/movement/XEH_postInit.sqf +++ b/addons/movement/XEH_postInit.sqf @@ -14,13 +14,13 @@ if (!hasInterface) exitWith {}; [_this select 1] call CBA_fnc_removePerFrameHandler; }; - _dialog displayCtrl 111 ctrlSetText format ["%1 - %2 %3", [ACE_player] call EFUNC(common,getName), localize STRING(Weight), [ACE_player] call FUNC(getWeight)]; + _dialog displayCtrl 111 ctrlSetText format ["%1 - %2 %3", [ACE_player] call EFUNC(common,getName), localize LSTRING(Weight), [ACE_player] call FUNC(getWeight)]; }, 0, _this select 0] call CBA_fnc_addPerFrameHandler; }] call EFUNC(common,addEventHandler); -["ACE3 Movement", QGVAR(climb), localize STRING(Climb), +["ACE3 Movement", QGVAR(climb), localize LSTRING(Climb), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/movement/functions/fnc_climb.sqf b/addons/movement/functions/fnc_climb.sqf index d9d0a2adfd..a395e834b8 100644 --- a/addons/movement/functions/fnc_climb.sqf +++ b/addons/movement/functions/fnc_climb.sqf @@ -20,7 +20,7 @@ private "_unit"; _unit = _this select 0; if !([_unit] call FUNC(canClimb)) exitWith { - [localize STRING(CanNotClimb)] call EFUNC(common,displayTextStructured); + [localize LSTRING(CanNotClimb)] call EFUNC(common,displayTextStructured); }; if !(_unit getVariable [QGVAR(isClimbInit), false]) then { diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf index 2d3366ae84..b8a570507f 100644 --- a/addons/nametags/XEH_postInit.sqf +++ b/addons/nametags/XEH_postInit.sqf @@ -8,7 +8,7 @@ if (!hasInterface) exitWith {}; GVAR(ShowNamesTime) = -10; // Add keybinds -["ACE3 Common", QGVAR(showNameTags), localize STRING(ShowNames), +["ACE3 Common", QGVAR(showNameTags), localize LSTRING(ShowNames), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/nightvision/XEH_postInitClient.sqf b/addons/nightvision/XEH_postInitClient.sqf index cf4541a86a..cc8490eb15 100644 --- a/addons/nightvision/XEH_postInitClient.sqf +++ b/addons/nightvision/XEH_postInitClient.sqf @@ -37,7 +37,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0; ["playerTurretChanged", {_this call FUNC(updatePPEffects)}] call EFUNC(common,addEventHandler); // Add keybinds -["ACE3 Equipment", QGVAR(IncreaseNVGBrightness), localize STRING(IncreaseNVGBrightness), +["ACE3 Equipment", QGVAR(IncreaseNVGBrightness), localize LSTRING(IncreaseNVGBrightness), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -51,7 +51,7 @@ GVAR(ppEffectMuzzleFlash) ppEffectCommit 0; {false}, [201, [false, false, true]], false] call cba_fnc_addKeybind; //PageUp + ALT -["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize STRING(DecreaseNVGBrightness), +["ACE3 Equipment", QGVAR(DecreaseNVGBrightness), localize LSTRING(DecreaseNVGBrightness), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/nightvision/functions/fnc_changeNVGBrightness.sqf b/addons/nightvision/functions/fnc_changeNVGBrightness.sqf index ac80f96c9c..327c148883 100644 --- a/addons/nightvision/functions/fnc_changeNVGBrightness.sqf +++ b/addons/nightvision/functions/fnc_changeNVGBrightness.sqf @@ -29,5 +29,5 @@ _player setVariable [QGVAR(NVGBrightness), _brightness, false]; GVAR(ppEffectNVGBrightness) ppEffectAdjust [1, 1, _brightness / 4, [0, 0, 0, 0], [0, 0, 0, 1], [0, 0, 0, 1]]; GVAR(ppEffectNVGBrightness) ppEffectCommit 0; -[format [(localize STRING(NVGBrightness)), (_brightness * 100)]] call EFUNC(common,displayTextStructured); +[format [(localize LSTRING(NVGBrightness)), (_brightness * 100)]] call EFUNC(common,displayTextStructured); playSound "ACE_Sound_Click"; diff --git a/addons/optionsmenu/functions/fnc_exportSettings.sqf b/addons/optionsmenu/functions/fnc_exportSettings.sqf index ccb7113915..d32c45f7f6 100644 --- a/addons/optionsmenu/functions/fnc_exportSettings.sqf +++ b/addons/optionsmenu/functions/fnc_exportSettings.sqf @@ -75,6 +75,6 @@ FUNC(clipboardExport) = { }; [_compiledConfig] call FUNC(clipboardExport); -[STRING(settingsExported)] call EFUNC(common,displayTextStructured); +[LSTRING(settingsExported)] call EFUNC(common,displayTextStructured); diff --git a/addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf b/addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf index b6a2c9ce26..0ddcc8d2a9 100644 --- a/addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf +++ b/addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf @@ -26,7 +26,7 @@ _settingsMenu = uiNamespace getVariable 'ACE_settingsMenu'; switch (GVAR(optionMenu_openTab)) do { case (MENU_TAB_OPTIONS): { - _localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabOptions))]; + _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabOptions))]; ctrlSetText [13, _localizedHeader]; lbClear 400; @@ -39,7 +39,7 @@ case (MENU_TAB_OPTIONS): { (_settingsMenu displayCtrl 413) ctrlShow false; }; case (MENU_TAB_COLORS): { - _localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabColors))]; + _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabColors))]; ctrlSetText [13, _localizedHeader]; lbClear 400; diff --git a/addons/optionsmenu/functions/fnc_onServerListBoxShowSelectionChanged.sqf b/addons/optionsmenu/functions/fnc_onServerListBoxShowSelectionChanged.sqf index 15de7d3c00..669faf74ed 100644 --- a/addons/optionsmenu/functions/fnc_onServerListBoxShowSelectionChanged.sqf +++ b/addons/optionsmenu/functions/fnc_onServerListBoxShowSelectionChanged.sqf @@ -26,7 +26,7 @@ _settingsMenu = uiNamespace getVariable 'ACE_serverSettingsMenu'; switch (GVAR(optionMenu_openTab)) do { case (MENU_TAB_SERVER_OPTIONS): { - _localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabOptions))]; + _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabOptions))]; ctrlSetText [13, _localizedHeader]; lbClear 400; @@ -43,7 +43,7 @@ case (MENU_TAB_SERVER_OPTIONS): { (_settingsMenu displayCtrl 416) ctrlEnable false; }; case (MENU_TAB_SERVER_COLORS): { - _localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabColors))]; + _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabColors))]; ctrlSetText [13, _localizedHeader]; lbClear 400; @@ -67,7 +67,7 @@ case (MENU_TAB_SERVER_COLORS): { (_settingsMenu displayCtrl 416) ctrlEnable false; }; case (MENU_TAB_SERVER_VALUES): { - _localizedHeader = format ["%1: %2", (localize STRING(OpenConfigMenu)), (localize STRING(TabValues))]; + _localizedHeader = format ["%1: %2", (localize LSTRING(OpenConfigMenu)), (localize LSTRING(TabValues))]; ctrlSetText [13, _localizedHeader]; lbClear 400; diff --git a/addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf b/addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf index 145a230a63..4f96438042 100644 --- a/addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf +++ b/addons/optionsmenu/functions/fnc_onServerSettingsMenuOpen.sqf @@ -61,7 +61,7 @@ _menu = uiNamespace getvariable "ACE_serverSettingsMenu"; (_menu displayCtrl 1003) ctrlEnable false; if (GVAR(ClientSettingsExportIncluded)) then { - (_settingsMenu displayCtrl 1102) ctrlSetText localize (STRING(exClientSettings)); + (_settingsMenu displayCtrl 1102) ctrlSetText localize (LSTRING(exClientSettings)); } else { - (_settingsMenu displayCtrl 1102) ctrlSetText localize (STRING(inClientSettings)); + (_settingsMenu displayCtrl 1102) ctrlSetText localize (LSTRING(inClientSettings)); }; diff --git a/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf b/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf index e95d73a67b..9daee053bb 100644 --- a/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf +++ b/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateKeyView.sqf @@ -56,8 +56,8 @@ if (count _collection > 0) then { // Created disable/enable options for bools if ((_setting select 1) == "BOOL") then { lbClear 400; - lbAdd [400, (localize STRING(Disabled))]; - lbAdd [400, (localize STRING(Enabled))]; + lbAdd [400, (localize LSTRING(Disabled))]; + lbAdd [400, (localize LSTRING(Enabled))]; _settingsValue = [0, 1] select _settingsValue; } else { lbClear 400; @@ -77,10 +77,10 @@ if (count _collection > 0) then { // Created disable/enable options for bools _expectedType = switch (_setting select 1) do { - case "STRING": {STRING(stringType)}; - case "ARRAY": {STRING(arrayType)}; - case "SCALAR": {STRING(scalarType)}; - default {STRING(unknownType)}; + case "STRING": {LSTRING(stringType)}; + case "ARRAY": {LSTRING(arrayType)}; + case "SCALAR": {LSTRING(scalarType)}; + default {LSTRING(unknownType)}; }; (_settingsMenu displayCtrl 414) ctrlSetText format["%1", _settingsValue]; (_settingsMenu displayCtrl 415) ctrlSetText format[localize _expectedType]; diff --git a/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf b/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf index 762a5497d4..f3e393bbfd 100644 --- a/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf +++ b/addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf @@ -37,7 +37,7 @@ switch (GVAR(optionMenu_openTab)) do { // Created disable/enable options for bools _settingsText = if ((_x select 1) == "BOOL") then { - [(localize STRING(Disabled)), (localize STRING(Enabled))] select _settingsValue; + [(localize LSTRING(Disabled)), (localize LSTRING(Enabled))] select _settingsValue; } else { (_x select 5) select _settingsValue; }; diff --git a/addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf b/addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf index 864033ce1f..3777093ccd 100644 --- a/addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf +++ b/addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf @@ -56,8 +56,8 @@ if (count _collection > 0) then { // Created disable/enable options for bools if ((_setting select 1) == "BOOL") then { lbClear 400; - lbAdd [400, (localize STRING(Disabled))]; - lbAdd [400, (localize STRING(Enabled))]; + lbAdd [400, (localize LSTRING(Disabled))]; + lbAdd [400, (localize LSTRING(Enabled))]; _settingsValue = [0, 1] select _settingsValue; } else { lbClear 400; diff --git a/addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf b/addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf index c3a232ec08..fdd9128ca3 100644 --- a/addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf +++ b/addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf @@ -34,7 +34,7 @@ switch (GVAR(optionMenu_openTab)) do { // Created disable/enable options for bools _settingsText = if ((_x select 1) == "BOOL") then { - [(localize STRING(Disabled)), (localize STRING(Enabled))] select _settingsValue; + [(localize LSTRING(Disabled)), (localize LSTRING(Enabled))] select _settingsValue; } else { (_x select 5) select _settingsValue; }; diff --git a/addons/overheating/XEH_postInit.sqf b/addons/overheating/XEH_postInit.sqf index 3b270f2d85..0dad0dd32c 100644 --- a/addons/overheating/XEH_postInit.sqf +++ b/addons/overheating/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapons", QGVAR(unjamWeapon), localize STRING(UnjamWeapon), +["ACE3 Weapons", QGVAR(unjamWeapon), localize LSTRING(UnjamWeapon), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/overheating/functions/fnc_clearJam.sqf b/addons/overheating/functions/fnc_clearJam.sqf index be6d073b6f..1c7e959a98 100644 --- a/addons/overheating/functions/fnc_clearJam.sqf +++ b/addons/overheating/functions/fnc_clearJam.sqf @@ -52,6 +52,6 @@ if (_weapon in _jammedWeapons) then { }; if (GVAR(DisplayTextOnJam)) then { - [localize STRING(WeaponUnjammed)] call EFUNC(common,displayTextStructured); + [localize LSTRING(WeaponUnjammed)] call EFUNC(common,displayTextStructured); }; }; diff --git a/addons/overheating/functions/fnc_jamWeapon.sqf b/addons/overheating/functions/fnc_jamWeapon.sqf index 487266be32..1249cac690 100644 --- a/addons/overheating/functions/fnc_jamWeapon.sqf +++ b/addons/overheating/functions/fnc_jamWeapon.sqf @@ -62,7 +62,7 @@ if (_unit getVariable [QGVAR(JammingActionID), -1] == -1) then { playSound3D ["a3\sounds_f\weapons\Other\dry9.wss", _this select 0]; if (!(missionNamespace getVariable [QGVAR(knowAboutJam), false]) && {(_this select 1) ammo currentWeapon (_this select 1) > 0} && {GVAR(DisplayTextOnJam)}) then { - [localize STRING(WeaponJammed)] call EFUNC(common,displayTextStructured); + [localize LSTRING(WeaponJammed)] call EFUNC(common,displayTextStructured); GVAR(knowAboutJam) = true; }; }; @@ -75,7 +75,7 @@ if (_unit getVariable [QGVAR(JammingActionID), -1] == -1) then { [_this select 1, currentWeapon (_this select 1), false] call FUNC(clearJam); }; - //_id = [_unit, format ["%1", localize STRING(UnjamWeapon)], "DefaultAction", _condition, _statement, _condition2, _statement2, 10] call EFUNC(common,addActionMenuEventHandler); + //_id = [_unit, format ["%1", localize LSTRING(UnjamWeapon)], "DefaultAction", _condition, _statement, _condition2, _statement2, 10] call EFUNC(common,addActionMenuEventHandler); _id = [_unit, "DefaultAction", _condition, _statement] call EFUNC(common,addActionEventHandler); _unit setVariable [QGVAR(JammingActionID), _id]; diff --git a/addons/overheating/functions/fnc_swapBarrel.sqf b/addons/overheating/functions/fnc_swapBarrel.sqf index f2c92d5b4a..4bd0f734b9 100644 --- a/addons/overheating/functions/fnc_swapBarrel.sqf +++ b/addons/overheating/functions/fnc_swapBarrel.sqf @@ -22,4 +22,4 @@ _player playActionNow "GestureDismountMuzzle"; _player playAction "GestureMountMuzzle"; playSound "ACE_BarrelSwap"; -[10, [_player, _weapon], {(_this select 0) call FUNC(swapBarrelCallback)}, {}, (localize STRING(SwappingBarrel))] call EFUNC(common,progressBar); +[10, [_player, _weapon], {(_this select 0) call FUNC(swapBarrelCallback)}, {}, (localize LSTRING(SwappingBarrel))] call EFUNC(common,progressBar); diff --git a/addons/overheating/functions/fnc_swapBarrelCallback.sqf b/addons/overheating/functions/fnc_swapBarrelCallback.sqf index 415908aea3..5947e381c7 100644 --- a/addons/overheating/functions/fnc_swapBarrelCallback.sqf +++ b/addons/overheating/functions/fnc_swapBarrelCallback.sqf @@ -16,6 +16,6 @@ EXPLODE_2_PVT(_this,_player,_weapon); // don't consume the barrel, but rotate through them. -[localize STRING(SwappedBarrel), QUOTE(PATHTOF(UI\spare_barrel_ca.paa))] call EFUNC(common,displayTextPicture); +[localize LSTRING(SwappedBarrel), QUOTE(PATHTOF(UI\spare_barrel_ca.paa))] call EFUNC(common,displayTextPicture); _player setVariable [format [QGVAR(%1), _weapon], [0, 0], false]; diff --git a/addons/parachute/XEH_postInit.sqf b/addons/parachute/XEH_postInit.sqf index 9ee62d08ba..a8f83b43a3 100644 --- a/addons/parachute/XEH_postInit.sqf +++ b/addons/parachute/XEH_postInit.sqf @@ -17,7 +17,7 @@ if (!hasInterface) exitWith {}; -["ACE3 Equipment", QGVAR(showAltimeter), localize STRING(showAltimeter), +["ACE3 Equipment", QGVAR(showAltimeter), localize LSTRING(showAltimeter), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/reload/XEH_postInit.sqf b/addons/reload/XEH_postInit.sqf index 869e151b6a..cd0108f740 100644 --- a/addons/reload/XEH_postInit.sqf +++ b/addons/reload/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapons", QGVAR(checkAmmo), localize STRING(checkAmmo), +["ACE3 Weapons", QGVAR(checkAmmo), localize LSTRING(checkAmmo), { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/reload/functions/fnc_startLinkingBelt.sqf b/addons/reload/functions/fnc_startLinkingBelt.sqf index c76dc5ccd5..4bed7f700a 100644 --- a/addons/reload/functions/fnc_startLinkingBelt.sqf +++ b/addons/reload/functions/fnc_startLinkingBelt.sqf @@ -66,4 +66,4 @@ _player playActionNow "PutDown"; [_player, _magazineType, _maxAmmo] call EFUNC(common,removeSpecificMagazine); // Call progress bar -[4, [_player, _target, [_magazineType, _maxAmmo]], _onFinish, _onFailure, (localize STRING(LinkingBelt)), _condition] call EFUNC(common,progressBar); +[4, [_player, _target, [_magazineType, _maxAmmo]], _onFinish, _onFailure, (localize LSTRING(LinkingBelt)), _condition] call EFUNC(common,progressBar); diff --git a/addons/reloadlaunchers/functions/fnc_addMissileReloadActions.sqf b/addons/reloadlaunchers/functions/fnc_addMissileReloadActions.sqf index 40c4e85c62..a07afe8e22 100644 --- a/addons/reloadlaunchers/functions/fnc_addMissileReloadActions.sqf +++ b/addons/reloadlaunchers/functions/fnc_addMissileReloadActions.sqf @@ -30,7 +30,7 @@ _loadableMissiles = [_unit, _weapon] call FUNC(getLoadableMissiles); private ["_name", "_displayName", "_statement", "_condition", "_action"]; _name = format [QGVAR(Missile_%1), _x]; - _displayName = format [localize STRING(LoadMagazine), getText (configFile >> "CfgMagazines" >> _x >> "displayName")]; + _displayName = format [localize LSTRING(LoadMagazine), getText (configFile >> "CfgMagazines" >> _x >> "displayName")]; _statement = { (_this select 2) call DFUNC(load); diff --git a/addons/reloadlaunchers/functions/fnc_load.sqf b/addons/reloadlaunchers/functions/fnc_load.sqf index 9cca572307..745bb2a5cb 100644 --- a/addons/reloadlaunchers/functions/fnc_load.sqf +++ b/addons/reloadlaunchers/functions/fnc_load.sqf @@ -34,15 +34,15 @@ _onSuccess = { (_this select 0 select 0) removeMagazine (_this select 0 select 3); ["reloadLauncher", _this select 0 select 1, _this select 0] call DEFUNC(common,targetEvent); - [localize STRING(LauncherLoaded)] call DEFUNC(common,displayTextStructured); + [localize LSTRING(LauncherLoaded)] call DEFUNC(common,displayTextStructured); }; _onFailure = { - [localize ESTRING(common,ActionAborted)] call DEFUNC(common,displayTextStructured); + [localize LESTRING(common,ActionAborted)] call DEFUNC(common,displayTextStructured); }; _condition = { (_this select 0) call DFUNC(canLoad) && {(_this select 0 select 0) distance (_this select 0 select 1) < 4} }; -[_reloadTime, [_unit, _target, _weapon, _magazine], _onSuccess, _onFailure, localize STRING(LoadingLauncher), _condition] call EFUNC(common,progressBar); +[_reloadTime, [_unit, _target, _weapon, _magazine], _onSuccess, _onFailure, localize LSTRING(LoadingLauncher), _condition] call EFUNC(common,progressBar); diff --git a/addons/respawn/functions/fnc_moveRallypoint.sqf b/addons/respawn/functions/fnc_moveRallypoint.sqf index ef84c93dc8..5a0472cf5b 100644 --- a/addons/respawn/functions/fnc_moveRallypoint.sqf +++ b/addons/respawn/functions/fnc_moveRallypoint.sqf @@ -38,7 +38,7 @@ if (count _position == 0) then {_position = getPosATL _unit}; _position set [2, 0]; -[localize STRING(Deploy)] call EFUNC(common,displayTextStructured); +[localize LSTRING(Deploy)] call EFUNC(common,displayTextStructured); [{ _rallypoint = _this select 0; @@ -53,6 +53,6 @@ _position set [2, 0]; ["rallypointMoved", [_rallypoint, _side, _position]] call EFUNC(common,globalEvent); - [localize STRING(Deployed)] call EFUNC(common,displayTextStructured); + [localize LSTRING(Deployed)] call EFUNC(common,displayTextStructured); }, [_rallypoint, _unit, _position, _rallypoint], 5, 1] call EFUNC(common,waitAndExecute); diff --git a/addons/respawn/functions/fnc_teleportToRallypoint.sqf b/addons/respawn/functions/fnc_teleportToRallypoint.sqf index 11bdad618f..59a9766114 100644 --- a/addons/respawn/functions/fnc_teleportToRallypoint.sqf +++ b/addons/respawn/functions/fnc_teleportToRallypoint.sqf @@ -31,4 +31,4 @@ _rallypoint = missionNamespace getVariable [_rallypoint, objNull], if (isNull _rallypoint) exitWith {}; _unit setPosASL getPosASL _rallypoint; -[[localize STRING(TeleportedToRallypoint), localize STRING(TeleportedToBase)] select _toBase] call EFUNC(common,displayTextStructured); +[[localize LSTRING(TeleportedToRallypoint), localize LSTRING(TeleportedToBase)] select _toBase] call EFUNC(common,displayTextStructured); diff --git a/addons/safemode/XEH_postInit.sqf b/addons/safemode/XEH_postInit.sqf index 9f19fe61c9..7ab283f6b6 100644 --- a/addons/safemode/XEH_postInit.sqf +++ b/addons/safemode/XEH_postInit.sqf @@ -9,7 +9,7 @@ if (!hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapons", QGVAR(safeMode), localize STRING(SafeMode), +["ACE3 Weapons", QGVAR(safeMode), localize LSTRING(SafeMode), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/safemode/functions/fnc_lockSafety.sqf b/addons/safemode/functions/fnc_lockSafety.sqf index b723e25dbd..42a8ef89fb 100644 --- a/addons/safemode/functions/fnc_lockSafety.sqf +++ b/addons/safemode/functions/fnc_lockSafety.sqf @@ -47,7 +47,7 @@ if (_unit getVariable [QGVAR(actionID), -1] == -1) then { [_this select 1, currentWeapon (_this select 1), currentMuzzle (_this select 1)] call FUNC(unlockSafety); }; - //_id = [_unit, format ["%1", localize STRING(TakeOffSafety)], "DefaultAction", _condition, {}, {true}, _statement, 10] call EFUNC(common,addActionMenuEventHandler); + //_id = [_unit, format ["%1", localize LSTRING(TakeOffSafety)], "DefaultAction", _condition, {}, {true}, _statement, 10] call EFUNC(common,addActionMenuEventHandler); _id = [_unit, "DefaultAction", _condition, {}] call EFUNC(common,addActionEventHandler); _unit setVariable [QGVAR(actionID), _id]; @@ -62,4 +62,4 @@ if ((typeName _muzzle) == (typeName "")) then { private "_picture"; _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); -[localize STRING(PutOnSafety), _picture] call EFUNC(common,displayTextPicture); +[localize LSTRING(PutOnSafety), _picture] call EFUNC(common,displayTextPicture); diff --git a/addons/safemode/functions/fnc_unlockSafety.sqf b/addons/safemode/functions/fnc_unlockSafety.sqf index 742fd878d8..2b4f00a4a9 100644 --- a/addons/safemode/functions/fnc_unlockSafety.sqf +++ b/addons/safemode/functions/fnc_unlockSafety.sqf @@ -59,4 +59,4 @@ if (inputAction "nextWeapon" > 0) then { private "_picture"; _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); -[localize STRING(TookOffSafety), _picture] call EFUNC(common,displayTextPicture); +[localize LSTRING(TookOffSafety), _picture] call EFUNC(common,displayTextPicture); diff --git a/addons/scopes/XEH_postInit.sqf b/addons/scopes/XEH_postInit.sqf index 18572327ea..e96ac43960 100644 --- a/addons/scopes/XEH_postInit.sqf +++ b/addons/scopes/XEH_postInit.sqf @@ -33,7 +33,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Scope Adjustment", QGVAR(AdjustUpMinor), localize STRING(AdjustUpMinor), +["ACE3 Scope Adjustment", QGVAR(AdjustUpMinor), localize LSTRING(AdjustUpMinor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -46,7 +46,7 @@ if !(hasInterface) exitWith {}; {false}, [201, [false, false, false]], true] call cba_fnc_addKeybind; -["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize STRING(AdjustDownMinor), +["ACE3 Scope Adjustment", QGVAR(AdjustDownMinor), localize LSTRING(AdjustDownMinor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -59,7 +59,7 @@ if !(hasInterface) exitWith {}; {false}, [209, [false, false, false]], true] call cba_fnc_addKeybind; -["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize STRING(AdjustLeftMinor), +["ACE3 Scope Adjustment", QGVAR(AdjustLeftMinor), localize LSTRING(AdjustLeftMinor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -72,7 +72,7 @@ if !(hasInterface) exitWith {}; {false}, [209, [false, true, false]], true] call cba_fnc_addKeybind; -["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize STRING(AdjustRightMinor), +["ACE3 Scope Adjustment", QGVAR(AdjustRightMinor), localize LSTRING(AdjustRightMinor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -85,7 +85,7 @@ if !(hasInterface) exitWith {}; {false}, [201, [false, true, false]], true] call cba_fnc_addKeybind; -["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize STRING(AdjustUpMajor), +["ACE3 Scope Adjustment", QGVAR(AdjustUpMajor), localize LSTRING(AdjustUpMajor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -98,7 +98,7 @@ if !(hasInterface) exitWith {}; {false}, [201, [true, false, false]], true] call cba_fnc_addKeybind; -["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize STRING(AdjustDownMajor), +["ACE3 Scope Adjustment", QGVAR(AdjustDownMajor), localize LSTRING(AdjustDownMajor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -111,7 +111,7 @@ if !(hasInterface) exitWith {}; {false}, [209, [true, false, false]], true] call cba_fnc_addKeybind; -["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize STRING(AdjustLeftMajor), +["ACE3 Scope Adjustment", QGVAR(AdjustLeftMajor), localize LSTRING(AdjustLeftMajor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -124,7 +124,7 @@ if !(hasInterface) exitWith {}; {false}, [209, [true, true, false]], true] call cba_fnc_addKeybind; -["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize STRING(AdjustRightMajor), +["ACE3 Scope Adjustment", QGVAR(AdjustRightMajor), localize LSTRING(AdjustRightMajor), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/switchunits/functions/fnc_switchUnit.sqf b/addons/switchunits/functions/fnc_switchUnit.sqf index 905efa72ea..1fbe8b9b28 100644 --- a/addons/switchunits/functions/fnc_switchUnit.sqf +++ b/addons/switchunits/functions/fnc_switchUnit.sqf @@ -41,7 +41,7 @@ if (GVAR(EnableSafeZone)) then { // exitWith doesn't exit past the "if(EnableSafeZone)" block if (_leave) exitWith { - [localize STRING(TooCloseToEnemy)] call EFUNC(common,displayTextStructured); + [localize LSTRING(TooCloseToEnemy)] call EFUNC(common,displayTextStructured); }; // should switch locality @@ -88,7 +88,7 @@ DFUNC(pfhSwitchUnit) = { [[_oldUnit, _oldOwner], QUOTE({(_this select 0) setOwner (_this select 1)}), 1] call EFUNC(common,execRemoteFnc); }; - [localize STRING(SwitchedUnit)] call EFUNC(common,displayTextStructured); + [localize LSTRING(SwitchedUnit)] call EFUNC(common,displayTextStructured); [(_this select 1)] call cba_fnc_removePerFrameHandler; diff --git a/addons/vector/initKeybinds.sqf b/addons/vector/initKeybinds.sqf index 84459f551a..babef0819c 100644 --- a/addons/vector/initKeybinds.sqf +++ b/addons/vector/initKeybinds.sqf @@ -1,6 +1,6 @@ // by commy2 -["ACE3 Equipment", QGVAR(AzimuthKey), localize STRING(AzimuthKey), +["ACE3 Equipment", QGVAR(AzimuthKey), localize LSTRING(AzimuthKey), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -29,7 +29,7 @@ [15, [false, false, false]], false, 0] call CBA_fnc_addKeybind; //Tab Key -["ACE3 Equipment", QGVAR(DistanceKey), localize STRING(DistanceKey), +["ACE3 Equipment", QGVAR(DistanceKey), localize LSTRING(DistanceKey), { // Conditions: canInteract if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/vehiclelock/functions/fnc_lockpick.sqf b/addons/vehiclelock/functions/fnc_lockpick.sqf index 608ad8eeb6..613a7b35dc 100644 --- a/addons/vehiclelock/functions/fnc_lockpick.sqf +++ b/addons/vehiclelock/functions/fnc_lockpick.sqf @@ -54,7 +54,7 @@ case (_funcType == "canLockpick"): { _returnValue = true; }; case (_funcType == "startLockpick"): { - [_vehLockpickStrenth, [_unit, _veh, "finishLockpick"], {(_this select 0) call FUNC(lockpick)}, {}, (localize STRING(Action_LockpickInUse)), _condition] call EFUNC(common,progressBar); + [_vehLockpickStrenth, [_unit, _veh, "finishLockpick"], {(_this select 0) call FUNC(lockpick)}, {}, (localize LSTRING(Action_LockpickInUse)), _condition] call EFUNC(common,progressBar); _returnValue = true; }; case (_funcType == "finishLockpick"): { diff --git a/addons/vehicles/XEH_postInit.sqf b/addons/vehicles/XEH_postInit.sqf index e47f00541d..253f5eab39 100644 --- a/addons/vehicles/XEH_postInit.sqf +++ b/addons/vehicles/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Vehicles", QGVAR(speedLimiter), localize STRING(SpeedLimiter), +["ACE3 Vehicles", QGVAR(speedLimiter), localize LSTRING(SpeedLimiter), { // Conditions: canInteract if !([ACE_player, objNull, ["isnotinside"]] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/vehicles/functions/fnc_speedLimiter.sqf b/addons/vehicles/functions/fnc_speedLimiter.sqf index 0b77e3f622..7ddb07433a 100644 --- a/addons/vehicles/functions/fnc_speedLimiter.sqf +++ b/addons/vehicles/functions/fnc_speedLimiter.sqf @@ -7,12 +7,12 @@ _driver = _this select 0; _vehicle = _this select 1; if (GETGVAR(isSpeedLimiter,false)) exitWith { - [localize STRING(Off)] call EFUNC(common,displayTextStructured); + [localize LSTRING(Off)] call EFUNC(common,displayTextStructured); playSound "ACE_Sound_Click"; GVAR(isSpeedLimiter) = false; }; -[localize STRING(On)] call EFUNC(common,displayTextStructured); +[localize LSTRING(On)] call EFUNC(common,displayTextStructured); playSound "ACE_Sound_Click"; GVAR(isSpeedLimiter) = true; diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf index d8676ef60f..08fa7c97fc 100644 --- a/addons/weaponselect/XEH_postInit.sqf +++ b/addons/weaponselect/XEH_postInit.sqf @@ -4,7 +4,7 @@ if !(hasInterface) exitWith {}; // Add keybinds -["ACE3 Weapons", QGVAR(SelectPistolNew), localize STRING(SelectPistol), +["ACE3 Weapons", QGVAR(SelectPistolNew), localize LSTRING(SelectPistol), { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -18,7 +18,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 1 Key) -["ACE3 Weapons", QGVAR(SelectRifleNew), localize STRING(SelectRifle), +["ACE3 Weapons", QGVAR(SelectRifleNew), localize LSTRING(SelectRifle), { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -32,7 +32,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 2 Key) -["ACE3 Weapons", QGVAR(SelectRifleMuzzleNew), localize STRING(SelectRifleMuzzle), +["ACE3 Weapons", QGVAR(SelectRifleMuzzleNew), localize LSTRING(SelectRifleMuzzle), { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -46,7 +46,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 3 Key) -["ACE3 Weapons", QGVAR(SelectLauncherNew), localize STRING(SelectLauncher), +["ACE3 Weapons", QGVAR(SelectLauncherNew), localize LSTRING(SelectLauncher), { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -60,7 +60,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 4 Key) -["ACE3 Weapons", QGVAR(SelectBinocularNew), localize STRING(SelectBinocular), +["ACE3 Weapons", QGVAR(SelectBinocularNew), localize LSTRING(SelectBinocular), { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -74,7 +74,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 5 Key) -["ACE3 Weapons", QGVAR(SelectGrenadeFrag), localize STRING(SelectGrenadeFrag), +["ACE3 Weapons", QGVAR(SelectGrenadeFrag), localize LSTRING(SelectGrenadeFrag), { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -88,7 +88,7 @@ if !(hasInterface) exitWith {}; {false}, [7, [false, false, false]], false] call cba_fnc_addKeybind; //6 Key -["ACE3 Weapons", QGVAR(SelectGrenadeOther), localize STRING(SelectGrenadeOther), +["ACE3 Weapons", QGVAR(SelectGrenadeOther), localize LSTRING(SelectGrenadeOther), { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -102,7 +102,7 @@ if !(hasInterface) exitWith {}; {false}, [8, [false, false, false]], false] call cba_fnc_addKeybind; //7 Key -["ACE3 Weapons", QGVAR(HolsterWeapon), localize STRING(HolsterWeapon), +["ACE3 Weapons", QGVAR(HolsterWeapon), localize LSTRING(HolsterWeapon), { // Conditions: canInteract if !([ACE_player, ACE_player, ["isNotEscorting"]] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -116,7 +116,7 @@ if !(hasInterface) exitWith {}; {false}, [11, [false, false, false]], false] call cba_fnc_addKeybind; //0 Key -["ACE3 Vehicles", QGVAR(EngineOn), localize STRING(EngineOn), +["ACE3 Vehicles", QGVAR(EngineOn), localize LSTRING(EngineOn), { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -130,7 +130,7 @@ if !(hasInterface) exitWith {}; {false}, [3, [false, false, false]], false] call cba_fnc_addKeybind; //2 Key -["ACE3 Vehicles", QGVAR(EngineOff), localize STRING(EngineOff), +["ACE3 Vehicles", QGVAR(EngineOff), localize LSTRING(EngineOff), { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -144,7 +144,7 @@ if !(hasInterface) exitWith {}; {false}, [2, [false, false, false]], false] call cba_fnc_addKeybind; //1 Key -["ACE3 Vehicles", QGVAR(SelectMainGunNew), localize STRING(SelectMainGun), +["ACE3 Vehicles", QGVAR(SelectMainGunNew), localize LSTRING(SelectMainGun), { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -158,7 +158,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 3 Key) -["ACE3 Vehicles", QGVAR(SelectMachineGunNew), localize STRING(SelectMachineGun), +["ACE3 Vehicles", QGVAR(SelectMachineGunNew), localize LSTRING(SelectMachineGun), { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -172,7 +172,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 4 Key) -["ACE3 Vehicles", QGVAR(SelectMissilesNew), localize STRING(SelectMissiles), +["ACE3 Vehicles", QGVAR(SelectMissilesNew), localize LSTRING(SelectMissiles), { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; @@ -186,7 +186,7 @@ if !(hasInterface) exitWith {}; {false}, [0, [false, false, false]], false] call cba_fnc_addKeybind; //Unbound (was 5 Key) -["ACE3 Vehicles", QGVAR(FireSmokeLauncher), localize STRING(FireSmokeLauncher), +["ACE3 Vehicles", QGVAR(FireSmokeLauncher), localize LSTRING(FireSmokeLauncher), { // Conditions: canInteract if !([ACE_player, (vehicle ACE_player), []] call EFUNC(common,canInteractWith)) exitWith {false}; diff --git a/addons/weaponselect/functions/fnc_selectGrenadeAll.sqf b/addons/weaponselect/functions/fnc_selectGrenadeAll.sqf index d07768729d..69ea5cdf99 100644 --- a/addons/weaponselect/functions/fnc_selectGrenadeAll.sqf +++ b/addons/weaponselect/functions/fnc_selectGrenadeAll.sqf @@ -37,7 +37,7 @@ if (_nextMuzzle != "") then { GVAR(CurrentGrenadeMuzzleFrag) = ""; GVAR(CurrentGrenadeMuzzleOther) = ""; if (GVAR(DisplayText)) then { - _text = [localize STRING(NoGrenadesLeft), [1,0,0]] call EFUNC(common,stringToColoredText); + _text = [localize LSTRING(NoGrenadesLeft), [1,0,0]] call EFUNC(common,stringToColoredText); [composeText [lineBreak, _text]] call EFUNC(common,displayTextStructured); }; }; diff --git a/addons/weaponselect/functions/fnc_selectGrenadeFrag.sqf b/addons/weaponselect/functions/fnc_selectGrenadeFrag.sqf index 3ffae72300..91d0023e47 100644 --- a/addons/weaponselect/functions/fnc_selectGrenadeFrag.sqf +++ b/addons/weaponselect/functions/fnc_selectGrenadeFrag.sqf @@ -36,7 +36,7 @@ if (_nextMuzzle != "") then { // There is a no muzzle with magazines --> select nothing GVAR(CurrentGrenadeMuzzleFrag) = ""; if (GVAR(DisplayText)) then { - _text = [localize STRING(NoFragsLeft), [1,0,0]] call EFUNC(common,stringToColoredText); + _text = [localize LSTRING(NoFragsLeft), [1,0,0]] call EFUNC(common,stringToColoredText); [composeText [lineBreak, _text]] call EFUNC(common,displayTextStructured); }; }; diff --git a/addons/weaponselect/functions/fnc_selectGrenadeOther.sqf b/addons/weaponselect/functions/fnc_selectGrenadeOther.sqf index 0fe6b1c204..28cc0e74d8 100644 --- a/addons/weaponselect/functions/fnc_selectGrenadeOther.sqf +++ b/addons/weaponselect/functions/fnc_selectGrenadeOther.sqf @@ -36,7 +36,7 @@ if (_nextMuzzle != "") then { // There is a no muzzle with magazines --> select nothing GVAR(CurrentGrenadeMuzzleOther) = ""; if (GVAR(DisplayText)) then { - _text = [localize STRING(NoMiscGrenadeLeft), [1,0,0]] call EFUNC(common,stringToColoredText); + _text = [localize LSTRING(NoMiscGrenadeLeft), [1,0,0]] call EFUNC(common,stringToColoredText); [composeText [lineBreak, _text]] call EFUNC(common,displayTextStructured); }; }; diff --git a/addons/weather/XEH_postInit.sqf b/addons/weather/XEH_postInit.sqf index 2b862ef1a5..fb6814dd1f 100644 --- a/addons/weather/XEH_postInit.sqf +++ b/addons/weather/XEH_postInit.sqf @@ -25,7 +25,7 @@ GVAR(rain_period_start_time) = ACE_time; }; }; -["ACE3 Common", QGVAR(WindInfoKey), localize STRING(WindInfoKey), +["ACE3 Common", QGVAR(WindInfoKey), localize LSTRING(WindInfoKey), { // Conditions: canInteract if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false};