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 French localization #2112

Merged
merged 1 commit into from
Jul 15, 2023
Merged

Fix: Key conflicts in French localization #2112

merged 1 commit into from
Jul 15, 2023

Conversation

xezon
Copy link
Collaborator

@xezon xezon commented Jul 15, 2023 •
edited
Loading

This change fixes 296 key conflicts in French localization.

  • Select all units can now be triggered with key Q and no longer conflicts with Attack Move (A).
  • The Boss Arm the Mob can now be researched with key R and no longer conflicts with China Mines (M).
  • The Boss Gattling Tank can now be produced with key A and no longer conflicts with Avenger (G).
  • The Boss Nuke Missile can now be placed with key I and no longer conflicts with Patriot Missile (M).
  • The Boss Composite Armor can now be researched with key C and no longer conflicts with Particle Cannon (P).
  • The Boss Nuke Missile can now be launched with key I and no longer conflicts with Mines (M).
  • The Boss Sneak Attack can now be placed with key F and no longer conflicts with Carpet Bomb (T).
  • The China Overlord can now be produced with key O and no longer conflicts with Paladin (P).
  • The China Inferno Cannon can now be produced with key P.
  • The China Black Lotus can now be produced with key L and no longer conflicts with Burton (N).
  • The China EMP Pulse can now be placed with key E and no longer conflicts with Mines (P).
  • The China Helix Nuke Bomb can now be researched with key N and no longer conflicts with Attack Move (A).
  • The China Infantry Outpost can now be produced with key S and no longer conflicts with Inferno Cannon (O).
  • The China Advanced Nuke Reactor can now be placed with key N and no longer conflicts with Barracks (R).
  • The GLA Scud Storm can now be placed with key L and no longer conflicts with Power Plant (U).
  • The GLA Radar Van Upgrade can now be researched with key A and no longer conflicts with Camo Netting (C).
  • The GLA Combat Bike can now be produced with key X and no longer conflicts with Camo Netting (C).
  • The GLA Quad Snipe can now be researched with key A and no longer conflicts with Select all Units (Q).
  • The GLA Booby Trap can now be placed with key M and no longer conflicts with Capture Building (P).
  • The GLA Advanced Demo Trap can now be placed with key G and no longer conflicts with Scatter Units (X).
  • The USA Search and Destroy plan can now be activated with key R and no longer conflicts with Stop (S).
  • The USA Raptor can now be produced with key T and no longer conflicts with Rally Point (R).
  • The USA & China Paradrop can now be placed with key P and no longer conflicts with Cluster Mines (I).
  • The USA & China Carpet Bomb can now be placed with key T and no longer conflicts with Stop (S).
  • The USA Spectre can now be placed with key C and no longer conflicts with Spy Satellite (S).
  • The USA Combat Chinook can now be produced with key T and no longer conflicts with Chinook (C).

Issue log

GenericCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaDozerCommandSet has key conflict with
  Command_ConstructAmericaWarFactory : CONTROLBAR:ConstructAmericaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

GLAWorkerCommandSet has key conflict with
  Command_ConstructGLAArmsDealer : CONTROLBAR:ConstructGLAArmsDealer "Trafiquant d'&armes"
  SELECT_ALL : "A"

GLAWorkerFakeBuildingsCommandSet has key conflict with
  Command_ConstructFakeGLAArmsDealer : CONTROLBAR:ConstructFakeGLAArmsDealer "Décor Trafiquant d'&armes"
  SELECT_ALL : "A"

ChinaDozerCommandSet has key conflict with
  Command_ConstructChinaWarFactory : CONTROLBAR:ConstructChinaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

AmericaInfantryRangerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaInfantryColonelBurtonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaInfantryCIAAgentCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaInfantryMissileDefenderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaInfantryPathfinderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaVehicleHumveeCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAInfantryRebelCommandSet has key conflict with
  Command_GLAInfantryRebelCaptureBuilding : CONTROLBAR:CaptureBuilding "&Prendre bâtiment"
  Command_GLAInfantryRebelBoobyTrapAttack : CONTROLBAR:BoobyTrapAttack "&Poser mines artisanales"

GLAInfantryRebelCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAInfantryTunnelDefenderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAInfantryAngryMobCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAInfantryJarmenKellCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaVehicleComancheCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaVehicleSentryDroneCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleRocketBuggyCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleCombatBikeDefaultCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleCombatBikeJarmenKellCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLATankScorpionCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleScudLauncherCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleQuadCannon has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleToxinTruckCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleBombTruckCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleBattleBusCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLAVehicleTechnicalCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaJetMIGCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaInfantryRedguardCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaVehicleECMTankCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaInfantryTankHunterCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaTroopCrawlerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaListeningOutpostCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaVehicleNukeCannonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaVehicleBattleMasterCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaVehicleGattlingTankCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaVehicleInfernoCannonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaTankDragonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaTankCrusaderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaTankPaladinCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaTankMicrowaveCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaTankAvengerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaVehicleAmbulanceCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaVehicleTomahawkCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaJetRaptorCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaJetAuroraCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaJetStealthFighterCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GLATankMarauderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaTankBattlemasterCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaTankOverlordDefaultCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaTankOverlordBattleBunkerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaTankOverlordGattlingCannonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaTankOverlordPropagandaTowerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaVehicleHelixCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaHelixGattlingCannonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaHelixPropagandaTowerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

ChinaHelixBattleBunkerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaCommandCenterCommandSet has key conflict with
  Command_SpectreGunship : CONTROLBAR:SpectreGunship "&Spectre"
  Command_SpySatelliteScan : CONTROLBAR:SpySatellite "&Satellite-espion"

AmericaCommandCenterCommandSet has key conflict with
  Command_A10ThunderboltMissileStrike : CONTROLBAR:A10ThunderboltMissileStrike "Bombardement &A10"
  SELECT_ALL : "A"

AmericaAirfieldCommandSet has key conflict with
  Command_ConstructAmericaJetRaptor : CONTROLBAR:ConstructAmericaJetRaptor "&Raptor"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Point de &ralliement"

AmericaAircraftCarrierCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AmericaWarFactoryCommandSet has key conflict with
  Command_ConstructAmericaVehicleMedic : CONTROLBAR:ConstructAmericaVehicleMedic "&Ambulance"
  SELECT_ALL : "A"

AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Plan : recherche et de&struction"
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stopper"

AmericaStrategyCenterCommandSet has key conflict with
  Command_UpgradeAmericaAdvancedTraining : CONTROLBAR:UpgradeAmericaAdvancedTraining "Techniques d'entr&aînement"
  SELECT_ALL : "A"

ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "Champ de &mines"

ChinaCommandCenterCommandSet has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Mines à neutrons"

ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

ChinaBarracksCommandSet has key conflict with
  Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "Technopir&ate"
  SELECT_ALL : "A"

ChinaBarracksCommandSetUpgrade has key conflict with
  Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "Technopir&ate"
  SELECT_ALL : "A"

ChinaWarFactoryCommandSet has key conflict with
  Command_ConstructChinaTankBattleMaster : CONTROLBAR:ConstructGLATankBattleMaster "M&aître de guerre"
  SELECT_ALL : "A"

ChinaWarFactoryCommandSetUpgrade has key conflict with
  Command_ConstructChinaTankBattleMaster : CONTROLBAR:ConstructGLATankBattleMaster "M&aître de guerre"
  SELECT_ALL : "A"

ChinaAirfieldCommandSet has key conflict with
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

ChinaAirfieldCommandSetUpgrade has key conflict with
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

GLACommandCenterCommandSet has key conflict with
  Command_Ambush : CONTROLBAR:Ambush "Embusc&ade"
  SELECT_ALL : "A"

GLAArmsDealerCommandSet has key conflict with
  Command_ConstructGLAVehicleToxinTruck : CONTROLBAR:ConstructGLAVehicleToxinTruck "Tr&acteur bactériologique"
  SELECT_ALL : "A"

GLAPalaceCommandSet has key conflict with
  Command_UpgradeGLAAnthraxBeta : CONTROLBAR:UpgradeGLAAnthraxBeta "Beta-&Anthrax"
  SELECT_ALL : "A"

CivilianCarBombCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GC_Chem_GLAWorkerCommandSet has key conflict with
  GC_Chem_Command_ConstructGLAArmsDealer : CONTROLBAR:ConstructGLAArmsDealer "Trafiquant d'&armes"
  SELECT_ALL : "A"

GC_Chem_GLACommandCenterCommandSet has key conflict with
  GC_Chem_Command_Ambush : CONTROLBAR:Ambush "Embusc&ade"
  SELECT_ALL : "A"

GC_Chem_GLAArmsDealerCommandSet has key conflict with
  GC_Chem_Command_ConstructGLAVehicleToxinTruck : CONTROLBAR:ConstructGLAVehicleToxinTruck "Tr&acteur bactériologique"
  SELECT_ALL : "A"

GC_Slth_GLAWorkerCommandSet has key conflict with
  GC_Slth_Command_ConstructGLAArmsDealer : CONTROLBAR:ConstructGLAArmsDealer "Trafiquant d'&armes"
  SELECT_ALL : "A"

GC_Slth_GLACommandCenterCommandSet has key conflict with
  Command_Ambush : CONTROLBAR:Ambush "Embusc&ade"
  SELECT_ALL : "A"

GC_Slth_GLAInfantryJarmenKellCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

GC_Slth_GLAVehicleBattleBusCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AirF_AmericaDozerCommandSet has key conflict with
  AirF_Command_ConstructAmericaWarFactory : CONTROLBAR:ConstructAmericaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

AirF_AmericaCommandCenterCommandSet has key conflict with
  AirF_Command_SpectreGunship : CONTROLBAR:SpectreGunship "&Spectre"
  Command_SpySatelliteScan : CONTROLBAR:SpySatellite "&Satellite-espion"

AirF_AmericaCommandCenterCommandSet has key conflict with
  AirF_Command_A10ThunderboltMissileStrike : CONTROLBAR:A10ThunderboltMissileStrike "Bombardement &A10"
  SELECT_ALL : "A"

