Remove the id= from the message tags

data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg

@@ -145,37 +145,30 @@
 
 		[message]
 		description="Kapou'e"
-		id=msg_orc5_1
 		message= _ "So here is Tirigaz."
 		[/message]
 		[message]
 		description="Pirk"
-		id=msg_orc5_2
 		message= _ "Looks like they are to be facing attack from pirates of the High Sea.  We should help them."
 		[/message]
 		[message]
 		description="Vraurk"
-		id=msg_orc5_3
 		message= _ "I propose that Gork, you and I call for reinforcements."
 		[/message]
 		[message]
 		description="Pirk"
-		id=msg_orc5_4
 		message= _ "Call for reinforcements?  Do you mean you don't want to fight for our brothers?  Are you a coward, Vraurk?"
 		[/message]
 		[message]
 		description="Vraurk"
-		id=msg_orc5_5
 		message= _ "Me?  I'll show you if I'm a coward!"
 		[/message]
 		[message]
 		description="Kapou'e"
-		id=msg_orc5_6
 		message= _ "It is not time for quarreling!  I'm to contain them, go find reinforcements."
 		[/message]
 		[message]
 		description="Gork"
-		id=msg_orc5_7
 		message= _ "This is a wise choice.  Good luck, son of the Black Eye."
 		[/message]
 		[kill]
@@ -189,7 +182,6 @@
 		[/kill]
 		[message]
 		description="Slowhand"
-		id=msg_orc5_8
 		message= _ "Haha!  Our plan is going well, let surround them on land while our allies attack them from sea!"
 		[/message]
 	[/event]
@@ -199,12 +191,10 @@
 	  {MOVE_TRANSPORT_GALEON 2 28 9 30 3,4,5,6,7,8,9 28,28,28,28,29,29,30}
 	  [message]
 		  description="Kapou'e"
-		  id=msg_orc5_9
 		  message= _ "We are attacked from both sides!  Grüü, hold them while I run to Tirigaz to find forces to counter attack.  Although we can't defeat those pirates without naval forces, we can wipe humans out of this region."
 	  [/message]
 	  [message]
 		  description="Grüü"
-		  id=msg_orc5_10
 		  message= _ "I love this strategy, chief!"
 	  [/message]
 	[/event]
@@ -273,7 +263,6 @@
 	  [/unit]
 	  [message]
 		  description="J'rem"
-		  id=msg_orc5_12
 		  message= _ "Pillage!  Let's plunder these orcs!"
 	  [/message]
 	[/event]
@@ -284,13 +273,11 @@
 		  description=Slowhand
 		  [/filter]
 		  [message]
-		    id=msg_orc5_22
 		    speaker=unit
 		    message= _ "Aaaargh!  I die!"
 		  [/message]
 		  [message]
 		    description="Kapou'e"
-		    id=msg_orc5_23
 		    message= _ "Finally you paid for all of what you did to my Orc brothers!"
 		  [/message]
 		  {ORCISH_SHAMAN 26 1 Pirk}
@@ -298,27 +285,22 @@
 		  {NOVICE_ORCISH_SHAMAN 28 1 Vraurk}
 		  [message]
 		    description=Gork
-		    id=msg_orc5_24
 		    message= _ "We're back! We have bad news, the humans are regrouping on our tails, we must leave."
 		  [/message]
 		  [message]
 		    description=Kapou'e
-		    id=msg_orc5_25
 		    message= _ "But where is the rest of the council?  We haven't made such a long journey to flee!"
 		  [/message]
 		  [message]
 		    description=Pirk
-		    id=msg_orc5_26
 		    message= _ "We had news from them, all of them fled to the East, near the Mourned Hills.  I think we should go for them as soon as possible and evacuate this city."
 		  [/message]
 		  [message]
 		    description=Kapou'e
-		    id=msg_orc5_27
 		    message= _ "But it is beyond the Desert of Death, which is full of poisonous giant scorpions and outlaws.  And bypassing it would take ages!  Not to mention after this desert, we'll have to cross the Silent Forest!"
 		  [/message]
 		  [message]
 		    description=Grüü
-		    id=msg_orc5_28
 		    message= _ "So we have no choice ... I've never tasted scorpions but sure, this journey promises to be fun."
 		  [/message]
 		  [kill]

data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg

@@ -213,79 +213,66 @@
       name=start
 
       [message]
-        id=msg_orc_11_1
 	speaker="Kapou'e"
 	message= _ "So here we are, they are preparing to assault."
       [/message]
 
       [message]
-        id=msg_orc_11_2
 	speaker="Grüü"
 	message= _ "Prestim's walls are rock hard, they' ll break clean off on them."
       [/message]
 
       [message]
-        id=msg_orc_11_3
 	speaker="Inarix"
 	message= _ "I'm not that sure.  Every fortress has its own weakness.  Prestim's wall are built on three towers.  If one of them is destroyed, a breach will allow humans to enter Prestim ... needless to say, this would be the end for us."
       [/message]
 
       [message]
