Settings - Added more categories (#5771)

addons/captives/ACE_Settings.hpp

@@ -1,11 +1,13 @@
 class ACE_Settings {
     class GVAR(allowHandcuffOwnSide) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(ModuleSettings_handcuffSide_name);
         description = CSTRING(ModuleSettings_handcuffSide_description);
         typeName = "BOOL";
         value = 1;
     };
     class GVAR(requireSurrender) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(ModuleSettings_requireSurrender_name);
         description = CSTRING(ModuleSettings_requireSurrender_description);
         typeName = "SCALAR";
@@ -13,12 +15,14 @@ class ACE_Settings {
         value = 1;
     };
     class GVAR(allowSurrender) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(ModuleSettings_allowSurrender_name);
         description = CSTRING(ModuleSettings_allowSurrender_description);
         typeName = "BOOL";
         value = 1;
     };
     class GVAR(requireSurrenderAi) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(ModuleSettings_requireSurrenderAi_name);
         description = CSTRING(ModuleSettings_requireSurrenderAi_description);
         typeName = "BOOL";

addons/captives/stringtable.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Captives">
+        <Key ID="STR_ACE_Captives_DisplayName">
+            <English>Captives</English>
+            <German>Gefangene</German>
+        </Key>
         <Key ID="STR_ACE_Captives_SetCaptive">
             <English>Take Prisoner</English>
             <German>Gefangen nehmen</German>

addons/common/ACE_Settings.hpp

