General - Use common's cancel stringtable entry (#10674)

Use common's cancel stringtable entry
acemod · Jan 20, 2025 · 6f49625 · 6f49625
1 parent d5f356e
commit 6f49625
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 105 deletions.
diff --git a/addons/attach/functions/fnc_attach.sqf b/addons/attach/functions/fnc_attach.sqf
@@ -56,7 +56,7 @@ if (_unit == _attachToVehicle) then {  //Self Attachment
     [{[localize LSTRING(PlaceAction), ""] call EFUNC(interaction,showMouseHint)}, []] call CBA_fnc_execNextFrame;
     _unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = PLACE_APPROVE;}] call EFUNC(common,AddActionEventHandler)];
 
-    private _actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", localize LSTRING(CancelAction)], {GVAR(placeAction) = PLACE_CANCEL}];
+    private _actionID = _unit addAction [format ["<t color='#FF0000'>%1</t>", LELSTRING(common,Cancel)], {GVAR(placeAction) = PLACE_CANCEL}];
 
     //Display to show virtual object:
     private _model = getText (configFile >> "CfgAmmo" >> _itemVehClass >> "model");

diff --git a/addons/attach/stringtable.xml b/addons/attach/stringtable.xml
@@ -35,23 +35,6 @@
             <Turkish>Eşyayı bağla</Turkish>
             <Hungarian>Tárgy hozzácsatolása</Hungarian>
         </Key>
-        <Key ID="STR_ACE_Attach_CancelAction">
-            <English>Cancel</English>
-            <Czech>Zrušit</Czech>
-            <French>Annuler</French>
-            <Spanish>Cancelar</Spanish>
-            <Italian>Annulla</Italian>
-            <Polish>Anuluj</Polish>
-            <Portuguese>Cancelar</Portuguese>
-            <Russian>Отмена</Russian>
-            <German>Abbrechen</German>
-            <Korean>취소</Korean>
-            <Japanese>やめる</Japanese>
-            <Chinese>取消</Chinese>
-            <Chinesesimp>取消</Chinesesimp>
-            <Turkish>Iptal</Turkish>
-            <Hungarian>Mégse</Hungarian>
-        </Key>
         <Key ID="STR_ACE_Attach_Chemlight_Attached">
             <English>Chemlight Attached</English>
             <Czech>Chemické světlo připnuto</Czech>

diff --git a/addons/explosives/functions/fnc_setupExplosive.sqf b/addons/explosives/functions/fnc_setupExplosive.sqf
@@ -33,7 +33,7 @@ if (_p3dModel == "") exitWith {ERROR("No Model");}; //"" - will crash game!
 [_unit, "blockThrow", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
 
 //Show mouse buttons:
-[localize LSTRING(PlaceAction), localize LSTRING(CancelAction), localize LSTRING(ScrollAction)] call EFUNC(interaction,showMouseHint);
+[localize LSTRING(PlaceAction), LELSTRING(common,Cancel), localize LSTRING(ScrollAction)] call EFUNC(interaction,showMouseHint);
 _unit setVariable [QGVAR(placeActionEH), [_unit, "DefaultAction", {true}, {GVAR(placeAction) = PLACE_APPROVE;}] call EFUNC(common,AddActionEventHandler)];
 _unit setVariable [QGVAR(cancelActionEH), [_unit, "zoomtemp", {true}, {GVAR(placeAction) = PLACE_CANCEL;}] call EFUNC(common,AddActionEventHandler)];
 

diff --git a/addons/explosives/stringtable.xml b/addons/explosives/stringtable.xml
@@ -45,40 +45,6 @@
             <Chinesesimp>断开</Chinesesimp>
             <Turkish>Bloke Edilmiş</Turkish>
         </Key>
-        <Key ID="STR_ACE_Explosives_Cancel">
-            <English>Cancel</English>
-            <Czech>Zrušit</Czech>
-            <French>Annuler</French>
-            <Spanish>Cancelar</Spanish>
-            <Italian>Annulla</Italian>
-            <Polish>Anuluj</Polish>
-            <Portuguese>Cancelar</Portuguese>
-            <Russian>Отмена</Russian>
-            <German>Abbrechen</German>
-            <Korean>취소</Korean>
-            <Japanese>中止</Japanese>
-            <Chinese>取消</Chinese>
-            <Chinesesimp>取消</Chinesesimp>
-            <Turkish>Iptal</Turkish>
-            <Hungarian>Mégsem</Hungarian>
-        </Key>
-        <Key ID="STR_ACE_Explosives_CancelAction">
-            <English>Cancel</English>
-            <Czech>Zrušit</Czech>
-            <French>Annuler</French>
-            <Spanish>Cancelar</Spanish>
-            <Italian>Annulla</Italian>
-            <Polish>Anuluj</Polish>
-            <Portuguese>Cancelar</Portuguese>
-            <Russian>Отмена</Russian>
-            <German>Abbrechen</German>
-            <Korean>취소</Korean>
-            <Japanese>中止</Japanese>
-            <Chinese>取消</Chinese>
-            <Chinesesimp>取消</Chinesesimp>
-            <Turkish>Iptal</Turkish>
-            <Hungarian>Mégsem</Hungarian>
-        </Key>
         <Key ID="STR_ACE_Explosives_Clear">
             <English>Clear</English>
             <Czech>Čistý</Czech>

diff --git a/addons/interaction/groupRename_GUI.hpp b/addons/interaction/groupRename_GUI.hpp
@@ -60,7 +60,7 @@ class GVAR(groupNameDisplay) {
             w = QUOTE(FONT_W * 6);
             h = QUOTE(ELEMENT_HEIGHT - FONT_W);
             sizeEx = QUOTE(FONT_H);
-            text = CSTRING(CancelSelection);
+            text = ECSTRING(common,Cancel);
         };
     };
 };
diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml
@@ -137,23 +137,6 @@
             <Turkish>Lider ol</Turkish>
             <Hungarian>Vezetés átvétele</Hungarian>
         </Key>
-        <Key ID="STR_ACE_Interaction_CancelSelection">
-            <English>Cancel</English>
-            <Czech>Zrušit</Czech>
-            <French>Annuler</French>
-            <Spanish>Cancelar</Spanish>
-            <Italian>Annulla</Italian>
-            <Polish>Anuluj</Polish>
-            <Portuguese>Cancelar</Portuguese>
-            <Russian>Отменить</Russian>
-            <German>Abbrechen</German>
-            <Korean>취소</Korean>
-            <Japanese>中止</Japanese>
-            <Chinese>取消</Chinese>
-            <Chinesesimp>取消</Chinesesimp>
-            <Turkish>Iptal</Turkish>
-            <Hungarian>Mégse</Hungarian>
-        </Key>
         <Key ID="STR_ACE_Interaction_Dance">
             <English>DANCE!</English>
             <Czech>TANCUJ!</Czech>

diff --git a/addons/marker_flags/functions/fnc_placeFlag.sqf b/addons/marker_flags/functions/fnc_placeFlag.sqf
@@ -32,7 +32,7 @@ GVAR(objectHeight) = MAX_HEIGHT;
 GVAR(isPlacing) = PLACE_WAITING;
 
 // Add info dialog for the player which show the controls
-[LLSTRING(ActionPlace), LLSTRING(ActionCancel), LLSTRING(ActionAdjustHeight)] call EFUNC(interaction,showMouseHint);
+[LLSTRING(ActionPlace), LELSTRING(common,Cancel), LLSTRING(ActionAdjustHeight)] call EFUNC(interaction,showMouseHint);
 
 private _mouseClickID = [_player, "DefaultAction", {
     GVAR(isPlacing) isEqualTo PLACE_WAITING

diff --git a/addons/marker_flags/stringtable.xml b/addons/marker_flags/stringtable.xml
@@ -14,23 +14,6 @@
             <Japanese>高さを調整する</Japanese>
             <Chinesesimp>调整高度</Chinesesimp>
         </Key>
-        <Key ID="STR_ACE_Marker_Flags_ActionCancel">
-            <English>Cancel</English>
-            <Czech>Zrušit</Czech>
-            <French>Annuler</French>
-            <Spanish>Cancelar</Spanish>
-            <Italian>Annulla</Italian>
-            <Polish>Anuluj</Polish>
-            <Portuguese>Cancelar</Portuguese>
-            <Russian>Отмена</Russian>
-            <German>Abbrechen</German>
-            <Korean>취소</Korean>
-            <Japanese>中止</Japanese>
-            <Chinese>取消</Chinese>
-            <Chinesesimp>取消</Chinesesimp>
-            <Turkish>Iptal</Turkish>
-            <Hungarian>Mégsem</Hungarian>
-        </Key>
         <Key ID="STR_ACE_Marker_Flags_ActionPickUp">
             <English>Pick Up</English>
             <Czech>Vyzvednutí</Czech>

diff --git a/addons/refuel/stringtable.xml b/addons/refuel/stringtable.xml
@@ -1,22 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Refuel">
-        <Key ID="STR_ACE_Refuel_Cancel">
-            <English>Cancel</English>
-            <Czech>Zrušit</Czech>
-            <French>Annuler</French>
-            <Spanish>Cancelar</Spanish>
-            <Italian>Cancella</Italian>
-            <Polish>Anuluj</Polish>
-            <Portuguese>Cancelar</Portuguese>
-            <Russian>Отменить</Russian>
-            <German>Abbrechen</German>
-            <Korean>취소</Korean>
-            <Japanese>中止</Japanese>
-            <Chinese>取消</Chinese>
-            <Chinesesimp>取消</Chinesesimp>
-            <Turkish>Iptal</Turkish>
-        </Key>
         <Key ID="STR_ACE_Refuel_CheckFuel">
             <English>Check remaining fuel</English>
             <Czech>Zkontrolovat zůstatek paliva</Czech>