Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Key conflicts in Polish localization #2138

Merged
merged 2 commits into from
Jul 22, 2023
Merged

Fix: Key conflicts in Polish localization #2138

merged 2 commits into from
Jul 22, 2023

Conversation

xezon
Copy link
Collaborator

@xezon xezon commented Jul 22, 2023

Merge with Rebase

This change fixes 77 key conflicts in Polish localization.

  • The Attack Move command can now be used with key A and no longer conflicts with several (O).
  • The Evacuate command can now be used with key V and no longer conflicts with Suicide Attack (J).
  • The Emergency Repair can now be placed with key E and no longer conflicts with Napalm Strike (N).
  • The Boss Aurora can now be produced with key B and no longer conflicts with Mig Armor (A).
  • The Boss Nuke Missile can now be constructed with key J and no longer conflicts with Particle Cannon (M).
  • The Boss Particle Cannon can now be launched with key C and no longer conflicts with Mines (M).
  • The Boss Avenger can now be produced with key J and no longer conflicts with Mines (M).
  • The Boss Combat Bike can now be produced with key Y and no longer conflicts with Tomahawk (T).
  • The China Cash Hack can now be placed with key C and no longer conflicts with Cluster Mines (K).
  • The China and USA Carpet Bomb can now be placed with key F and no longer conflicts with China Dozer (D).
  • The China Helix Nuke Bomb can now be researched with key N and no longer conflicts with Attack Move (A).
  • The GLA Marauder can now be produced with key M.
  • The GLA Rocket Buggy can now be produced with key B and no longer conflicts with Rally Point (R).
  • The GLA Scud Storm can now be constructed with key C and no longer conflicts with Stop (S).
  • The GLA Scud Storm can now be constructed with key C and no longer conflicts with Stop (S).
  • The GLA Buggy Ammo can now be researched with key B and no longer conflicts with Anthrax Beta (A).
  • The GLA Hijack can now be used with key P and no longer conflicts with Suicide Attack (J).
  • The GLA Fake Command Center can now be constructed with key Z and no longer conflicts with Stop (S).
  • The GLA Camo Netting can now be researched with key C and no longer conflicts with Stop (S).
  • The USA Search and Destroy plan can now be activated with key D and no longer conflicts with Stop (S).
  • The USA Ranger can now be produced with key G and no longer conflicts with Hacker (A).
  • The USA Raptor can now be produced with key T and no longer conflicts with Rally Point (R).
  • The USA Composite Armor can now be researched with key P and no longer conflicts with Intelligence (C).
  • The USA and GLA Timed Demo Charge can now be used with key C and no longer conflicts with Attack Move (A).
  • The USA EMP Patriot can now be constructed with key T and no longer conflicts with Stop (S).
  • The USA Stealth Comanche can now be researched with key S and no longer conflicts with Laser Missiles (L).

Issue log

GLAWorkerCommandSet has key conflict with
  Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Deszcz &SCUD-ów"
  STOP : "S"

GLAWorkerFakeBuildingsCommandSet has key conflict with
  Command_ConstructFakeGLACommandCenter : CONTROLBAR:ConstructFakeGLACommandCenter "Fałszywy &sztab"
  STOP : "S"

GLAVehicleBombTruckCommandSet has key conflict with
  Command_UpgradeGLABombTruckHighExplosiveBomb : CONTROLBAR:UpgradeGLABombTruckHighExplosiveBomb "B&omba krusząca"
  Command_AttackMove : CONTROLBAR:AttackMove "Ruch &ofensywny"

ChinaTankDragonCommandSet has key conflict with
  Command_ChinaDragonTankFireWall : CONTROLBAR:FireWall "Ściana &ogniowa"
  Command_AttackMove : CONTROLBAR:AttackMove "Ruch &ofensywny"

AmericaAirfieldCommandSet has key conflict with
  Command_ConstructAmericaJetRaptor : CONTROLBAR:ConstructAmericaJetRaptor "&Raptor"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

AmericaStrategyCenterCommandSet has key conflict with
  Command_CIAIntelligence : CONTROLBAR:CIAIntelligence "Wywiad &CIA"
  Command_UpgradeAmericaCompositeArmor : CONTROLBAR:UpgradeAmericaCompositeArmor "Pan&cerz kompozytowy"

AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Strategia wy&szukania i zniszczenia"
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stop"

ChinaCommandCenterCommandSet has key conflict with
  Command_ConstructChinaDozer : CONTROLBAR:ConstructChinaDozer "Bul&dożer"
  Early_Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Nalot &dywanowy"

ChinaCommandCenterCommandSet has key conflict with
  Command_NapalmStrike : CONTROLBAR:NapalmStrike "Nalot &napalmowy"
  Command_EmergencyRepair : CONTROLBAR:EmergencyRepair "&Naprawa pojazdów"

ChinaCommandCenterCommandSet has key conflict with
  Command_ClusterMines : CONTROLBAR:ClusterMines "Miny &kasetowe"
  Command_CashHack : CONTROLBAR:CashHack "e-&Kradzież pieniędzy"

ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_ConstructChinaDozer : CONTROLBAR:ConstructChinaDozer "Bul&dożer"
  Early_Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Nalot &dywanowy"

ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_NapalmStrike : CONTROLBAR:NapalmStrike "Nalot &napalmowy"
  Command_EmergencyRepair : CONTROLBAR:EmergencyRepair "&Naprawa pojazdów"

ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_ClusterMines : CONTROLBAR:ClusterMines "Miny &kasetowe"
  Command_CashHack : CONTROLBAR:CashHack "e-&Kradzież pieniędzy"

GLAArmsDealerCommandSet has key conflict with
  Command_ConstructGLAVehicleRocketBuggy : CONTROLBAR:ConstructGLAVehicleRocketBuggy "Pojazd &rakietowy"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

GLATunnelNetworkCommandSet has key conflict with
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "&Siatka maskująca"
  Command_Stop : CONTROLBAR:Stop "&Stop"

GLAStingerSiteCommandSet has key conflict with
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "&Siatka maskująca"
  Command_Stop : CONTROLBAR:Stop "&Stop"

GC_Chem_GLAWorkerCommandSet has key conflict with
  GC_Chem_Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Deszcz &SCUD-ów"
  STOP : "S"

GC_Slth_GLAWorkerCommandSet has key conflict with
  GC_Slth_Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Deszcz &SCUD-ów"
  STOP : "S"

GC_Slth_GLAArmsDealerCommandSet has key conflict with
  Command_ConstructGLAVehicleRocketBuggy : CONTROLBAR:ConstructGLAVehicleRocketBuggy "Pojazd &rakietowy"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

AirF_AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Strategia wy&szukania i zniszczenia"
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stop"

AirF_AmericaAirfieldCommandSet has key conflict with
  AirF_Command_UpgradeAmericaLaserMissiles : CONTROLBAR:UpgradeAmericaLaserMissiles "Pociski &laserowe"
  AirF_Command_UpgradeStealthComanche : CONTROLBAR:UpgradeStealthComanche "Niewykrywa&lność"

Demo_GLAWorkerCommandSet has key conflict with
  Demo_Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Deszcz &SCUD-ów"
  STOP : "S"

Demo_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Demo_Command_ConstructFakeGLACommandCenter : CONTROLBAR:ConstructFakeGLACommandCenter "Fałszywy &sztab"
  STOP : "S"

Demo_GLAArmsDealerCommandSet has key conflict with
  Demo_Command_ConstructGLAVehicleRocketBuggy : CONTROLBAR:ConstructGLAVehicleRocketBuggy "Pojazd &rakietowy"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

Demo_GLAVehicleBombTruckCommandSet has key conflict with
  Command_UpgradeGLABombTruckHighExplosiveBomb : CONTROLBAR:UpgradeGLABombTruckHighExplosiveBomb "B&omba krusząca"
  Command_AttackMove : CONTROLBAR:AttackMove "Ruch &ofensywny"

Demo_GLAVehicleTechnicalCommandSetUpgrade has key conflict with
  Command_EmptyCrawler : CONTROLBAR:Evacuate "Ewakuac&ja"
  Demo_Command_TertiarySuicide : CONTROLBAR:SuicideAttack "Detonu&j"

Demo_GLAWorkerCommandSetUpgrade has key conflict with
  Demo_Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Deszcz &SCUD-ów"
  STOP : "S"

