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 Brazilian localization #2136

Merged
merged 1 commit into from
Jul 22, 2023
Merged

Fix: Key conflicts in Brazilian localization #2136

merged 1 commit into from
Jul 22, 2023

Conversation

xezon
Copy link
Collaborator

@xezon xezon commented Jul 21, 2023

This change fixes 102 key conflicts in Brazilian localization.

  • The Stop command no longer triggers with keys P and S and will instead only trigger with key S.
  • The Boss Arm the Mob can now be researched with key O and no longer conflicts with Mines (M).
  • The Boss Gattling Tank can now be produced with key A and no longer conflicts with Avenger (G).
  • The Boss Burton can now be produced with key N and no longer conflicts with Black Lotus (B).
  • The Boss Nuke Missile can now be launched with key N and no longer conflicts with Patriot Missile (M).
  • The Boss Drone Armor can now be researched with key R and no longer conflicts with Sentry Drone Gun (N).
  • The Boss Nuke Missile can now be launched with key I and no longer conflicts with Neutron Shells (N).
  • The Boss Combat Bike can now be produced with key Y and no longer conflicts with Chain Guns (C).
  • The China Subliminal Messaging can now be researched with key B and no longer conflicts with Uranium Shells (U).
  • The China EMP Pulse can now be placed with key U and no longer conflicts with Rally Point (P).
  • The GLA Radar Van can now be produced with key F and no longer conflicts with Camo Netting (R).
  • The GLA Angry Mob can now be produced with key Y and no longer conflicts with Camo Netting (R).
  • The GLA Buggy Ammo can now be researched with key G and no longer conflicts with Mines (M).
  • The GLA Junk Repair can now be researched with key E and no longer conflicts with Camo Netting (R).
  • The GLA Snipe Attack can now be used with key N and no longer conflicts with Timed Demo Charge (T).
  • The GLA Bomb Truck suicide can now be used with key I and no longer conflicts with Attack Move (A).
  • The GLA Fake Barracks can now be constructed with key L and no longer conflicts with Select all Units (Q).
  • The GLA Sneak Attack can now be placed with key F and no longer conflicts with GLA Worker (T).
  • The GLA Bobby Trap can now be used with key B and no longer conflicts with Attack Move (A).
  • The GLA Toxin Tunnel can now be constructed with key I and no longer conflicts with Clear Mines (N).
  • The GLA Sabotage ability can now be used with key B and no longer conflicts with Select matching Units (E).
  • The USA Ranger can now be produced with key G and no longer conflicts with Hacker (A).
  • The USA Composite Armor can now be researched with key P and no longer conflicts with Intelligence (C).
  • The USA and China Paradrop can now be placed with key R and no longer conflicts with Rally Point (R).
  • The USA and China Carpet Bomb can now be placed with key G and no longer conflicts with Stop (S).
  • The USA Aurora Alpha can now be produced with key A and no longer conflicts with Bunker Buster (B).
  • The USA Leaflet can now be placed with key L and no longer conflicts with Spy Satellite (S).
  • The USA Combat Chinook can now be produced with key T and no longer conflicts with View Command Center (H).

Issue log

GLAWorkerFakeBuildingsCommandSet has key conflict with
  Command_ConstructFakeGLABarracks : CONTROLBAR:ConstructFakeGLABarracks "&Quartel Falso"
  SELECT_ALL : "Q"

GLAInfantryRebelCommandSet has key conflict with
  Command_GLAInfantryRebelBoobyTrapAttack : CONTROLBAR:BoobyTrapAttack "Ataque de &Armadilha Explosiva"
  Command_AttackMove : CONTROLBAR:AttackMove "Mover e &Atacar"

GLAInfantrySaboteurCommandSet has key conflict with
  Command_SabotageBuilding : CONTROLBAR:SabotageBuilding "Sabotar &Edifício"
  SELECT_MATCHING_UNITS : "E"

GLAVehicleBombTruckCommandSet has key conflict with
  Command_BombTruckDetonateNow : CONTROLBAR:DetonateBombTruck "Detonar &Agora!"
  Command_AttackMove : CONTROLBAR:AttackMove "Mover e &Atacar"