AirF_AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Plan : recherche et de&struction"
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stopper"

AirF_AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Plan : recherche et de&struction"
  AirF_Command_CarpetBomb : CONTROLBAR:CarpetBomb "Tapi&s de bombes"

AirF_AmericaStrategyCenterCommandSet has key conflict with
  Command_UpgradeAmericaAdvancedTraining : CONTROLBAR:UpgradeAmericaAdvancedTraining "Techniques d'entr&aînement"
  SELECT_ALL : "A"

AirF_AmericaStrategyCenterCommandSet has key conflict with
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stopper"
  AirF_Command_CarpetBomb : CONTROLBAR:CarpetBomb "Tapi&s de bombes"

AirF_AmericaVehicleComancheCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

AirF_AmericaVehicleChinookCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

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

AirF_AmericaWarFactoryCommandSet has key conflict with
  AirF_Command_ConstructAmericaVehicleMedic : CONTROLBAR:ConstructAmericaVehicleMedic "&Ambulance"
  SELECT_ALL : "A"

AirF_AmericaInfantryMissileDefenderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAWorkerCommandSet has key conflict with
  Demo_Command_ConstructGLADemoTrap : CONTROLBAR:Demo_ConstructGLADemoTrap "Pièges e&xplosifs C-404"
  SCATTER : "X"

Demo_GLAWorkerCommandSet has key conflict with
  Demo_Command_ConstructGLAArmsDealer : CONTROLBAR:ConstructGLAArmsDealer "Trafiquant d'&armes"
  SELECT_ALL : "A"

Demo_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Demo_Command_ConstructFakeGLAArmsDealer : CONTROLBAR:ConstructFakeGLAArmsDealer "Décor Trafiquant d'&armes"
  SELECT_ALL : "A"

Demo_GLACommandCenterCommandSet has key conflict with
  Demo_Command_Ambush : CONTROLBAR:Ambush "Embusc&ade"
  SELECT_ALL : "A"

Demo_GLAArmsDealerCommandSet has key conflict with
  Demo_Command_ConstructGLAVehicleToxinTruck : CONTROLBAR:ConstructGLAVehicleToxinTruck "Tr&acteur bactériologique"
  SELECT_ALL : "A"

Demo_GLAInfantryRebelCommandSet has key conflict with
  Command_GLAInfantryRebelCaptureBuilding : CONTROLBAR:CaptureBuilding "&Prendre bâtiment"
  Command_GLAInfantryRebelBoobyTrapAttack : CONTROLBAR:BoobyTrapAttack "&Poser mines artisanales"

Demo_GLAInfantryRebelCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAInfantryTunnelDefenderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAInfantryAngryMobCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAInfantryJarmenKellCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleQuadCannon has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleBombTruckCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleBattleBusCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleScudLauncherCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleCombatBikeDefaultCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleCombatBikeJarmenKellCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLATankScorpionCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleRocketBuggyCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleToxinTruckCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleTechnicalCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLATankMarauderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLATankMarauderCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleTechnicalCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleToxinTruckCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleRocketBuggyCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLATankScorpionCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAWorkerCommandSetUpgrade has key conflict with
  Demo_Command_ConstructGLADemoTrap : CONTROLBAR:Demo_ConstructGLADemoTrap "Pièges e&xplosifs C-404"
  SCATTER : "X"

Demo_GLAWorkerCommandSetUpgrade has key conflict with
  Demo_Command_ConstructGLAArmsDealer : CONTROLBAR:ConstructGLAArmsDealer "Trafiquant d'&armes"
  SELECT_ALL : "A"

Demo_GLAWorkerFakeBuildingsCommandSetUpgrade has key conflict with
  Demo_Command_ConstructFakeGLAArmsDealer : CONTROLBAR:ConstructFakeGLAArmsDealer "Décor Trafiquant d'&armes"
  SELECT_ALL : "A"

Demo_GLACommandCenterCommandSetUpgrade has key conflict with
  Demo_Command_Ambush : CONTROLBAR:Ambush "Embusc&ade"
  SELECT_ALL : "A"

Demo_GLAArmsDealerCommandSetUpgrade has key conflict with
  Demo_Command_ConstructGLAVehicleToxinTruck : CONTROLBAR:ConstructGLAVehicleToxinTruck "Tr&acteur bactériologique"
  SELECT_ALL : "A"

Demo_GLAInfantryRebelCommandSetUpgrade has key conflict with
  Command_GLAInfantryRebelCaptureBuilding : CONTROLBAR:CaptureBuilding "&Prendre bâtiment"
  Command_GLAInfantryRebelBoobyTrapAttack : CONTROLBAR:BoobyTrapAttack "&Poser mines artisanales"

Demo_GLAInfantryRebelCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAInfantryTunnelDefenderCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAInfantryAngryMobCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAInfantryJarmenKellCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleQuadCannonUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleBombTruckCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleBattleBusCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleScudLauncherCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Demo_GLAVehicleCombatBikeDefaultCommandSetUpgrade has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Slth_GLAWorkerCommandSet has key conflict with
  Slth_Command_ConstructGLAArmsDealer : CONTROLBAR:ConstructGLAArmsDealer "Trafiquant d'&armes"
  SELECT_ALL : "A"

