diff --git a/po/wesnoth.pot b/po/wesnoth.pot
index 93b68e88784..ca43d8ce585 100644
--- a/po/wesnoth.pot
+++ b/po/wesnoth.pot
@@ -10,7 +10,7 @@ msgstr ""
 "#-#-#-#-#  wesnoth.cpp.po (PACKAGE VERSION)  #-#-#-#-#\n"
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
-"POT-Creation-Date: 2004-08-24 23:24+0200\n"
+"POT-Creation-Date: 2004-08-27 16:15+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -188,7 +188,7 @@ msgid ""
 "Upkeep'</ref> for more information."
 msgstr ""
 
-#: data/help.cfg:85 src/help.cpp:765 src/help.cpp:766
+#: data/help.cfg:85 src/help.cpp:766 src/help.cpp:767
 msgid "Movement"
 msgstr ""
 
@@ -674,7 +674,7 @@ msgid "&human-general.png,Loyalists"
 msgstr ""
 
 #: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-lord.png,Rebels"
+msgid "&elvish-high-lord.png,Rebels"
 msgstr ""
 
 #: data/multiplayer.cfg:50 data/multiplayer.cfg:200
@@ -702,7 +702,7 @@ msgid "&human-general.png,Humans"
 msgstr ""
 
 #: data/multiplayer.cfg:114
-msgid "&elvish-lord.png,Elves"
+msgid "&elvish-high-lord.png,Elves"
 msgstr ""
 
 #: data/multiplayer.cfg:125
@@ -722,7 +722,7 @@ msgid "Great War"
 msgstr ""
 
 #: data/multiplayer.cfg:254
-msgid "&elvish-lord.png,Alliance of Light"
+msgid "&elvish-high-lord.png,Alliance of Light"
 msgstr ""
 
 #: data/multiplayer.cfg:265
@@ -1558,54 +1558,6 @@ msgid ""
 "them."
 msgstr ""
 
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:3
-msgid "The Peasants Revolt"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:24
-msgid ""
-"\n"
-"Victory:\n"
-"@Defeat enemy leader\n"
-"Defeat:\n"
-"#Death of Gweddry\n"
-"#Death of Dacyn\n"
-"#Death of Owaec\n"
-"#Death of Sudoc"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:76
-msgid "Good! Finally some non-undead people are here!"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:81
-msgid "Uh... hello, Sudoc... why aren't you at your southern outpost?"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:86
-msgid ""
-"It was captured and we were forced to come here. This is the only place left "
-"in Wesnoth where you can find non-undead, except for Weldyn. And Weldyn is "
-"besieged right now."
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:91
-msgid "What do the undead want you here for?"
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:96
-msgid ""
-"We are slaves! The undead work us, mining and making weapons, and then, when "
-"they need to, kill us to add to their army! But I am leading a rebellion... "
-"unfortunately, its hard for our rapiers to do anything against these undead. "
-"We need outside help."
-msgstr ""
-
-#: data/scenarios/Eastern_Invasion/Peasant_Revolt.cfg:101
-msgid ""
-"I guess we'll have to help him. Maybe his fencers will prove useful later on."
-msgstr ""
-
 #: data/scenarios/Eastern_Invasion/Reject.cfg:3
 msgid "Weldyn Besieged"
 msgstr ""
@@ -1648,6 +1600,68 @@ msgstr ""
 msgid "They killed Konrad... now, even if save Weldyn, Wesnoth has fallen."
 msgstr ""
 
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:3
+msgid "The Drowned Plains"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:24
+msgid ""
+"\n"
+"Victory:\n"
+"@Defeat Khrakrahs the Skeletal Dragon\n"
+"Defeat:\n"
+"#Death of Gweddry\n"
+"#Death of Dacyn\n"
+"#Death of Owaec\n"
+"#Turns run out"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:63
+msgid "What the... swamps? These were fertile plains when I was here last!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:67
+msgid ""
+"The lich-lord must have flooded the valley. The undead like the swamp. It is "
+"death, decay, everything that they are themselves."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:71
+msgid "I suppose we will have to wade across it... ugh."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:75
+msgid "Die... die... my master is calling you... Die!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:87
+msgid "What is that?!?"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:91
+msgid "I leave you to your doom."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:129
+msgid "Undead are rising out of the ground! We must destroy them, quickly!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:135
+msgid "My lord, undead are rising out of the cracks in the ground!"
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:139
+msgid "This might be more difficult than i thought."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:181
+msgid "I will get you! I... will... get... youu...."
+msgstr ""
+
+#: data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg:185
+msgid "Now lets get out of this bog!"
+msgstr ""
+
 #: data/scenarios/Eastern_Invasion/The_Duel.cfg:3
 msgid "The Duel"
 msgstr ""
@@ -6658,127 +6672,128 @@ msgstr ""
 msgid "Toward Mountains of Haag"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:26
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:27
 msgid ""
 "\n"
 "Victory:\n"
 "@Move Kapou'e to the end of the mountains\n"
 "Defeat:\n"
 "#Death of Kapou'e\n"
+"#Death of Grüü\n"
 "#Turns run out"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:103
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:104
 msgid ""
 "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."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:108
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:109
 msgid "What are these orcs doing here?  They should be too tired to live."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:122
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:123
 msgid ""
 "I've never pushed so far, we are crossing the border of the Black Eye lands."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:160
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:161
 msgid "Look!  Dwarves are fighting against orcs!"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:165
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:166
 msgid "Father, we should help them.  Orcs are our allies."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:170
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:171
 msgid ""
 "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."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:175
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:176
 msgid ""
 "But Father, we don't know what they are seeking there, maybe this is a good "
 "occasion to get rid of these dwarves."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:180
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:181
 msgid ""
 "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."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:192
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:193
 msgid "Argh!  I'm done.  My people is dommed!"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:207
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:208
 msgid "Father!  Oh no!"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:212
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:213
 msgid "Filthy dwarves!  Now I'm to kill you to the last!"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:224
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:225
 #: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:100
 #: data/scenarios/Son_Of_The_Black_Eye/deaths.cfg:113
 msgid "Oh no, I'm defeated."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:234
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:235
 msgid ""
 "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."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:244
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:245
 msgid "Our troll friends are over.  Without them there is no hope."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:259
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:260
 msgid "Argh!  I die!"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:286
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:314
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:287
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:315
 msgid ""
 "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."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:291
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:292
 msgid ""
 "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!"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:297
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:298
 msgid "Father, I'd like to join them.  Would you mind it?"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:302
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:303
 msgid ""
 "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."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:307
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:308
 msgid "Thanks, father.  Don't worry, I'll take care of myself."
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:319
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:320
 msgid ""
 "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!"
 msgstr ""
 