ChinaVehicleNukeCannonCommandSet has key conflict with
  Command_ChinaNeutronWarhead : CONTROLBAR:NeutronWarhead "Muniçõ&es de Nêutron"
  SELECT_MATCHING_UNITS : "E"

AmericaCommandCenterCommandSet has key conflict with
  Command_LeafletDrop : CONTROLBAR:LeafletDrop "&Soltar Folhetos"
  Command_SpySatelliteScan : CONTROLBAR:SpySatellite "&Satélite Espião"

AmericaCommandCenterCommandSet has key conflict with
  Command_Paradrop : CONTROLBAR:Paradrop "&Pára-Quedistas"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

AmericaStrategyCenterCommandSet has key conflict with
  Command_CIAIntelligence : CONTROLBAR:CIAIntelligence "Relatório de Inteligên&cia"
  Command_UpgradeAmericaCompositeArmor : CONTROLBAR:UpgradeAmericaCompositeArmor "Blindagem &Composta"

ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

ChinaNuclearMissileCommandSet has key conflict with
  Command_NeutronMissile : CONTROLBAR:NeutronMissile "Míssil &Nuclear"
  Command_UpgradeChinaNeutronShells : CONTROLBAR:UpgradeChinaNeutronShells "Munição de &Neutrônio"

ChinaNuclearMissileCommandSetUpgrade has key conflict with
  Command_NeutronMissile : CONTROLBAR:NeutronMissile "Míssil &Nuclear"
  Command_UpgradeChinaNeutronShells : CONTROLBAR:UpgradeChinaNeutronShells "Munição de &Neutrônio"

GLACommandCenterCommandSet has key conflict with
  Command_ConstructGLAWorker : CONTROLBAR:ConstructGLAWorker "&Trabalhador"
  Command_SneakAttack : CONTROLBAR:SneakAttack "A&taque Sorrateiro"

GLABarracksCommandSet has key conflict with
  Command_ConstructGLAInfantryAngryMob : CONTROLBAR:ConstructGLAInfantryAngryMob "Multidão &Revoltada"
  Command_UpgradeGLAInfantryRebelBoobyTrapAttack : CONTROLBAR:UpgradeGLABoobyTrap "A&rmadilha"

GC_Chem_GLAWorkerCommandSet has key conflict with
  GC_Chem_Command_ConstructGLATunnelNetwork : CONTROLBAR:Chem_ConstructGLATunnelNetwork "Rede de Toxi&na"
  Command_DisarmMinesAtPosition : CONTROLBAR:DisarmMinesAtPosition "Desarmar Mi&nas"

GC_Chem_GLACommandCenterCommandSet has key conflict with
  GC_Chem_Command_ConstructGLAWorker : CONTROLBAR:ConstructGLAWorker "&Trabalhador"
  Command_SneakAttack : CONTROLBAR:SneakAttack "A&taque Sorrateiro"

GC_Slth_GLACommandCenterCommandSet has key conflict with
  GC_Slth_Command_ConstructGLAWorker : CONTROLBAR:ConstructGLAWorker "&Trabalhador"
  Command_SneakAttack : CONTROLBAR:SneakAttack "A&taque Sorrateiro"

AirF_AmericaCommandCenterCommandSet has key conflict with
  Command_LeafletDrop : CONTROLBAR:LeafletDrop "&Soltar Folhetos"
  Command_SpySatelliteScan : CONTROLBAR:SpySatellite "&Satélite Espião"

AirF_AmericaCommandCenterCommandSet has key conflict with
  Command_Paradrop : CONTROLBAR:Paradrop "&Pára-Quedistas"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

AirF_AmericaSupplyCenterCommandSet has key conflict with
  AirF_Command_ConstructAFGChinook : CONTROLBAR:ConstructAmericaVehicleChinook "&Chinook"
  AirF_Command_ConstructAmericaVehicleChinook : CONTROLBAR:AirF_ConstructAmericaVehicleChinook "Chinook de &Combate"