-        id=msg_orc_11_4
 	speaker="Kapou'e"
 	message= _ "I've received messengers from the Council, saying that they are regrouping tribes into the Great Horde."
       [/message]
 
       [message]
-        id=msg_orc_11_5
 	speaker="Grüü"
 	message= _ "Great!  When do they arrive?"
       [/message]
 
       [message]
-        id=msg_orc_11_6
 	speaker="Kapou'e"
 	message= _ "In four days minimum.  I fear it will be too late."
       [/message]
 
       [message]
-        id=msg_orc_11_7
 	speaker="Inarix"
 	message= _ "I don't think so, there is still a way..."
       [/message]
 
       [message]
-        id=msg_orc_11_8
 	speaker="Kapou'e"
 	message= _ "Which one?"
       [/message]
 
       [message]
-        id=msg_orc_11_9
 	speaker="Inarix"
 	message= _ "Most of forces will cross the river by the ford where the bridge where previously.  If we manage to defend it, we might still have a chance."
       [/message]
 
       [message]
-        id=msg_orc_11_10
 	speaker="Kapou'e"
 	message= _ "And if we fail?"
       [/message]
 
       [message]
-        id=msg_orc_11_11
 	speaker="Inarix"
 	message= _ "Then they will assault Prestim at five versus one.  We'll just have to pray to Mother earth."
       [/message]
 
       [message]
-        id=msg_orc_11_12
 	speaker="Kapou'e"
 	message= _ "Great."
       [/message]
 
       [message]
-        id=msg_orc_11_13
 	speaker="narrator"
 	message= _ "Then, the battle for Prestim began."
       [/message]
@@ -305,7 +292,6 @@
       {MERMAN 16 12 Glou}
       {MERMAN 16 12 Glorg}
       [message]
-        id=msg_orc_11_14
 	speaker="Plouf"
 	message= _ "We arrive to honor our alliance, Earl Lanbec'h."
       [/message]
@@ -400,13 +386,11 @@
       {NOVICE_ORCISH_SHAMAN 38 1 Vraurk}
 
       [message]
-        id=msg_orc_11_20
 	speaker="Gork"
 	message= _ "Here we are!  Hold on Prestim, we arrive to push them to the river!"
       [/message]
 
       [message]
-        id=msg_orc_11_21
 	speaker="Earl Lanbec'h"
 	message= _ "They are too numerous now, RETREAT !"
       [/message]
@@ -429,25 +413,21 @@
       [/kill]
 
       [message]
-        id=msg_orc_11_21a
 	speaker="Kapou'e"
 	message= _ "The Great Horde at last!  I was beginning to think they would never come."
       [/message]
 
       [message]
-        id=msg_orc_11_22
 	speaker="Gork"
 	message= _ "The defense of Prestim you've done is heroic, facing such opposition surely undermined morale of humans.  Now they are retreating to their fortresses and won't get out of them."
       [/message]
 
       [message]
-        id=msg_orc_11_23
 	speaker="Pirk"
 	message= _ "It is now time to show them who we are and to lead the Great Horde to their tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
       [/message]
 
       [message]
-        id=msg_orc_11_24
 	speaker="Kapou'e"
 	caption="End of chapter I"
 	message= _ "Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great Horde'."
@@ -465,7 +445,6 @@
         type=Watch_Tower
       [/filter]
       [message]
-	id=orc_death_tower
 	speaker=Kapou'e
 	message= _ "No!  The walls of Prestim are destroyed, we are done!"
       [/message]

data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg

@@ -129,32 +129,26 @@
 
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc6_1
 		  message= _ "It's been two days since we entered this desert.  I have never been so hot and we have nearly finished our food."
 		[/message]
 		[message]
 		  description="Grüü"
-		  id=msg_orc6_2
 		  message= _ "I'm hungry and we found no giant scorpion yet.  I'm sure it would be delicious."
 		[/message]
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc6_3
 		  message= _ "I hope we won't find one!  They are terrible armored beasts and your troll clubs are useless against their heavy shells."
 		[/message]
 		[message]
 		  description="Vraurk"
-		  id=msg_orc6_4
 		  message= _ "I've been told the best way to defeat them is to attack their eyes with sharp blades.  But I hope too we won't meet them."
 		[/message]
 		[message]
 		  description="Pirk"
-		  id=msg_orc6_5
 		  message= _ "The sun is rising, we should resume our journey and find this oasis mentioned on the map before the sun gets high."
 		[/message]
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc6_6
 		  message= _ "Stay alert!  This oasis is known to be a den of outlaws and desert pillagers."
 		[/message]
 
@@ -180,7 +174,6 @@
 	name=victory
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc6_10
 		  message= _ "We've done it!  Now we need some rest, before we continue our journey."
 		[/message]
 	[/event]

data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg

@@ -107,17 +107,14 @@
 	[event]
 	name=start
 		[message]