Slth_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Slth_Command_ConstructFakeGLAArmsDealer : CONTROLBAR:ConstructFakeGLAArmsDealer "Décor Trafiquant d'&armes"
  SELECT_ALL : "A"

Slth_GLACommandCenterCommandSet has key conflict with
  Command_Ambush : CONTROLBAR:Ambush "Embusc&ade"
  SELECT_ALL : "A"

Slth_GLAPalaceCommandSet has key conflict with
  Command_UpgradeGLAAnthraxBeta : CONTROLBAR:UpgradeGLAAnthraxBeta "Beta-&Anthrax"
  SELECT_ALL : "A"

Slth_GLABlackMarketCommandSet has key conflict with
  Command_UpgradeGLARadarVanScan : CONTROLBAR:UpgradeGLARadarVanScan "S&canner"
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "Filet de &camouflage"

Slth_GLAArmsDealerCommandSet has key conflict with
  Slth_Command_ConstructGLAVehicleToxinTruck : CONTROLBAR:ConstructGLAVehicleToxinTruck "Tr&acteur bactériologique"
  SELECT_ALL : "A"

Slth_GLAArmsDealerCommandSet has key conflict with
  Slth_Command_ConstructGLAVehicleCombatBike : CONTROLBAR:ConstructGLAVehicleCombatBike "Moto de &combat"
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "Filet de &camouflage"

Slth_GLAArmsDealerCommandSet has key conflict with
  Command_UpgradeGLACamoNetting : CONTROLBAR:UpgradeGLACamoNetting "Filet de &camouflage"
  Command_ConstructGLAVehicleCombatBikeTerrorist : CONTROLBAR:ConstructGLAVehicleCombatBike "Moto de &combat"

Slth_GLAInfantryRebelCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Slth_GLAInfantryTunnelDefenderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Slth_GLAInfantryAngryMobCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Slth_GLAInfantryJarmenKellCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Slth_GLAVehicleQuadCannon has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Slth_GLAVehicleBombTruckCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Slth_GLAVehicleBattleBusCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Slth_GLAVehicleScudLauncherCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Chem_GLAWorkerCommandSet has key conflict with
  Chem_Command_ConstructGLAArmsDealer : CONTROLBAR:ConstructGLAArmsDealer "Trafiquant d'&armes"
  SELECT_ALL : "A"

Chem_GLAWorkerFakeBuildingsCommandSet has key conflict with
  Chem_Command_ConstructFakeGLAArmsDealer : CONTROLBAR:ConstructFakeGLAArmsDealer "Décor Trafiquant d'&armes"
  SELECT_ALL : "A"

Chem_GLAVehicleBombTruckCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Chem_GLAVehicleScudLauncherCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Chem_GLACommandCenterCommandSet has key conflict with
  Chem_Command_Ambush : CONTROLBAR:Ambush "Embusc&ade"
  SELECT_ALL : "A"

Chem_GLAArmsDealerCommandSet has key conflict with
  Chem_Command_ConstructGLAVehicleToxinTruck : CONTROLBAR:ConstructGLAVehicleToxinTruck "Tr&acteur bactériologique"
  SELECT_ALL : "A"

Chem_GLAInfantryRebelCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Nuke_ChinaDozerCommandSet has key conflict with
  Nuke_Command_ConstructChinaPowerPlant : CONTROLBAR:Nuke_ConstructChinaPowerPlant "&Réacteur nucléaire de pointe"
  Nuke_Command_ConstructChinaBarracks : CONTROLBAR:ConstructChinaBarracks "Case&rne"

Nuke_ChinaDozerCommandSet has key conflict with
  Nuke_Command_ConstructChinaWarFactory : CONTROLBAR:ConstructChinaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

Nuke_ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "Champ de &mines"

Nuke_ChinaCommandCenterCommandSet has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

Nuke_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Mines à neutrons"

Nuke_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

Nuke_ChinaBarracksCommandSet has key conflict with
  Nuke_Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "Technopir&ate"
  SELECT_ALL : "A"

Nuke_ChinaBarracksCommandSetUpgrade has key conflict with
  Nuke_Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "Technopir&ate"
  SELECT_ALL : "A"

Nuke_ChinaInfantryMiniGunnerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Nuke_ChinaWarFactoryCommandSet has key conflict with
  Nuke_Command_ConstructChinaTankBattleMaster : CONTROLBAR:Nuke_ConstructChinaTankBattleMaster "M&aître de guerre nucléaire"
  SELECT_ALL : "A"

Nuke_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Nuke_Command_ConstructChinaTankBattleMaster : CONTROLBAR:Nuke_ConstructChinaTankBattleMaster "M&aître de guerre nucléaire"
  SELECT_ALL : "A"

Nuke_ChinaAirfieldCommandSet has key conflict with
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

Nuke_ChinaAirfieldCommandSetUpgrade has key conflict with
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