Demo_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Demo_Command_ConstructFakeGLABarracks : CONTROLBAR:ConstructFakeGLABarracks "&Quartel Falso"
  SELECT_ALL : "Q"

Demo_GLACommandCenterCommandSet has key conflict with
  Demo_Command_ConstructGLAWorker : CONTROLBAR:ConstructGLAWorker "&Trabalhador"
  Command_SneakAttack : CONTROLBAR:SneakAttack "A&taque Sorrateiro"

Demo_GLAInfantryRebelCommandSet has key conflict with
  Command_GLAInfantryRebelBoobyTrapAttack : CONTROLBAR:BoobyTrapAttack "Ataque de &Armadilha Explosiva"
  Command_AttackMove : CONTROLBAR:AttackMove "Mover e &Atacar"

Demo_GLAInfantryJarmenKellCommandSet has key conflict with
  Command_GLAInfantryJarmenKellSnipeVehicleAttack : CONTROLBAR:SniperAttack "Eliminar &Tripulação"
  Demo_Command_KellTimedDemoCharge : CONTROLBAR:TimedDemoCharge "Plantar Carga c/ &Timer"

Demo_GLAVehicleBombTruckCommandSet has key conflict with
  Command_BombTruckDetonateNow : CONTROLBAR:DetonateBombTruck "Detonar &Agora!"
  Command_AttackMove : CONTROLBAR:AttackMove "Mover e &Atacar"

Demo_GLAWorkerFakeBuildingsCommandSetUpgrade has key conflict with
  Demo_Command_ConstructFakeGLABarracks : CONTROLBAR:ConstructFakeGLABarracks "&Quartel Falso"
  SELECT_ALL : "Q"

Demo_GLACommandCenterCommandSetUpgrade has key conflict with
  Demo_Command_ConstructGLAWorker : CONTROLBAR:ConstructGLAWorker "&Trabalhador"
  Command_SneakAttack : CONTROLBAR:SneakAttack "A&taque Sorrateiro"

Demo_GLAInfantryRebelCommandSetUpgrade has key conflict with
  Command_GLAInfantryRebelBoobyTrapAttack : CONTROLBAR:BoobyTrapAttack "Ataque de &Armadilha Explosiva"
  Command_AttackMove : CONTROLBAR:AttackMove "Mover e &Atacar"

Demo_GLAInfantryJarmenKellCommandSetUpgrade has key conflict with
  Command_GLAInfantryJarmenKellSnipeVehicleAttack : CONTROLBAR:SniperAttack "Eliminar &Tripulação"
  Demo_Command_KellTimedDemoCharge : CONTROLBAR:TimedDemoCharge "Plantar Carga c/ &Timer"

Demo_GLAVehicleBombTruckCommandSetUpgrade has key conflict with
  Command_BombTruckDetonateNow : CONTROLBAR:DetonateBombTruck "Detonar &Agora!"
  Command_AttackMove : CONTROLBAR:AttackMove "Mover e &Atacar"

Slth_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Slth_Command_ConstructFakeGLABarracks : CONTROLBAR:ConstructFakeGLABarracks "&Quartel Falso"
  SELECT_ALL : "Q"

Slth_GLACommandCenterCommandSet has key conflict with
  Slth_Command_ConstructGLAWorker : CONTROLBAR:ConstructGLAWorker "&Trabalhador"
  Command_SneakAttack : CONTROLBAR:SneakAttack "A&taque Sorrateiro"

Slth_GLABarracksCommandSet has key conflict with
  Slth_Command_ConstructGLAInfantryAngryMob : CONTROLBAR:ConstructGLAInfantryAngryMob "Multidão &Revoltada"
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "&Rede de Camuflagem"

Slth_GLABlackMarketCommandSet has key conflict with
  Command_UpgradeGLAJunkRepair : CONTROLBAR:UpgradeGLAJunkRepair "&Reparos de Combate"
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "&Rede de Camuflagem"

