Merge pull request acemod#1 from Elgin675/satchel_jetables

Add compatibility with "realistic names" modules, and add french translation
Elgin675 · Aug 23, 2020 · 777c858 · 777c858
2 parents 7f1f119 + 2b3a7f1
commit 777c858
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml
@@ -510,24 +510,31 @@
         </Key>
         <Key ID="STR_ACE_Grenades_SatchelCharge_Remote_Mag_Throwable">
             <English>Explosive Satchel (Throwable)</English>
+            <French>Charge en sacoche (lançable)</French>
         </Key>
         <Key ID="STR_ACE_Grenades_SatchelCharge_Description">
             <English>Type: Charge&lt;br /&gt;Rounds: 1&lt;br /&gt;Used on: Things that need to die</English>
+            <French>Type : Charge&lt;br /&gt;Munitions : 1&lt;br /&gt;Application : main</French>
         </Key>
         <Key ID="STR_ACE_Grenades_SatchelCharge_LibText">
             <English>An explosive satchel that is throwable. 7 second fixed fuse</English>
+            <French>Charge explosive lançable. Détonation après 7 secondes.</French>
         </Key>
         <Key ID="STR_ACE_Grenades_DemoCharge_Remote_Mag_Throwable">
             <English>Explosive Charge (Throwable)</English>
+            <French>Charge explosive (lançable)</French>
         </Key>
         <Key ID="STR_ACE_Grenades_DemoCharge_LibText">
             <English>An explosive charge that is throwable. 7 second fixed fuse</English>
+            <French>Bloc explosif lançable. Détonation après 7 secondes.</French>
         </Key>
         <Key ID="STR_ACE_Grenades_Convert_Fuse">
             <English>Convert to short fuse</English>
+            <French>Mèche lente (7 secondes)</French>
         </Key>
         <Key ID="STR_ACE_Grenades_Remove_Fuse">
             <English>Remove short fuse</English>
+            <French>Retirer la mèche lente</French>
         </Key>
     </Package>
 </Project>
diff --git a/addons/realisticnames/CfgMagazines.hpp b/addons/realisticnames/CfgMagazines.hpp
@@ -390,6 +390,12 @@ class CfgMagazines {
     class DemoCharge_Remote_Mag: SatchelCharge_Remote_Mag {
         displayName = CSTRING(DemoCharge_Name);
     };
+    class ACE_SatchelCharge_Remote_Mag_Throwable: SatchelCharge_Remote_Mag {
+        displayName = CSTRING(SatchelChargeThrowable_Name);
+    };
+    class ACE_DemoCharge_Remote_Mag_Throwable: ACE_SatchelCharge_Remote_Mag_Throwable {
+        displayName = CSTRING(DemoChargeThrowable_Name);
+    };
 
     // hand grenades
     class HandGrenade: CA_Magazine {
@@ -474,7 +480,7 @@ class CfgMagazines {
     };
     class PylonRack_7Rnd_Rocket_04_HE_F: 7Rnd_Rocket_04_HE_F {
         displayName = "Hydra 70 7x HE"; // [vanilla: Shrieker 7x HE - Rocket_04_HE_Plane_CAS_01_F]
-    }; 
+    };
     class PylonRack_7Rnd_Rocket_04_AP_F: 7Rnd_Rocket_04_AP_F {
         displayName = "Hydra 70 7x AP"; // [vanilla: Shrieker 7x AP - Rocket_04_AP_Plane_CAS_01_F]
     };

diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
@@ -1312,7 +1312,7 @@
             <Spanish>Conjunto de carga de demolición M183</Spanish>
             <Polish>Ładunek burzący M183</Polish>
             <Czech>Demoliční nálož M183</Czech>
-            <French>M183 Charge de Démolition</French>
+            <French>M183 Charge de démolition</French>
             <Russian>M183 Комплектный подрывной заряд</Russian>
             <Portuguese>M183 Sacola de Demolição</Portuguese>
             <Hungarian>M183 romboló töltet</Hungarian>
@@ -1323,13 +1323,17 @@
             <Chinesesimp>M183炸药包</Chinesesimp>
             <Turkish>M183 Demolition Charge Assembly</Turkish>
         </Key>
+        <Key ID="STR_ACE_RealisticNames_SatchelChargeThrowable_Name">
+            <English>M183 Demolition Charge (Throwable)</English>
+            <French>M183 Charge de démolition (lançable)</French>
+        </Key>
         <Key ID="STR_ACE_RealisticNames_DemoCharge_Name">
             <English>M112 Demolition Block</English>
             <German>M112 Sprengladung</German>
             <Spanish>Bloque de demolición M112</Spanish>
             <Polish>Ładunek burzący M112</Polish>
             <Czech>Výbušná nálož M112</Czech>
-            <French>M112 Block de Démolition</French>
+            <French>M112 Bloc de démolition</French>
             <Russian>M112 подрывной заряд</Russian>
             <Portuguese>M112 Carga de Demolição</Portuguese>
             <Hungarian>M112 romboló tömb</Hungarian>
@@ -1340,6 +1344,10 @@
             <Chinesesimp>M112塑性炸药</Chinesesimp>
             <Turkish>M112 Demolition Block</Turkish>
         </Key>
+        <Key ID="STR_ACE_RealisticNames_DemoChargeThrowable_Name">
+            <English>M112 Demolition Charge (Throwable)</English>
+            <French>M112 Bloc de démolition (lançable)</French>
+        </Key>
         <Key ID="STR_ACE_RealisticNames_HandGrenade_Name">
             <English>M67 Fragmentation Grenade</English>
             <German>M67 Splittergranate</German>