-#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:324
+#: data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg:325
 msgid ""
 "My father would have come to help you.  I would insult his memory not to "
 "help you.  I come!"
@@ -7156,6 +7171,7 @@ msgid ""
 msgstr ""
 
 #: data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg:171
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
 msgid "What? I can't die! Noooo!"
 msgstr ""
 
@@ -7357,7 +7373,11 @@ msgstr ""
 msgid "The Skull of Agarash"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:24
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:10
+msgid "Still fleeing from Wesnoth, Gwiti entered the lands of the Orcs."
+msgstr ""
+
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:52
 msgid ""
 "\n"
 "Victory:\n"
@@ -7367,74 +7387,66 @@ msgid ""
 "#Turns run out"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:73
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:101
 msgid ""
 "After Gwiti destroyed his brother, he planned to march on Wesnoth to gain "
 "his revenge. But a Dark Spirit came to counsel him..."
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:93
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:121
 msgid "Gwitiii...Gwiti!"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:98
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:126
 msgid "A Dark Spirit? Surely this is a token of my mastery of the undead!"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:103
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:131
 msgid ""
 "Gwiti, do not yet march in pursuit of your revenge. First, you shall go "
 "south, against the orcs, and there find the Skull of Agarash."
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:108
-msgid "What is the Skull of Agarash? Tell me more."
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:136
+msgid "Speak on."
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:113
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:141
 msgid ""
 "Do you see the three orc clans of this land? Their banners are topped with "
-"skulls, as is their custom. But one of these is the Skull of Agarash - which "
-"once was mine. Take it and your power will grow greater by far."
+"skulls, as is their custom. But one of these is the Skull of Agarash - Take "
+"it and your power will grow greater by far."
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:127
-msgid "What? I can't die! I've done so already! Noooo!"
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:145
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:173
 msgid "Oh, no! The undead hordes have taken my banner!"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:150
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:178
 msgid ""
 "It is not your banner, and it never was! That skull has marked it as mine "
 "since long ago."
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:155
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:183
 msgid ""
 "Argh! This is only half of the skull, and near enough to powerless! Begone, "
 "Spirit!"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:177
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:205
 msgid "Let us trample his banner into the ground! *smash*"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:196
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:220
 msgid "That skull is powerless!"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:208
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:232
 msgid "That is not the skull of Agarash!"
 msgstr ""
 
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:221
-msgid "I am dying, and my army is defeated! This is the end..."
-msgstr ""
-
-#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:239
+#: data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg:244
 msgid "It's been a long time since I fought anything myself!"
 msgstr ""
 
@@ -11057,7 +11069,7 @@ msgid ""
 "legions of the walking dead. . ."
 msgstr ""
 
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:19
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:20
 msgid ""
 "After a time of great struggle a peace was reached. We came to dominate most "
 "of the Isle, with the Wesfolk pushed onto the most marginal of lands. In "
@@ -11065,7 +11077,7 @@ msgid ""
 "we gleaned our first shards of knowledge about magic."
 msgstr ""
 
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:28
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:29
 msgid ""
 "Thus history continued apace for several centuries. You must recall that the "
 "route from the Western lands to our Isle was perilous at the best of times. "
@@ -11073,7 +11085,7 @@ msgid ""
 "Isle could never be maintained."
 msgstr ""
 
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:37
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:38
 msgid ""
 "Things only got worse when looking to the East. A strong, cold, ocean "
 "current swept down from the North in the Eastern ocean, pushing all ships "
@@ -11081,7 +11093,7 @@ msgid ""
 "nothing but open ocean, and vile sea monsters. . ."
 msgstr ""
 
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:50
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:51
 msgid ""
 "Over time our skills as navigators grew. Then, one day, the Crown Prince of "
 "Southbay returned home from a long voyage with a fabulous tale. He said that "
@@ -11090,7 +11102,7 @@ msgid ""
 "Southern pull of the ocean."
 msgstr ""
 
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:59
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:60
 msgid ""
 "It wasn't long after he returned that the very Crown Prince who discovered "
 "the land to the East fell ill and died, under mysterious circumstances. His "
@@ -11098,17 +11110,17 @@ msgid ""
 "of distraction with the poor Wesfolk kingdoms, and their Lich-Lords."
 msgstr ""
 
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:64
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:65
 msgid ""
 "The new Crown Prince departed, with the largest army ever assembled on the "
 "Isle to make war with the Wesfolk. This where our story begins. . ."
 msgstr ""
 
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:69
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:70
 msgid "With the plight of a different Prince on the same Isle. . ."
 msgstr ""
 
-#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:74
+#: data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg:75
 msgid ""
 "For this is the story of Haldric the First, and the Rise of Wesnoth. . ."
 msgstr ""
@@ -11261,7 +11273,7 @@ msgstr ""
 #: data/scenarios/multiplayer/Wesbowl.cfg:361
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:451
+#: data/scenarios/tutorial/tutorial2.cfg:219 src/show_dialog.cpp:450
 msgid "No"
 msgstr ""
 
@@ -11433,7 +11445,7 @@ msgid "Do you want to review any of the skills learned on this level?"
 msgstr ""
 
 #: data/scenarios/tutorial/tutorial1.cfg:264
-#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:450
+#: data/scenarios/tutorial/tutorial2.cfg:206 src/show_dialog.cpp:449
 msgid "Yes"
 msgstr ""
 
@@ -11775,7 +11787,7 @@ msgid ""
 "with this terrain"
 msgstr ""
 