Slth_GLAArmsDealerCommandSet has key conflict with
  Slth_Command_ConstructGLAVehicleRadarVan : CONTROLBAR:ConstructGLAVehicleRadarVan "Furgão &Radar"
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "&Rede de Camuflagem"

Slth_GLAVehicleBombTruckCommandSet has key conflict with
  Command_BombTruckDetonateNow : CONTROLBAR:DetonateBombTruck "Detonar &Agora!"
  Command_AttackMove : CONTROLBAR:AttackMove "Mover e &Atacar"

Chem_GLAWorkerCommandSet has key conflict with
  Chem_Command_ConstructGLATunnelNetwork : CONTROLBAR:Chem_ConstructGLATunnelNetwork "Rede de Toxi&na"
  Command_DisarmMinesAtPosition : CONTROLBAR:DisarmMinesAtPosition "Desarmar Mi&nas"

Chem_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Chem_Command_ConstructFakeGLABarracks : CONTROLBAR:ConstructFakeGLABarracks "&Quartel Falso"
  SELECT_ALL : "Q"

Chem_GLAVehicleBombTruckCommandSet has key conflict with
  Command_BombTruckDetonateNow : CONTROLBAR:DetonateBombTruck "Detonar &Agora!"
  Command_AttackMove : CONTROLBAR:AttackMove "Mover e &Atacar"

Chem_GLACommandCenterCommandSet has key conflict with
  Chem_Command_ConstructGLAWorker : CONTROLBAR:ConstructGLAWorker "&Trabalhador"
  Command_SneakAttack : CONTROLBAR:SneakAttack "A&taque Sorrateiro"

Nuke_ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Nuke_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Nuke_ChinaNuclearMissileCommandSet has key conflict with
  Nuke_Command_NeutronMissile : CONTROLBAR:NeutronMissile "Míssil &Nuclear"
  Command_UpgradeChinaNeutronShells : CONTROLBAR:UpgradeChinaNeutronShells "Munição de &Neutrônio"

Nuke_ChinaNuclearMissileCommandSetUpgrade has key conflict with
  Nuke_Command_NeutronMissile : CONTROLBAR:NeutronMissile "Míssil &Nuclear"
  Command_UpgradeChinaNeutronShells : CONTROLBAR:UpgradeChinaNeutronShells "Munição de &Neutrônio"

SupW_AmericaCommandCenterCommandSet has key conflict with
  Early_Command_LeafletDrop : CONTROLBAR:LeafletDrop "&Soltar Folhetos"
  Command_SpySatelliteScan : CONTROLBAR:SpySatellite "&Satélite Espião"

SupW_AmericaCommandCenterCommandSet has key conflict with
  Command_Paradrop : CONTROLBAR:Paradrop "&Pára-Quedistas"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

SupW_AmericaAirfieldCommandSet has key conflict with
  SupW_Command_ConstructAmericaJetAurora : CONTROLBAR:ConstructAmericaJetFuelAirAurora "&Bombardeiro Aurora Alpha"
  Command_UpgradeAmericaBunkerBusters : CONTROLBAR:UpgradeAmericaBunkerBusters "Destruidores de &Bunker"

Infa_ChinaCommandCenterCommandSet has key conflict with
  Infa_Command_Paradrop : CONTROLBAR:Paradrop "&Pára-Quedistas"
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."

Infa_ChinaCommandCenterCommandSet has key conflict with
  Infa_Command_Paradrop : CONTROLBAR:Paradrop "&Pára-Quedistas"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Infa_ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Infa_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Infa_Command_Paradrop : CONTROLBAR:Paradrop "&Pára-Quedistas"
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."

Infa_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Infa_Command_Paradrop : CONTROLBAR:Paradrop "&Pára-Quedistas"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Infa_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Infa_ChinaNuclearMissileCommandSet has key conflict with
  Command_NeutronMissile : CONTROLBAR:NeutronMissile "Míssil &Nuclear"
  Command_UpgradeChinaNeutronShells : CONTROLBAR:UpgradeChinaNeutronShells "Munição de &Neutrônio"