Nuke_ChinaVehicleHelixCommandSet has key conflict with
  Nuke_Command_UpgradeChinaHelixNukeBomb : CONTROLBAR:UpgradeHelixNukeBomb "Bombe &atomique"
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"

Nuke_ChinaVehicleHelixCommandSet has key conflict with
  Nuke_Command_UpgradeChinaHelixNukeBomb : CONTROLBAR:UpgradeHelixNukeBomb "Bombe &atomique"
  SELECT_ALL : "A"

Nuke_ChinaVehicleHelixCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Nuke_ChinaHelixGattlingCannonCommandSet has key conflict with
  Nuke_Command_UpgradeChinaHelixNukeBomb : CONTROLBAR:UpgradeHelixNukeBomb "Bombe &atomique"
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"

Nuke_ChinaHelixGattlingCannonCommandSet has key conflict with
  Nuke_Command_UpgradeChinaHelixNukeBomb : CONTROLBAR:UpgradeHelixNukeBomb "Bombe &atomique"
  SELECT_ALL : "A"

Nuke_ChinaHelixGattlingCannonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Nuke_ChinaHelixPropagandaTowerCommandSet has key conflict with
  Nuke_Command_UpgradeChinaHelixNukeBomb : CONTROLBAR:UpgradeHelixNukeBomb "Bombe &atomique"
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"

Nuke_ChinaHelixPropagandaTowerCommandSet has key conflict with
  Nuke_Command_UpgradeChinaHelixNukeBomb : CONTROLBAR:UpgradeHelixNukeBomb "Bombe &atomique"
  SELECT_ALL : "A"

Nuke_ChinaHelixPropagandaTowerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Nuke_ChinaHelixBattleBunkerCommandSet has key conflict with
  Nuke_Command_UpgradeChinaHelixNukeBomb : CONTROLBAR:UpgradeHelixNukeBomb "Bombe &atomique"
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"

Nuke_ChinaHelixBattleBunkerCommandSet has key conflict with
  Nuke_Command_UpgradeChinaHelixNukeBomb : CONTROLBAR:UpgradeHelixNukeBomb "Bombe &atomique"
  SELECT_ALL : "A"

Nuke_ChinaHelixBattleBunkerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Nuke_ChinaVehicleBattleMasterCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Nuke_ChinaListeningOutpostCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaDozerCommandSet has key conflict with
  SupW_Command_ConstructAmericaWarFactory : CONTROLBAR:ConstructAmericaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

SupW_AmericaCommandCenterCommandSet has key conflict with
  AirF_Command_SpectreGunship : CONTROLBAR:SpectreGunship "&Spectre"
  Command_SpySatelliteScan : CONTROLBAR:SpySatellite "&Satellite-espion"

SupW_AmericaCommandCenterCommandSet has key conflict with
  Command_A10ThunderboltMissileStrike : CONTROLBAR:A10ThunderboltMissileStrike "Bombardement &A10"
  SELECT_ALL : "A"

SupW_AmericaWarFactoryCommandSet has key conflict with
  SupW_Command_ConstructAmericaVehicleMedic : CONTROLBAR:ConstructAmericaVehicleMedic "&Ambulance"
  SELECT_ALL : "A"

SupW_AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Plan : recherche et de&struction"
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stopper"

SupW_AmericaStrategyCenterCommandSet has key conflict with
  Command_UpgradeAmericaAdvancedTraining : CONTROLBAR:UpgradeAmericaAdvancedTraining "Techniques d'entr&aînement"
  SELECT_ALL : "A"

SupW_AmericaVehicleComancheCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaAirfieldCommandSet has key conflict with
  SupW_Command_ConstructAmericaJetRaptor : CONTROLBAR:ConstructAmericaJetRaptor "&Raptor"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Point de &ralliement"

SupW_AmericaInfantryColonelBurtonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaInfantryMissileDefenderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaInfantryRangerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaTankCrusaderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaVehicleTomahawkCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaVehicleHumveeCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaTankMicrowaveCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaVehicleAmbulanceCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaTankAvengerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaJetAuroraCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

SupW_AmericaTankPaladinCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Infa_ChinaDozerCommandSet has key conflict with
  Infa_Command_ConstructChinaWarFactory : CONTROLBAR:ConstructChinaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

Infa_ChinaCommandCenterCommandSet has key conflict with
  Infa_Command_Paradrop : CONTROLBAR:Paradrop "Parachut&istes"
  Command_ClusterMines : CONTROLBAR:ClusterMines "Mines à fragmentat&ion"

Infa_ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "Champ de &mines"

Infa_ChinaCommandCenterCommandSet has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

Infa_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Infa_Command_Paradrop : CONTROLBAR:Paradrop "Parachut&istes"
  Command_ClusterMines : CONTROLBAR:ClusterMines "Mines à fragmentat&ion"

Infa_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Mines à neutrons"

Infa_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

Infa_ChinaBarracksCommandSet has key conflict with
  Infa_Command_ConstructChinaInfantryHacker : CONTROLBAR:Infa_ConstructChinaInfantryHacker "Super technopir&ate"
  SELECT_ALL : "A"