-		id=msg_orc1_1
 		description=Albert
 		message= _ "Look, companions!  Those orcs don't imagine they are living their last day.  Let's slay all of them and give this land back to our people!"
 		[/message]
 		[message]
-		id=msg_orc1_2
 		description=Kapou'e
 		message= _ "We are attacked by these humans!  Hurry up, we must defend our fathers' land!"
 		[/message]
 		[message]
-		id=msg_orc1_3
 		speaker=narrator
 		message= _ "The battle begun."
 		[/message]
@@ -129,41 +126,34 @@
 		description=Albert
 		[/filter]
 		[message]
-		id=msg_orc1_10
 		speaker=unit
 		message= _ "Argh!  I die!  But other humans will go and slay you, filthy orcs!"
 		[/message]
 		[role]
 		role=second
-    		type=Orcish Warlord, Orcish Warrior, Goblin Knight, Goblin Pillager, Orcish Grunt, Orcish Archer, Wolf Rider
+		type=Orcish Warlord, Orcish Warrior, Goblin Knight, Goblin Pillager, Orcish Grunt, Orcish Archer, Wolf Rider
-    		[/role]
+		[/role]
 		[message]
-		id=msg_orc1_11
 		role=second
 		message= _ "Hurrah!  Victory!"
 		[/message]
 		[message]
-		id=msg_orc1_12
 		description=Kapou'e
 		message= _ "We are victorious this time, but humans are organizing themselves in a huge army.  We have just defeated a vanguard, they are coming massively."
 		[/message]
 		[message]
-		id=msg_orc1_13
 		role=second
 		message= _ "What should be do, chief?"
 		[/message]
 		[message]
-		id=msg_orc1_14
 		description=Kapou'e
 		message= _ "We must lead my people to a safe place and pledge the Great Council for assistance.  Some of them live in Barag Gor in the lands of the free tribes.  We must leave, now!"
 		[/message]
 		[message]
-		id=msg_orc1_15
 		role=second
 		message= _ "But the free tribes are beyond the Mountains of Haag.  These moutains are infested of dwarves and wild trolls."
 		[/message]
 		[message]
-		id=msg_orc1_16
 		description=Kapou'e
 		message= _ "We have no choice, we shall pass.  The trolls have been our allies in the past--maybe they can help us.  Hurry up, we must leave now."
 		[/message]

data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg

@@ -219,42 +219,34 @@
       name=start
       [message]
 	description="Plonk"
-	id=msg_orc_10_1
 	message= _ "Reinforcements, at least!  Whoever you are, you are welcome in Prestim!  The fortified bridge over the Gork river has been taken this morning by a small commando of elves, we already tried to assault it twice without success."
       [/message]
       [message]
 	description="Grüü"
-	id=msg_orc_10_2
 	message= _ "Ah!  They are no match against my mace."
       [/message]
       [message]
 	description="Plonk"
-	id=msg_orc_10_3
 	message= _ "There is worse, our scouts reported that our saurians allies led by Inarix are still blocked on the other side of the river some miles away. They won't be able to cross the river."
       [/message]
       [message]
 	description="Plonk"
-	id=msg_orc_10_4
 	message= _ "Elves and dwarves have joined humans against us and are camping near.  Humans will arrive soon.  We must destroy the southern bridge on the river."
       [/message]
       [message]
 	description="Kapou'e"
-	id=msg_orc_10_5
 	message= _ "We must do something!"
       [/message]
       [message]
 	description="Grüü"
-	id=msg_orc_10_6
 	message= _ "I know what we must do.  Kill elves and help Inarix cross."
       [/message]
       [message]
 	description="Plonk"
-	id=msg_orc_10_7
 	message= _ "It won't be that easy!  Our enemies are well entrenchered.  And don't forget, we will sabotage the southern bridge as soon as the bulk of Saurians army will have crossed!"
       [/message]
       [message]
 	description="Plonk"
-	id=msg_orc_10_8
 	message= _ "Each warrior trapped on the bridge or on the other side of the river will perish!"
       [/message]
       [set_variable]
@@ -277,7 +269,6 @@
       {SAURIAN 8 42 Stelianx}
       [message]
 	description="Inarix"
-	id=msg_orc10_10
 	message= _ "Here we are, my friends.  Earl Lanbec'h and his kind is on our tails, we must hurry up."
       [/message]
     [/event]
@@ -307,7 +298,6 @@
 	[then]
 	  [message]
 	    description="Kapou'e"
-	    id=msg_orc10_20
 	    message= _ "Hurry up!  The southern bridge is going to explode! Retreat! "
 	  [/message]
 	  [set_variable]
@@ -339,7 +329,6 @@
 	  [then]
 	    [message]
 	      description="Kapou'e"
-	      id=msg_orc10_31
 	      message= _ "We've had too much casualties to be able to resist to humans, we have no choice but surrender."
 	    [/message]
 	    [endlevel]
@@ -354,12 +343,10 @@
       name=turn 8
       [message]
         description=Mkel