-#: data/translations/english.cfg:92 src/help.cpp:868
+#: data/translations/english.cfg:92 src/help.cpp:869
 msgid "or"
 msgstr ""
 
@@ -12382,16 +12394,17 @@ msgstr ""
 #: data/units/Deathmaster.cfg:37 data/units/Demilich.cfg:33
 #: data/units/Drake_Mage.cfg:68 data/units/Drake_Warmage.cfg:78
 #: data/units/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
-#: data/units/Fireball.cfg:21 data/units/Great_Mage.cfg:42
-#: data/units/Great_Mage.cfg:118 data/units/Initiate.cfg:21
-#: data/units/Lich.cfg:34 data/units/Mage.cfg:39 data/units/Mage.cfg:106
-#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
-#: data/units/Necromancer.cfg:37 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 data/units/Sea_Hag.cfg:31
-#: data/units/Silver_Mage.cfg:44 data/units/Silver_Mage.cfg:131
-#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
+#: data/units/Elvish_Druid.cfg:63 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Fireball.cfg:21
+#: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
+#: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Mage.cfg:39
+#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
+#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
+#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
+#: data/units/White_Mage.cfg:106
 msgid "magical"
 msgstr ""
 
@@ -12467,10 +12480,10 @@ msgid "staff"
 msgstr ""
 
 #: data/units/Arch_Mage.cfg:39 data/units/Arch_Mage.cfg:118
-#: data/units/Elvish_Lord.cfg:36 data/units/Great_Mage.cfg:39
-#: data/units/Great_Mage.cfg:115 data/units/Red_Mage.cfg:39
-#: data/units/Red_Mage.cfg:108 data/units/Silver_Mage.cfg:41
-#: data/units/Silver_Mage.cfg:128
+#: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
+#: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
+#: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
 msgid "fireball"
 msgstr ""
 
@@ -12480,11 +12493,12 @@ msgstr ""
 #: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
 #: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
 #: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
-#: data/units/Elder_Mage.cfg:39 data/units/Elvish_Lord.cfg:37
-#: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
-#: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
-#: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
-#: data/units/Mage.cfg:37 data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
+#: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
+#: data/units/Elvish_Lord.cfg:37 data/units/Fire_Dragon.cfg:59
+#: data/units/Fireball.cfg:18 data/units/Fireball.cfg:19
+#: data/units/Goblin_Pillager.cfg:20 data/units/Great_Mage.cfg:40
+#: data/units/Great_Mage.cfg:116 data/units/Mage.cfg:37
+#: data/units/Mage.cfg:104 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
 #: data/units/Silver_Mage.cfg:129
 msgid "fire"
@@ -12540,19 +12554,19 @@ msgstr ""
 #: data/units/Elvish_Archer.cfg:101 data/units/Elvish_Avenger.cfg:24
 #: data/units/Elvish_Avenger.cfg:97 data/units/Elvish_Captain.cfg:24
 #: data/units/Elvish_Champion.cfg:22 data/units/Elvish_Fighter.cfg:24
-#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_Lord.cfg:21
-#: data/units/Elvish_Marksman.cfg:22 data/units/Elvish_Marksman.cfg:100
-#: data/units/Elvish_Marshal.cfg:25 data/units/Elvish_Outrider.cfg:24
-#: data/units/Elvish_Ranger.cfg:22 data/units/Elvish_Ranger.cfg:99
-#: data/units/Elvish_Rider.cfg:31 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:22
+#: data/units/Elvish_Hero.cfg:22 data/units/Elvish_High_Lord.cfg:21
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:22
+#: data/units/Elvish_Marksman.cfg:100 data/units/Elvish_Marshal.cfg:25
+#: data/units/Elvish_Outrider.cfg:24 data/units/Elvish_Ranger.cfg:22
+#: data/units/Elvish_Ranger.cfg:99 data/units/Elvish_Rider.cfg:31
+#: data/units/Elvish_Scout.cfg:32 data/units/Elvish_Sharpshooter.cfg:22
 #: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
 #: data/units/Fighter.cfg:21 data/units/Fire_Dragon.cfg:23
 #: data/units/General.cfg:22 data/units/Ghoul.cfg:20
 #: data/units/Goblin_Direwolver.cfg:21 data/units/Goblin_Direwolver.cfg:33
 #: data/units/Goblin_Knight.cfg:19 data/units/Grand_Knight.cfg:21
 #: data/units/Gryphon.cfg:19 data/units/Gryphon_Master.cfg:22
-#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:27
+#: data/units/Gryphon_Rider.cfg:20 data/units/Halbardier.cfg:37
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Mage.cfg:21
 #: data/units/Mage.cfg:88 data/units/Master_Bowman.cfg:21
@@ -12646,12 +12660,12 @@ msgstr ""
 #: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:23
 #: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
 #: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_Lord.cfg:20
-#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
-#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
-#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
-#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
-#: data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
+#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
+#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
+#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
+#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
 #: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
 #: data/units/General.cfg:21 data/units/Grand_Knight.cfg:19
 #: data/units/Knight.cfg:20 data/units/Lieutenant.cfg:21
@@ -12726,7 +12740,7 @@ msgstr ""
 #: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
 #: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
 #: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
-#: data/units/Death_Knight.cfg:32 data/units/Dragoon.cfg:49
+#: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
 #: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
 #: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
 #: data/units/Dwarvish_Dragonguard.cfg:47 data/units/Dwarvish_Guardsman.cfg:40
@@ -12971,7 +12985,7 @@ msgstr ""
 msgid "battle axe"
 msgstr ""
 
-#: data/units/Death_Knight.cfg:31 data/units/Duelist.cfg:31
+#: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
 #: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
 #: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
 #: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
@@ -13415,6 +13429,16 @@ msgid ""
 "fighting at close range with the sword, but are also skilled at the bow."
 msgstr ""
 
+#: data/units/Elvish_High_Lord.cfg:3
+msgid "Elvish High Lord"
+msgstr ""
+
+#: data/units/Elvish_High_Lord.cfg:17
+msgid ""
+"Elvish High Lords are fearsome in combat, using the sword at close range and "
+"devastating balls of fire at long range."
+msgstr ""
+
 #: data/units/Elvish_Lord.cfg:3
 msgid "Elvish Lord"
 msgstr ""