Infa_ChinaBarracksCommandSetUpgrade has key conflict with
  Infa_Command_ConstructChinaInfantryHacker : CONTROLBAR:Infa_ConstructChinaInfantryHacker "Super technopir&ate"
  SELECT_ALL : "A"

Infa_ChinaInfantryMiniGunnerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Infa_ChinaWarFactoryCommandSet has key conflict with
  Infa_Command_ConstructChinaVehicleTroopCrawler : CONTROLBAR:Infa_ConstructChinaVehicleTroopCrawler "Tr&ansporteur d'assaut"
  SELECT_ALL : "A"

Infa_ChinaWarFactoryCommandSet has key conflict with
  Infa_Command_ConstructChinaVehicleListeningOutpost : CONTROLBAR:Infa_ConstructChinaVehicleListeningOutpost "P&oste d'écoute amélioré"
  Infa_Command_ConstructChinaVehicleInfernoCannon : CONTROLBAR:ConstructChinaVehicleInfernoCannon "Napacan&on"

Infa_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Infa_Command_ConstructChinaVehicleTroopCrawler : CONTROLBAR:Infa_ConstructChinaVehicleTroopCrawler "Tr&ansporteur d'assaut"
  SELECT_ALL : "A"

Infa_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Infa_Command_ConstructChinaVehicleListeningOutpost : CONTROLBAR:Infa_ConstructChinaVehicleListeningOutpost "P&oste d'écoute amélioré"
  Infa_Command_ConstructChinaVehicleInfernoCannon : CONTROLBAR:ConstructChinaVehicleInfernoCannon "Napacan&on"

Infa_ChinaAirfieldCommandSet has key conflict with
  Infa_Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

Infa_ChinaAirfieldCommandSetUpgrade has key conflict with
  Infa_Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

Infa_ChinaTroopCrawlerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Infa_ChinaListeningOutpostCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Infa_ChinaVehicleHelixCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Infa_ChinaHelixBombCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaDozerCommandSet has key conflict with
  Lazr_Command_ConstructAmericaWarFactory : CONTROLBAR:ConstructAmericaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

Lazr_AmericaCommandCenterCommandSet has key conflict with
  Command_SpectreGunship : CONTROLBAR:SpectreGunship "&Spectre"
  Command_SpySatelliteScan : CONTROLBAR:SpySatellite "&Satellite-espion"

Lazr_AmericaCommandCenterCommandSet has key conflict with
  Command_A10ThunderboltMissileStrike : CONTROLBAR:A10ThunderboltMissileStrike "Bombardement &A10"
  SELECT_ALL : "A"

Lazr_AmericaStrategyCenterCommandSet has key conflict with
  Command_InitiateBattlePlanSearchAndDestroy : CONTROLBAR:InitiateBattlePlanSearchAndDestroy "Plan : recherche et de&struction"
  Command_StrategyCenter_Stop : CONTROLBAR:Stop "&Stopper"

Lazr_AmericaStrategyCenterCommandSet has key conflict with
  Command_UpgradeAmericaAdvancedTraining : CONTROLBAR:UpgradeAmericaAdvancedTraining "Techniques d'entr&aînement"
  SELECT_ALL : "A"

Lazr_AmericaWarFactoryCommandSet has key conflict with
  Lazr_Command_ConstructAmericaVehicleMedic : CONTROLBAR:ConstructAmericaVehicleMedic "&Ambulance"
  SELECT_ALL : "A"

Lazr_AmericaAirfieldCommandSet has key conflict with
  Lazr_Command_ConstructAmericaJetRaptor : CONTROLBAR:ConstructAmericaJetRaptor "&Raptor"
  Command_SetRallyPoint : CONTROLBAR:SetRallyPoint "Point de &ralliement"

Lazr_AmericaVehicleComancheCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaJetStealthFighterCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaInfantryRangerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaInfantryColonelBurtonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaTankAvengerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaTankCrusaderCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaVehicleHumveeCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaTankMicrowaveCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaVehicleAmbulanceCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaTankPaladinCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Lazr_AmericaVehicleSentryDroneCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Tank_ChinaDozerCommandSet has key conflict with
  Tank_Command_ConstructChinaWarFactory : CONTROLBAR:ConstructChinaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

Tank_ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "Champ de &mines"

Tank_ChinaCommandCenterCommandSet has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

Tank_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Mines à neutrons"

Tank_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

Tank_ChinaWarFactoryCommandSet has key conflict with
  Tank_Command_ConstructChinaTankBattleMaster : CONTROLBAR:ConstructGLATankBattleMaster "M&aître de guerre"
  SELECT_ALL : "A"

Tank_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Tank_Command_ConstructChinaTankBattleMaster : CONTROLBAR:ConstructGLATankBattleMaster "M&aître de guerre"
  SELECT_ALL : "A"

Tank_ChinaPropagandaCenterCommandSet has key conflict with
  Tank_Command_UpgradeChinaAutoLoader : CONTROLBAR:UpgradeChinaTankAutoLoader "Chargeur &auto"
  SELECT_ALL : "A"