-	id=msg_orc10_40
 	message="This has taken too much time, we should send all of our troops and send theses creatures back to hell."
       [/message]
       [message]
         description=Oumph
-	id=msg_orc10_41
 	message="It won't be said that Elves were braver than us, everyone to attack!"
       [/message]
       [modify_side]
@@ -404,12 +391,10 @@
 	  {HEAVY_INFANTRYMAN 8 42}
 	  {HEAVY_INFANTRYMAN 8 42}
 	  [message]
-	    id=msg_orc10_50
 	    speaker="Earl Lanbec'h"
 	    message= _ "At the saurians! Rip them to the last!"
 	  [/message]
 	  [message]
-	    id=msg_orc10_51
 	    speaker="Kapou'e"
 	    message= _ "It is too late, we are defeated."
 	  [/message]

data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg

@@ -100,58 +100,47 @@
 	
 #		[message]
 #		  speaker=narrator
-#		  id=msg_orc9_1a
 #		  message= _ "This scenario is under construction but should mostly be playable."
 #		[/message]
 
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc9_1
 		  message= _ "At last, here are the mourned hills!  I hope everything will be OK."
 		[/message]
 		[message]
 		  description="Grüü"
-		  id=msg_orc9_2
 		  message= _ "Why?"
 		[/message]
 		[message]
 		  description="Gork"
-		  id=msg_orc9_3
 		  message= _ "Only trolls don't know that these lands are ruled by Shan Taum the Smug, who was a rival for Black Eye Karun."
 		[/message]
 		[message]
 		  description="Pirk"
-		  id=msg_orc9_4
 		  message= _ "I doubt he would welcome the son of the Black Eye."
 		[/message]
 		[message]
 		  description="Shan Taum"
-		  id=msg_orc9_5
 		  message= _ "Who is that?  Kapou'e!  What are you doing in my lands you ridiculous born loser?"
 		[/message]
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc9_6
 		  message= _ "Hold on, Shan Taum. We are not here to quarrel, we are here to escort our brothers and to deliberate about what we have to do."
 		[/message]
 		[message]
 		  description="Shan Taum"
-		  id=msg_orc9_7
 		  message= _ "Bwahaha!  You are nothing!  Where is your land?  You became a beggar.  You are as pathetic as your father!"
 		[/message]
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc9_8
 		  message= _ "How can you talk that way about my father, you miserable coward?!  I'll make a mug with your skull!"
 		[/message]
 		[message]
 		  description="Shan Taum"
-		  id=msg_orc9_9
 		  message= _ "Really?  What would you drink with it?  Mint cordial?"
 		[/message]
 		[message]
 		  speaker="narrator"
-		  id=msg_orc9_10
 		  message= _ "Exasperated, Kapou'e launched an attack on his fellow orc Shan Taum the Smug."
 		[/message]
 
@@ -171,57 +160,46 @@
 		{OLD_ORCISH_SHAMAN 32 30 Echarp}
 		[message]
 		  description="Echarp"
-		  id=msg_orc9_30
 		  message= _ "What is this?  Are you mad!?  Humans are to besiege our fortress at Prestim and you are fighting each other!?"
 		[/message]
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc9_31
 		  message= _ "Well, ermmm..."
 		[/message]
 		[message]
 		  description="Echarp"
-		  id=msg_orc9_32
 		  message= _ "Kapou'e, rumors tell you made a long trip to seek assistance from us, and escorting Pirk, Gork and Vraurk.  The council is grateful for that."
 		[/message]
 		[message]
 		  description="Fabstep"
-		  id=msg_orc9_33
 		  message= _ "I know what you want from us but I'm afraid we can't help you."
 		[/message]
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc9_34
 		  message= _ "Really?  But my people..."
 		[/message]
 		[message]
 		  description="Echarp"
-		  id=msg_orc9_36
 		  message= _ "You don't understand.  Orcs have been divided for ages.  The only one who gave us some unity was your father, Black Eye Karun.  Hearing rumors from your exploits, we understood you are a worthy son of your father."
 		[/message]
 		[message]
 		  description="Vraurk"
-		  id=msg_orc9_37
 		  message= _ "This is true.  Now we are pressured from all sides by humans and elves; we need a leader that can unite all banners.  This one is YOU!"
 		[/message]
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc9_38
 		  message= _ "Well, I'm not sure I deserve that..."
 		[/message]
 		[message]
 		  description="Grüü"
-		  id=msg_orc9_39
 		  message= _ "Did you hear?  There is a battle waiting for us at Prestim!"
 		[/message]
 		[message]
 		  description="Echarp"
-		  id=msg_orc9_40
 		  message= _ "Kapou'e, if Prestim falls, humans will have a strong bridgehead on this side of the river and your people won't be safe.  You are the only one that can help us defend Prestim!"
 		[/message]
 		[message]
 		  description="Pirk"
