Merge branch 'master' into release-3.19.0

acemod · Jan 28, 2025 · d48ba46 · d48ba46
2 parents 14b9617 + d2e0494
commit d48ba46
Show file tree

Hide file tree

Showing 107 changed files with 1,135 additions and 207 deletions.
diff --git a/addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf b/addons/advanced_throwing/functions/fnc_renderPickUpInteraction.sqf
@@ -58,7 +58,7 @@
         } forEach _addedPickUpHelpers;
     } else {
         TRACE_1("Cleaning Pick Up Helpers",count _addedPickUpHelpers);
-        {deleteVehicle _x} forEach _addedPickUpHelpers;
+        deleteVehicle _addedPickUpHelpers;
         [_idPFH] call CBA_fnc_removePerFrameHandler;
     };
 }, 0, [(getPosASL ACE_player) vectorAdd [-100, 0, 0], [], [], []]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/arsenal/stringtable.xml b/addons/arsenal/stringtable.xml
@@ -1097,6 +1097,9 @@
             <English>Missing items:\n%1</English>
             <Korean>누락 아이템:\n%1</Korean>
             <Japanese>存在しないアイテム:\n%1</Japanese>
+            <Chinesesimp>缺失物品:\n%1</Chinesesimp>
+            <French>Éléments manquants:\n%1</French>
+            <Russian>Недостающие предметы:\n%1</Russian>
         </Key>
         <Key ID="STR_ACE_Arsenal_modIconsSetting">
             <English>Enable mod icons</English>
@@ -1776,16 +1779,25 @@
             <English>Unavailable items:\n%1</English>
             <Korean>사용 불가 아이템:\n%1</Korean>
             <Japanese>利用できないアイテム:\n%1</Japanese>
+            <Chinesesimp>不可用物品:\n%1</Chinesesimp>
+            <French>Articles indisponibles:\n%1</French>
+            <Russian>Недоступные предметы:\n%1</Russian>
         </Key>
         <Key ID="STR_ACE_Arsenal_unavailableItemsSetting">
             <English>Show missing / unavailable items</English>
             <Korean>누락/사용 불가 아이템 표시</Korean>
             <Japanese>存在しない/利用できないアイテムを表示</Japanese>
+            <Chinesesimp>显示缺失/不可用物品</Chinesesimp>
+            <French>Afficher les éléments manquants ou indisponibles</French>
+            <Russian>Показать отсутствующие / недоступные предметы</Russian>
         </Key>
         <Key ID="STR_ACE_Arsenal_unavailableItemsTooltip">
             <English>Show missing / unavailable items when hovering over a loadout</English>
             <Korean>로드아웃 위에 마우스 커서를 올리면 누락되거나 사용할 수 없는 아이템을 표시합니다.</Korean>
             <Japanese>装備にカーソルを重ねた時に存在しない/利用できないアイテムを表示します</Japanese>
+            <Chinesesimp>鼠标悬停在负载上时显示缺失/不可用物品</Chinesesimp>
+            <French>Afficher les éléments manquants / indisponibles au survol d'un chargement</French>
+            <Russian>Показать отсутствующие / недоступные предметы при наведении курсора мыши на комплект</Russian>
         </Key>
     </Package>
 </Project>
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/common/stringtable.xml b/addons/common/stringtable.xml
@@ -404,13 +404,18 @@
             <Russian>Проверка аддонов</Russian>
             <German>Überprüfe PBOs</German>
             <Korean>PBO 검사</Korean>
-            <Japanese>PBOを検査</Japanese>
+            <Japanese>PBO(アドオン)を検査</Japanese>
             <Chinese>檢查PBO檔</Chinese>
             <Chinesesimp>检查 PBO</Chinesesimp>
             <Hungarian>PBO-k ellenőrzése</Hungarian>
         </Key>
         <Key ID="STR_ACE_Common_checkExtensions_DisplayName">
             <English>Check Extensions</English>
+            <Japanese>拡張(DLL)を検査</Japanese>
+            <Chinesesimp>检查DLL扩展文件</Chinesesimp>
+            <Korean>확장 프로그램 검사</Korean>
+            <French>Vérifier les extensions</French>
+            <Russian>Проверка расширений (библиотек DLL)</Russian>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Whitelist_Description">
             <English>What addons are allowed regardless?</English>
@@ -455,7 +460,7 @@
             <Portuguese>Ação de Checar PBO</Portuguese>
             <Russian>Действие при проверке PBO</Russian>
             <German>PBO Überprüfung</German>
-            <Korean>PBO 검사</Korean>
+            <Korean>PBO 검사 행동</Korean>
             <Japanese>PBO検査の挙動</Japanese>
             <Chinese>檢查PBO動作</Chinese>
             <Chinesesimp>检查 PBO 动作</Chinesesimp>