Tank_ChinaPropagandaCenterCommandSetUpgrade has key conflict with
  Tank_Command_UpgradeChinaAutoLoader : CONTROLBAR:UpgradeChinaTankAutoLoader "Chargeur &auto"
  SELECT_ALL : "A"

Tank_ChinaVehicleBattleMasterCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Tank_ChinaTankOverlordGattlingCannonCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Tank_ChinaTankOverlordPropagandaTowerCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Tank_ChinaTankEmperorDefaultCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Tank_ChinaVehicleGattlingTankCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Tank_ChinaVehicleECMTankCommandSet has key conflict with
  Command_AttackMove : CONTROLBAR:AttackMove "&Attaquer"
  SELECT_ALL : "A"

Tank_ChinaBarracksCommandSet has key conflict with
  Tank_Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "Technopir&ate"
  SELECT_ALL : "A"

Tank_ChinaBarracksCommandSetUpgrade has key conflict with
  Tank_Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "Technopir&ate"
  SELECT_ALL : "A"

Tank_ChinaAirfieldCommandSet has key conflict with
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

Tank_ChinaAirfieldCommandSetUpgrade has key conflict with
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

Boss_AmericaDozerCommandSet has key conflict with
  Boss_Command_ConstructAmericaPowerPlant : CONTROLBAR:ConstructAmericaPowerPlant "Réacteur à f&usion froide"
  Boss_Command_ConstructGLAScudStorm : CONTROLBAR:ConstructGLAScudStorm "Scuds m&ultiples"

Boss_AmericaDozerCommandSet has key conflict with
  Boss_Command_ConstructAmericaPatriotBattery : CONTROLBAR:ConstructAmericaPatriotBattery "Systè&me défensif Patriot"
  Boss_Command_ConstructChinaNuclearMissileLauncher : CONTROLBAR:ConstructChinaNuclearMissileLauncher "&Missile nucléaire"

Boss_AmericaDozerCommandSet has key conflict with
  Boss_Command_ConstructChinaWarFactory : CONTROLBAR:ConstructChinaWarFactory "Complexe milit&aro-industriel"
  SELECT_ALL : "A"

Boss_ChinaCommandCenterCommandSet has key conflict with
  Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Tapi&s de bombes"
  Command_SpectreGunship : CONTROLBAR:SpectreGunship "&Spectre"

Boss_ChinaCommandCenterCommandSet has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "Champ de &mines"

Boss_ChinaCommandCenterCommandSet has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

Boss_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_ChinaCarpetBomb : CONTROLBAR:CarpetBomb "Tapi&s de bombes"
  Command_SpectreGunship : CONTROLBAR:SpectreGunship "&Spectre"

Boss_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_EMPPulse : CONTROLBAR:EMPPulse "Bo&mbe IEM"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Mines à neutrons"

Boss_ChinaCommandCenterCommandSetUpgrade has key conflict with
  Command_UpgradeChinaRadar : CONTROLBAR:UpgradeChinaRadar "R&adar"
  SELECT_ALL : "A"

Boss_ChinaAirfieldCommandSet has key conflict with
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

Boss_ChinaAirfieldCommandSetUpgrade has key conflict with
  Command_UpgradeChinaAircraftArmor : CONTROLBAR:UpgradeChinaAircraftArmor "Mig fusel&age renforcé"
  SELECT_ALL : "A"

Boss_ChinaBarracksCommandSet has key conflict with
  Boss_Command_ConstructChinaInfantryBlackLotus : CONTROLBAR:ConstructChinaInfantryBlackLotus "Lotus &Noir"
  Boss_Command_ConstructAmericaInfantryColonelBurton : CONTROLBAR:ConstructAmericaInfantryColonelBurton "Colonel Burto&n"

Boss_ChinaBarracksCommandSet has key conflict with
  Boss_Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "Technopir&ate"
  SELECT_ALL : "A"

Boss_ChinaBarracksCommandSetUpgrade has key conflict with
  Boss_Command_ConstructChinaInfantryBlackLotus : CONTROLBAR:ConstructChinaInfantryBlackLotus "Lotus &Noir"
  Boss_Command_ConstructAmericaInfantryColonelBurton : CONTROLBAR:ConstructAmericaInfantryColonelBurton "Colonel Burto&n"

Boss_ChinaBarracksCommandSetUpgrade has key conflict with
  Boss_Command_ConstructChinaInfantryHacker : CONTROLBAR:ConstructChinaInfantryHacker "Technopir&ate"
  SELECT_ALL : "A"

Boss_ChinaWarFactoryCommandSet has key conflict with
  Boss_Command_ConstructAmericaVehiclePaladin : CONTROLBAR:ConstructAmericaTankPaladin "&Paladin"
  Boss_Command_ConstructChinaTankOverlord : CONTROLBAR:ConstructChinaTankOverlord "Em&pereur"