Infa_ChinaNuclearMissileCommandSetUpgrade has key conflict with
  Command_NeutronMissile : CONTROLBAR:NeutronMissile "Míssil &Nuclear"
  Command_UpgradeChinaNeutronShells : CONTROLBAR:UpgradeChinaNeutronShells "Munição de &Neutrônio"

Lazr_AmericaCommandCenterCommandSet has key conflict with
  Command_LeafletDrop : CONTROLBAR:LeafletDrop "&Soltar Folhetos"
  Command_SpySatelliteScan : CONTROLBAR:SpySatellite "&Satélite Espião"

Lazr_AmericaCommandCenterCommandSet has key conflict with
  Command_Paradrop : CONTROLBAR:Paradrop "&Pára-Quedistas"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Lazr_AmericaStrategyCenterCommandSet has key conflict with
  Command_CIAIntelligence : CONTROLBAR:CIAIntelligence "Relatório de Inteligên&cia"
  Command_UpgradeAmericaCompositeArmor : CONTROLBAR:UpgradeAmericaCompositeArmor "Blindagem &Composta"

Tank_ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Tank_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Boss_AmericaDozerCommandSet has key conflict with
  Boss_Command_ConstructAmericaPatriotBattery : CONTROLBAR:ConstructAmericaPatriotBattery "Sistema de &Mísseis Patriot"
  Boss_Command_ConstructChinaNuclearMissileLauncher : CONTROLBAR:ConstructChinaNuclearMissileLauncher "&Míssil Nuclear"

Boss_ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

Boss_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "&Pulso E.M."
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "&Ponto de Encontro"

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

Boss_ChinaBarracksCommandSet has key conflict with
  Boss_Command_ConstructChinaInfantryBlackLotus : CONTROLBAR:ConstructChinaInfantryBlackLotus "&Black Lotus"
  Boss_Command_ConstructAmericaInfantryColonelBurton : CONTROLBAR:ConstructAmericaInfantryColonelBurton "Coronel &Burton"

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

Boss_ChinaBarracksCommandSetUpgrade has key conflict with
  Boss_Command_ConstructChinaInfantryBlackLotus : CONTROLBAR:ConstructChinaInfantryBlackLotus "&Black Lotus"
  Boss_Command_ConstructAmericaInfantryColonelBurton : CONTROLBAR:ConstructAmericaInfantryColonelBurton "Coronel &Burton"

Boss_ChinaWarFactoryCommandSet has key conflict with
  Boss_Command_ConstructAmericaVehicleAvenger : CONTROLBAR:ConstructAmericaTankAvenger "Vin&gador"
  Boss_Command_ConstructChinaTankGattling : CONTROLBAR:ConstructChinaTankGattling "Tanque &Gattling"

Boss_ChinaWarFactoryCommandSet has key conflict with
  Command_UpgradeChinaChainGuns : CONTROLBAR:UpgradeChinaChainGuns "&Correia de Balas"
  Boss_Command_ConstructGLAVehicleCombatBikeTerrorist : CONTROLBAR:ConstructGLAVehicleCombatBike "Moto de &Combate"

Boss_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Boss_Command_ConstructAmericaVehicleAvenger : CONTROLBAR:ConstructAmericaTankAvenger "Vin&gador"
  Boss_Command_ConstructChinaTankGattling : CONTROLBAR:ConstructChinaTankGattling "Tanque &Gattling"

Boss_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Command_UpgradeChinaChainGuns : CONTROLBAR:UpgradeChinaChainGuns "&Correia de Balas"
  Boss_Command_ConstructGLAVehicleCombatBikeTerrorist : CONTROLBAR:ConstructGLAVehicleCombatBike "Moto de &Combate"

Boss_AmericaParticleUplinkCannonCommandSet has key conflict with
  Command_UpgradeAmericaSentryDroneGun : CONTROLBAR:UpgradeAmericaSentryDroneGun "Arma do Drone Se&ntinela"
  Command_UpgradeAmericaDroneArmor : CONTROLBAR:UpgradeAmericaDroneArmor "Bli&ndagem Drone"