@@ -15,20 +15,26 @@ class ACE_Settings {
      * };
      */
     class GVAR(checkPBOsAction) {
+        category = CSTRING(DisplayName);
         value = 0;
         typeName = "SCALAR";
         isClientSettable = 0;
+        displayName = CSTRING(CheckPBOsAction);
         values[] = {CSTRING(CheckPBO_Action_WarnOnce), CSTRING(CheckPBO_Action_WarnPerm), CSTRING(CheckPBO_Action_Kick)};
     };
     class GVAR(checkPBOsCheckAll) {
+        category = CSTRING(DisplayName);
         value = 0;
         typeName = "BOOL";
         isClientSettable = 0;
+        displayName = CSTRING(CheckPBOsCheckAll);
     };
     class GVAR(checkPBOsWhitelist) {
+        category = CSTRING(DisplayName);
         value = "[]";
         typeName = "STRING";
         isClientSettable = 0;
+        displayName = CSTRING(CheckPBOsWhitelist);
     };
     /*class GVAR(enableNumberHotkeys) {
         value = 1;
@@ -37,6 +43,7 @@ class ACE_Settings {
         displayName = CSTRING(EnableNumberHotkeys);
     };*/
     class GVAR(settingFeedbackIcons) {
+        category = CSTRING(DisplayName);
         value = 1;
         typeName = "SCALAR";
         force = 0;
@@ -46,6 +53,7 @@ class ACE_Settings {
         values[] = {ECSTRING(optionsmenu,Hide), ECSTRING(optionsmenu,TopRightDown), ECSTRING(optionsmenu,TopRightLeft), ECSTRING(optionsmenu,TopLeftDown), ECSTRING(optionsmenu,TopLeftRight)};
     };
     class GVAR(settingProgressBarLocation) {
+        category = CSTRING(DisplayName);
         value = 0;
         typeName = "SCALAR";
         force = 0;
@@ -55,6 +63,7 @@ class ACE_Settings {
         values[] = {ECSTRING(optionsmenu,Top), ECSTRING(optionsmenu,Bottom)};
     };
     class GVAR(displayTextColor) {
+        category = CSTRING(DisplayName);
         value[] = {0,0,0,0.1};
         typeName = "COLOR";
         isClientSettable = 1;
@@ -62,6 +71,7 @@ class ACE_Settings {
         description = CSTRING(SettingDisplayTextColorDesc);
     };
     class GVAR(displayTextFontColor) {
+        category = CSTRING(DisplayName);
         value[] = {1,1,1,1};
         typeName = "COLOR";
         isClientSettable = 1;

addons/common/stringtable.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Common">
+        <Key ID="STR_ACE_Common_DisplayName">
+            <English>Common</English>
+            <German>Allgemein</German>
+        </Key>
         <Key ID="STR_ACE_Common_ACETeam">
             <English>ACE-Team</English>
             <German>ACE-Team</German>
@@ -466,6 +470,15 @@
             <Chinese>拒絕由其他玩家送出的請求。包含使用/共享裝備與執行特定動作。</Chinese>
             <Chinesesimp>拒绝由其他玩家送出的请求。包含使用/共享装备与执行特定动作。</Chinesesimp>
         </Key>
+        <Key ID="STR_ACE_Common_CheckPBOsAction">
+            <English>Check PBO Action</English>
+        </Key>
+        <Key ID="STR_ACE_Common_CheckPBOsCheckAll">
+            <English>Check PBO All</English>
+        </Key>
+        <Key ID="STR_ACE_Common_CheckPBOsWhitelist">
+            <English>Check PBO Whitelist</English>
+        </Key>
         <Key ID="STR_ACE_Common_SettingFeedbackIconsName">
             <English>Feedback icons</English>
             <German>Rückmeldungssymbole</German>

addons/cookoff/ACE_Settings.hpp

@@ -1,24 +1,28 @@
 
 class ACE_Settings {
     class GVAR(enable) {
+        category = CSTRING(displayName);
         displayName = CSTRING(enable_name);
         description = CSTRING(enable_tooltip);
         value = 1;
         typeName = "BOOL";
     };
     class GVAR(enableAmmobox) {
+        category = CSTRING(displayName);
         displayName = CSTRING(enableBoxCookoff_name);
         description = CSTRING(enableBoxCookoff_tooltip);
         value = 1;
         typeName = "BOOL";
     };
     class GVAR(enableAmmoCookoff) { // For CBA Setting Switch: we can eliminate and just use (ammoCookoffDuration == 0)
+        category = CSTRING(displayName);
         displayName = CSTRING(enableAmmoCookoff_name);
         description = CSTRING(enableAmmoCookoff_tooltip);
         value = 1;
         typeName = "BOOL";
     };
     class GVAR(ammoCookoffDuration) {
+        category = CSTRING(displayName);
         displayName = CSTRING(ammoCookoffDuration_name);
         description = CSTRING(ammoCookoffDuration_tooltip);
         value = 1;

addons/cookoff/stringtable.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="CookOff">
+        <Key ID="STR_ACE_CookOff_displayName">
+            <English>Cook off</English>
+        </Key>
         <Key ID="STR_ACE_CookOff_enable_name">
             <English>Enable cook off</English>
             <German>Selbstzündung ermöglichen</German>

addons/explosives/ACE_Settings.hpp

@@ -1,17 +1,20 @@
 class ACE_Settings {
     class GVAR(requireSpecialist) {
+        category = CSTRING(Menu);
         displayName = CSTRING(RequireSpecialist_DisplayName);
         description = CSTRING(RequireSpecialist_Description);
         value = 0;
         typeName = "BOOL";
     };
     class GVAR(punishNonSpecialists) {
+        category = CSTRING(Menu);
         displayName = CSTRING(PunishNonSpecialists_DisplayName);
         description = CSTRING(PunishNonSpecialists_Description);
         value = 1;
         typeName = "BOOL";
     };
     class GVAR(explodeOnDefuse) {
+        category = CSTRING(Menu);
         displayName = CSTRING(ExplodeOnDefuse_DisplayName);
         description = CSTRING(ExplodeOnDefuse_Description);
         value = 1;

addons/finger/ACE_Settings.hpp

@@ -1,16 +1,19 @@
 class ACE_Settings {
     class GVAR(enabled) {
+        category = CSTRING(DisplayName);
         value = 0;
         typeName = "BOOL";
         displayName = CSTRING(enabled_displayName);
     };
     class GVAR(maxRange) {
+        category = CSTRING(DisplayName);
         value = 4;
         typeName = "SCALAR";
         displayName = CSTRING(maxRange_displayName);
         description = CSTRING(maxRange_description);
     };
     class GVAR(indicatorForSelf) {
+        category = CSTRING(DisplayName);
         value = 1;
         typeName = "BOOL";
         isClientSettable = 1;
@@ -18,6 +21,7 @@ class ACE_Settings {
         description = CSTRING(indicatorForSelf_description);
     };
     class GVAR(indicatorColor) {
+        category = CSTRING(DisplayName);
         value[] = {0.83, 0.68, 0.21, 0.75};
         typeName = "COLOR";
         isClientSettable = 1;

addons/finger/stringtable.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="finger">
+        <Key ID="STR_ACE_finger_DisplayName">
+            <English>Pointing</English>
+            <German>Fingerzeig</German>
+        </Key>
         <Key ID="STR_ACE_finger_indicatorForSelf_name">
             <English>Show pointing indicator to self</English>
             <German>Zeigersymbol einem selbst anzeigen</German>

addons/goggles/ACE_Settings.hpp

@@ -1,12 +1,14 @@
 
 class ACE_Settings {
     class GVAR(effects) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(effects_displayName);
         typeName = "SCALAR";
         value = 2;
         values[] = {ECSTRING(common,Disabled), CSTRING(effects_tintOnly), CSTRING(enabled_tintAndEffects)};
     };
     class GVAR(showInThirdPerson) {
+        category = CSTRING(DisplayName);
         value = 0;
         typeName = "BOOL";
         isClientSettable = 1;

addons/goggles/stringtable.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Goggles">
+        <Key ID="STR_ACE_Goggles_DisplayName">
+            <English>Goggles</English>
+            <German>Schutzbrille</German>
+        </Key>
         <Key ID="STR_ACE_Goggles_ShowInThirdPerson">
             <English>Show Goggle Effects in Third Person</English>
             <German>Brilleneffekt in dritter Person anzeigen</German>

addons/hitreactions/ACE_Settings.hpp

@@ -4,5 +4,6 @@ class ACE_Settings {
         //Minimum mamage needed to trigger falling down while moving. Set to -1 to disable completely.
         typeName = "SCALAR";
         value = 0.1;
+        displayName = CSTRING(minDamageToTrigger_displayName);
     };
 };

addons/hitreactions/stringtable.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="ACE">
+    <Package name="hitreactions">
+        <Key ID="STR_ACE_hitreactions_minDamageToTrigger_displayName">
+            <English>Min Damage to trigger falling</English>
+        </Key>
+    </Package>
+</Project>

addons/interaction/ACE_Settings.hpp

@@ -1,19 +1,21 @@
 
 class ACE_Settings {
     class GVAR(enableTeamManagement) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(EnableTeamManagement_DisplayName);
         description = CSTRING(EnableTeamManagement_Description);
         value = 1;
         typeName = "BOOL";
     };
     class GVAR(enableMagazinePassing) {
+        category = CSTRING(DisplayName);
         value = 1;
         typeName = "BOOL";
         isClientSettable = 1;
         displayName = CSTRING(PassMagazineSetting);
-        category = ECSTRING(interact_menu,Category_InteractionMenu);
     };
     class GVAR(disableNegativeRating) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(DisableNegativeRating_DisplayName);
         description = CSTRING(DisableNegativeRating_Description);
         value = 0;

addons/interaction/stringtable.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Interaction">
+        <Key ID="STR_ACE_Interaction_DisplayName">
+            <English>Interaction</English>
+            <German>Interaktion</German>
+        </Key>
         <Key ID="STR_ACE_Interaction_MainAction">
             <English>Interactions</English>
             <German>Interaktionen</German>

addons/laserpointer/ACE_Settings.hpp

@@ -1,5 +1,6 @@
 class ACE_Settings {
     class GVAR(enabled) {
+        displayName = CSTRING(DisplayName);
         typeName = "BOOL";
         value = 1;
     };

addons/laserpointer/stringtable.xml

@@ -1,6 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Laserpointer">
+        <Key ID="STR_ACE_Laserpointer_DisplayName">
+            <English>Laser Pointer</English>
+            <French>Pointeur laser</French>
+            <German>Laserpointer</German>
+            <Russian>Лазерный прицел</Russian>
+            <Czech>Laserové ukazovátko</Czech>
+            <Polish>Wskaźnik laserowy</Polish>
+            <Hungarian>Lézer-pointer</Hungarian>
+            <Spanish>Puntero láser</Spanish>
+            <Italian>Puntatore laser</Italian>
+            <Portuguese>Laser</Portuguese>
+            <Japanese>レーザ ポインタ</Japanese>
+            <Korean>레이저 지시기</Korean>
+            <Chinesesimp>雷射指示器</Chinesesimp>
+            <Chinese>雷射指示器</Chinese>
+        </Key>
         <Key ID="STR_ACE_Laserpointer_red">
             <English>Laser Pointer (red)</English>
             <French>Pointeur laser (rouge)</French>

addons/maptools/ACE_Settings.hpp

@@ -1,5 +1,6 @@
 class ACE_Settings {
     class GVAR(rotateModifierKey) {
+        category = CSTRING(Name);
         value = 1;
         typeName = "SCALAR";
         isClientSettable = 1;
@@ -8,6 +9,7 @@ class ACE_Settings {
         values[] = {"$STR_A3_OPTIONS_DISABLED", "ALT", "CTRL", "SHIFT"};
     };
     class GVAR(drawStraightLines) {
+        category = CSTRING(Name);
         value = 1;
         typeName = "BOOL";
         isClientSettable = 1;

addons/mk6mortar/ACE_Settings.hpp

@@ -1,6 +1,7 @@
 class ACE_Settings {
     //These settings effect gameplay difficutly:  defaults will leave the mortar the same as vanilla
     class GVAR(airResistanceEnabled) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(airResistanceEnabled_DisplayName);
         description = CSTRING(airResistanceEnabled_Description);
         value = 0;
@@ -8,6 +9,7 @@ class ACE_Settings {
         isClientSetable = 0;
     };
     class GVAR(allowComputerRangefinder) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(allowComputerRangefinder_DisplayName);
         description = CSTRING(allowComputerRangefinder_Description);
         value = 1;
@@ -15,6 +17,7 @@ class ACE_Settings {
         isClientSetable = 0;
     };
     class GVAR(allowCompass) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(allowCompass_DisplayName);
         description = CSTRING(allowCompass_Description);
         value = 1;
@@ -22,6 +25,7 @@ class ACE_Settings {
         isClientSetable = 0;
     };
     class GVAR(useAmmoHandling) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(useAmmoHandling_DisplayName);
         description = CSTRING(useAmmoHandling_Description);
         value = 0;

addons/mk6mortar/stringtable.xml

@@ -65,6 +65,10 @@
             <Chinesesimp>装药</Chinesesimp>
             <Chinese>裝藥</Chinese>
         </Key>
+        <Key ID="STR_ACE_Mk6Mortar_DisplayName">
+            <English>Mk6 Mortar</English>
+            <German>Mk6 Mörser</German>
+        </Key>
         <Key ID="STR_ACE_Mk6Mortar_Module_DisplayName">
             <English>Mk6 Settings</English>
             <Polish>Moździerz Mk6 - Ustawienia</Polish>

addons/overheating/ACE_Settings.hpp

@@ -1,5 +1,6 @@
 class ACE_Settings {
     class GVAR(displayTextOnJam) {
+        category = CSTRING(DisplayName);
         typeName = "BOOL";
         isClientSettable = 1;
         value = 1;
@@ -7,6 +8,7 @@ class ACE_Settings {
         description = CSTRING(DisplayTextOnJam_description);
     };
     class GVAR(showParticleEffects) {
+        category = CSTRING(DisplayName);
         typeName = "BOOL";
         isClientSettable = 1;
         value = 1;
@@ -14,6 +16,7 @@ class ACE_Settings {
         description = CSTRING(showParticleEffects_description);
     };
     class GVAR(showParticleEffectsForEveryone) {
+        category = CSTRING(DisplayName);
         typeName = "BOOL";
         isClientSettable = 1;
         value = 0;
@@ -21,24 +24,28 @@ class ACE_Settings {
         description = CSTRING(showParticleEffectsForEveryone_description);
     };
     class GVAR(overheatingDispersion) {
+        category = CSTRING(DisplayName);
         typeName = "BOOL";
         value = 1;
         displayName = CSTRING(overheatingDispersion_displayName);
         description = CSTRING(overheatingDispersion_description);
     };
     class GVAR(unJamOnreload) {
+        category = CSTRING(DisplayName);
         typeName = "BOOL";
         value = 0;
         displayName = CSTRING(unJamOnreload_displayName);
         description = CSTRING(unJamOnreload_description);
     };
     class GVAR(unJamFailChance) {
+        category = CSTRING(DisplayName);
         typeName = "SCALAR";
         value = 0.1;
         displayName = CSTRING(unJamFailChance_displayName);
         description = CSTRING(unJamFailChance_description);
     };
     class GVAR(enabled) {
+        category = CSTRING(DisplayName);
         typeName = "BOOL";
         value = 1;
         displayName = CSTRING(enabled_displayName);

addons/overheating/stringtable.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Overheating">
+        <Key ID="STR_ACE_Overheating_DisplayName">
+            <English>Overheating</English>
+            <German>Heißlaufen</German>
+        </Key>
         <Key ID="STR_ACE_Overheating_DisplayTextOnJam_displayName">
             <English>Display text on jam</English>
             <German>Zeige Text bei Ladehemmung</German>

addons/rearm/ACE_Settings.hpp

@@ -1,6 +1,6 @@
 class ACE_Settings {
     class GVAR(level) {
-        category = ECSTRING(OptionsMenu,CategoryLogistics);
+        category = CSTRING(DisplayName);
         displayName = CSTRING(RearmSettings_level_DisplayName);
         description = CSTRING(RearmSettings_level_Description);
         value = 0;
@@ -8,6 +8,7 @@ class ACE_Settings {
         values[] = {CSTRING(RearmSettings_vehicle), CSTRING(RearmSettings_magazine), CSTRING(RearmSettings_caliber)};
     };
     class GVAR(supply) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(RearmSettings_supply_DisplayName);
         description = CSTRING(RearmSettings_supply_Description);
         value = 0;

addons/rearm/stringtable.xml

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Rearm">
+        <Key ID="STR_ACE_Rearm_RearmSettings_DisplayName">
+            <English>Rearm</English>
+            <German>Aufmunitionierung</German>
+        </Key>
         <Key ID="STR_ACE_Rearm_RearmSettings_Module_DisplayName">
             <English>Rearm Settings</English>
             <German>Aufmunitioniereinstellungen</German>

addons/respawn/ACE_Settings.hpp

@@ -1,18 +1,22 @@
 
 class ACE_Settings {
     class GVAR(savePreDeathGear) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(SavePreDeathGear_DisplayName);
         description = CSTRING(SavePreDeathGear_Description);
         value = 0;
         typeName = "BOOL";
     };
     class GVAR(removeDeadBodiesDisconnected) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(RemoveDeadBodiesDisconnected_DisplayName);
         description = CSTRING(RemoveDeadBodiesDisconnected_Description);
         value = 1;
         typeName = "BOOL";
     };
     class GVAR(bodyRemoveTimer) {
+        category = CSTRING(DisplayName);
+        displayName = CSTRING(DeadBodyRemoveTimer);
         value = 0;
         typeName = "SCALAR";
     };

addons/respawn/stringtable.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Respawn">
+        <Key ID="STR_ACE_Respawn_DisplayName">
+            <English>Respawn</English>
+        </Key>
         <Key ID="STR_ACE_Respawn_Deploy">
             <English>Deploy in 5 seconds...</English>
             <French>Déploiement dans 5 secondes...</French>
@@ -273,6 +276,9 @@
             <Chinesesimp>要删除已离线的玩家尸体吗?</Chinesesimp>
             <Chinese>要刪除已離線的玩家屍體嗎?</Chinese>
         </Key>
+        <Key ID="STR_ACE_Respawn_DeadBodyRemoveTimer">
+            <English>Body remove timer</English>
+        </Key>
         <Key ID="STR_ACE_Respawn_Module_Description">
             <English>This module enables you to configure ACE functionality specific to respawns.</English>
             <Polish>Moduł ten pozwala dostosować ustawienia odrodzenia (respawnu).</Polish>

addons/spectator/ACE_Settings.hpp

@@ -1,11 +1,13 @@
 class ACE_Settings {
     class GVAR(enableAI) {
+        category = CSTRING(Module_DisplayName);
         displayName = CSTRING(ai_DisplayName);
         description = CSTRING(ai_Description);
         typeName = "BOOL";
         value = 0;
     };
     class GVAR(restrictModes) {
+        category = CSTRING(Module_DisplayName);
         displayName = CSTRING(modes_DisplayName);
         description = CSTRING(modes_Description);
         typeName = "SCALAR";
@@ -13,6 +15,7 @@ class ACE_Settings {
         values[] = {CSTRING(modes_all), CSTRING(modes_unit), "$STR_A3_Spectator_free_camera_tooltip", "$STR_A3_Spectator_1pp_camera_tooltip", "$STR_A3_Spectator_3pp_camera_tooltip"};
     };
     class GVAR(restrictVisions) {
+        category = CSTRING(Module_DisplayName);
         displayName = CSTRING(visions_DisplayName);
         description = CSTRING(visions_Description);
         typeName = "SCALAR";

addons/spectator/stringtable.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Spectator">
-        <Key ID="STR_ACE_Spectator_DisplayName">
+        <Key ID="STR_ACE_Spectator_Module_DisplayName">
+            <English>Spectator</English>
+            <German>Zuschauer</German>
+        </Key>
+        <Key ID="STR_ACE_Spectator_Settings_DisplayName">
             <English>ACE Spectator</English>
             <German>ACE Zuschauer</German>
             <Japanese>ACE スペクテイター</Japanese>
@@ -12,21 +16,6 @@
             <Polish>Obserwator ACE</Polish>
             <Korean>ACE 관전자</Korean>
         </Key>
-        <Key ID="STR_ACE_Spectator_Settings_DisplayName">
-            <English>Spectator Settings</English>
-            <German>Zuschauer-Einstellungen</German>
-            <Polish>Ustawienia obserwatora</Polish>
-            <Portuguese>Preferências de Espectador</Portuguese>
-            <Russian>Настройки спектатора</Russian>
-            <Czech>Nastavení pozorovatele</Czech>
-            <Spanish>Ajustes de espectador</Spanish>
-            <Italian>Impostazioni Spettatore</Italian>
-            <French>Réglages de spectateur</French>
-            <Japanese>スペクテイター設定</Japanese>
-            <Korean>관전자 설정</Korean>
-            <Chinesesimp>旁观者设定</Chinesesimp>
-            <Chinese>旁觀者設定</Chinese>
-        </Key>
         <Key ID="STR_ACE_Spectator_Settings_Description">
             <English>Configure how the spectator system will operate by default.</English>
             <German>Konfiguriert den Zuschauermodus</German>

addons/switchunits/ACE_Settings.hpp

@@ -1,46 +1,46 @@
 class ACE_Settings {
     class GVAR(enableSwitchUnits) {
-        category = CSTRING(Module_DisplayName);
+        category = CSTRING(DisplayName);
         value = 0;
         typeName = "BOOL";
     };
     class GVAR(switchToWest) {
-        category = CSTRING(Module_DisplayName);
+        category = CSTRING(DisplayName);
         displayName = CSTRING(SwitchToWest_DisplayName);
         description = CSTRING(SwitchToWest_Description);
         value = 0;
         typeName = "BOOL";
     };
     class GVAR(switchToEast) {
-        category = CSTRING(Module_DisplayName);
+        category = CSTRING(DisplayName);
         displayName = CSTRING(SwitchToEast_DisplayName);
         description = CSTRING(SwitchToEast_Description);
         value = 0;
         typeName = "BOOL";
     };
     class GVAR(switchToIndependent) {
-        category = CSTRING(Module_DisplayName);
+        category = CSTRING(DisplayName);
         displayName = CSTRING(SwitchToIndependent_DisplayName);
         description = CSTRING(SwitchToIndependent_Description);
         value = 0;
         typeName = "BOOL";
     };
     class GVAR(switchToCivilian) {
-        category = CSTRING(Module_DisplayName);
+        category = CSTRING(DisplayName);
         displayName = CSTRING(SwitchToCivilian_DisplayName);
         description = CSTRING(SwitchToCivilian_Description);
         value = 0;
         typeName = "BOOL";
     };
     class GVAR(enableSafeZone) {
-        category = CSTRING(Module_DisplayName);
+        category = CSTRING(DisplayName);
         displayName = CSTRING(EnableSafeZone_DisplayName);
         description = CSTRING(EnableSafeZone_Description);
         value = 1;
         typeName = "BOOL";
     };
     class GVAR(safeZoneRadius) {
-        category = CSTRING(Module_DisplayName);
+        category = CSTRING(DisplayName);
         displayName = CSTRING(SafeZoneRadius_DisplayName);
         description = CSTRING(SafeZoneRadius_Description);
         value = 100;

addons/switchunits/CfgVehicles.hpp

@@ -3,7 +3,7 @@ class CfgVehicles {
     class ACE_ModuleSwitchUnits: ACE_Module {
         author = ECSTRING(common,ACETeam);
         category = "ACE";
-        displayName = CSTRING(Module_DisplayName);
+        displayName = CSTRING(DisplayName);
         function = FUNC(module);
         scope = 1;
         isGlobal = 1;

addons/switchunits/stringtable.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="SwitchUnits">
+        <Key ID="STR_ACE_SwitchUnits_DisplayName">
+            <English>Switch Units</English>
+        </Key>
         <Key ID="STR_ACE_SwitchUnits_SwitchedUnit">
             <English>Switched unit</English>
             <German>Einheit gewechselt</German>
@@ -48,22 +51,6 @@
             <Chinesesimp>这单位太接近敌人了</Chinesesimp>
             <Chinese>這單位太接近敵人了</Chinese>
         </Key>
-        <Key ID="STR_ACE_SwitchUnits_Module_DisplayName">
-            <English>SwitchUnits System</English>
-            <Polish>System zmiany stron</Polish>
-            <Spanish>Sistema de cambio de unidad</Spanish>
-            <German>Einheiten-Wechsel-System</German>
-            <Czech>Systém výměny stran</Czech>
-            <Portuguese>Sistema de troca de unidades</Portuguese>
-            <French>Système de changement d'unité</French>
-            <Hungarian>Egységváltó-rendszer</Hungarian>
-            <Russian>Переключение между юнитами</Russian>
-            <Italian>Sistema Cambio Unità</Italian>
-            <Japanese>SwitchUnits システム</Japanese>
-            <Chinesesimp>切换单位系统</Chinesesimp>
-            <Chinese>切換單位系統</Chinese>
-            <Korean>인원 전환 시스템</Korean>
-        </Key>
         <Key ID="STR_ACE_SwitchUnits_SwitchToWest_DisplayName">
             <English>Switch to West?</English>
             <Polish>Zmiana na Zachód?</Polish>

addons/vehiclelock/ACE_Settings.hpp

@@ -1,17 +1,20 @@
 class ACE_Settings {
     class GVAR(defaultLockpickStrength) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(DefaultLockpickStrength_DisplayName);
         description = CSTRING(DefaultLockpickStrength_Description);
         value = 10;
         typeName = "SCALAR";
     };
     class GVAR(lockVehicleInventory) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(LockVehicleInventory_DisplayName);
         description = CSTRING(LockVehicleInventory_Description);
         value = 0;
         typeName = "BOOL";
     };
     class GVAR(vehicleStartingLockState) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(VehicleStartingLockState_DisplayName);
         description = CSTRING(VehicleStartingLockState_Description);
         value = -1;

addons/vehiclelock/stringtable.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="VehicleLock">
+        <Key ID="STR_ACE_VehicleLock_DisplayName">
+            <English>Vehicle Lock</English>
+        </Key>
         <Key ID="STR_ACE_VehicleLock_Action_UnLock">
             <English>Unlock Vehicle</English>
             <German>Fahrzeug aufschließen</German>

addons/zeus/ACE_Settings.hpp

@@ -1,29 +1,34 @@
 class ACE_Settings {
     class GVAR(zeusAscension) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(ascension_DisplayName);
         description = CSTRING(ascension_Description);
         typeName = "BOOL";
         value = 0;
     };
     class GVAR(zeusBird) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(bird_DisplayName);
         description = CSTRING(bird_Description);
         typeName = "BOOL";
         value = 0;
     };
     class GVAR(remoteWind) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(remoteWind_DisplayName);
         description = CSTRING(remoteWind_Description);
         typeName = "BOOL";
         value = 0;
     };
     class GVAR(radioOrdnance) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(radioOrdnance_DisplayName);
         description = CSTRING(radioOrdnance_Description);
         typeName = "BOOL";
         value = 0;
     };
     class GVAR(revealMines) {
+        category = CSTRING(DisplayName);
         displayName = CSTRING(revealMines_DisplayName);
         description = CSTRING(revealMines_Description);
         typeName = "SCALAR";
@@ -31,6 +36,7 @@ class ACE_Settings {
         values[] = {"$STR_A3_OPTIONS_DISABLED", CSTRING(revealMines_partial), CSTRING(revealMines_full)};
     };
     class GVAR(autoAddObjects) {
+        category = CSTRING(DisplayName);
         typeName = "BOOL";
         value = 0;
         displayName = CSTRING(AddObjectsToCurator);

addons/zeus/stringtable.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="Zeus">
+        <Key ID="STR_ACE_Zeus_DisplayName">
+            <English>Zeus</English>
+        </Key>
         <Key ID="STR_ACE_Zeus_Settings_DisplayName">
             <English>Zeus Settings</English>
             <Polish>Ustawienia Zeusa</Polish>