@@ -13800,11 +13824,11 @@ msgid ""
 "when defending."
 msgstr ""
 
-#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:26
+#: data/units/Halbardier.cfg:18 data/units/Halbardier.cfg:36
 msgid "halberd"
 msgstr ""
 
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:31
+#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
 #: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
 msgid "firststrike"
 msgstr ""
@@ -14844,7 +14868,7 @@ msgid ""
 "Lord -- to join the elite of human fighters."
 msgstr ""
 
-#: src/about.cpp:240 src/help.cpp:2363 src/show_dialog.cpp:470
+#: src/about.cpp:240 src/help.cpp:2364 src/show_dialog.cpp:469
 msgid "Close"
 msgstr ""
 
@@ -14938,141 +14962,141 @@ msgstr ""
 msgid "No objectives available"
 msgstr ""
 
-#: src/dialogs.cpp:178
+#: src/dialogs.cpp:177
 msgid "Save already exists. Do you want to overwrite it ?"
 msgstr ""
 
-#: src/dialogs.cpp:207 src/dialogs.cpp:446
+#: src/dialogs.cpp:206 src/dialogs.cpp:443
 msgid "Don't ask me again!"
 msgstr ""
 
-#: src/dialogs.cpp:209
+#: src/dialogs.cpp:208
 msgid "Do you really want to delete this game?"
 msgstr ""
 
-#: src/dialogs.cpp:350
+#: src/dialogs.cpp:347
 msgid "%a %b %d %H:%M %Y"
 msgstr ""
 
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:360
 msgid "#(Invalid)"
 msgstr ""
 
-#: src/dialogs.cpp:368 src/game.cpp:921
+#: src/dialogs.cpp:365 src/game.cpp:921
 msgid "Campaign"
 msgstr ""
 
-#: src/dialogs.cpp:370 src/game.cpp:968
+#: src/dialogs.cpp:367 src/game.cpp:968
 msgid "Multiplayer"
 msgstr ""
 
-#: src/dialogs.cpp:372
+#: src/dialogs.cpp:369
 msgid "Tutorial"
 msgstr ""
 
-#: src/dialogs.cpp:380
+#: src/dialogs.cpp:377
 msgid "replay"
 msgstr ""
 
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1381
+#: src/dialogs.cpp:379 src/multiplayer_lobby.cpp:139 src/playturn.cpp:1382
 msgid "Turn"
 msgstr ""
 
-#: src/dialogs.cpp:384
+#: src/dialogs.cpp:381
 msgid "Scenario Start"
 msgstr ""
 
-#: src/dialogs.cpp:387 src/game.cpp:944
+#: src/dialogs.cpp:384 src/game.cpp:944
 msgid "Difficulty"
 msgstr ""
 
-#: src/dialogs.cpp:401
+#: src/dialogs.cpp:398
 msgid "No Saved Games"
 msgstr ""
 
-#: src/dialogs.cpp:402
+#: src/dialogs.cpp:399
 msgid ""
 "There are no saved games to load.\n"
 "(Games are saved automatically when you complete a scenario)"
 msgstr ""
 
-#: src/dialogs.cpp:421
+#: src/dialogs.cpp:418
 msgid "Delete Save"
 msgstr ""
 
-#: src/dialogs.cpp:436
+#: src/dialogs.cpp:433
 msgid "Import Saved Games"
 msgstr ""
 
-#: src/dialogs.cpp:437
+#: src/dialogs.cpp:434
 msgid ""
 "Your saves directory contains some files from an old version of Battle for "
 "Wesnoth. Would you like to update these to the latest version? This may take "
 "some time."
 msgstr ""
 
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:439
 msgid ""
 "Your saves directory contains some files that don't appear to have been "
 "generated by this version of Battle for Wesnoth. Would you like to register "
 "these files with the game?"
 msgstr ""
 
-#: src/dialogs.cpp:512
+#: src/dialogs.cpp:509
 msgid "Show replay"
 msgstr ""
 
-#: src/dialogs.cpp:515 src/hotkeys.cpp:133 src/multiplayer.cpp:82
+#: src/dialogs.cpp:512 src/hotkeys.cpp:133 src/multiplayer.cpp:82
 msgid "Load Game"
 msgstr ""
 
-#: src/dialogs.cpp:516
+#: src/dialogs.cpp:513
 msgid "Choose the game to load"
 msgstr ""
 
-#: src/dialogs.cpp:570 src/multiplayer.cpp:121 src/show_dialog.cpp:444
-#: src/show_dialog.cpp:457
+#: src/dialogs.cpp:567 src/multiplayer.cpp:121 src/show_dialog.cpp:443
+#: src/show_dialog.cpp:456
 msgid "Ok"
 msgstr ""
 
-#: src/dialogs.cpp:571 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
-#: src/multiplayer_connect.cpp:49 src/show_dialog.cpp:458
-#: src/show_dialog.cpp:464
+#: src/dialogs.cpp:568 src/multiplayer.cpp:120 src/multiplayer_client.cpp:117
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:457
+#: src/show_dialog.cpp:463
 msgid "Cancel"
 msgstr ""
 
-#: src/dialogs.cpp:620 src/dialogs.cpp:629
+#: src/dialogs.cpp:617 src/dialogs.cpp:626
 msgid "Profile"
 msgstr ""
 
-#: src/dialogs.cpp:716 src/display.cpp:884 src/help.cpp:561
-#: src/playturn.cpp:1711
+#: src/dialogs.cpp:713 src/display.cpp:884 src/help.cpp:562
+#: src/playturn.cpp:1712
 msgid "level"
 msgstr ""
 
-#: src/dialogs.cpp:737 src/display.cpp:902 src/help.cpp:615
-#: src/playturn.cpp:1875 src/unit.cpp:1028
+#: src/dialogs.cpp:734 src/display.cpp:902 src/help.cpp:616
+#: src/playturn.cpp:1876 src/unit.cpp:1028
 msgid "HP"
 msgstr ""
 