Boss_AmericaParticleUplinkCannonCommandSetUpgrade has key conflict with
  Command_UpgradeAmericaSentryDroneGun : CONTROLBAR:UpgradeAmericaSentryDroneGun "Arma do Drone Se&ntinela"
  Command_UpgradeAmericaDroneArmor : CONTROLBAR:UpgradeAmericaDroneArmor "Bli&ndagem Drone"

Boss_GLAScudStormCommandSet has key conflict with
  Command_UpgradeGLABuggyAmmo : CONTROLBAR:UpgradeGLABuggyAmmo "&Munição p/ Buggy"
  Command_UpgradeGLAArmTheMob : CONTROLBAR:UpgradeGLAArmTheMob "Armar a &Multidão"

Boss_GLAScudStormCommandSet has key conflict with
  Command_UpgradeGLABuggyAmmo : CONTROLBAR:UpgradeGLABuggyAmmo "&Munição p/ Buggy"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "Campo &Minado"

Boss_GLAScudStormCommandSet has key conflict with
  Command_UpgradeGLAArmTheMob : CONTROLBAR:UpgradeGLAArmTheMob "Armar a &Multidão"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "Campo &Minado"

Boss_GLAScudStormCommandSetUpgrade has key conflict with
  Command_UpgradeGLABuggyAmmo : CONTROLBAR:UpgradeGLABuggyAmmo "&Munição p/ Buggy"
  Command_UpgradeGLAArmTheMob : CONTROLBAR:UpgradeGLAArmTheMob "Armar a &Multidão"

Boss_GLAScudStormCommandSetUpgrade has key conflict with
  Command_UpgradeGLABuggyAmmo : CONTROLBAR:UpgradeGLABuggyAmmo "&Munição p/ Buggy"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Minas de Nêutron"

Boss_GLAScudStormCommandSetUpgrade has key conflict with
  Command_UpgradeGLAArmTheMob : CONTROLBAR:UpgradeGLAArmTheMob "Armar a &Multidão"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Minas de Nêutron"

Boss_ChinaNuclearMissileCommandSet has key conflict with
  Command_NeutronMissile : CONTROLBAR:NeutronMissile "Míssil &Nuclear"
  Boss_Command_UpgradeChinaNationalism : CONTROLBAR:UpgradeChinaNationalism "&Nacionalismo"

Boss_ChinaNuclearMissileCommandSet has key conflict with
  Command_UpgradeChinaSubliminalMessaging : CONTROLBAR:UpgradeChinaSubliminalMessaging "Mensagens S&ubliminares"
  Command_UpgradeChinaUraniumShells : CONTROLBAR:UpgradeChinaUraniumShells "M&unição Radioativa"

Boss_ChinaNuclearMissileCommandSetUpgrade has key conflict with
  Command_NeutronMissile : CONTROLBAR:NeutronMissile "Míssil &Nuclear"
  Boss_Command_UpgradeChinaNationalism : CONTROLBAR:UpgradeChinaNationalism "&Nacionalismo"

Boss_ChinaNuclearMissileCommandSetUpgrade has key conflict with
  Command_UpgradeChinaSubliminalMessaging : CONTROLBAR:UpgradeChinaSubliminalMessaging "Mensagens S&ubliminares"
  Command_UpgradeChinaUraniumShells : CONTROLBAR:UpgradeChinaUraniumShells "M&unição Radioativa"

@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 21, 2023
@xezon xezon force-pushed the fix-key-conflict-brazilian branch from da78416 to b7f0d19 Compare July 21, 2023 17:03
@xezon xezon force-pushed the fix-key-conflict-brazilian branch from b7f0d19 to a87f161 Compare July 21, 2023 17:09
@xezon
Copy link
Collaborator Author

xezon commented Jul 21, 2023

Documentation added.

@xezon
Copy link
Collaborator Author

xezon commented Jul 22, 2023

Looks good.

@xezon xezon merged commit 624b562 into main Jul 22, 2023
@xezon xezon deleted the fix-key-conflict-brazilian branch July 22, 2023 05:34
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