-		  id=msg_orc9_41
 		  message= _ "Leave your people here Kapou'e--they are safe for the moment--and go defend Prestim.  In the meantime, now that the council is complete again, we will decide if we have to form the Great Horde again and give you the leadership on it."
 		[/message]
 		[kill]
@@ -242,7 +220,6 @@
 		[/filter]
 		[message]
 		  description="Shan Taum"
-		  id=msg_orc9_21
 		  message= _ "Nooo!  Don't kill me, I surrender to you little earthworm."
 		[/message]
 		[endlevel]

data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg

@@ -128,27 +128,22 @@
 
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc7_1
 		  message= _ "So here is the Silent Forest ... why is it named that way?  Is it really that silent?"
 		[/message]
 		[message]
 		  description="Pirk"
-		  id=msg_orc7_2
 		  message= _ "It has not always been that silent.  A lot of hunters from tribes used to hunt there and fish in the Bork river.  But now, no one would enter there unless forced."
 		[/message]
 		[message]
 		  description="Vraurk"
-		  id=msg_orc7_3
 		  message= _ "Some people say these woods are haunted."
 		[/message]
 		[message]
 		  description="Pirk"
-		  id=msg_orc7_4
 		  message= _ "The fact is that few people entered this forest and returned home safe.  Most likely, this forest is full of elvish renegades."
 		[/message]
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc7_5
 		  message= _ "Anyway, we need some rest.  We are sufficiently armed to cope with a bunch of elvish poachers.  If we ever meet some, I'll push them into the Bork river with great delight."
 		[/message]
 
@@ -159,12 +154,10 @@
 
 	  [message]
 	    description="Lucile"
-	    id=msg_orc7_6
 	    message= _ "What is that?  Orcs entering our forest?  Fools!  None of them will return alive!"
 	  [/message]
 	  [message]
 	    description="Raceme"
-	    id=msg_orc7_7
 	    message= _ "I agree.  We'll attack them on both sides."
 	  [/message]
 	
@@ -174,7 +167,6 @@
 	name=victory
 		[message]
 		  description="Kapou'e"
-		  id=msg_orc7_10
 		  message= _ "We've done it!  Now we need some rest, before we continue our journey."
 		[/message]
 	[/event]
@@ -195,17 +187,14 @@
 	    [else]
 	      [message]
 		  description="Grüü"
-		  id=msg_orc7_11
 		  message= _ "No more elves?  Where are you cowards!?"
 	      [/message]
 	      [message]
 		  description="Gork"
-		  id=msg_orc7_12
 		  message= _ "Don't shout that loud, stupid troll.  Do you remember we are in the Silent Forest?  Perhaps there more are to come."
 	      [/message]
 	      [message]
 		  description="Kapou'e"
-		  id=msg_orc7_13
 		  message= _ "I don't think so.  They must have fled.  Now that this forest has been cleared of elves, we can have a rest and then continue our journey."
 	      [/message]
 	      [endlevel]

data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg

@@ -156,37 +156,30 @@
 
 		[message]
 			description=Kapou'e
-			id=msg_orc3_1
 			message= _ "Here is Barag Gor."
 		[/message]
 		[message]
 			description=Kapou'e
-			id=msg_orc3_2
 			message= _ "Oh no!  They are besieged by elves.  We must help our brothers to get rid of this mob.  But these filthy elves are so numerous."
 		[/message]
 		[message]
 			description=Grüü
-			id=msg_orc3_3
 			message= _ "I have a subtle plan, chief."
 		[/message]
 		[message]
 			description=Kapou'e
-			id=msg_orc3_4
 			message= _ "Which plan?"
 		[/message]
 		[message]
 			description=Grüü
-			id=msg_orc3_5
 			message= _ "We go and we kill all of them.  What do you think?"
 		[/message]
 		[message]
 			description=Kapou'e
-			id=msg_orc3_6
 			message= _ "..."
 		[/message]
 		[message]
 			speaker=narrator
-			id=msg_orc3_7
 			message= _ "Then, Kapou'e launched his desperate attack to stop the siege of Barag Gor."
 		[/message]
 
@@ -219,7 +212,6 @@
 		[/allow_recruit]
 
 		[message]
-		  id=msg_orc3_7_1
 		  description=Jetto
 		  message= _ "Freedom!  Many thanks, Son of The Black Eye.  I'm Jetto, master of assassins, now you can count on the assassins guild to help you in your quest!"
 		[/message]
@@ -250,27 +242,22 @@
 			type=Orcish Shaman,Old Orcish Shaman,Novice Orcish Shaman
 			[/role]
 			[message]
-			id=msg_orc3_8
 			role=shaman
 			message= _ "They are retreating at last!"
 			[/message]
 			[message]
 			description=Kapou'e
-			id=msg_orc3_9
 			message= _ "We're not out of the woods yet.  I can see that more are pouring from the forest.  We are not in safety."
 			[/message]
 			[message]