Boss_ChinaWarFactoryCommandSet has key conflict with
  Boss_Command_ConstructAmericaVehicleAvenger : CONTROLBAR:ConstructAmericaTankAvenger "Ven&geur"
  Boss_Command_ConstructChinaTankGattling : CONTROLBAR:ConstructChinaTankGattling "Char &Gattling"

Boss_ChinaWarFactoryCommandSet has key conflict with
  Command_UpgradeChinaChainGuns : CONTROLBAR:UpgradeChinaChainGuns "&Cadences rapides"
  Boss_Command_ConstructGLAVehicleCombatBikeTerrorist : CONTROLBAR:ConstructGLAVehicleCombatBike "Moto de &combat"

Boss_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Boss_Command_ConstructAmericaVehiclePaladin : CONTROLBAR:ConstructAmericaTankPaladin "&Paladin"
  Boss_Command_ConstructChinaTankOverlord : CONTROLBAR:ConstructChinaTankOverlord "Em&pereur"

Boss_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Boss_Command_ConstructAmericaVehicleAvenger : CONTROLBAR:ConstructAmericaTankAvenger "Ven&geur"
  Boss_Command_ConstructChinaTankGattling : CONTROLBAR:ConstructChinaTankGattling "Char &Gattling"

Boss_ChinaWarFactoryCommandSetUpgrade has key conflict with
  Command_UpgradeChinaChainGuns : CONTROLBAR:UpgradeChinaChainGuns "&Cadences rapides"
  Boss_Command_ConstructGLAVehicleCombatBikeTerrorist : CONTROLBAR:ConstructGLAVehicleCombatBike "Moto de &combat"

Boss_AmericaParticleUplinkCannonCommandSet has key conflict with
  Command_FireParticleUplinkCannon : CONTROLBAR:FireParticleUplinkCannon "Canon à &particules"
  Command_UpgradeAmericaCompositeArmor : CONTROLBAR:UpgradeAmericaCompositeArmor "Blindage com&posite"

Boss_AmericaParticleUplinkCannonCommandSet has key conflict with
  Command_UpgradeAmericaAdvancedTraining : CONTROLBAR:UpgradeAmericaAdvancedTraining "Techniques d'entr&aînement"
  SELECT_ALL : "A"

Boss_AmericaParticleUplinkCannonCommandSetUpgrade has key conflict with
  Command_FireParticleUplinkCannon : CONTROLBAR:FireParticleUplinkCannon "Canon à &particules"
  Command_UpgradeAmericaCompositeArmor : CONTROLBAR:UpgradeAmericaCompositeArmor "Blindage com&posite"

Boss_AmericaParticleUplinkCannonCommandSetUpgrade has key conflict with
  Command_UpgradeAmericaAdvancedTraining : CONTROLBAR:UpgradeAmericaAdvancedTraining "Techniques d'entr&aînement"
  SELECT_ALL : "A"

Boss_GLAScudStormCommandSet has key conflict with
  Command_UpgradeGLAAnthraxBeta : CONTROLBAR:UpgradeGLAAnthraxBeta "Beta-&Anthrax"
  SELECT_ALL : "A"

Boss_GLAScudStormCommandSet has key conflict with
  Command_UpgradeGLAArmTheMob : CONTROLBAR:UpgradeGLAArmTheMob "Armer les é&meutiers"
  Command_UpgradeChinaMines : CONTROLBAR:UpgradeChinaMines "Champ de &mines"

Boss_GLAScudStormCommandSetUpgrade has key conflict with
  Command_UpgradeGLAAnthraxBeta : CONTROLBAR:UpgradeGLAAnthraxBeta "Beta-&Anthrax"
  SELECT_ALL : "A"

Boss_GLAScudStormCommandSetUpgrade has key conflict with
  Command_UpgradeGLAArmTheMob : CONTROLBAR:UpgradeGLAArmTheMob "Armer les é&meutiers"
  Command_UpgradeEMPMines : CONTROLBAR:UpgradeEMPMines "&Mines à neutrons"

Boss_ChinaNuclearMissileCommandSet has key conflict with
  Command_NeutronMissile : CONTROLBAR:NeutronMissile "Missile &nucléaire"
  Boss_Command_UpgradeChinaNationalism : CONTROLBAR:UpgradeChinaNationalism "&Nationalisme"

Boss_ChinaNuclearMissileCommandSetUpgrade has key conflict with
  Command_NeutronMissile : CONTROLBAR:NeutronMissile "Missile &nucléaire"
  Boss_Command_UpgradeChinaNationalism : CONTROLBAR:UpgradeChinaNationalism "&Nationalisme"

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

xezon commented Jul 15, 2023

Documentation added.

@xezon xezon force-pushed the fix-key-conflict-french branch 2 times, most recently from e6ffba0 to 62c0eab Compare July 15, 2023 11:56
@xezon
Copy link
Collaborator Author

xezon commented Jul 15, 2023

Errors in documentation fixed. Looks good.

@xezon xezon merged commit d3565f7 into main Jul 15, 2023
@xezon xezon deleted the fix-key-conflict-french branch July 15, 2023 12:08
@xezon xezon mentioned this pull request Jul 17, 2023
Merged
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 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