Fix 7 of approximately 90 unresolved-image references.

Some have FIXME comments that should be gone over by an art developer.

(Found by macroscope.)

data/campaigns/The_South_Guard/scenarios/5.Choice_In_The_Fog.cfg

@@ -528,7 +528,7 @@
 
 				[message]
 					description=Ethiliel
-					image=portraits/ethilile-mad.png
+					image=portraits/ethiliel-mad.png
 					message= _ "You will pay for taking Mebrin from us! If he is harmed..."
 				[/message]
 

data/campaigns/The_South_Guard/units/3.Dismounted_Commander.cfg

@@ -5,7 +5,8 @@
 	race=human
 	image=deoran/dismounted-commander.png
 	ellipse="misc/ellipse-leader"
-	image_leading=deoran/dismounted-commander-leading.png
+	#FIXME: There is supposed to be a leading image. There isn't.
+	#image_leading=deoran/dismounted-commander-leading.png
 	profile=portraits/deoran.png
 	hitpoints=60
 	alignment=lawful

data/campaigns/Under_the_Burning_Suns/scenarios/11_Island.cfg

@@ -1818,7 +1818,8 @@ name=sighted
 
 [message]
 	description=Trapped Merman
-	image="merman-triton.png"
+	# FIXME: This wants to be a portrait, not just a unit icon
+	image="units/merfolk/triton.png"
 	message= _ "Help me..."
 [/message]
 

data/campaigns/Under_the_Burning_Suns/scenarios/7_1_DwarfInterlude.cfg

@@ -813,7 +813,7 @@ first_time_only=no
 			[/filter]
 
 			id=FlamingSword
-			image=misc/item-flamesword.png
+			image=flame-sword.png
 			name= _ "Flaming Sword"
 			description= _ "This sword will make all your melee attacks do fire damage."
 

data/campaigns/Under_the_Burning_Suns/scenarios/7_2_TrollInterlude.cfg

@@ -812,7 +812,7 @@ first_time_only=no
 			[/filter]
 
 			id=FlamingSword
-			image=misc/item-flamesword.png
+			image=items/flame-sword.png
 			name= _ "Flaming Sword"
 			description= _ "This sword will make all your melee attacks do fire damage."
 

data/tools/macroscope

@@ -21,7 +21,7 @@
 # in the set of input trees.
 #
 # (3) A reference with embedded {}s in a macro will have the macro's
-# formal args subtituted in at WML evaluation time.  Instead, this
+# formal args substituted in at WML evaluation time.  Instead, this
 # tool treats each {} as a .* wildcard and considers the reference to
 # match *every* resource filename that matches that pattern.  Under
 # appropriate circumstances this might report a resource filename

data/units/Dwarvish_Fighter.cfg

@@ -7,7 +7,7 @@
 {MAGENTA_IS_THE_TEAM_COLOR}
 	ellipse="misc/ellipse"
 #ifdef CAMPAIGN_THE_RISE_OF_WESNOTH
-	profile=portraits/The_Rise_of_Wesnoth/burin.png
+	profile=portraits/burin.png
 #endif
 	hitpoints=38
 	movement_type=dwarvishfoot