-#: src/dialogs.cpp:741 src/dialogs.cpp:749 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1713 src/playturn.cpp:1876
+#: src/dialogs.cpp:738 src/dialogs.cpp:746 src/display.cpp:906
+#: src/display.cpp:914 src/playturn.cpp:1714 src/playturn.cpp:1877
 #: src/unit.cpp:1087
 msgid "XP"
 msgstr ""
 
-#: src/dialogs.cpp:754 src/display.cpp:918 src/help.cpp:616
-#: src/playturn.cpp:1877 src/unit.cpp:1064
+#: src/dialogs.cpp:751 src/display.cpp:918 src/help.cpp:617
+#: src/playturn.cpp:1878 src/unit.cpp:1064
 msgid "Moves"
 msgstr ""
 
-#: src/dialogs.cpp:771 src/display.cpp:935 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:229
+#: src/dialogs.cpp:764 src/display.cpp:935 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:229
 msgid "melee"
 msgstr ""
 
-#: src/dialogs.cpp:772 src/display.cpp:936 src/help.cpp:693
-#: src/playturn.cpp:616 src/reports.cpp:230
+#: src/dialogs.cpp:765 src/display.cpp:936 src/help.cpp:694
+#: src/playturn.cpp:618 src/reports.cpp:230
 msgid "ranged"
 msgstr ""
 
@@ -15088,11 +15112,11 @@ msgstr ""
 msgid "Do you want to save a replay of this scenario?"
 msgstr ""
 
-#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1388
+#: src/game.cpp:136 src/game.cpp:198 src/playturn.cpp:1389
 msgid "Name:"
 msgstr ""
 
-#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1399
+#: src/game.cpp:144 src/game.cpp:205 src/playturn.cpp:1400
 msgid "The game could not be saved"
 msgstr ""
 
@@ -15179,83 +15203,83 @@ msgstr ""
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr ""
 
-#: src/help.cpp:568
+#: src/help.cpp:569
 msgid "Advances to"
 msgstr ""
 
-#: src/help.cpp:594
+#: src/help.cpp:595
 msgid "Abilities"
 msgstr ""
 
-#: src/help.cpp:617
+#: src/help.cpp:618
 msgid "Alignment"
 msgstr ""
 
-#: src/help.cpp:622
+#: src/help.cpp:623
 msgid "Required XP"
 msgstr ""
 
-#: src/help.cpp:632 src/reports.cpp:232
+#: src/help.cpp:633 src/reports.cpp:232
 msgid "attacks"
 msgstr ""
 
-#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1874
+#: src/help.cpp:641 src/help.cpp:642 src/playturn.cpp:1875
 msgid "Name"
 msgstr ""
 
-#: src/help.cpp:644 src/help.cpp:645 src/playturn.cpp:1873
+#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1874
 msgid "Type"
 msgstr ""
 
-#: src/help.cpp:648 src/help.cpp:649 src/unit_types.cpp:301
+#: src/help.cpp:649 src/help.cpp:650 src/unit_types.cpp:301
 msgid "Dmg"
 msgstr ""
 
-#: src/help.cpp:652 src/help.cpp:653
+#: src/help.cpp:653 src/help.cpp:654
 msgid "Strikes"
 msgstr ""
 
-#: src/help.cpp:656 src/help.cpp:657
+#: src/help.cpp:657 src/help.cpp:658
 msgid "Range"
 msgstr ""
 
-#: src/help.cpp:660 src/help.cpp:661
+#: src/help.cpp:661 src/help.cpp:662
 msgid "Special"
 msgstr ""
 
-#: src/help.cpp:717
+#: src/help.cpp:718
 msgid "Resistances"
 msgstr ""
 
-#: src/help.cpp:721 src/help.cpp:722
+#: src/help.cpp:722 src/help.cpp:723
 msgid "Attack Type"
 msgstr ""
 
-#: src/help.cpp:725 src/help.cpp:726
+#: src/help.cpp:726 src/help.cpp:727
 msgid "Resistance"
 msgstr ""
 
-#: src/help.cpp:757
+#: src/help.cpp:758
 msgid "Terrain Modifiers"
 msgstr ""
 
-#: src/help.cpp:761 src/help.cpp:762
+#: src/help.cpp:762 src/help.cpp:763
 msgid "Terrain"
 msgstr ""
 
-#: src/help.cpp:769 src/help.cpp:770
+#: src/help.cpp:770 src/help.cpp:771
 msgid "Defense"
 msgstr ""
 
-#: src/help.cpp:1867
+#: src/help.cpp:1868
 msgid "< Back"
 msgstr ""
 
-#: src/help.cpp:1868
+#: src/help.cpp:1869
 msgid "Forward >"
 msgstr ""
 
-#: src/help.cpp:2366
+#: src/help.cpp:2367
 msgid "The Battle for Wesnoth Help"
 msgstr ""
 
@@ -15267,7 +15291,7 @@ msgstr ""
 msgid "End Unit Turn"
 msgstr ""
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1457
+#: src/hotkeys.cpp:122 src/playturn.cpp:1458
 msgid "Leader"
 msgstr ""
 
@@ -15303,7 +15327,7 @@ msgstr ""
 msgid "Unit Description"
 msgstr ""
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1357
+#: src/hotkeys.cpp:131 src/playturn.cpp:1358
 msgid "Rename Unit"
 msgstr ""
 
@@ -15347,7 +15371,7 @@ msgstr ""
 msgid "Change Unit Side (Debug!)"
 msgstr ""
 
-#: src/hotkeys.cpp:144 src/preferences.cpp:910
+#: src/hotkeys.cpp:144 src/preferences.cpp:920
 msgid "Preferences"
 msgstr ""
 
@@ -15355,11 +15379,11 @@ msgstr ""
 msgid "Scenario Objectives"
 msgstr ""
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:1926
+#: src/hotkeys.cpp:146 src/playturn.cpp:1927
 msgid "Unit List"
 msgstr ""
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:1988
+#: src/hotkeys.cpp:147 src/playturn.cpp:2015
 msgid "Statistics"
 msgstr ""
 
@@ -15463,7 +15487,7 @@ msgstr ""
 msgid "Speak to All"
 msgstr ""
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:608
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:606
 msgid "Help"
 msgstr ""
 