Demo_GLAWorkerFakeBuildingsCommandSetUpgrade has key conflict with
  Demo_Command_ConstructFakeGLACommandCenter : CONTROLBAR:ConstructFakeGLACommandCenter "Fałszywy &sztab"
  STOP : "S"

Demo_GLAPalaceCommandSetUpgrade has key conflict with
  Command_Evacuate : CONTROLBAR:Evacuate "Ewakuac&ja"
  Demo_Command_TertiarySuicide : CONTROLBAR:SuicideAttack "Detonu&j"

Demo_GLATunnelNetworkCommandSetUpgrade has key conflict with
  Command_TunnelEvacuate : CONTROLBAR:Evacuate "Ewakuac&ja"
  Demo_Command_TertiarySuicide : CONTROLBAR:SuicideAttack "Detonu&j"

Demo_GLAArmsDealerCommandSetUpgrade has key conflict with
  Demo_Command_ConstructGLAVehicleRocketBuggy : CONTROLBAR:ConstructGLAVehicleRocketBuggy "Pojazd &rakietowy"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

Demo_GLAVehicleBombTruckCommandSetUpgrade has key conflict with
  Command_UpgradeGLABombTruckHighExplosiveBomb : CONTROLBAR:UpgradeGLABombTruckHighExplosiveBomb "B&omba krusząca"
  Command_AttackMove : CONTROLBAR:AttackMove "Ruch &ofensywny"

Demo_GLAInfantryHijackerCommandSetUpgrade has key conflict with
  Command_GLAInfantryHijack : CONTROLBAR:Hijack "Porwi&j"
  Demo_Command_TertiarySuicide : CONTROLBAR:SuicideAttack "Detonu&j"

Demo_GLAVehicleBattleBusCommandSetUpgrade has key conflict with
  Command_EmptyCrawler : CONTROLBAR:Evacuate "Ewakuac&ja"
  Demo_Command_TertiarySuicide : CONTROLBAR:SuicideAttack "Detonu&j"

Slth_GLAWorkerCommandSet has key conflict with
  Slth_Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Deszcz &SCUD-ów"
  STOP : "S"

Slth_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Slth_Command_ConstructFakeGLACommandCenter : CONTROLBAR:ConstructFakeGLACommandCenter "Fałszywy &sztab"
  STOP : "S"

Slth_GLAPalaceCommandSet has key conflict with
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "&Siatka maskująca"
  Command_Stop : CONTROLBAR:Stop "&Stop"

Slth_GLAScudStormCommandSet has key conflict with
  Command_ScudStorm : CONTROLBAR:ScudStorm "Deszcz &SCUD-ów"
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "&Siatka maskująca"

Slth_GLAArmsDealerCommandSet has key conflict with
  Slth_Command_ConstructGLAVehicleRocketBuggy : CONTROLBAR:ConstructGLAVehicleRocketBuggy "Pojazd &rakietowy"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

Slth_GLAVehicleBombTruckCommandSet has key conflict with
  Command_UpgradeGLABombTruckHighExplosiveBomb : CONTROLBAR:UpgradeGLABombTruckHighExplosiveBomb "B&omba krusząca"
  Command_AttackMove : CONTROLBAR:AttackMove "Ruch &ofensywny"

Chem_GLAWorkerCommandSet has key conflict with
  Chem_Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Deszcz &SCUD-ów"
  STOP : "S"

Chem_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Chem_Command_ConstructFakeGLACommandCenter : CONTROLBAR:ConstructFakeGLACommandCenter "Fałszywy &sztab"
  STOP : "S"

Chem_GLAArmsDealerCommandSet has key conflict with
  Chem_Command_ConstructGLAVehicleRocketBuggy : CONTROLBAR:ConstructGLAVehicleRocketBuggy "Pojazd &rakietowy"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

Nuke_ChinaCommandCenterCommandSet has key conflict with
  Command_NapalmStrike : CONTROLBAR:NapalmStrike "Nalot &napalmowy"
  Early_Command_EmergencyRepair : CONTROLBAR:EmergencyRepair "&Naprawa pojazdów"

Nuke_ChinaCommandCenterCommandSet has key conflict with
  Command_ClusterMines : CONTROLBAR:ClusterMines "Miny &kasetowe"
  Command_CashHack : CONTROLBAR:CashHack "e-&Kradzież pieniędzy"

Nuke_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_NapalmStrike : CONTROLBAR:NapalmStrike "Nalot &napalmowy"
  Early_Command_EmergencyRepair : CONTROLBAR:EmergencyRepair "&Naprawa pojazdów"

Nuke_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_ClusterMines : CONTROLBAR:ClusterMines "Miny &kasetowe"
  Command_CashHack : CONTROLBAR:CashHack "e-&Kradzież pieniędzy"

SupW_AmericaDozerCommandSet has key conflict with
  SupW_Command_ConstructAmericaPatriotBattery : CONTROLBAR:SupW_ConstructAmericaPatriotBattery "Sy&stem el-magn Patriot"
  STOP : "S"

SupW_AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Strategia wy&szukania i zniszczenia"
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stop"

SupW_AmericaAirfieldCommandSet has key conflict with
  SupW_Command_ConstructAmericaJetRaptor : CONTROLBAR:ConstructAmericaJetRaptor "&Raptor"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

Infa_ChinaCommandCenterCommandSet has key conflict with
  Infa_Command_ConstructChinaDozer : CONTROLBAR:ConstructChinaDozer "Bul&dożer"
  Early_Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Nalot &dywanowy"

Infa_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Infa_Command_ConstructChinaDozer : CONTROLBAR:ConstructChinaDozer "Bul&dożer"
  Early_Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Nalot &dywanowy"

Lazr_AmericaStrategyCenterCommandSet has key conflict with
  Command_CIAIntelligence : CONTROLBAR:CIAIntelligence "Wywiad &CIA"
  Command_UpgradeAmericaCompositeArmor : CONTROLBAR:UpgradeAmericaCompositeArmor "Pan&cerz kompozytowy"

Lazr_AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Strategia wy&szukania i zniszczenia"
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stop"

Lazr_AmericaAirfieldCommandSet has key conflict with
  Lazr_Command_ConstructAmericaJetRaptor : CONTROLBAR:ConstructAmericaJetRaptor "&Raptor"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

Tank_ChinaCommandCenterCommandSet has key conflict with
  Tank_Command_ConstructChinaDozer : CONTROLBAR:ConstructChinaDozer "Bul&dożer"
  Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Nalot &dywanowy"

Tank_ChinaCommandCenterCommandSet has key conflict with
  Command_ClusterMines : CONTROLBAR:ClusterMines "Miny &kasetowe"
  Command_CashHack : CONTROLBAR:CashHack "e-&Kradzież pieniędzy"

Tank_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Tank_Command_ConstructChinaDozer : CONTROLBAR:ConstructChinaDozer "Bul&dożer"
  Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Nalot &dywanowy"

Tank_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_ClusterMines : CONTROLBAR:ClusterMines "Miny &kasetowe"
  Command_CashHack : CONTROLBAR:CashHack "e-&Kradzież pieniędzy"

Boss_AmericaDozerCommandSet has key conflict with
  Boss_Command_ConstructChinaNuclearMissileLauncher : CONTROLBAR:ConstructChinaNuclearMissileLauncher "Rakieta ato&mowa"
  Boss_Command_ConstructAmericaParticleCannonUplink : CONTROLBAR:ConstructAmericaParticleCannonUplink "&Miotacz cząstek"

Boss_AmericaDozerCommandSet has key conflict with
  Boss_Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Deszcz &SCUD-ów"
  STOP : "S"

Boss_ChinaCommandCenterCommandSet has key conflict with
  Boss_Command_ConstructChinaDozer : CONTROLBAR:ConstructBossDozer "Bul&dożer"
  Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Nalot &dywanowy"

Boss_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Boss_Command_ConstructChinaDozer : CONTROLBAR:ConstructBossDozer "Bul&dożer"
  Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Nalot &dywanowy"

Boss_ChinaAirfieldCommandSet has key conflict with
  Boss_Command_ConstructAmericaJetAurora : CONTROLBAR:ConstructAmericaJetAurora "Bombowiec &Aurora"
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "P&ancerz MiG-a"

Boss_ChinaAirfieldCommandSetUpgrade has key conflict with
  Boss_Command_ConstructAmericaJetAurora : CONTROLBAR:ConstructAmericaJetAurora "Bombowiec &Aurora"
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "P&ancerz MiG-a"