-			id=msg_orc3_10
 			role=shaman
 			message= _ "You are right, we have to go to a safer place.  You have helped us.  Would you help us again and escort us to the Harbour of Tirigaz?"
 			[/message]
 			[message]
 			description=Kapou'e
-			id=msg_orc3_11
 			message= _ "Yes, I need to ask for assistance from whole council.  I'm with you."
 			[/message]
 			[message]
-			id=msg_orc3_12
 			role=shaman
 			message= _ "Excellent.  This is a dangerous journey, as we have to take a road near the elvish forest.  This is the road near that yellow farm."
 			[/message]
@@ -303,27 +290,22 @@
 			type=Orcish Shaman,Old Orcish Shaman,Novice Orcish Shaman
 			[/role]
 			[message]
-			id=msg_orc3_13
 			role=shaman
 			message= _ "They are retreating at last!"
 			[/message]
 			[message]
 			description=Kapou'e
-			id=msg_orc3_14
 			message= _ "Yes, but I can see that more are pouring from the forest.  We are not in safety."
 			[/message]
 			[message]
-			id=msg_orc3_15
 			role=shaman
 			message= _ "You are right, we have to leave to a safer place.  You have helped us.  Would you help us again and escort us to the Harbour of Tirigaz?"
 			[/message]
 			[message]
 			description=Kapou'e
-			id=msg_orc3_16
 			message= _ "Yes, I need to ask for assistance to the whole council.  I'm with you."
 			[/message]
 			[message]
-			id=msg_orc3_17
 			role=shaman
 			message= _ "Excellent.  This is a dangerous journey, as we have to take a road near the elvish forest.  This is the road near this yellow farm."
 			[/message]
@@ -352,7 +334,6 @@
             [then]
 		[message]
 		  speaker=unit
-		  id=msg_orc_17_1
 		  message= _ "We're safe, finally.  Hurry up Kapou'e, come with us, we need to reach Tirigaz as soon as possible."
 		[/message]
 	    [/then]
@@ -386,7 +367,6 @@
 	
 	  [message]
 		description="Filiel"
-		msg_id=msg_orc3_18
 		message= _ "Aha!  Surprise!  You thought you could cross elvish lands safely!"
 	  [/message]
 	[/event]
@@ -407,7 +387,6 @@
             [then]
 		[message]
 		speaker=unit
-		id=msg_orc3_19
 		message= _ "We've made it!  Our journey is still long.  Hurry up, my people!"
 		[/message]
                 [endlevel]
@@ -428,7 +407,6 @@
 	    [command]
 		[message]
 			speaker=Etheliel
-			id=msg_orc3_20
 			message= _ "They are destroying our castle!  To my rescue my merry Elves!"
 		[/message]
 		{ELVISH_HERO 1 26}
@@ -441,7 +419,6 @@
     		[/role]
 		[message]
 			role=hero
-			id=msg_orc3_21
 			message= _ "At your service, Etheliel.  Let push these evil creatures back to their quag!"
 		[/message]
 	    [/command]

data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg

@@ -170,27 +170,22 @@
 		
 		[message]
 			description="Vraurk"
-			id=msg_orc4_1
 			message= _ "Ahhh, I'm so tired.  It was a good idea to halt in such a quiet place."
 		[/message]
 		[message]
 			description="Grüü"
-			id=msg_orc4_2
 			message= _ "It is too quiet.  Just plain boring."
 		[/message]
 		[message]
 			description="Pirk"
-			id=msg_orc4_3
 			message= _ "Shut up, I just heard something."
 		[/message]
 		[message]
 			description="Kapou'e"
-			id=msg_orc4_4
 			message= _ "You're right.  I can see something is moving in these hills.  Looks like there are undead there."
 		[/message]
 		[message]
 			description="Grüü"
-			id=msg_orc4_5
 			message= _ "Excellent!  It is time for exercise!"
 		[/message]
 
@@ -206,22 +201,18 @@
 		[/filter]
 		[message]
 		speaker=unit
-		id=msg_orc4_6
 		message= _ "Hmmm, what neat bottle!  What is it?"
 		[/message]
 		[message]
 		speaker=unit
-		id=msg_orc4_7
 		message= _ "It is written H.O.L.Y W.A.T.E.R"
 		[/message]
 		[message]
 		speaker=unit
-		id=msg_orc4_8
 		message= _ "I'm thirsty ... *gulp* *gulp*"
 		[/message]
 		[message]
 		description=unit
-		id=msg_orc4_9
 		message= _ "Ahhh, that was yummy!"
 		[/message]
 		[removeitem]
@@ -234,17 +225,14 @@
 	  name=turn 17
 	  [message]
 	    description="Grüü"
-	    id=msg_orc4_10
 	    message= _ "The day is coming, these night creatures will soon return to the pit."
 	  [/message]
 	  [message]
 	    description="Pirk"
-	    id=msg_orc4_11
 	    message= _ "Grüü, are you forgeting we are ALSO night creatures?"
 	  [/message]
 	  [message]
 	    description="Grüü"
