Merge branch 'master' into cba-log-macros

.gibot.yml

@@ -0,0 +1,55 @@
+stages:
+  mark_for_closing:
+     days: 30
+     labels:
+       - need more info
+       - invalid
+       - can't reproduce
+       - wontfix
+       - information required
+     exclude:
+       - marked for cleanup
+     comment:
+       - 'Hello @{author}! There has been no activity on this ticket for over a period of {days} days. I am automatically replying to let you know we will close this ticket within 1 week due to inactivity and consider this resolved.'
+       - 'If you believe this in error, please reply with the requested information.'
+       - 'Thank you. :robot:'
+     action:
+       close: false
+       comment: true
+       assign_label:
+         - marked for cleanup
+  clean_up:
+     days: 7
+     labels:
+       - marked for cleanup
+     comment:
+       - 'Hello @{author}! We have detected no activity for {days} days on this ticket. We therefore assume that the original reporter has lost interest or the issue has been resolved.'
+       - 'Since we have marked this ticket for deletion, we will be closing it.'
+       - 'If this has been closed in error, please create a comment below and we can reopen this issue. Note that you may need to provide additional information that was requested.'
+       - 'Thank you. :robot:'
+     action:
+       close: true
+       comment: true
+       assign_label:
+         - closed by bot
+       remove_label:
+         - marked for cleanup
+  remind_about_old_ticket:
+    days: 130
+    labels:
+      - bug
+      - critical bug
+    exclude:
+      - need more info
+      - invalid
+      - can't reproduce
+      - wontfix
+      - information required
+      - marked for cleanup
+      - inactive
+    comment:
+      - 'Hello @acemod/maintainers. This ticket has been open for over {days} days without any activity.'
+    action:
+      comment: true
+      assign_label:
+       - inactive

addons/advanced_ballistics/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Széladatok mutatása</Hungarian>
             <Czech>Zobrazit údaje o větru</Czech>
             <Portuguese>Mostrar Informação do Vento</Portuguese>
+            <Japanese>風の情報を表示</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_ProtractorKey">
             <English>Show Protractor</English>
@@ -24,6 +25,7 @@
             <Hungarian>Szögmérő mutatása</Hungarian>
             <Czech>Zobrazit úhloměr</Czech>
             <Portuguese>Mostrar Transferidor</Portuguese>
+            <Japanese>分度器を表示</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_DisplayName">
             <English>Advanced Ballistics</English>
@@ -36,6 +38,7 @@
             <Hungarian>Fejlett ballisztika</Hungarian>
             <Russian>Продвинутая баллистика</Russian>
             <Italian>Balistica Avanzata</Italian>
+            <Japanese>アドバンスド バリスティックス</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_enabled_DisplayName">
             <English>Advanced Ballistics</English>
@@ -48,6 +51,7 @@
             <Hungarian>Fejlett ballisztika</Hungarian>
             <Russian>Продвинутая баллистика</Russian>
             <Italian>Balistica Avanzata</Italian>
+            <Japanese>アドバンスド バリスティックス</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_enabled_Description">
             <English>Enables advanced ballistics</English>
@@ -60,6 +64,7 @@
             <Hungarian>Engedélyezi a fejlett ballisztikát</Hungarian>
             <Russian>Включает продвинутую баллистику</Russian>
             <Italian>Abilita Balistica Avanzata</Italian>
+            <Japanese>アドバンスド バリスティックスを有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulateForSnipers_DisplayName">
             <English>Enabled For Snipers</English>
@@ -72,6 +77,7 @@
             <Hungarian>Mesterlövészeknek engedélyezve</Hungarian>
             <Russian>Включена для снайперов</Russian>
             <Italian>Abilita per Tiratori Scelti</Italian>
+            <Japanese>狙撃手へ有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulateForSnipers_Description">
             <English>Enables advanced ballistics for non local snipers (when using high power optics)</English>
@@ -84,6 +90,7 @@
             <Hungarian>Engedélyezi a fejlett ballisztikát nem-helyi mesterlövészeknek (nagy-teljesítményű optika használatakor)</Hungarian>
             <Russian>Включает продвинутую баллистику для нелокальных снайперов (при использовании мощной оптики)</Russian>
             <Italian>Abilita Balistica Avanzata per Tiratori Scelti non locali (con ottiche ad alto potenziale)</Italian>
+            <Japanese>非ローカルの狙撃手 (高倍率スコープを使っている場合)へアドバンスド バリスティックスを有効化します</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulateForGroupMembers_DisplayName">
             <English>Enabled For Group Members</English>
@@ -96,6 +103,7 @@
             <Hungarian>Csoporttagoknak engedélyezve</Hungarian>
             <Russian>Включена для группы</Russian>
             <Italian>Abilita per Membri del Gruppo</Italian>
+            <Japanese>グループ メンバーへ有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulateForGroupMembers_Description">
             <English>Enables advanced ballistics for non local group members</English>
@@ -108,6 +116,7 @@
             <Hungarian>Engedélyezi a fejlett ballisztikát nem-helyi csoporttagoknak</Hungarian>
             <Russian>Включает продвинутую баллистику для нелокальных членов группы</Russian>
             <Italian>Abilita Balistica Avanzata per Membri non locali del Gruppo</Italian>
+            <Japanese>非ローカルのグループ メンバーへアドバンスド バリスティックスを有効化します</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulateForEveryone_DisplayName">
             <English>Enabled For Everyone</English>
@@ -120,6 +129,7 @@
             <Hungarian>Mindenkinek engedélyezve</Hungarian>
             <Russian>Включена для всех</Russian>
             <Italian>Abilita per tutti</Italian>
+            <Japanese>全員に有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulateForEveryone_Description">
             <English>Enables advanced ballistics for all non local players (enabling this may degrade performance during heavy firefights in multiplayer)</English>
@@ -132,6 +142,7 @@
             <Hungarian>Engedélyezi a fejlett ballisztikát az összes nem-helyi játékosnak (ez a funkció leronthatja a teljesítményt intenzív többjátékos tűzharcok alatt)</Hungarian>
             <Russian>Включает продвинутую баллистику для всех нелокальных игроков (включение этой опции может снизить производительность при массовых перестрелках в мультиплеере)</Russian>
             <Italian>Abilita Balistica Avanzata per tutti i giocatori non locali (abilitare questo parametro potrebbe degradare le prestazioni durante scontri intensi in multiplayer)</Italian>
+            <Japanese>非ローカルの全プレイヤーへアドバンスド バリスティックスを有効化します (マルチプレイで大規模な銃撃戦がおこなわれると、動作の低下を招きます)</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_alwaysSimulateForGroupMembers_DisplayName">
             <English>Always Enabled For Group Members</English>
@@ -144,6 +155,7 @@
             <Hungarian>Mindig engedélyezve csoporttagoknak</Hungarian>
             <Russian>Всегда включена для членов группы</Russian>
             <Italian>Sempre abilitato per Membri del Gruppo</Italian>
+            <Japanese>常にグループ メンバーへ有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_alwaysSimulateForGroupMembers_Description">
             <English>Always enables advanced ballistics when a group member fires</English>
@@ -156,6 +168,7 @@
             <Hungarian>Mindig engedélyezi a fejlett ballisztikát, ha egy csoporttag tüzel</Hungarian>
             <Russian>Всегда включает продвинутую баллистику когда стреляет член группы</Russian>
             <Italian>Abilita sempre Balistica Avanzata quando un Membro del Gruppo spara</Italian>
+            <Japanese>グループ メンバーが射撃した時、常にアドバンスド バリスティックスを有効化します</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_disabledInFullAutoMod_DisplayName">
             <English>Disabled In FullAuto Mode</English>
@@ -168,6 +181,7 @@
             <Hungarian>Automata módban letiltva</Hungarian>
             <Russian>Выкл. для автомат. режима</Russian>
             <Italian>Disabilita in modalità di fuoco automatico</Italian>
+            <Japanese>フルオートでは無効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_disabledInFullAutoMod_Description">
             <English>Disables the advanced ballistics during full auto fire</English>
@@ -180,6 +194,7 @@
             <Hungarian>Letiltja a fejlett ballisztikát automata tüzelés folyamán</Hungarian>
             <Russian>Выключает продвинутую баллистику при стрельбе в полностью автоматическом режиме</Russian>
             <Italian>Disabilita Balistica Avanzata durante fuoco automatico</Italian>
+            <Japanese>フルオートで射撃中ではアドバンスド バリスティックスを無効化します</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_DisplayName">
             <English>Enable Ammo Temperature Simulation</English>
@@ -192,6 +207,7 @@
             <Hungarian>Lőszer-hő szimuláció engedélyezése</Hungarian>
             <Russian>Симуляция температуры для боеприпасов</Russian>
             <Italian>Abilita simulazione della temperatura delle munizioni</Italian>
+            <Japanese>弾薬の温度シミュレーションを有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_ammoTemperatureEnabled_Description">
             <English>Muzzle velocity varies with ammo temperature</English>
@@ -204,6 +220,7 @@
             <Hungarian>A kezdősebesség a lőszer hőmérsékletétől függően változó</Hungarian>
             <Russian>Начальная скорость пули зависит от температуры</Russian>
             <Italian>Velocità alla volata varia con la temperatura delle munizioni</Italian>
+            <Japanese>弾薬の温度により初速値を変化させます</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_DisplayName">
             <English>Enable Barrel Length Simulation</English>
@@ -216,6 +233,7 @@
             <Hungarian>Csőhossz-szimuláció engedélyezése</Hungarian>
             <Russian>Симуляция длины ствола</Russian>
             <Italian>Abilita simulazione della lunghezza della canna</Italian>
+            <Japanese>銃身長のシミュレーションを有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_barrelLengthInfluenceEnabled_Description">
             <English>Muzzle velocity varies with barrel length</English>
@@ -228,6 +246,7 @@
             <Hungarian>A kezdősebesség a cső hosszától függően változó</Hungarian>
             <Russian>Начальная скорость пули зависит от длины ствола</Russian>
             <Italian>Velocità alla volata varia con la lunghezza della canna</Italian>
+            <Japanese>銃身長により初速値を変化させます</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_DisplayName">
             <English>Enable Bullet Trace Effect</English>
@@ -240,6 +259,7 @@
             <Hungarian>Nyomkövető-effekt engedélyezése</Hungarian>
             <Russian>Следы пуль</Russian>
             <Italian>Abilita effetto di tracciatura dei proiettili</Italian>
+            <Japanese>弾丸の痕跡表示を有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_bulletTraceEnabled_Description">
             <English>Enables a bullet trace effect to high caliber bullets (only visible when looking through high power optics)</English>
@@ -252,6 +272,7 @@
             <Hungarian>Engedélyezi a nagy kaliberű lövedékek nyomának vizuális követését (csak nagy teljesítményű optikán keresztül látható)</Hungarian>
             <Russian>Включает эффект следов пуль для больших калибров (видны только через мощную оптику)</Russian>
             <Italian>Abilita effetto di tracciatura per proiettili di alto calibro (visibile solo attraverso ottiche ad alto potenziale)</Italian>
+            <Japanese>大口径の銃弾による弾丸の痕跡表示を有効化します (高倍率スコープを介してでしか見れません)</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_DisplayName">
             <English>Simulation Interval</English>
@@ -264,6 +285,7 @@
             <Hungarian>Szimuláció intervalluma</Hungarian>
             <Russian>Интервал симуляции</Russian>
             <Italian>Intervallo Simulazione</Italian>
+            <Japanese>シミュレーション間隔</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulationInterval_Description">
             <English>Defines the interval between every calculation step</English>
@@ -276,6 +298,7 @@
             <Hungarian>Meghatározza a számítási lépések közötti időintervallumot</Hungarian>
             <Russian>Определяет временной интервал между вычислениями</Russian>
             <Italian>Definisce l'intervallo tra ogni step di calcolo</Italian>
+            <Japanese>各計算ごとの間隔を定義します</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulationRadius_DisplayName">
             <English>Simulation Radius</English>
@@ -288,6 +311,7 @@
             <Hungarian>Szimuláció hatóköre</Hungarian>
             <Russian>Радиус симуляции</Russian>
             <Italian>Raggio Simulazione</Italian>
+            <Japanese>シミュレーションの適用範囲</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_simulationRadius_Description">
             <English>Defines the radius around the player (in meters) at which advanced ballistics are applied to projectiles</English>
@@ -300,6 +324,7 @@
             <Hungarian>Meghatározza a játékos körüli hatókört (méterben), ahol a lövedékek fejlett ballisztikát használnak</Hungarian>
             <Russian>Определяет радиус вокруг игрока (в метрах), в котором продвинутая баллистика применяется к снарядам</Russian>
             <Italian>Definisce il raggio attorno al giocatore (in metri) per cui la Balistica Avanzata è applicata ai proiettili</Italian>
+            <Japanese>プレイヤーの周囲にアドバンスド バリスティックスによる弾道を適用させる範囲を半径で定義します (メートル)</Japanese>
         </Key>
         <Key ID="STR_ACE_Advanced_Ballistics_Description">
             <English>This module enables advanced ballistics simulation - meaning the trajectory of projectiles is influenced by variables like air temperature, atmospheric pressure, humidity, gravity, the type of ammunition and the weapon from which it was fired.</English>
@@ -312,6 +337,7 @@
             <Russian>Этот модуль включает симуляцию продвинутой баллистики - при этом на траекторию полета снаряда влияют различные параметры, такие как температура воздуха, атмосферное давление, влажность, гравитация, тип боеприпаса и оружия, из которого произвели выстрел.</Russian>
             <Spanish>Este módulo permite la simulación balística avanzada - es decir, la trayectoria de los proyectiles está influenciada por variables como la temperatura del aire, la presión atmosférica, la humedad, la gravedad, el tipo de municiones y el arma desde el que fue disparada.</Spanish>
             <Italian>Questo modulo abilita la simulazione della Balistica Avanzata - cioè la traiettoria dei proiettili è influenzata da variabili come la temperatura dell'aria, pressione atmosferica, umidità, gravità, il tipo di munizione e l'arma da cui è sparata</Italian>
+            <Japanese>このモジュールはアドバンスド バリスティックスを有効化します。弾道は気温や気圧、湿度、重力、弾薬の種類、発射する武器から影響を受けるようになります。</Japanese>
         </Key>
     </Package>
 </Project>

addons/advanced_fatigue/XEH_PREP.hpp

@@ -5,6 +5,6 @@ PREP(getMetabolicCosts);
 PREP(handleEffects);
 PREP(handlePlayerChanged);
 PREP(handleStaminaBar);
+PREP(mainLoop);
 PREP(moduleSettings);
-PREP(pfhMain);
 PREP(removeDutyFactor);

addons/advanced_fatigue/XEH_postInit.sqf

@@ -37,8 +37,8 @@ if (!hasInterface) exitWith {};
         }] call FUNC(addDutyFactor);
     };
 
-    // - Add main PFH -------------------------------------------------------------
-    [FUNC(pfhMain), 1, []] call CBA_fnc_addPerFrameHandler;
+    // - Add main loop at 1 second interval -------------------------------------------------------------
+    [FUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;
 }] call CBA_fnc_addEventHandler;
 
 ["ace_settingChanged", {

addons/advanced_fatigue/functions/fnc_mainLoop.sqf

@@ -1,6 +1,6 @@
 /*
  * Author: BaerMitUmlaut
- * Main perFrameHandler that updates fatigue values.
+ * Main looping function that updates fatigue values.
  *
  * Arguments:
  * None
@@ -9,7 +9,9 @@
  * None
  */
 #include "script_component.hpp"
-if (!alive ACE_player) exitWith {}; // Dead people don't breath, Will also handle null (Map intros)
+if (!alive ACE_player) exitWith { // Dead people don't breath, Will also handle null (Map intros)
+    [FUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;
+};
 
 private _currentWork = REE;
 private _currentSpeed = (vectorMagnitude (velocity ACE_player)) min 6;
@@ -61,3 +63,5 @@ private _perceivedFatigue = 1 - (_anReservePercentage min _aeReservePercentage);
 if (GVAR(enableStaminaBar)) then {
     [GVAR(anReserve) / AN_MAXRESERVE] call FUNC(handleStaminaBar);
 };
+
+[FUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;

addons/advanced_fatigue/stringtable.xml

@@ -4,67 +4,80 @@
         <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor">
             <English>Performance Factor</English>
             <German>Leistungsfaktor</German>
+            <Japanese>パフォーマンス要因</Japanese>
             <Polish>Współczynnik wydolności</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor_Description">
             <English>Influences the overall performance of all players with no custom factor. Higher means better.</English>
             <German>Beinflusst die Leistungsfähigkeit aller Spieler ohne eigenen Leistungsfaktor. Ein höherer Wert bedeutet bessere Leistung.</German>
+            <Japanese>非カスタム要因をもつ全プレイヤーへ全体的に動作を影響させます。高いほど影響がでます。</Japanese>
             <Polish>Wpływa na ogólną wydolność organizmu u wszystkich graczy bez ustawionego niestandardowego współczynnika. Więcej znaczy lepiej.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor_EdenDescription">
             <English>Influences the overall performance of this unit. Higher means better.</English>
             <German>Beinflusst die Leistungsfähigkeit dieser Einheit. Ein höherer Wert bedeutet bessere Leistung.</German>
+            <Japanese>非カスタム要因をもつ全プレイヤーへ全体的に動作を影響させます。高いほど影響がでます。</Japanese>
             <Polish>Wpływa na ogólną wydolność tej jednostki. Więcej znaczy lepiej.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_RecoveryFactor">
             <English>Recovery Factor</English>
             <German>Erholungsfaktor</German>
+            <Japanese>回復要因</Japanese>
             <Polish>Współczynnik regeneracji</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_RecoveryFactor_Description">
             <English>Changes how fast the player recovers when resting. Higher is faster.</English>
             <German>Ändert, wie schnell ein Spieler Ausdauer regeneriert. Ein höherer Wert bedeutet eine schnellere Regeneration.</German>
+            <Japanese>休憩時は、プレイヤーが早く回復します。高いほど早くなります。</Japanese>
             <Polish>Wpływa na czas regeneracji podczas postoju. Więcej znaczy szybciej.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_LoadFactor">
             <English>Load Factor</English>
             <German>Gewichtsfaktor</German>
+            <Japanese>負荷要因</Japanese>
             <Polish>Współczynnik masy ekwipunku</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_LoadFactor_Description">
             <English>Increases or decreases how much weight influences the players performance. Zero means equipment weight has no performance influence.</English>
             <German>Erhöht oder verringert, wie viel Einfluss das Ausrüstungsgewicht auf die Leistung hat. Null heißt, dass es keinen Einfluss hat.</German>
+            <Japanese>重量によりプレイヤーの動作への影響下増加したり、低下します。装備を持っていない場合、影響はしません。</Japanese>
             <Polish>Zmniejsza lub zwiększa wpływ ciężaru ekwipunku na wydolność gracza. Zero oznacza kompletny brak wpływu na wydolność.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_TerrainGradientFactor">
             <English>Terrain Gradient Factor</English>
             <German>Terrainsteigungsfaktor</German>
+            <Japanese>地形の勾配による要因</Japanese>
             <Polish>Współczynnik terenu</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_TerrainGradientFactor_Description">
             <English>Sets how much steep terrain increases stamina loss. Higher means higher stamina loss.</English>
             <German>Beeinflusst, wie stark Steigungen den Ausdauerverbrauch erhöhen. Ein höherer Wert erhöht den Ausdauerverbrauch.</German>
+            <Japanese>地形によって影響する体力の消費量を決定します。高数値ではより体力を消費します。</Japanese>
             <Polish>Wpływa na to w jakim stopniu stromy teren wpływa na utratę wytrzymałości. Więcej oznacza szybszą utratę wytrzymałości.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_Enabled">
             <English>Enabled</English>
             <German>Aktiv</German>
+            <Japanese>有効化</Japanese>
             <Polish>Włączone</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_Enabled_Description">
             <English>Enables/disables Advanced Fatigue.</English>
             <German>Aktiviert/deaktiviert Advanced Fatigue.</German>
+            <Japanese>アドバンスド疲労の有効化と無効化</Japanese>
             <Polish>Włącza/wyłącza zaawansowaną wytrzymałość</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_EnableStaminaBar">
             <English>Show stamina bar</English>
             <German>Zeige Ausdauerleiste</German>
+            <Japanese>体力バーを表示</Japanese>
             <Polish>Pokaż pasek wytrzymałości</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_EnableStaminaBar_Description">
             <English>Shows the stamina bar.</English>
             <German>Zeigt die Ausdauerleiste an.</German>
+            <Japanese>体力バーを表示します。</Japanese>
             <Polish>Pokazuje pasek wytrzymałości.</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/advanced_throwing/CfgEventHandlers.hpp

@@ -12,6 +12,6 @@ class Extended_PreInit_EventHandlers {
 
 class Extended_PostInit_EventHandlers {
     class ADDON {
-        clientInit = QUOTE(call COMPILE_FILE(XEH_postInitClient));
+        init = QUOTE(call COMPILE_FILE(XEH_postInit));
     };
 };

addons/advanced_throwing/XEH_postInit.sqf

@@ -1,5 +1,8 @@
 #include "script_component.hpp"
 
+// Fired XEH
+[QGVAR(throwFiredXEH), FUNC(throwFiredXEH)] call CBA_fnc_addEventHandler;
+
 // Exit on HC
 if (!hasInterface) exitWith {};
 
@@ -63,6 +66,13 @@ GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;
     [_this select 1, "Player changed"] call FUNC(exitThrowMode);
 }] call CBA_fnc_addPlayerEventhandler;
 
+["visibleMap", {
+    if (visibleMap && {ACE_player getVariable [QGVAR(inHand), false]}) then {
+        [ACE_player, "Opened Map"] call FUNC(exitThrowMode);
+    };
+}] call CBA_fnc_addPlayerEventhandler;
+
+
 ["ace_interactMenuOpened", {
     // Exit if advanced throwing is disabled (pick up only supports advanced throwing)
     if (!GVAR(enabled)) exitWith {};
@@ -80,9 +90,6 @@ GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;
 }] call CBA_fnc_addEventHandler;
 
 
-// Fired XEH
-[QGVAR(throwFiredXEH), FUNC(throwFiredXEH)] call CBA_fnc_addEventHandler;
-
 // Set last thrown time on Vanilla Throwing and Advanced Throwing
 ["ace_firedPlayer", {
     if (_weapon == "Throw") then {

addons/advanced_throwing/functions/fnc_drawArc.sqf

@@ -47,11 +47,15 @@ for "_i" from 0.05 to 1.45 step 0.1 do {
 
     if (_newTrajASL distance (getPosASLVisual ACE_player) <= 20) then {
         if ((ASLToATL _newTrajASL) select 2 <= 0) then {
-            _cross = 1
+            _cross = 1; // 1: Distance Limit (Green)
         } else {
             // Even vanilla throwables go through glass, only "GEOM" LOD will stop it but that will also stop it when there is glass in a window
-            if (lineIntersects [_prevTrajASL, _newTrajASL]) then {
-                _cross = 2;
+            if (lineIntersects [_prevTrajASL, _newTrajASL]) then { // Checks the "VIEW" LOD
+                _cross = 2; // 2: View LOD Block (Red)
+            } else {
+                if (!((lineIntersectsSurfaces [_prevTrajASL, _newTrajASL, _activeThrowable, ACE_player, true, 1, "GEOM", "FIRE"]) isEqualTo [])) then {
+                    _cross = 3; // 3: GEOM/FIRE LOD Block (Yellow) - pass a3 bulding glass, but blocked on some CUP glass
+                };
             };
         };
 
@@ -60,7 +64,7 @@ for "_i" from 0.05 to 1.45 step 0.1 do {
         private _movePerc = linearConversion [3, 0, vectorMagnitude (velocity ACE_player), 0, 1, true];
         _alpha = _alpha * _movePerc;
 
-        private _col = [ [1, 1, 1, _alpha], [0, 1, 0, _alpha], [1, 0, 0, _alpha] ] select _cross;
+        private _col = [ [1, 1, 1, _alpha], [0, 1, 0, _alpha], [1, 0, 0, _alpha], [1, 1, 0, _alpha] ] select _cross;
 
         if (_cross != 2 && {lineIntersects [eyePos ACE_player, _newTrajASL]}) then {
             _col set [3, 0.1]

addons/advanced_throwing/functions/fnc_prime.sqf

@@ -31,6 +31,12 @@ private _muzzle = _unit getVariable [QGVAR(activeMuzzle), ""];
 // Set muzzle ammo to 0 to block vanilla throwing (can only be 0 or 1), removeItem above resets it
 _unit setAmmo [_muzzle, 0];
 
+// Handle weird scripted grenades (RHS) which could cause unexpected behaviour
+private _nonInheritedCfg = configProperties [configFile >> "CfgAmmo" >> _throwableType, 'configName _x == QGVAR(replaceWith)', false];
+if ((count _nonInheritedCfg) == 1) then {
+    _throwableType = getText (_nonInheritedCfg select 0);
+};
+
 // Create actual throwable globally
 private _activeThrowableOld = _unit getVariable [QGVAR(activeThrowable), objNull];
 private _activeThrowable = createVehicle [_throwableType, _activeThrowableOld, [], 0, "CAN_COLLIDE"];

addons/advanced_throwing/stringtable.xml

@@ -4,107 +4,128 @@
         <Key ID="STR_ACE_Advanced_Throwing_Category">
             <English>Advanced Throwing</English>
             <Russian>Улучшенный бросок гранат</Russian>
+            <Japanese>アドバンスド投てき</Japanese>
             <Polish>Zaawansowane rzucanie</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_Module_Description">
             <English>Allows changing advanced throwing behaviour.</English>
             <Russian>Позволяет настраивать поведение улучшенного броска гранат.</Russian>
+            <Japanese>アドバンスド投てきの挙動変更を許可します。</Japanese>
             <Polish>Zezwala na zmianę zachowania zaawansowanego trybu rzucania.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_Enable_DisplayName">
             <English>Enable Advanced Throwing</English>
             <Russian>Включить улучшенный бросок</Russian>
+            <Japanese>アドバンスド投てきを有効化</Japanese>
             <Polish>Aktywuj zaawansowane rzucanie</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_Enable_Description">
             <English>Enables advanced throwing system.</English>
             <Russian>Включает систему улучшенного броска.</Russian>
+            <Japanese>アドバンスド投てきシステムを有効化</Japanese>
             <Polish>Aktywuje system zaawansowanego rzucania.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_ShowThrowArc_DisplayName">
             <English>Show Throw Arc</English>
             <Russian>Показать траекторию броска</Russian>
+            <Japanese>軌道を表示</Japanese>
             <Polish>Pokaż trasę lotu</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_ShowThrowArc_Description">
             <English>Enables visualization of the throw arc (where throwable will fly).</English>
             <Russian>Включает визуализацию траектории броска (как полетит граната).</Russian>
+            <Japanese>投てき物の予測軌道の表示を有効化します。</Japanese>
             <Polish>Wyświetla wizualizację trasy przelotu granatu.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_ShowMouseControls_DisplayName">
             <English>Show Throwing Mouse Controls</English>
             <Russian>Показывать управление мышью</Russian>
+            <Japanese>投てきのマウス操作を表示</Japanese>
             <Polish>Pokaż podpowiedzi sterowania myszą</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_ShowMouseControls_Description">
             <English>Enables visual cues for mouse controls when throwable is prepared.</English>
             <Russian>Включает отображение подсказок по управлению мышью, когда граната подготовлена.</Russian>
+            <Japanese>投てき物を投げるとき、マウス操作の説明表示を有効化します。</Japanese>
             <Polish>Wyświetla podpowiedzi sterowania myszą kiedy obiekt miotany jest w ręku.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_EnablePickUp_DisplayName">
             <English>Enable Throwables Pick Up</English>
             <Russian>Включить подбор гранат</Russian>
+            <Japanese>投てき物の拾い上げを有効化</Japanese>
             <Polish>Zezwól na podnoszenie obiektów miotanych</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_EnablePickUp_Description">
             <English>Enables ability to pick up throwables from the ground.</English>
             <Russian>Включает возможность подбирать гранаты с земли.</Russian>
+            <Japanese>地面に落ちている投てき物の拾い上げ動作を有効化します。</Japanese>
             <Polish>Umożliwia podnoszenie obiektów miotanych z ziemi.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_EnablePickUpAttached_DisplayName">
             <English>Enable Attached Throwables Pick Up</English>
             <Russian>Включить подбор прикрепленных гранат</Russian>
+            <Japanese>拾い上げた投てき物の取り付けを有効化</Japanese>
             <Polish>Zezwól na podnoszenie przyczepionych obiektów miotanych</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_EnablePickUpAttached_Description">
             <English>Enables ability to pick up throwables from attached objects.</English>
             <Russian>Включает возможность подбирать гранаты, прикрепленные к объектам.</Russian>
+            <Japanese>オブジェクトに取り付けられていた投てき物を拾い上げられるようにします。</Japanese>
             <Polish>Umożliwia podnoszenie obiektów miotanych przyczepionych do innych obiektów.</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_Prepare">
             <English>Prepare/Change Throwable</English>
             <Russian>Подготовить/заменить гранату</Russian>
+            <Japanese>機能の起動/変更</Japanese>
             <Polish>Przygotuj/zmień ob. miotany</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_dropModeHold">
             <English>Throwable Drop Mode (Hold)</English>
             <Russian>Режим броска гранаты (удерживать)</Russian>
+            <Japanese>投てきモード (押しっぱ)</Japanese>
             <Polish>Tryb upuszczania ob. miotanego (przytrzymaj)</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_DropModeToggle">
             <English>Throwable Drop Mode (Toggle)</English>
             <Russian>Режим броска гранаты (переключить)</Russian>
+            <Japanese>投てきモード (トグル)</Japanese>
             <Polish>Tryb upuszczania ob. miotanego (przełącz)</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_Primed">
             <English>Primed</English>
             <Russian>Подготовлена</Russian>
+            <Japanese>起動した</Japanese>
             <Polish>Odbezpieczony</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_Throw">
             <English>Throw</English>
             <Russian>Бросить</Russian>
+            <Japanese>投げる</Japanese>
             <Polish>Rzuć</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_ChangeMode">
             <English>(Scroll) Change Mode</English>
             <Russian>(Скролл) Изменить режим</Russian>
+            <Japanese>(スクロール) モード変更</Japanese>
             <Polish>(Kółko m.) zmień tryb</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_Extend">
             <English>(Scroll) Extend</English>
             <Russian>(Скролл) Увеличить</Russian>
+            <Japanese>(スクロール) 遠くに</Japanese>
             <Polish>(Kółko m.) przedłuż</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_Cook">
             <English>(Click) Cook</English>
             <Russian>(Клик) Подготовить</Russian>
+            <Japanese>(クリック) 起爆</Japanese>
             <Polish>(Kliknięcie) Odbezpiecz</Polish>
         </Key>
         <Key ID="STR_ACE_Advanced_Throwing_PickUp">
             <English>Pick Up</English>
             <Russian>Подобрать</Russian>
+            <Japanese>拾い上げる</Japanese>
             <Polish>Podnieś</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/ai/CfgWeapons.hpp

@@ -22,6 +22,7 @@ class CfgWeapons {
     };
 
     class Rifle_Base_F: Rifle {};
+    class Rifle_Short_Base_F: Rifle_Base_F {};
     class Rifle_Long_Base_F: Rifle_Base_F {};
 
     // MX
@@ -470,7 +471,7 @@ class CfgWeapons {
     };
 
     // PD2000
-    class pdw2000_base_F: Rifle_Base_F {
+    class pdw2000_base_F: Rifle_Short_Base_F {
         aiDispersionCoefY = 18.0;
         aiDispersionCoefX = 12.0;
 
@@ -484,7 +485,7 @@ class CfgWeapons {
     };
 
     // Vector
-    class SMG_01_Base: Rifle_Base_F {
+    class SMG_01_Base: Rifle_Short_Base_F {
         aiDispersionCoefY = 18.0;
         aiDispersionCoefX = 12.0;
 

addons/aircraft/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Sorozat</Hungarian>
             <Portuguese>Rajada</Portuguese>
             <Italian>Raffica</Italian>
+            <Japanese>バースト</Japanese>
         </Key>
         <Key ID="STR_ACE_Aircraft_gatling_20mm_Name">
             <English>XM301</English>
@@ -24,6 +25,7 @@
             <Hungarian>XM301</Hungarian>
             <Portuguese>XM301</Portuguese>
             <Italian>XM301</Italian>
+            <Japanese>XM301</Japanese>
         </Key>
         <Key ID="STR_ACE_Aircraft_OpenCargoRamp">
             <English>Open Cargo Door</English>
@@ -36,6 +38,7 @@
             <Russian>Открыть грузовой отсек</Russian>
             <Italian>Apri la rampa di carico</Italian>
             <Portuguese>Abrir porta de carga</Portuguese>
+            <Japanese>カーゴ ドアを開く</Japanese>
         </Key>
         <Key ID="STR_ACE_Aircraft_CloseCargoRamp">
             <English>Close Cargo Door</English>
@@ -48,6 +51,7 @@
             <Russian>Закрыть грузовой отсек</Russian>
             <Italian>Chiudi la rampa di carico</Italian>
             <Portuguese>Fechar porta de carga</Portuguese>
+            <Japanese>カーゴ ドアを閉じる</Japanese>
         </Key>
     </Package>
 </Project>

addons/atragmx/config.cpp

@@ -18,7 +18,3 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
 #include "RscTitles.hpp"
-
-class ACE_newEvents {
-    RangerfinderData = QEGVAR(vector,rangefinderData);
-};

addons/atragmx/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>ATragMX</Hungarian>
             <Portuguese>ATragMX</Portuguese>
             <Russian>ATragMX</Russian>
+            <Japanese>ATragMX</Japanese>
         </Key>
         <Key ID="STR_ACE_ATragMX_OpenATragMXDialog">
             <English>Open ATragMX</English>
@@ -24,6 +25,7 @@
             <Hungarian>ATragMX elővétele</Hungarian>
             <Czech>Otevřít ATragMX</Czech>
             <Portuguese>Abrir ATragMX</Portuguese>
+            <Japanese>ATragMX を開く</Japanese>
         </Key>
         <Key ID="STR_ACE_ATragMX_Description">
             <English>Rugged PDA with ATragMX</English>
@@ -36,6 +38,7 @@
             <Hungarian>Megerősített PDA, ATragMX-el</Hungarian>
             <Czech>PDA s ATragMX</Czech>
             <Portuguese>PDA Robusto com ATragMX</Portuguese>
+            <Japanese>ATragMX 付きの携行型端末</Japanese>
         </Key>
         <Key ID="STR_ACE_ATragMX_ATragMXDialogKey">
             <English>Open ATragMX</English>
@@ -48,6 +51,7 @@
             <Hungarian>ATragMX elővétele</Hungarian>
             <Czech>Otevřít ATragMX</Czech>
             <Portuguese>Abrir ATragMX</Portuguese>
+            <Japanese>ATragMX を開く</Japanese>
         </Key>
     </Package>
 </Project>

addons/attach/config.cpp

@@ -19,7 +19,3 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
 #include "GUI_VirtualAmmo.hpp"
-
-class ACE_newEvents {
-    interactMenuOpened = "ace_interactMenuOpened";
-};

addons/attach/stringtable.xml

@@ -12,6 +12,7 @@
             <Italian>Attacca l'oggetto</Italian>
             <Hungarian>Tárgy hozzácsatolása</Hungarian>
             <Russian>Прикрепить предмет</Russian>
+            <Japanese>&amp;gt;&amp;gt; アイテムを取り付ける</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_Attach">
             <English>Attach</English>
@@ -24,6 +25,7 @@
             <Italian>Attacca</Italian>
             <Hungarian>Hozzácsatolás</Hungarian>
             <Russian>Прикрепить</Russian>
+            <Japanese>取り付ける</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_Detach">
             <English>Detach item</English>
@@ -36,6 +38,7 @@
             <Italian>Stacca l'oggetto</Italian>
             <Hungarian>Tárgy lecsatolása</Hungarian>
             <Russian>Отсоединить</Russian>
+            <Japanese>アイテムを外す</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_IrStrobe_Attached">
             <English>IR Strobe Attached</English>
@@ -48,6 +51,7 @@
             <Italian>Strobo IR attaccata</Italian>
             <Hungarian>Infravörös jeladó hozzácsatolva</Hungarian>
             <Russian>ИК-маяк прикреплён</Russian>
+            <Japanese>赤外線ストロボを取り付ける</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_IrStrobe_Detached">
             <English>IR Strobe Detached</English>
@@ -60,6 +64,7 @@
             <Italian>Strobo IR staccata</Italian>
             <Hungarian>Infravörös jeladó lecsatolva</Hungarian>
             <Russian>ИК-маяк отсоединён</Russian>
+            <Japanese>赤外線ストロボを外す</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_IrGrenade_Attached">
             <English>IR Grenade Attached</English>
@@ -72,6 +77,7 @@
             <Italian>Granata IR attaccata</Italian>
             <Hungarian>Infravörös gránát hozzácsatolva</Hungarian>
             <Russian>ИК-граната прикреплена</Russian>
+            <Japanese>赤外線グレネードを取り付ける</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_IrGrenade_Detached">
             <English>IR Grenade Detached</English>
@@ -84,6 +90,7 @@
             <Italian>Granata IR staccata</Italian>
             <Hungarian>Infravörös gránát lecsatolva</Hungarian>
             <Russian>ИК-граната отсоединена</Russian>
+            <Japanese>赤外線グレネードを外す</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_Chemlight_Attached">
             <English>Chemlight Attached</English>
@@ -96,6 +103,7 @@
             <Italian>Chemlight attaccata</Italian>
             <Hungarian>Chemlight hozzácsatolva</Hungarian>
             <Russian>Химсвет прикреплён</Russian>
+            <Japanese>ケミライトを取り付け</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_Chemlight_Detached">
             <English>Chemlight Detached</English>
@@ -108,6 +116,7 @@
             <Italian>Chemlight staccata</Italian>
             <Hungarian>Chemlight hozzácsatolva</Hungarian>
             <Russian>Химсвет отсоединён</Russian>
+            <Japanese>ケミライトを外す</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_Inventory_Full">
             <English>No inventory space</English>
@@ -120,6 +129,7 @@
             <Italian>Non hai più spazio</Italian>
             <Hungarian>Nincs több hely</Hungarian>
             <Russian>В инвентаре нет места</Russian>
+            <Japanese>インベントリに空きがない</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_IrStrobe_Name">
             <English>IR Strobe</English>
@@ -132,6 +142,7 @@
             <Italian>Strobo IR</Italian>
             <Hungarian>Infravörös jeladó</Hungarian>
             <Russian>ИК-маяк</Russian>
+            <Japanese>赤外線ストロボ</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_IrStrobe_Description">
             <English>IR Strobe allows you to signal your position through a pulsating beacon only visible with NVGs.</English>
@@ -144,6 +155,7 @@
             <Italian>La Strobo IR è una luce stroboscopica che ti permette di segnalare la tua posizione grazie all'emissione di impulsi ad infrarossi visibili solo con i visori notturni.</Italian>
             <Hungarian>Az infravörös jeladóval megjelölheted a helyzetedet úgy, hogy annak pulzáló fénye csak éjjellátó készülékkel látható.</Hungarian>
             <Russian>ИК-маяк позволяет сигнализировать о своём местоположении через пульсирующий свет, видимый только через ПНВ.</Russian>
+            <Japanese>赤外線ストロボはあなたの位置を知らせますが、夜間暗視装置を介してでしか見れません。</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_PlaceAction">
             <English>Place</English>
@@ -156,6 +168,7 @@
             <Italian>Posiziona</Italian>
             <Hungarian>Elhelyez</Hungarian>
             <Russian>Установить</Russian>
+            <Japanese>置く</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_CancelAction">
             <English>Cancel</English>
@@ -168,6 +181,7 @@
             <Italian>Annulla</Italian>
             <Hungarian>Mégse</Hungarian>
             <Russian>Отмена</Russian>
+            <Japanese>やめる</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_Failed">
             <English>Attach Failed</English>
@@ -180,6 +194,7 @@
             <Polish>Przyczepianie nie powiodło się</Polish>
             <Hungarian>Hozzácsatolás sikertelen</Hungarian>
             <Italian>Non si attacca</Italian>
+            <Japanese>取り付けに失敗した</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_Item_Attached">
             <English>%1&lt;br/&gt;Attached</English>
@@ -192,6 +207,7 @@
             <Italian>%1&lt;br/&gt;attaccata</Italian>
             <Hungarian>%1&lt;br/&gt;hozzácsatolva</Hungarian>
             <Russian>%1&lt;br/&gt;присоединен(-а)</Russian>
+            <Japanese>%1&amp;lt;br/&amp;gt; を取り付けた</Japanese>
         </Key>
         <Key ID="STR_ACE_Attach_Item_Detached">
             <English>%1&lt;br/&gt;Detached</English>
@@ -204,6 +220,7 @@
             <Italian>%1&lt;br/&gt;staccata</Italian>
             <Hungarian>%1&lt;br/&gt;lecsatolva</Hungarian>
             <Russian>%1&lt;br/&gt;отсоединен(-а)</Russian>
+            <Japanese>%1&amp;lt;br/&amp;gt; を外した</Japanese>
         </Key>
     </Package>
-</Project>
+</Project>

addons/backpacks/config.cpp

@@ -15,7 +15,3 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
-
-class ACE_newEvents {
-    backpackOpened = "ace_backpackOpened";
-};

addons/ballistics/CfgWeapons.hpp

@@ -9,7 +9,8 @@ class CfgWeapons {
     class MMG_01_base_F;
     class MMG_02_base_F;
     class Rifle_Base_F;
-    class Rifle_Long_Base_F;
+    class Rifle_Short_Base_F: Rifle_Base_F {};
+    class Rifle_Long_Base_F: Rifle_Base_F {};
     class MuzzleSlot;
 
     /* Long Rifles */
@@ -189,8 +190,8 @@ class CfgWeapons {
             dispersion = 0.0008727; // radians. Equal to 3 MOA.
         };
     };
-    class pdw2000_base_F: Rifle_Base_F {};
-    class SMG_01_Base: Rifle_Base_F {};
+    class pdw2000_base_F: Rifle_Short_Base_F {};
+    class SMG_01_Base: Rifle_Short_Base_F {};
     class SMG_02_base_F: Rifle_Base_F {};
 
     /* Pistols */

addons/ballistics/stringtable.xml

@@ -13,6 +13,7 @@
             <Portuguese>Carregador de 30 projéteis traçantes IR-DIM de 6,5mm</Portuguese>
             <Italian>Caricatore 6.5mm 30Rnd Traccianti IR-DIM</Italian>
             <Russian>Магазин из 30-ти 6,5 мм ИК-трассирующих</Russian>
+            <Japanese>6.5mm 30発入り IR-DIM曳光弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_Tracer_DimNameShort">
             <English>6.5mm IR-DIM</English>
@@ -25,6 +26,7 @@
             <Portuguese>6,5mm IR-DIM</Portuguese>
             <Italian>6.5mm IR-DIM</Italian>
             <Russian>6,5 мм ИК-трассирующие</Russian>
+            <Japanese>6.5mm IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_Tracer_DimDescription">
             <English>Caliber: 6.5x39mm Tracer IR-DIM&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: MX/C/M/SW/3GL</English>
@@ -37,6 +39,7 @@
             <Portuguese>Calibre: 6,5x39mm Traçante IR-DIM&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: MX/C/M/SW/3GL</Portuguese>
             <Italian>Calibro: 6.5x39mm Traccianti IR-DIM &lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: MX/C/M/SW/3GL</Italian>
             <Russian>Калибр: 6,5x39 мм ИК-трассирующие&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: MX/C/M/SW/3GL</Russian>
+            <Japanese>口径: 6.5x39mm 曳光弾 IR-DIM&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MX/C/M/SW/3GL</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_SDName">
             <English>6.5mm 30Rnd SD Mag</English>
@@ -49,6 +52,7 @@
             <Portuguese>Carregador de 30 projéteis SD de 6,5mm</Portuguese>
             <Italian>Caricatore 6.5mm 30Rnd Sil.</Italian>
             <Russian>Магазин из 30-ти 6,5 мм дозвуковых</Russian>
+            <Japanese>6.5mm 30発入り 亜音速弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_SDNameShort">
             <English>6.5mm SD</English>
@@ -61,6 +65,7 @@
             <Portuguese>6,5mm SD</Portuguese>
             <Italian>6.5mm Sil.</Italian>
             <Russian>6,5 мм дозвуковые</Russian>
+            <Japanese>6.5mm 亜音速弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_SDDescription">
             <English>Caliber: 6.5x39mm SD&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: MX/C/M/SW/3GL</English>
@@ -73,6 +78,7 @@
             <Portuguese>Calibre: 6,5x39mm SD&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: MX/C/M/SW/3GL</Portuguese>
             <Italian>Calibro: 6.5x39mm Sil.&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: MX/C/M/SW/3GL </Italian>
             <Russian>Калибр: 6,5x39 мм дозвуковые&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: MX/C/M/SW/3GL</Russian>
+            <Japanese>口径: 6.5x39mm 亜音速弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MX/C/M/SW/3GL</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_APName">
             <English>6.5mm 30Rnd AP Mag</English>
@@ -85,6 +91,7 @@
             <Portuguese>Carregador de 30 projéteis AP de 6,5mm</Portuguese>
             <Italian>Caricatore 6.5mm 30Rnd AP</Italian>
             <Russian>Магазин из 30-ти 6,5 мм бронебойных</Russian>
+            <Japanese>6.5mm 30 発入り徹甲弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_APNameShort">
             <English>6.5mm AP</English>
@@ -97,6 +104,7 @@
             <Portuguese>6,5mm AP</Portuguese>
             <Italian>6.5mm AP</Italian>
             <Russian>6,5 мм бронебойные</Russian>
+            <Japanese>6.5mm 徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_mag_APDescription">
             <English>Caliber: 6.5x39mm AP&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: MX/C/M/SW/3GL</English>
@@ -109,6 +117,7 @@
             <Portuguese>Calibre: 6,5x39mm AP&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: MX/C/M/SW/3GL</Portuguese>
             <Italian>Calibro: 6.5x39mm AP&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: MX/C/M/SW/3GL</Italian>
             <Russian>Калибр: 6,5x39 мм бронебойные&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: MX/C/M/SW/3GL</Russian>
+            <Japanese>口径: 6.5x39mm 徹甲弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MX/C/M/SW/3GL</Japanese>
         </Key>
         <!-- KATIBA -->
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_Tracer_DimName">
@@ -122,6 +131,7 @@
             <Portuguese>Carregador de 30 projéteis traçantes IR-DIM de 6,5mm</Portuguese>
             <Italian>Caricatore 6.5mm 30Rnd Traccianti IR-DIM</Italian>
             <Russian>Магазин из 30-ти 6,5 мм ИК-трассирующих</Russian>
+            <Japanese>6.5mm 30発入り IR-DIM曳光弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_Tracer_DimNameShort">
             <English>6.5mm IR-DIM</English>
@@ -134,6 +144,7 @@
             <Portuguese>6,5mm IR-DIM</Portuguese>
             <Italian>6.5mm IR-DIM</Italian>
             <Russian>6,5 мм ИК-трассирующие</Russian>
+            <Japanese>6.5mm IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_Tracer_DimDescription">
             <English>Caliber: 6.5x39mm Tracer IR-DIM&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: Katiba</English>
@@ -146,6 +157,7 @@
             <Portuguese>Calibre: 6,5x39mm Traçante IR-DIM&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: Katiba</Portuguese>
             <Italian>Calibro: 6.5x39mm Tracciant IR-DIM&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: Katiba</Italian>
             <Russian>Калибр: 6,5x39 мм ИК-трассирующие&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: Katiba</Russian>
+            <Japanese>口径: 6.5x39mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: Katiba</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_SDName">
             <English>6.5mm 30Rnd SD Mag</English>
@@ -158,6 +170,7 @@
             <Portuguese>Carregador de 30 projéteis SD de 6,5mm</Portuguese>
             <Italian>Caricatore 6.5mm 30Rnd Sil.</Italian>
             <Russian>Магазин из 30-ти 6,5 мм дозвуковых</Russian>
+            <Japanese>6.5mm 30発入り 亜音速弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_SDNameShort">
             <English>6.5mm SD</English>
@@ -170,6 +183,7 @@
             <Portuguese>6,5mm SD</Portuguese>
             <Italian>6.5mm Sil.</Italian>
             <Russian>6,5 мм дозвуковые</Russian>
+            <Japanese>6.5mm 亜音速弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_SDDescription">
             <English>Caliber: 6.5x39mm SD&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: Katiba</English>
@@ -182,6 +196,7 @@
             <Portuguese>Calibre: 6,5x39mm SD&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: Katiba</Portuguese>
             <Italian>Calibro: 6.5x39mm Sil.&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: Katiba</Italian>
             <Russian>Калибр: 6,5x39 мм дозвуковые&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: Katiba</Russian>
+            <Japanese>口径: 6.5x39mm 亜音速弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: Katiba</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_APName">
             <English>6.5mm 30Rnd AP Mag</English>
@@ -194,6 +209,7 @@
             <Portuguese>Carregador de 30 projéteis AP de 6,5mm</Portuguese>
             <Italian>Caricatore 6.5mm 30Rnd AP</Italian>
             <Russian>Магазин из 30-ти 6,5 мм бронебойных</Russian>
+            <Japanese>6.5mm 30 発入り徹甲弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_APNameShort">
             <English>6.5mm AP</English>
@@ -206,6 +222,7 @@
             <Portuguese>6,5mm AP</Portuguese>
             <Italian>6.5mm AP</Italian>
             <Russian>6,5 мм бронебойные</Russian>
+            <Japanese>6.5mm 徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x39_caseless_green_mag_APDescription">
             <English>Caliber: 6.5x39mm AP&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: Katiba</English>
@@ -218,6 +235,7 @@
             <Portuguese>Calibre: 6,5x39mm AP&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: Katiba</Portuguese>
             <Italian>Calibro: 6.5x39mm AP&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: Katiba</Italian>
             <Russian>Калибр: 6,5x39 мм бронебойные&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: Katiba</Russian>
+            <Japanese>口径: 6.5x39mm 徹甲弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: Katiba</Japanese>
         </Key>
         <!-- 5.56x45mm -->
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_mag_Tracer_DimName">
@@ -231,6 +249,7 @@
             <Portuguese>Carregador de 30 projéteis traçantes IR-DIM de 5,56mm</Portuguese>
             <Italian>Caricatore 5.56mm 30rnd Traccianti IR-DIM</Italian>
             <Russian>Магазин из 30-ти 5,56 мм ИК-трассирующих</Russian>
+            <Japanese>5.56mm 30発入り IR-DIM曳光弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_mag_Tracer_DimNameShort">
             <English>5.56mm IR-DIM</English>
@@ -243,6 +262,7 @@
             <Portuguese>5,56mm IR-DIM</Portuguese>
             <Italian>5.56mm IR-DIM</Italian>
             <Russian>5,56 мм ИК-трассирующие</Russian>
+            <Japanese>5.56mm IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_mag_Tracer_DimDescription">
             <English>Caliber: 5.56x45mm Tracer IR-DIM&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</English>
@@ -255,6 +275,7 @@
             <Portuguese>Calibre: 5,56x45mm Traçante IR-DIM&lt;br /&gt;Projéteis: 30&lt;br /&gt;Usado em: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Portuguese>
             <Italian>Calibro: 5.56x45mm Traccianti IR-DIM&lt;br /&gt;Munizioni: 30&lt;br /&gt;In uso su: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Italian>
             <Russian>Калибр: 5,56x45 мм ИК-трассирующие&lt;br /&gt;Патронов: 30&lt;br /&gt;Используются с: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Russian>
+            <Japanese>口径: 5.56x45mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: TRG-20, TRG-21/EGLM, Mk20/C/EGLM, SDAR</Japanese>
         </Key>
         <!-- 7.62x51mm -->
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_TracerName">
@@ -268,6 +289,7 @@
             <Portuguese>Carregador de 20 projéteis traçantes de 7,62mm</Portuguese>
             <Italian>Caricatore 7.62mm 20Rnd Traccianti</Italian>
             <Russian>Магазин из 20-ти 7,62 мм трассирующих</Russian>
+            <Japanese>7.62mm 20発入り 曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_TracerNameShort">
             <English>7.62mm Tracer</English>
@@ -280,6 +302,7 @@
             <Portuguese>7,62mm Traçante</Portuguese>
             <Italian>7.62mm Traccianti</Italian>
             <Russian>7,62 мм трассирущие</Russian>
+            <Japanese>7.62mm 曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_TracerDescription">
             <English>Caliber: 7.62x51mm Tracer&lt;br /&gt;Rounds: 20&lt;br /&gt;Used in: Mk18 ABR</English>
@@ -292,6 +315,7 @@
             <Portuguese>Calibre: 7,62x51mm Traçante&lt;br /&gt;Projéteis: 20&lt;br /&gt;Usado em: Mk18 ABR</Portuguese>
             <Italian>Calibro: 7.62x51mm Traccianti&lt;br /&gt;Munizioni: 20&lt;br /&gt;In uso su: Mk18 ABR</Italian>
             <Russian>Калибр: 7,62x51 мм трассирующие&lt;br /&gt;Патронов: 20&lt;br /&gt;Используются с: Mk18 ABR</Russian>
+            <Japanese>口径: 7.62x51mm 曳光弾&amp;lt;br /&amp;gt;装填数: 20&amp;lt;br /&amp;gt;次で使用: Mk18 ABR</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_Tracer_DimName">
             <English>7.62mm 20rnd Tracer IR-DIM Mag</English>
@@ -304,6 +328,7 @@
             <Portuguese>Carregador de 20 projéteis IR-DIM de 7,62mm</Portuguese>
             <Italian>Caricatore 7.62mm 20rnd Traccianti IR-DIM</Italian>
             <Russian>Магазин из 20-ти 7,62 мм ИК-трассирующих</Russian>
+            <Japanese>7.62mm 20発入り IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_Tracer_DimNameShort">
             <English>7.62mm IR-DIM</English>
@@ -316,6 +341,7 @@
             <Portuguese>7,62mm IR-DIM</Portuguese>
             <Italian>7.62mm IR-DIM</Italian>
             <Russian>7,62 мм ИК-трассирующие</Russian>
+            <Japanese>7.62mm IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_Tracer_DimDescription">
             <English>Caliber: 7.62x51mm Tracer IR-DIM&lt;br /&gt;Rounds: 20&lt;br /&gt;Used in: Mk18 ABR</English>
@@ -328,6 +354,7 @@
             <Portuguese>Calibre: 7,62x51mm Traçante IR-DIM&lt;br /&gt;Projéteis: 20&lt;br /&gt;Usado em: Mk18 ABR</Portuguese>
             <Italian>Calibro: 7.62x51mm Traccianti IR-DIM&lt;br /&gt;Munizioni: 20&lt;br /&gt;In uso su: Mk18 ABR</Italian>
             <Russian>Калибр: 7,62x51 мм ИК-трассирующие&lt;br /&gt;Патронов: 20&lt;br /&gt;Используются с: Mk18 ABR</Russian>
+            <Japanese>口径: 7.62x51mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 20&amp;lt;br /&amp;gt;次で使用: Mk18 ABR</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_SDName">
             <English>7.62mm 20Rnd SD Mag</English>
@@ -340,6 +367,7 @@
             <Portuguese>Carregador de 20 projéteis SD de 7,62mm</Portuguese>
             <Italian>Caricatore 7.62mm 20Rnd Sil.</Italian>
             <Russian>Магазин из 20-ти 7,62 мм дозвуковых</Russian>
+            <Japanese>7.62mm 20発入り 亜音速弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_SDNameShort">
             <English>7.62mm SD</English>
@@ -352,6 +380,7 @@
             <Portuguese>7,62mm SD</Portuguese>
             <Italian>7.62mm Sil.</Italian>
             <Russian>7,62 мм дозвуковые</Russian>
+            <Japanese>7.62mm 亜音速弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_mag_SDDescription">
             <English>Caliber: 7.62x51mm SD&lt;br /&gt;Rounds: 20&lt;br /&gt;Used in: Mk18 ABR</English>
@@ -364,6 +393,7 @@
             <Portuguese>Calibre: 7,62x51mm SD&lt;br /&gt;Projéteis: 20&lt;br /&gt;Usado em: Mk18 ABR</Portuguese>
             <Italian>Calibro: 7.62x51mm Sil.&lt;br /&gt;Munizioni: 20&lt;br /&gt;In uso su: Mk18 ABR</Italian>
             <Russian>Калибр: 7,62x51 мм дозвуковые&lt;br /&gt;Патронов: 20&lt;br /&gt;Используются с: Mk18 ABR</Russian>
+            <Japanese>口径: 7.62x51mm 亜音速弾&amp;lt;br /&amp;gt;装填数: 20&amp;lt;br /&amp;gt;次で使用: Mk18 ABR</Japanese>
         </Key>
         <!-- .338 Norma Magnum -->
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_TracerName">
@@ -377,6 +407,7 @@
             <Czech>.338 NM 130náb. Svítící Pás </Czech>
             <Portuguese>Cinto de munição .338 NM com 130 cartuchos</Portuguese>
             <Hungarian>.338 NM 130-lövedékes nyomkövető heveder</Hungarian>
+            <Japanese>.338 NM 130発入り 曳光弾ベルト</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_TracerNameShort">
             <English>.338 NM Tracer</English>
@@ -389,6 +420,7 @@
             <Italian>.338 NM 130Rnd Tracciante</Italian>
             <Portuguese>.338 NM Traçante</Portuguese>
             <Hungarian>.338 NM nyomkövető</Hungarian>
+            <Japanese>.338 NM 曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_TracerDescription">
             <English>Caliber: .338 Norma Magnum Tracer&lt;br /&gt;Rounds: 130&lt;br /&gt;Used in: SPMG</English>
@@ -401,6 +433,7 @@
             <Czech>Ráže: .338 Noma Magnum Svítící&lt;br /&gt;Nábojů: 130&lt;br /&gt;Použití u: LWMMG</Czech>
             <Portuguese>Calibre: .338 Norma Magnum Traçante&lt;br /&gt;Cartuchos: 130&lt;br /&gt;Usado em: SPMG</Portuguese>
             <Hungarian>Kaliber: .338 Norma Magnum nyomkövető&lt;br /&gt;Lövedékek: 130&lt;br /&gt;Használható: SPMG</Hungarian>
+            <Japanese>口径: .338 Norma Magnum 曳光弾&amp;lt;br /&amp;gt;装填数: 130&amp;lt;br /&amp;gt;次で使用: SPMG</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_Tracer_DimName">
             <English>.338 NM 130Rnd IR-DIM Belt</English>
@@ -413,6 +446,7 @@
             <Czech>.338 NM 130náb. IR-DIM Pás</Czech>
             <Portuguese>Cinto de munição traçante .338 NM IR-DIM com 130 cartuchos</Portuguese>
             <Hungarian>.338 NM 130-lövedékes infravörös nyomkövető heveder</Hungarian>
+            <Japanese>.338 NM 130発入り IR-DIM曳光弾ベルト</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_Tracer_DimNameShort">
             <English>.338 NM IR-DIM</English>
@@ -425,6 +459,7 @@
             <Italian>.338 NM IR-DIM</Italian>
             <Portuguese>.338 NM IR-DIM</Portuguese>
             <Hungarian>.338 NM infravörös nyomkövető</Hungarian>
+            <Japanese>.338 NM IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_Tracer_DimDescription">
             <English>Caliber: .338 Norma Magnum Tracer IR-DIM&lt;br /&gt;Rounds: 130&lt;br /&gt;Used in: SPMG</English>
@@ -437,6 +472,7 @@
             <Czech>Ráže: .338 Noma Magnum Svítící IR-DIM&lt;br /&gt;Nábojů: 130&lt;br /&gt;Použití u: LWMMG</Czech>
             <Portuguese>Calibre: .338 Norma Magnum Traçante IR-DIM&lt;br /&gt;Cartuchos: 130&lt;br /&gt;Usado em: SPMG</Portuguese>
             <Hungarian>Kaliber: .338 Norma Magnum infravörös nyomkövető&lt;br /&gt;Lövedékek: 130&lt;br /&gt;Használható: SPMG</Hungarian>
+            <Japanese>口径: .338 Norma Magnum IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 130&amp;lt;br /&amp;gt;次で使用: SPMG</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_APName">
             <English>.338 NM 130Rnd AP Belt</English>
@@ -449,6 +485,7 @@
             <Czech>.338 NM 130náb. AP Pás</Czech>
             <Portuguese>Cinto de munição .338 NM  com 130 cartuchos AP</Portuguese>
             <Hungarian>.338 NM 130-lövedékes páncéltörő heveder</Hungarian>
+            <Japanese>.338 NM 130発入り 徹甲弾ベルト</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_APNameShort">
             <English>.338 NM AP</English>
@@ -461,6 +498,7 @@
             <Italian>.338 NM AP</Italian>
             <Portuguese>.338 NM AP</Portuguese>
             <Hungarian>.338 NM páncéltörő</Hungarian>
+            <Japanese>.338 NM 徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_130Rnd_338_Mag_APDescription">
             <English>Caliber: .338 Norma Magnum AP&lt;br /&gt;Rounds: 130&lt;br /&gt;Used in: SPMG</English>
@@ -473,6 +511,7 @@
             <Czech>Ráže: .338 Noma Magnum AP&lt;br /&gt;Nábojů: 130&lt;br /&gt;Použití u: LWMMG</Czech>
             <Portuguese>Calibre: .338 Norma Magnum AP&lt;br /&gt;Cartuchos: 130&lt;br /&gt;Usado em: SPMG</Portuguese>
             <Hungarian>Kaliber: .338 Norma Magnum páncéltörő&lt;br /&gt;Lövedékek: 130&lt;br /&gt;Használható: SPMG</Hungarian>
+            <Japanese>口径: .338 Norma Magnum 徹甲弾&amp;lt;br /&amp;gt;装填数: 130&amp;lt;br /&amp;gt;次で使用: SPMG</Japanese>
         </Key>
         <!-- 9.3x64mm 10Rnd -->
         <Key ID="STR_ACE_Ballistics_10Rnd_93x64_DMR_05_Mag_TracerName">
@@ -486,6 +525,7 @@
             <Czech>9.3mm 10náb. Svítící Zásobník</Czech>
             <Portuguese>Carregador de 10 cartuchos 9.3mm traçantes </Portuguese>
             <Hungarian>9,3mm 10-lövedékes nyomkövető tár</Hungarian>
+            <Japanese>9.3mm 10発入り 曳光弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_93x64_DMR_05_Mag_TracerNameShort">
             <English>9.3mm Tracer</English>
@@ -498,6 +538,7 @@
             <Italian>9.3mm Tracer</Italian>
             <Portuguese>9.3mm Traçante</Portuguese>
             <Hungarian>9,3mm nyomkövető</Hungarian>
+            <Japanese>9.3mm 曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_93x64_DMR_05_Mag_TracerDescription">
             <English>Caliber: 9.3x64mm Tracer&lt;br /&gt;Rounds: 10&lt;br /&gt;Used in: Cyrus</English>
@@ -510,6 +551,7 @@
             <Czech>Ráže: 9.3x64mm Svítící&lt;br /&gt;Nábojů: 10&lt;br /&gt;Použití u: Cyrus</Czech>
             <Portuguese>Calibre: 9.3x64mm Traçante&lt;br /&gt;Cartuchos: 10&lt;br /&gt;Usado em: Cyrus</Portuguese>
             <Hungarian>Kaliber: 9,3x64mm nyomkövető&lt;br /&gt;Lövedékek: 10&lt;br /&gt;Használható: Cyrus</Hungarian>
+            <Japanese>口径: 9.3x64mm 曳光弾&amp;lt;br /&amp;gt;装填数: 10&amp;lt;br /&amp;gt;次で使用: Cyrus</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_93x64_DMR_05_Mag_Tracer_DimName">
             <English>9.3mm 10Rnd Tracer IR-DIM Mag</English>
@@ -522,6 +564,7 @@
             <Czech>9.3mm 10náb. Svítící IR-DIM Zásobník</Czech>
             <Portuguese>Carregador de 10 cartuchos 9.3mm traçantes IR-DIM</Portuguese>
             <Hungarian>9,3mm 10-lövedékes infravörös nyomkövető tár</Hungarian>
+            <Japanese>9.3mm 10発入り IR-DIM曳光弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_93x64_DMR_05_Mag_Tracer_DimNameShort">
             <English>9.3mm IR-DIM</English>
@@ -534,6 +577,7 @@
             <Italian>9.3mm IR-DIM</Italian>
             <Portuguese>9.3mm IR-DIM</Portuguese>
             <Hungarian>9,3mm infravörös nyomkövető</Hungarian>
+            <Japanese>9.3mm IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_93x64_DMR_05_Mag_Tracer_DimDescription">
             <English>Caliber: 9.3x64mm Tracer IR-DIM&lt;br /&gt;Rounds: 10&lt;br /&gt;Used in: Cyrus</English>
@@ -546,6 +590,7 @@
             <Czech>Ráže: 9.3x64mm Svítící IR-DIM&lt;br /&gt;Nábojů: 10&lt;br /&gt;Použití u: Cyrus</Czech>
             <Portuguese>Calibre: 9.3x64mm Traçante IR-DIM&lt;br /&gt;Cartuchos: 10&lt;br /&gt;Usado em: Cyrus</Portuguese>
             <Hungarian>Kaliber: 9,3x64mm infravörös nyomkövető&lt;br /&gt;Lövedékek: 10&lt;br /&gt; Használható: Cyrus</Hungarian>
+            <Japanese>口径: 9.3x64mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 10&amp;lt;br /&amp;gt;次で使用: Cyrus</Japanese>
         </Key>
         <!-- 9.3x64mm 150Rnd Belt-->
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_TracerName">
@@ -559,6 +604,7 @@
             <Czech>9.3mm 150náb. Svítící Pás</Czech>
             <Portuguese>Cinto de munição traçante 9.3mm com 150 cartuchos</Portuguese>
             <Hungarian>9,3mm 150-lövedékes nyomkövető heveder</Hungarian>
+            <Japanese>9.3mm 150発入り 曳光弾ベルト</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_TracerNameShort">
             <English>9.3mm Tracer</English>
@@ -571,6 +617,7 @@
             <Italian>9.3mm Tracciante</Italian>
             <Portuguese>9.3mm Traçante</Portuguese>
             <Hungarian>9,3mm nyomkövető</Hungarian>
+            <Japanese>9.3mm 曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_TracerDescription">
             <English>Caliber: 9.3x64mm Tracer&lt;br /&gt;Rounds: 150&lt;br /&gt;Used in: Navid</English>
@@ -583,6 +630,7 @@
             <Czech>Ráže: 9.3x64mm Svítící&lt;br /&gt;Nábojů: 150&lt;br /&gt;Použití u: HK121</Czech>
             <Portuguese>Calibre: 9.3x64mm Traçante&lt;br /&gt;Cartuchos: 150&lt;br /&gt;Usado em: Navid</Portuguese>
             <Hungarian>Kaliber: 9,3x64mm nyomkövető&lt;br /&gt;Lövedékek: 150&lt;br /&gt;Használható: Navid</Hungarian>
+            <Japanese>口径: 9.3x64mm 曳光弾&amp;lt;br /&amp;gt;装填数: 150&amp;lt;br /&amp;gt;次で使用: Navid</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_Tracer_DimName">
             <English>9.3mm 150Rnd Tracer IR-DIM Belt</English>
@@ -595,6 +643,7 @@
             <Czech>9.3mm 150náb. Svítící IR-DIM Pás</Czech>
             <Portuguese>Cinto de munição traçante 9.3mm IR-DIM com 150 cartuchos</Portuguese>
             <Hungarian>9,3mm 150-lövedékes infravörös nyomkövető heveder</Hungarian>
+            <Japanese>9.3mm 150発入り IR-DIM曳光弾ベルト</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_Tracer_DimNameShort">
             <English>9.3mm IR-DIM</English>
@@ -607,6 +656,7 @@
             <Italian>9.3mm IR-DIM</Italian>
             <Portuguese>9.3mm IR-DIM</Portuguese>
             <Hungarian>9,3mm infravörös nyomkövető</Hungarian>
+            <Japanese>9.3mm IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_Tracer_DimDescription">
             <English>Caliber: 9.3x64mm Tracer IR-DIM&lt;br /&gt;Rounds: 150&lt;br /&gt;Used in: Navid</English>
@@ -619,6 +669,7 @@
             <Czech>Ráže: 9.3x64mm Svítící IR-DIM&lt;br /&gt;Nábojů: 150&lt;br /&gt;Použití u: HK121</Czech>
             <Portuguese>Calibre: 9.3x64mm Traçante IR-DIM&lt;br /&gt;Cartuchos: 150&lt;br /&gt;Usado em: Navid</Portuguese>
             <Hungarian>Kaliber: 9,3x64mm infravörös nyomkövető&lt;br /&gt;Lövedékek: 150&lt;br /&gt;Használható: Navid</Hungarian>
+            <Japanese>口径: 9.3x64mm IR-DIM曳光弾&amp;lt;br /&amp;gt;装填数: 150&amp;lt;br /&amp;gt;次で使用: Navid</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_APName">
             <English>9.3mm 150Rnd AP Belt</English>
@@ -631,6 +682,7 @@
             <Czech>9.3mm 150náb. AP Pás</Czech>
             <Portuguese>Cinto de munição 9.3mm AP com 150 cartuchos</Portuguese>
             <Hungarian>9,3mm 150-lövedékes páncéltörő heveder</Hungarian>
+            <Japanese>9.3mm 150発入り 徹甲弾ベルト</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_APNameShort">
             <English>9.3mm AP</English>
@@ -643,6 +695,7 @@
             <Italian>9.3mm AP</Italian>
             <Portuguese>9.3mm AP</Portuguese>
             <Hungarian>9,3mm páncéltörő</Hungarian>
+            <Japanese>9.3mm 徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_150Rnd_93x64_Mag_APDescription">
             <English>Caliber: 9.3x64mm AP&lt;br /&gt;Rounds: 150&lt;br /&gt;Used in: Navid</English>
@@ -655,6 +708,7 @@
             <Czech>Ráže: 9.3x64mm AP&lt;br /&gt;Nábojů: 150&lt;br /&gt;Použití u: HK121</Czech>
             <Portuguese>Calibre: 9.3x64mm AP&lt;br /&gt;Cartuchos: 150&lt;br /&gt;Usado em: Navid</Portuguese>
             <Hungarian>Kaliber: 9,3x64mm páncéltörő&lt;br /&gt;Lövedékek: 150&lt;br /&gt;Használható: Navid</Hungarian>
+            <Japanese>口径: 9.3x64mm 徹甲弾&amp;lt;br /&amp;gt;装填数: 150&amp;lt;br /&amp;gt;次で使用: Navid</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_16Rnd_9x19_mag_Name">
             <English>9x19mm 16Rnd Mag</English>
@@ -667,6 +721,7 @@
             <Czech>9x19mm 16náb. Zásobník</Czech>
             <Portuguese>Carregador de 16 cartuchos 9x19mm</Portuguese>
             <Hungarian>9x19mm 16-lövedékes tár</Hungarian>
+            <Japanese>9x19mm 16発入り 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_16Rnd_9x19_mag_NameShort">
             <English>9x19mm</English>
@@ -679,6 +734,7 @@
             <Czech>9x19mm</Czech>
             <Portuguese>9x19mm</Portuguese>
             <Hungarian>9x19mm</Hungarian>
+            <Japanese>9x19mm</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_16Rnd_9x19_mag_Description">
             <English>9x19mm 30Rnd Mag</English>
@@ -691,6 +747,7 @@
             <Czech>9x19mm 30náb. Zásobník</Czech>
             <Portuguese>Carregador de 16 cartuchos 9x19mm</Portuguese>
             <Hungarian>9x19mm 16-lövedékes tár</Hungarian>
+            <Japanese>9x19mm 30発入り 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_9x19_mag_Name">
             <English>9x19mm 30Rnd Mag</English>
@@ -703,6 +760,7 @@
             <Czech>9x19mm 30náb. Zásobník</Czech>
             <Portuguese>Carregador de 30 cartuchos 9x19mm</Portuguese>
             <Hungarian>9x19mm 30-lövedékes tár</Hungarian>
+            <Japanese>9x19mm 30発入り 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_9x19_mag_NameShort">
             <English>9x19mm</English>
@@ -715,6 +773,7 @@
             <Czech>9x19mm</Czech>
             <Portuguese>9x19mm</Portuguese>
             <Hungarian>9x19mm</Hungarian>
+            <Japanese>9x19mm</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_9x19_mag_Description">
             <English>9x19mm 30Rnd Mag</English>
@@ -727,6 +786,7 @@
             <Czech>9x19mm 30náb. Zásobník</Czech>
             <Portuguese>Carregador de 30 cartuchos 9x19mm</Portuguese>
             <Hungarian>9x19mm 30-lövedékes tár</Hungarian>
+            <Japanese>9x19mm 30発入り 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x54_Tracer_mag_Name">
             <English>7.62x54mm 10Rnd Tracer Mag</English>
@@ -739,6 +799,7 @@
             <Czech>7.62x54mm 10náb. Svítící Zásobník</Czech>
             <Portuguese>Carregador com 10 cartuchos 7.62x54mm Traçante</Portuguese>
             <Hungarian>7,62x54mm 10-lövedékes nyomkövető tár</Hungarian>
+            <Japanese>7.62x54mm 10発入り 曳光弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x54_Tracer_mag_NameShort">
             <English>7.62mm</English>
@@ -751,6 +812,7 @@
             <Czech>7.62mm</Czech>
             <Portuguese>7.62mm</Portuguese>
             <Hungarian>7,62mm</Hungarian>
+            <Japanese>7.62mm</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x54_Tracer_mag_Description">
             <English>7.62x54mm 10Rnd Tracer Mag</English>
@@ -763,6 +825,7 @@
             <Czech>7.62x54mm 10náb. Svítící Zásobník</Czech>
             <Portuguese>Carregador com 10 cartuchos 7.62x54mm Traçante</Portuguese>
             <Hungarian>7,62x54mm 10-lövedékes nyomkövető tár</Hungarian>
+            <Japanese>7.62x54mm 10発入り 曳光弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_100Rnd_65x39_caseless_mag_Tracer_DimName">
             <English>6.5mm 100Rnd Tracer IR-DIM Mag</English>
@@ -775,6 +838,7 @@
             <Czech>6.5mm 100náb. Svítící IR-DIM Zásobník</Czech>
             <Portuguese>Carregador com 100 cartuchos 6.5mm IR-DIM Traçante</Portuguese>
             <Hungarian>6,5mm 100-lövedékes infravörös nyomkövető tár</Hungarian>
+            <Japanese>6.5mm 100発入り IR-DIM曳光弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_100Rnd_65x39_caseless_mag_Tracer_DimNameShort">
             <English>6.5mm IR-DIM</English>
@@ -787,6 +851,7 @@
             <Czech>6.5mm IR-DIM</Czech>
             <Portuguese>6.5mm IR-DIM</Portuguese>
             <Hungarian>6,5mm infravörös nyomkövető</Hungarian>
+            <Japanese>6.5mm IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_100Rnd_65x39_caseless_mag_Tracer_DimDescription">
             <English>6.5mm 100Rnd Tracer IR-DIM Mag&lt;br /&gt;Rounds: 100&lt;br /&gt;Used in: MX LSW</English>
@@ -799,6 +864,7 @@
             <Czech>6.5mm 100náb. Svítící IR-DIM Zásobník&lt;br /&gt;Nábojů: 100&lt;br /&gt;Použití u: MX LSW</Czech>
             <Portuguese>Carregador 6.5mm 100 Cartuchos Traçantes IR-DIM&lt;br /&gt;Cartuchos: 100&lt;br /&gt;Usado em: MX LSW</Portuguese>
             <Hungarian>6.5mm 100-lövedékes infravörös nyomkövető tár&lt;br /&gt;Lövedékek: 100&lt;br /&gt;Használható: MX LSW</Hungarian>
+            <Japanese>6.5mm 100発入り IR-DIM曳光弾 弾倉&amp;lt;br /&amp;gt;装填数: 100&amp;lt;br /&amp;gt;次で使用: MX LSW</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_200Rnd_65x39_cased_Box_Tracer_DimName">
             <English>6.5mm 200Rnd Tracer IR-DIM Belt</English>
@@ -811,6 +877,7 @@
             <Czech>6.5mm 200náb. Svítící IR-DIM Pás</Czech>
             <Portuguese>Cinto de munição traçante 6.5mm IR-DIM com 200 cartuchos</Portuguese>
             <Hungarian>6,5mm 200-lövedékes infravörös nyomkövető heveder</Hungarian>
+            <Japanese>6.5mm 200発入り IR-DIM曳光弾ベルト</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_200Rnd_65x39_cased_Box_Tracer_DimNameShort">
             <English>6.5mm IR-DIM</English>
@@ -823,6 +890,7 @@
             <Czech>6.5mm IR-DIM</Czech>
             <Portuguese>6.5mm IR-DIM</Portuguese>
             <Hungarian>6,5mm infravörös nyomkövető</Hungarian>
+            <Japanese>6.5mm IR-DIM曳光弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_200Rnd_65x39_cased_Box_Tracer_DimDescription">
             <English>6.5mm 200Rnd Tracer IR-DIM Belt&lt;br /&gt;Rounds: 200&lt;br /&gt;Used in: Stoner 99 LMG</English>
@@ -835,6 +903,7 @@
             <Czech>6.5mm 200náb. Svítící IR-DIM Pás&lt;br /&gt;Nábojů: 200&lt;br /&gt;Použití u: Stoner 99 LMG</Czech>
             <Portuguese>Cinto de munição traçante 6.5mm IR-DIM com 200 cartuchos&lt;br /&gt;Cartuchos: 200&lt;br /&gt;Usado em: Stoner 99 LMG</Portuguese>
             <Hungarian>6.5mm 200-lövedékes infravörös nyomkövető heveder&lt;br /&gt;Lövedékek: 200&lt;br /&gt;Használható: Stoner 99 LMG</Hungarian>
+            <Japanese>6.5mm 200発入り IR-DIM曳光弾ベルト&amp;lt;br /&amp;gt;装填数: 200&amp;lt;br /&amp;gt;次で使用: Stoner 99 LMG</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_Mk262_mag_Name">
             <English>5.56mm 30Rnd Mag (Mk262)</English>
@@ -847,6 +916,7 @@
             <Czech>5.56mm 30náb. Zásobník (Mk262)</Czech>
             <Portuguese>Carregador 5.56mm com 30 cartuchos (Mk262)</Portuguese>
             <Hungarian>5,56mm 30-lövedékes tár (Mk262)</Hungarian>
+            <Japanese>5.56mm 30発入り 弾倉 (Mk262)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_Mk262_mag_NameShort">
             <English>5.56mm Mk262</English>
@@ -859,6 +929,7 @@
             <Czech>5.56mm Mk262</Czech>
             <Portuguese>5.56mm Mk262</Portuguese>
             <Hungarian>5,56mm Mk262</Hungarian>
+            <Japanese>5.56mm Mk262</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_Mk262_mag_Description">
             <English>Caliber: 5.56x45mm NATO (Mk262)&lt;br /&gt;Rounds: 30</English>
@@ -871,6 +942,7 @@
             <Czech>Ráže: 5.56x45mm NATO (Mk262)&lt;br /&gt;Nábojů: 30</Czech>
             <Portuguese>Calibre: 5.56x45mm NATO (Mk262)&lt;br/&gt;Cartuchos: 30</Portuguese>
             <Hungarian>Kaliber: 5,56x45mm NATO (Mk262)&lt;br /&gt;Lövedékek: 30</Hungarian>
+            <Japanese>口径: 5.56x45mm NATO (Mk262)&amp;lt;br /&amp;gt;装填数: 30</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_Mk318_mag_Name">
             <English>5.56mm 30Rnd Mag (Mk318)</English>
@@ -883,6 +955,7 @@
             <Czech>5.56mm 30Rnd Zásobník (Mk318)</Czech>
             <Portuguese>Carregador 5.56mm com 30 cartuchos (Mk318)</Portuguese>
             <Hungarian>5,56mm 30-lövedékes tár (Mk318)</Hungarian>
+            <Japanese>5.56mm 30発入り 弾倉 (Mk318)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_Mk318_mag_NameShort">
             <English>5.56mm Mk318</English>
@@ -895,6 +968,7 @@
             <Czech>5.56mm Mk318</Czech>
             <Portuguese>5.56mm Mk318</Portuguese>
             <Hungarian>5,56mm Mk318</Hungarian>
+            <Japanese>5.56mm Mk318</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_Mk318_mag_Description">
             <English>Caliber: 5.56x45mm NATO (Mk318)&lt;br /&gt;Rounds: 30</English>
@@ -907,6 +981,7 @@
             <Czech>Ráže: 5.56x45mm NATO (Mk318)&lt;br /&gt;Nábojů: 30</Czech>
             <Portuguese>Calibre: 5.56x45mm NATO (Mk318)&lt;br/&gt;Cartuchos: 30</Portuguese>
             <Hungarian>Kaliber: 5,56x45mm NATO (Mk318)&lt;br /&gt;Lövedékek: 30</Hungarian>
+            <Japanese>口径: 5.56x45mm NATO (Mk318)&amp;lt;br /&amp;gt;装填数: 30</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M995_AP_mag_Name">
             <English>5.56mm 30Rnd Mag (M995 AP)</English>
@@ -919,6 +994,7 @@
             <Czech>5.56mm 30náb. Zásobník (M995 AP)</Czech>
             <Portuguese>Carregador 5.56mm com 30 cartuchos (M995 AP)</Portuguese>
             <Hungarian>5,56mm 30-lövedékes tár (M995 páncéltörő)</Hungarian>
+            <Japanese>5.56mm 30発入り 弾倉 (M995 徹甲弾)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M995_AP_mag_NameShort">
             <English>5.56mm AP</English>
@@ -931,6 +1007,7 @@
             <Czech>5.56mm AP</Czech>
             <Portuguese>5.56mm M995 AP</Portuguese>
             <Hungarian>5,56mm páncéltörő</Hungarian>
+            <Japanese>5.56mm 徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_556x45_Stanag_M995_AP_mag_Description">
             <English>Caliber: 5.56x45mm NATO (M995 AP)&lt;br /&gt;Rounds: 30</English>
@@ -943,6 +1020,7 @@
             <Czech>Ráže: 5.56x45mm NATO (M995 AP)&lt;br /&gt;Nábojů: 30</Czech>
             <Portuguese>Calibre: 5.56x45mm NATO (M995 AP)&lt;br/&gt;Cartuchos: 30</Portuguese>
             <Hungarian>Kaliber: 5,56x45mm NATO (M995 páncéltörő)&lt;br /&gt;Lövedékek: 30</Hungarian>
+            <Japanese>口径: 5.56x45mm NATO (M995 徹甲弾)&amp;lt;br /&amp;gt;装填数: 30</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_M118LR_Mag_Name">
             <English>7.62mm 10Rnd Mag (M118LR)</English>
@@ -955,6 +1033,7 @@
             <Czech>7.62mm 10náb. Zásobník (M118LR)</Czech>
             <Portuguese>Carregador 7.62mm com 10 cartuchos (M118LR)</Portuguese>
             <Hungarian>7,62mm 10-lövedékes tár (M118LR)</Hungarian>
+            <Japanese>7.62mm 10発入り 弾倉 (M118LR)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_M118LR_Mag_NameShort">
             <English>7.62mm M118LR</English>
@@ -967,6 +1046,7 @@
             <Czech>7.62mm M118LR</Czech>
             <Portuguese>7.62mm M118LR</Portuguese>
             <Hungarian>7,62mm M118LR</Hungarian>
+            <Japanese>7.62mm M118LR</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_M118LR_Mag_Description">
             <English>Caliber: 7.62x51mm NATO (M118LR)&lt;br /&gt;Rounds: 10</English>
@@ -979,6 +1059,7 @@
             <Czech>Ráže: 7.62x51mm NATO (M118LR)&lt;br /&gt;Nábojů: 10</Czech>
             <Portuguese>Calibre: 7.26x51mm NATO (M118LR)&lt;br/&gt;Cartuchos: 10</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (M118LR)&lt;br /&gt;Lövedékek: 10</Hungarian>
+            <Japanese>口径: 7.62x51mm NATO (M118LR)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_M118LR_Mag_Name">
             <English>7.62mm 20Rnd Mag (M118LR)</English>
@@ -991,6 +1072,7 @@
             <Czech>7.62mm 20náb. Zásobník (M118LR)</Czech>
             <Portuguese>Carregador 7.62mm com 20 cartuchos (M118LR)</Portuguese>
             <Hungarian>7,62mm 20-lövedékes tár (M118LR)</Hungarian>
+            <Japanese>7.62mm 20発入り 弾倉 (M118LR)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_M118LR_Mag_NameShort">
             <English>7.62mm M118LR</English>
@@ -1003,6 +1085,7 @@
             <Czech>7.62mm M118LR</Czech>
             <Portuguese>7.62mm M118LR</Portuguese>
             <Hungarian>7,62mm M118LR</Hungarian>
+            <Japanese>7.62mm M118LR</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_M118LR_Mag_Description">
             <English>Caliber: 7.62x51mm NATO (M118LR)&lt;br /&gt;Rounds: 20</English>
@@ -1015,6 +1098,7 @@
             <Czech>Ráže: 7.62x51mm NATO (M118LR)&lt;br /&gt;Nábojů: 20</Czech>
             <Portuguese>Calibre: 7.26x51mm NATO (M118LR)&lt;br/&gt;Cartuchos: 20</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (M118LR)&lt;br /&gt;Lövedékek: 20</Hungarian>
+            <Japanese>口径: 7.62x51mm NATO (M118LR)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_Mk316_Mod_0_Mag_Name">
             <English>7.62mm 10Rnd Mag (Mk316 Mod 0)</English>
@@ -1027,6 +1111,7 @@
             <Czech>7.62mm 10náb. Zásobník (Mk316 Mod 0)</Czech>
             <Portuguese>Carregador 7.62mm com 10 cartuchos (Mk316 Mod 0)</Portuguese>
             <Hungarian>7,62mm 10-lövedékes tár (Mk316 Mod 0)</Hungarian>
+            <Japanese>7.62mm 10発入り 弾倉 (Mk316 Mod 0)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_Mk316_Mod_0_Mag_NameShort">
             <English>7.62mm Mk316</English>
@@ -1039,6 +1124,7 @@
             <Czech>7.62mm Mk316</Czech>
             <Portuguese>7.62mm Mk316</Portuguese>
             <Hungarian>7,62mm Mk316</Hungarian>
+            <Japanese>7.62mm Mk316</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_Mk316_Mod_0_Mag_Description">
             <English>Caliber: 7.62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Rounds: 10</English>
@@ -1051,6 +1137,7 @@
             <Czech>Ráže: 7.62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Nábojů: 10</Czech>
             <Portuguese>Calibre: 7.26x51mm NATO (Mk316 Mod 0)&lt;br/&gt;Cartuchos: 10</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Lövedékek: 10</Hungarian>
+            <Japanese>口径: 7.62x51mm NATO (Mk316 Mod 0)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_Mk316_Mod_0_Mag_Name">
             <English>7.62mm 20Rnd Mag (Mk316 Mod 0)</English>
@@ -1063,6 +1150,7 @@
             <Czech>7.62mm 20náb. Zásobník (Mk316 Mod 0)</Czech>
             <Portuguese>Carregador 7.62mm com 20 cartuchos (Mk316 Mod 0)</Portuguese>
             <Hungarian>7,62mm 20-lövedékes tár (Mk316 Mod 0)</Hungarian>
+            <Japanese>7.62mm 20発入り 弾倉 (Mk316 Mod 0)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_Mk316_Mod_0_Mag_NameShort">
             <English>7.62mm Mk316</English>
@@ -1075,6 +1163,7 @@
             <Czech>7.62mm Mk316</Czech>
             <Portuguese>7.62mm Mk316</Portuguese>
             <Hungarian>7,62mm Mk316</Hungarian>
+            <Japanese>7.62mm Mk316</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_Mk316_Mod_0_Mag_Description">
             <English>Caliber: 7.62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Rounds: 20</English>
@@ -1087,6 +1176,7 @@
             <Czech>Ráže: 7.62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Nábojů: 20</Czech>
             <Portuguese>Calibre: 7.26x51mm NATO (Mk316 Mod 0)&lt;br/&gt;Cartuchos: 20</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (Mk316 Mod 0)&lt;br /&gt;Lövedékek: 20</Hungarian>
+            <Japanese>口径: 7.62x51mm NATO (Mk316 Mod 0)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_Mk319_Mod_0_Mag_Name">
             <English>7.62mm 10Rnd Mag (Mk319 Mod 0)</English>
@@ -1099,6 +1189,7 @@
             <Czech>7.62mm 10náb. Zásobník (Mk319 Mod 0)</Czech>
             <Portuguese>Carregador 7.62mm com 10 cartuchos (Mk319 Mod 0)</Portuguese>
             <Hungarian>7,62mm 10-lövedékes tár (Mk319 Mod 0)</Hungarian>
+            <Japanese>7.62mm 10発入り 弾倉 (Mk319 Mod 0)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_Mk319_Mod_0_Mag_NameShort">
             <English>7.62mm Mk319</English>
@@ -1111,6 +1202,7 @@
             <Czech>7.62mm Mk319</Czech>
             <Portuguese>7.62mm Mk319</Portuguese>
             <Hungarian>7,62mm Mk319</Hungarian>
+            <Japanese>7.62mm Mk319</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_Mk319_Mod_0_Mag_Description">
             <English>Caliber: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Rounds: 10</English>
@@ -1123,6 +1215,7 @@
             <Czech>Ráže: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Nábojů: 10</Czech>
             <Portuguese>Calibre: 7.26x51mm NATO (Mk319 Mod 0)&lt;br/&gt;Cartuchos: 10</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Lövedékek: 10</Hungarian>
+            <Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_Mk319_Mod_0_Mag_Name">
             <English>7.62mm 20Rnd Mag (Mk319 Mod 0)</English>
@@ -1135,6 +1228,7 @@
             <Czech>7.62mm 20náb. Zásobník (Mk319 Mod 0)</Czech>
             <Portuguese>Carregador 7.62mm com 20 cartuchos (Mk319 Mod 0)</Portuguese>
             <Hungarian>7,62mm 20-lövedékes tár (Mk319 Mod 0)</Hungarian>
+            <Japanese>7.62mm 20発入り 弾倉 (Mk319 Mod 0)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_Mk319_Mod_0_Mag_NameShort">
             <English>7.62mm Mk319</English>
@@ -1147,6 +1241,7 @@
             <Czech>7.62mm Mk319</Czech>
             <Portuguese>7.62mm Mk319</Portuguese>
             <Hungarian>7,62mm Mk319</Hungarian>
+            <Japanese>7.62mm Mk319</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_Mk319_Mod_0_Mag_Description">
             <English>Caliber: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Rounds: 20</English>
@@ -1159,6 +1254,7 @@
             <Czech>Ráže: 7.62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Nábojů: 20</Czech>
             <Portuguese>Calibre: 7.26x51mm NATO (Mk319 Mod 0)&lt;br/&gt;Cartuchos: 20</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (Mk319 Mod 0)&lt;br /&gt;Lövedékek: 20</Hungarian>
+            <Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_M993_AP_Mag_Name">
             <English>7.62mm 10Rnd Mag (M993 AP)</English>
@@ -1171,6 +1267,7 @@
             <Czech>7.62 10náb. Zásobník (M993 AP)</Czech>
             <Portuguese>Carregador 7.62mm com 10 cartuchos (M993 AP)</Portuguese>
             <Hungarian>7,62mm 10-lövedékes tár (M993 páncéltörő)</Hungarian>
+            <Japanese>7.62mm 10発入り 弾倉 (M993 徹甲弾)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_M993_AP_Mag_NameShort">
             <English>7.62mm AP</English>
@@ -1183,6 +1280,7 @@
             <Czech>7.62mm AP</Czech>
             <Portuguese>7.62mm AP</Portuguese>
             <Hungarian>7,62mm páncéltörő</Hungarian>
+            <Japanese>7.62mm 徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_762x51_M993_AP_Mag_Description">
             <English>Caliber: 7.62x51mm NATO (M993 AP)&lt;br /&gt;Rounds: 10</English>
@@ -1195,6 +1293,7 @@
             <Czech>Ráže: 7.62x51mm NATO (M993 AP)&lt;br /&gt;Nábojů: 10</Czech>
             <Portuguese>Calibre: 7.26x51mm NATO (M993 AP)&lt;br/&gt;Cartuchos: 10</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (M993 páncéltörő)&lt;br /&gt;Lövedékek: 10</Hungarian>
+            <Japanese>口径: 7.62x51mm NATO (Mk319 Mod 0)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_M993_AP_Mag_Name">
             <English>7.62mm 20Rnd Mag (M993 AP)</English>
@@ -1207,6 +1306,7 @@
             <Czech>7.62mm 20náb. Zásobník (M993 AP)</Czech>
             <Portuguese>Carregador 7.62mm com 20 cartuchos (M993 AP)</Portuguese>
             <Hungarian>7,62mm 20-lövedékes tár (M993 páncéltörő)</Hungarian>
+            <Japanese>7.62mm 20発入り 弾倉 (M993 徹甲弾)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_M993_AP_Mag_NameShort">
             <English>7.62mm AP</English>
@@ -1219,6 +1319,7 @@
             <Czech>7.62mm AP</Czech>
             <Portuguese>7.62mm AP</Portuguese>
             <Hungarian>7,62mm páncéltörő</Hungarian>
+            <Japanese>7.62mm 徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x51_M993_AP_Mag_Description">
             <English>Caliber: 7.62x51mm NATO (M993 AP)&lt;br /&gt;Rounds: 20</English>
@@ -1231,6 +1332,7 @@
             <Czech>Ráže: 7.62x51mm NATO (M993 AP)&lt;br /&gt;Nábojů: 20</Czech>
             <Portuguese>Calibre: 7.26x51mm NATO (M993 AP)&lt;br/&gt;Cartuchos: 20</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (M993 páncéltörő)&lt;br /&gt;Lövedékek: 20</Hungarian>
+            <Japanese>口径: 7.62x51mm NATO (M993 徹甲弾)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Mk248_Mod_0_Mag_Name">
             <English>7.62mm 20Rnd Mag (Mk248 Mod 0)</English>
@@ -1243,6 +1345,7 @@
             <Czech>7.62mm 20náb. Zásobník (Mk248 Mod 0)</Czech>
             <Portuguese>Carregador 7.62mm com 20 cartuchos (Mk248 Mod 0)</Portuguese>
             <Hungarian>7,62mm 20-lövedékes tár (Mk248 Mod 0)</Hungarian>
+            <Japanese>7.62mm 20発入り 弾倉 (Mk248 Mod 0)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Mk248_Mod_0_Mag_NameShort">
             <English>7.62mm Mk248</English>
@@ -1255,6 +1358,7 @@
             <Czech>7.62mm Mk248</Czech>
             <Portuguese>7.62mm Mk248</Portuguese>
             <Hungarian>7,62mm Mk248</Hungarian>
+            <Japanese>7.62mm Mk248</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Mk248_Mod_0_Mag_Description">
             <English>Caliber: 7.62x67mm NATO (Mk248 Mod 0)&lt;br /&gt;Rounds: 20</English>
@@ -1267,6 +1371,7 @@
             <Czech>Ráže: 7.62x67mm NATO (Mk248 Mod 0)&lt;br /&gt;Nábojů: 20</Czech>
             <Portuguese>Calibre: 7.26x67mm NATO (Mk248 Mod 0)&lt;br/&gt;Cartuchos: 20</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (Mk248 Mod 0)&lt;br /&gt;Lövedékek: 20</Hungarian>
+            <Japanese>口径: 7.62x67mm NATO (Mk248 Mod 0)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Mk248_Mod_1_Mag_Name">
             <English>7.62mm 20Rnd Mag (Mk248 Mod 1)</English>
@@ -1279,6 +1384,7 @@
             <Czech>7.62mm 20náb. Zásobník (Mk248 Mod 1)</Czech>
             <Portuguese>Carregador 7.62mm com 20 cartuchos (Mk248 Mod 1)</Portuguese>
             <Hungarian>7,62mm 20-lövedékes tár (Mk248 Mod 1)</Hungarian>
+            <Japanese>7.62mm 20発入り 弾倉 (Mk248 Mod 1)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Mk248_Mod_1_Mag_NameShort">
             <English>7.62mm Mk248</English>
@@ -1291,6 +1397,7 @@
             <Czech>7.62mm Mk248</Czech>
             <Portuguese>7.62mm Mk248</Portuguese>
             <Hungarian>7,62mm Mk248</Hungarian>
+            <Japanese>7.62mm Mk248</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Mk248_Mod_1_Mag_Description">
             <English>Caliber: 7.62x67mm NATO (Mk248 Mod 1)&lt;br /&gt;Rounds: 20</English>
@@ -1303,6 +1410,7 @@
             <Czech>Ráže: 7.62x67mm NATO (Mk248 Mod 1)&lt;br /&gt;Nábojů: 20</Czech>
             <Portuguese>Calibre: 7.26x67mm NATO (Mk248 Mod 1)&lt;br/&gt;Cartuchos: 20</Portuguese>
             <Hungarian>Kaliber: 7,62x51mm NATO (Mk248 Mod 1)&lt;br /&gt;Lövedékek: 20</Hungarian>
+            <Japanese>口径: 7.62x67mm NATO (Mk248 Mod 1)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name">
             <English>7.62mm 20Rnd Mag (Berger Hybrid OTM)</English>
@@ -1315,6 +1423,7 @@
             <Czech>7.62mm 20náb. Zásobník (Berger Hybrid OTM)</Czech>
             <Portuguese>Carregador 7.62mm com 20 cartuchos (Berger Hybrid OTM)</Portuguese>
             <Hungarian>7,62mm 20-lövedékes tár (Berger Hybrid OTM)</Hungarian>
+            <Japanese>7.62mm 20発入り 弾倉 (Berger Hybrid OTM)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort">
             <English>7.62mm OTM</English>
@@ -1327,6 +1436,7 @@
             <Czech>7.62mm OTM</Czech>
             <Portuguese>7.62mm OTM</Portuguese>
             <Hungarian>7,62mm OTM</Hungarian>
+            <Japanese>7.62mm OTM</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_20Rnd_762x67_Berger_Hybrid_OTM_Mag_Description">
             <English>Caliber: 7.62x67mm NATO (Berger Hybrid OTM)&lt;br /&gt;Rounds: 20</English>
@@ -1339,6 +1449,7 @@
             <Czech>Ráže: 7.62x67mm NATO (Berger Hybrid OTM)&lt;br /&gt;Nábojů: 20</Czech>
             <Portuguese>Calibre: 7.26x67mm NATO (Berger Hybrid OTM)&lt;br/&gt;Cartuchos: 20</Portuguese>
             <Hungarian>Kaliber: 7,62x67mm NATO (Berger Hybrid OTM)&lt;br /&gt;Lövedékek: 20</Hungarian>
+            <Japanese>口径: 7.62x67mm NATO (Berger Hybrid OTM)&amp;lt;br /&amp;gt;装填数: 20</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x47_Scenar_mag_Name">
             <English>6.5x47mm 30Rnd Mag (HPBT Scenar)</English>
@@ -1351,6 +1462,7 @@
             <Czech>6.5x47mm 30náb. Zásobník (HPBT Scenar)</Czech>
             <Portuguese>Carregador 6.5x47mm com 30 cartuchos (HPBT Scenar)</Portuguese>
             <Hungarian>6,5x47mm 30-lövedékes tár (HPBT Scenar)</Hungarian>
+            <Japanese>6.5x47mm 30発入り 弾倉 (HPBT Scenar)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x47_Scenar_mag_NameShort">
             <English>6.5mm Lapua</English>
@@ -1363,6 +1475,7 @@
             <Czech>6.5mm Lapua</Czech>
             <Portuguese>6.5mm Lapua</Portuguese>
             <Hungarian>6,5mm Lapua</Hungarian>
+            <Japanese>6.5mm Lapua</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65x47_Scenar_mag_Description">
             <English>Caliber: 6.5x47mm (HPBT Scenar)&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: MXM</English>
@@ -1375,6 +1488,7 @@
             <Czech>Ráže: 6.5x47mm (HPBT Scenar)&lt;br /&gt;Nábojů: 30&lt;br /&gt;Použití u: MXM</Czech>
             <Portuguese>Calibre: 6.5x47mm (HPBT Scenar)&lt;br/&gt;Cartuchos: 30&lt;br/&gt;Usado em: MXM</Portuguese>
             <Hungarian>Kaliber: 6,5x47mm (HPBT Scenar)&lt;br /&gt;Lövedékek: 30&lt;br /&gt;Használható: MXM</Hungarian>
+            <Japanese>口径: 6.5x47mm (HPBT Scenar)&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MXM</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65_Creedmor_mag_Name">
             <English>6.5mm Creedmor 30Rnd Mag</English>
@@ -1387,6 +1501,7 @@
             <Czech>6.5mm Creedmor 30náb. Zásobník</Czech>
             <Portuguese>Carregador 6.5mm com 30 cartuchos Creedmor</Portuguese>
             <Hungarian>6,5mm Creedmor 30-lövedékes tár</Hungarian>
+            <Japanese>6.5mm Creedmor 30発入り 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65_Creedmor_mag_NameShort">
             <English>6.5mm CM</English>
@@ -1399,6 +1514,7 @@
             <Czech>6.5mm CM</Czech>
             <Portuguese>6.5mm CM</Portuguese>
             <Hungarian>6,5mm CM</Hungarian>
+            <Japanese>6.5mm CM</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_30Rnd_65_Creedmor_mag_Description">
             <English>Caliber: 6.5x47mm Creedmor&lt;br /&gt;Rounds: 30&lt;br /&gt;Used in: MXM</English>
@@ -1411,6 +1527,7 @@
             <Czech>Ráže: 6.5x47mm Creedmor&lt;br /&gt;Nábojů: 30&lt;br /&gt;Použití u: MXM</Czech>
             <Portuguese>Calibre: 6.5x47mm Creedmor&lt;br/&gt;Cartuchos: 30&lt;br/&gt;Usado em: MXM</Portuguese>
             <Hungarian>Kaliber: 6,5x47mm Creedmor&lt;br /&gt;Lövedékek: 30&lt;br /&gt;Használható: MXM</Hungarian>
+            <Japanese>口径: 6.5x47mm Creedmor&amp;lt;br /&amp;gt;装填数: 30&amp;lt;br /&amp;gt;次で使用: MXM</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_338_300gr_HPBT_Mag_Name">
             <English>.338 10Rnd Mag (300gr Sierra MatchKing HPBT)</English>
@@ -1423,6 +1540,7 @@
             <Czech>.338 10náb. Zásobník (300gr Sierra MatchKing HPBT)</Czech>
             <Portuguese>Carregador .338 (300gr Sierra MatchKing HPBT) com 10 cartuchos </Portuguese>
             <Hungarian>.338 10-lövedékes tár (300gr Sierra MatchKing HPBT)</Hungarian>
+            <Japanese>.338 10発入り 弾倉 (300gr Sierra MatchKing HPBT)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_338_300gr_HPBT_Mag_NameShort">
             <English>.338 HPBT</English>
@@ -1435,6 +1553,7 @@
             <Czech>.338 HPBT</Czech>
             <Portuguese>.338 HPBT</Portuguese>
             <Hungarian>.338 HPBT</Hungarian>
+            <Japanese>338 HPBT</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_338_300gr_HPBT_Mag_Description">
             <English>Caliber: 8.6x70mm (300gr Sierra MatchKing HPBT)&lt;br /&gt;Rounds: 10</English>
@@ -1447,6 +1566,7 @@
             <Czech>Ráže: 8.6x70mm (300gr Sierra MatchKing HPBT)&lt;br /&gt;Nábojů: 10</Czech>
             <Portuguese>Calibre: 8.6x70mm  (300gr Sierra MatchKing HPBT)&lt;br/&gt;Cartuchos: 10</Portuguese>
             <Hungarian>Kaliber: 8,6x70mm (300gr Sierra MatchKing HPBT)&lt;br /&gt;Lövedékek: 10</Hungarian>
+            <Japanese>口径: 8.6x70mm (300gr Sierra MatchKing HPBT)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_338_API526_Mag_Name">
             <English>.338 10Rnd Mag (API526)</English>
@@ -1459,6 +1579,7 @@
             <Czech>.338 10náb. Zásobník (API526)</Czech>
             <Portuguese>Carregador .338 (API526) com 10 cartuchos </Portuguese>
             <Hungarian>.338 10-lövedékes tár (API526)</Hungarian>
+            <Japanese>.338 10発入り 弾倉 (API526)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_338_API526_Mag_NameShort">
             <English>.338 AP</English>
@@ -1471,6 +1592,7 @@
             <Czech>.338 AP</Czech>
             <Portuguese>.338 AP</Portuguese>
             <Hungarian>.338 páncéltörő</Hungarian>
+            <Japanese>.338 徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_10Rnd_338_API526_Mag_Description">
             <English>Caliber: 8.6x70mm (API526)&lt;br /&gt;Rounds: 10</English>
@@ -1483,6 +1605,7 @@
             <Czech>Ráže: 8.6x70mm (API526)&lt;br /&gt;Nábojů: 10</Czech>
             <Portuguese>Calibre: 8.6x70mm  (API526)&lt;br/&gt;Cartuchos: 10</Portuguese>
             <Hungarian>Kaliber: 8,6x70mm (API526)&lt;br /&gt;Lövedékek: 10</Hungarian>
+            <Japanese>口径: 8.6x70mm (API526)&amp;lt;br /&amp;gt;装填数: 10</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_Mag_Name">
             <English>12.7x99mm 5Rnd Mag</English>
@@ -1495,6 +1618,7 @@
             <Czech>12.7x99mm 5náb. Zásobník</Czech>
             <Portuguese>Carregador 12.7x99mm com 5 cartuchos </Portuguese>
             <Hungarian>12,7x99mm 5-lövedékes tár</Hungarian>
+            <Japanese>12.7x99mm 5発入り 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_Mag_NameShort">
             <English>12.7mm</English>
@@ -1507,6 +1631,7 @@
             <Czech>12.7mm</Czech>
             <Portuguese>12.7mm</Portuguese>
             <Hungarian>12,7mm</Hungarian>
+            <Japanese>12.7mm</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_Mag_Description">
             <English>Caliber: 12.7x99mm&lt;br /&gt;Rounds: 5</English>
@@ -1519,6 +1644,7 @@
             <Czech>Ráže: 12.7x99mm&lt;br /&gt;Nábojů: 5</Czech>
             <Portuguese>Calibre: 12.7x99mm&lt;br/&gt;Cartuchos: 5</Portuguese>
             <Hungarian>Kaliber: 12,7x99mm&lt;br /&gt;Lövedékek: 5</Hungarian>
+            <Japanese>口径: 12.7x99mm&amp;lt;br /&amp;gt;装填数: 5</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_API_Mag_Name">
             <English>12.7x99mm API 5Rnd Mag</English>
@@ -1531,6 +1657,7 @@
             <Czech>12.7x99mm API 5náb. Zásobník</Czech>
             <Portuguese>Carregador 12.7x99mm API com 5 cartuchos </Portuguese>
             <Hungarian>12,7x99mm 5-lövedékes tár (páncéltörő-gyújtó)</Hungarian>
+            <Japanese>12.7x99mm 5発入り焼夷徹甲弾 弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_API_Mag_NameShort">
             <English>12.7mm API</English>
@@ -1543,6 +1670,7 @@
             <Czech>12.7mm API</Czech>
             <Portuguese>12.7mm API</Portuguese>
             <Hungarian>12,7mm páncéltörő-gyújtó</Hungarian>
+            <Japanese>12.7mm 焼夷徹甲弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_API_Mag_Description">
             <English>Caliber: 12.7x99mm API&lt;br /&gt;Rounds: 5</English>
@@ -1555,6 +1683,7 @@
             <Czech>Ráže: 12.7x99mm API&lt;br /&gt;Nábojů: 5</Czech>
             <Portuguese>Calibre: 12.7x99mm API&lt;br/&gt;Cartuchos: 5</Portuguese>
             <Hungarian>Kaliber: 12,7x99mm API&lt;br /&gt;Lövedékek: 5</Hungarian>
+            <Japanese>口径: 12.7x99mm 焼夷徹甲弾&amp;lt;br /&amp;gt;装填数: 5</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_AMAX_Mag_Name">
             <English>12.7x99mm 5Rnd Mag (AMAX)</English>
@@ -1567,6 +1696,7 @@
             <Czech>12.7x99mm 5náb. Zásobník (AMAX)</Czech>
             <Portuguese>Carregador 12.7x99mm (AMAX) com 5 cartuchos </Portuguese>
             <Hungarian>12,7x99mm 5-lövedékes tár (AMAX)</Hungarian>
+            <Japanese>12.7x99mm 5発入り 弾倉 (AMAX)</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_AMAX_Mag_NameShort">
             <English>12.7mm</English>
@@ -1579,6 +1709,7 @@
             <Czech>12.7mm</Czech>
             <Portuguese>12.7mm</Portuguese>
             <Hungarian>12,7mm</Hungarian>
+            <Japanese>12.7mm</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_5Rnd_127x99_AMAX_Mag_Description">
             <English>Caliber: 12.7x99mm (AMAX)&lt;br /&gt;Rounds: 5</English>
@@ -1591,6 +1722,7 @@
             <Czech>Ráže: 12.7x99mm (AMAX)&lt;br /&gt;Nábojů: 5</Czech>
             <Portuguese>Calibre: 12.7x99mm (AMAX)&lt;br/&gt;Cartuchos: 5</Portuguese>
             <Hungarian>Kaliber: 12,7x99mm (AMAX)&lt;br /&gt;Lövedékek: 5</Hungarian>
+            <Japanese>口径: 12.7x99mm (AMAX)&amp;lt;br /&amp;gt;装填数: 5</Japanese>
         </Key>
         <Key ID="STR_ACE_Ballistics_AmmoSupplyCrate_DisplayName">
             <English>[ACE] Ammo Supply Crate</English>
@@ -1603,6 +1735,7 @@
             <Hungarian>[ACE] Lőszeres láda</Hungarian>
             <Russian>[ACE] Ящик с боеприпасами</Russian>
             <Italian>[ACE] Cassa munizioni</Italian>
+            <Japanese>[ACE] 弾薬物資箱</Japanese>
         </Key>
     </Package>
 </Project>

addons/captives/config.cpp

@@ -20,11 +20,3 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 #include "CfgWeapons.hpp"
 #include "CfgEden.hpp"
-
-class ACE_newEvents {
-    SetSurrendered = QGVAR(setSurrendered);
-    SetHandcuffed = QGVAR(setHandcuffed);
-    MoveOutCaptive = QGVAR(moveOutCaptive);
-    MoveInCaptive = QGVAR(moveInCaptive);
-    CaptiveStatusChanged = "ace_captiveStatusChanged";
-};

addons/captives/stringtable.xml

@@ -12,6 +12,7 @@
             <Portuguese>Tomar Prisioneiro</Portuguese>
             <Hungarian>Foglyul ejtés</Hungarian>
             <Russian>Взять в плен</Russian>
+            <Japanese>捕虜にする</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ReleaseCaptive">
             <English>Free Prisoner</English>
@@ -24,6 +25,7 @@
             <Portuguese>Libertar Prisioneiro</Portuguese>
             <Hungarian>Fogoly szabadon engedése</Hungarian>
             <Russian>Освободить пленника</Russian>
+            <Japanese>捕虜を解放する</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_EscortCaptive">
             <English>Escort Prisoner</English>
@@ -36,6 +38,7 @@
             <Portuguese>Escoltar Prisioneiro</Portuguese>
             <Hungarian>Fogoly kísérése</Hungarian>
             <Russian>Конвоировать пленника</Russian>
+            <Japanese>捕虜を移動させる</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_StopEscorting">
             <English>Release Prisoner</English>
@@ -48,6 +51,7 @@
             <Portuguese>Largar Prisioneiro</Portuguese>
             <Hungarian>Fogoly elengedése</Hungarian>
             <Russian>Прекратить конвоирование</Russian>
+            <Japanese>捕虜を解放する</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_NoCaptive">
             <English>You need to take him as prisoner first!</English>
@@ -60,6 +64,7 @@
             <Portuguese>Você deve tomá-lo como prisioneiro primeiro!</Portuguese>
             <Hungarian>Először foglyul kell ejtened őt!</Hungarian>
             <Russian>Вы должны сначала взять его в плен!</Russian>
+            <Japanese>あなたは先に捕虜を取る必要があります。</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_LoadCaptive">
             <English>Load Captive</English>
@@ -72,6 +77,7 @@
             <Russian>Загрузить пленного</Russian>
             <Portuguese>Embarcar Prisioneiro</Portuguese>
             <Italian>Fai salire il prigioniero</Italian>
+            <Japanese>捕虜を乗せる</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_UnloadCaptive">
             <English>Unload Captive</English>
@@ -84,6 +90,7 @@
             <Russian>Выгрузить пленного</Russian>
             <Portuguese>Desembarcar Prisioneiro</Portuguese>
             <Italian>Fai scendere il prigioniero</Italian>
+            <Japanese>捕虜を降ろす</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_CableTie">
             <English>Cable Tie</English>
@@ -96,6 +103,7 @@
             <Italian>Fascietta</Italian>
             <Hungarian>Gyorskötöző</Hungarian>
             <Russian>Кабельная стяжка</Russian>
+            <Japanese>ケーブル タイ</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_CableTieDescription">
             <English>Cable ties that allow you to restrain prisoners.</English>
@@ -108,6 +116,7 @@
             <Italian>Fascetta per arrestare i prigionieri</Italian>
             <Hungarian>Gyorskötöző, emberek foglyulejtéséhez használható.</Hungarian>
             <Russian>Кабельные стяжки позволяют связывать пленников.</Russian>
+            <Japanese>ケーブル タイは捕虜を制圧できます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_FriskMenuHeader">
             <English>Inventory of frisked person</English>
@@ -120,6 +129,7 @@
             <Russian>Инвентарь обысканного человека</Russian>
             <Portuguese>Inventário da pessoa revistada</Portuguese>
             <Italian>Inventario della persona perquisita</Italian>
+            <Japanese>捕虜の持ち物を確認する</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_FriskPerson">
             <English>Frisk person</English>
@@ -132,6 +142,7 @@
             <Russian>Обыскать человека</Russian>
             <Portuguese>Revistar</Portuguese>
             <Italian>Perquisisci la persona</Italian>
+            <Japanese>捕虜の持ち物</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_StartSurrendering">
             <English>Surrender</English>
@@ -144,6 +155,7 @@
             <Russian>Сдаться</Russian>
             <Hungarian>Megadás</Hungarian>
             <Italian>Arrenditi</Italian>
+            <Japanese>投降</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_StopSurrendering">
             <English>Stop Surrendering</English>
@@ -156,6 +168,7 @@
             <Russian>Прекратить сдачу в плен</Russian>
             <Hungarian>Megadás abbahagyása</Hungarian>
             <Italian>Smetti di arrenderti</Italian>
+            <Japanese>投降をやめる</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSurrender_DisplayName">
             <English>Make Unit Surrender</English>
@@ -168,6 +181,7 @@
             <Hungarian>Egység kapitulálása</Hungarian>
             <Russian>Заставить юнита сдаться</Russian>
             <Italian>Fai arrendere l'unità</Italian>
+            <Japanese>ユニットを投降させる</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSurrender_Description">
             <English>Sync a unit to make them surrender.</English>
@@ -180,6 +194,7 @@
             <Hungarian>Egység szinkronizálása, hogy kapituláljon.</Hungarian>
             <Russian>Синхронизируйте с юнитами, чтобы заставить их сдаться в плен.</Russian>
             <Italian>Sincronizza una unità per farla arrendere.</Italian>
+            <Japanese>同期されたユニットを投降させます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleHandcuffed_DisplayName">
             <English>Make Unit Handcuffed</English>
@@ -191,6 +206,7 @@
             <Italian>Metti manette all'unità</Italian>
             <Spanish>Hacer que la unidad esté esposada</Spanish>
             <French>Rendre une unité captive</French>
+            <Japanese>ユニットを拘束する</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleHandcuffed_Description">
             <English>Sync a unit to make them handcuffed.</English>
@@ -202,6 +218,7 @@
             <Italian>Sincronizza un'unità per metterle le manette.</Italian>
             <Spanish>Sincroniza una unidad para hacer que esté esposada.</Spanish>
             <French>Synchronisez une unité pour la rendre captive.</French>
+            <Japanese>同期されたユニットを拘束させます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_DisplayName">
             <English>Captives Settings</English>
@@ -214,6 +231,7 @@
             <Hungarian>Fogoly-beállítások</Hungarian>
             <Russian>Настройки пленения</Russian>
             <Italian>Impostazioni Prigionieri</Italian>
+            <Japanese>拘束の設定</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_Description">
             <English>Controls settings for surrender and cable ties</English>
@@ -226,6 +244,7 @@
             <Hungarian>Szabályozza a kapituláció és bilincselés beállításait</Hungarian>
             <Russian>Управляет настройками сдачи в плен и связывания</Russian>
             <Italian>Controlla le impostazioni per la resa e le manette</Italian>
+            <Japanese>投降したユニットや拘束されたユニットの扱いを設定します。</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_handcuffSide_name">
             <English>Can handcuff own side</English>
@@ -238,6 +257,7 @@
             <Hungarian>Saját oldal megbilincselhető</Hungarian>
             <Russian>Связать союзника</Russian>
             <Italian>Puoi ammanettare unità alleate</Italian>
+            <Japanese>自陣営への拘束を可能に</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_handcuffSide_description">
             <English>Can players cabletie units on their own side</English>
@@ -250,6 +270,7 @@
             <Hungarian>A játékosok megkötözhetik-e a saját oldalukon lévő egységeket</Hungarian>
             <Russian>Разрешить игрокам связывать юнитов своей стороны</Russian>
             <Italian>I giocatori possono ammanettare unità alleate</Italian>
+            <Japanese>プレイヤーがユニットを拘束し、彼らの陣営に変更できます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_allowSurrender_name">
             <English>Allow surrendering</English>
@@ -262,6 +283,7 @@
             <Hungarian>Kapituláció engedélyezése</Hungarian>
             <Russian>Сдаться в плен</Russian>
             <Italian>Permetti Resa</Italian>
+            <Japanese>投降を許可</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_allowSurrender_description">
             <English>Players can surrender after holstering their weapon</English>
@@ -274,6 +296,7 @@
             <Hungarian>A játékosok megadhatják magukat a fegyverük elrakása után</Hungarian>
             <Russian>Игроки могут сдаться в плен после того, как уберут оружие</Russian>
             <Italian>I giocatori possono arrendersi dopo aver messo via le proprie armi</Italian>
+            <Japanese>プレイヤーは武器を収めたあとに投降できるようにします。</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_requireSurrender_name">
             <English>Require surrendering</English>
@@ -285,6 +308,7 @@
             <Czech>Vzdávání vyžadováno</Czech>
             <Italian>Richiedi Resa</Italian>
             <French>Requiert la reddition</French>
+            <Japanese>投降を必要とする</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_ModuleSettings_requireSurrender_description">
             <English>Require Players to surrender before they can be arrested</English>
@@ -296,6 +320,7 @@
             <Czech>Vyžaduje, aby se hráč nejdříve vzdal, poté může být spoután</Czech>
             <Italian>I giocatori devono arrendersi prima che possano essere arrestati</Italian>
             <French>Requiert la capitulation des joueurs avant qu'ils ne puissent être arrêtés</French>
+            <Japanese>プレイヤーは拘束される前に、投降する必要があります。</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_SurrenderOnly">
             <English>Surrendering only</English>
@@ -307,6 +332,7 @@
             <Czech>Pouze vzdávání</Czech>
             <Italian>Solo Resa</Italian>
             <French>Reddition seulement</French>
+            <Japanese>投降中のみ</Japanese>
         </Key>
         <Key ID="STR_ACE_Captives_SurrenderOrNoWeapon">
             <English>Surrendering or No weapon</English>
@@ -318,6 +344,7 @@
             <Czech>Vzdávání nebo beze zbraně</Czech>
             <Italian>Resa o senza armi</Italian>
             <French>Capitulation ou desarmé</French>
+            <Japanese>投降中か非武装時</Japanese>
         </Key>
     </Package>
-</Project>
+</Project>

addons/cargo/config.cpp

@@ -18,13 +18,3 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
 #include "menu.hpp"
-
-class ACE_newEvents {
-    LoadCargo = "ace_loadCargo";
-    cargoUnloaded = "ace_cargoUnloaded";
-    cargoLoaded = "ace_cargoLoaded";
-    AddCargoByClass = "ace_addCargo";
-    ServerUnloadCargo = QGVAR(serverUnload);
-    UnloadCargo = "ace_unloadCargo";
-    cargoAddedByClass = "ace_cargoAdded";
-};

addons/cargo/functions/fnc_paradropItem.sqf

@@ -49,7 +49,7 @@ private _itemObject = if (_item isEqualType objNull) then {
     _newItem
 };
 
-_newItem setVelocity ((velocity _vehicle) vectorAdd ((vectorNormalized (vectorDir _vehicle)) vectorMultiply 10));
+_itemObject setVelocity ((velocity _vehicle) vectorAdd ((vectorNormalized (vectorDir _vehicle)) vectorMultiply 10));
 
 // open parachute and ir light effect
 [{
@@ -57,13 +57,16 @@ _newItem setVelocity ((velocity _vehicle) vectorAdd ((vectorNormalized (vectorDi
 
     if (isNull _item || {getPos _item select 2 < 1}) exitWith {};
 
-    private _itemPosASL = getPosASL _item;
-    private _itemVelocity = velocity _item;
     private _parachute = createVehicle ["B_Parachute_02_F", [0,0,0], [], 0, "CAN_COLLIDE"];
 
-    _item attachTo [_parachute, [0,0,0.2]];
-    _parachute setPosASL _itemPosASL;
-    _parachute setVelocity _itemVelocity;
+    // cannot use setPos on parachutes without them closing down
+    _parachute attachTo [_item, [0,0,0]];
+    detach _parachute;
+
+    private _velocity = velocity _item;
+
+    _item attachTo [_parachute, [0,0,-1]];
+    _parachute setVelocity _velocity;
 
     private _light = "Chemlight_yellow" createVehicle [0,0,0];
     _light attachTo [_item, [0,0,0]];

addons/cargo/stringtable.xml

@@ -11,6 +11,7 @@
             <Spanish>Cargar</Spanish>
             <Italian>Carica</Italian>
             <French>Charger</French>
+            <Japanese>積み込む</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_unloadObject">
             <English>Unload</English>
@@ -22,6 +23,7 @@
             <Spanish>Descargar</Spanish>
             <Italian>Scarica</Italian>
             <French>Décharger</French>
+            <Japanese>下ろす</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_openMenu">
             <English>Cargo</English>
@@ -33,6 +35,7 @@
             <Spanish>Carga</Spanish>
             <Italian>Cargo</Italian>
             <French>Cargaison</French>
+            <Japanese>カーゴ</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_cargoMenu">
             <English>Cargo Menu</English>
@@ -44,6 +47,7 @@
             <Spanish>Menu de carga</Spanish>
             <Italian>Menù Cargo</Italian>
             <French>Menu de cargaison</French>
+            <Japanese>カーゴ メニュー</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_labelSpace">
             <English>Cargo space left: %1</English>
@@ -55,6 +59,7 @@
             <Spanish>Espacio de carga restante: %1</Spanish>
             <Italian>Spazio cargo rimanente: %1</Italian>
             <French>Espace de cargaison restant : %1</French>
+            <Japanese>カーゴの空き容量は: %1</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_ModuleSettings_enable">
             <English>Enable Cargo</English>
@@ -66,6 +71,7 @@
             <Spanish>Habilitar carga</Spanish>
             <Italian>Abilita Cargo</Italian>
             <French>Activer la mise en cargaison</French>
+            <Japanese>カーゴを有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_ModuleSettings_enable_Description">
             <English>Enable the load in cargo module</English>
@@ -77,6 +83,7 @@
             <Czech>Umožňuje naložit předměty do nákladového prostoru vozidla</Czech>
             <Italian>Abilita il modulo di caricamento in cargo</Italian>
             <French>Active le chargement de cargaison dans un vehicule</French>
+            <Japanese>カーゴ モジュールで積み込みを有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_SettingsModule_DisplayName">
             <English>Cargo Settings</English>
@@ -88,6 +95,7 @@
             <Spanish>Ajustes de carga</Spanish>
             <Italian>Impostazioni Cargo</Italian>
             <French>Paramètres de cargaison</French>
+            <Japanese>カーゴ設定</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_SettingsModule_Description">
             <English>Configure the cargo module settings</English>
@@ -99,6 +107,7 @@
             <Czech>Konfigurace nákladního modulu</Czech>
             <Italian>Configura le impostazioni del modulo cargo</Italian>
             <French>Configure les paramètres du module de cargaison</French>
+            <Japanese>カーゴ モジュールの設定を構成</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_LoadedItem">
             <English>%1&lt;br/&gt;loaded into&lt;br/&gt;%2</English>
@@ -111,6 +120,7 @@
             <Italian>%1&lt;br/&gt;caricato su&lt;br/&gt;%2</Italian>
             <Hungarian>%1&lt;br/&gt;berakodva ide:&lt;br/&gt;%2</Hungarian>
             <Russian>%1&lt;br/&gt;загружен в&lt;br/&gt;%2</Russian>
+            <Japanese>%1&amp;lt;br/&amp;gt; は &amp;lt;br/&amp;gt;%2 へ積み込まれた</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_UnloadedItem">
             <English>Unloaded&lt;br/&gt;%1 from&lt;br/&gt;%2</English>
@@ -123,6 +133,7 @@
             <Italian>Hai scaricato&lt;br/&gt;%1 da&lt;br/&gt;%2</Italian>
             <Hungarian>1%&lt;br/&gt;kirakodva ebből:&lt;br/&gt;%2</Hungarian>
             <Russian>%1&lt;br/&gt;разгружен из&lt;br/&gt;%2</Russian>
+            <Japanese>&amp;lt;br/&amp;gt;%2 から &amp;lt;br/&amp;gt;%1 が下ろされた</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_LoadingItem">
             <English>Loading Cargo</English>
@@ -134,6 +145,7 @@
             <Italian>Caricando</Italian>
             <Spanish>Cargando</Spanish>
             <French>Chargement de la cargaison</French>
+            <Japanese>カーゴへ積み込んでいる</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_UnloadingItem">
             <English>Unloading Cargo</English>
@@ -145,6 +157,7 @@
             <Italian>Scaricando</Italian>
             <Spanish>Descargando</Spanish>
             <French>Déchargement de la cargaison</French>
+            <Japanese>カーゴから下ろしている</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_LoadingFailed">
             <English>%1&lt;br/&gt;could not be loaded</English>
@@ -156,6 +169,7 @@
             <Italian>%1&lt;br/&gt;non può essere caricato</Italian>
             <Spanish>%1&lt;br/&gt;no pudo ser cargado</Spanish>
             <French>%1&lt;br /&gt; n'a pas pu être chargé</French>
+            <Japanese>%1&amp;lt;br/&amp;gt;は積み込めなかった</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_UnloadingFailed">
             <English>%1&lt;br/&gt;could not be unloaded</English>
@@ -167,6 +181,7 @@
             <Italian>%1&lt;br/&gt;non può essere scaricato</Italian>
             <Spanish>%1&lt;br/&gt;no pudo ser descargado</Spanish>
             <French>%1&lt;br /&gt; n'a pas pu être déchargé</French>
+            <Japanese>%1&amp;lt;br/&amp;gt;は下ろせなかった</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_makeLoadable_displayName">
             <English>Make Object Loadable</English>
@@ -178,6 +193,7 @@
             <Czech>Vytvořit objekt nakladatelným</Czech>
             <Portuguese>Fazer objeto carregável</Portuguese>
             <Russian>Сделать объект загружаемым</Russian>
+            <Japanese>オブジェクトを積載可能に</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_makeLoadable_description">
             <English>Sets the synced object as loadable by the cargo system.</English>
@@ -189,6 +205,7 @@
             <Czech>Nastaví synchronizované objekty nakladatelnými za pomocí Nákladního systému.</Czech>
             <Portuguese>Seta o objeto sincronizado como carregável</Portuguese>
             <Russian>Делает синхронизированный объект загружаемым для модуля перевозки грузов.</Russian>
+            <Japanese>オブジェクトを同期させると、カーゴ システムによる積載が可能になります。</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_makeLoadable_setSize_displayName">
             <English>Object's Size</English>
@@ -200,16 +217,19 @@
             <Czech>Velikost objektu</Czech>
             <Portuguese>Tamanho do objeto</Portuguese>
             <Russian>Размер объекта</Russian>
+            <Japanese>オブジェクトの大きさ</Japanese>
         </Key>
         <Key ID="STR_ACE_Cargo_paradropButton">
             <English>Airdrop</English>
             <German>Türlast</German>
+            <Japanese>空中投下</Japanese>
             <Polish>Zrzut zaopatrzenia</Polish>
         </Key>
         <Key ID="STR_ACE_Cargo_unlevelFlightWarning">
             <English>Unlevel Flight</English>
             <German>Schieflage</German>
+            <Japanese>機体が水平ではありません</Japanese>
             <Polish>Nierówny lot</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/chemlights/stringtable.xml

@@ -3,14 +3,17 @@
     <Package name="Chemlights">
         <Key ID="STR_ACE_Chemlights_Action_Chemlights">
             <English>Chemlights</English>
+            <Japanese>ケミライト</Japanese>
             <Polish>Świetliki</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Action_Prepare">
             <English>Prepare %1</English>
+            <Japanese>%1 をつかう</Japanese>
             <Polish>Przygotuj %1</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Action_Prepare_Done">
             <English>%1&lt;br/&gt;Prepared</English>
+            <Japanese>%1&amp;lt;br/&amp;gt; をつかった</Japanese>
             <Polish>%1&lt;br/&gt;Przygotowany</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Inventory_Full">
@@ -24,150 +27,186 @@
             <Italian>Non hai più spazio</Italian>
             <Hungarian>Nincs több hely</Hungarian>
             <Russian>В инвентаре нет места</Russian>
+            <Japanese>インベントリに空きがありません</Japanese>
         </Key>
         <Key ID="STR_ACE_Chemlights_Box_DisplayName">
             <English>[ACE] Chemlights</English>
+            <Japanese>[ACE] ケミライト</Japanese>
             <Polish>[ACE] Świetliki</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Orange_DisplayName">
             <English>Chemlight (Orange)</English>
+            <Japanese>ケミライト (オレンジ)</Japanese>
             <Polish>Świetlik (pomarańczowy)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Orange_DisplayNameShort">
             <English>Orange Light</English>
+            <Japanese>オレンジ色</Japanese>
             <Polish>Pomarańczowe światło</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Orange_DescriptionShort">
             <English>Type: Light - Orange&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <Japanese>種類: 照明 - オレンジ&amp;lt;br /&amp;gt;装填数: 1&amp;lt;br /&amp;gt;次で使用: 携帯</Japanese>
             <Polish>Typ: Światło - pomarańczowe&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_White_DisplayName">
             <English>Chemlight (White)</English>
+            <Japanese>ケミライト (白)</Japanese>
             <Polish>Świetlik (biały)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_White_DisplayNameShort">
             <English>White Light</English>
+            <Japanese>白色</Japanese>
             <Polish>Białe światło</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_White_DescriptionShort">
             <English>Type: Light - White&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <Japanese>種類: 照明 - 白&amp;lt;br /&amp;gt;装填数: 1&amp;lt;br /&amp;gt;次で使用: 携帯</Japanese>
             <Polish>Typ: Światło - białe&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiRed_DisplayName">
             <English>Chemlight (Hi Red)</English>
+            <Japanese>ケミライト (高輝度 赤)</Japanese>
             <Polish>Świetlik (jaskrawy czerwony)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiRed_DisplayNameShort">
             <English>Red Hi Light</English>
+            <Japanese>高輝度の赤色</Japanese>
             <Polish>Jaskrawe czerwone światło</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiRed_DescriptionShort">
             <English>Type: Light - Red Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <Japanese>種類: 照明 - 高輝度 赤 (5分間)&amp;lt;br /&amp;gt;装填数: 1&amp;lt;br /&amp;gt;次で使用: 携帯</Japanese>
             <Polish>Typ: Światło - jaskrawe czerwone (5 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiYellow_DisplayName">
             <English>Chemlight (Hi Yellow)</English>
+            <Japanese>ケミライト (高輝度 黄)</Japanese>
             <Polish>Świetlik (jaskrawy żółty)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiYellow_DisplayNameShort">
             <English>Yellow Hi Light</English>
+            <Japanese>高輝度の黄色</Japanese>
             <Polish>Jaskrawe żółte światło</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiYellow_DescriptionShort">
             <English>Type: Light - Yellow Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <Japanese>種類: 照明 - 高輝度 黄 (5分間)&amp;lt;br /&amp;gt;装填数: 1&amp;lt;br /&amp;gt;次で使用: 携帯</Japanese>
             <Polish>Typ: Światło - jaskrawe żółte (5 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiOrange_DisplayName">
             <English>Chemlight (Hi Orange)</English>
+            <Japanese>ケミライト (高輝度 オレンジ)</Japanese>
             <Polish>Świetlik (jaskrawy pomarańczowy)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiOrange_DisplayNameShort">
             <English>Orange Hi Light</English>
+            <Japanese>高輝度のオレンジ</Japanese>
             <Polish>Jaskrawe pomarańczowe światło</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiOrange_DescriptionShort">
             <English>Type: Light - Orange Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <Japanese>種類: 照明 - 高輝度 オレンジ (5分間)&amp;lt;br /&amp;gt;装填数: 1&amp;lt;br /&amp;gt;次で使用: 携帯</Japanese>
             <Polish>Typ: Światło - jaskrawe pomarańczowe (5 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiWhite_DisplayName">
             <English>Chemlight (Hi White)</English>
+            <Japanese>ケミライト (高輝度 白)</Japanese>
             <Polish>Świetlik (jaskrawy biały)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiWhite_DisplayNameShort">
             <English>White Hi Light</English>
+            <Japanese>高輝度の白色</Japanese>
             <Polish>Jaskrawe białe światło</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiWhite_DescriptionShort">
             <English>Type: Light - White Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <Japanese>種類: 照明 - 高輝度 白 (5分間)&amp;lt;br /&amp;gt;装填数: 1&amp;lt;br /&amp;gt;次で使用: 携帯</Japanese>
             <Polish>Typ: Światło - jaskrawe białe (5 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_IR_DisplayName">
             <English>Chemlight (IR)</English>
+            <Japanese>ケミライト (IR)</Japanese>
             <Polish>Świetlik (podczerwony)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_IR_DisplayNameShort">
             <English>IR Light</English>
+            <Japanese>赤外線光</Japanese>
             <Polish>Światło podczerwone</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_IR_DescriptionShort">
             <English>Type: Light - Infrared&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <Japanese>種類: 照明 - 赤外線&amp;lt;br /&amp;gt;装填数: 1&amp;lt;br /&amp;gt;次で使用: 携帯</Japanese>
             <Polish>Typ: Światło - podczerwone&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Empty_DisplayName">
             <English>Chemlight Shield (Empty)</English>
+            <Japanese>ケミライト シールド (空)</Japanese>
             <Polish>Osłona na świetlik (pusta)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Empty_DescriptionShort">
             <English>Shield for chemlights. Combine with chemlight to prepare reading light.</English>
+            <Japanese>ケミライトを入れられます。シールドとケミライトを組み合わせることで、照明にもなりえます。</Japanese>
             <Polish>Osłona na świetliki. Połącz ją ze świetlikiem by stworzyć lampkę do czytania.</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Green_DisplayName">
             <English>Chemlight Shield (Green)</English>
+            <Japanese>ケミライト シールド (緑)</Japanese>
             <Polish>Osłona na świetlik (zielona)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Green_DescriptionShort">
             <English>Green reading light.</English>
+            <Japanese>緑色の照明。</Japanese>
             <Polish>Zielona lampka.</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Red_DisplayName">
             <English>Chemlight Shield (Red)</English>
+            <Japanese>ケミライト シールド (赤)</Japanese>
             <Polish>Osłona na świetlik (czerwona)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Red_DescriptionShort">
             <English>Red reading light.</English>
+            <Japanese>赤色の照明。</Japanese>
             <Polish>Czerwona lampka.</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Blue_DisplayName">
             <English>Chemlight Shield (Blue)</English>
+            <Japanese>ケミライト シールド (青)</Japanese>
             <Polish>Osłona na świetlik (niebieska)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Blue_DescriptionShort">
             <English>Blue reading light.</English>
+            <Japanese>青色の照明。</Japanese>
             <Polish>Niebieska lampka.</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Yellow_DisplayName">
             <English>Chemlight Shield (Yellow)</English>
+            <Japanese>ケミライト シールド (黄)</Japanese>
             <Polish>Osłona na świetlik (żółta)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Yellow_DescriptionShort">
             <English>Yellow reading light.</English>
+            <Japanese>黄色の照明。</Japanese>
             <Polish>Żółta lampka.</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Orange_DisplayName">
             <English>Chemlight Shield (Orange)</English>
+            <Japanese>ケミライト シールド (オレンジ)</Japanese>
             <Polish>Osłona na świetlik (pomarańczowa)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_Orange_DescriptionShort">
             <English>Orange reading light.</English>
+            <Japanese>オレンジの照明。</Japanese>
             <Polish>Pomarańczowa lampka.</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_White_DisplayName">
             <English>Chemlight Shield (White)</English>
+            <Japanese>ケミライト シールド (白)</Japanese>
             <Polish>Osłona na świetlik (biała)</Polish>
         </Key>
         <Key ID="STR_ACE_Chemlights_Shield_White_DescriptionShort">
             <English>White reading light.</English>
-            <Polish>Biała lampka.</Polish>
+            <Japanese>白の照明。</Japanese>
         </Key>
     </Package>
-</Project>
+</Project>

addons/common/CfgEden.hpp

@@ -8,4 +8,14 @@ class Cfg3DEN {
             };
         };
     };
+
+    class Group {
+        class AttributeCategories {
+            class ace_attributes {
+                displayName = CSTRING(Options);
+                collapsed = 1;
+                class Attributes {};
+            };
+        };
+    };
 };

addons/common/XEH_PREP.hpp

@@ -38,7 +38,6 @@ PREP(dropBackpack);
 PREP(endRadioTransmission);
 PREP(eraseCache);
 PREP(errorMessage);
-PREP(execNextFrame);
 PREP(findUnloadPosition);
 PREP(firedEH);
 PREP(fixCollision);
@@ -85,12 +84,10 @@ PREP(hadamardProduct);
 PREP(handleEngine);
 PREP(handleModifierKey);
 PREP(handleModifierKeyUp);
-PREP(handleScrollWheel);
 PREP(hasItem);
 PREP(hasMagazine);
 PREP(headBugFix);
 PREP(hideUnit);
-PREP(insertionSort);
 PREP(interpolateFromArray);
 PREP(inTransitionAnim);
 PREP(isAwake);
@@ -173,8 +170,6 @@ PREP(unmuteUnit);
 PREP(useItem);
 PREP(useMagazine);
 PREP(watchVariable);
-PREP(waitAndExecute);
-PREP(waitUntilAndExecute);
 PREP(waveHeightAt);
 
 PREP(translateToWeaponSpace);
@@ -184,14 +179,12 @@ PREP(translateToModelSpace);
 PREP(worldToScreenBounds);
 
 // config items
-PREP(getConfigType);
 PREP(getItemType);
 PREP(getWeaponType);
 PREP(getWeaponModes);
 PREP(getWeaponMuzzles);
 
 // config objects
-PREP(getConfigTypeObject);
 PREP(getConfigGunner);
 PREP(getConfigCommander);
 PREP(getSelectionsWithoutHitPoints);
@@ -212,10 +205,6 @@ PREP(getTurretsFFV);
 PREP(getTurretsOther);
 PREP(hasHatch);
 
-// missing inventory commands
-PREP(binocularMagazine);
-PREP(removeBinocularMagazine);
-
 // ACE_Debug
 PREP(getChildren);
 PREP(getDisplayConfigName);
@@ -225,15 +214,6 @@ PREP(showUser);
 PREP(dumpPerformanceCounters);
 PREP(dumpArray);
 
-PREP(globalEvent);
-PREP(addEventHandler);
-PREP(objectEvent);
-PREP(targetEvent);
-PREP(serverEvent);
-PREP(localEvent);
-PREP(removeEventHandler);
-PREP(removeAlLEventHandlers);
-
 // Synchronized Events
 PREP(syncedEventPFH);
 PREP(addSyncedEventHandler);
@@ -248,17 +228,8 @@ PREP(_handleRequestAllSyncedEvents);
 // other eventhandlers
 PREP(addActionEventHandler);
 PREP(addActionMenuEventHandler);
-PREP(addScrollWheelEventHandler);
 PREP(addMapMarkerCreatedEventHandler);
 
 PREP(removeActionEventHandler);
 PREP(removeActionMenuEventHandler);
-PREP(removeScrollWheelEventHandler);
 PREP(removeMapMarkerCreatedEventHandler);
-
-// hashes
-PREP(hashCreate);
-PREP(hashSet);
-PREP(hashGet);
-PREP(hashHasKey);
-PREP(hashRem);

addons/common/XEH_missionDisplayLoad.sqf

@@ -1,4 +1,3 @@
 #include "script_component.hpp"
 
-call COMPILE_FILE(init_handleScrollWheel);
 call COMPILE_FILE(init_handleModifierKey);

addons/common/XEH_postInit.sqf

@@ -306,71 +306,6 @@ if (!isNull (missionNamespace getVariable ["cba_events_oldUnit", objNull])) then
 // "playerChanged" event
 ["unit", {
     ACE_player = (_this select 0);
-    ["ace_playerChanged", _this] call CBA_fnc_localEvent;
-}] call CBA_fnc_addPlayerEventHandler;
-
-// "playerVehicleChanged" event
-["vehicle", {
-    ["ace_playerVehicleChanged", _this] call CBA_fnc_localEvent;
-}] call CBA_fnc_addPlayerEventHandler;
-
-// "playerTurretChanged" event
-["turret", {
-    ["ace_playerTurretChanged", _this] call CBA_fnc_localEvent;
-}] call CBA_fnc_addPlayerEventHandler;
-
-// "playerWeaponChanged" event
-["weapon", {
-    ["ace_playerWeaponChanged", _this] call CBA_fnc_localEvent;
-}] call CBA_fnc_addPlayerEventHandler;
-
-// "playerInventoryChanged" event
-["loadout", {
-    private _fnc_getAllGear = {
-        if (isNull _this) exitWith {[
-            "",
-            "",
-            "", [],
-            "", [],
-            "", [],
-            "", ["","","",""], [],
-            "", ["","","",""], [],
-            "", ["","","",""], [],
-            [],
-            "",
-            ""
-        ]};
-
-        [
-            headgear _this,
-            goggles _this,
-            uniform _this, uniformItems _this,
-            vest _this, vestItems _this,
-            backpack _this, backpackItems _this,
-            primaryWeapon _this, primaryWeaponItems _this, primaryWeaponMagazine _this,
-            secondaryWeapon _this, secondaryWeaponItems _this, secondaryWeaponMagazine _this,
-            handgunWeapon _this, handgunItems _this, handgunMagazine _this,
-            assignedItems _this,
-            binocular _this,
-            _this call CBA_fnc_binocularMagazine
-        ]
-    };
-
-    ["ace_playerInventoryChanged", [ACE_player, ACE_player call _fnc_getAllGear]] call CBA_fnc_localEvent;
-}] call CBA_fnc_addPlayerEventHandler;
-
-// "playerVisionModeChanged" event
-["visionMode", {
-    ["ace_playerVisionModeChanged", _this] call CBA_fnc_localEvent;
-}] call CBA_fnc_addPlayerEventHandler;
-
-// "cameraViewChanged" event
-["cameraView", {
-    ["ace_cameraViewChanged", _this] call CBA_fnc_localEvent;
-}] call CBA_fnc_addPlayerEventHandler;
-
-["visibleMap", {
-    ["ace_visibleMapChanged", _this] call CBA_fnc_localEvent;
 }] call CBA_fnc_addPlayerEventHandler;
 
 GVAR(OldIsCamera) = false;

addons/common/config.cpp

@@ -14,70 +14,6 @@ class CfgPatches {
     };
 };
 
-// This class will be deprecated in version 3.8.0
-class ACE_newEvents {
-    // Status effect events
-    forceWalk = QGVAR(forceWalk);
-    blockSprint = QGVAR(blockSprint);
-    setCaptive = QGVAR(setCaptive);
-    blockDamage = QGVAR(blockDamage);
-    blockEngine = QGVAR(blockEngine);
-
-    // Public listenable events
-    PlayerJip = "ace_playerJIP";
-    activeCameraChanged = "ace_activeCameraChanged";
-    visibleMapChanged = "ace_visibleMapChanged";
-    cameraViewChanged = "ace_cameraViewChanged";
-    playerVisionModeChanged = "ace_playerVisionModeChanged";
-    playerInventoryChanged = "ace_playerInventoryChanged";
-    playerWeaponChanged = "ace_playerWeaponChanged";
-    playerTurretChanged = "ace_playerTurretChanged";
-    playerVehicleChanged = "ace_playerVehicleChanged";
-    playerChanged = "ace_playerChanged";
-    SettingsInitialized = "ace_settingsInitialized";
-    SettingChanged = "ace_settingChanged";
-    firedNonPlayerVehicle = "ace_firedNonPlayerVehicle";
-    firedPlayerVehicleNonLocal = "ace_firedPlayerVehicleNonLocal";
-    firedPlayerVehicle = "ace_firedPlayerVehicle";
-    firedNonPlayer = "ace_firedNonPlayer";
-    firedPlayerNonLocal = "ace_firedPlayerNonLocal";
-    firedPlayer = "ace_firedPlayer";
-    unloadPersonEvent = "ace_unloadPersonEvent";
-    loadPersonEvent = "ace_loadPersonEvent";
-    useItem = "ace_useItem";
-    infoDisplayChanged = "ace_infoDisplayChanged";
-
-    // Internal callable events
-    setStatusEffect = QGVAR(setStatusEffect);
-    HeadbugFixUsed = QGVAR(headbugFixUsed);
-    InitSettingsFromModules = QGVAR(initSettingsFromModules);
-    enableSimulationGlobal = QGVAR(enableSimulationGlobal);
-    hideObjectGlobal = QGVAR(hideObjectGlobal);
-    fixPosition = QGVAR(fixPosition);
-    fixFloating = QGVAR(fixFloating);
-    fixCollision = QGVAR(fixCollision);
-    unlockVehicle = QGVAR(unlockVehicle);
-    lockVehicle = QGVAR(lockVehicle);
-    displayTextPicture = QGVAR(displayTextPicture);
-    displayTextStructured = QGVAR(displayTextStructured);
-    setVanillaHitPointDamage = QGVAR(setVanillaHitPointDamage);
-    setVectorDirAndUp = QGVAR(setVectorDirAndUp);
-    switchMove = QGVAR(switchMove);
-    playMoveNow = QGVAR(playMoveNow);
-    playMove = QGVAR(playMove);
-    setVelocity = QGVAR(setVelocity);
-    selectLeader = QGVAR(selectLeader);
-    setSpeaker = QGVAR(setSpeaker);
-    engineOn = QGVAR(engineOn);
-    setFuel = QGVAR(setFuel);
-    setDir = QGVAR(setDir);
-
-    // Events framework
-    SEH_s = "ACEs";
-    SEH = "ACEe";
-    SEH_all = "ACEa";
-};
-
 #include "CfgEventHandlers.hpp"
 
 #include "CfgLocationTypes.hpp"

addons/common/functions/fnc_addEventHandler.sqf

@@ -1,14 +0,0 @@
-#define DEBUG_MODE_FULL
-#include "script_component.hpp"
-
-params ["_eventName", "_eventCode"];
-
-private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
-if (_newName != "") then {
-    TRACE_2("Switching Names",_eventName,_newName);
-    _eventName = _newName;
-};
-
-[_eventName, _eventCode] call CBA_fnc_addEventHandler;
-
-ACE_DEPRECATED("ace_common_fnc_addEventHandler","3.8.0","CBA_fnc_addEventHandler");

addons/common/functions/fnc_addScrollWheelEventHandler.sqf

@@ -1,35 +0,0 @@
-/*
- * Author: commy2
- * Add an event handler that executes every time the scroll wheel is used. This is needed, because adding a MouseZ display event handler to display 46 will break in save games.
- * _this will be [Interval] where 'Interval' is a number.
- *
- * Arguments:
- * 0: Code to execute <CODE, STRING>
- *
- * Return Value:
- * ID of the event script (used to remove it later). <NUMBER>
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-params ["_statement"];
-
-ACE_DEPRECATED("ace_common_fnc_addScrollWheelEventHandler", "3.8.0", "'MouseZChanged' Display EventHandler");
-
-if (_statement isEqualType "") then {
-    _statement = compile _statement;
-};
-
-private _actionsVar = missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]];
-
-_actionsVar params ["_id", "_actionIDs", "_actions"];
-
-_id = _id + 1;
-
-_actionIDs pushBack _id;
-_actions pushBack _statement;
-
-missionNamespace setVariable ["ACE_EventHandler_ScrollWheel", [_id, _actionIDs, _actions]];
-
-_id

addons/common/functions/fnc_binocularMagazine.sqf

@@ -1,20 +0,0 @@
-/*
- * Author: commy2
- * Returns the magazine of the units rangefinder.
- *
- * Arguments:
- * 0: Unit <OBJECT>
- *
- * Return Value:
- * Magazine of the units binocular <STRING>
- *
- * Example:
- * player call ace_common_fnc_binocularMagazine
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED("ace_common_fnc_binocularMagazine","3.8.0","CBA_fnc_binocularMagazine");
-
-_this call CBA_fnc_binocularMagazine

addons/common/functions/fnc_execNextFrame.sqf

@@ -1,18 +0,0 @@
-/*
- * Author: esteldunedain
- * Executes a code on the next frame
- *
- * Arguments:
- * 0: Code to execute <CODE>
- * 1: Parameters to run the code with <ARRAY>
- *
- * Return Value:
- * PFH handler ID <NUMBER>
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED("ace_common_fnc_execNextFrame","3.8.0","CBA_fnc_execNextFrame");
-
-_this call CBA_fnc_execNextFrame;

addons/common/functions/fnc_getConfigType.sqf

@@ -1,17 +0,0 @@
-/*
- * Author: commy2
- * Determins type of item. Can be CfgMagaines, CfgWeapons or CfgGlasses.
- *
- * Arguments:
- * 0: Item Classname <STRING>
- *
- * Return Value:
- * Config category ("CfgWeapons", "CfgMagazines", "CfgGlasses", "") <STRING>
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED("ace_common_fnc_getConfigType","3.8.0","CBA_fnc_getItemConfig");
-
-configName (configHierarchy (_item call CBA_fnc_getItemConfig) param [1, configNull])

addons/common/functions/fnc_getConfigTypeObject.sqf

@@ -1,17 +0,0 @@
-/*
- * Author: commy2
- * Determins type of object. Can be CfgVehicles or CfgAmmo.
- *
- * Arguments:
- * 0: Object classname <STRING>
- *
- * Return Value:
- * Config category ("CfgWeapons", "Cfgmagazines", "CfgGlasses", "") <STRING>
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED("ace_common_fnc_getConfigTypeObject","3.8.0","CBA_fnc_getObjectConfig");
-
-configName (configHierarchy (_item call CBA_fnc_getObjectConfig) param [1, configNull])

addons/common/functions/fnc_globalEvent.sqf

@@ -1,14 +0,0 @@
-#define DEBUG_MODE_FULL
-#include "script_component.hpp"
-
-params ["_eventName", "_eventArgs"];
-
-private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
-if (_newName != "") then {
-    TRACE_2("Switching Names",_eventName,_newName);
-    _eventName = _newName;
-};
-
-[_eventName, _eventArgs] call CBA_fnc_globalEvent;
-
-ACE_DEPRECATED("ace_common_fnc_globalEvent","3.8.0","CBA_fnc_globalEvent");

addons/common/functions/fnc_handleScrollWheel.sqf

@@ -1,20 +0,0 @@
-/*
- * Author: commy2
- * Handles MouseZChanged event.
- *
- * Arguments:
- * None
- *
- * Return Value:
- * None
- *
- * Public : No
- */
-#include "script_component.hpp"
-
-{
-    [_this select 1] call _x;
-    false
-} count ((missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]]) select 2);
-
-nil

addons/common/functions/fnc_hashCreate.sqf

@@ -1,17 +0,0 @@
-/*
- * Author: ?
- * Returns an empty hash structure
- *
- * Arguments:
- * None
- *
- * Return Value:
- * Empty Hash Structure <ARRAY>
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED(QFUNC(hashCreate),"3.8.0","CBA_fnc_hashCreate");
-
-[[],[]]

addons/common/functions/fnc_hashGet.sqf

@@ -1,40 +0,0 @@
-/*
- * Author: ?
- * Returns value attached to key in given hash.
- *
- * Arguments:
- * 0: Hash <ARRAY>
- * 1: Key <STRING>
- *
- * Return Value:
- * Value <ANY>
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED(QFUNC(hashGet),"3.8.0","CBA_fnc_hashGet");
-
-params ["_hash", "_key"];
-
-ERRORDATA(2);
-private _val = nil;
-try {
-    if(VALIDHASH(_hash)) then {
-        private _index = (_hash select 0) find _key;
-        if(_index != -1) then {
-            _val = (_hash select 1) select _index;
-            if(IS_STRING(_val) && {_val == "ACREHASHREMOVEDONOTUSETHISVAL"}) then {
-                _val = nil;
-            };
-        };
-    } else {
-        ERROR("Input hash is not valid");
-    };
-} catch {
-    HANDLECATCH;
-};
-
-if (isNil "_val") exitWith { nil };
-
-_val

addons/common/functions/fnc_hashHasKey.sqf

@@ -1,35 +0,0 @@
-/*
- * Author: ?
- * ?
- *
- * Arguments:
- * ?
- *
- * Return Value:
- * ?
- *
- * Public: ?
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED(QFUNC(hashHasKey),"3.8.0","CBA_fnc_hashHasKey");
-
-// diag_log text format["%1 HASH HAS KEY: %2", diag_tickTime, _this];
-
-params ["_hash", "_key"];
-
-ERRORDATA(2);
-private _val = false;
-try {
-    if(VALIDHASH(_hash)) then {
-        private _index = (_hash select 0) find _key;
-        if(_index != -1) then {
-            _val = true;
-        };
-    } else {
-        ERROR("Input hash is not valid");
-    };
-} catch {
-    HANDLECATCH;
-};
-_val

addons/common/functions/fnc_hashRem.sqf

@@ -1,41 +0,0 @@
-/*
- * Author: ?
- * ?
- *
- * Arguments:
- * ?
- *
- * Return Value:
- * ?
- *
- * Public: ?
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED(QFUNC(hashRem),"3.8.0","CBA_fnc_hashRem");
-
-params ["_hash", "_key"];
-
-ERRORDATA(2);
-private _val = nil;
-try {
-    if(VALIDHASH(_hash)) then {
-        private _index = (_hash select 0) find _key;
-        if(_index != -1) then {
-            (_hash select 1) set[_index, "ACREHASHREMOVEDONOTUSETHISVAL"];
-            // is this hash is not part of a hash list?
-            // if it is we need to leave the keys intact.
-            if((count _hash) == 2) then {
-                // if this is a standalone hash then we can clean it up
-                (_hash select 0) set[_index, "ACREHASHREMOVEDONOTUSETHISVAL"];
-                _hash set[0, ((_hash select 0) - ["ACREHASHREMOVEDONOTUSETHISVAL"])];
-                _hash set[1, ((_hash select 1) - ["ACREHASHREMOVEDONOTUSETHISVAL"])];
-            };
-        };
-    } else {
-        ERROR("Input hash is not valid");
-    };
-} catch {
-    HANDLECATCH;
-};
-true

addons/common/functions/fnc_hashSet.sqf

@@ -1,38 +0,0 @@
-/*
- * Author: ?
- * ?
- *
- * Arguments:
- * ?
- *
- * Return Value:
- * ?
- *
- * Public: ?
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED(QFUNC(hashSet),"3.8.0","CBA_fnc_hashSet");
-
-// diag_log text format["%1 HASH SET: %2", diag_tickTime, _this];
-
-params ["_hash", "_key", "_val"];
-
-ERRORDATA(3);
-try {
-    if(VALIDHASH(_hash)) then {
-        private _index = (_hash select 0) find _key;
-        if(_index == -1) then {
-            _index = (_hash select 0) find "ACREHASHREMOVEDONOTUSETHISVAL";
-            if(_index == -1) then {
-                _index = (count (_hash select 0));
-            };
-            (_hash select 0) set[_index, _key];
-        };
-        (_hash select 1) set[_index, _val];
-    } else {
-        ERROR("Input hash is not valid");
-    };
-} catch {
-    HANDLECATCH;
-};

addons/common/functions/fnc_insertionSort.sqf

@@ -1,22 +0,0 @@
-/*
- * Author: Ruthberg
- * Sorts an array of numbers
- *
- * Arguments:
- * 0: array <ARRAY>
- * 1: ascending (optional) <BOOL>
- *
- * Return Value:
- * sortedArray (ARRAY)
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED(QFUNC(insertionSort),"3.8.0","sort");
-
-params [["_list", [], [[]]], ["_ascending", true, [false]]];
-
-_list = + _list; // copy array to not alter the original one
-_list sort _ascending;
-_list

addons/common/functions/fnc_localEvent.sqf

@@ -1,13 +0,0 @@
-#include "script_component.hpp"
-
-params ["_eventName", "_eventArgs"];
-
-private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
-if (_newName != "") then {
-    TRACE_2("Switching Names",_eventName,_newName);
-    _eventName = _newName;
-};
-
-[_eventName, _eventArgs] call CBA_fnc_localEvent;
-
-ACE_DEPRECATED("ace_common_fnc_localEvent","3.8.0","CBA_fnc_localEvent");

addons/common/functions/fnc_objectEvent.sqf

@@ -1,13 +0,0 @@
-#include "script_component.hpp"
-
-params ["_eventName", "_eventTargets", "_eventArgs"];
-
-private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
-if (_newName != "") then {
-    TRACE_2("Switching Names",_eventName,_newName);
-    _eventName = _newName;
-};
-
-[_eventName, _eventArgs, _eventTargets] call CBA_fnc_targetEvent;
-
-ACE_DEPRECATED("ace_common_fnc_objectEvent","3.8.0","CBA_fnc_targetEvent");

addons/common/functions/fnc_parseList.sqf

@@ -28,7 +28,7 @@ private _whitespaceList = [];
 
 {
     if (_removeWhitespace) then {
-        _whitespaceList pushBack ([_x] call FUNC(stringRemoveWhiteSpace));
+        _whitespaceList pushBack ([_x] call CBA_fnc_removeWhitespace);
     } else {
         _whitespaceList pushBack ([_x] call CBA_fnc_trim);
     };

addons/common/functions/fnc_removeAllEventHandlers.sqf

@@ -1,14 +0,0 @@
-#include "script_component.hpp"
-
-params ["_eventName"];
-
-private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
-if (_newName != "") then {
-    TRACE_2("Switching Names",_eventName,_newName);
-    _eventName = _newName;
-};
-
-CBA_events_eventNamespace setVariable [_eventName,nil];
-CBA_events_eventHashes setVariable [_eventName,nil];
-
-ACE_DEPRECATED("ace_common_fnc_removeAllEventHandlers","3.8.0","N/A (remove events individually w/ CBA_fnc_removeEventHandler)");

addons/common/functions/fnc_removeBinocularMagazine.sqf

@@ -1,20 +0,0 @@
-/*
- * Author: commy2
- * Removes the magazine of the units rangefinder.
- *
- * Arguments:
- * 0: Unit <OBJECT>
- *
- * Return Value:
- * None
- *
- * Example:
- * player call ace_common_fnc_removeBinocularMagazine
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED("ace_common_fnc_removeBinocularMagazine","3.8.0","CBA_fnc_removeBinocularMagazine");
-
-_this call CBA_fnc_removeBinocularMagazine

addons/common/functions/fnc_removeEventHandler.sqf

@@ -1,13 +0,0 @@
-#include "script_component.hpp"
-
-params ["_eventName", "_eventCode"];
-
-private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
-if (_newName != "") then {
-    TRACE_2("Switching Names",_eventName,_newName);
-    _eventName = _newName;
-};
-
-[_eventName, _eventCode] call CBA_fnc_removeEventHandler;
-
-ACE_DEPRECATED("ace_common_fnc_removeEventHandler","3.8.0","CBA_fnc_removeEventHandler");

addons/common/functions/fnc_removeScrollWheelEventHandler.sqf

@@ -1,31 +0,0 @@
-/*
- * Author: commy2
- * Remove a scroll wheel event handler.
- *
- * Arguments:
- * 0: ID of the event handler <NUMBER>
- *
- * Return Value:
- * None
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-params ["_id"];
-
-private _actionsVar = missionNamespace getVariable ["ACE_EventHandler_ScrollWheel", [-1, [], []]];
-
-_actionsVar params ["_currentId", "_actionIDs", "_actions"];
-
-_id = _actionIDs find _id;
-
-if (_id == -1) exitWith {};
-
-_actionIDs set [_id, -1];
-_actionIDs = _actionIDs - [-1];
-
-_actions set [_id, []];//{}
-_actions = _actions - [[]];//[{}]
-
-missionNamespace setVariable ["ACE_EventHandler_ScrollWheel", [_currentId, _actionIDs, _actions]];

addons/common/functions/fnc_serverEvent.sqf

@@ -1,13 +0,0 @@
-#include "script_component.hpp"
-
-params ["_eventName", "_eventArgs"];
-
-private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
-if (_newName != "") then {
-    TRACE_2("Switching Names",_eventName,_newName);
-    _eventName = _newName;
-};
-
-[_eventName, _eventArgs] call CBA_fnc_serverEvent;
-
-ACE_DEPRECATED("ace_common_fnc_serverEvent","3.8.0","CBA_fnc_serverEvent");

addons/common/functions/fnc_stringRemoveWhiteSpace.sqf

@@ -17,4 +17,6 @@
 
 params ["_string"];
 
+ACE_DEPRECATED(QFUNC(stringRemoveWhiteSpace),"3.10.0","CBA_fnc_removeWhitespace");
+
 (_string splitString " ") joinString ""

addons/common/functions/fnc_targetEvent.sqf

@@ -1,13 +0,0 @@
-#include "script_component.hpp"
-
-params ["_eventName", "_eventTargets", "_eventArgs"];
-
-private _newName = getText (configFile >> "ACE_newEvents" >> _eventName);
-if (_newName != "") then {
-    TRACE_2("Switching Names",_eventName,_newName);
-    _eventName = _newName;
-};
-
-[_eventName,_eventArgs,_eventTargets] call CBA_fnc_targetEvent;
-
-ACE_DEPRECATED("ace_common_fnc_targetEvent","3.8.0","CBA_fnc_targetEvent");

addons/common/functions/fnc_waitAndExecute.sqf

@@ -1,22 +0,0 @@
-/*
- * Author: esteldunedain
- * Executes a code once with a given game time delay, using a PFH
- *
- * Arguments:
- * 0: Code to execute <CODE>
- * 1: Parameters to run the code with <ARRAY>
- * 2: Delay in seconds before executing the code <NUMBER>
- *
- * Return Value:
- * None
- *
- * Example:
- * [{(_this select 0) setVelocity [0,0,200];}, [player], 10] call ace_common_fnc_waitAndExecute
- *
- * Public: Yes
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED("ace_common_fnc_waitAndExecute","3.8.0","CBA_fnc_waitAndExecute");
-
-_this call CBA_fnc_waitAndExecute;

addons/common/functions/fnc_waitUntilAndExecute.sqf

@@ -1,24 +0,0 @@
-/*
- * Author: joko // Jonas
- * Executes a code once with after the Condition is True, using a PFH
- *
- * Arguments:
- * 0: Condition <CODE>
- * 1: Code to execute <CODE>
- * 2: Parameters to run the code with <ARRAY,ANY,NIL>
- *
- * Return Value:
- * None
- *
- * Example:
- * [{(_this select 0) == vehicle (_this select 0)}, {(_this select 0) setDamage 1;}, [ACE_player]] call ace_common_fnc_waitUntilAndExecute
- *
- * Public: No
- */
-#include "script_component.hpp"
-
-ACE_DEPRECATED("ace_common_fnc_waitUntilAndExecute","3.8.0","CBA_fnc_waitUntilAndExecute");
-
-_this call CBA_fnc_waitUntilAndExecute;
-
-nil

addons/common/init_handleScrollWheel.sqf

@@ -1,19 +0,0 @@
-/*
- * Author: commy2
- * Initializes the MouseZChanged eventhandler.
- *
- * Arguments:
- * None
- *
- * Return Value:
- * None
- *
- * Public : No
- */
-#include "script_component.hpp"
-
-disableSerialization;
-
-params ["_display"];
-
-_display displayAddEventHandler ["MouseZChanged", QUOTE(_this call FUNC(handleScrollWheel))];

addons/common/stringtable.xml

@@ -12,6 +12,7 @@
             <Portuguese>ACE-Team</Portuguese>
             <Hungarian>ACE-Team</Hungarian>
             <Italian>ACE-Team</Italian>
+            <Japanese>ACE-Team</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_Save">
             <English>Save</English>
@@ -24,6 +25,7 @@
             <Portuguese>Salvar</Portuguese>
             <Hungarian>Mentés</Hungarian>
             <Italian>Salva</Italian>
+            <Japanese>保存</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_Cancel">
             <English>Cancel</English>
@@ -36,6 +38,7 @@
             <Portuguese>Cancelar</Portuguese>
             <Hungarian>Mégse</Hungarian>
             <Italian>Annulla</Italian>
+            <Japanese>中止</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_Options">
             <English>ACE Options</English>
@@ -48,6 +51,7 @@
             <Portuguese>Opções do ACE</Portuguese>
             <Hungarian>ACE Beállítások</Hungarian>
             <Italian>Opzioni ACE</Italian>
+            <Japanese>ACE オプション</Japanese>
         </Key>
         <!-- These are cardinal directions, in case you didn't guess. -->
         <Key ID="STR_ACE_Common_N">
@@ -61,6 +65,7 @@
             <Portuguese>N</Portuguese>
             <Hungarian>É</Hungarian>
             <Italian>N</Italian>
+            <Japanese>N</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_NNE">
             <English>NNE</English>
@@ -73,6 +78,7 @@
             <Portuguese>NNE</Portuguese>
             <Hungarian>ÉÉK</Hungarian>
             <Italian>NNE</Italian>
+            <Japanese>NNE</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_NE">
             <English>NE</English>
@@ -85,6 +91,7 @@
             <Portuguese>NE</Portuguese>
             <Hungarian>ÉK</Hungarian>
             <Italian>NE</Italian>
+            <Japanese>NE</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ENE">
             <English>ENE</English>
@@ -97,6 +104,7 @@
             <Portuguese>LNE</Portuguese>
             <Hungarian>KÉK</Hungarian>
             <Italian>ENE</Italian>
+            <Japanese>ENE</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_E">
             <English>E</English>
@@ -109,6 +117,7 @@
             <Portuguese>L</Portuguese>
             <Hungarian>K</Hungarian>
             <Italian>E</Italian>
+            <Japanese>E</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ESE">
             <English>ESE</English>
@@ -121,6 +130,7 @@
             <Portuguese>LSE</Portuguese>
             <Hungarian>KDK</Hungarian>
             <Italian>ESE</Italian>
+            <Japanese>ESE</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SE">
             <English>SE</English>
@@ -133,6 +143,7 @@
             <Portuguese>SE</Portuguese>
             <Hungarian>DK</Hungarian>
             <Italian>SE</Italian>
+            <Japanese>SE</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SSE">
             <English>SSE</English>
@@ -145,6 +156,7 @@
             <Portuguese>SSE</Portuguese>
             <Hungarian>DDK</Hungarian>
             <Italian>SSE</Italian>
+            <Japanese>SSE</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_S">
             <English>S</English>
@@ -157,6 +169,7 @@
             <Portuguese>S</Portuguese>
             <Hungarian>D</Hungarian>
             <Italian>S</Italian>
+            <Japanese>S</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SSW">
             <English>SSW</English>
@@ -169,6 +182,7 @@
             <Portuguese>SSO</Portuguese>
             <Hungarian>DDNy</Hungarian>
             <Italian>SSO</Italian>
+            <Japanese>SSW</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SW">
             <English>SW</English>
@@ -181,6 +195,7 @@
             <Portuguese>SO</Portuguese>
             <Hungarian>DNy</Hungarian>
             <Italian>SO</Italian>
+            <Japanese>SW</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_WSW">
             <English>WSW</English>
@@ -193,6 +208,7 @@
             <Portuguese>OSO</Portuguese>
             <Hungarian>NyDNy</Hungarian>
             <Italian>OSO</Italian>
+            <Japanese>WSW</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_W">
             <English>W</English>
@@ -205,6 +221,7 @@
             <Portuguese>O</Portuguese>
             <Hungarian>Ny</Hungarian>
             <Italian>O</Italian>
+            <Japanese>W</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_WNW">
             <English>WNW</English>
@@ -217,6 +234,7 @@
             <Portuguese>ONO</Portuguese>
             <Hungarian>NyÉNy</Hungarian>
             <Italian>ONO</Italian>
+            <Japanese>WNW</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_NW">
             <English>NW</English>
@@ -229,6 +247,7 @@
             <Portuguese>NO</Portuguese>
             <Hungarian>ÉNy</Hungarian>
             <Italian>NO</Italian>
+            <Japanese>NW</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_NNW">
             <English>NNW</English>
@@ -241,6 +260,7 @@
             <Portuguese>NNO</Portuguese>
             <Hungarian>ÉÉNy</Hungarian>
             <Italian>NNO</Italian>
+            <Japanese>NNW</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ActionAborted">
             <English>Action cancelled.</English>
@@ -253,6 +273,7 @@
             <Portuguese>Ação cancelada.</Portuguese>
             <Hungarian>Művelet megszakítva.</Hungarian>
             <Italian>Azione cancellata.</Italian>
+            <Japanese>動作を中止した。</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_MiscItems">
             <English>[ACE] Miscellaneous Items</English>
@@ -265,6 +286,7 @@
             <Portuguese>[ACE] Itens diversos</Portuguese>
             <Hungarian>[ACE] Egyéb tárgyak</Hungarian>
             <Italian>[ACE] Oggetti vari</Italian>
+            <Japanese>[ACE] その他のアイテム</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_EnableNumberHotkeys">
             <English>Disable Command Menu</English>
@@ -277,6 +299,7 @@
             <Hungarian>Parancsnoki menü kikapcsolása</Hungarian>
             <Italian>Disabilita menù di comando</Italian>
             <Portuguese>Desabilitar menu de comando</Portuguese>
+            <Japanese>指揮メニューを無効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_Unknown">
             <English>Unknown</English>
@@ -289,6 +312,7 @@
             <Italian>Sconosciuto</Italian>
             <French>Inconnu</French>
             <Portuguese>Desconhecido</Portuguese>
+            <Japanese>不明</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_NoVoice">
             <English>No Voice</English>
@@ -301,6 +325,7 @@
             <Italian>Senza voce</Italian>
             <French>Pas de voix</French>
             <Portuguese>Sem voz</Portuguese>
+            <Japanese>音声なし</Japanese>
         </Key>
         <Key ID="STR_ACE_ACTION_ACCEPT_REQUEST_KEY_TITLE">
             <English>Accept Requests</English>
@@ -313,6 +338,7 @@
             <Hungarian>Kérések elfogadása</Hungarian>
             <Portuguese>Aceitar Pedido</Portuguese>
             <Italian>Accetta la richiesta</Italian>
+            <Japanese>要求を受け入れ</Japanese>
         </Key>
         <Key ID="STR_ACE_ACTION_DECLINE_REQUEST_KEY_TITLE">
             <English>Decline Requests</English>
@@ -325,6 +351,7 @@
             <Hungarian>Kérések elutasítása</Hungarian>
             <Portuguese>Rejeitar pedido</Portuguese>
             <Italian>Rifiuta la richiesta</Italian>
+            <Japanese>要求を拒否</Japanese>
         </Key>
         <Key ID="STR_ACE_ACTION_ACCEPT_REQUEST_KEY_TOOLTIP">
             <English>Accept Requests send by other players. These can be requests to use / share equipment, perform certain actions.</English>
@@ -337,6 +364,7 @@
             <French>Accepter les requêtes d'autres joueurs. Comme l'utilisation / l'échange d'équipement, la réalisation d'actions.</French>
             <Hungarian>Más játékosok általi kérések elfogadása. Ezek a kérések vonatkozhatnak a felszerelés használatára/megosztására, valamint különböző cselekményekre.</Hungarian>
             <Portuguese>Aceitar pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações.</Portuguese>
+            <Japanese>他プレイヤからの要求を許可します。他プレイヤは装備を共有し、使うなど特定の動作を行えます。</Japanese>
         </Key>
         <Key ID="STR_ACE_ACTION_DECLINE_REQUEST_KEY_TOOLTIP">
             <English>Decline Requests send by other players. These can be requests to use / share equipment, perform certain actions.</English>
@@ -349,6 +377,7 @@
             <French>Rejeter les requêtes d'autres joueurs. Comme l'utilisation / l'échange d'équipement, la réalisation d'actions.</French>
             <Hungarian>Más játékosok általi kérések elutasítása. Ezek a kérések vonatkozhatnak a felszerelés használatára/megosztására, valamint különböző cselekményekre.</Hungarian>
             <Portuguese>Rejeita pedidos enviados por outros jogadores. Podem ser pedidos para usar/ compartilhar equipamento, realizar certas ações.</Portuguese>
+            <Japanese>他プレイヤからの要求を拒否します。他プレイヤは装備を共有し、使うなど特定の動作をできません。</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SettingFeedbackIconsName">
             <English>Feedback icons</English>
@@ -361,6 +390,7 @@
             <Czech>Pomocné ikony</Czech>
             <Hungarian>Visszajelző ikonok</Hungarian>
             <Portuguese>Ícones de Feedback</Portuguese>
+            <Japanese>フィードバック アイコン</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SettingFeedbackIconsDesc">
             <English>Select the position of or disable the feedback icons on your screen. These icons will show to provide extra feedback on your character status and actions performed.</English>
@@ -373,6 +403,7 @@
             <Czech>Nastavuje pozici nebo vypíná pomocné ikony. Tyto ikony ukazují extra informace ke stavu postavy a vykonávaných činností.</Czech>
             <Hungarian>Itt beállítható a visszajelző ikonok képernyőn lévő helyzete és jelenléte. Ezek az ikonok extra visszajelzést biztosítanak a karaktered állapotán és végrehajtott cselekvésein.</Hungarian>
             <Portuguese>Selecione a posição ou disabilite a posição dos ícones de feedback na sua tela. Esses ícones irão aparecer para mostrar feedback extra do status do seu personagem e ações realizadas.</Portuguese>
+            <Japanese>画面上に表示するフィードバック アイコンの位置や無効化を選択できます。このアイコンは自キャラクター状態や動作の状況をフィードバックするために表示されています。</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SettingProgressbarLocationName">
             <English>Progress bar location</English>
@@ -385,6 +416,7 @@
             <Czech>Pozice ukazetele průběhu činnosti</Czech>
             <Hungarian>Állapotjelző sáv helyzete</Hungarian>
             <Portuguese>Local da barra de progresso</Portuguese>
+            <Japanese>プログレス バーの位置</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SettingProgressbarLocationDesc">
             <English>Set the desired location of the progress bar on your screen.</English>
@@ -397,6 +429,7 @@
             <Czech>Nastavuje pozici ukazetele průběhu činnosti na vaší obrazovce.</Czech>
             <Hungarian>Itt beállítható az állapotjelző sáv képernyődön lévő helyzete.</Hungarian>
             <Portuguese>Define o local desejado da barra de progresso na sua tela.</Portuguese>
+            <Japanese>画面上に表示されるプログレス バーの位置を設定できます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SettingDisplayTextColorName">
             <English>Hint Background color</English>
@@ -409,6 +442,7 @@
             <Czech>Barva pozadí nápovědy</Czech>
             <Hungarian>Súgó háttérszíne</Hungarian>
             <Portuguese>Cor do fundo da hint</Portuguese>
+            <Japanese>ヒントの背景色</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SettingDisplayTextColorDesc">
             <English>The color of the background from the ACE hints.</English>
@@ -421,6 +455,7 @@
             <Czech>Barva pozadí ACE nápovědy.</Czech>
             <Hungarian>Az ACE-súgók hátterének színe.</Hungarian>
             <Portuguese>A cor de fundo das hints do ACE.</Portuguese>
+            <Japanese>ACE によるヒントの背景色を指定します。</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SettingDisplayTextFontColorName">
             <English>Hint text font color</English>
@@ -433,6 +468,7 @@
             <Czech>Barva fontu nápovědy.</Czech>
             <Hungarian>Súgószöveg betűinek színe</Hungarian>
             <Portuguese>Cor do do texto da hint</Portuguese>
+            <Japanese>ヒント文章の色</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_SettingDisplayTextFontColorDesc">
             <English>The color of the text font from the ACE hints. This color is the default color for all text displayed through the ACE Hint system, if the hint text has no other color specified.</English>
@@ -445,6 +481,7 @@
             <Czech>Barva fontu ACE nápověd. Toto je standardní barva pro všechen text zobrazovaný ACE nápovědami, pokud nemá nápověda žádnou specifikanou barvu.</Czech>
             <Hungarian>Az ACE-súgók betűkészletének színek. Ez a szín alapértelmezett az összes szövegre az ACE-súgórendszerben, ha a súgószöveg maga nem ad meg más színt.</Hungarian>
             <Portuguese>A cor do texto das hints do ACE. Essa cor é a cor default para todos os texos exibidos pelo sistema de hints do ACE , caso o texto da hint não tem outra cor especificada.</Portuguese>
+            <Japanese>ACE によるヒントの文章へ、色を設定できます。この色は ACE ヒント システムを介して表示される全文章の色と標準でなっており、特定の色を設定していても、標準色になります。</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_bananaDisplayName">
             <English>Banana</English>
@@ -457,6 +494,7 @@
             <French>Banane</French>
             <Hungarian>Banán</Hungarian>
             <Portuguese>Banana</Portuguese>
+            <Japanese>甘蕉</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_bananaDescr">
             <English>A banana is an edible fruit, botanically a berry, produced by several kinds of large herbaceous flowering plants in the genus Musa.</English>
@@ -469,6 +507,7 @@
             <Polish>Rodzaj roślin z rodziny bananowatych, obejmujący około 80 gatunków.&lt;br /&gt;Przedstawiciele są typowymi przedstawicielami flory międzyzwrotnikowej Azji, Afryki i Australii.&lt;br /&gt;Część gatunków dostarcza jadalnych owoców. Słowo banan pochodzi prawdopodobnie od arabskiego słowa banan, co oznacza palec, lub afrykańskiego języka wolof, w którym rośliny te określa się mianem banaana.</Polish>
             <French>Une banane est un fruit qui, d'un point de vue botanique, fait partie du groupe des baies. Produite par plusieurs sortes de grandes plantes à fleurs herbacées du type Musa.</French>
             <Portuguese>A banana é uma fruta comestível, botanicamente uma baga, produzida por vários tipos de plantas herbáceas grandes do genero Musa.</Portuguese>
+            <Japanese>甘蕉は食べられる果物でバショウ科バショウ属のうち、果実を食用とする品種群の総称。また、その果実のこと。いくつかの原種から育種された多年草。種によっては熟すまでは毒を持つものもある。</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_DisplayName">
             <English>Check PBOs</English>
@@ -481,6 +520,7 @@
             <Hungarian>PBO-k ellenőrzése</Hungarian>
             <Russian>Проверка аддонов</Russian>
             <Italian>Controlla PBO</Italian>
+            <Japanese>PBO を検査</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Description">
             <English>Check addon integrity with server and do selected action if an addon is missing.</English>
@@ -492,6 +532,7 @@
             <Russian>Выполняет проверку версий аддонов ACE у подключаемых игроков</Russian>
             <French>Ce module contrôle si les PBOs de chaque joueur sont corrects</French>
             <Italian>Controlla l'integrità degli addon con il server ed esegui l'azione selezionata se un addon è mancante</Italian>
+            <Japanese>サーバがアドオンの整合性を検査し、もし不備があれば実行する動作を選択できます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Action_DisplayName">
             <English>Action</English>
@@ -504,6 +545,7 @@
             <Hungarian>Cselekvés</Hungarian>
             <Russian>Действие</Russian>
             <Italian>Azione</Italian>
+            <Japanese>動作</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Action_Description">
             <English>What to do with people who do not have the right PBOs?</English>
@@ -516,6 +558,7 @@
             <Hungarian>Mi legyen azokkal a személyekkel, akiknek nincsenek meg a helyes PBO-k?</Hungarian>
             <Russian>Что делать с игроками с неправильными аддонами?</Russian>
             <Italian>Cosa fare con giocatori che non hanno i PBO corretti?</Italian>
+            <Japanese>プレイヤーが正しい PBO を持っていない場合は？</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Action_WarnOnce">
             <English>Warn once</English>
@@ -528,6 +571,7 @@
             <Hungarian>Egyszeri figyelmeztetés</Hungarian>
             <Russian>Предупредить один раз</Russian>
             <Italian>Avverti una volta</Italian>
+            <Japanese>一度の警告</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Action_WarnPerm">
             <English>Warn (permanent)</English>
@@ -540,6 +584,7 @@
             <Hungarian>Figyelmeztetés (tartós)</Hungarian>
             <Russian>Предупреждать (постоянно)</Russian>
             <Italian>Avverti (permanente)</Italian>
+            <Japanese>警告（永久的）</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Action_Kick">
             <English>Kick</English>
@@ -552,6 +597,7 @@
             <Hungarian>Kirúgás</Hungarian>
             <Russian>Кикнуть</Russian>
             <Italian>Kick</Italian>
+            <Japanese>排除</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_CheckAll_DisplayName">
             <English>Check all addons</English>
@@ -564,6 +610,7 @@
             <Hungarian>Összes bővítmény ellenőrzése</Hungarian>
             <Russian>Проверять все аддоны</Russian>
             <Italian>Controlla tutti gli addon</Italian>
+            <Japanese>全アドオンを検査</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_CheckAll_Description">
             <English>Check all addons instead of only those of ACE?</English>
@@ -576,6 +623,7 @@
             <Hungarian>Az összes bővítmény ellenőrzése, csak az ACE helyett?</Hungarian>
             <Russian>Проверять все аддоны, а не только ACE?</Russian>
             <Italian>Controlla tutti gli addon invece dei soli addon ACE?</Italian>
+            <Japanese>ACE MOD の代わりに全アドオンを検査しますか？</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Whitelist_DisplayName">
             <English>Whitelist</English>
@@ -588,6 +636,7 @@
             <Hungarian>Fehérlista</Hungarian>
             <Russian>Вайтлист доп. аддонов</Russian>
             <Italian>Lista Bianca</Italian>
+            <Japanese>許可制</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_CheckPBO_Whitelist_Description">
             <English>What addons are allowed regardless?</English>
@@ -600,6 +649,7 @@
             <Hungarian>Milyen bővítmények vannak feltétlenül engedélyezve?</Hungarian>
             <Russian>Какие аддоны дополнительно разрешены?</Russian>
             <Italian>Quali addon sono permessi in ogni caso?</Italian>
+            <Japanese>どのようなアドオンを許可しますか？</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_LSDVehicles_DisplayName">
             <English>LSD Vehicles</English>
@@ -612,6 +662,7 @@
             <Hungarian>LSD járművek</Hungarian>
             <Russian>Транспорт под LSD</Russian>
             <Italian>Veicoli LSD</Italian>
+            <Japanese>LSD 車両</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_LSDVehicles_Description">
             <English>Adds LSD effect to synchronized vehicle</English>
@@ -624,6 +675,7 @@
             <Hungarian>LSD-effekt hozzáadása a szinkronizált járművekhez</Hungarian>
             <Russian>Добавляет эффект LSD (мигание всеми цветами радуги) синхронизированным транспортным средствам</Russian>
             <Italian>Aggiunge effetti LSD ai veicoli sincronizzati</Italian>
+            <Japanese>同期されたオブジェクトに LSD の効果を追加します</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_toggleHandheldDevice">
             <English>Toggle Handheld Device</English>
@@ -636,6 +688,7 @@
             <Hungarian>Kézi eszköz kapcsolása</Hungarian>
             <Russian>Включить портативное устройство</Russian>
             <Italian>Apri dispositivo palmare</Italian>
+            <Japanese>デバイスを常に表示</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_closeHandheldDevice">
             <English>Close Handheld Device</English>
@@ -648,6 +701,7 @@
             <Hungarian>Kézi eszköz bezárása</Hungarian>
             <Russian>Закрыть портативное устройство</Russian>
             <Italian>Chiudi dispositivo palmare</Italian>
+            <Japanese>デバイスを閉じる</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_cycleHandheldDevices">
             <English>Cycle Handheld Devices</English>
@@ -660,6 +714,7 @@
             <Hungarian>Kézi eszköz váltása</Hungarian>
             <Russian>Следующее портативное устройство</Russian>
             <Italian>Cicla tra dispositivi palmari</Italian>
+            <Japanese>表示するデバイスを変える</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_Disabled">
             <English>Disabled</English>
@@ -671,6 +726,7 @@
             <Portuguese>Desativado</Portuguese>
             <Russian>Откл.</Russian>
             <Spanish>Desactivado</Spanish>
+            <Japanese>無効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_Enabled">
             <English>Enabled</English>
@@ -682,6 +738,7 @@
             <Portuguese>Ativado</Portuguese>
             <Russian>Вкл.</Russian>
             <Spanish>Activado</Spanish>
+            <Japanese>有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_Yes">
             <English>Yes</English>
@@ -694,6 +751,7 @@
             <Hungarian>Igen</Hungarian>
             <Portuguese>Sim</Portuguese>
             <Italian>Si</Italian>
+            <Japanese>はい</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_No">
             <English>No</English>
@@ -706,6 +764,7 @@
             <Hungarian>Nem</Hungarian>
             <Portuguese>Não</Portuguese>
             <Italian>No</Italian>
+            <Japanese>いいえ</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_VehiclesOnly">
             <English>Vehicles only</English>
@@ -717,6 +776,7 @@
             <Spanish>Solo vehículos</Spanish>
             <Italian>Solo veicoli</Italian>
             <French>Vehicules seulement</French>
+            <Japanese>車両のみ</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_DoNotForce">
             <English>Do Not Force</English>
@@ -728,6 +788,7 @@
             <Russian>Не обязывать</Russian>
             <Italian>Non forzare</Italian>
             <French>Ne pas forcer</French>
+            <Japanese>強制しない</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ACEKeybindCategoryEquipment">
             <English>ACE3 Equipment</English>
@@ -739,6 +800,7 @@
             <Spanish>ACE3 Equipo</Spanish>
             <Italian>Equipaggiamento ACE3</Italian>
             <French>ACE3 Equipement</French>
+            <Japanese>ACE3 装備</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ACEKeybindCategoryCommon">
             <English>ACE3 Common</English>
@@ -750,6 +812,7 @@
             <Czech>ACE3 Obecné</Czech>
             <Italian>Comune ACE3</Italian>
             <French>ACE3 Commun</French>
+            <Japanese>ACE3 全般</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ACEKeybindCategoryWeapons">
             <English>ACE3 Weapons</English>
@@ -761,6 +824,7 @@
             <Spanish>ACE3 Armas</Spanish>
             <Italian>Armi ACE3</Italian>
             <French>ACE3 Armes</French>
+            <Japanese>ACE3 武器</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ACEKeybindCategoryMovement">
             <English>ACE3 Movement</English>
@@ -772,6 +836,7 @@
             <Czech>ACE3 Pohyb</Czech>
             <Italian>Movimento ACE3</Italian>
             <French>ACE3 Mouvement</French>
+            <Japanese>ACE3 移動</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ACEKeybindCategoryScopeAdjustment">
             <English>ACE3 Scope Adjustment</English>
@@ -783,6 +848,7 @@
             <Spanish>ACE3 Ajuste de miras</Spanish>
             <Italian>Regolazione Ottiche ACE3</Italian>
             <French>ACE3 Ajustement de la lunette </French>
+            <Japanese>ACE3 スコープ調節</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_ACEKeybindCategoryVehicles">
             <English>ACE3 Vehicles</English>
@@ -794,6 +860,7 @@
             <Spanish>ACE3 Vehículos</Spanish>
             <Italian>Veicoli ACE3</Italian>
             <French>ACE3 Vehicules</French>
+            <Japanese>ACE3 車両</Japanese>
         </Key>
         <Key ID="STR_ACE_Common_NoRoomToUnload">
             <English>No Room to unload</English>
@@ -805,6 +872,7 @@
             <Czech>Nedostatek místa k vyložení</Czech>
             <Portuguese>Sem espaço para descarregar</Portuguese>
             <Russian>Нет места для выгрузки</Russian>
+            <Japanese>降ろすための空間がありません</Japanese>
         </Key>
     </Package>
 </Project>

addons/concertina_wire/config.cpp

@@ -16,7 +16,3 @@ class CfgPatches {
 
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
-
-class ACE_newEvents {
-    interactMenuOpened = "ace_interactMenuOpened";
-};

addons/concertina_wire/stringtable.xml

@@ -12,6 +12,7 @@
             <Italian>Filo spinato di concertina</Italian>
             <Hungarian>Concertina wire</Hungarian>
             <Portuguese>Arame farpado</Portuguese>
+            <Japanese>鉄条網</Japanese>
         </Key>
         <Key ID="STR_ACE_CONCERTINA_WIRECOIL">
             <English>Concertina Wire Coil</English>
@@ -24,6 +25,7 @@
             <Italian>Bobina di concertina</Italian>
             <Hungarian>Concertina wire coil</Hungarian>
             <Portuguese>Bobina de arame farpado</Portuguese>
+            <Japanese>鉄条網コイル</Japanese>
         </Key>
         <Key ID="STR_ACE_UNROLLWIRE">
             <English>Dismount Concertina Wire</English>
@@ -36,6 +38,7 @@
             <Italian>Smonta la concertina</Italian>
             <Hungarian>Dismount Concertina wire</Hungarian>
             <Portuguese>Desmontar arame farpado</Portuguese>
+            <Japanese>鉄条網をほどく</Japanese>
         </Key>
         <Key ID="STR_ACE_ROLLWIRE">
             <English>Deploy Concertina Wire</English>
@@ -48,6 +51,7 @@
             <Italian>Posa il filo di concertina</Italian>
             <Hungarian>Deploy Concertina wire</Hungarian>
             <Portuguese>Colocar arame farpado</Portuguese>
+            <Japanese>鉄条網を置く</Japanese>
         </Key>
     </Package>
 </Project>

addons/cookoff/functions/fnc_cookOff.sqf

@@ -20,7 +20,9 @@ params ["_vehicle"];
 if (_vehicle getVariable [QGVAR(isCookingOff), false]) exitWith {};
 _vehicle setVariable [QGVAR(isCookingOff), true];
 
-[QGVAR(cookOff), _vehicle] call CBA_fnc_remoteEvent;
+if (local _vehicle) then {
+    [QGVAR(cookOff), _vehicle] call CBA_fnc_remoteEvent;
+};
 
 [{
     params ["_vehicle"];

addons/cookoff/stringtable.xml

@@ -6,6 +6,7 @@
             <German>Cook-off ermöglichen</German>
             <Czech>Povolit explozi munice</Czech>
             <Russian>Включить воспламенение</Russian>
+            <Japanese>誘爆を有効化</Japanese>
             <Polish>Aktywuj efekty zapłonu</Polish>
         </Key>
         <Key ID="STR_ACE_CookOff_enable_tooltip">
@@ -13,21 +14,22 @@
             <German>Ermöglicht Cook-off und zugehörige Fahrzeug-Zerstörungseffekte.</German>
             <Czech>Povolí explozi munice a její následné ničivé efekty.</Czech>
             <Russian>Включает воспламенение и сопутствующие эффекты повреждения техники.</Russian>
+            <Japanese>誘爆を有効化し、車両が誘爆によって破壊されていきます。</Japanese>
             <Polish>Aktywuje efekt zapłonu na zniszczonych pojazdach.</Polish>
         </Key>
         <Key ID="STR_ACE_CookOff_generic_turret_wreck">
-          <Original>Wreck (Turret)</Original>
-          <French>Épave (tourelle)</French>
-          <Spanish>Restos (torreta)</Spanish>
-          <Italian>Rottami (torretta)</Italian>
-          <Polish>Wrak (wieżyczka)</Polish>
-          <Russian>Обломки (башня)</Russian>
-          <German>Wrack (Geschützturm)</German>
-          <Czech>Vrak (věž)</Czech>
-          <English>Wreck (Turret)</English>
-          <Portuguese>Ruínas (torre)</Portuguese>
-          <Korean>잔해(포탑)</Korean>
-          <Japanese>残骸（タレット）</Japanese>
+            <Original>Wreck (Turret)</Original>
+            <French>Épave (tourelle)</French>
+            <Spanish>Restos (torreta)</Spanish>
+            <Italian>Rottami (torretta)</Italian>
+            <Polish>Wrak (wieżyczka)</Polish>
+            <Russian>Обломки (башня)</Russian>
+            <German>Wrack (Geschützturm)</German>
+            <Czech>Vrak (věž)</Czech>
+            <English>Wreck (Turret)</English>
+            <Portuguese>Ruínas (torre)</Portuguese>
+            <Korean>잔해(포탑)</Korean>
+            <Japanese>残骸（タレット）</Japanese>
         </Key>
     </Package>
-</Project>
+</Project>

addons/dagr/config.cpp

@@ -19,7 +19,3 @@ class CfgPatches {
 #include "CfgWeapons.hpp"
 #include "Dialog.hpp"
 #include "RscTitles.hpp"
-
-class ACE_newEvents {
-    RangerfinderData = QEGVAR(vector,rangefinderData);
-};

addons/dagr/stringtable.xml

@@ -11,6 +11,7 @@
             <Czech>DAGR</Czech>
             <Italian>DAGR</Italian>
             <French>DAGR</French>
+            <Japanese>DAGR</Japanese>
         </Key>
         <Key ID="STR_ACE_DAGR_ConfigureDAGR">
             <English>Configure DAGR</English>
@@ -22,6 +23,7 @@
             <Czech>Konfigurovat DAGR</Czech>
             <Italian>Configura DAGR</Italian>
             <French>Configurer le DAGR</French>
+            <Japanese>DAGR を設定</Japanese>
         </Key>
         <Key ID="STR_ACE_DAGR_ToggleDAGR">
             <English>Toggle DAGR</English>
@@ -33,6 +35,7 @@
             <Czech>Přepnout DAGR</Czech>
             <Italian>Apri DAGR</Italian>
             <French>Activer/Desactiver le DAGR</French>
+            <Japanese>DAGR を常に表示</Japanese>
         </Key>
         <Key ID="STR_ACE_DAGR_Description">
             <English>Defense Advanced GPS Receiver</English>
@@ -44,6 +47,7 @@
             <Czech>Defense Advanced GPS Receiver</Czech>
             <Italian>Defense Advanced GPS Receiver</Italian>
             <French>Defense Advanced GPS Receiver</French>
+            <Japanese>アドバンスド DAGR の受信を定義します</Japanese>
         </Key>
     </Package>
-</Project>
+</Project>

addons/disarming/config.cpp

@@ -19,8 +19,3 @@ class CfgPatches {
 #include "CfgWeapons.hpp"
 
 #include "gui_disarm.hpp"
-
-class ACE_newEvents {
-    DisarmDebugCallback = QGVAR(debugCallback);
-    DisarmDropItems = QGVAR(dropItems);
-};

addons/disarming/stringtable.xml

@@ -12,6 +12,7 @@
             <French>Ouvrir l'inventaire</French>
             <Hungarian>Felszerelés megtekintése</Hungarian>
             <Portuguese>Abrir inventário</Portuguese>
+            <Japanese>インベントリを開く</Japanese>
         </Key>
     </Package>
-</Project>
+</Project>

addons/disposable/stringtable.xml

@@ -12,6 +12,7 @@
             <Russian>Отстрелянная труба</Russian>
             <Italian>Tubo usato</Italian>
             <Portuguese>Tubo utilizado</Portuguese>
+            <Japanese>使用済み</Japanese>
         </Key>
         <Key ID="STR_ACE_Disposable_UsedTubeDescription">
             <English>Used disposable rocket launcher</English>
@@ -24,6 +25,7 @@
             <Russian>Отстрелянная одноразовая пусковая установка</Russian>
             <Italian>Lanciarazzi monouso già utilizzato</Italian>
             <Portuguese>Lança foguetes descartável utilizado</Portuguese>
+            <Japanese>使い終わったロケット ランチャーの筒部分</Japanese>
         </Key>
         <Key ID="STR_ACE_Disposable_PreloadedMissileDummy">
             <English>Preloaded Missile Dummy</English>
@@ -36,6 +38,7 @@
             <Russian>Предзаряженная ракетная болванка</Russian>
             <Italian>Missile inerte precaricato</Italian>
             <Portuguese>Míssel inerte pré-carregado</Portuguese>
+            <Japanese>仮置きのミサイルをあらかじめ装填</Japanese>
         </Key>
     </Package>
 </Project>

addons/dogtags/CfgWeapons.hpp

@@ -4,7 +4,7 @@
         scope = 1; \
         scopeArsenal = 0; \
         scopeCurator = 0; \
-        descriptionShort = QUOTE(DOGTAGID); \
+        descriptionShort = CSTRING(itemName); \
         GVAR(tagID) = DOGTAGID; \
     }
 

addons/dogtags/config.cpp

@@ -6,7 +6,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common"};
+        requiredAddons[] = {"ace_interaction"};
         author = ECSTRING(common,ACETeam);
         authors[] = {"SzwedzikPL"};
         url = ECSTRING(main,URL);

addons/dogtags/stringtable.xml

@@ -6,36 +6,42 @@
             <Polish>Nieśmiertelnik</Polish>
             <Russian>Жетон</Russian>
             <Czech>Identifikační známka</Czech>
+            <Japanese>ドッグ タグ</Japanese>
         </Key>
         <Key ID="STR_ACE_Dogtags_checkItem">
             <English>Check Dog Tag</English>
             <Polish>Sprawdź nieśmiertelnik</Polish>
             <Russian>Проверить жетон</Russian>
             <Czech>Zkontrolovat známku</Czech>
+            <Japanese>ドッグ タグを見る</Japanese>
         </Key>
         <Key ID="STR_ACE_Dogtags_checkDogtag">
             <English>Check</English>
             <Polish>Sprawdź</Polish>
             <Russian>Проверить</Russian>
             <Czech>Zkontroluj</Czech>
+            <Japanese>見る</Japanese>
         </Key>
         <Key ID="STR_ACE_Dogtags_takeDogtag">
             <English>Take</English>
             <Polish>Zabierz</Polish>
             <Russian>Взять</Russian>
             <Czech>Vezmi</Czech>
+            <Japanese>取る</Japanese>
         </Key>
         <Key ID="STR_ACE_Dogtags_takeDogtagSuccess">
             <English>Dogtag taken from %1...</English>
             <Polish>Zabrałeś nieśmiertelnik %1...</Polish>
             <Russian>Жетон снят с %1...</Russian>
             <Czech>Sebral jsem známku od %1...</Czech>
+            <Japanese>%1からドッグ タグを取っている・・・</Japanese>
         </Key>
         <Key ID="STR_ACE_Dogtags_dogtagAlreadyTaken">
             <English>Somebody else has already taken the dogtag...</English>
             <Polish>Ktoś już zabrał ten nieśmiertelnik...</Polish>
             <Russian>Кто-то уже забрал жетон...</Russian>
             <Czech>Někdo jiný už vzal identifikační známku...</Czech>
+            <Japanese>すでに誰かがドッグ タグを取っているようだ・・・</Japanese>
         </Key>
     </Package>
 </Project>

addons/dragging/stringtable.xml

@@ -12,6 +12,7 @@
             <Portuguese>Arrastar</Portuguese>
             <Italian>Trascina</Italian>
             <Hungarian>Húzás</Hungarian>
+            <Japanese>引きずる</Japanese>
         </Key>
         <Key ID="STR_ACE_Dragging_Drop">
             <English>Release</English>
@@ -24,6 +25,7 @@
             <Portuguese>Soltar</Portuguese>
             <Italian>Lascia</Italian>
             <Hungarian>Elengedés</Hungarian>
+            <Japanese>はなす</Japanese>
         </Key>
         <Key ID="STR_ACE_Dragging_DragKeybind">
             <English>Drag/Release Object</English>
@@ -36,6 +38,7 @@
             <Portuguese>Arrastar/Soltar Objeto</Portuguese>
             <Italian>Trascina/Lascia Oggetto</Italian>
             <Hungarian>Húzás/Elengedés Objektum</Hungarian>
+            <Japanese>オブジェクトを引きずる/はなす</Japanese>
         </Key>
         <Key ID="STR_ACE_Dragging_UnableToDrag">
             <English>Item too heavy</English>
@@ -48,6 +51,7 @@
             <Russian>Предмет слишком тяжёлый</Russian>
             <Czech>Předmět je moc těžký</Czech>
             <Hungarian>Az objektum túl nehéz</Hungarian>
+            <Japanese>アイテムが重すぎる</Japanese>
         </Key>
         <Key ID="STR_ACE_Dragging_Carry">
             <English>Carry</English>
@@ -60,6 +64,7 @@
             <Hungarian>Felvevés</Hungarian>
             <Italian>Trasporta</Italian>
             <Russian>Нести</Russian>
+            <Japanese>運ぶ</Japanese>
         </Key>
         <Key ID="STR_ACE_Dragging_LowerRaise">
             <English>Raise/Lower</English>
@@ -71,6 +76,7 @@
             <Italian>Alza/Abbassa</Italian>
             <Spanish>Subir/Bajar</Spanish>
             <French>Lever/Baisser</French>
+            <Japanese>上げる/下げる</Japanese>
         </Key>
     </Package>
-</Project>
+</Project>

addons/explosives/config.cpp

@@ -45,8 +45,3 @@ class CfgMineTriggers {
         mineTriggerRange = 1;
     };
 };
-
-class ACE_newEvents {
-    clientRequestsOrientations = QGVAR(sendOrientations);
-    serverSendsOrientations = QGVAR(orientationsSent);
-};

addons/explosives/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Robbanóanyagok</Hungarian>
             <Portuguese>Explosivos</Portuguese>
             <Russian>Взрывчатка</Russian>
+            <Japanese>爆発物</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Place">
             <English>Place</English>
@@ -24,6 +25,7 @@
             <Hungarian>Elhelyezés</Hungarian>
             <Portuguese>Colocar</Portuguese>
             <Russian>Установить</Russian>
+            <Japanese>設置</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Detonate">
             <English>Detonate</English>
@@ -36,6 +38,7 @@
             <Hungarian>Robbantás</Hungarian>
             <Portuguese>Detonar</Portuguese>
             <Russian>Подрыв</Russian>
+            <Japanese>点火</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_DetonateAll">
             <English>Detonate All</English>
@@ -47,6 +50,7 @@
             <Italian>Detona Tutti</Italian>
             <French>Tout détoner</French>
             <Portuguese>Detonar Tudo</Portuguese>
+            <Japanese>すべて点火</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_DetonateCode">
             <English>Explosive code: %1</English>
@@ -59,6 +63,7 @@
             <Portuguese>Código do explosivo: %1</Portuguese>
             <Russian>Код подрыва: %1</Russian>
             <Italian>Codice esplosivo: %1</Italian>
+            <Japanese>爆破コード: %1</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_PlaceAction">
             <English>Place</English>
@@ -71,6 +76,7 @@
             <Hungarian>Elhelyezés</Hungarian>
             <Portuguese>Colocar</Portuguese>
             <Russian>Установить</Russian>
+            <Japanese>設置</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_AttachAction">
             <English>Attach</English>
@@ -83,6 +89,7 @@
             <Italian>Attacca</Italian>
             <Hungarian>Hozzácsatolás</Hungarian>
             <Russian>Прикрепить</Russian>
+            <Japanese>取り付け</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_BlockedAction">
             <English>Blocked</English>
@@ -94,6 +101,7 @@
             <Italian>Bloccato</Italian>
             <German>Blockiert</German>
             <French>Bloqué</French>
+            <Japanese>取り付けできない</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_CancelAction">
             <English>Cancel</English>
@@ -106,6 +114,7 @@
             <Hungarian>Mégsem</Hungarian>
             <Portuguese>Cancelar</Portuguese>
             <Russian>Отмена</Russian>
+            <Japanese>中止</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_ScrollAction">
             <English>Rotate</English>
@@ -118,6 +127,7 @@
             <Polish>Obrót</Polish>
             <Portuguese>Rotaciona</Portuguese>
             <Russian>Bращать</Russian>
+            <Japanese>向きを変える</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Jammer_TurnOn">
             <English>Turn On Thor III</English>
@@ -130,6 +140,7 @@
             <Hungarian>Thor III bekapcsolása</Hungarian>
             <Portuguese>Ativar Thor III</Portuguese>
             <Russian>Активировать Thor III</Russian>
+            <Japanese>Thor III を使う</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Jammer_TurnOff">
             <English>Turn Off Thor III</English>
@@ -142,6 +153,7 @@
             <Hungarian>Thor III kikapcsolása</Hungarian>
             <Portuguese>Desativar Thor III</Portuguese>
             <Russian>Деактивировать Thor III</Russian>
+            <Japanese>Thor III を止める</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_cellphone_displayName">
             <English>Cellphone</English>
@@ -154,6 +166,7 @@
             <Hungarian>Mobiltelefon</Hungarian>
             <Portuguese>Celular</Portuguese>
             <Russian>Сотовый телефон</Russian>
+            <Japanese>携帯電話</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_cellphone_description">
             <English>Used to remotely trigger explosives</English>
@@ -166,6 +179,7 @@
             <Hungarian>Robbanóanyagok távoli robbantásához való</Hungarian>
             <Portuguese>Usado para acionar explosivos remotamente</Portuguese>
             <Russian>Используется для удаленной детонации СВУ</Russian>
+            <Japanese>爆発物を遠隔で起爆させるのに使います</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_clacker_displayName">
             <English>M57 Firing Device</English>
@@ -178,6 +192,7 @@
             <Hungarian>M57 Gyújtóeszköz</Hungarian>
             <Portuguese>M57 Dispositivo de Detonação</Portuguese>
             <Russian>Взрыватель M57</Russian>
+            <Japanese>M57 起爆装置</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_clacker_description">
             <English>Used to remotely trigger explosives</English>
@@ -190,6 +205,7 @@
             <Hungarian>Robbanóanyagok távoli robbantásához</Hungarian>
             <Portuguese>Usado para acionar explosivos remotamente</Portuguese>
             <Russian>Используется для удаленной детонации зарядов</Russian>
+            <Japanese>爆発物を遠隔で起爆させるのに使います</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_M152_Clacker_displayName">
             <English>M152 Firing Device</English>
@@ -202,6 +218,7 @@
             <Hungarian>M152 Gyújtóeszköz</Hungarian>
             <Portuguese>M152 Dispositivo de Detonação</Portuguese>
             <Russian>Взрыватель M152</Russian>
+            <Japanese>M152 起爆装置</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_M152_displayName">
             <English>M152 RAMS</English>
@@ -214,6 +231,7 @@
             <Russian>M152 RAMS</Russian>
             <Spanish>M152 RAMS</Spanish>
             <Italian>M152 RAMS</Italian>
+            <Japanese>M152 RAMS</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_DefusalKit_displayName">
             <English>Defusal Kit</English>
@@ -226,6 +244,7 @@
             <Hungarian>Hatástalanító felszerelés</Hungarian>
             <Portuguese>Kit de desarme</Portuguese>
             <Russian>Комплект разминирования</Russian>
+            <Japanese>解除キット</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_DefusalKit_description">
             <English>Allows defusing of explosives</English>
@@ -238,6 +257,7 @@
             <Hungarian>Robbanóanyagok hatástalanítását teszi lehetővé</Hungarian>
             <Portuguese>Permite o desarme de explosivos</Portuguese>
             <Russian>Позволяет обезвреживать взрывчатку</Russian>
+            <Japanese>爆発物を無力化できます</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Phone_AddToSpeedDial">
             <English>Add to Speed Dial</English>
@@ -250,6 +270,7 @@
             <Hungarian>Hozzáadás a gyorstárcsázóhoz</Hungarian>
             <Portuguese>Adicionar à ligação rápida</Portuguese>
             <Russian>Добавить в быстрый вызов</Russian>
+            <Japanese>短縮ダイアルに追加</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Clear">
             <English>Clear</English>
@@ -262,6 +283,7 @@
             <Hungarian>Törlés</Hungarian>
             <Portuguese>Limpar</Portuguese>
             <Russian>Очистить</Russian>
+            <Japanese>消去</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Phone_Dial">
             <English>Dial</English>
@@ -274,6 +296,7 @@
             <Hungarian>Tárcsázás</Hungarian>
             <Portuguese>Discar</Portuguese>
             <Russian>Hабрать</Russian>
+            <Japanese>ダイアル</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Phone_Up">
             <English>Up</English>
@@ -286,6 +309,7 @@
             <Hungarian>Fel</Hungarian>
             <Portuguese>Cima</Portuguese>
             <Russian>Вызов</Russian>
+            <Japanese>上へ</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Phone_Down">
             <English>Down</English>
@@ -298,6 +322,7 @@
             <Hungarian>Le</Hungarian>
             <Portuguese>Baixo</Portuguese>
             <Russian>Сброс</Russian>
+            <Japanese>下へ</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Cancel">
             <English>Cancel</English>
@@ -310,6 +335,7 @@
             <Hungarian>Mégsem</Hungarian>
             <Portuguese>Cancelar</Portuguese>
             <Russian>Отмена</Russian>
+            <Japanese>中止</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_DetonateMenu">
             <English>Detonate Menu</English>
@@ -322,6 +348,7 @@
             <Hungarian>Robbantási menü</Hungarian>
             <Portuguese>Menu de detonação</Portuguese>
             <Russian>Меню подрыва</Russian>
+            <Japanese>点火メニュー</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_PlaceMenu">
             <English>Place Menu</English>
@@ -334,6 +361,7 @@
             <Hungarian>Elhelyezési menü</Hungarian>
             <Portuguese>Menu de posicionamento</Portuguese>
             <Russian>Меню установки</Russian>
+            <Japanese>設置メニュー</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Defuse">
             <English>Defuse</English>
@@ -346,6 +374,7 @@
             <Hungarian>Hatástalanítás</Hungarian>
             <Portuguese>Desarmar</Portuguese>
             <Russian>Обезвредить</Russian>
+            <Japanese>無力化</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_DefusingExplosive">
             <English>Defusing Explosive...</English>
@@ -358,6 +387,7 @@
             <Hungarian>Robbanóanyag hatástalanítása...</Hungarian>
             <Portuguese>Desarmando Explosivo...</Portuguese>
             <Russian>Обезвреживание...</Russian>
+            <Japanese>爆発物を無力化中・・・</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_timerName">
             <English>Timer</English>
@@ -370,6 +400,7 @@
             <Hungarian>Időzítő</Hungarian>
             <Portuguese>Timer</Portuguese>
             <Russian>Таймер</Russian>
+            <Japanese>タイマー</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_TimerMenu">
             <English>Time: %1m %2s</English>
@@ -382,6 +413,7 @@
             <Hungarian>Idő: %1m %2s</Hungarian>
             <Portuguese>Tempo: %1m %2s</Portuguese>
             <Russian>Время: %1m %2c</Russian>
+            <Japanese>設定時間: %1分 %2秒</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_SetTime">
             <English>Set Time</English>
@@ -394,6 +426,7 @@
             <Hungarian>Idő beállítása</Hungarian>
             <Portuguese>Configurar Tempo</Portuguese>
             <Russian>Установить время</Russian>
+            <Japanese>時間を設定</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_TriggerMenu">
             <English>Select a Trigger</English>
@@ -406,6 +439,7 @@
             <Hungarian>Gyújtóeszköz kiválasztása</Hungarian>
             <Portuguese>Selecionar um Gatilho</Portuguese>
             <Russian>Выберите детонатор</Russian>
+            <Japanese>点火装置を選択</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_SelectTrigger">
             <English>Select</English>
@@ -418,6 +452,7 @@
             <Hungarian>Kiválasztás</Hungarian>
             <Portuguese>Selecionar</Portuguese>
             <Russian>Выбрать</Russian>
+            <Japanese>選択</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_PressurePlate">
             <English>Pressure Plate</English>
@@ -430,6 +465,7 @@
             <Hungarian>Nyomólap</Hungarian>
             <Portuguese>Placa de pressão</Portuguese>
             <Russian>Нажимная плита</Russian>
+            <Japanese>圧力感知式</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_TripWire">
             <English>Tripwire</English>
@@ -442,6 +478,7 @@
             <Hungarian>Botlódrót</Hungarian>
             <Portuguese>Linha de tração</Portuguese>
             <Russian>Растяжка</Russian>
+            <Japanese>仕掛け線</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_IRSensor">
             <English>IR Sensor</English>
@@ -454,6 +491,7 @@
             <Hungarian>Infravörös szenzor</Hungarian>
             <Portuguese>Sensor IV</Portuguese>
             <Russian>ИК сенсор</Russian>
+            <Japanese>赤外線感知式</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_NoTriggersAvailable">
             <English>No triggers available for %1</English>
@@ -466,6 +504,7 @@
             <Hungarian>Nincs elérhető gyújtóeszköz ide: %1</Hungarian>
             <Portuguese>Nenhum gatilho disponível para %1</Portuguese>
             <Russian>Нет доступных взрывателей для %1</Russian>
+            <Japanese>%1 につかえる点火装置がありません</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_SLAME_IRSensor">
             <English>IR Sensor (Side Attack)</English>
@@ -478,6 +517,7 @@
             <Hungarian>Infravörös szenzor (Side Attack)</Hungarian>
             <Portuguese>Sensor infravermelho (ataque lateral)</Portuguese>
             <Russian>ИК сенсор (детонация вбок)</Russian>
+            <Japanese>赤外線感知式 (横からの攻撃)</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_SLAME_Magnetic">
             <English>Magnetic Influence Sensor (Bottom Attack)</English>
@@ -490,6 +530,7 @@
             <Hungarian>Mágneses mező érzékelő (Bottom Attack)</Hungarian>
             <Portuguese>Influência magnética (ataque inferior)</Portuguese>
             <Russian>Магнитный сенсор (детонация вверх)</Russian>
+            <Japanese>磁気感知式 (下からの攻撃)</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_NoExplosivesAvailable">
             <English>No explosives on trigger.</English>
@@ -502,6 +543,7 @@
             <Polish>Brak ładunków na zapalnik.</Polish>
             <Portuguese>Nenhum explosivo no gatilho.</Portuguese>
             <Russian>Взрыватель не подсоединён к взрывчатке</Russian>
+            <Japanese>点火装置に爆発物がありません。</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_DeadManSwitch_displayName">
             <English>Dead Man's Switch</English>
@@ -514,6 +556,7 @@
             <Portuguese>Detonador do homem morto</Portuguese>
             <Russian>Кнопка мертвеца</Russian>
             <Italian>Detonatore a rilascio</Italian>
+            <Japanese>自爆装置</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_DeadManSwitch_description">
             <English>Used to remotely trigger explosives when released.</English>
@@ -526,6 +569,7 @@
             <Portuguese>Usado para detonar remotamente o explosivo quando solto.</Portuguese>
             <Russian>Используется для дистанционного подрыва, после смерти оператора.</Russian>
             <Italian>Usato per attivare a distanza esplosivi al momento del rilascio</Italian>
+            <Japanese>点火装置を離すと遠隔で起爆したいときに使います。</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Pickup">
             <English>Pick up</English>
@@ -538,6 +582,7 @@
             <Russian>Поднять</Russian>
             <Italian>Raccogli</Italian>
             <Portuguese>Pegar</Portuguese>
+            <Japanese>拾う</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Module_DisplayName">
             <English>Explosive System</English>
@@ -550,6 +595,7 @@
             <Hungarian>Robbanóanyag-rendszer</Hungarian>
             <Russian>Взрывные устройства</Russian>
             <Italian>Sistema Esplosivi</Italian>
+            <Japanese>爆発システム</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_RequireSpecialist_DisplayName">
             <English>Require specialists?</English>
@@ -562,6 +608,7 @@
             <Hungarian>Specialisták igénylése?</Hungarian>
             <Russian>Требуется специалист?</Russian>
             <Italian>Richiedi specialisti?</Italian>
+            <Japanese>特技兵を必要としますか？</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_RequireSpecialist_Description">
             <English>Require explosive specialists to disable explosives? Default: No</English>
@@ -574,6 +621,7 @@
             <Hungarian>Szükséges-e egy specialista a robbanóanyagok hatástalanításához? Alapértelmezett: Nem</Hungarian>
             <Russian>Требуется ли специалист по минному делу для обезвреживания взрывчатки? По-умолчанию: Нет</Russian>
             <Italian>Richiedi specialisti esplosivi per disabilitare esplosivi? Default: No</Italian>
+            <Japanese>爆発物を無効化するには、爆発物の特技兵を必要としますか？標準：いいえ</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_PunishNonSpecialists_DisplayName">
             <English>Punish non-specialists?</English>
@@ -586,6 +634,7 @@
             <Hungarian>Nem-specialisták büntetése?</Hungarian>
             <Russian>Штраф не-специалистам?</Russian>
             <Italian>Punisci non-specialisti?</Italian>
+            <Japanese>非特技兵へ足かせを与えますか？</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_PunishNonSpecialists_Description">
             <English>Increase the time it takes to complete actions for non-specialists? Default: Yes</English>
@@ -598,6 +647,7 @@
             <Hungarian>Nem-specialisták esetén több ideig tartson a cselekvés befejezése? Alapértelmezett: Igen</Hungarian>
             <Russian>Увеличивать время завершения действий для не-специалистов? По-умолчанию: Нет</Russian>
             <Italian>Aumenta il tempo richiesto per completare azioni per non-specialisti? Default: Si</Italian>
+            <Japanese>非特技兵は動作を完了する必要を増加させますか？標準：はい</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_ExplodeOnDefuse_DisplayName">
             <English>Explode on defusal?</English>
@@ -610,6 +660,7 @@
             <Hungarian>Robbanás hatástalanításkor?</Hungarian>
             <Russian>Взрыв при разминир.?</Russian>
             <Italian>Fai esplodere quando disarmato?</Italian>
+            <Japanese>解除時に爆発させますか？</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_ExplodeOnDefuse_Description">
             <English>Enable certain explosives to explode on defusal? Default: Yes</English>
@@ -622,6 +673,7 @@
             <Hungarian>Meghatározott robbanóanyagok felrobbanjanak-e hatástalanításkor? Alapértelmezett: Igen</Hungarian>
             <Russian>Разрешить определенным взрывным устройствам взрываться при разминировании? По-умолчанию: Да</Russian>
             <Italian>Abilita alcuni esplosivi per esplosione al disarmo? Default: Si</Italian>
+            <Japanese>特定の爆発物へ、解除時に爆発させますか？標準：はい</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Module_Description">
             <English>This module adjusts the settings related to explosives.</English>
@@ -634,6 +686,7 @@
             <Russian>Этот модуль управляет настройками, связанными со взрывными устройствами</Russian>
             <Spanish>Este módulo ajusta las configuraciones relacionadas con explosivos.</Spanish>
             <Italian>Questo modulo cambia le impostazioni relative agli esplosivi</Italian>
+            <Japanese>このモジュールを調節し爆発物に設定を反映させます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Module_SLAMBottomAttack_DisplayName">
             <English>M6 SLAM Mine (Bottom Attack)</English>
@@ -652,6 +705,7 @@
             <Czech>M6 SLAM (Útok zespoda)</Czech>
             <Portuguese>Mina M6 SLAM (Ataque Inferior)</Portuguese>
             <Russian>Мина M6 SLAM (направлена вверх)</Russian>
+            <Japanese>M6 SLAM 地雷 (下からの攻撃)</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Module_SLAMSideAttack_DisplayName">
             <English>M6 SLAM Mine (Side Attack)</English>
@@ -670,6 +724,7 @@
             <Czech>M6 SLAM (Útok do strany)</Czech>
             <Portuguese>Mina M6 SLAM (Ataque Lateral)</Portuguese>
             <Russian>Мина M6 SLAM (направлена вбок)</Russian>
+            <Japanese>M6 SLAM 地雷 (横からの攻撃)</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Module_IEDUrbanBig_Range_DisplayName">
             <English>Large IED (Urban, Pressure Plate)</English>
@@ -688,6 +743,7 @@
             <Czech>IED, Velké (Městské, Nášlapné)</Czech>
             <Portuguese>IED Grande (Urbano, Placa de pressão)</Portuguese>
             <Russian>Большое СВУ (городское, нажимного действия)</Russian>
+            <Japanese>大きな IED (市街地用、圧力感知)</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Module_IEDLandBig_Range_DisplayName">
             <English>Large IED (Dug-in, Pressure Plate)</English>
@@ -706,6 +762,7 @@
             <Czech>IED, Velké (Zakopané, Nášlapné)</Czech>
             <Portuguese>IED Grande (Enterrado, Placa de pressão)</Portuguese>
             <Russian>Большое СВУ (закопанное, нажимного действия)</Russian>
+            <Japanese>大きな IED (埋め込み型、圧力感知)</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Module_IEDUrbanSmall_Range_DisplayName">
             <English>Small IED (Urban, Pressure Plate)</English>
@@ -724,6 +781,7 @@
             <Czech>IED, Malé (Městské, Nášlapné)</Czech>
             <Portuguese>IED Pequeno(Urbano, Placa de pressão)</Portuguese>
             <Russian>Малое СВУ (городское, нажимного действия)</Russian>
+            <Japanese>小さな IED (市街地用、圧力感知)</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_Module_IEDLandSmall_Range_DisplayName">
             <English>Small IED (Dug-in, Pressure Plate)</English>
@@ -742,6 +800,7 @@
             <Czech>IED, Malé (Zakopané, Nášlapné)</Czech>
             <Portuguese>IED Pequeno (Enterrado, Placa de pressão)</Portuguese>
             <Russian>Малое СВУ (закопанное, нажимного действия)</Russian>
+            <Japanese>小さな IED (埋め込み型、圧力感知)</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_connectInventoryExplosiveToDeadman">
             <English>Connect to %1</English>
@@ -754,16 +813,19 @@
             <Hungarian>Csatlakozás %1</Hungarian>
             <Italian>Collega a  %1</Italian>
             <Portuguese>Conectar à %1</Portuguese>
+            <Japanese>%1 へ接続</Japanese>
         </Key>
         <Key ID="STR_ACE_Explosives_TripFlare_Name">
             <English>Tripwire Flare</English>
             <Russian>Сигнальная растяжка</Russian>
+            <Japanese>仕掛け型照明地雷</Japanese>
             <Polish>Flara na linkę</Polish>
         </Key>
         <Key ID="STR_ACE_Explosives_TripFlare_Description">
             <English>Type: Tripwire flare - Ignites a non-lethal flare when triggered.&lt;br /&gt;Rounds: 1&lt;br /&gt;Used on: Ground</English>
             <Russian>Тип: Сигнальная растяжка - При срабатывании выпускает несмертельную сгнальную вспышку.&lt;br /&gt;Зарядов: 1&lt;br /&gt;Используется на: Земле</Russian>
+            <Japanese>種類: 仕掛け型照明地雷 - 発動したとき、非致死性の照明を発炎します。&lt;br /&gt;装填数: 1&lt;br /&gt;次で使用: 地表</Japanese>
             <Polish>Typ: Flara na linkę - Wystrzeliwuje nieszkodliwą flarę przy nadepnięciu linki.&lt;br/&gt;Pociski: 1&lt;br/&gt;Używane na: ziemia</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/fastroping/stringtable.xml

@@ -11,6 +11,7 @@
             <Czech>Vybavit FRIES</Czech>
             <Portuguese>Equipar FRIES</Portuguese>
             <Russian>Десантирование по канатам</Russian>
+            <Japanese>FRIES を装備</Japanese>
         </Key>
         <Key ID="STR_ACE_Fastroping_Module_FRIES_Description">
             <English>Equips compatible helicopters with a Fast Rope Insertion Extraction System.</English>
@@ -22,6 +23,7 @@
             <Czech>Vybavit kompatibilní vrtulníky systémem Fast Rope Insertion Extraction (FRIES).</Czech>
             <Portuguese>Equipa um helicóptero compatível com o Fast Rope Insertion Exctraction System.</Portuguese>
             <Russian>Снаряжает совместимые вертолеты оборудованием для спуска десанта по канатам.</Russian>
+            <Japanese>ヘリコプターで Fast Rope Insertion Extraction System を使えるようにします</Japanese>
         </Key>
         <Key ID="STR_ACE_Fastroping_Interaction_prepareFRIES">
             <English>Prepare fast roping system</English>
@@ -33,6 +35,7 @@
             <Czech>Připravit systém slaňování</Czech>
             <Portuguese>Prepara sistema de descida rápida</Portuguese>
             <Russian>Подготовить канаты</Russian>
+            <Japanese>ファスト ロープのシステムを準備</Japanese>
         </Key>
         <Key ID="STR_ACE_Fastroping_Interaction_deployRopes">
             <English>Deploy ropes</English>
@@ -44,6 +47,7 @@
             <Czech>Připravit lana</Czech>
             <Portuguese>Jogar cordas</Portuguese>
             <Russian>Зацепить канаты</Russian>
+            <Japanese>ロープを展開</Japanese>
         </Key>
         <Key ID="STR_ACE_Fastroping_Interaction_fastRope">
             <English>Fast rope</English>
@@ -55,6 +59,7 @@
             <Czech>SLANIT</Czech>
             <Portuguese>Descida rápida</Portuguese>
             <Russian>Спуститься по канату</Russian>
+            <Japanese>ファスト ロープをする</Japanese>
         </Key>
         <Key ID="STR_ACE_Fastroping_Interaction_cutRopes">
             <English>Cut ropes</English>
@@ -66,6 +71,7 @@
             <Czech>Odříznout lano</Czech>
             <Portuguese>Cortar cordas</Portuguese>
             <Russian>Обрезать канаты</Russian>
+            <Japanese>ロープを切断</Japanese>
         </Key>
         <Key ID="STR_ACE_Fastroping_Eden_equipFRIES">
             <English>Equip helicopter with FRIES</English>
@@ -77,6 +83,7 @@
             <Czech>Vybavit vrtulník pomocí FRIES</Czech>
             <Portuguese>Equipar helicóptero com FRIES</Portuguese>
             <Russian>Снарядить вертолет канатами для спуска</Russian>
+            <Japanese>ヘリコプターへ FRIES を装備</Japanese>
         </Key>
         <Key ID="STR_ACE_Fastroping_Eden_equipFRIES_Tooltip">
             <English>Equips the selected helicopter with a Fast Rope Insertion Extraction System</English>
@@ -88,6 +95,7 @@
             <Czech>Vybavit vybraný vrtulník systémem Fast Rope Insertion Extraction (FRIES)</Czech>
             <Portuguese>Equipa um helicóptero selecionado com um sistema de Fast Rope Insertion Extraction System</Portuguese>
             <Russian>Снаряжает выбранный вертолет оборудованием для спуска десанта по канатам</Russian>
+            <Japanese>選択されたヘリコプターで Fast Rope Insertion Extraction System を使えるようにします。</Japanese>
         </Key>
         <Key ID="STR_ACE_Fastroping_Waypoint_Fastrope">
             <English>LET UNITS FAST ROPE</English>
@@ -96,7 +104,8 @@
             <Portuguese>Equipa o helicóptero selecionado com o Fast Rope Insertion Extraction System</Portuguese>
             <French>LAISSER LES UNITES UTILISER LA CORDE </French>
             <Russian>ДЕСАНТИРОВАНИЕ ПО КАНАТУ</Russian>
+            <Japanese>ユニットへファスト ロープをさせる</Japanese>
             <Polish>ZJAZD NA LINACH</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/fcs/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Célpont lézerezése / Távolság Bemérése</Hungarian>
             <Italian>Misura la distanza</Italian>
             <Portuguese>Marcar com laser / Medir Distância</Portuguese>
+            <Japanese>レーザー ターゲット / 計測距離</Japanese>
         </Key>
         <Key ID="STR_ACE_FCS_ZeroedTo">
             <English>Zeroed To</English>
@@ -24,6 +25,7 @@
             <Hungarian>Nullázási táv</Hungarian>
             <Portuguese>Fixado em</Portuguese>
             <Italian>Azzeramento a</Italian>
+            <Japanese>次にゼロイン</Japanese>
         </Key>
         <Key ID="STR_ACE_FCS_AdjustRangeUp">
             <English>Adjust FCS Range (Up)</English>
@@ -36,6 +38,7 @@
             <Portuguese>Ajustar distância do FCS (Acima)</Portuguese>
             <Italian>Aumentare la distanza dell'FCS</Italian>
             <Russian>Диапазон СУО (Выше)</Russian>
+            <Japanese>FCS による距離を調節 (上げ)</Japanese>
         </Key>
         <Key ID="STR_ACE_FCS_AdjustRangeDown">
             <English>Adjust FCS Range (Down)</English>
@@ -48,6 +51,7 @@
             <Portuguese>Ajustar distância do FCS (Abaixo)</Portuguese>
             <Italian>Ridurre la distanza dell'FCS</Italian>
             <Russian>Диапазон СУО (Ниже)</Russian>
+            <Japanese>FCS による距離を調節 (下げ)</Japanese>
         </Key>
         <Key ID="STR_ACE_FCS_ResetFCS">
             <English>Reset FCS</English>
@@ -60,6 +64,7 @@
             <Portuguese>Reiniciar FCS</Portuguese>
             <Italian>Azzeramento dell'FCS</Italian>
             <Russian>Обнулить СУО</Russian>
+            <Japanese>FCS を初期化</Japanese>
         </Key>
         <Key ID="STR_ACE_FCS_HasBeenReset">
             <English>FCS has been reset.</English>
@@ -72,6 +77,7 @@
             <Portuguese>FCS reiniciado.</Portuguese>
             <Italian>L'FCS è stato azzerato</Italian>
             <Russian>СУО обнулен.</Russian>
+            <Japanese>FCS は初期化された</Japanese>
         </Key>
     </Package>
 </Project>

addons/finger/stringtable.xml

@@ -12,6 +12,7 @@
             <Spanish>Mostrar el indicador de señalado a uno mismo</Spanish>
             <Czech>Zobrazit ukázání směru pro sebe</Czech>
             <Italian>Mostra puntatore per te stesso</Italian>
+            <Japanese>自分にポインティング表記を表示する</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_indicatorForSelf_description">
             <English>Render the indicator for the pointing player. This option doesn't affect whether the other players would see the indicator</English>
@@ -24,6 +25,7 @@
             <Spanish>Muestra el indicador para el jugador que apunta. Esta opción no afecta si los otros jugadores verían el indicador</Spanish>
             <Czech>Zobrazit infikátor, když ukážete prstem. Tato volba nemá vliv, zda ostatní hráči uvidí indikátor nebo ne.</Czech>
             <Italian>Mostra puntatore per il giocatore indicato. Questa opzione non influisce la possibilità che gli altri giocatori vedano il puntatore</Italian>
+            <Japanese>プレイヤーへのポインティング表記を描画します。このオプションは他のプレイヤーの表記に影響しません。</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_indicatorColor_name">
             <English>Pointing indicator</English>
@@ -36,6 +38,7 @@
             <Spanish>Indicador de señalado</Spanish>
             <Czech>Ukazování směru</Czech>
             <Italian>Indicatore di puntamento</Italian>
+            <Japanese>ポインティング表記</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_indicatorColor_description">
             <English>Color of the pointing indicator circle</English>
@@ -48,6 +51,7 @@
             <Spanish>Color del círculo indicador que señala</Spanish>
             <Czech>Barva kruhu pro ukázání směru</Czech>
             <Italian>Colore del cerchio dell'indicatore di puntamento</Italian>
+            <Japanese>ポインティング表記の円の色</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_keyComb">
             <English>Action "point a finger at"</English>
@@ -60,6 +64,7 @@
             <Spanish>Acción "apuntar con el dedo a"</Spanish>
             <Czech>Akce "ukázat prstem na"</Czech>
             <Italian>Azione "punta il dito a"</Italian>
+            <Japanese>"point a finger at"キー</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_keyComb_description">
             <English>Points, and shows a virtual marker of where you are looking to nearby units. Can be held down.</English>
@@ -72,6 +77,7 @@
             <Spanish>Señala y muestra un marcador virtual donde ustás apuntando para las unidades cercanas. Puede ser mantenido.</Spanish>
             <Czech>Ukazuje virtuální značku kruhu ve směru, kterým se díváte pro všechny blízké jednotky.</Czech>
             <Italian>Punta e mostra un marker virtuale di dove stai guardando alle unità vicine. Può essere tenuto premuto.</Italian>
+            <Japanese>ポイント、そして架空のマーカー表記は自ユニットの近くにいると表記されます。これは押しっぱなしにできます。</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_moduleSettings_displayName">
             <English>Pointing Settings</English>
@@ -84,6 +90,7 @@
             <Spanish>Ajustes de señalado</Spanish>
             <Czech>Nastavení ukázování směru</Czech>
             <Italian>Impostazioni puntamento</Italian>
+            <Japanese>ポインティング設定</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_enabled_displayName">
             <English>Pointing Enabled</English>
@@ -96,6 +103,7 @@
             <Spanish>Señalado habilitado</Spanish>
             <Czech>Ukazování povoleno</Czech>
             <Italian>Puntamento abilitato</Italian>
+            <Japanese>ポインティングを有効</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_maxRange_displayName">
             <English>Pointing Max Range</English>
@@ -108,6 +116,7 @@
             <Spanish>Distancia máxima de señalado</Spanish>
             <Czech>Maximální dosah pro ukazování směru</Czech>
             <Italian>Raggio massimo puntamento</Italian>
+            <Japanese>ポインティングの最大範囲</Japanese>
         </Key>
         <Key ID="STR_ACE_finger_maxRange_description">
             <English>Max range between players to show the pointing indicator [default: 4 meters]</English>
@@ -120,6 +129,7 @@
             <Spanish>Distancia máxima entre los jugadores para mostrar el indicador que señala [por defecto: 4 metros]</Spanish>
             <Czech>Maximální vzdálenost mezi hráči pro ukázání směru [výchozí: 4 metry]</Czech>
             <Italian>Distanza massima tra giocatori per mostrare l'indicatore di puntamento [default: 4 metri]</Italian>
+            <Japanese>ポインティング表記が他のプレイヤーに表示される範囲を決定できます。（標準 4 メートル）</Japanese>
         </Key>
     </Package>
 </Project>

addons/flashlights/stringtable.xml

@@ -11,6 +11,7 @@
             <Spanish>Fulton MX-991</Spanish>
             <Italian>Fulton MX-991</Italian>
             <French>Fulton MX-991</French>
+            <Japanese>Fulton MX-991</Japanese>
         </Key>
         <Key ID="STR_ACE_Flashlights_MX991_Description">
             <English>Flashlight with red filter. For use on map.</English>
@@ -22,6 +23,7 @@
             <Spanish>Linterna con filtro rojo. Para su uso en el mapa.</Spanish>
             <Italian>Torcia con filtro rosso. Da usare in mappa.</Italian>
             <French>Lampe torche avec un filtre rouge. Pour utilisation sur carte.</French>
+            <Japanese>赤色フィルタ付きのフラッシュライト。地図上でつかいます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Flashlights_XL50_DisplayName">
             <English>Maglite XL50</English>
@@ -33,6 +35,7 @@
             <Spanish>Maglite XL50</Spanish>
             <Italian>Maglite XL50</Italian>
             <French>Maglite XL50</French>
+            <Japanese>Maglite XL50</Japanese>
         </Key>
         <Key ID="STR_ACE_Flashlights_XL50_Description">
             <English>White mini flashlight. For use on map.</English>
@@ -44,6 +47,7 @@
             <Spanish>Mini linterna blanca. Para su uso en el mapa.</Spanish>
             <Italian>Mini-torcia bianca. Da usare in mappa.</Italian>
             <French>Mini lampe torche blanche. Pour utilisation sur carte.</French>
+            <Japanese>白色光の小さなフラッシュライト。地図上でつかいます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Flashlights_KSF1_DisplayName">
             <English>KSF-1</English>
@@ -55,6 +59,7 @@
             <Spanish>KSF-1</Spanish>
             <Italian>KSF-1</Italian>
             <French>KSF-1</French>
+            <Japanese>KSF-1</Japanese>
         </Key>
         <Key ID="STR_ACE_Flashlights_KSF1_Description">
             <English>Flashlight with red filter. For use on map.</English>
@@ -66,6 +71,7 @@
             <Spanish>Linterna con filtro rojo. Para su uso en el mapa.</Spanish>
             <Italian>Torcia con filtro rosso. Da usare in mappa.</Italian>
             <French>Lampe torche avec un filtre rouge. Pour utilisation sur carte.</French>
+            <Japanese>赤色フィルタ付きのフラッシュライト。地図上でつかいます。</Japanese>
         </Key>
     </Package>
 </Project>

addons/flashsuppressors/CfgWeapons.hpp

@@ -9,6 +9,12 @@ class asdg_MuzzleSlot_762: asdg_MuzzleSlot { // for 7.62x51 universal mount supp
         ACE_muzzle_mzls_B = 1;
     };
 };
+class asdg_MuzzleSlot_65: asdg_MuzzleSlot_762 { // for 6.5 weapons, mostly to deal with BIS vanilla compatibility
+    class compatibleItems: compatibleItems {
+        ACE_muzzle_mzls_H = 1;
+        ACE_muzzle_mzls_B = 0;
+    };
+};
 class asdg_MuzzleSlot_93x64: asdg_MuzzleSlot { // for 9.3x64 universal mount suppressors
     class compatibleItems {
         ACE_muzzle_mzls_93mmg = 1;
@@ -19,6 +25,11 @@ class asdg_MuzzleSlot_9MM_SMG: asdg_MuzzleSlot { // for 9x19mm universal mount S
         ACE_muzzle_mzls_smg_02 = 1;
     };
 };
+class asdg_MuzzleSlot_9MM: asdg_MuzzleSlot { // for 9x19mm universal mount pistol suppressors
+    class compatibleItems {
+        ACE_muzzle_mzls_smg_02 = 1;
+    };
+};
 class asdg_MuzzleSlot_556: asdg_MuzzleSlot { // for 5.56x45 universal mount suppressors
     class compatibleItems {
         ACE_muzzle_mzls_L = 1;
@@ -29,12 +40,16 @@ class asdg_MuzzleSlot_45ACP_SMG: asdg_MuzzleSlot { // for .45ACP universal mount
         ACE_muzzle_mzls_smg_01 = 1;
     };
 };
+class asdg_MuzzleSlot_45ACP: asdg_MuzzleSlot { // for .45ACP universal mount pistol suppressors
+    class compatibleItems {
+        ACE_muzzle_mzls_smg_01 = 1;
+    };
+};
 class asdg_MuzzleSlot_762MG: asdg_MuzzleSlot { // for 7.62, 6.5 and 5.56 universal mount MG suppressors
     class compatibleItems {
         ACE_muzzle_mzls_B = 1;
     };
 };
-
 class MuzzleSlot;
 
 class CfgWeapons {
@@ -44,100 +59,6 @@ class CfgWeapons {
         class WeaponSlotsInfo;
     };
 
-    /* MX */
-   class arifle_MX_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class arifle_MXC_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_MX_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_MX_GL_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_MX_SW_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762MG {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_MXM_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-
-
-    /* Katiba */
-
-    class arifle_Katiba_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-    class arifle_Katiba_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_Katiba_C_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-    class arifle_Katiba_GL_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                class compatibleItems: compatibleItems {
-                    ACE_muzzle_mzls_H = 1;
-                    ACE_muzzle_mzls_B = 0;
-                };
-            };
-        };
-    };
-
-
     /* Other */
     class LMG_Mk200_F: Rifle_Long_Base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
@@ -150,56 +71,6 @@ class CfgWeapons {
         };
     };
 
-    /* Pistols */
-
-    class Pistol;
-    class Pistol_Base_F: Pistol {
-        class WeaponSlotsInfo;
-    };
-
-    class hgun_P07_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-
-    class hgun_Rook40_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_02"};
-            };
-        };
-    };
-
-    class hgun_ACPC2_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };
-
-    class hgun_Pistol_heavy_01_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: MuzzleSlot {
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };
-
-    /*class hgun_Pistol_heavy_02_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot {
-                linkProxy = "\A3\data_f\proxies\weapon_slots\MUZZLE";
-                compatibleItems[] += {"ACE_muzzle_mzls_smg_01"};
-            };
-        };
-    };*/
-
 
     /* Flashsuppressors */
 

addons/flashsuppressors/stringtable.xml

@@ -12,6 +12,7 @@
             <French>Cache-flamme (6,5 mm)</French>
             <Russian>Пламегаситель (6,5 мм)</Russian>
             <Spanish>Bocacha (6,5 mm)</Spanish>
+            <Japanese>消炎器 (6.5 mm)</Japanese>
         </Key>
         <Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_B">
             <English>Flash Suppressor (7.62 mm)</English>
@@ -24,6 +25,7 @@
             <French>Cache-flamme (7,62 mm)</French>
             <Russian>Пламегаситель (7,62 мм)</Russian>
             <Spanish>Bocacha (7,62 mm)</Spanish>
+            <Japanese>消炎器 (7.62 mm)</Japanese>
         </Key>
         <Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_L">
             <English>Flash Suppressor (5.56 mm)</English>
@@ -36,6 +38,7 @@
             <French>Cache-flamme (5,56 mm)</French>
             <Russian>Пламегаситель (5,56 мм)</Russian>
             <Spanish>Bocacha (5,56 mm)</Spanish>
+            <Japanese>消炎器 (5.56 mm)</Japanese>
         </Key>
         <Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_smg_01">
             <English>Flash Suppressor (.45 ACP)</English>
@@ -48,6 +51,7 @@
             <French>Cache-flamme (.45 ACP)</French>
             <Russian>Пламегаситель (.45 ACP)</Russian>
             <Spanish>Bocacha (.45 ACP)</Spanish>
+            <Japanese>消炎器 (.45 ACP)</Japanese>
         </Key>
         <Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_smg_02">
             <English>Flash Suppressor (9 mm)</English>
@@ -60,6 +64,7 @@
             <French>Cache-flamme (9 mm)</French>
             <Russian>Пламегаситель (9 мм)</Russian>
             <Spanish>Bocacha (9 mm)</Spanish>
+            <Japanese>消炎器 (9 mm)</Japanese>
         </Key>
         <Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_338">
             <English>Flash Suppressor (.338)</English>
@@ -72,6 +77,7 @@
             <French>Cache-flamme (.338)</French>
             <Russian>Пламегаситель (.338)</Russian>
             <Spanish>Bocacha (.338)</Spanish>
+            <Japanese>消炎器 (.338)</Japanese>
         </Key>
         <Key ID="STR_ACE_FlashSuppressors_muzzle_mzls_93mmg">
             <English>Flash Suppressor (9.3 mm)</English>
@@ -84,6 +90,7 @@
             <French>Cache-flamme (9,3 mm)</French>
             <Russian>Пламегаситель (9,3 мм)</Russian>
             <Spanish>Bocacha (9,3 mm)</Spanish>
+            <Japanese>消炎器 (9.3 mm)</Japanese>
         </Key>
     </Package>
 </Project>

addons/frag/functions/fnc_findReflections.sqf

@@ -42,7 +42,7 @@ if(_zIndex < 5) then {
             _lastPos = _testPos;
         };
     };
-    _params set[4, _zIndex+1];
+    _args set[4, _zIndex+1];
 } else {
     _depth = _depth + 1;
     _buckets = [];

addons/frag/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Repesz-szimuláció</Hungarian>
             <Russian>Симуляция осколков</Russian>
             <Italian>Simulazione Frammentazione</Italian>
+            <Japanese>破片シミュレーション</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_EnableFrag">
             <English>Fragmentation Simulation</English>
@@ -24,6 +25,7 @@
             <Hungarian>Repesz-szimuláció</Hungarian>
             <Russian>Симуляция осколков</Russian>
             <Italian>Simulazione Frammentazione</Italian>
+            <Japanese>破片シミュレーション</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_EnableFrag_Desc">
             <English>Enable the ACE Fragmentation Simulation</English>
@@ -36,6 +38,7 @@
             <Hungarian>Az ACE repesz-szimuláció engedélyezése</Hungarian>
             <Russian>Включить симуляцию осколков ACE</Russian>
             <Italian>Abilita la Simulazione Frammentazione di ACE</Italian>
+            <Japanese>ACE 破片シミュレーションを有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_EnableSpall">
             <English>Spalling Simulation</English>
@@ -48,6 +51,7 @@
             <Hungarian>Pattogzás-szimuláció</Hungarian>
             <Russian>Симуляция обломков</Russian>
             <Italian>Simulazione Spalling</Italian>
+            <Japanese>剥離シミュレーション</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_EnableSpall_Desc">
             <English>Enable the ACE Spalling Simulation</English>
@@ -60,6 +64,7 @@
             <Hungarian>Az ACE pattogzás-szimuláció engedélyezése</Hungarian>
             <Russian>Включить симуляцию обломков ACE</Russian>
             <Italian>Abilita la Simulazione Spalling di ACE</Italian>
+            <Japanese>ACE 剥離シミュレーションを有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_EnableReflections">
             <English>Explosion Reflections Simulation</English>
@@ -70,6 +75,7 @@
             <French>Simulation de la réflection des explosions.</French>
             <Portuguese>Simulação de reflexo de explosão</Portuguese>
             <Russian>Cимуляция отражения взрывов ACE</Russian>
+            <Japanese>爆発による飛翔シミュレーション</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_EnableReflections_Desc">
             <English>Enable the ACE Explosion Reflection Simulation</English>
@@ -80,6 +86,7 @@
             <French>Activer la simulation de la réfléction des explosions ACE.</French>
             <Portuguese>Ativa a simulação de reflexo de explosão do ACE</Portuguese>
             <Russian>Включить симуляцию отражения взрывов ACE</Russian>
+            <Japanese>爆発による飛翔シミュレーションを有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_MaxTrack">
             <English>Maximum Projectiles Tracked</English>
@@ -92,6 +99,7 @@
             <Hungarian>Maximum követett repeszek</Hungarian>
             <Russian>Макс. количество отслеживаемых снарядов</Russian>
             <Italian>Numero massimo di Proiettili Tracciati</Italian>
+            <Japanese>最大弾頭追跡数</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_MaxTrack_Desc">
             <English>This setting controls the maximum amount of projectiles the fragmentation and spalling system will track at any given time. If more projectiles are fired, they will not be tracked. Lower this setting if you do not want FPS drops at high-count projectile scenarios ( &gt;200 rounds in the air at once)</English>
@@ -104,6 +112,7 @@
             <Hungarian>Ez a beállítás szabályozza a repeszeződés és pattogzás által kilőtt objektumok követett számát. Ha több ez a szám, ezek az objektumok nem lesznek követve. Csökkentsd ezt a beállítást, ha nem akarsz lassulásokat magas-törmelékmennyiségű helyzetekben (200+ repesz a levegőben egyszerre)</Hungarian>
             <Russian>Эта настройка контролирует максимальное количество снарядов, которок отслеживает система осколков и обломков в каждый момент времени. Снаряды, выстреленные сверх этого числа, отслеживаться не будут. Уменьшите это значение, если вы не хотите падения FPS при большом количестве снарядов в одной перестрелке (&gt; 200 одновременно летящих снарядов)</Russian>
             <Italian>Questo parametro controlla il numero massimo di proiettili che la frammentazione e il sistema di spalling tracciano in ogni momento. Se più proiettili sono sparati, non verranno tracciati. Abbassa questo parametro se non vuoi cali di FPS in scenari con molti proiettili (&gt;200 proiettili in aria contemporaneamente)</Italian>
+            <Japanese>時間が許すかぎり、破片と剥離システムの最大数を設定できます。設定数以上の弾丸が発射された場合、それは対象になりません。もし多い弾数による FPS の低下を望まない場合は、低い数へ設定にします。( &amp;gt;一度に空中内で200発)</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_MaxTrackPerFrame">
             <English>Maximum Projectiles Per Frame</English>
@@ -116,6 +125,7 @@
             <Hungarian>Maximum repesz/képkocka</Hungarian>
             <Russian>Макс. количество снарядов за кадр</Russian>
             <Italian>Numero massimo di proiettili per Frame</Italian>
+            <Japanese>フレームごとの最大弾頭数</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_MaxTrackPerFrame_Desc">
             <English>The number of spall track calculations to perform in any given frame. This helps spread the FPS impact of tracking spall rounds across multiple frames, limiting its impact even further.</English>
@@ -128,6 +138,7 @@
             <Hungarian>A lepattogzási útvonalak számításának darabjai képkockánként. Ez eloszlatja az FPS-megszakadást több képkockára, ezzel csökkentve a súlyosságát.</Hungarian>
             <Russian>Число обрабатываемых осколков за кадр. Это позволяет распределить нагрузку по отслеживанию осколков между несколькими кадрами, чтобы предотвратить падение FPS.</Russian>
             <Italian>Il numero di calcoli per tracciamento di spalling ad ogni frame. Questo aiuta a distribuire l'impatto del tracciamento dello spalling su più frame, limitando ancora di più l'impatto.</Italian>
+            <Japanese>与えられたフレームごとに追跡する剥離の数を決定します。FPS に影響をあたえないよう、剥離を複数のフレームで追跡し、分散させています。</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_EnableDebugTrace">
             <English>(SP Only) Frag/Spall Debug Tracing</English>
@@ -140,6 +151,7 @@
             <Hungarian>(Csak SP) Repesz/Pattogzás debug követés</Hungarian>
             <Russian>(Только для одиночной игры) Отслеживаение/отладка осколков</Russian>
             <Italian>(Solo SP) Debug Tracciamento Frag/Spall</Italian>
+            <Japanese>(SP のみ) 破片/剥離のデバッグ用表示</Japanese>
         </Key>
         <Key ID="STR_ACE_Frag_EnableDebugTrace_Desc">
             <English>(SP Only) Requires a mission/editor restart. Enables visual tracing of fragmentation and spalling rounds in SP game mode only.</English>
@@ -152,6 +164,7 @@
             <Hungarian>(Csak SP) Küldetés/Editor újraindítás szükséges. Engedélyezi a repeszek és pattogzó lövedékek vizuális nyomkövetését, csak egyjátékos módok alatt.</Hungarian>
             <Russian>(Только для одиночной игры) Требует перезапуска миссии/редактора. Включает визуальные следы от осколков и обломков в режиме одиночной игры.</Russian>
             <Italian>(Solo SP) Richiede un restart editor/missione. Abilita il tracciamento visivo di schegge da frammentazione/spalling in modalità Giocatore Singolo.</Italian>
+            <Japanese>(SP のみ) ミッションとエディタの再起動が必要です。有効化すると、シングルプレイでのみ破片と剥離の弾頭が見えるようになります。</Japanese>
         </Key>
     </Package>
 </Project>

addons/gestures/stringtable.xml

@@ -12,6 +12,7 @@
             <Portuguese>ACE Gestos</Portuguese>
             <Russian>ACE Жесты</Russian>
             <Spanish>ACE Gestos</Spanish>
+            <Japanese>ACE ジェスチャー</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Gestures">
             <English>Gestures</English>
@@ -24,6 +25,7 @@
             <Hungarian>Kézjelek</Hungarian>
             <Portuguese>Gestos</Portuguese>
             <Italian>Gesti</Italian>
+            <Japanese>ジェスチャー</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Advance">
             <English>Advance</English>
@@ -36,6 +38,7 @@
             <Hungarian>Előre</Hungarian>
             <Portuguese>Avançar</Portuguese>
             <Italian>Avanzare</Italian>
+            <Japanese>警戒</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Go">
             <English>Go</English>
@@ -48,6 +51,7 @@
             <Hungarian>Mozgás</Hungarian>
             <Portuguese>Mover-se</Portuguese>
             <Italian>Muoversi</Italian>
+            <Japanese>進め</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Follow">
             <English>Follow</English>
@@ -60,6 +64,7 @@
             <Hungarian>Utánam</Hungarian>
             <Portuguese>Seguir</Portuguese>
             <Italian>Seguire</Italian>
+            <Japanese>ついて来い</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Up">
             <English>Up</English>
@@ -72,6 +77,7 @@
             <Hungarian>Fel</Hungarian>
             <Portuguese>Acima</Portuguese>
             <Italian>Alzarsi</Italian>
+            <Japanese>立ち上がれ</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_CeaseFire">
             <English>Cease Fire</English>
@@ -84,6 +90,7 @@
             <Hungarian>Tüzet szüntess</Hungarian>
             <Portuguese>Cessar Fogo</Portuguese>
             <Italian>Cessare il Fuoco</Italian>
+            <Japanese>撃つな</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Stop">
             <English>Stop</English>
@@ -95,6 +102,7 @@
             <Czech>Stop</Czech>
             <Italian>Stop</Italian>
             <Spanish>Detenerse</Spanish>
+            <Japanese>止まれ</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Freeze">
             <English>Freeze</English>
@@ -107,6 +115,7 @@
             <Hungarian>Állj</Hungarian>
             <Portuguese>Alto</Portuguese>
             <Italian>Fermi</Italian>
+            <Japanese>動くな</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Cover">
             <English>Cover</English>
@@ -119,6 +128,7 @@
             <Hungarian>Fedezékbe</Hungarian>
             <Portuguese>Proteger-se</Portuguese>
             <Italian>Copertura</Italian>
+            <Japanese>隠れろ</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Regroup">
             <English>Rally up</English>
@@ -130,6 +140,7 @@
             <Czech>Přeskupit</Czech>
             <Italian>Raggruppare</Italian>
             <Spanish>Reunirse</Spanish>
+            <Japanese>集合</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Forward">
             <English>Move forward</English>
@@ -141,6 +152,7 @@
             <Czech>Kupředu</Czech>
             <Italian>Muovere avanti</Italian>
             <Spanish>Avanzar</Spanish>
+            <Japanese>前に進め</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Engage">
             <English>Engage</English>
@@ -152,6 +164,7 @@
             <Czech>Útok</Czech>
             <Italian>Ingaggiare</Italian>
             <Spanish>Atacar</Spanish>
+            <Japanese>交戦しろ</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Point">
             <English>Point</English>
@@ -163,6 +176,7 @@
             <Czech>Ukázat</Czech>
             <Italian>Puntare</Italian>
             <Spanish>Señalar</Spanish>
+            <Japanese>指示</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Hold">
             <English>Hold</English>
@@ -174,6 +188,7 @@
             <Czech>Čekej</Czech>
             <Italian>Mantenere</Italian>
             <Spanish>Esperar</Spanish>
+            <Japanese>そこにいろ</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_Warning">
             <English>Warning</English>
@@ -185,6 +200,7 @@
             <Czech>Pozor</Czech>
             <Italian>Attenzione</Italian>
             <Spanish>Atención</Spanish>
+            <Japanese>注意</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_ShowOnInteractionMenu_displayName">
             <English>Show Gestures On Interaction Menu</English>
@@ -196,6 +212,7 @@
             <French>Afficher les gestes dans le menu d'interaction.</French>
             <Portuguese>Mostrar gestos no menu de interação</Portuguese>
             <Russian>Показать жесты в меню взаимодействия</Russian>
+            <Japanese>インタラクション メニュー上でジェスチャーを表示する</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_ShowOnInteractionMenu_description">
             <English>Show gestures on the self interaction menu, or just use keybinds, or disable completely</English>
@@ -207,6 +224,7 @@
             <French>Afficher les gestes dans le menu d'interaction personnel, ou seulement utiliser les touches, ou desactiver complètement.</French>
             <Portuguese>Mostra gestos no menu de interação, ou utilize um dos atalhos de teclado ou desative completamente</Portuguese>
             <Russian>Показать жесты в меню взамиодейтсвия с собой или только использовать горячие клавиши, или полностью отключить</Russian>
+            <Japanese>キー操作や同時使用を無効化している場合はセルフ インタラクション メニュ上でジェスチャーを表示します</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_JustKeybinds">
             <English>Just Keybinds</English>
@@ -218,6 +236,7 @@
             <French>Seulement les touches</French>
             <Portuguese>Somente atalhos de teclado</Portuguese>
             <Russian>Только горячие клавиши</Russian>
+            <Japanese>キー操作のみ</Japanese>
         </Key>
         <Key ID="STR_ACE_Gestures_KeysAndInteractionMenu">
             <English>Keybinds + Interaction Menu</English>
@@ -229,6 +248,7 @@
             <French>Touches + menu d'interaction</French>
             <Portuguese>Atalhos + Menu de Interação</Portuguese>
             <Russian>Клавиши + Меню взаимодействия</Russian>
+            <Japanese>キー操作とインタラクション メニュ</Japanese>
         </Key>
     </Package>
 </Project>

addons/gforces/stringtable.xml

@@ -9,6 +9,7 @@
             <Portuguese>Efeitos de ForçaG</Portuguese>
             <French>Effets de force gravitationnelle</French>
             <Russian>Эффекты перегрузок</Russian>
+            <Japanese>G による効果</Japanese>
             <Polish>Efekty przeciążeń</Polish>
         </Key>
         <Key ID="STR_ACE_gforces_enabledFor_onlyAircraft">
@@ -19,7 +20,8 @@
             <Portuguese>Somente Aeronave</Portuguese>
             <French>Avions seulement</French>
             <Russian>Только для летательных аппаратов</Russian>
+            <Japanese>航空機のみ</Japanese>
             <Polish>Tylko samoloty</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/goggles/config.cpp

@@ -270,8 +270,3 @@ class CfgCloudlets {
         destroyOnWaterSurface = 1;
     };
 };
-
-class ACE_newEvents {
-    GlassesChanged = "ace_glassesChanged";
-    GlassesCracked = "ace_glassesCracked";
-};

addons/goggles/stringtable.xml

@@ -12,6 +12,7 @@
             <Polish>Włącz efekty gogli w trzeciej osobie</Polish>
             <Portuguese>Mostrar efeitos de óculos em Terceira Pessoa</Portuguese>
             <Italian>Attiva l'effetto degli occhiali in terza persona</Italian>
+            <Japanese>三人称視点でもゴーグルによる効果を出す</Japanese>
         </Key>
         <Key ID="STR_ACE_Goggles_WipeGlasses">
             <English>Wipe Goggles</English>
@@ -24,21 +25,25 @@
             <Polish>Wytrzyj gogle</Polish>
             <Portuguese>Limpar Óculos</Portuguese>
             <Italian>Pulisci gli occhiali</Italian>
+            <Japanese>ゴーグルを拭く</Japanese>
         </Key>
         <Key ID="STR_ACE_Goggles_effects_displayName">
             <English>Goggle Effects</English>
             <Russian>Эффект очков</Russian>
+            <Japanese>ゴーグルによる効果</Japanese>
             <Polish>Efekty gogli</Polish>
         </Key>
         <Key ID="STR_ACE_Goggles_effects_tintOnly">
             <English>Tint</English>
             <Russian>Тонировка</Russian>
+            <Japanese>色彩のみ</Japanese>
             <Polish>Winieta</Polish>
         </Key>
         <Key ID="STR_ACE_Goggles_enabled_tintAndEffects">
             <English>Tint + Effects</English>
             <Russian>Тонировка + эффекты</Russian>
+            <Japanese>色彩 + 効果</Japanese>
             <Polish>Winieta + Efekty</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/grenades/config.cpp

@@ -28,7 +28,3 @@ class CfgPatches {
 #include "CfgVehicles.hpp"
 
 #include "Effects.hpp"
-
-class ACE_newEvents {
-    flashbangExplosion = "ace_flashbangExploded";
-};

addons/grenades/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Gránátkezelési mód váltása</Hungarian>
             <Italian>Cambia tipo di granata</Italian>
             <Portuguese>Alternar Modo de Granada</Portuguese>
+            <Japanese>グレネード モードを切り替え</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_NormalThrow">
             <English>Normal Throw</English>
@@ -24,6 +25,7 @@
             <Hungarian>Normál dobás</Hungarian>
             <Italian>Lancio normale</Italian>
             <Portuguese>Arremesso Normal</Portuguese>
+            <Japanese>通常で投げる</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_HighThrow">
             <English>High Throw</English>
@@ -36,6 +38,7 @@
             <Hungarian>Magas dobás</Hungarian>
             <Italian>Lancio verso l'alto</Italian>
             <Portuguese>Arremesso Alto</Portuguese>
+            <Japanese>高く投げる</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_PreciseThrow">
             <English>Precise Throw</English>
@@ -48,6 +51,7 @@
             <Hungarian>Pontos dobás</Hungarian>
             <Italian>Lancio preciso</Italian>
             <Portuguese>Arremesso Preciso</Portuguese>
+            <Japanese>低く投げる</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_RollGrenade">
             <English>Roll Grenade</English>
@@ -60,6 +64,7 @@
             <Hungarian>Gránát gurítása</Hungarian>
             <Italian>Fai rotolare la granata</Italian>
             <Portuguese>Rolar Granada</Portuguese>
+            <Japanese>転がす</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_DropGrenade">
             <English>Drop Grenade</English>
@@ -72,6 +77,7 @@
             <Hungarian>Gránát ejtése</Hungarian>
             <Italian>Lascia la granata</Italian>
             <Portuguese>Largar Granada</Portuguese>
+            <Japanese>落とす</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M84_Name">
             <English>M84 Stun Grenade</English>
@@ -84,6 +90,7 @@
             <Hungarian>M84 Kábítógránát</Hungarian>
             <Italian>Granata Stordente M84</Italian>
             <Portuguese>M84 granada de atordoamento</Portuguese>
+            <Japanese>M84 閃光手榴弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M84_NameShort">
             <English>M84</English>
@@ -96,6 +103,7 @@
             <Hungarian>M84</Hungarian>
             <Italian>M84</Italian>
             <Portuguese>M84</Portuguese>
+            <Japanese>M84</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M84_Description">
             <English>Also known as flashbang. Causes immediate flash blindness, deafness, tinnitus, and inner ear disturbance.</English>
@@ -108,6 +116,7 @@
             <Hungarian>Villanógránát néven is ismert. Azonnali villanási vakságot, süketséget, fülzúgást, és belső füli zavart okoz.</Hungarian>
             <Italian>Anche conosciuta come flashbang. Causa accecamento immediato, sensazioni di sposatezza, mancanza d'equilibrio e disturbi al timpano.</Italian>
             <Portuguese>Também conhecida como flashbang. Causa uma clarão imediato, cegueira, surdez, zumbido e distúrbio no tímpano.</Portuguese>
+            <Japanese>フラッシュバンとも知られています。即時に失明と難聴、耳鳴り、内耳障害を引き起こします。</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_White_Name">
             <English>M127A1 Hand Held Signal (White)</English>
@@ -120,6 +129,7 @@
             <Russian>M127A1 Фальшфейер (Белый)</Russian>
             <Spanish>Bengala M127A1 (Blanca)</Spanish>
             <French>M127A1 Feux à main (Blanc)</French>
+            <Japanese>M127A1 信号弾 (白)</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Red_Name">
             <English>M127A1 Hand Held Signal (Red)</English>
@@ -132,6 +142,7 @@
             <Russian>M127A1 Фальшфейер (Красный)</Russian>
             <Spanish>Bengala M127A1 (Roja)</Spanish>
             <French>M127A1 Feux à main (Rouge)</French>
+            <Japanese>M127A1 信号弾 (赤)</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Green_Name">
             <English>M127A1 Hand Held Signal (Green)</English>
@@ -144,6 +155,7 @@
             <Russian>M127A1 Фальшфейер (Зелёный)</Russian>
             <Spanish>Bengala M127A1 (Verde)</Spanish>
             <French>M127A1 Feux à main (Vert)</French>
+            <Japanese>M127A1 信号弾 (緑)</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Yellow_Name">
             <English>M127A1 Hand Held Signal (Yellow)</English>
@@ -156,6 +168,7 @@
             <Russian>M127A1 Фальшфейер (Жёлтые)</Russian>
             <Spanish>Bengala M127A1 (Amarilla)</Spanish>
             <French>M127A1 Feux à main (Jaune)</French>
+            <Japanese>M127A1 信号弾 (黄)</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_White_Description">
             <English>White Hand Flare</English>
@@ -168,6 +181,7 @@
             <Russian>Фальшфейер (Белый)</Russian>
             <Spanish>Bengala (Blanca)</Spanish>
             <French>Feux à main (Blanc)</French>
+            <Japanese>白の発炎筒</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Red_Description">
             <English>Red Hand Flare</English>
@@ -180,6 +194,7 @@
             <Russian>Фальшфейер (Красный)</Russian>
             <Spanish>Bengala (Roja)</Spanish>
             <French>Feux à main (Rouge)</French>
+            <Japanese>赤の発炎筒</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Green_Description">
             <English>Green Hand Flare</English>
@@ -192,6 +207,7 @@
             <Russian>Фальшфейер (Зелёный)</Russian>
             <Spanish>Bengala (Verde)</Spanish>
             <French>Feux à main (Vert)</French>
+            <Japanese>緑の発炎筒</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Yellow_Description">
             <English>Yellow Hand Flare</English>
@@ -204,6 +220,7 @@
             <Russian>Фальшфейер (Жёлтые)</Russian>
             <Spanish>Bengala (Amarilla)</Spanish>
             <French>Feux à main (Jaune)</French>
+            <Japanese>黄の発炎筒</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_White_NameShort">
             <English>M127A1 (White)</English>
@@ -216,6 +233,7 @@
             <Portuguese>M127A1 (Branco)</Portuguese>
             <Russian>M127A1 (Белый)</Russian>
             <Spanish>M127A1 (Blanca)</Spanish>
+            <Japanese>M127A1 (白)</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Red_NameShort">
             <English>M127A1 (Red)</English>
@@ -228,6 +246,7 @@
             <Portuguese>M127A1 (Vermelho)</Portuguese>
             <Russian>M127A1 (Красный)</Russian>
             <Spanish>M127A1 (Roja)</Spanish>
+            <Japanese>M127A1 (赤)</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Green_NameShort">
             <English>M127A1 (Green)</English>
@@ -240,6 +259,7 @@
             <Portuguese>M127A1 (Verde)</Portuguese>
             <Russian>M127A1 (Зелёный)</Russian>
             <Spanish>M127A1 (Verde)</Spanish>
+            <Japanese>M127A1 (緑)</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_M127A1_Yellow_NameShort">
             <English>M127A1 (Yellow)</English>
@@ -252,24 +272,28 @@
             <Portuguese>M127A1 (Amarelo)</Portuguese>
             <Russian>M127A1 (Жёлтые)</Russian>
             <Spanish>M127A1 (Amarilla)</Spanish>
+            <Japanese>M127A1 (黄)</Japanese>
         </Key>
         <Key ID="STR_ACE_Grenades_Incendiary_Name">
             <English>AN-M14 Incendiary Grenade</English>
             <German>AN-M14 Brandsatz</German>
             <Russian>AN-M14 Зажигательная граната</Russian>
+            <Japanese>AN-M14 焼夷手榴弾</Japanese>
             <Polish>Granat zapalający AN-M14</Polish>
         </Key>
         <Key ID="STR_ACE_Grenades_Incendiary_NameShort">
             <English>AN-M14</English>
             <German>AN-M14</German>
             <Russian>AN-M14</Russian>
+            <Japanese>AN-M14</Japanese>
             <Polish>AN-M14</Polish>
         </Key>
         <Key ID="STR_ACE_Grenades_Incendiary_Description">
             <English>Incendiary grenade used to destroy weapons, ammunition and other equipment.</English>
             <German>Brandsatzgranate. Verwendet um Waffen, Munition und andere Ausrüstung zu zerstören.</German>
             <Russian>Зажигательная граната используется для уничтожения оружия, боеприпасов и прочего оборудования.</Russian>
+            <Japanese>焼夷手榴弾は武器や弾薬箱などの装備を破壊するために使われます。</Japanese>
             <Polish>Granat zapalający, używany do niszczenia broni, amunicji i innego sprzętu.</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/gunbag/stringtable.xml

@@ -7,6 +7,7 @@
             <French>Housse d'arme</French>
             <Russian>Чехол</Russian>
             <Czech>Pouzdro na zbraň</Czech>
+            <Japanese>ガンバッグ</Japanese>
             <Polish>Torba na broń</Polish>
         </Key>
         <Key ID="STR_ACE_Gunbag_DisplayName_Tan">
@@ -15,6 +16,7 @@
             <French>Housse d'arme (marron clair)</French>
             <Russian>Чехол (желтовато-коричневый)</Russian>
             <Czech>Pouzdro na zbraň (Žlutohnědá)</Czech>
+            <Japanese>ガンバッグ (タン)</Japanese>
             <Polish>Torba na broń (jasnobrązowa)</Polish>
         </Key>
         <Key ID="STR_ACE_Gunbag_ToGunbag">
@@ -23,6 +25,7 @@
             <French>Placer l'arme dans la housse d'arme</French>
             <Russian>Зачехлить оружие</Russian>
             <Czech>Vložit zbraň do pouzdra</Czech>
+            <Japanese>ガンバッグへ武器を入れる</Japanese>
             <Polish>Włóż broń do torby</Polish>
         </Key>
         <Key ID="STR_ACE_Gunbag_OffGunbag">
@@ -31,6 +34,7 @@
             <French>Sortir l'arme hors de la housse</French>
             <Russian>Расчехлить оружие</Russian>
             <Czech>Vytáhnout zbraň z pouzdra</Czech>
+            <Japanese>ガンバッグから武器を出す</Japanese>
             <Polish>Wyciągnij broń z torby</Polish>
         </Key>
         <Key ID="STR_ACE_Gunbag_Status">
@@ -39,6 +43,7 @@
             <French>Status</French>
             <Russian>Статус</Russian>
             <Czech>Status</Czech>
+            <Japanese>中身</Japanese>
             <Polish>Status</Polish>
         </Key>
         <Key ID="STR_ACE_Gunbag_Empty">
@@ -47,7 +52,8 @@
             <French>Housse d'arme vide</French>
             <Russian>Чехол пуст</Russian>
             <Czech>Prázdné pouzdro na zbraň</Czech>
+            <Japanese>ガンバッグは空</Japanese>
             <Polish>Torba jest pusta</Polish>
         </Key>
     </Package>
-</Project>
+</Project>

addons/hearing/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Füldugó</Hungarian>
             <Portuguese>Protetor auricular</Portuguese>
             <Italian>Tappi auricolari</Italian>
+            <Japanese>耳栓</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_EarPlugs_Description">
             <English>Protective Earplugs allow the wearer to be near loud weaponry without damage to his hearing.</English>
@@ -24,6 +25,7 @@
             <Hungarian>Erősebb hanghatásoktól védő füldugó, megakadályozza a nagy hanggal járó fegyverzettől való halláskárosodást.</Hungarian>
             <Portuguese>Protetor para ouvidos permitem que o usuário esteja próximo a ruídos sem danificar sua audição.</Portuguese>
             <Italian>Proteggono l'apparato uditivo, permettendo a chi li indossa di resistere ai suoni particolarmente forti senza alcun danno.</Italian>
+            <Japanese>着けることにより、近くの大きな銃声から聴覚を保護します。</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_EarPlugs_On">
             <English>Earplugs in</English>
@@ -36,6 +38,7 @@
             <Hungarian>Füldugó berakva</Hungarian>
             <Portuguese>Protetores colocados</Portuguese>
             <Italian>Indossa i tappi auricolari</Italian>
+            <Japanese>耳栓を着ける</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_EarPlugs_Off">
             <English>Earplugs out</English>
@@ -48,6 +51,7 @@
             <Hungarian>Füldugó kivéve</Hungarian>
             <Portuguese>Protetores retirados</Portuguese>
             <Italian>Levati i tappi auricolari</Italian>
+            <Japanese>耳栓を外す</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_EarPlugs_Are_On">
             <English>Earplugs in</English>
@@ -60,6 +64,7 @@
             <Hungarian>Füldugó berakva</Hungarian>
             <Portuguese>Protetores colocados</Portuguese>
             <Italian>Indossa i tappi auricolari</Italian>
+            <Japanese>耳栓を着けた</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_EarPlugs_Are_Off">
             <English>Earplugs out</English>
@@ -72,6 +77,7 @@
             <Hungarian>Füldugó kivéve</Hungarian>
             <Portuguese>Protetores retirados</Portuguese>
             <Italian>Levati i tappi auricolari</Italian>
+            <Japanese>耳栓を外した</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_NoPlugs">
             <English>You have no earplugs</English>
@@ -84,6 +90,7 @@
             <Hungarian>Nincsen füldugód</Hungarian>
             <Portuguese>Você não possui protetores auriculares</Portuguese>
             <Italian>Non hai i tappi auricolari</Italian>
+            <Japanese>耳栓を持っていません</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_Inventory_Full">
             <English>No inventory space</English>
@@ -96,6 +103,7 @@
             <Portuguese>Não há espaço no inventário</Portuguese>
             <Hungarian>Nincs több hely</Hungarian>
             <Russian>Нет места в инвентаре</Russian>
+            <Japanese>インベントリに空きがありません。</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_DisableEarRinging_DisplayName">
             <English>Disable ear ringing</English>
@@ -108,6 +116,7 @@
             <Hungarian>Fülcsengés letiltása</Hungarian>
             <Italian>Disabilita i fischi nelle orecchie</Italian>
             <Portuguese>Desabilitar zumbido de ouvidos</Portuguese>
+            <Japanese>耳鳴りを無効化する</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_DisableEarRinging_Description">
             <English>Remove tinnitus effect when the player takes hearing damage</English>
@@ -118,6 +127,7 @@
             <Italian>Quando il giocatore riceve danni all'udito, non fa sentire i fischi nelle orecchie</Italian>
             <Portuguese>Remove o efeito de zunido quando o jogador recebe dano na audição</Portuguese>
             <Russian>Убирает эффект звона в ушах, когда игрок получает повреждение слуха</Russian>
+            <Japanese>プレイヤーの聴覚が損傷をしたら耳鳴りの効果を削除します</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_Module_DisplayName">
             <English>Hearing</English>
@@ -130,6 +140,7 @@
             <Hungarian>Hallás</Hungarian>
             <Russian>Слух</Russian>
             <Italian>Udito</Italian>
+            <Japanese>聴覚</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_EnableCombatDeafness_DisplayName">
             <English>Enable Combat Deafness</English>
@@ -142,6 +153,7 @@
             <Hungarian>Harci süketség engedélyezése?</Hungarian>
             <Russian>Оглушение</Russian>
             <Italian>Sordità da combattimento</Italian>
+            <Japanese>戦闘による難聴を有効化</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_EnableCombatDeafness_Description">
             <English>Reduces the hearing ability as the player takes hearing damage</English>
@@ -153,6 +165,7 @@
             <Russian>Уменьшает возможность игрока слышать звуки при повреждении органов слуха</Russian>
             <Italian>Riduci l'abilità uditiva quando il giocatore riceve danno uditivo</Italian>
             <French>Réduire l'audition lorsque le joueur prend des dommages auditifs.</French>
+            <Japanese>音による損傷をうけ、聴覚が減る可能性があります</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_Module_Description">
             <English>Controls combat deafness and ear ringing. When activated, players can be deafened when a gun is fired in their vicinity or an explosion takes place without hearing protection</English>
@@ -165,6 +178,7 @@
             <French>Ce module active / désactivé la surdité au combat. Si active, des joueurs peuvent devenir sourds sans protection d'oreille, si une arme est utilisée ou une explosion a lieu à proximité</French>
             <Spanish>Controles de sordera de combate y zumbido en los oídos. Al activarlo, los jugadores pueden ser ensordecidos cuando un arma se dispara cerca o una explosión tiene lugar sin protección auditiva</Spanish>
             <Italian>Controlla la sordità da combattimento e fischio alle orecchie. Quando attivato, i giocatori possono essere assordati quando un'arma spara vicino o avviene un'esplosione senza protezione uditiva</Italian>
+            <Japanese>戦闘による難聴や、耳鳴りを設定します。有効になった場合、聴覚を保護していないと近傍の銃声や爆発音により、難聴になります。</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_enabledForZeusUnits_DisplayName">
             <English>Effect Zeus RC</English>
@@ -176,6 +190,7 @@
             <Czech>Vliv na Zeus RC</Czech>
             <Italian>Effetto Zeus RC</Italian>
             <French>Effet sur le CàD du Zeus</French>
+            <Japanese>Zeus RC への効果</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_enabledForZeusUnits_Description">
             <English>Allow zeus remote controlled units to be able to take hearing damage.</English>
@@ -187,6 +202,7 @@
             <Czech>Aktivovat efekt ztráty sluchu pro vzdáleně ovládané jednotky.</Czech>
             <Italian>Consenti alle unità controllate in remoto da Zeus di ricevere danni all'udito.</Italian>
             <French>Permet aux unités controlées à distance de subir des traumatismes sonores.</French>
+            <Japanese>Zeus により遠隔操作されたユニットにも、聴覚へ損傷を受けるようにします。</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_autoAddEarplugsToUnits_DisplayName">
             <English>Add earplugs to units</English>
@@ -198,6 +214,7 @@
             <Italian>Aggiungi Tappi per Orecchie alle unità</Italian>
             <Spanish>Agregar tapones de oida a la unidad</Spanish>
             <French>Ajouter des bouchons anti-bruits aux unités</French>
+            <Japanese>ユニットへ耳栓を追加</Japanese>
         </Key>
         <Key ID="STR_ACE_Hearing_autoAddEarplugsToUnits_Description">
             <English>Add the `ACE_EarPlugs` item to all units that have loud weapons. Can disable if using custom loadouts.</English>
@@ -209,6 +226,7 @@
             <Italian>Aggiungi l'oggetto 'ACE_EarPlugs' a tutte le unità che hanno armi rumorose. Può essere disabilitato se vengono usati loadout personalizzati.</Italian>
             <Spanish>Agregar el item `ACE_EarPlugs`  a todas las unidades equipadas con armas muy ruidosas. Desactivar si quieren utilizarse equipamientos personalizados.</Spanish>
             <French>Ajoute l'objet "Ace_EarPlugs" à toutes les unités ayant des armes bruyantes. Peut être désactivé par des loadouts personalisés.</French>
+            <Japanese>全ユニットへ`ACE_EarPlugs`アイテムをもたせます。これは変更された武装で無効化できます。</Japanese>
         </Key>
     </Package>
 </Project>

addons/huntir/stringtable.xml

@@ -12,6 +12,7 @@
             <French>Boite de transport HuntIR</French>
             <Hungarian>HuntIR Transport Box</Hungarian>
             <Portuguese>Caixa de transporte do HuntIR</Portuguese>
+            <Japanese>HuntIR 輸送箱</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_magazine_displayName">
             <English>HuntIR Round</English>
@@ -24,6 +25,7 @@
             <French>Munition HuntIR</French>
             <Hungarian>HuntIR lövedék</Hungarian>
             <Portuguese>Cartucho HuntIR</Portuguese>
+            <Japanese>HuntIR 弾頭</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_monitor_displayName">
             <English>HuntIR monitor</English>
@@ -36,6 +38,7 @@
             <French>Ecran HuntIR</French>
             <Hungarian>HuntIR monitor</Hungarian>
             <Portuguese>Monitor HuntIR</Portuguese>
+            <Japanese>HuntIR モニタ</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_activateMonitor">
             <English>Activate HuntIR monitor</English>
@@ -48,6 +51,7 @@
             <French>Allumer l'écran du HuntIR</French>
             <Hungarian>HuntIR monitor aktiválása</Hungarian>
             <Portuguese>Ativar monitor do HuntIR</Portuguese>
+            <Japanese>HuntIR を起動する</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_CAM">
             <English>Camera:</English>
@@ -60,6 +64,7 @@
             <French>Caméra :</French>
             <Hungarian>Kamera:</Hungarian>
             <Portuguese>Câmera:</Portuguese>
+            <Japanese>カメラ:</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_ALT">
             <English>Altitude:</English>
@@ -72,6 +77,7 @@
             <French>Altitude :</French>
             <Hungarian>Magasság:</Hungarian>
             <Portuguese>Altitude:</Portuguese>
+            <Japanese>高度:</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_TIME">
             <English>Recording Time:</English>
@@ -84,6 +90,7 @@
             <French>Temps d'enregistrement :</French>
             <Hungarian>Felvételi idő:</Hungarian>
             <Portuguese>Tempo de gravação:</Portuguese>
+            <Japanese>録画時間:</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_ESC">
             <English>Press ESC to quit camera</English>
@@ -96,6 +103,7 @@
             <French>Appuyer sur ESC pour quitter la camera</French>
             <Hungarian>Nyomj ESC-ket a kamerából való kilépéshez</Hungarian>
             <Portuguese>Pressione ESC para sair da câmera</Portuguese>
+            <Japanese>ESC を押しカメラを抜ける</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_HELP">
             <English>Help</English>
@@ -108,6 +116,7 @@
             <French>Aide</French>
             <Hungarian>Súgó</Hungarian>
             <Portuguese>Ajuda</Portuguese>
+            <Japanese>ヘルプ</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_HELP_ZOOM">
             <English>A/D - Cycle zoom</English>
@@ -120,6 +129,7 @@
             <French>Q/D - Changement de zoom</French>
             <Hungarian>A/D - Nagyítás</Hungarian>
             <Portuguese>A/D - Troca zoom</Portuguese>
+            <Japanese>A/D - 倍率の変更</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_HELP_CAM">
             <English>W/S - Select camera</English>
@@ -132,6 +142,7 @@
             <French>Z/S - Sélectionner la caméra</French>
             <Hungarian>W/S - Kamera váltás</Hungarian>
             <Portuguese>W/S - Seleciona câmera</Portuguese>
+            <Japanese>W/S - カメラを選択</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_HELP_ROT">
             <English>Left/Right - Rotate camera</English>
@@ -144,6 +155,7 @@
             <French>Gauche/Droite - Rotation de la caméra</French>
             <Hungarian>Jobb/Bal - Kamera forgatás</Hungarian>
             <Portuguese>Esquerda/Direita - Rotaciona câmera</Portuguese>
+            <Japanese>Left/Right - カメラを開店</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_HELP_ELV">
             <English>Up/Down - Elevate/lower camera</English>
@@ -156,6 +168,7 @@
             <French>Haut/Bas - Monter/descendre la caméra</French>
             <Hungarian>Fel/Le - Kamera döntése/süllyesztése</Hungarian>
             <Portuguese>Acima/Abaixo - Eleva/Abaixa a câmera</Portuguese>
+            <Japanese>Up/Down - カメラ角度を変更</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_HELP_MOD">
             <English>N - Cycle IT modes</English>
@@ -168,6 +181,7 @@
             <French>N - Changement de modes IT</French>
             <Hungarian>N - Hőkép módok</Hungarian>
             <Portuguese>N - Troca modo IT</Portuguese>
+            <Japanese>N - IT モードを変更</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_HELP_RES">
             <English>R - Reset camera</English>
@@ -180,6 +194,7 @@
             <French>R - Reset de la caméra</French>
             <Hungarian>R - Kamera visszaállítása</Hungarian>
             <Portuguese>R - Redefine a câmera</Portuguese>
+            <Japanese>R - カメラを初期化</Japanese>
         </Key>
         <Key ID="STR_ACE_HUNTIR_HELP_EXIT">
             <English>Esc - Exit help</English>
@@ -192,6 +207,7 @@
             <French>Esc - Sortir de l'aide</French>
             <Hungarian>Exit - Kilépés a súgóból</Hungarian>
             <Portuguese>Esc - Sai do Ajuda</Portuguese>
+            <Japanese>Esc - ヘルプを出る</Japanese>
         </Key>
     </Package>
 </Project>

addons/interact_menu/config.cpp

@@ -25,9 +25,3 @@ class CfgPatches {
 class ACE_Extensions {
     extensions[] += {"ace_break_line", "ace_parse_imagepath"};
 };
-
-class ACE_newEvents {
-    interactMenuOpened = "ace_interactMenuOpened";
-    clearConditionCaches = QGVAR(clearConditionCaches);
-    interactMenuClosed = "ace_interactMenuClosed";
-};

addons/interact_menu/functions/fnc_addActionToClass.sqf

@@ -22,6 +22,7 @@
 
 if (!params [["_objectType", "", [""]], ["_typeNum", 0, [0]], ["_parentPath", [], [[]]], ["_action", [], [[]], 11]]) exitWith {
     ERROR("Bad Params");
+    []
 };
 TRACE_4("params",_objectType,_typeNum,_parentPath,_action);
 
@@ -38,6 +39,9 @@ if (param [4, false, [false]]) exitwith {
     ', _index];
     TRACE_2("Added inheritable action",_objectType,_index);
     [_objectType, "init", _initEH, true, [], true] call CBA_fnc_addClassEventHandler;
+
+    // Return the full path
+    (_parentPath + [_action select 0])
 };
 
 // Ensure the config menu was compiled first
@@ -60,12 +64,12 @@ if (_parentPath isEqualTo ["ACE_MainActions"]) then {
 
 private _parentNode = [_actionTrees, _parentPath] call FUNC(findActionNode);
 if (isNil {_parentNode}) exitWith {
-    ERROR("Failed to add action");
-    ERROR_4("action (%1) to parent %2 on object %3 [%4]",(_action select 0),_parentPath,_objectType,_typeNum);
+    ERROR_4("Failed to add action - action (%1) to parent %2 on object %3 [%4]",(_action select 0),_parentPath,_objectType,_typeNum);
+    []
 };
 
 // Add action node as children of the correct node of action tree
 (_parentNode select 1) pushBack [_action,[]];
 
 // Return the full path
-(+ _parentPath) pushBack (_action select 0)
+(_parentPath + [_action select 0])

addons/interact_menu/functions/fnc_addActionToObject.sqf

@@ -21,6 +21,7 @@
 
 if (!params [["_object", objNull, [objNull]], ["_typeNum", 0, [0]], ["_parentPath", [], [[]]], ["_action", [], [[]], 11]]) exitWith {
     ERROR("Bad Params");
+    []
 };
 
 private _varName = [QGVAR(actions),QGVAR(selfActions)] select _typeNum;
@@ -38,4 +39,4 @@ if (_parentPath isEqualTo ["ACE_MainActions"]) then {
 _actionList pushBack [_action, +_parentPath];
 
 // Return the full path
-(+ _parentPath) pushBack (_action select 0)
+(_parentPath + [_action select 0])

addons/interact_menu/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Mindig legyen a saját cselekvés kurzorja látható</Hungarian>
             <Italian>Mostra sempre il cursore delle autointerazioni</Italian>
             <Portuguese>Sempre mostrar cursor para interação pessoal</Portuguese>
+            <Japanese>セルフ インタラクションへ常にカーソルを表示</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_AlwaysUseCursorInteraction">
             <English>Always display cursor for interaction</English>
@@ -24,6 +25,7 @@
             <German>Immer den Mauszeiger für Fremd-Interaktionen anzeigen</German>
             <Hungarian>Mindig legyen a cselekvés kurzorja látható</Hungarian>
             <Portuguese>Sempre mostrar cursor para interação</Portuguese>
+            <Japanese>インタラクションへ常にカーソルを表示</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_UseListMenu">
             <English>Display interaction menus as lists</English>
@@ -36,6 +38,7 @@
             <German>Interaktionsmenü in Listen anzeigen</German>
             <Hungarian>Cselekvő menük listaként való megjelenítése</Hungarian>
             <Portuguese>Mostrar menu de interação como listas</Portuguese>
+            <Japanese>表示されるインタラクション メニューを一覧表示</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_InteractKey">
             <English>Interact Key</English>
@@ -48,6 +51,7 @@
             <Hungarian>Cselekvő gomb</Hungarian>
             <Italian>Tasto interazione</Italian>
             <Portuguese>Tecla de Interação</Portuguese>
+            <Japanese>インタラクション キー</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_SelfInteractKey">
             <English>Self Interaction Key</English>
@@ -60,6 +64,7 @@
             <Hungarian>Saját cselekvő gomb</Hungarian>
             <Italian>Tasto interazione su se stessi</Italian>
             <Portuguese>Tecla de Interação Pessoal</Portuguese>
+            <Japanese>セルフ インタラクション キー</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_SelfActionsRoot">
             <English>Self Actions</English>
@@ -72,6 +77,7 @@
             <Hungarian>Saját cselekvések</Hungarian>
             <Italian>Interazioni su se stessi</Italian>
             <Portuguese>Ações Pessoais</Portuguese>
+            <Japanese>自分への動作</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_VehicleActionsRoot">
             <English>Vehicle Actions</English>
@@ -84,6 +90,7 @@
             <Hungarian>Járműves cselekvések</Hungarian>
             <Italian>Interazioni con veicoli</Italian>
             <Portuguese>Ações de Veículos</Portuguese>
+            <Japanese>車両への動作</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_ZeusActionsRoot">
             <English>Zeus Actions</English>
@@ -96,6 +103,7 @@
             <Portuguese>Ações do Zeus</Portuguese>
             <Russian>Действия Зевса</Russian>
             <Italian>Azioni Zeus</Italian>
+            <Japanese>Zeus への動作</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_ColorTextMax">
             <English>Interaction - Text Max</English>
@@ -108,6 +116,7 @@
             <Spanish>Interacción - Texto al max.</Spanish>
             <Hungarian>Cselekvés - Szöveg max.</Hungarian>
             <Portuguese>Interação - Max. de Texto</Portuguese>
+            <Japanese>インタラクション - 文字の色</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_ColorTextMin">
             <English>Interaction - Text Min</English>
@@ -120,6 +129,7 @@
             <Spanish>Interacción - Texto al min.</Spanish>
             <Hungarian>Cselekvés - Szöveg min.</Hungarian>
             <Portuguese>Interação - Min. de Texto</Portuguese>
+            <Japanese>インタラクション - 文字の背景色</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_ColorShadowMax">
             <English>Interaction - Shadow Max</English>
@@ -132,6 +142,7 @@
             <Spanish>Interacción - Sombras al max.</Spanish>
             <Hungarian>Cselekvés - Árnyék max.</Hungarian>
             <Portuguese>Interação - Max. de Sombra</Portuguese>
+            <Japanese>インタラクション - 文字への影の色</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_ColorShadowMin">
             <English>Interaction - Shadow Min</English>
@@ -144,6 +155,7 @@
             <Spanish>Interacción - Sombras al min.</Spanish>
             <Hungarian>Cselekvés - Árnyék min.</Hungarian>
             <Portuguese>Interação - Min. de Sombra</Portuguese>
+            <Japanese>インタラクション - 文字への影の最低色</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_cursorKeepCentered">
             <English>Keep cursor centered</English>
@@ -156,6 +168,7 @@
             <Czech>Udržuj kurzor na středu</Czech>
             <Portuguese>Manter o cursor centralizado</Portuguese>
             <Italian>Mantieni il cursore centrato</Italian>
+            <Japanese>常にカーソルを中央にする</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_cursorKeepCenteredDescription">
             <English>Keeps cursor centered and pans the option menu around. Useful if screen size is limited.</English>
@@ -168,6 +181,7 @@
             <Spanish>Mantiene el cursor centrado y despliega los menús alrededor. Útil si el tamaño de la pantalla es limitado.</Spanish>
             <Portuguese>Manter o cursor centralizado e mover o menu de opções. Útil caso o tamanho da tela seja limitado.</Portuguese>
             <Italian>Mantieni il cursore centrato e sposta il menù intorno. Utile se lo schermo è piccolo.</Italian>
+            <Japanese>常にカーソルを中央へ表示させ、オプション メニューが移動します。画面の大きさが制限されている時に使いやすくなります。</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_ActionOnKeyRelease">
             <English>Do action when releasing menu key</English>
@@ -180,6 +194,7 @@
             <Portuguese>Execute a ação quando soltar a tecla de menu</Portuguese>
             <Hungarian>Cselekvés végrehajtása a menügomb elengedésekor</Hungarian>
             <Italian>Esegui l'azione quando rilasci il tasto menu</Italian>
+            <Japanese>メニュー キーを離したときに動作を実行します。</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_textSize">
             <English>Interaction Text Size</English>
@@ -192,6 +207,7 @@
             <Portuguese>Tamanho do texto de interação</Portuguese>
             <Hungarian>Cselekvő szöveg mérete</Hungarian>
             <Italian>Dimensione del testo d'interazione</Italian>
+            <Japanese>インタラクション文字の大きさ</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_shadowSetting">
             <English>Interaction Text Shadow</English>
@@ -204,6 +220,7 @@
             <Portuguese>Sombra do texto de interação</Portuguese>
             <Hungarian>Cselekvő szöveg árnyéka</Hungarian>
             <Italian>Ombra del testo d'interazione</Italian>
+            <Japanese>インタラクション文字へ影</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_shadowSettingDescription">
             <English>Allows controlling the text's shadow. Outline ignores custom shadow colors.</English>
@@ -216,6 +233,7 @@
             <Portuguese>Permite controlar a sombra do texto. Contorno ignora sombras com cores customizadas.</Portuguese>
             <Hungarian>Hozzáférést biztosít a szöveg árnyékának kezeléséhez. A körvonal nem veszi figyelembe az egyedi árnyékszíneket.</Hungarian>
             <Italian>Permette di controllare l'ombra del testo. L'impostazione "Contorno" ignora il colore dell'ombra.</Italian>
+            <Japanese>文字への影を設定します。縁取りは設定された影の色を無視します。</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_shadowOutline">
             <English>Outline</English>
@@ -228,6 +246,7 @@
             <Portuguese>Contorno</Portuguese>
             <Hungarian>Körvonal</Hungarian>
             <Italian>Contorno</Italian>
+            <Japanese>縁取り</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_background">
             <English>Interaction menu background</English>
@@ -240,6 +259,7 @@
             <Hungarian>Cselekvő menü háttere</Hungarian>
             <Russian>Фон меню взаимодействия</Russian>
             <Italian>Sfondo Menù Interazioni</Italian>
+            <Japanese>インタラクション メニューの背景</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_blurScreenDesc">
             <English>Blur the background while the interaction menu is open.</English>
@@ -252,6 +272,7 @@
             <Hungarian>A háttér elmosása a cselekvő menü használata alatt.</Hungarian>
             <Russian>Размыть фон, пока открыто меню взаимодействия.</Russian>
             <Italian>Sfoca lo sfondo mentre il Menù Interazioni è aperto.</Italian>
+            <Japanese>インタラクション メニューを開いたとき、背景にボケを与えます。</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_backgroundBlur">
             <English>Blur screen</English>
@@ -264,6 +285,7 @@
             <Hungarian>Kép elmosása</Hungarian>
             <Russian>Размытый</Russian>
             <Italian>Sfoca schermo</Italian>
+            <Japanese>ボケ画面</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_backgroundBlack">
             <English>Black</English>
@@ -276,6 +298,7 @@
             <Hungarian>Fekete</Hungarian>
             <Russian>Черный</Russian>
             <Italian>Nero</Italian>
+            <Japanese>ブラック</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_addBuildingActions">
             <English>Show actions for buildings</English>
@@ -288,6 +311,7 @@
             <Portuguese>Mostrar ações para edifícios</Portuguese>
             <Russian>Показывать действия для зданий</Russian>
             <Italian>Mostra azioni per edifici</Italian>
+            <Japanese>建物へ動作を表示</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_addBuildingActionsDescription">
             <English>Adds interaction actions for opening doors and mounting ladders on buildings. (Note: There is a performance cost when opening interaction menu, especially in towns)</English>
@@ -300,6 +324,7 @@
             <Portuguese>Adiciona ações de interações para abrir portas e montar escadas em edifícios. (Nota: Existe um custo de performance quando aberto o menu de interação, especialmente em cidades)</Portuguese>
             <Russian>Добавляет действия открывания дверей и залезания на лестницы для зданий. (Примечание: возможно падение производительности при открытии меню взаимодействия, особенно в городах)</Russian>
             <Italian>Aggiunge azioni interattive per l'apertura delle porte e piazzamento scale su edifici. (Nota: C'è un costo in performance quando si apre il Menù Interazioni, soprattutto in città)</Italian>
+            <Japanese>建物にあるドアの開閉やラダーの昇降といった動作をインタラクションへ追加します。(街などでインタラクション メニューを開くとパフォーマンスが低下します)</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_Category_InteractionMenu">
             <English>Interaction Menu</English>
@@ -311,6 +336,7 @@
             <Spanish>Menú de interacción</Spanish>
             <Italian>Menù Interazioni</Italian>
             <French>Menu d'interaction</French>
+            <Japanese>インタラクション メニュー</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_menuAnimationSpeed">
             <English>Interaction Animation Speed</English>
@@ -322,6 +348,7 @@
             <Italian>Velocità Animazioni Interazioni</Italian>
             <Spanish>Velocidad de animación del menú de interacción</Spanish>
             <French>Vitesse de l'aniamtion d'interaction</French>
+            <Japanese>インタラクションのアニメーション速度</Japanese>
         </Key>
         <Key ID="STR_ACE_Interact_Menu_menuAnimationSpeed_Description">
             <English>Makes menu animations faster and decreases the time needed to hover to show sub actions</English>
@@ -333,6 +360,7 @@
             <Italian>Rende le animazioni Menù più veloci e diminuisce il tempo richiesto per mostrare sotto-azioni</Italian>
             <Spanish>Hace la animación del menú más rápida, reduciendo el tiempo necesario para abrir sub-acciones.</Spanish>
             <French>Rend les animations de menu plus rapide et réduit le temps nécessaire à l'affichage des sous menus d'action</French>
+            <Japanese>サブ動作が表示されるホバーをした時に、表示されるメニューのアニメーション速度を早くしたり遅くしたりできます</Japanese>
         </Key>
     </Package>
 </Project>

addons/interaction/config.cpp

@@ -19,12 +19,3 @@ class CfgPatches {
 #include "RscTitles.hpp"
 #include "ACE_Settings.hpp"
 #include "ACE_ZeusActions.hpp"
-
-class ACE_newEvents {
-    getDown = QGVAR(getDown);
-    pardon = QGVAR(pardon);
-    tapShoulder = QGVAR(tapShoulder);
-    sendAway = QGVAR(sendAway);
-    lampTurnOff = QGVAR(setLampOff);
-    lampTurnOn = QGVAR(setLampOn);
-};

addons/interaction/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Cselekvések</Hungarian>
             <Italian>Interazioni</Italian>
             <Portuguese>Interaçãoes</Portuguese>
+            <Japanese>インタラクション</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Torso">
             <English>Torso</English>
@@ -24,6 +25,7 @@
             <Hungarian>Testtörzs</Hungarian>
             <Italian>Torso</Italian>
             <Portuguese>Torso</Portuguese>
+            <Japanese>胴体</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Head">
             <English>Head</English>
@@ -36,6 +38,7 @@
             <Hungarian>Fej</Hungarian>
             <Italian>Testa</Italian>
             <Portuguese>Cabeça</Portuguese>
+            <Japanese>頭部</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_ArmLeft">
             <English>Left Arm</English>
@@ -48,6 +51,7 @@
             <Hungarian>Bal kar</Hungarian>
             <Italian>Braccio sinistro</Italian>
             <Portuguese>Braço Esquerdo</Portuguese>
+            <Japanese>左腕</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_ArmRight">
             <English>Right Arm</English>
@@ -60,6 +64,7 @@
             <Hungarian>Jobb kar</Hungarian>
             <Italian>Braccio destro</Italian>
             <Portuguese>Braço Direito</Portuguese>
+            <Japanese>右腕</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_LegLeft">
             <English>Left Leg</English>
@@ -72,6 +77,7 @@
             <Hungarian>Bal láb</Hungarian>
             <Italian>Gamba sinistra</Italian>
             <Portuguese>Perna Esquerda</Portuguese>
+            <Japanese>左足</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_LegRight">
             <English>Right Leg</English>
@@ -84,6 +90,7 @@
             <Hungarian>Jobb láb</Hungarian>
             <Italian>Gamba destra</Italian>
             <Portuguese>Perna Direita</Portuguese>
+            <Japanese>右足</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Weapon">
             <English>Weapon</English>
@@ -96,6 +103,7 @@
             <Hungarian>Fegyver</Hungarian>
             <Italian>Arma</Italian>
             <Portuguese>Arma</Portuguese>
+            <Japanese>武器</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_InteractionMenu">
             <English>Interaction Menu</English>
@@ -108,6 +116,7 @@
             <Hungarian>Cselekvő menü</Hungarian>
             <Portuguese>Menu de Interação</Portuguese>
             <Italian>Menù interazione</Italian>
+            <Japanese>インタラクション メニュー</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_InteractionMenuSelf">
             <English>Interaction Menu (Self)</English>
@@ -120,6 +129,7 @@
             <Hungarian>Cselekvő menü (saját) </Hungarian>
             <Portuguese>Menu de Interação (Individual)</Portuguese>
             <Italian>Menù interazione (individuale)</Italian>
+            <Japanese>インタラクション メニュー (セルフ)</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_OpenDoor">
             <English>Open / Close Door</English>
@@ -132,6 +142,7 @@
             <Hungarian>Ajtó nyitása / zárása</Hungarian>
             <Portuguese>Abrir / Fechar Porta</Portuguese>
             <Italian>Apri / Chiudi la porta</Italian>
+            <Japanese>ドアの開け閉め</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_LockDoor">
             <English>Lock Door</English>
@@ -144,6 +155,7 @@
             <Hungarian>Ajtó bezárása</Hungarian>
             <Polish>Zablokuj drzwi</Polish>
             <Czech>Zamknout dveře</Czech>
+            <Japanese>ドアの鍵を閉める</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_UnlockDoor">
             <English>Unlock Door</English>
@@ -156,6 +168,7 @@
             <Hungarian>Zár kinyitása</Hungarian>
             <Polish>Odblokuj drzwi</Polish>
             <Czech>Odemknout dveře</Czech>
+            <Japanese>ドアの鍵を開ける</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_LockedDoor">
             <English>Locked Door</English>
@@ -168,6 +181,7 @@
             <Hungarian>Zárt ajtó</Hungarian>
             <Polish>Zablokowano drzwi</Polish>
             <Czech>Zamčené dveře</Czech>
+            <Japanese>ドアの鍵を締めた</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_UnlockedDoor">
             <English>Unlocked Door</English>
@@ -180,6 +194,7 @@
             <Hungarian>Nyitott ajtó</Hungarian>
             <Polish>Odblokowano drzwi</Polish>
             <Czech>Odemčené dveře</Czech>
+            <Japanese>ドアの鍵を開けられた</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_JoinGroup">
             <English>Join group</English>
@@ -192,6 +207,7 @@
             <Hungarian>Csatlakozás a csoporthoz</Hungarian>
             <Portuguese>Unir-se ao grupo</Portuguese>
             <Italian>Unisciti alla squadra</Italian>
+            <Japanese>グループにはいる</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_LeaveGroup">
             <English>Leave Group</English>
@@ -204,6 +220,7 @@
             <Hungarian>Csoport elhagyása</Hungarian>
             <Portuguese>Deixar grupo</Portuguese>
             <Italian>Lascia la squadra</Italian>
+            <Japanese>グループをぬける</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_BecomeLeader">
             <English>Become Leader</English>
@@ -216,6 +233,7 @@
             <Hungarian>Vezetés átvétele</Hungarian>
             <Portuguese>Tornar-se Líder</Portuguese>
             <Italian>Prendi il comando</Italian>
+            <Japanese>リーダーになる</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Dance">
             <English>DANCE!</English>
@@ -228,6 +246,7 @@
             <Hungarian>TÁNC!</Hungarian>
             <Portuguese>DANCE!</Portuguese>
             <Italian>DANZA!</Italian>
+            <Japanese>おどれ！</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_StopDancing">
             <English>Stop Dancing</English>
@@ -240,6 +259,7 @@
             <Hungarian>Tánc abbahagyása</Hungarian>
             <Portuguese>Parar de dançar</Portuguese>
             <Italian>Smetti di ballare</Italian>
+            <Japanese>踊るのをやめる</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Back">
             <English>&lt;&lt; Back</English>
@@ -252,6 +272,7 @@
             <Hungarian>&lt;&lt; Vissza</Hungarian>
             <Portuguese>&lt;&lt; Voltar</Portuguese>
             <Italian>&lt;&lt; Indietro</Italian>
+            <Japanese>&amp;lt;&amp;lt; もどる</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_WeaponOnBack">
             <English>Put weapon on back</English>
@@ -264,6 +285,7 @@
             <Hungarian>Fegyvert hátra</Hungarian>
             <Portuguese>Colocar arma nas costas</Portuguese>
             <Italian>Metti l'arma in spalla</Italian>
+            <Japanese>武器を背負う</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_TapShoulder">
             <English>Tap Shoulder</English>
@@ -276,6 +298,7 @@
             <Hungarian>Vállveregetés</Hungarian>
             <Portuguese>Tocar ombro</Portuguese>
             <Italian>Dai un colpetto</Italian>
+            <Japanese>肩をたたく</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_YouWereTappedRight">
             <English>You were tapped on the RIGHT shoulder</English>
@@ -288,6 +311,7 @@
             <Russian>Вас похлопали по ПРАВОМУ плечу</Russian>
             <Portuguese>Você foi tocado no ombro</Portuguese>
             <Italian>Ti è stato dato un colpetto sulla spalla destra</Italian>
+            <Japanese>右肩を叩かれた</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_YouWereTappedLeft">
             <English>You were tapped on the LEFT shoulder.</English>
@@ -300,6 +324,7 @@
             <Russian>Вас похлопали по ЛЕВОМУ плечу</Russian>
             <Portuguese>Você foi tocado no ombro.</Portuguese>
             <Italian>Ti è stato dato un colpetto sulla spalla sinistra</Italian>
+            <Japanese>左肩を叩かれた</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_CancelSelection">
             <English>Cancel</English>
@@ -312,6 +337,7 @@
             <Russian>Отменить</Russian>
             <Portuguese>Cancelar</Portuguese>
             <Hungarian>Mégse</Hungarian>
+            <Japanese>中止</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_MakeSelection">
             <English>Select</English>
@@ -324,6 +350,7 @@
             <Russian>Выбрать</Russian>
             <Portuguese>Selecionar</Portuguese>
             <Hungarian>Kiválaszt</Hungarian>
+            <Japanese>選択</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_SendAway">
             <English>Go Away!</English>
@@ -336,6 +363,7 @@
             <Hungarian>Tűnés!</Hungarian>
             <Portuguese>Vá Embora!</Portuguese>
             <Italian>Via di qui!</Italian>
+            <Japanese>うせろ！</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_GetDown">
             <English>Get Down!</English>
@@ -348,6 +376,7 @@
             <Russian>Ложись!</Russian>
             <Portuguese>Abaixe-se!</Portuguese>
             <Italian>A terra!</Italian>
+            <Japanese>ふせろ！</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_GetOut">
             <English>Get Out</English>
@@ -358,6 +387,7 @@
             <French>Sortez !</French>
             <Russian>Выходи</Russian>
             <Czech>Vystupte</Czech>
+            <Japanese>降りる</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_TeamManagement">
             <English>Team Management</English>
@@ -370,6 +400,7 @@
             <Portuguese>Gerenciamento de Equipe</Portuguese>
             <Italian>Organizzazione Squadra</Italian>
             <Hungarian>Csapat kezelése</Hungarian>
+            <Japanese>チーム管理</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_TeamRED">
             <English>Red</English>
@@ -382,6 +413,7 @@
             <Portuguese>Vermelha</Portuguese>
             <Italian>Rosso</Italian>
             <Hungarian>Piros</Hungarian>
+            <Japanese>レッド</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_TeamGREEN">
             <English>Green</English>
@@ -394,6 +426,7 @@
             <Portuguese>Verde</Portuguese>
             <Italian>Verde</Italian>
             <Hungarian>Zöld</Hungarian>
+            <Japanese>グリーン</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_TeamBLUE">
             <English>Blue</English>
@@ -406,6 +439,7 @@
             <Portuguese>Azul</Portuguese>
             <Italian>Blu</Italian>
             <Hungarian>Kék</Hungarian>
+            <Japanese>ブルー</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_TeamYELLOW">
             <English>Yellow</English>
@@ -418,6 +452,7 @@
             <Portuguese>Amarela</Portuguese>
             <Italian>Giallo</Italian>
             <Hungarian>Sárga</Hungarian>
+            <Japanese>イエロー</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_AssignTeamRed">
             <English>Assign Red</English>
@@ -430,6 +465,7 @@
             <Russian>Назначить в Красную группу</Russian>
             <French>Assigner à rouge</French>
             <Italian>Assegna al team rosso</Italian>
+            <Japanese>レッドにする</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_AssignTeamGreen">
             <English>Assign Green</English>
@@ -442,6 +478,7 @@
             <Russian>Назначить в Зеленую группу</Russian>
             <French>Assigner à vert</French>
             <Italian>Assegna al team verde</Italian>
+            <Japanese>グリーンにする</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_AssignTeamBlue">
             <English>Assign Blue</English>
@@ -454,6 +491,7 @@
             <Russian>Назначить в Синюю группу</Russian>
             <French>Assigner à bleu</French>
             <Italian>Assegna al team blu</Italian>
+            <Japanese>ブルーにする</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_AssignTeamYellow">
             <English>Assign Yellow</English>
@@ -466,6 +504,7 @@
             <Russian>Назначить в Желтую группу</Russian>
             <French>Assigner à jaune</French>
             <Italian>Assegna al team giallo</Italian>
+            <Japanese>イエローにする</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_JoinTeamRed">
             <English>Join Red</English>
@@ -478,6 +517,7 @@
             <Russian>Присоединиться к Красной группе</Russian>
             <French>Rejoindre rouge</French>
             <Italian>Unirsi al team rosso</Italian>
+            <Japanese>レッドに入る</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_JoinTeamGreen">
             <English>Join Green</English>
@@ -490,6 +530,7 @@
             <Russian>Присоединиться к Зеленой группе</Russian>
             <French>Rejoindre vert</French>
             <Italian>Unirsi al team verde</Italian>
+            <Japanese>グリーンに入る</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_JoinTeamBlue">
             <English>Join Blue</English>
@@ -502,6 +543,7 @@
             <Russian>Присоединиться к Синей группе</Russian>
             <French>Rejoindre bleu</French>
             <Italian>Unirsi al team blu</Italian>
+            <Japanese>ブルーに入る</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_JoinTeamYellow">
             <English>Join Yellow</English>
@@ -514,6 +556,7 @@
             <Russian>Присоединиться к Жёлтой группе</Russian>
             <French>Rejoindre jaune</French>
             <Italian>Unirsi al team giallo</Italian>
+            <Japanese>イエローに入る</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_JoinedTeam">
             <English>You joined Team %1</English>
@@ -526,6 +569,7 @@
             <Portuguese>Você uniu-se à Equipe %1</Portuguese>
             <Italian>Sei entrato nel team %1</Italian>
             <Hungarian>Csatlakoztál a %1 csapathoz</Hungarian>
+            <Japanese>チーム %1 に入った</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_LeaveTeam">
             <English>Leave Team</English>
@@ -538,6 +582,7 @@
             <Portuguese>Deixar Equipe</Portuguese>
             <Italian>Lascia il team</Italian>
             <Hungarian>Csapat elhagyása</Hungarian>
+            <Japanese>チームを抜ける</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_LeftTeam">
             <English>You left the Team</English>
@@ -550,6 +595,7 @@
             <Portuguese>Você deixou a Equipe</Portuguese>
             <Italian>Hai lasciato il team</Italian>
             <Hungarian>Elhagytad a csapatot</Hungarian>
+            <Japanese>チームを抜けた</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Pardon">
             <English>Pardon</English>
@@ -562,6 +608,7 @@
             <Portuguese>Perdão</Portuguese>
             <Italian>Perdona</Italian>
             <Hungarian>Megbocsátás</Hungarian>
+            <Japanese>許す</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_ScrollHint">
             <English>Scroll</English>
@@ -574,6 +621,7 @@
             <Italian>Scorri</Italian>
             <Hungarian>Görgetés</Hungarian>
             <Czech>Posunout</Czech>
+            <Japanese>スクロール</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_ModifierKey">
             <English>Modifier Key</English>
@@ -586,6 +634,7 @@
             <Italian>Tasto modifica</Italian>
             <Hungarian>Módosító billentyű</Hungarian>
             <Czech>Modifikátor</Czech>
+            <Japanese>キーを割り当て</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_NotInRange">
             <English>Not in Range</English>
@@ -598,6 +647,7 @@
             <Polish>Poza zasięgiem</Polish>
             <Czech>Mimo dosah</Czech>
             <Italian>Fuori limite</Italian>
+            <Japanese>範囲内にありません</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Equipment">
             <English>Equipment</English>
@@ -610,6 +660,7 @@
             <Russian>Снаряжение</Russian>
             <Italian>Equipaggiamento</Italian>
             <Portuguese>Equipamento</Portuguese>
+            <Japanese>装備</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Push">
             <English>Push</English>
@@ -622,6 +673,7 @@
             <Russian>Толкать</Russian>
             <Portuguese>Empurrar</Portuguese>
             <Italian>Spingere</Italian>
+            <Japanese>押す</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Interact">
             <English>Interact</English>
@@ -634,6 +686,7 @@
             <Hungarian>Cselekvés</Hungarian>
             <Italian>Interagire</Italian>
             <Portuguese>Interagir</Portuguese>
+            <Japanese>インタラクト</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Passengers">
             <English>Passengers</English>
@@ -646,6 +699,7 @@
             <Hungarian>Utasok</Hungarian>
             <Italian>Passeggeri</Italian>
             <Portuguese>Passageiros</Portuguese>
+            <Japanese>後部座席</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_OpenBox">
             <English>Open</English>
@@ -658,6 +712,7 @@
             <Russian>Открыть</Russian>
             <Italian>Apri</Italian>
             <German>Öffnen</German>
+            <Japanese>開く</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Module_DisplayName">
             <English>Interaction System</English>
@@ -670,6 +725,7 @@
             <Hungarian>Interakciós rendszer</Hungarian>
             <Portuguese>Sistema de interação</Portuguese>
             <Italian>Sistema Interazioni</Italian>
+            <Japanese>インタラクション システム</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_EnableTeamManagement_DisplayName">
             <English>Enable Team Management</English>
@@ -682,6 +738,7 @@
             <Hungarian>Csapatkezelés engedélyezése</Hungarian>
             <Portuguese>Habilitar gestão de equipes</Portuguese>
             <Italian>Abilità Management Squadra</Italian>
+            <Japanese>チーム管理をつかう</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_EnableTeamManagement_Description">
             <English>Should players be allowed to use the Team Management Menu? Default: Yes</English>
@@ -694,6 +751,7 @@
             <Hungarian>A játékosoknak engedélyezve legyen a csapatkezelő menü? Alapértelmezett: Igen</Hungarian>
             <Portuguese>Devem os jogadores ter permissão de usar o menu de gestão de equipes? Padrão: Sim</Portuguese>
             <Italian>Possono i giocatori usare il Menù Managment Squadra? Default: Si</Italian>
+            <Japanese>プレイヤーがチーム管理メニューを使えるようにしますか？標準：はい</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_Module_Description">
             <English>Team management allows color allocation for team members, taking team command and joining/leaving teams.</English>
@@ -706,6 +764,7 @@
             <Portuguese>O módulo de gestão de equipe é composto por: a atribuição de cores para os membros da equipe, comando das equipes, juntando-se / deixando equipes.</Portuguese>
             <Russian>Управление группами позволяет назначать цвета членам групп, брать командование, вступать в группы или покидать их.</Russian>
             <Italian>Management Squadra permette l'assegnazione di colori per membri della squadra, prendere il comando ed entrare/uscire dalle squadre.</Italian>
+            <Japanese>チーム管理はチーム メンバーへ色の割り当てや指揮権を取ったり、チームの出入りを許可します。</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_TurnOn">
             <English>Turn on</English>
@@ -717,6 +776,7 @@
             <Czech>Zapnout</Czech>
             <Portuguese>Ligar</Portuguese>
             <Russian>Включить</Russian>
+            <Japanese>中に入る</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_TurnOff">
             <English>Turn off</English>
@@ -728,6 +788,7 @@
             <Czech>Vypnout</Czech>
             <Portuguese>Desligar</Portuguese>
             <Russian>Выключить</Russian>
+            <Japanese>外に出す</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_PassMagazine">
             <English>Pass magazine</English>
@@ -739,6 +800,7 @@
             <Italian>Passa caricatore</Italian>
             <Spanish>Pasar cargador</Spanish>
             <French>Passer un chargeur</French>
+            <Japanese>弾倉をわたす</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_PassMagazinePrimary">
             <English>Primary magazine</English>
@@ -750,6 +812,7 @@
             <Italian>Caricatore Primario</Italian>
             <Spanish>Cargador primario</Spanish>
             <French>Chargeur de l'arme principale</French>
+            <Japanese>プライマリ用弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_PassMagazineHandgun">
             <English>Pistol magazine</English>
@@ -761,6 +824,7 @@
             <Italian>Caricatore Pistola</Italian>
             <Spanish>Cargador de pistola</Spanish>
             <French>Chargeur de pistolet</French>
+            <Japanese>拳銃の弾倉</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_PassMagazineHint">
             <English>%1 passed you a %2 magazine.</English>
@@ -772,6 +836,7 @@
             <Italian>%1 ti ha passato un caricatore %2 .</Italian>
             <Spanish>%1 te pasó un cargador %2.</Spanish>
             <French>%1 vous a passé un chargeur de %2.</French>
+            <Japanese>%1 はあなたに %2 弾倉をわたした</Japanese>
         </Key>
         <Key ID="STR_ACE_Interaction_PassMagazineSetting">
             <English>Show "pass magazine" interaction</English>
@@ -783,6 +848,7 @@
             <Italian>Mostra interazione "passa caricatore"</Italian>
             <Spanish>Mostrar "Pasar cargador" en el menú de interacción</Spanish>
             <French>Montrer l'interaction "Passer un chargeur"</French>
+            <Japanese>"弾倉をわたす"をインタラクションに表示する</Japanese>
         </Key>
     </Package>
 </Project>

addons/inventory/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Legyen a felszerelés menüje nagyobb</Hungarian>
             <Italian>Ingrandisci il menù inventario</Italian>
             <Portuguese>Aumentar o Tamanho da Tela do Inventário</Portuguese>
+            <Japanese>インベントリ表示を大きくする</Japanese>
         </Key>
         <Key ID="STR_ACE_Inventory_SettingDescription">
             <English>Normally inventory display is scaled by UI size. This allows scaling the Inventory UI size up, but doesn't increase font size allowing more rows displayed.</English>
@@ -24,6 +25,7 @@
             <Hungarian>Alaphelyzetben a kezelőfelület mérete skálázza a felszerelési menüt. Ez az opció engedélyezi a menü felskálázását, de megtartja a betűméreteket, így növelve a láthatóságot.</Hungarian>
             <Italian>Normalmente il menù inventario è scalato in base alle dimensioni interfaccia. Questa opzione di permette di ingrandirlo ulteriormente ma senza aumentare la dimensione del testo.</Italian>
             <Portuguese>Normalmente o tamanho da tela do inventário é ditada pelo tamanho da UI. Isso permite aumentar o tamanho da tela de inventário, mas não aumenta o tamanho da fonte, permitindo que mais linhas sejam visualizadas.</Portuguese>
+            <Japanese>通常のインベントリは UI の大きさによって表示されます。これはインベントリ UI を大きくできますが、文字は大きくできません。</Japanese>
         </Key>
         <Key ID="STR_ACE_Inventory_Backpacks">
             <English>Backpacks</English>
@@ -35,6 +37,7 @@
             <French>Sacs à dos</French>
             <Portuguese>Mochilas</Portuguese>
             <Russian>Рюкзаки</Russian>
+            <Japanese>バックパック</Japanese>
         </Key>
         <Key ID="STR_ACE_Inventory_Headgear">
             <English>Headgear</English>
@@ -46,6 +49,7 @@
             <French> Couvre-chefs</French>
             <Portuguese>Capacetes</Portuguese>
             <Russian>Головные уборы</Russian>
+            <Japanese>ヘッドギア</Japanese>
         </Key>
         <Key ID="STR_ACE_Inventory_Glasses">
             <English>Glasses</English>
@@ -57,6 +61,7 @@
             <French>Lunettes</French>
             <Portuguese>Óculos</Portuguese>
             <Russian>Очки</Russian>
+            <Japanese>メガネ</Japanese>
         </Key>
         <Key ID="STR_ACE_Inventory_Uniforms">
             <English>Uniforms</English>
@@ -68,6 +73,7 @@
             <French>Uniformes</French>
             <Portuguese>Uniformes</Portuguese>
             <Russian>Униформа</Russian>
+            <Japanese>戦闘服</Japanese>
         </Key>
         <Key ID="STR_ACE_Inventory_Vests">
             <English>Vests</English>
@@ -79,6 +85,7 @@
             <French>Vestes</French>
             <Portuguese>Coletes</Portuguese>
             <Russian>Жилеты</Russian>
+            <Japanese>ベスト</Japanese>
         </Key>
         <Key ID="STR_ACE_Inventory_Grenades">
             <English>Grenades</English>
@@ -90,6 +97,7 @@
             <French>Grenades</French>
             <Portuguese>Granadas</Portuguese>
             <Russian>Гранаты</Russian>
+            <Japanese>手榴弾</Japanese>
         </Key>
         <Key ID="STR_ACE_Inventory_Medical">
             <English>Medical</English>
@@ -101,6 +109,7 @@
             <French>Médical</French>
             <Portuguese>Médico</Portuguese>
             <Russian>Медицина</Russian>
+            <Japanese>医療</Japanese>
         </Key>
     </Package>
 </Project>

addons/javelin/stringtable.xml

@@ -12,6 +12,7 @@
             <Italian>Aggangia il bersagio</Italian>
             <Spanish>Fijar objetivo (Mantener)</Spanish>
             <Portuguese>Travar Alvo(Segurar)</Portuguese>
+            <Japanese>目標を捕捉 (押しっぱ)</Japanese>
         </Key>
         <Key ID="STR_ACE_Javelin_CycleFireMode">
             <English>Cycle Fire Mode</English>
@@ -24,6 +25,7 @@
             <Italian>Alterna le modalità di fuoco</Italian>
             <Spanish>Cambiar modo de disparo</Spanish>
             <Portuguese>Alterar Modo de Disparo</Portuguese>
+            <Japanese>発射モード切り替え</Japanese>
         </Key>
     </Package>
-</Project>
+</Project>

addons/kestrel4500/stringtable.xml

@@ -12,6 +12,7 @@
             <Hungarian>Kestrel 4500NV</Hungarian>
             <Portuguese>Kestrel 4500NV</Portuguese>
             <Russian>Kestrel 4500NV</Russian>
+            <Japanese>Kestrel 4500NV</Japanese>
         </Key>
         <Key ID="STR_ACE_Kestrel4500_Description">
             <English>Kestrel 4500 Pocket Weather Tracker</English>
@@ -24,6 +25,7 @@
             <Portuguese>Kestrel 4500 Medidor Balístico Ativo</Portuguese>
             <Hungarian>Kestrel 4500 kézi szél-és időjárásmérő</Hungarian>
             <Czech>Příruční meteostanice Kestrel 4500</Czech>
+            <Japanese>Kestrel 4500 携帯型風速計</Japanese>
         </Key>
         <Key ID="STR_ACE_Kestrel4500_OpenKestrel">
             <English>Open Kestrel 4500</English>
@@ -36,6 +38,7 @@
             <German>Kestrel 4500 öffnen</German>
             <Portuguese>Abrir Kestrel 4500</Portuguese>
             <Czech>Otevřít Kestrel 4500</Czech>
+            <Japanese>Kestrel 4500 を開く</Japanese>
         </Key>
         <Key ID="STR_ACE_Kestrel4500_ShowKestrel">
             <English>Show Kestrel 4500</English>
@@ -48,6 +51,7 @@
             <Hungarian>Kestrel 4500 mutatása</Hungarian>
             <Czech>Zobrazit Kestrel 4500</Czech>
             <Portuguese>Mostrar Kestrel 4500</Portuguese>
+            <Japanese>Kestrel 4500 を見る</Japanese>
         </Key>
         <Key ID="STR_ACE_Kestrel4500_HideKestrel">
             <English>Hide Kestrel 4500</English>
@@ -60,6 +64,7 @@
             <Hungarian>Kestrel 4500 elrejtése</Hungarian>
             <Czech>Skrýt Kestrel 4500</Czech>
             <Portuguese>Ocultar Kestrel 4500</Portuguese>
+            <Japanese>Kestrel 4500 を隠す</Japanese>
         </Key>
         <Key ID="STR_ACE_Kestrel4500_KestrelDialogKey">
             <English>Open Kestrel 4500</English>
@@ -72,6 +77,7 @@
             <Hungarian>Kestrel 4500 elővétele</Hungarian>
             <Czech>Otevřít Kestrel 4500</Czech>
             <Portuguese>Abrir Kestrel 4500</Portuguese>
+            <Japanese>Kestrel 4500 を開く</Japanese>
         </Key>
         <Key ID="STR_ACE_Kestrel4500_DisplayKestrelKey">
             <English>Show Kestrel 4500</English>
@@ -84,6 +90,7 @@
             <Hungarian>Kestrel 4500 mutatása</Hungarian>
             <Czech>Zobrazit Kestrel 4500</Czech>
             <Portuguese>Mostrar Kestrel 4500</Portuguese>
+            <Japanese>Kestrel 4500 を見る</Japanese>
         </Key>
     </Package>
 </Project>