Boss_ChinaBarracksCommandSet has key conflict with
  Boss_Command_ConstructAmericaInfantryRanger : CONTROLBAR:ConstructAmericaInfantryRanger "R&anger"
  Boss_Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "H&aker"

Boss_ChinaBarracksCommandSetUpgrade has key conflict with
  Boss_Command_ConstructAmericaInfantryRanger : CONTROLBAR:ConstructAmericaInfantryRanger "R&anger"
  Boss_Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "H&aker"

Boss_ChinaWarFactoryCommandSet has key conflict with
  Boss_Command_ConstructAmericaVehicleAvenger : CONTROLBAR:ConstructAmericaTankAvenger "&Mściciel"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "&Miny"

Boss_ChinaWarFactoryCommandSet has key conflict with
  Boss_Command_ConstructAmericaVehicleTomahawk : CONTROLBAR:ConstructAmericaVehicleTomahawk "&Tomahawk"
  Boss_Command_ConstructGLAVehicleCombatBikeTerrorist : CONTROLBAR:ConstructGLAVehicleCombatBike "Mo&tor bojowy"

Boss_ChinaWarFactoryCommandSet has key conflict with
  Boss_Command_ConstructGLAVehicleRocketBuggy : CONTROLBAR:ConstructGLAVehicleRocketBuggy "Pojazd &rakietowy"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

Boss_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Boss_Command_ConstructAmericaVehicleAvenger : CONTROLBAR:ConstructAmericaTankAvenger "&Mściciel"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Miny neutronowe"

Boss_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Boss_Command_ConstructAmericaVehicleTomahawk : CONTROLBAR:ConstructAmericaVehicleTomahawk "&Tomahawk"
  Boss_Command_ConstructGLAVehicleCombatBikeTerrorist : CONTROLBAR:ConstructGLAVehicleCombatBike "Mo&tor bojowy"

Boss_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Boss_Command_ConstructGLAVehicleRocketBuggy : CONTROLBAR:ConstructGLAVehicleRocketBuggy "Pojazd &rakietowy"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Punkt zbo&rny"

Boss_AmericaParticleUplinkCannonCommandSet has key conflict with
  Command_FireParticleUplinkCannon : CONTROLBAR:FireParticleUplinkCannon "Uruchomienie &Miotacza cząstek"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "&Miny"

Boss_AmericaParticleUplinkCannonCommandSetUpgrade has key conflict with
  Command_FireParticleUplinkCannon : CONTROLBAR:FireParticleUplinkCannon "Uruchomienie &Miotacza cząstek"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Miny neutronowe"

Boss_GLAScudStormCommandSet has key conflict with
  Command_UpgradeGLABuggyAmmo : CONTROLBAR:UpgradeGLABuggyAmmo "Zasobnik &amunicyjny"
  Command_UpgradeGLAAnthraxBeta : CONTROLBAR:UpgradeGLAAnthraxBeta "Wąglik bet&a"

Boss_GLAScudStormCommandSetUpgrade has key conflict with
  Command_UpgradeGLABuggyAmmo : CONTROLBAR:UpgradeGLABuggyAmmo "Zasobnik &amunicyjny"
  Command_UpgradeGLAAnthraxBeta : CONTROLBAR:UpgradeGLAAnthraxBeta "Wąglik bet&a"

@xezon xezon added Bug Something is not working right Major Severity: Minor < Major < Critical < Blocker USA Affects USA faction China Affects China faction GLA Affects GLA faction Text Is text, string, localization related Boss Affects Boss faction labels Jul 22, 2023
@xezon
Copy link
Collaborator Author

xezon commented Jul 22, 2023

Documentation added. Looks good.

@xezon xezon merged commit 2e52f0a into main Jul 22, 2023
xezon added a commit that referenced this pull request Jul 22, 2023
@xezon
Update ini documentation for Boss general key conflicts (#2138)
6d61e0e
@xezon xezon deleted the fix-key-conflict-polish branch July 22, 2023 11:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Boss Affects Boss faction Bug Something is not working right China Affects China faction GLA Affects GLA faction Major Severity: Minor < Major < Critical < Blocker Text Is text, string, localization related USA Affects USA faction
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@xezon