-	    id=msg_orc4_12
 	    message= _ "Err... well..."
 	  [/message]
 	[/event]

data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg

@@ -113,12 +113,10 @@
 	[event]
 	name=start
 		[message]
-		id=msg_orc2_1
 		description=Kapou'e
 		message= _ "We have nearly crossed the mountains.  I feel the lands of the free tribes are near now.  But beware, there are dwarves and wild trolls around.  Hurry up!  I can see the sign post that indicates their land."
 		[/message]
 		[message]
-		id=msg_orc2_2
 		description=Kwili
 		message= _ "What are these orcs doing here?  They should be too tired to live."
 		[/message]
@@ -133,7 +131,6 @@
 	[/filter]
 	[message]
 		speaker=unit
-		id=msg_orc2_3
 		message= _ "I've never pushed so far, we are crossing the border of the Black Eye lands."
 	[/message]
 	[/event]
@@ -174,27 +171,22 @@
 		[/unit]
 
 		[message]
-		id=msg_orc2_4
 		description=Blemaker
 		message= _ "Look!  Dwarves are fighting against orcs!"
 		[/message]
 		[message]
-		id=msg_orc2_5
 		description=Grüü
 		message= _ "Father, we should help them.  Orcs are our allies."
 		[/message]
 		[message]
-		id=msg_orc2_6
 		description=Blemaker
 		message= _ "I don't know if we should do that.  Orcs have been our allies in the past, but they have always treated us as fools."
 		[/message]
 		[message]
-		id=msg_orc2_7
 		description=Grüü
 		message= _ "But Father, we don't know what they are seeking there, maybe this is a good occasion to get rid of these dwarves."
 		[/message]
 		[message]
-		id=msg_orc2_8
 		description=Blemaker
 		message= _ "You are right, my son.  We will help our orcish friends.  But take care of you ... I would be desperate if something would happen to you."
 		[/message]
@@ -226,7 +218,6 @@
 		description=Kapou'e
 		[/filter]
 		[message]
-		id=msg_orc2_10
 		speaker=unit
 		message= _ "Argh!  I'm done.  My people is doomed!"
 		[/message]
@@ -241,12 +232,10 @@
 		description=Blemaker
 		[/filter]
 		[message]
-		id=msg_orc2_11
 		description=Grüü
 		message= _ "Father!  Oh no!"
 		[/message]
 		[message]
-		id=msg_orc2_12
 		description=Grüü
 		message= _ "Filthy dwarves!  Now I'm to kill you to the last!"
 		[/message]
@@ -258,17 +247,15 @@
 		description=Grüü
 		[/filter]
 		[message]
-		id=msg_orc2_13
 		speaker=unit
 		message= _ "Oh no, I'm defeated."
 		[/message]
 		[if]
-	      		[have_unit]
+			[have_unit]
-      			description=Blemaker
+			description=Blemaker
-      			[/have_unit]
+			[/have_unit]
-      		[then]
+		[then]
 			[message]
-			id=msg_orc2_14
 			description=Blemaker
 		 	message= _ "My son!  I should have never brought him to this fight.  Now we are to return to our caverns, and we will never go back."
 			[/message]
@@ -278,7 +265,6 @@
 		[/then]
 		[/if]
 		[message]
-			id=msg_orc2_15
 			description=Kapou'e
 		 	message= _ "Our troll friends are over.  Without them there is no hope."
 		[/message]
@@ -293,7 +279,6 @@
 		description=Kwili
 		[/filter]
 		[message]
-		id=msg_orc2_16
 		speaker=unit
 		message= _ "Argh!  I die!"
 		[/message]
@@ -315,50 +300,42 @@
 	[event]
 	name=victory
 		[if]
-	      		[have_unit]
+			[have_unit]
-      			description=Blemaker
+			description=Blemaker
-      			[/have_unit]
+			[/have_unit]
-      		[then]
+		[then]
 			[message]
-			id=msg_orc2_20
 			description=Kapou'e
 			message= _ "We've succeeded!  We've passed through the Mountains of Haag!  Look at these green hills!  The land of the free tribes is near now.  I can see the walls of Barag-Gor in the distance."
 			[/message]
 			[message]
-			id=msg_orc2_21
 			description=Kapou'e
 			message= _ "Blemaker, many thanks for your help in this fight.  Would you like to join us in our journey with your son?  Your help would be very appreciated!"
 			[/message]
 
 			[message]
-			id=msg_orc2_22
 			description=Grüü
 			message= _ "Father, I'd like to join them.  Would you mind it?"
 			[/message]
 			[message]
-			id=msg_orc2_23
 			description=Blemaker
 			message= _ "My son, you're old enough to discover the world.  Me, I have to stay here.  But take care, there are plenty of creatures that seek our end, like elves or humans.  They are as clever as merciless."
 			[/message]
 			[message]
-			id=msg_orc2_24
 			description=Grüü
 			message= _ "Thanks, father.  Don't worry, I'll take care of myself."
 			[/message]
 		[/then]
 		[else]
 			[message]