@@ -15487,7 +15511,7 @@ msgstr ""
 msgid "System default language"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1010
+#: src/mapgen_dialog.cpp:69 src/preferences.cpp:1019
 msgid "Close Window"
 msgstr ""
 
@@ -15495,7 +15519,7 @@ msgstr ""
 msgid "Map Generator"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:478
+#: src/mapgen_dialog.cpp:77 src/multiplayer.cpp:481
 msgid "Players"
 msgstr ""
 
@@ -15515,7 +15539,7 @@ msgstr ""
 msgid "Bump Size"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1458
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1459
 msgid "Villages"
 msgstr ""
 
@@ -15523,23 +15547,23 @@ msgstr ""
 msgid "Landform"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:183
+#: src/mapgen_dialog.cpp:182
 msgid "Roads Between Castles"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:246
+#: src/mapgen_dialog.cpp:245
 msgid "/1000 tiles"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
 msgid "Coastal"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
 msgid "Inland"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:251
+#: src/mapgen_dialog.cpp:250
 msgid "Island"
 msgstr ""
 
@@ -15611,35 +15635,31 @@ msgstr ""
 msgid "Name of game"
 msgstr ""
 
-#: src/multiplayer.cpp:175
-msgid "game name prefix^"
+#: src/multiplayer.cpp:178
+msgid "$login's game"
 msgstr ""
 
-#: src/multiplayer.cpp:175
-msgid "game name suffix^'s game"
-msgstr ""
-
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:189
 msgid "Map to play"
 msgstr ""
 
-#: src/multiplayer.cpp:283
+#: src/multiplayer.cpp:286
 msgid "Era"
 msgstr ""
 
-#: src/multiplayer.cpp:345
+#: src/multiplayer.cpp:348
 msgid "Unlimited"
 msgstr ""
 
-#: src/multiplayer.cpp:349
+#: src/multiplayer.cpp:352
 msgid "Turns"
 msgstr ""
 
-#: src/multiplayer.cpp:357
+#: src/multiplayer.cpp:360
 msgid "Village Gold"
 msgstr ""
 
-#: src/multiplayer.cpp:369
+#: src/multiplayer.cpp:372
 msgid "Experience Requirements"
 msgstr ""
 
@@ -15651,9 +15671,9 @@ msgstr ""
 msgid "Receiving game list..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:382
-#: src/multiplayer_connect.cpp:384 src/playlevel.cpp:732 src/playturn.cpp:1457
-#: src/playturn.cpp:1462 src/playturn.cpp:1549
+#: src/multiplayer_client.cpp:93 src/multiplayer_connect.cpp:378
+#: src/multiplayer_connect.cpp:380 src/playlevel.cpp:732 src/playturn.cpp:1458
+#: src/playturn.cpp:1463 src/playturn.cpp:1550
 msgid "Gold"
 msgstr ""
 
@@ -15698,11 +15718,11 @@ msgid "Show replay of game up to save point?"
 msgstr ""
 
 #: src/multiplayer_connect.cpp:48
-msgid "I'm Ready"
+msgid " Computer vs Computer "
 msgstr ""
 
-#: src/multiplayer_connect.cpp:50
-msgid " Computer vs Computer "
+#: src/multiplayer_connect.cpp:49
+msgid "I'm Ready"
 msgstr ""
 
 #: src/multiplayer_connect.cpp:97
@@ -15723,8 +15743,8 @@ msgstr ""
 msgid "Local Player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:475
-#: src/multiplayer_connect.cpp:589 src/multiplayer_connect.cpp:683
+#: src/multiplayer_connect.cpp:259 src/multiplayer_connect.cpp:467
+#: src/multiplayer_connect.cpp:581 src/multiplayer_connect.cpp:675
 msgid "Computer Player"
 msgstr ""
 
@@ -15732,64 +15752,64 @@ msgstr ""
 msgid "Empty"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:372
-#: src/multiplayer_connect.cpp:375
+#: src/multiplayer_connect.cpp:288 src/multiplayer_connect.cpp:368
+#: src/multiplayer_connect.cpp:371
 msgid "Team"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:295
+#: src/multiplayer_connect.cpp:296
 msgid "Red"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
 msgid "Blue"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:300
 msgid "Green"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:302
 msgid "Yellow"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
 msgid "Purple"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:306
 msgid "Orange"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:308
 msgid "Grey"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
 msgid "White"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:312
 msgid "Brown"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:361
+#: src/multiplayer_connect.cpp:357
 msgid "Game Lobby"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:364 src/multiplayer_connect.cpp:366
+#: src/multiplayer_connect.cpp:360 src/multiplayer_connect.cpp:362
 msgid "Player/Type"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:367 src/multiplayer_connect.cpp:370
+#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:366
 msgid "Race"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:377 src/multiplayer_connect.cpp:380
+#: src/multiplayer_connect.cpp:373 src/multiplayer_connect.cpp:376
 msgid "Color"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:538 src/multiplayer_connect.cpp:542
+#: src/multiplayer_connect.cpp:530 src/multiplayer_connect.cpp:534
 msgid "Waiting for network players to join"
 msgstr ""
 
@@ -15872,208 +15892,224 @@ msgid ""
 "want to save the game?"
 msgstr ""
 
-#: src/playturn.cpp:79
+#: src/playturn.cpp:78
 msgid "It is now your turn"
 msgstr ""
 
-#: src/playturn.cpp:499
+#: src/playturn.cpp:503
 msgid "Attacker"
 msgstr ""
 
-#: src/playturn.cpp:501
+#: src/playturn.cpp:505
 msgid "Defender"
 msgstr ""
 
-#: src/playturn.cpp:525 src/playturn.cpp:650
+#: src/playturn.cpp:529 src/playturn.cpp:652
 msgid "Damage Calculations"
 msgstr ""
 
-#: src/playturn.cpp:616
+#: src/playturn.cpp:618
 msgid "Melee"
 msgstr ""
 
-#: src/playturn.cpp:629 src/reports.cpp:209
+#: src/playturn.cpp:631 src/reports.cpp:209
 msgid "vs"
 msgstr ""
 