diff --git a/addons/compat_gm/compat_gm_hearing/CfgWeapons.hpp b/addons/compat_gm/compat_gm_hearing/CfgWeapons.hpp
@@ -100,26 +100,26 @@ class CfgWeapons {
         HEARING_PROTECTION_PELTOR;
     };
 
-    class gm_xx_headgear_headwrap_01_base;
-    class gm_xx_headgear_headwrap_crew_01_oli: gm_xx_headgear_headwrap_01_base {
+    class gm_xx_headgear_headwrap_crew_01_base;
+    class gm_xx_headgear_headwrap_crew_01_oli: gm_xx_headgear_headwrap_crew_01_base {
         HEARING_PROTECTION_PELTOR;
     };
-    class gm_xx_headgear_headwrap_crew_01_m84: gm_xx_headgear_headwrap_01_base {
+    class gm_xx_headgear_headwrap_crew_01_m84: gm_xx_headgear_headwrap_crew_01_base {
         HEARING_PROTECTION_PELTOR;
     };
-    class gm_xx_headgear_headwrap_crew_01_grn: gm_xx_headgear_headwrap_01_base {
+    class gm_xx_headgear_headwrap_crew_01_grn: gm_xx_headgear_headwrap_crew_01_base {
         HEARING_PROTECTION_PELTOR;
     };
-    class gm_xx_headgear_headwrap_crew_01_smp: gm_xx_headgear_headwrap_01_base {
+    class gm_xx_headgear_headwrap_crew_01_smp: gm_xx_headgear_headwrap_crew_01_base {
         HEARING_PROTECTION_PELTOR;
     };
-    class gm_xx_headgear_headwrap_crew_01_blk: gm_xx_headgear_headwrap_01_base {
+    class gm_xx_headgear_headwrap_crew_01_blk: gm_xx_headgear_headwrap_crew_01_base {
         HEARING_PROTECTION_PELTOR;
     };
-    class gm_xx_headgear_headwrap_crew_01_flk: gm_xx_headgear_headwrap_01_base {
+    class gm_xx_headgear_headwrap_crew_01_flk: gm_xx_headgear_headwrap_crew_01_base {
         HEARING_PROTECTION_PELTOR;
     };
-    class gm_xx_headgear_headwrap_crew_01_trp: gm_xx_headgear_headwrap_01_base {
+    class gm_xx_headgear_headwrap_crew_01_trp: gm_xx_headgear_headwrap_crew_01_base {
         HEARING_PROTECTION_PELTOR;
     };
 };
diff --git a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
@@ -141,6 +141,7 @@
             <Italian>Desert Eagle Mark XIX L5 (Mimetica)</Italian>
             <Korean>데저트 이글 마크 XIX L5 (위장)</Korean>
             <Japanese>デザートイーグル Mark XIX L5 (迷彩)</Japanese>
+            <French>Desert Eagle Mark XIX L5 (Camo)</French>
         </Key>
         <Key ID="STR_ACE_Compat_RF_RealisticNames_deagle_classic_Name">
             <English>Desert Eagle Mark XIX L5 (Classic)</English>
@@ -552,6 +553,7 @@
             <Italian>Ram 1500 (Minigun)</Italian>
             <Korean>램 1500 (미니건)</Korean>
             <Japanese>ラム 1500 (ミニガン)</Japanese>
+            <French>Ram 1500 (Minigun)</French>
         </Key>
         <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_mmg_Name">
             <English>Ram 1500 (MMG)</English>
@@ -576,6 +578,7 @@
             <Italian>Ram 1500 (RCWS)</Italian>
             <Korean>램 1500 (무인포탑)</Korean>
             <Japanese>ラム 1500 (RCWS)</Japanese>
+            <French>Ram 1500 (RCWS)</French>
         </Key>
         <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_repair_Name">
             <English>Ram 1500 (Repair)</English>
@@ -591,6 +594,7 @@
             <Italian>Ram 1500 (Razzi)</Italian>
             <Korean>램 1500 (로켓)</Korean>
             <Japanese>ラム 1500 (ロケット)</Japanese>
+            <French>Ram 1500 (Rocket)</French>
         </Key>
         <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_service_Name">
             <English>Ram 1500 (Services)</English>
@@ -709,6 +713,7 @@
             <Italian>Typhoon Carico</Italian>
             <Korean>타이푼 화물</Korean>
             <Japanese>タイフーン (貨物)</Japanese>
+            <French>Typhoon Cargo</French>
         </Key>
         <Key ID="STR_ACE_Compat_RF_RealisticNames_truck_03_water_Name">
             <English>Typhoon Water</English>