-			id=msg_orc2_25
 			description=Kapou'e
 			message= _ "We've succeeded!  We've passed through the Mountains of Haag!  Look at these green hills!  The land of the free tribes is near now.  I can see the walls of Barag-Gor in the distance."
 			[/message]
 			[message]
-			id=msg_orc2_26
 			description=Kapou'e
 			message= _ "Grüü, many thanks for your help in this fight.  I'm sorry for your father.  Would you like to join us in our journey?  Your help would be very appreciated!"
 			[/message]
 			[message]
-			id=msg_orc2_27
 			description=Grüü
 			message= _ "My father would have come to help you.  I would insult his memory not to help you.  I come!"
 			[/message]

data/scenarios/Son_Of_The_Black_Eye/deaths.cfg

@@ -10,12 +10,10 @@ name=die
 	type=Orcish Shaman
 	[/filter]
 	[message]
-	id=orc_death_priest1
 	speaker=unit
 	message= _ "Ouch!  This hurts!"
 	[/message]
 	[message]
-	id=orc_death_priest2
 	description="Kapou'e"
 	message= _ "The council will never be complete again.  This is hopeless."
 	[/message]
@@ -28,12 +26,10 @@ name=die
 	type=Old Orcish Shaman
 	[/filter]
 	[message]
-	id=orc_death_priest1
 	speaker=unit
 	message= _ "Ouch!  This hurts!"
 	[/message]
 	[message]
-	id=orc_death_priest2
 	description="Kapou'e"
 	message= _ "The council will never be complete again.  This is hopeless."
 	[/message]
@@ -46,12 +42,10 @@ name=die
 	type=Novice Orcish Shaman
 	[/filter]
 	[message]
-	id=orc_death_priest1
 	speaker=unit
 	message= _ "Ouch!  This hurts!"
 	[/message]
 	[message]
-	id=orc_death_priest2
 	description="Kapou'e"
 	message= _ "The council will never be complete again.  This is hopeless."
 	[/message]
@@ -64,12 +58,10 @@ name=die
 	type=Orcish Priest Doctor
 	[/filter]
 	[message]
-	id=orc_death_priest1
 	speaker=unit
 	message= _ "Ouch!  This hurts!"
 	[/message]
 	[message]
-	id=orc_death_priest2
 	description="Kapou'e"
 	message= _ "The council will never be complete again.  This is hopeless."
 	[/message]
@@ -82,7 +74,6 @@ name=die
 	description=Kapou'e
 	[/filter]
 	[message]
-	id=orc_death_kapoue
 	speaker=unit
 	message= _ "Argh!  I'm done.  My people is doomed!"
 	[/message]
@@ -95,7 +86,6 @@ name=die
 	description=Grüü
 	[/filter]
 	[message]
-	id=orc_death_gruu
 	speaker=unit
 	message= _ "Oh no, I'm defeated."
 	[/message]
@@ -108,7 +98,6 @@ name=die
 	description=Grüü
 	[/filter]
 	[message]
-	id=orc_death_gruu
 	speaker=unit
 	message= _ "Oh no, I'm defeated."
 	[/message]
@@ -122,7 +111,6 @@ name=die
       [/filter]
       [message]
 	description="Kapou'e"
-	id=orc_death_inarix
 	message= _ "Without Inarix to lead his saurians, there is no hope."
       [/message]
       [endlevel]

data/scenarios/Son_Of_The_Black_Eye/story.cfg

@@ -1,31 +1,26 @@
 [story]
 
   [part]
-	id=orc_intro_1
 	story= _ "Rahul I, King of Wesnoth, concluded peace with orcs in the 4th year of his reign.  He ended a 15 year war with Black Eye Karun, ruler of the orcs.  A peace treaty defined which lands were devoted to orcs or humans.  Years that followed the treaty were prosperous."
 	background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
   [/part]
 
   [part]
-	id=orc_intro_2
 	story= _ "In the thirteenth year of Howgarth III, tension began to rise between Orcish tribes and human northern earldoms.  Famine led humans to colonize some orcish lands and to push orcs to desolated hills."
 	background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
   [/part]
 
   [part]
-	id=orc_intro_3
 	story= _ "Of course, this caused violent orcish riots as orcs systematically slaughtered human colonies and villages that were on their lands.  Then, earl Lanbec'h decided to definitively address the Orcish menace and conferred a small army to his son-in-law baron Albert."
 	background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
   [/part]
 
   [part]
-	id=orc_intro_4
 	story= _ "Baron Albert personally led a small vanguard with the mission to establish a bridgehead inside Orcish lands."
 	background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
   [/part]
 
   [part]
-	id=orc_intro_5
 	story= _ "By nightfall his troops reached a mountainous territory, under the authority of orcish leader Kapou'e, the son of the Black Eye."
 	background=campaigns/Son_Of_The_Black_Eye/maps/sotbe.png
   [/part]