-#: src/playturn.cpp:662
+#: src/playturn.cpp:664
 msgid "Attack Enemy"
 msgstr ""
 
-#: src/playturn.cpp:663
+#: src/playturn.cpp:665
 msgid "Choose weapon"
 msgstr ""
 
-#: src/playturn.cpp:1144
+#: src/playturn.cpp:1145
 msgid ""
 "You have not started your turn yet.  Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1153 src/playturn.cpp:1158
+#: src/playturn.cpp:1154 src/playturn.cpp:1159
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1174
+#: src/playturn.cpp:1175
 msgid "Auto-Save"
 msgstr ""
 
-#: src/playturn.cpp:1176
+#: src/playturn.cpp:1177
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid "The game has been saved"
 msgstr ""
 
-#: src/playturn.cpp:1458
+#: src/playturn.cpp:1459
 msgid "Units"
 msgstr ""
 
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
 msgid "Income"
 msgstr ""
 
-#: src/playturn.cpp:1459
+#: src/playturn.cpp:1460
 msgid "Upkeep"
 msgstr ""
 
-#: src/playturn.cpp:1555
+#: src/playturn.cpp:1556
 msgid "You have no units available to recruit."
 msgstr ""
 
-#: src/playturn.cpp:1568
+#: src/playturn.cpp:1569
 msgid "Recruit unit"
 msgstr ""
 
-#: src/playturn.cpp:1597
+#: src/playturn.cpp:1598
 msgid "You don't have enough gold to recruit that unit"
 msgstr ""
 
-#: src/playturn.cpp:1655
+#: src/playturn.cpp:1656
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1657
+#: src/playturn.cpp:1658
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
 msgid "her"
 msgstr ""
 
-#: src/playturn.cpp:1662
+#: src/playturn.cpp:1663
 msgid "him"
 msgstr ""
 
-#: src/playturn.cpp:1695
+#: src/playturn.cpp:1696
 msgid "You are seperated from your soldiers and may not recall them"
 msgstr ""
 
-#: src/playturn.cpp:1697
+#: src/playturn.cpp:1698
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
 msgstr ""
 
-#: src/playturn.cpp:1701
+#: src/playturn.cpp:1702
 msgid "You must have at least"
 msgstr ""
 
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1704
 msgid "gold pieces to recall a unit"
 msgstr ""
 
-#: src/playturn.cpp:1726
+#: src/playturn.cpp:1727
 msgid "Dismiss Unit"
 msgstr ""
 
-#: src/playturn.cpp:1739
+#: src/playturn.cpp:1740
 msgid "Select unit"
 msgstr ""
 
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
 msgid "Message"
 msgstr ""
 
-#: src/playturn.cpp:1783
+#: src/playturn.cpp:1784
 msgid "Send to allies only"
 msgstr ""
 
-#: src/playturn.cpp:1878
+#: src/playturn.cpp:1879
 msgid "Location"
 msgstr ""
 
-#: src/playturn.cpp:1960 src/playturn.cpp:1994
+#: src/playturn.cpp:1961 src/playturn.cpp:2021
 msgid "Recruits"
 msgstr ""
 
-#: src/playturn.cpp:1966 src/playturn.cpp:1998
+#: src/playturn.cpp:1967 src/playturn.cpp:2025
 msgid "Recalls"
 msgstr ""
 
-#: src/playturn.cpp:1972 src/playturn.cpp:2002
+#: src/playturn.cpp:1973 src/playturn.cpp:2029
 msgid "Advancements"
 msgstr ""
 
-#: src/playturn.cpp:1978 src/playturn.cpp:2006
+#: src/playturn.cpp:1979 src/playturn.cpp:2033
 msgid "Losses"
 msgstr ""
 
-#: src/playturn.cpp:1984 src/playturn.cpp:2010
+#: src/playturn.cpp:1985 src/playturn.cpp:2037
 msgid "Kills"
 msgstr ""
 
-#: src/playturn.cpp:2025
+#: src/playturn.cpp:1991
+msgid "Damage Inflicted"
+msgstr ""
+
+#: src/playturn.cpp:1997
+msgid "Damage Taken"
+msgstr ""
+
+#: src/playturn.cpp:2003
+msgid "Damage Inflicted (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2010
+msgid "Damage Taken (EV)"
+msgstr ""
+
+#: src/playturn.cpp:2052
 msgid "Search"
 msgstr ""
 
-#: src/playturn.cpp:2035
+#: src/playturn.cpp:2062
 msgid "prompt^Command:"
 msgstr ""
 
-#: src/playturn.cpp:2046
+#: src/playturn.cpp:2073
 msgid "Chat Log"
 msgstr ""
 
-#: src/playturn.cpp:2111
+#: src/playturn.cpp:2138
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr ""
 
-#: src/playturn.cpp:2184
+#: src/playturn.cpp:2212
 msgid "Place Label"
 msgstr ""
 
-#: src/playturn.cpp:2185
+#: src/playturn.cpp:2213
 msgid "Label"
 msgstr ""
 
-#: src/playturn.cpp:2348
+#: src/playturn.cpp:2376
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
 msgstr ""
 
-#: src/playturn.cpp:2400
+#: src/playturn.cpp:2428
 msgid "Replace with AI"
 msgstr ""
 
-#: src/playturn.cpp:2401
+#: src/playturn.cpp:2429
 msgid "Replace with local player"
 msgstr ""
 
-#: src/playturn.cpp:2402
+#: src/playturn.cpp:2430
 msgid "Abort game"
 msgstr ""
 
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2433
 msgid "Replace with "
 msgstr ""
 
-#: src/playturn.cpp:2409
+#: src/playturn.cpp:2437
 msgid "has left the game. What do you want to do?"
 msgstr ""
 
@@ -16088,177 +16124,177 @@ msgstr ""
 msgid "player"
 msgstr ""
 
-#: src/preferences.cpp:627
+#: src/preferences.cpp:637
 msgid "Full Screen"
 msgstr ""
 
-#: src/preferences.cpp:628
+#: src/preferences.cpp:638
 msgid "Accelerated Speed"
 msgstr ""
 
