Merge pull request #7873 from penev92/bleed_raceToFaction

Replace old "country" and "race" name in the code with the generic "faction"
2015-08-23 17:49:40 +02:00
parent 60eea5a507 dec2696e76
commit bec209085b
36 changed files with 84 additions and 84 deletions
--- a/mods/cnc/chrome/dialogs.yaml
+++ b/mods/cnc/chrome/dialogs.yaml
@@ -26,7 +26,7 @@ ScrollPanel@LABEL_DROPDOWN_TEMPLATE:
 					Width: PARENT_RIGHT-20
 					Height: 25

-ScrollPanel@RACE_DROPDOWN_TEMPLATE:
+ScrollPanel@FACTION_DROPDOWN_TEMPLATE:
 	Width: DROPDOWN_WIDTH
 	Background: panel-black
 	Children:
--- a/mods/cnc/chrome/ingame-infostats.yaml
+++ b/mods/cnc/chrome/ingame-infostats.yaml
@@ -36,7 +36,7 @@ Container@SKIRMISH_STATS:
 					Height: 25
 					Text: Player
 					Font: Bold
-				Label@RACE:
+				Label@FACTION:
 					X: 150
 					Width: 80
 					Height: 25