Move macros into a 'maxros' directory under core.

data/_main.cfg

@@ -1,6 +1,6 @@
 {themes/}
-{utils/}
-{misc/}
+{core/macros/}
+{core/}
 {hardwired/}		# Locations under here are wired into the C++
 {terrain-graphics/}
 {units.cfg}
@@ -91,7 +91,7 @@
 
     ellipsis_image="misc/icon-ellipsis.png"
 
-    {misc/team-colors.cfg}
+    {core/team-colors.cfg}
 
 [/game_config]
 

data/misc/english.cfg

@@ -1,56 +0,0 @@
-[language]
-EASY= _ "Easy"
-NORMAL= _ "Medium"
-HARD= _ "Hard"
-
-lawful_description= _ "Lawful units fight better during the day, and worse at night.
-
-Day: +25% Damage
-Night: -25% Damage"
-neutral_description= _ "Neutral units are unaffected by day and night, fighting equally well under both conditions."
-chaotic_description= _ "Chaotic units fight better at night, and worse during the day.
-
-Day: -25% Damage
-Night: +25% Damage"
-
-# Races
-elves= _ "Elves"
-humans= _ "Humans"
-orcs= _ "Orcs"
-undead= _ "race^Undead"
-dwarves= _ "race^Dwarves"
-goblins= _ "race^Goblins"
-lizards= _ "race^Lizards"
-mechanical= _ "race^Mechanical"
-mermen= _ "race^Mermen"
-monsters= _ "race^Monsters"
-nagas= _ "race^Nagas"
-ogres= _ "race^Ogres"
-trolls= _ "race^Trolls"
-woses= _ "race^Woses"
-
-#naming of terrain features
-bridge_name= _ "$name's Bridge,$name's Crossing"
-road_name= _ "$name's Highway,$name's Pass,Path of $name"
-river_name= _ "$name River,River $name"
-forest_name= _ "$name Forest,$name's Forest"
-lake_name= _ "$name Lake"
-village_name= _ "$name|bury,$name|ham,$name|ton"
-village_name_lake= _ "$name|harbor,$name|port"
-village_name_river= _ "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
-village_name_river_bridge= _ "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
-village_name_grassland= _ "$name|ham,$name|ton,$name|field"
-village_name_forest= _ "$name|ham,$name|ton,$name|wood,$name Forest"
-village_name_hill= _ "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
-village_name_mountain= _ "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
-
-#ranges
-range_melee= _ "melee"
-range_ranged= _ "ranged"
-
-#units.wesnoth.org
-wesnoth_unit_list= _ "Wesnoth unit list"
-based_on_version= _ "Based on version"
-race= _ "Race"
-advance_from= _ "Advance from:"
-[/language]