-#: src/preferences.cpp:629
+#: src/preferences.cpp:639
 msgid "Skip AI Moves"
 msgstr ""
 
-#: src/preferences.cpp:630
+#: src/preferences.cpp:640
 msgid "Show Grid"
 msgstr ""
 
-#: src/preferences.cpp:631
+#: src/preferences.cpp:641
 msgid "Show Floating Labels"
 msgstr ""
 
-#: src/preferences.cpp:632
+#: src/preferences.cpp:642
 msgid "Turn Dialog"
 msgstr ""
 
-#: src/preferences.cpp:633
+#: src/preferences.cpp:643
 msgid "Turn Bell"
 msgstr ""
 
-#: src/preferences.cpp:634
+#: src/preferences.cpp:644
 msgid "Show Team Colors"
 msgstr ""
 
-#: src/preferences.cpp:635
+#: src/preferences.cpp:645
 msgid "Show Color Cursors"
 msgstr ""
 
-#: src/preferences.cpp:636
+#: src/preferences.cpp:646
 msgid "Show Haloing Effects"
 msgstr ""
 
-#: src/preferences.cpp:637
+#: src/preferences.cpp:647
 msgid "Video Mode"
 msgstr ""
 
-#: src/preferences.cpp:638
+#: src/preferences.cpp:648
 msgid "Hotkeys"
 msgstr ""
 
-#: src/preferences.cpp:639
+#: src/preferences.cpp:649
 msgid "Adjust Gamma"
 msgstr ""
 
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
 msgid "Music Volume:"
 msgstr ""
 
-#: src/preferences.cpp:640
+#: src/preferences.cpp:650
 msgid "SFX Volume:"
 msgstr ""
 
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
 msgid "Gamma:"
 msgstr ""
 
-#: src/preferences.cpp:641
+#: src/preferences.cpp:651
 msgid "Scroll Speed:"
 msgstr ""
 
-#: src/preferences.cpp:653
+#: src/preferences.cpp:663
 msgid "Change the sound effects volume"
 msgstr ""
 
-#: src/preferences.cpp:658
+#: src/preferences.cpp:668
 msgid "Change the music volume"
 msgstr ""
 
-#: src/preferences.cpp:663
+#: src/preferences.cpp:673
 msgid "Change the speed of scrolling around the map"
 msgstr ""
 
-#: src/preferences.cpp:666 src/preferences.cpp:671
+#: src/preferences.cpp:676 src/preferences.cpp:681
 msgid "Change the brightness of the display"
 msgstr ""
 
-#: src/preferences.cpp:674
+#: src/preferences.cpp:684
 msgid "Choose whether the game should run full screen or in a window"
 msgstr ""
 
-#: src/preferences.cpp:677
+#: src/preferences.cpp:687
 msgid "Make units move and fight faster"
 msgstr ""
 
-#: src/preferences.cpp:680
+#: src/preferences.cpp:690
 msgid "Do not animate AI units moving"
 msgstr ""
 
-#: src/preferences.cpp:683
+#: src/preferences.cpp:693
 msgid "Overlay a grid onto the map"
 msgstr ""
 
-#: src/preferences.cpp:686
+#: src/preferences.cpp:696
 msgid "Show text above a unit when it is hit to display damage inflicted"
 msgstr ""
 
-#: src/preferences.cpp:688
+#: src/preferences.cpp:698
 msgid "Change the resolution the game runs at"
 msgstr ""
 
-#: src/preferences.cpp:691
+#: src/preferences.cpp:701
 msgid "Display a dialog at the beginning of your turn"
 msgstr ""
 
-#: src/preferences.cpp:694
+#: src/preferences.cpp:704
 msgid "Play a bell sound at the beginning of your turn"
 msgstr ""
 
-#: src/preferences.cpp:697
+#: src/preferences.cpp:707
 msgid ""
 "Show a colored circle around the base of each unit to show which side it is "
 "on"
 msgstr ""
 
-#: src/preferences.cpp:700
+#: src/preferences.cpp:710
 msgid "Use colored mouse cursors (may be slower)"
 msgstr ""
 
-#: src/preferences.cpp:703
+#: src/preferences.cpp:713
 msgid "Use graphical special effects (may be slower)"
 msgstr ""
 
-#: src/preferences.cpp:705
+#: src/preferences.cpp:715
 msgid "View and configure keyboard shortcuts"
 msgstr ""
 
-#: src/preferences.cpp:898
+#: src/preferences.cpp:908
 msgid "Prefs section^General"
 msgstr ""
 
-#: src/preferences.cpp:899
+#: src/preferences.cpp:909
 msgid "Prefs section^Display"
 msgstr ""
 
-#: src/preferences.cpp:900
+#: src/preferences.cpp:910
 msgid "Prefs section^Sound"
 msgstr ""
 
-#: src/preferences.cpp:956
+#: src/preferences.cpp:966
 msgid "There are no alternative video modes available"
 msgstr ""
 
-#: src/preferences.cpp:987
+#: src/preferences.cpp:996
 msgid "Choose Resolution"
 msgstr ""
 
-#: src/preferences.cpp:1015
+#: src/preferences.cpp:1024
 msgid "Hotkey Settings"
 msgstr ""
 
-#: src/preferences.cpp:1019 src/preferences.cpp:1077
+#: src/preferences.cpp:1028 src/preferences.cpp:1086
 msgid "Press desired HotKey"
 msgstr ""
 
-#: src/preferences.cpp:1038
+#: src/preferences.cpp:1047
 msgid "Change Hotkey"
 msgstr ""
 
-#: src/preferences.cpp:1041
+#: src/preferences.cpp:1050
 msgid "Save Hotkeys"
 msgstr ""
 
-#: src/preferences.cpp:1110
+#: src/preferences.cpp:1119
 msgid "This HotKey is already in use."
 msgstr ""
 
@@ -16318,7 +16354,7 @@ msgstr ""
 msgid "Allied"
 msgstr ""
 
-#: src/show_dialog.cpp:941
+#: src/show_dialog.cpp:931
 msgid "KB"
 msgstr ""