[Wesnoth-cvs-commits] wesnoth/po/wesnoth zh_CN.po

[Jord� Polo]

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Jordà Polo <address@hidden>     05/05/18 16:01:32

Modified files:
        po/wesnoth     : zh_CN.po 

Log message:
        update chinese translation

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/zh_CN.po.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: wesnoth/po/wesnoth/zh_CN.po
diff -u wesnoth/po/wesnoth/zh_CN.po:1.11 wesnoth/po/wesnoth/zh_CN.po:1.12
--- wesnoth/po/wesnoth/zh_CN.po:1.11    Tue May 10 18:04:27 2005
+++ wesnoth/po/wesnoth/zh_CN.po Wed May 18 16:01:31 2005
@@ -1,67 +1,61 @@
-# #-#-#-#-#  wesnoth.cpp1.po (Battle for Wesnoth VERSION)  #-#-#-#-#
 # Chinese translations for Battle for Wesnoth package.
 # Copyright (C) 2005 Wesnoth development team
 # This file is distributed under the same license as the Battle for Wesnoth 
package.
 # Automatically generated, 2005.
+# Lim Choon Kiat <address@hidden>, 2005.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Battle for Wesnoth 0.8.11+cvs\n"
+"Project-Id-Version: wesnoth\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2005-05-10 19:30+0200\n"
-"PO-Revision-Date: 2005-04-09 11:32+0200\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"POT-Creation-Date: 2005-04-18 17:52+0200\n"
+"PO-Revision-Date: 2005-05-18 18:21+0800\n"
+"Last-Translator: Lim Choon Kiat <address@hidden>\n"
+"Language-Team:  <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10\n"
 
 #: data/fonts.cfg:4
 msgid "Vera.ttf,Bepa-Roman.ttf,FreeSans.ttf,sazanami-gothic.ttf"
 msgstr "Vera.ttf,Bepa-Roman.ttf,FreeSans.ttf,gkai00mp.ttf,sazanami-gothic.ttf"
 
-#: data/game.cfg:36
-msgid "Binary Saves"
-msgstr ""
-
-#: data/game.cfg:43
-msgid "Show Combat"
-msgstr ""
-
 #: data/help.cfg:10 data/help.cfg:53 data/help.cfg:59
 msgid "Introduction"
-msgstr ""
+msgstr "游戏介绍"
 
 #: data/help.cfg:16
 msgid "Gameplay"
-msgstr ""
+msgstr "游戏玩法"
+
+#: data/help.cfg:22 data/help.cfg:209 src/playturn.cpp:2127
 
-#: data/help.cfg:22 data/help.cfg:209 src/playturn.cpp:2142
 msgid "Traits"
-msgstr ""
+msgstr "特征"
 
-#: data/help.cfg:28 src/playturn.cpp:1706
+#: data/help.cfg:28 src/playturn.cpp:1692
 msgid "Units"
-msgstr ""
+msgstr "单位"
 
 #: data/help.cfg:34
 msgid "Abilities"
-msgstr ""
+msgstr "特能"
 
 #: data/help.cfg:41
 msgid "Weapon Specials"
-msgstr ""
+msgstr "武器特异"
 
 #: data/help.cfg:47
 msgid "Terrains"
-msgstr ""
+msgstr "地形"
 
 #: data/help.cfg:54
 msgid ""
 "Certain units have abilities that either directly affect other units, or "
 "have an impact on how the unit interacts with other units. These abilities "
 "will be listed under this topic as you encounter them."
-msgstr ""
+msgstr "某些单位有特能，可直接影响å…
¶ä»–单位，或影响那单位对å…
¶ä»–单位的沟通。这些特能将在这文稿中被讨论。"
 
 #: data/help.cfg:62
 msgid ""
@@ -74,10 +68,13 @@
 "simple rules arise a wealth of strategy, making the game easy to learn but a "
 "challenge to master."
 msgstr ""
+"\n"
+"\n"
+"“魏诺之战”是个用步伐形式玩的策划游戏、有如许多现代的策划游戏。通常，å
…¶ä»–的游戏包
含这复杂的规条与玩法，“魏诺之战”却讲究简单条例与玩法
 － è™½ç®€æ˜“å´åˆèƒ½æ¿€å‘æ— 
穷的计议，从而成为一个易学却不易专的游戏。"
 
 #: data/help.cfg:67
 msgid "Fundamentals of Gameplay"
-msgstr ""
+msgstr "基本游戏玩法原则"
 
 #: data/help.cfg:68
 msgid ""
@@ -85,9 +82,11 @@
 "covers how to play and the basic mechanics behind the game. Keep in mind "
 "that this is just an outline - for special exceptions and situations, please "
 "follow the links included."
-msgstr ""
+msgstr "è¿™ç¯‡æ–‡ç« æè¿°çŽ©â€œé­è¯ºä¹‹æˆ˜â€çš„å¿…
须知识。它讲述如何玩和基本游戏控制。要紧记，这篇只是扼要概念。如果要é˜
…读特别情况或变化，请跟随其中网接。"
 
 #: data/help.cfg:70
+
+#: I translated campaign to "演义", that carries forward the "taste" of the 
well known Chinese Classic "三国演义" (Romance of the Three Kingdoms), 
which is a story about a Chinese war fought between 刘备(liu bei)，曹操 
(cao cao) and many other war heroes well known among the Chinese.
 msgid ""
 "\n"
 "\n"
@@ -98,17 +97,20 @@
 "then <italic>text='Heir to the Throne'</italic>. As Battle for Wesnoth can "
 "be quite challenging, you may wish to start on <italic>text=Easy</italic>."
 msgstr ""
+"\n"
+"\n"
+"开始玩时，建议您在主菜单选择<italic>text=å­¦ä¹ 
</italic>ã€‚è¿™å°†å¸¦æ‚¨åˆ°ä¸€ä¸ªèƒ½ä¸Žæ‚¨æ²Ÿé€šçš„å­¦ä¹ çŽ¯å¢ƒï¼Œä»Žè€Œå­¦ä¹ 
魏诺的基本战略。过后，建议您先玩演义：“续位者
之战”。先选<italic>text=演义</italic>，再选<italic>text=“续位者
之战”</italic>ã€‚â€œé­è¯ºä¹‹æˆ˜â€æŒ‘æˆ˜æ€§å¾ˆé«˜ï¼Œå› æ­¤å»ºè®®æ‚¨å¼€å§‹å…
ˆé€‰<italic>text=容易</italic>。 "
 
 #: data/help.cfg:73
 msgid ""
 "While playing, keep in mind that if you mouse-over many items on the menu "
 "bar to the right, a brief description will pop up explaining each item. This "
 "is especially useful when you encounter new abilities for the first time."
-msgstr ""
+msgstr "åœ¨çŽ©çš„å½“å„¿ï¼Œç´§è®°ï¼šæ‚¨å¦‚å°†ç”µé¼ 
越过左边目录的字句，一个简短的描述将会呈上来。这功能在您看到新特能时，将非常有用。"
 
 #: data/help.cfg:78
 msgid "Recruiting and Recalling"
-msgstr ""
+msgstr "征兵与宣将"
 
 #: data/help.cfg:79
 msgid ""
@@ -120,7 +122,7 @@
 "menu, which lists units available for recruitment, along with their gold "
 "cost. Click on a unit to see its statistics to the left, then press the "
 "recruit button to recruit it."
-msgstr ""
+msgstr "在新战，或战中，您会需要征兵入伍。如要征å…
µï¼Œæ‚¨å¾—将领导者（孔列，“续位者
ä¹‹æˆ˜â€æ¼”ä¹‰ï¼‰å¸¦åˆ°åŸŽçš„å†›æ——æ ¼å­ã€‚ç„¶åŽï¼Œæ‚¨å¯ç”¨å•ä¸Šçš„â€œå¾å…
µâ€ï¼Œæˆ–åœ¨åŸŽæ—çš„æ ¼å­ä¸Šå·¦æŒ‰ï¼Œå†é€‰<italic>text=征å…
µ</italic>。这将呈上征兵单，内含可征的兵士与征聘价æ 
¼ã€‚按任何一个兵士，就可在右边看到å…
µå£«çš„描述。选按“征兵”钮就可征那兵。"
 
 #: data/help.cfg:81
 msgid ""
@@ -131,6 +133,9 @@
 "keep. You may only recruit as many units as you have free hexes in your "
 "castle, and you cannot spend more gold than you actually have on recruiting."
 msgstr ""
+"\n"
+"\n"
+"æ‚¨å¦‚æžœå·¦æŒ‰åŸŽæ—æ ¼å­ï¼Œå†é€‰å¾å…µï¼Œæ–°å…µå°†å‡ºçŽ°åœ¨é‚£æ 
¼å­é‡Œã€‚要不然，新兵将出现在任何城旁的空æ 
¼é‡Œã€‚æ‚¨åªèƒ½å¾è˜ä¸Žç©ºæ ¼ç›¸åŒçš„é‡æ•°ï¼Œä½†æ€»å†›è´¹å´ä¸èƒ½è¶…
出您所拥有的金。"
 
 #: data/help.cfg:83
 msgid ""
@@ -139,6 +144,9 @@
 "Recruited units come with two random <ref>dst=traits text=Traits</ref> which "
 "modify their statistics."
 msgstr ""
+"\n"
+"\n"
+"新兵有两个乱选的<ref>dst=traits text=特征</ref>，将稍改å…
¶æœ¬èƒ½ã€‚"
 
 #: data/help.cfg:85
 msgid ""
@@ -159,7 +167,7 @@
 "Upkeep'</ref> for more information."
 msgstr ""
 
-#: data/help.cfg:92 src/help.cpp:1177
+#: data/help.cfg:92 src/help.cpp:1235 src/help.cpp:1236
 msgid "Movement"
 msgstr ""
 
@@ -572,7 +580,7 @@
 "advance to higher levels more quickly. Later in campaigns Intelligent is not "
 "quite as useful because units no longer have any use for experience points "
 "after reaching their maximum level. If you have many 'maximum level' units "
-"you may wish to recall units with more desirable traits."
+"you may with to recall units with more desirable traits."
 msgstr ""
 
 #: data/help.cfg:226
@@ -1005,8 +1013,7 @@
 msgstr ""
 
 #: data/scenarios/multiplayer/IcyWaters.cfg:5
-msgid ""
-"Battle in and around the icy waters of this crucial harbor in North Wesnoth."
+msgid "Battle in and around the icy waters of this crucial harbor in North 
Wesnoth."
 msgstr ""
 
 #: data/scenarios/multiplayer/Random_Scenario.cfg:3
@@ -1426,8 +1433,7 @@
 msgstr ""
 
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:167
-msgid ""
-"Many units have a specialty which changes the rules of play in some way."
+msgid "Many units have a specialty which changes the rules of play in some 
way."
 msgstr ""
 
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:189
@@ -2159,11 +2165,11 @@
 msgid "End Turn"
 msgstr ""
 
-#: data/themes/default.cfg:167 src/playturn.cpp:2140 src/unit.cpp:1059
+#: data/themes/default.cfg:167 src/playturn.cpp:2125 src/unit.cpp:1046
 msgid "HP"
 msgstr ""
 
-#: data/themes/default.cfg:176 src/playturn.cpp:2141
+#: data/themes/default.cfg:176 src/playturn.cpp:2126
 msgid "XP"
 msgstr ""
 
@@ -2264,8 +2270,7 @@
 msgstr ""
 
 #: data/tips.cfg:9
-msgid ""
-"Units stationed in villages heal 8 hitpoints at the beginning of their turn."
+msgid "Units stationed in villages heal 8 hitpoints at the beginning of their 
turn."
 msgstr ""
 
 #: data/tips.cfg:10
@@ -2314,8 +2319,7 @@
 msgstr ""
 
 #: data/tips.cfg:17
-msgid ""
-"Do not be afraid to retreat and regroup, it is often the key to victory."
+msgid "Do not be afraid to retreat and regroup, it is often the key to 
victory."
 msgstr ""
 
 #: data/tips.cfg:18
@@ -2560,17 +2564,17 @@
 msgstr ""
 
 #: data/translations/english.cfg:56 data/units/Commander.cfg:11
-#: data/units/Commander.cfg:98 data/units/Death_Knight.cfg:16
+#: data/units/Commander.cfg:86 data/units/Death_Knight.cfg:16
 #: data/units/Drake_Flameheart.cfg:15 data/units/Drake_Flare.cfg:10
 #: data/units/Elvish_Captain.cfg:11 data/units/Elvish_Marshal.cfg:12
 #: data/units/Fire_Dragon.cfg:7 data/units/General.cfg:23
 #: data/units/Grand_Marshal.cfg:19 data/units/Lieutenant.cfg:19
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:85
-#: data/units/Noble_Commander.cfg:15 data/units/Noble_Lord.cfg:15
+#: data/units/Noble_Commander.cfg:15 data/units/Noble_Lord.cfg:13
 #: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
 #: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
 #: data/units/Princess.cfg:56 data/units/Sergeant.cfg:20
-#: data/units/Warrior_King.cfg:20 src/actions.cpp:439 src/actions.cpp:548
+#: data/units/Warrior_King.cfg:20 src/actions.cpp:358 src/actions.cpp:467
 msgid "leadership"
 msgstr ""
 
@@ -2617,7 +2621,7 @@
 msgstr ""
 
 #: data/translations/english.cfg:78 data/units/Assassin.cfg:17
-#: data/units/Assassin.cfg:109 data/units/Duelist.cfg:16
+#: data/units/Assassin.cfg:96 data/units/Duelist.cfg:16
 #: data/units/Fencer.cfg:16 data/units/Outlaw_Princess.cfg:20
 #: data/units/Rogue.cfg:17 data/units/Rogue.cfg:77 data/units/Saurian.cfg:22
 #: data/units/Saurian_Ambusher.cfg:20 data/units/Saurian_Flanker.cfg:21
@@ -2631,9 +2635,9 @@
 "This unit takes half normal damage when it did not initiate the attack."
 msgstr ""
 
-#: data/translations/english.cfg:83 data/units/Dwarvish_Guardsman.cfg:16
-#: data/units/Dwarvish_Sentinel.cfg:18 data/units/Dwarvish_Stalwart.cfg:18
-#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:575
+#: data/translations/english.cfg:83 data/units/Dwarvish_Guardsman.cfg:15
+#: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
+#: data/units/Merman_Hoplite.cfg:26 src/actions.cpp:494
 msgid "steadfast"
 msgstr ""
 
@@ -2774,8 +2778,7 @@
 msgstr ""
 
 #: data/translations/english.cfg:144
-msgid ""
-"$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
+msgid 
"$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 
 #: data/units/Ancient_Lich.cfg:3
@@ -2791,18 +2794,17 @@
 "far, for they move faster than most undead."
 msgstr ""
 
-#: data/units/Ancient_Lich.cfg:41 data/units/Demilich.cfg:31
+#: data/units/Ancient_Lich.cfg:22 data/units/Demilich.cfg:19
 #: data/units/Ghost.cfg:19 data/units/Lich.cfg:19
 msgid "touch"
 msgstr ""
 
-#: data/units/Ancient_Lich.cfg:42 data/units/Ancient_Lich.cfg:55
-#: data/units/Cockatrice.cfg:34 data/units/Dark_Adept.cfg:35
-#: data/units/Dark_Queen.cfg:45 data/units/Dark_Queen.cfg:46
-#: data/units/Dark_Sorcerer.cfg:41 data/units/Dark_Spirit.cfg:49
-#: data/units/Deathmaster.cfg:53 data/units/Demilich.cfg:32
-#: data/units/Demilich.cfg:45 data/units/Elvish_Enchantress.cfg:118
-#: data/units/Elvish_High_Lord.cfg:43 data/units/Elvish_Lord.cfg:39
+#: data/units/Ancient_Lich.cfg:23 data/units/Ancient_Lich.cfg:36
+#: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
+#: data/units/Dark_Queen.cfg:33 data/units/Dark_Queen.cfg:34
+#: data/units/Dark_Sorcerer.cfg:41 data/units/Dark_Spirit.cfg:37
+#: data/units/Deathmaster.cfg:41 data/units/Demilich.cfg:20
+#: data/units/Demilich.cfg:33 data/units/Elvish_Enchantress.cfg:118
 #: data/units/Elvish_Sorceress.cfg:118 data/units/Elvish_Sylph.cfg:84
 #: data/units/Ghost.cfg:20 data/units/Ghost.cfg:32 data/units/Initiate.cfg:20
 #: data/units/Lich.cfg:20 data/units/Lich.cfg:33 data/units/Necromancer.cfg:36
@@ -2812,30 +2814,30 @@
 msgid "cold"
 msgstr ""
 
-#: data/units/Ancient_Lich.cfg:46 data/units/Blood_Bat.cfg:37
-#: data/units/Dark_Spirit.cfg:36 data/units/Demilich.cfg:36
+#: data/units/Ancient_Lich.cfg:27 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:24
 #: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:41
 #: data/units/Orcish_Shaman.cfg:100 data/units/Orcish_Shaman.cfg:159
-#: data/units/Skeletal_Dragon.cfg:33 data/units/Spectre.cfg:29
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:29
 #: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
 #: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:29
 msgid "drain"
 msgstr ""
 
-#: data/units/Ancient_Lich.cfg:54 data/units/Deathmaster.cfg:52
-#: data/units/Demilich.cfg:44 data/units/Initiate.cfg:19
+#: data/units/Ancient_Lich.cfg:35 data/units/Deathmaster.cfg:40
+#: data/units/Demilich.cfg:32 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr ""
 
-#: data/units/Ancient_Lich.cfg:56 data/units/Arch_Mage.cfg:60
-#: data/units/Arch_Mage.cfg:168 data/units/Battle_Princess.cfg:92
-#: data/units/Commander.cfg:135 data/units/Dark_Adept.cfg:36
-#: data/units/Dark_Queen.cfg:47 data/units/Dark_Sorcerer.cfg:42
-#: data/units/Deathmaster.cfg:54 data/units/Demilich.cfg:46
+#: data/units/Ancient_Lich.cfg:37 data/units/Arch_Mage.cfg:47
+#: data/units/Arch_Mage.cfg:140 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:35 data/units/Dark_Sorcerer.cfg:42
+#: data/units/Deathmaster.cfg:42 data/units/Demilich.cfg:34
 #: data/units/Dwarvish_Runemaster.cfg:47 data/units/Elder_Mage.cfg:42
 #: data/units/Elvish_Druid.cfg:65 data/units/Elvish_Enchantress.cfg:122
-#: data/units/Elvish_High_Lord.cfg:45 data/units/Elvish_Lord.cfg:41
+#: data/units/Elvish_High_Lord.cfg:44 data/units/Elvish_Lord.cfg:38
 #: data/units/Elvish_Shyde.cfg:27 data/units/Elvish_Shyde.cfg:74
 #: data/units/Elvish_Sorceress.cfg:122 data/units/Elvish_Sylph.cfg:26
 #: data/units/Elvish_Sylph.cfg:85 data/units/Fighter.cfg:86
@@ -2878,16 +2880,16 @@
 "kind and curious beings."
 msgstr ""
 
-#: data/units/Ancient_Wose.cfg:38 data/units/Elder_Wose.cfg:20
+#: data/units/Ancient_Wose.cfg:20 data/units/Elder_Wose.cfg:20
 #: data/units/Wose.cfg:20
 msgid "crush"
 msgstr ""
 
-#: data/units/Ancient_Wose.cfg:39 data/units/Arch_Mage.cfg:37
-#: data/units/Arch_Mage.cfg:145 data/units/Bandit.cfg:33
-#: data/units/Cave_Spider.cfg:47 data/units/Cuttle_Fish.cfg:33
-#: data/units/Dark_Queen.cfg:35 data/units/Dark_Sorcerer.cfg:20
-#: data/units/Deathmaster.cfg:32 data/units/Drake_Gladiator.cfg:63
+#: data/units/Ancient_Wose.cfg:21 data/units/Arch_Mage.cfg:24
+#: data/units/Arch_Mage.cfg:117 data/units/Bandit.cfg:20
+#: data/units/Cave_Spider.cfg:34 data/units/Cuttle_Fish.cfg:20
+#: data/units/Dark_Queen.cfg:23 data/units/Dark_Sorcerer.cfg:20
+#: data/units/Deathmaster.cfg:20 data/units/Drake_Gladiator.cfg:63
 #: data/units/Drake_Glider.cfg:22 data/units/Drake_Sky.cfg:28
 #: data/units/Dwarvish_Dragonguard.cfg:21 data/units/Dwarvish_Fighter.cfg:40
 #: data/units/Dwarvish_Lord.cfg:45 data/units/Dwarvish_Runemaster.cfg:21
@@ -2945,14 +2947,14 @@
 msgid "Arch Mage"
 msgstr ""
 
-#: data/units/Arch_Mage.cfg:20 data/units/Arch_Mage.cfg:126
+#: data/units/Arch_Mage.cfg:20 data/units/Arch_Mage.cfg:113
 msgid ""
 "Leaders among the mages, the Arch Mages hurl huge balls of fire at their "
 "enemies."
 msgstr ""
 
-#: data/units/Arch_Mage.cfg:36 data/units/Arch_Mage.cfg:144
-#: data/units/Dark_Sorcerer.cfg:19 data/units/Deathmaster.cfg:31
+#: data/units/Arch_Mage.cfg:23 data/units/Arch_Mage.cfg:116
+#: data/units/Dark_Sorcerer.cfg:19 data/units/Deathmaster.cfg:19
 #: data/units/Elder_Mage.cfg:23 data/units/Elvish_Druid.cfg:23
 #: data/units/Elvish_Enchantress.cfg:25 data/units/Elvish_Shaman.cfg:24
 #: data/units/Elvish_Sorceress.cfg:25 data/units/Great_Mage.cfg:23
@@ -2970,20 +2972,22 @@
 msgid "staff"
 msgstr ""
 
-#: data/units/Arch_Mage.cfg:57 data/units/Arch_Mage.cfg:165
+#: data/units/Arch_Mage.cfg:44 data/units/Arch_Mage.cfg:137
+#: data/units/Elvish_High_Lord.cfg:42 data/units/Elvish_Lord.cfg:36
 #: data/units/Great_Mage.cfg:44 data/units/Great_Mage.cfg:137
 #: data/units/Red_Mage.cfg:44 data/units/Red_Mage.cfg:137
 msgid "fireball"
 msgstr ""
 
-#: data/units/Arch_Mage.cfg:58 data/units/Arch_Mage.cfg:166
-#: data/units/Battle_Princess.cfg:90 data/units/Commander.cfg:133
-#: data/units/Drake_Burner.cfg:55 data/units/Drake_Fighter.cfg:58
-#: data/units/Drake_Fire.cfg:56 data/units/Drake_Flameheart.cfg:54
+#: data/units/Arch_Mage.cfg:45 data/units/Arch_Mage.cfg:138
+#: data/units/Battle_Princess.cfg:78 data/units/Commander.cfg:121
+#: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
+#: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:54
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:46
 #: data/units/Drake_Inferno.cfg:44 data/units/Drake_Sky.cfg:52
 #: data/units/Drake_Warrior.cfg:47 data/units/Dwarvish_Runemaster.cfg:42
-#: data/units/Elder_Mage.cfg:40 data/units/Fighter.cfg:84
+#: data/units/Elder_Mage.cfg:40 data/units/Elvish_High_Lord.cfg:43
+#: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
 #: data/units/Fire_Dragon.cfg:60 data/units/Fireball.cfg:18
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:21
 #: data/units/Great_Mage.cfg:45 data/units/Great_Mage.cfg:138
@@ -2994,7 +2998,7 @@
 msgid "fire"
 msgstr ""
 
-#: data/units/Arch_Mage.cfg:109
+#: data/units/Arch_Mage.cfg:96
 msgid "female^Arch Mage"
 msgstr ""
 
@@ -3002,14 +3006,14 @@
 msgid "Assassin"
 msgstr ""
 
-#: data/units/Assassin.cfg:18 data/units/Assassin.cfg:110
+#: data/units/Assassin.cfg:18 data/units/Assassin.cfg:97
 msgid ""
 "Assassins are masters of the night. Like Rogues, they can surround an "
 "opponent and backstab him, doing double damage. They can also throw poison-"
 "tipped knives at their enemies from long range."
 msgstr ""
 
-#: data/units/Assassin.cfg:34 data/units/Assassin.cfg:113
+#: data/units/Assassin.cfg:21 data/units/Assassin.cfg:100
 #: data/units/Dwarvish_Thunderer.cfg:20
 #: data/units/Dwarvish_Thunderguard.cfg:20 data/units/Orcish_Archer.cfg:21
 #: data/units/Orcish_Assassin.cfg:19 data/units/Orcish_Slayer.cfg:19
@@ -3018,32 +3022,32 @@
 msgid "dagger"
 msgstr ""
 
-#: data/units/Assassin.cfg:35 data/units/Assassin.cfg:66
-#: data/units/Assassin.cfg:114 data/units/Assassin.cfg:145
-#: data/units/Battle_Princess.cfg:36 data/units/Battle_Princess.cfg:74
-#: data/units/Blood_Bat.cfg:33 data/units/Bone_Shooter.cfg:38
-#: data/units/Bowman.cfg:34 data/units/Cavalier.cfg:41
-#: data/units/Cavalryman.cfg:42 data/units/Cave_Spider.cfg:33
-#: data/units/Commander.cfg:36 data/units/Commander.cfg:111
-#: data/units/Dark_Spirit.cfg:32 data/units/Death_Knight.cfg:34
-#: data/units/Deathblade.cfg:40 data/units/Direwolf_Rider.cfg:38
-#: data/units/Direwolf_Rider.cfg:50 data/units/Dragoon.cfg:46
-#: data/units/Drake_Burner.cfg:35 data/units/Drake_Clasher.cfg:34
-#: data/units/Drake_Fighter.cfg:34 data/units/Drake_Fire.cfg:37
+#: data/units/Assassin.cfg:22 data/units/Assassin.cfg:53
+#: data/units/Assassin.cfg:101 data/units/Assassin.cfg:132
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
+#: data/units/Blood_Bat.cfg:20 data/units/Bone_Shooter.cfg:26
+#: data/units/Bowman.cfg:22 data/units/Cavalier.cfg:29
+#: data/units/Cavalryman.cfg:30 data/units/Cave_Spider.cfg:20
+#: data/units/Commander.cfg:24 data/units/Commander.cfg:99
+#: data/units/Dark_Spirit.cfg:20 data/units/Death_Knight.cfg:22
+#: data/units/Deathblade.cfg:29 data/units/Direwolf_Rider.cfg:21
+#: data/units/Direwolf_Rider.cfg:33 data/units/Dragoon.cfg:29
+#: data/units/Drake_Burner.cfg:22 data/units/Drake_Clasher.cfg:22
+#: data/units/Drake_Fighter.cfg:22 data/units/Drake_Fire.cfg:25
 #: data/units/Drake_Flameheart.cfg:24 data/units/Drake_Flare.cfg:24
 #: data/units/Drake_Gladiator.cfg:26 data/units/Drake_Inferno.cfg:25
 #: data/units/Drake_Slasher.cfg:23 data/units/Drake_Warrior.cfg:23
-#: data/units/Draug.cfg:37 data/units/Duelist.cfg:34
-#: data/units/Dwarvish_Berserker.cfg:34 data/units/Dwarvish_Fighter.cfg:23
+#: data/units/Draug.cfg:25 data/units/Duelist.cfg:21
+#: data/units/Dwarvish_Berserker.cfg:28 data/units/Dwarvish_Fighter.cfg:23
 #: data/units/Dwarvish_Lord.cfg:28 data/units/Dwarvish_Lord.cfg:61
 #: data/units/Dwarvish_Steelclad.cfg:29 data/units/Dwarvish_Thunderer.cfg:21
 #: data/units/Dwarvish_Thunderguard.cfg:21
-#: data/units/Dwarvish_Ulfserker.cfg:34 data/units/Elvish_Archer.cfg:24
+#: data/units/Dwarvish_Ulfserker.cfg:28 data/units/Elvish_Archer.cfg:24
 #: data/units/Elvish_Archer.cfg:103 data/units/Elvish_Avenger.cfg:25
 #: data/units/Elvish_Avenger.cfg:113 data/units/Elvish_Captain.cfg:25
 #: data/units/Elvish_Champion.cfg:23 data/units/Elvish_Fighter.cfg:25
 #: data/units/Elvish_Hero.cfg:23 data/units/Elvish_High_Lord.cfg:22
-#: data/units/Elvish_Lord.cfg:23 data/units/Elvish_Marksman.cfg:24
+#: data/units/Elvish_Lord.cfg:21 data/units/Elvish_Marksman.cfg:24
 #: data/units/Elvish_Marksman.cfg:117 data/units/Elvish_Marshal.cfg:26
 #: data/units/Elvish_Outrider.cfg:28 data/units/Elvish_Ranger.cfg:25
 #: data/units/Elvish_Ranger.cfg:115 data/units/Elvish_Rider.cfg:32
@@ -3054,7 +3058,7 @@
 #: data/units/Ghoul.cfg:20 data/units/Goblin_Knight.cfg:21
 #: data/units/Grand_Knight.cfg:22 data/units/Grand_Marshal.cfg:25
 #: data/units/Gryphon.cfg:23 data/units/Gryphon_Master.cfg:25
-#: data/units/Gryphon_Rider.cfg:24 data/units/Halbardier.cfg:65
+#: data/units/Gryphon_Rider.cfg:24 data/units/Halbardier.cfg:40
 #: data/units/Horse_Lord.cfg:23 data/units/Knight.cfg:22
 #: data/units/Lieutenant.cfg:25 data/units/Longbowman.cfg:23
 #: data/units/Lord.cfg:23 data/units/Lord.cfg:98
@@ -3066,7 +3070,7 @@
 #: data/units/Naga-Warrior.cfg:26 data/units/Naga-Warrior.cfg:65
 #: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
 #: data/units/Noble_Commander.cfg:29 data/units/Noble_Fighter.cfg:24
-#: data/units/Noble_Lord.cfg:28 data/units/Ogre.cfg:20
+#: data/units/Noble_Lord.cfg:26 data/units/Ogre.cfg:20
 #: data/units/Orcish_Archer.cfg:22 data/units/Orcish_Assassin.cfg:20
 #: data/units/Orcish_Assassin.cfg:37 data/units/Orcish_Crossbowman.cfg:21
 #: data/units/Orcish_Grunt.cfg:20 data/units/Orcish_Leader.cfg:22
@@ -3078,8 +3082,8 @@
 #: data/units/Rogue.cfg:22 data/units/Rogue.cfg:40 data/units/Rogue.cfg:82
 #: data/units/Rogue.cfg:100 data/units/Royal_Guard.cfg:24
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:25
-#: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Skeletal_Dragon.cfg:50 data/units/Skeleton.cfg:38
+#: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
+#: data/units/Skeletal_Dragon.cfg:48 data/units/Skeleton.cfg:38
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:25
 #: data/units/Swordsman.cfg:24 data/units/Thief.cfg:85
 #: data/units/Thief.cfg:186 data/units/Trapper.cfg:26
@@ -3089,27 +3093,27 @@
 msgid "blade"
 msgstr ""
 
-#: data/units/Assassin.cfg:39 data/units/Assassin.cfg:118
+#: data/units/Assassin.cfg:26 data/units/Assassin.cfg:105
 #: data/units/Nightgaunt.cfg:25 data/units/Rogue.cfg:26
 #: data/units/Rogue.cfg:86 data/units/Shadow.cfg:25 data/units/Thief.cfg:89
-#: data/units/Thief.cfg:190 src/actions.cpp:566
+#: data/units/Thief.cfg:190 src/actions.cpp:485
 msgid "backstab"
 msgstr ""
 
-#: data/units/Assassin.cfg:65 data/units/Assassin.cfg:144
+#: data/units/Assassin.cfg:52 data/units/Assassin.cfg:131
 #: data/units/Rogue.cfg:39 data/units/Rogue.cfg:99
 msgid "knife"
 msgstr ""
 
-#: data/units/Assassin.cfg:68 data/units/Assassin.cfg:147
-#: data/units/Cave_Spider.cfg:37 data/units/Cuttle_Fish.cfg:73
-#: data/units/Direwolf_Rider.cfg:54 data/units/Ghoul.cfg:24
+#: data/units/Assassin.cfg:55 data/units/Assassin.cfg:134
+#: data/units/Cave_Spider.cfg:24 data/units/Cuttle_Fish.cfg:60
+#: data/units/Direwolf_Rider.cfg:37 data/units/Ghoul.cfg:24
 #: data/units/Giant_Scorpion.cfg:22 data/units/Necrophage.cfg:24
 #: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
 msgid "poison"
 msgstr ""
 
-#: data/units/Assassin.cfg:95
+#: data/units/Assassin.cfg:82
 msgid "female^Assassin"
 msgstr ""
 
@@ -3124,7 +3128,7 @@
 "near them when not fighting against invaders."
 msgstr ""
 
-#: data/units/Bandit.cfg:32 data/units/Drake_Gladiator.cfg:62
+#: data/units/Bandit.cfg:19 data/units/Drake_Gladiator.cfg:62
 #: data/units/Great_Troll.cfg:21 data/units/Heavy_Infantryman.cfg:19
 #: data/units/Iron_Mauler.cfg:19 data/units/Mage_of_Light.cfg:30
 #: data/units/Mage_of_Light.cfg:102 data/units/Outlaw.cfg:20
@@ -3137,7 +3141,7 @@
 msgid "female^Princess"
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:68
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr ""
 
@@ -3149,11 +3153,11 @@
 "now aid those around her in the art of combat."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:35 data/units/Battle_Princess.cfg:73
-#: data/units/Bowman.cfg:33 data/units/Cavalier.cfg:40
-#: data/units/Cavalryman.cfg:41 data/units/Commander.cfg:35
-#: data/units/Commander.cfg:110 data/units/Deathblade.cfg:39
-#: data/units/Dragoon.cfg:45 data/units/Drake_Clasher.cfg:33
+#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Bowman.cfg:21 data/units/Cavalier.cfg:28
+#: data/units/Cavalryman.cfg:29 data/units/Commander.cfg:23
+#: data/units/Commander.cfg:98 data/units/Deathblade.cfg:28
+#: data/units/Dragoon.cfg:28 data/units/Drake_Clasher.cfg:21
 #: data/units/Drake_Flameheart.cfg:23 data/units/Drake_Flare.cfg:23
 #: data/units/Drake_Gladiator.cfg:25 data/units/Drake_Slasher.cfg:22
 #: data/units/Drake_Warrior.cfg:22 data/units/Elvish_Archer.cfg:23
@@ -3161,7 +3165,7 @@
 #: data/units/Elvish_Avenger.cfg:112 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_High_Lord.cfg:21
-#: data/units/Elvish_Lord.cfg:22 data/units/Elvish_Marksman.cfg:23
+#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:23
 #: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Marshal.cfg:25
 #: data/units/Elvish_Outrider.cfg:27 data/units/Elvish_Ranger.cfg:24
 #: data/units/Elvish_Ranger.cfg:114 data/units/Elvish_Rider.cfg:31
@@ -3178,7 +3182,7 @@
 #: data/units/Naga-Fighter.cfg:56 data/units/Naga-Myrmidon.cfg:25
 #: data/units/Naga-Myrmidon.cfg:64 data/units/Naga-Warrior.cfg:25
 #: data/units/Naga-Warrior.cfg:64 data/units/Noble_Commander.cfg:28
-#: data/units/Noble_Fighter.cfg:23 data/units/Noble_Lord.cfg:27
+#: data/units/Noble_Fighter.cfg:23 data/units/Noble_Lord.cfg:25
 #: data/units/Orcish_Grunt.cfg:19 data/units/Orcish_Leader.cfg:21
 #: data/units/Orcish_Ruler.cfg:21 data/units/Orcish_Sovereign.cfg:21
 #: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:19
@@ -3189,11 +3193,11 @@
 msgid "sword"
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:54 data/units/Princess.cfg:42
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
 msgid "Princess"
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:70
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -3202,7 +3206,7 @@
 "and ignores enemy zones of control."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:89 data/units/Commander.cfg:132
+#: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:114
 #: data/units/Princess.cfg:77
 msgid "scepter of fire"
@@ -3220,8 +3224,8 @@
 "beasts is tainted red with the blood of their victims."
 msgstr ""
 
-#: data/units/Blood_Bat.cfg:32 data/units/Cave_Spider.cfg:32
-#: data/units/Direwolf_Rider.cfg:37 data/units/Goblin_Knight.cfg:20
+#: data/units/Blood_Bat.cfg:19 data/units/Cave_Spider.cfg:19
+#: data/units/Direwolf_Rider.cfg:20 data/units/Goblin_Knight.cfg:20
 #: data/units/Sea_Serpent.cfg:19 data/units/Vampire_Bat.cfg:19
 #: data/units/Wolf_Rider.cfg:21
 msgid "fangs"
@@ -3240,12 +3244,12 @@
 "all who live."
 msgstr ""
 
-#: data/units/Bone_Shooter.cfg:36 data/units/Soul_Shooter.cfg:24
+#: data/units/Bone_Shooter.cfg:24 data/units/Soul_Shooter.cfg:24
 msgid "stab"
 msgstr ""
 
-#: data/units/Bone_Shooter.cfg:50 data/units/Bowman.cfg:50
-#: data/units/Commander.cfg:57 data/units/Elvish_Archer.cfg:40
+#: data/units/Bone_Shooter.cfg:38 data/units/Bowman.cfg:38
+#: data/units/Commander.cfg:45 data/units/Elvish_Archer.cfg:40
 #: data/units/Elvish_Archer.cfg:119 data/units/Elvish_Avenger.cfg:40
 #: data/units/Elvish_Avenger.cfg:128 data/units/Elvish_Captain.cfg:40
 #: data/units/Elvish_Champion.cfg:41 data/units/Elvish_Fighter.cfg:41
@@ -3254,7 +3258,7 @@
 #: data/units/Elvish_Ranger.cfg:131 data/units/Elvish_Rider.cfg:52
 #: data/units/Elvish_Scout.cfg:53 data/units/Longbowman.cfg:39
 #: data/units/Lord.cfg:39 data/units/Master_Bowman.cfg:33
-#: data/units/Noble_Commander.cfg:46 data/units/Noble_Lord.cfg:45
+#: data/units/Noble_Commander.cfg:46 data/units/Noble_Lord.cfg:43
 #: data/units/Orcish_Archer.cfg:37 data/units/Orcish_Leader.cfg:37
 #: data/units/Orcish_Ruler.cfg:38 data/units/Orcish_Sovereign.cfg:42
 #: data/units/Orcish_Warlord.cfg:30 data/units/Poacher.cfg:42
@@ -3263,16 +3267,16 @@
 msgid "bow"
 msgstr ""
 
-#: data/units/Bone_Shooter.cfg:51 data/units/Bowman.cfg:51
-#: data/units/Cavalier.cfg:62 data/units/Chocobone.cfg:33
-#: data/units/Commander.cfg:58 data/units/Cuttle_Fish.cfg:69
-#: data/units/Death_Knight.cfg:51 data/units/Dragoon.cfg:67
-#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Gladiator.cfg:44
-#: data/units/Drake_Slasher.cfg:41 data/units/Duelist.cfg:50
-#: data/units/Dwarvish_Dragonguard.cfg:39 data/units/Dwarvish_Guardsman.cfg:27
-#: data/units/Dwarvish_Guardsman.cfg:40 data/units/Dwarvish_Sentinel.cfg:29
-#: data/units/Dwarvish_Sentinel.cfg:42 data/units/Dwarvish_Stalwart.cfg:29
-#: data/units/Dwarvish_Stalwart.cfg:42 data/units/Dwarvish_Thunderer.cfg:41
+#: data/units/Bone_Shooter.cfg:39 data/units/Bowman.cfg:39
+#: data/units/Cavalier.cfg:50 data/units/Chocobone.cfg:21
+#: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:56
+#: data/units/Death_Knight.cfg:39 data/units/Dragoon.cfg:50
+#: data/units/Drake_Clasher.cfg:40 data/units/Drake_Gladiator.cfg:44
+#: data/units/Drake_Slasher.cfg:41 data/units/Duelist.cfg:37
+#: data/units/Dwarvish_Dragonguard.cfg:39 data/units/Dwarvish_Guardsman.cfg:26
+#: data/units/Dwarvish_Guardsman.cfg:39 data/units/Dwarvish_Sentinel.cfg:28
+#: data/units/Dwarvish_Sentinel.cfg:41 data/units/Dwarvish_Stalwart.cfg:28
+#: data/units/Dwarvish_Stalwart.cfg:41 data/units/Dwarvish_Thunderer.cfg:41
 #: data/units/Dwarvish_Thunderguard.cfg:47 data/units/Elvish_Archer.cfg:41
 #: data/units/Elvish_Archer.cfg:120 data/units/Elvish_Avenger.cfg:41
 #: data/units/Elvish_Avenger.cfg:129 data/units/Elvish_Captain.cfg:41
@@ -3288,7 +3292,7 @@
 #: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:40
 #: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:34
 #: data/units/Grand_Knight.cfg:38 data/units/Grand_Marshal.cfg:48
-#: data/units/Halbardier.cfg:24 data/units/Horseman.cfg:22
+#: data/units/Halbardier.cfg:22 data/units/Horseman.cfg:22
 #: data/units/Javelineer.cfg:20 data/units/Javelineer.cfg:48
 #: data/units/Knight.cfg:38 data/units/Lancer.cfg:22
 #: data/units/Lieutenant.cfg:42 data/units/Longbowman.cfg:40
@@ -3300,7 +3304,7 @@
 #: data/units/Merman_Netcaster.cfg:20 data/units/Merman_Spearman.cfg:21
 #: data/units/Merman_Spearman.cfg:61 data/units/Merman_Triton.cfg:24
 #: data/units/Merman_Warrior.cfg:24 data/units/Naga.cfg:25
-#: data/units/Noble_Commander.cfg:47 data/units/Noble_Lord.cfg:46
+#: data/units/Noble_Commander.cfg:47 data/units/Noble_Lord.cfg:44
 #: data/units/Orcish_Archer.cfg:38 data/units/Orcish_Crossbowman.cfg:40
 #: data/units/Orcish_Leader.cfg:38 data/units/Orcish_Ruler.cfg:39
 #: data/units/Orcish_Shaman.cfg:37 data/units/Orcish_Shaman.cfg:96
@@ -3348,8 +3352,8 @@
 "turned the tide of some of the greatest battles in known history."
 msgstr ""
 
-#: data/units/Cavalier.cfg:61 data/units/Death_Knight.cfg:50
-#: data/units/Dragoon.cfg:66 data/units/Duelist.cfg:49
+#: data/units/Cavalier.cfg:49 data/units/Death_Knight.cfg:38
+#: data/units/Dragoon.cfg:49 data/units/Duelist.cfg:36
 #: data/units/General.cfg:51 data/units/Grand_Marshal.cfg:47
 #: data/units/Lieutenant.cfg:41 data/units/Orcish_Crossbowman.cfg:39
 #: data/units/Sergeant.cfg:41 data/units/Wall_Guard.cfg:36
@@ -3379,11 +3383,11 @@
 "attack with a web at long range, slowing their foes down."
 msgstr ""
 
-#: data/units/Cave_Spider.cfg:46
+#: data/units/Cave_Spider.cfg:33
 msgid "web"
 msgstr ""
 
-#: data/units/Cave_Spider.cfg:62 data/units/Elvish_Druid.cfg:44
+#: data/units/Cave_Spider.cfg:49 data/units/Elvish_Druid.cfg:44
 #: data/units/Elvish_Enchantress.cfg:67 data/units/Elvish_Shaman.cfg:45
 #: data/units/Elvish_Shyde.cfg:53 data/units/Elvish_Sorceress.cfg:67
 #: data/units/Elvish_Sylph.cfg:53 data/units/Goblin_Pillager.cfg:38
@@ -3402,11 +3406,11 @@
 "units."
 msgstr ""
 
-#: data/units/Chocobone.cfg:32 data/units/Drake_Clasher.cfg:51
+#: data/units/Chocobone.cfg:20 data/units/Drake_Clasher.cfg:39
 #: data/units/Drake_Gladiator.cfg:43 data/units/Drake_Slasher.cfg:40
-#: data/units/Dwarvish_Guardsman.cfg:25 data/units/Dwarvish_Guardsman.cfg:39
-#: data/units/Dwarvish_Sentinel.cfg:27 data/units/Dwarvish_Sentinel.cfg:41
-#: data/units/Dwarvish_Stalwart.cfg:27 data/units/Dwarvish_Stalwart.cfg:41
+#: data/units/Dwarvish_Guardsman.cfg:24 data/units/Dwarvish_Guardsman.cfg:38
+#: data/units/Dwarvish_Sentinel.cfg:26 data/units/Dwarvish_Sentinel.cfg:40
+#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
 #: data/units/Goblin_Impaler.cfg:20 data/units/Goblin_Impaler.cfg:39
 #: data/units/Goblin_Spearman.cfg:20 data/units/Goblin_Spearman.cfg:33
 #: data/units/Horseman.cfg:21 data/units/Javelineer.cfg:19
@@ -3424,10 +3428,10 @@
 msgid "spear"
 msgstr ""
 
-#: data/units/Chocobone.cfg:35 data/units/Grand_Knight.cfg:39
+#: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:39
 #: data/units/Horseman.cfg:23 data/units/Knight.cfg:39
-#: data/units/Lancer.cfg:23 data/units/Paladin.cfg:44 src/actions.cpp:449
-#: src/actions.cpp:557
+#: data/units/Lancer.cfg:23 data/units/Paladin.cfg:44 src/actions.cpp:368
+#: src/actions.cpp:476
 msgid "charge"
 msgstr ""
 
@@ -3442,19 +3446,19 @@
 "them into stone until the source of their power is destroyed."
 msgstr ""
 
-#: data/units/Cockatrice.cfg:33
+#: data/units/Cockatrice.cfg:21
 msgid "gaze"
 msgstr ""
 
-#: data/units/Cockatrice.cfg:38 src/actions.cpp:864 src/actions.cpp:1031
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:744 src/actions.cpp:908
 msgid "stone"
 msgstr ""
 
-#: data/units/Commander.cfg:3 data/units/Commander.cfg:90
+#: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr ""
 
-#: data/units/Commander.cfg:20 data/units/Commander.cfg:107
+#: data/units/Commander.cfg:20 data/units/Commander.cfg:95
 #: data/units/Noble_Commander.cfg:24
 msgid ""
 "The rank of Commander is held by those who lead battle groups into combat. "
@@ -3476,11 +3480,11 @@
 "remain ashore."
 msgstr ""
 
-#: data/units/Cuttle_Fish.cfg:32 data/units/Tentacle.cfg:20
+#: data/units/Cuttle_Fish.cfg:19 data/units/Tentacle.cfg:20
 msgid "tentacle"
 msgstr ""
 
-#: data/units/Cuttle_Fish.cfg:68
+#: data/units/Cuttle_Fish.cfg:55
 msgid "ink"
 msgstr ""
 
@@ -3496,7 +3500,7 @@
 "close combat."
 msgstr ""
 
-#: data/units/Dark_Adept.cfg:34 data/units/Dark_Sorcerer.cfg:40
+#: data/units/Dark_Adept.cfg:22 data/units/Dark_Sorcerer.cfg:40
 #: data/units/Necromancer.cfg:35
 msgid "chill wave"
 msgstr ""
@@ -3512,7 +3516,7 @@
 "mostly derived from those she commands."
 msgstr ""
 
-#: data/units/Dark_Queen.cfg:34
+#: data/units/Dark_Queen.cfg:22
 msgid "scepter"
 msgstr ""
 
@@ -3539,12 +3543,12 @@
 "seen in Wesnoth."
 msgstr ""
 
-#: data/units/Dark_Spirit.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Dark_Spirit.cfg:19 data/units/Spectre.cfg:24
 #: data/units/Wraith.cfg:24
 msgid "baneblade"
 msgstr ""
 
-#: data/units/Dark_Spirit.cfg:48 data/units/Ghost.cfg:31
+#: data/units/Dark_Spirit.cfg:36 data/units/Ghost.cfg:31
 #: data/units/Spectre.cfg:41 data/units/Wraith.cfg:41
 msgid "wail"
 msgstr ""
@@ -3561,16 +3565,16 @@
 "revenge."
 msgstr ""
 
-#: data/units/Death_Knight.cfg:33 data/units/Dwarvish_Lord.cfg:27
+#: data/units/Death_Knight.cfg:21 data/units/Dwarvish_Lord.cfg:27
 #: data/units/Dwarvish_Steelclad.cfg:27
 msgid "battle axe"
 msgstr ""
 
-#: data/units/Deathblade.cfg:3
+#: data/units/Deathblade.cfg:4
 msgid "Deathblade"
 msgstr ""
 
-#: data/units/Deathblade.cfg:16
+#: data/units/Deathblade.cfg:17
 msgid ""
 "Deathblades abhor the living and seek to destroy all that they once loved. "
 "They are deadly fighters, ignoring all danger to themselves, and caring only "
@@ -3612,12 +3616,12 @@
 "enemies."
 msgstr ""
 
-#: data/units/Direwolf_Rider.cfg:49 data/units/Drake_Burner.cfg:34
-#: data/units/Drake_Fire.cfg:36 data/units/Drake_Inferno.cfg:24
+#: data/units/Direwolf_Rider.cfg:32 data/units/Drake_Burner.cfg:21
+#: data/units/Drake_Fire.cfg:24 data/units/Drake_Inferno.cfg:24
 #: data/units/Ghoul.cfg:19 data/units/Gryphon.cfg:22
 #: data/units/Gryphon_Master.cfg:24 data/units/Gryphon_Rider.cfg:23
 #: data/units/Necrophage.cfg:19 data/units/Nightgaunt.cfg:20
-#: data/units/Shadow.cfg:20 data/units/Skeletal_Dragon.cfg:49
+#: data/units/Shadow.cfg:20 data/units/Skeletal_Dragon.cfg:47
 #: data/units/Sleeping_Gryphon.cfg:18
 msgid "claws"
 msgstr ""
@@ -3648,8 +3652,8 @@
 "Drake Flares who aspire to be leaders of their kind."
 msgstr ""
 
-#: data/units/Drake_Burner.cfg:53 data/units/Drake_Fighter.cfg:56
-#: data/units/Drake_Fire.cfg:54 data/units/Drake_Flameheart.cfg:52
+#: data/units/Drake_Burner.cfg:40 data/units/Drake_Fighter.cfg:44
+#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:52
 #: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:44
 #: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:50
 #: data/units/Drake_Warrior.cfg:45 data/units/Fire_Dragon.cfg:58
@@ -3681,7 +3685,7 @@
 "join the ranks of the elite Drake Warriors."
 msgstr ""
 
-#: data/units/Drake_Fighter.cfg:33
+#: data/units/Drake_Fighter.cfg:21
 msgid "scimitar"
 msgstr ""
 
@@ -3792,7 +3796,7 @@
 msgstr ""
 
 #: data/units/Drake_Slasher.cfg:43 data/units/Goblin_Impaler.cfg:26
-#: data/units/Halbardier.cfg:28 data/units/Halbardier.cfg:69
+#: data/units/Halbardier.cfg:26 data/units/Halbardier.cfg:44
 #: data/units/Javelineer.cfg:24 data/units/Pikeman.cfg:27
 #: data/units/Spearman.cfg:42
 msgid "firststrike"
@@ -3822,7 +3826,7 @@
 "of their struggle have long faded into oblivion."
 msgstr ""
 
-#: data/units/Draug.cfg:36 data/units/Dwarvish_Fighter.cfg:22
+#: data/units/Draug.cfg:24 data/units/Dwarvish_Fighter.cfg:22
 #: data/units/Revenant.cfg:36 data/units/Skeleton.cfg:37
 msgid "axe"
 msgstr ""
@@ -3838,7 +3842,7 @@
 "crossbow in the other to shoot distant foes."
 msgstr ""
 
-#: data/units/Duelist.cfg:33 data/units/Fencer.cfg:20
+#: data/units/Duelist.cfg:20 data/units/Fencer.cfg:20
 msgid "rapier"
 msgstr ""
 
@@ -3854,11 +3858,11 @@
 "push the attack until either they or their enemy lies dead."
 msgstr ""
 
-#: data/units/Dwarvish_Berserker.cfg:32 data/units/Dwarvish_Ulfserker.cfg:32
+#: data/units/Dwarvish_Berserker.cfg:26 data/units/Dwarvish_Ulfserker.cfg:26
 msgid "berserker frenzy"
 msgstr ""
 
-#: data/units/Dwarvish_Berserker.cfg:35 data/units/Dwarvish_Ulfserker.cfg:35
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
 msgid "berserk"
 msgstr ""
 
@@ -3899,7 +3903,7 @@
 msgid "Dwarvish Guardsman"
 msgstr ""
 
-#: data/units/Dwarvish_Guardsman.cfg:22
+#: data/units/Dwarvish_Guardsman.cfg:21
 msgid ""
 "The most resilient dwarves sometimes join the Dwarvish army as Guardsman. "
 "Slow and without a strong attack, they guard the Army's flank, soaking up a "
@@ -3945,7 +3949,7 @@
 msgid "Dwarvish Sentinel"
 msgstr ""
 
-#: data/units/Dwarvish_Sentinel.cfg:24
+#: data/units/Dwarvish_Sentinel.cfg:23
 msgid ""
 "The Sentinel, with his tower shield and great courage, refuses to yield "
 "under even the strongest of enemy attacks."
@@ -3955,7 +3959,7 @@
 msgid "Dwarvish Stalwart"
 msgstr ""
 
-#: data/units/Dwarvish_Stalwart.cfg:24
+#: data/units/Dwarvish_Stalwart.cfg:23
 msgid ""
 "Stalwarts, after years in battle, have fashioned new shields and strong "
 "armor from the ruins of their enemies. While slow, they are the feared for "
@@ -4132,10 +4136,9 @@
 msgid "entangle"
 msgstr ""
 
-#: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_High_Lord.cfg:42
-#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Sorceress.cfg:117
+#: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
 #: data/units/Elvish_Sylph.cfg:83
-msgid "faerie fire"
+msgid "fey gale"
 msgstr ""
 
 #: data/units/Elvish_Fighter.cfg:3
@@ -4167,7 +4170,7 @@
 #: data/units/Elvish_High_Lord.cfg:18
 msgid ""
 "Elvish High Lords are fearsome in combat, using the sword at close range and "
-"devastating balls of frost at long range."
+"devastating balls of fire at long range."
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:4
@@ -4191,10 +4194,10 @@
 msgid "Elvish Lord"
 msgstr ""
 
-#: data/units/Elvish_Lord.cfg:19
+#: data/units/Elvish_Lord.cfg:17
 msgid ""
 "Elvish Lords are fearsome in combat, using the sword at close range and "
-"devastating balls of frost at long range."
+"devastating balls of fire at long range."
 msgstr ""
 
 #: data/units/Elvish_Marksman.cfg:3
@@ -4403,8 +4406,7 @@
 msgstr ""
 
 #: data/units/Fireball.cfg:16
-msgid ""
-"A Fireball. This is not to be used for anything else than a 'Move_Unit_Fake'!"
+msgid "A Fireball. This is not to be used for anything else than a 
'Move_Unit_Fake'!"
 msgstr ""
 
 #: data/units/Footpad.cfg:3
@@ -4685,7 +4687,7 @@
 msgid "Halberdier"
 msgstr ""
 
-#: data/units/Halbardier.cfg:19
+#: data/units/Halbardier.cfg:18
 msgid ""
 "The best of the soldiers are chosen to become Halberdiers. Their weapon, "
 "though a little slower than the sword, can strike with deadly force, and "
@@ -4695,6 +4697,10 @@
 "very close combat."
 msgstr ""
 
+#: data/units/Halbardier.cfg:21 data/units/Halbardier.cfg:39
+msgid "halberd"
+msgstr ""
+
 #: data/units/Heavy_Infantryman.cfg:3
 msgid "Heavy Infantryman"
 msgstr ""
@@ -4829,7 +4835,7 @@
 msgid "Lord"
 msgstr ""
 
-#: data/units/Lord.cfg:19 data/units/Lord.cfg:94
+#: data/units/Lord.cfg:19 data/units/Lord.cfg:94 data/units/Noble_Lord.cfg:22
 msgid ""
 "The noble leaders of many troops, Lords are especially strong in melee "
 "combat, and also possess skill with the bow. Like Commanders, Lords possess "
@@ -5173,9 +5179,7 @@
 #: data/units/Necrophage.cfg:16
 msgid ""
 "Driven ravenous by an unholy hunger for dead flesh, Necrophages attack their "
-"hoped-for food with poisonous claws. When they are sated with the flesh of "
-"their victims, they simply shrug off all damage sustained as if they had "
-"been freshly summoned, to begin their search for flesh again."
+"hoped-for food with poisonous claws."
 msgstr ""
 
 #: data/units/Nightgaunt.cfg:3
@@ -5208,14 +5212,6 @@
 msgid "Noble Lord"
 msgstr ""
 
-#: data/units/Noble_Lord.cfg:24
-msgid ""
-"The noble leaders of many troops, Lords are especially strong in melee "
-"combat, and also possess skill with the bow. Like lords, Lords possess "
-"leadership skills, and improve the fighting ability of all adjacent lower-"
-"level units."
-msgstr ""
-
 #: data/units/Noble_Youth.cfg:3
 msgid "Noble Youth"
 msgstr ""
@@ -5715,8 +5711,7 @@
 msgstr ""
 
 #: data/units/Sea_Serpent.cfg:16
-msgid ""
-"Sea Serpents are gigantic monsters, capable of capsizing boats by themselves."
+msgid "Sea Serpents are gigantic monsters, capable of capsizing boats by 
themselves."
 msgstr ""
 
 #: data/units/Sergeant.cfg:3
@@ -5780,7 +5775,7 @@
 "lived long enough to change their minds."
 msgstr ""
 
-#: data/units/Skeletal_Dragon.cfg:29
+#: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr ""
 
@@ -5947,7 +5942,7 @@
 "terrifying ability to recover from wounds make them a formidable foe even "
 "far from the mountainous ground they prefer to fight in. An adult troll is "
 "smarter, faster, stronger, and though one would dare not say it to their "
-"face, uglier than any of their children. They wield heavy clubs with brutal "
+"face, uglier than any of their children. Their wield heavy clubs with brutal "
 "proficiency, and form a bulwark of strength in any battle they participate "
 "in - the only weakness they have, if such can be said, is their inability to "
 "fight at a distance.\n"
@@ -5981,7 +5976,7 @@
 #: data/units/Troll_Rocklobber.cfg:21
 msgid ""
 "Given the monstrous strength of their race, trolls can turn rather mundane "
-"implements into weapons of deadly force. Some trolls piece together crude "
+"weapons into implements of deadly force. Some trolls piece together crude "
 "slings, little different from what a child would use, save for the fact they "
 "hurl boulders instead of pebbles. Though not especially accurate, a rock "
 "thrown by one of these monsters can cripple a man if it hits him. Despite "
@@ -6026,7 +6021,7 @@
 "Usage:\n"
 "Troll Warriors fight well on rough, rocky terrain, especially at night. "
 "Though vulnerable to archers and spellcasters, especially in open terrain, "
-"the raw power of a Troll Warrior makes it a foe that generally must be "
+"the raw power of a Troll Warrior makes them a foe that generally must be "
 "brought down by several enemies. There are few enemies which can engage them "
 "in one-on-one combat without a great danger of being killed on the same "
 "turn. Their regeneration allows them to cure poison, and heal wounds without "
@@ -6228,410 +6223,402 @@
 "Lord -- to join the elite of human fighters."
 msgstr ""
 
-#: src/about.cpp:33
+#: src/about.cpp:46
 msgid "+Core Developers"
 msgstr ""
 
-#: src/about.cpp:34
+#: src/about.cpp:47
 msgid "-   Main Developer"
 msgstr ""
 
-#: src/about.cpp:37
+#: src/about.cpp:50
 msgid "-   Artwork and graphics designer"
 msgstr ""
 
-#: src/about.cpp:40
+#: src/about.cpp:54
 msgid "+Developers"
 msgstr ""
 
-#: src/about.cpp:57
+#: src/about.cpp:71
 msgid "+General Purpose Administrators"
 msgstr ""
 
-#: src/about.cpp:61
+#: src/about.cpp:76
 msgid "+Artwork and graphics designers"
 msgstr ""
 
-#: src/about.cpp:86
+#: src/about.cpp:102
 msgid "+Music"
 msgstr ""
 
-#: src/about.cpp:92
+#: src/about.cpp:109
 msgid "+Scenario Designers"
 msgstr ""
 
-#: src/about.cpp:101
+#: src/about.cpp:119
 msgid "+Multiplayer Maps"
 msgstr ""
 
-#: src/about.cpp:105
+#: src/about.cpp:124
 msgid "+Packagers"
 msgstr ""
 
-#: src/about.cpp:115
+#: src/about.cpp:135
 msgid "+Miscellaneous"
 msgstr ""
 
-#: src/about.cpp:120
+#: src/about.cpp:141
 msgid "+Internationalization Managers"
 msgstr ""
 
-#: src/about.cpp:126
+#: src/about.cpp:148
 msgid "+Afrikaans Translation"
 msgstr ""
 
-#: src/about.cpp:130
+#: src/about.cpp:153
 msgid "+Basque Translation"
 msgstr ""
 
-#: src/about.cpp:135
+#: src/about.cpp:159
 msgid "+Bulgarian Translation"
 msgstr ""
 
-#: src/about.cpp:138
+#: src/about.cpp:163
 msgid "+Catalan Translation"
 msgstr ""
 
-#: src/about.cpp:145
+#: src/about.cpp:171
 msgid "+Chinese Translation"
 msgstr ""
 
-#: src/about.cpp:148
+#: src/about.cpp:175
 msgid "+Czech Translation"
 msgstr ""
 
-#: src/about.cpp:156
+#: src/about.cpp:184
 msgid "+Danish Translation"
 msgstr ""
 
-#: src/about.cpp:160
+#: src/about.cpp:189
 msgid "+Dutch Translation"
 msgstr ""
 
-#: src/about.cpp:167
+#: src/about.cpp:197
 msgid "+English (GB) Translation"
 msgstr ""
 
-#: src/about.cpp:170
+#: src/about.cpp:201
 msgid "+Estonian Translation"
 msgstr ""
 
-#: src/about.cpp:173
+#: src/about.cpp:205
 msgid "+Finnish Translation"
 msgstr ""
 
-#: src/about.cpp:177
+#: src/about.cpp:210
 msgid "+French Translation"
 msgstr ""
 
-#: src/about.cpp:190
+#: src/about.cpp:224
 msgid "+German Translation"
 msgstr ""
 
-#: src/about.cpp:201
+#: src/about.cpp:236
 msgid "+Greek Translation"
 msgstr ""
 
-#: src/about.cpp:205
+#: src/about.cpp:241
 msgid "+Hungarian Translation"
 msgstr ""
 
-#: src/about.cpp:216
+#: src/about.cpp:253
 msgid "+Italian Translation"
 msgstr ""
 
-#: src/about.cpp:225
+#: src/about.cpp:262
 msgid "+Japanese Translation"
 msgstr ""
 
-#: src/about.cpp:230
+#: src/about.cpp:268
 msgid "+Latin Translation"
 msgstr ""
 
-#: src/about.cpp:233
+#: src/about.cpp:272
 msgid "+Norwegian Translation"
 msgstr ""
 
-#: src/about.cpp:239
+#: src/about.cpp:279
 msgid "+Polish Translation"
 msgstr ""
 
-#: src/about.cpp:249
+#: src/about.cpp:290
 msgid "+Portuguese (Brazil) Translation"
 msgstr ""
 
-#: src/about.cpp:257
+#: src/about.cpp:299
 msgid "+Russian Translation"
 msgstr ""
 
-#: src/about.cpp:262
+#: src/about.cpp:305
 msgid "+Slovak Translation"
 msgstr ""
 
-#: src/about.cpp:265
+#: src/about.cpp:309
 msgid "+Slovenian Translation"
 msgstr ""
 
-#: src/about.cpp:268
+#: src/about.cpp:313
 msgid "+Spanish Translation"
 msgstr ""
 
-#: src/about.cpp:276
+#: src/about.cpp:322
 msgid "+Swedish Translation"
 msgstr ""
 
-#: src/about.cpp:282
+#: src/about.cpp:329
 msgid "+Turkish Translation"
 msgstr ""
 
-#: src/about.cpp:286
+#: src/about.cpp:334
 msgid "+Contributors"
 msgstr ""
 
-#: src/about.cpp:289
+#: src/about.cpp:338
 msgid "+Bots"
 msgstr ""
 
-#: src/about.cpp:325 src/help.cpp:2633
+#: src/about.cpp:375 src/help.cpp:2713
 msgid "Close"
 msgstr ""
 
-#: src/actions.cpp:108
+#: src/actions.cpp:105
 msgid "You don't have a leader to recruit with."
 msgstr ""
 
-#: src/actions.cpp:112
+#: src/actions.cpp:109
 msgid "You must have your leader on a keep to recruit or recall units."
 msgstr ""
 
-#: src/actions.cpp:129
+#: src/actions.cpp:126
 msgid "There are no vacant castle tiles in which to recruit a unit."
 msgstr ""
 
-#: src/actions.cpp:297
+#: src/actions.cpp:216
 msgid "none"
 msgstr ""
 
-#: src/actions.cpp:373 src/dialogs.cpp:700 src/display.cpp:1094
-#: src/help.cpp:1122 src/reports.cpp:233
+#: src/actions.cpp:292 src/dialogs.cpp:699 src/display.cpp:1094
+#: src/help.cpp:1171 src/reports.cpp:233
 msgid "melee"
 msgstr ""
 
-#: src/actions.cpp:373 src/dialogs.cpp:700 src/display.cpp:1095
-#: src/help.cpp:1122 src/reports.cpp:234
+#: src/actions.cpp:292 src/dialogs.cpp:699 src/display.cpp:1095
+#: src/help.cpp:1171 src/reports.cpp:234
 msgid "ranged"
 msgstr ""
 
-#: src/actions.cpp:419 src/actions.cpp:527
+#: src/actions.cpp:338 src/actions.cpp:446
 msgid "base damage"
 msgstr ""
 
-#: src/actions.cpp:449 src/actions.cpp:557 src/actions.cpp:566
+#: src/actions.cpp:368 src/actions.cpp:476 src/actions.cpp:485
 msgid "Doubled"
 msgstr ""
 
-#: src/actions.cpp:457
+#: src/actions.cpp:376
 msgid "attacker resistance vs"
 msgstr ""
 
-#: src/actions.cpp:457
+#: src/actions.cpp:376
 msgid "attacker vulnerability vs"
 msgstr ""
 
-#: src/actions.cpp:471 src/actions.cpp:597
+#: src/actions.cpp:390 src/actions.cpp:516
 msgid "total damage"
 msgstr ""
 
-#: src/actions.cpp:575
+#: src/actions.cpp:494
 msgid "Halved"
 msgstr ""
 
-#: src/actions.cpp:583
+#: src/actions.cpp:502
 msgid "defender resistance vs"
 msgstr ""
 
-#: src/actions.cpp:583
+#: src/actions.cpp:502
 msgid "defender vulnerability vs"
 msgstr ""
 
-#: src/actions.cpp:644
-msgid "(both should survive)"
-msgstr ""
-
-#: src/actions.cpp:646
-msgid "% Pr[kills/killed by/both survive]"
-msgstr ""
-
-#: src/actions.cpp:848 src/actions.cpp:1014 src/display.cpp:1037
+#: src/actions.cpp:730 src/actions.cpp:893 src/display.cpp:1037
 msgid "poisoned"
 msgstr ""
 
-#: src/actions.cpp:853 src/actions.cpp:1019 src/display.cpp:1033
+#: src/actions.cpp:735 src/actions.cpp:898 src/display.cpp:1033
 msgid "slowed"
 msgstr ""
 
-#: src/actions.cpp:1898
+#: src/actions.cpp:1765
 msgid "Ambushed!"
 msgstr ""
 
-#: src/actions.cpp:1932
+#: src/actions.cpp:1793
 msgid "Friendly unit sighted"
 msgstr ""
 
-#: src/actions.cpp:1934
+#: src/actions.cpp:1795
 msgid "Enemy unit sighted!"
 msgstr ""
 
-#: src/actions.cpp:1939
+#: src/actions.cpp:1800
 msgid "$friends Friendly units sighted"
 msgstr ""
 
-#: src/actions.cpp:1941
+#: src/actions.cpp:1802
 msgid "$enemies Enemy units sighted!"
 msgstr ""
 
-#: src/actions.cpp:1945
+#: src/actions.cpp:1806
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr ""
 
-#: src/actions.cpp:1960
+#: src/actions.cpp:1821
 msgid "(press $hotkey to continue)"
 msgstr ""
 
-#: src/dialogs.cpp:100
+#: src/dialogs.cpp:99
 msgid "Advance Unit"
 msgstr ""
 
-#: src/dialogs.cpp:101
+#: src/dialogs.cpp:100
 msgid "What should our victorious unit become?"
 msgstr ""
 
-#: src/dialogs.cpp:170
+#: src/dialogs.cpp:169
 msgid "No objectives available"
 msgstr ""
 
-#: src/dialogs.cpp:184
+#: src/dialogs.cpp:183
 msgid "Save Game"
 msgstr ""
 
-#: src/dialogs.cpp:186
+#: src/dialogs.cpp:185
 msgid "Overwrite?"
 msgstr ""
 
-#: src/dialogs.cpp:187
+#: src/dialogs.cpp:186
 msgid "Save already exists. Do you want to overwrite it ?"
 msgstr ""
 
-#: src/dialogs.cpp:216 src/dialogs.cpp:448
+#: src/dialogs.cpp:215 src/dialogs.cpp:447
 msgid "Don't ask me again!"
 msgstr ""
 
-#: src/dialogs.cpp:218
+#: src/dialogs.cpp:217
 msgid "Do you really want to delete this game?"
 msgstr ""
 
-#: src/dialogs.cpp:349
+#: src/dialogs.cpp:348
 msgid "%a %b %d %H:%M %Y"
 msgstr ""
 
-#: src/dialogs.cpp:362
+#: src/dialogs.cpp:361
 msgid "#(Invalid)"
 msgstr ""
 
-#: src/dialogs.cpp:367 src/game.cpp:748
+#: src/dialogs.cpp:366 src/game.cpp:909
 msgid "Campaign"
 msgstr ""
 
-#: src/dialogs.cpp:369 src/game.cpp:1103
+#: src/dialogs.cpp:368 src/game.cpp:1235
 msgid "Multiplayer"
 msgstr ""
 
-#: src/dialogs.cpp:371
+#: src/dialogs.cpp:370
 msgid "Tutorial"
 msgstr ""
 
-#: src/dialogs.cpp:379
+#: src/dialogs.cpp:378
 msgid "replay"
 msgstr ""
 
-#: src/dialogs.cpp:381 src/multiplayer_lobby.cpp:115 src/playturn.cpp:1547
+#: src/dialogs.cpp:380 src/multiplayer_lobby.cpp:115 src/playturn.cpp:1541
 msgid "Turn"
 msgstr ""
 
-#: src/dialogs.cpp:383
+#: src/dialogs.cpp:382
 msgid "Scenario Start"
 msgstr ""
 
-#: src/dialogs.cpp:386
+#: src/dialogs.cpp:385
 msgid "Difficulty: "
 msgstr ""
 
-#: src/dialogs.cpp:388
+#: src/dialogs.cpp:387
 msgid "Version: "
 msgstr ""
 
-#: src/dialogs.cpp:403
+#: src/dialogs.cpp:402
 msgid "No Saved Games"
 msgstr ""
 
-#: src/dialogs.cpp:404
+#: src/dialogs.cpp:403
 msgid ""
 "There are no saved games to load.\n"
 "(Games are saved automatically when you complete a scenario)"
 msgstr ""
 
-#: src/dialogs.cpp:423
+#: src/dialogs.cpp:422
 msgid "Delete Save"
 msgstr ""
 
-#: src/dialogs.cpp:438
+#: src/dialogs.cpp:437
 msgid "Import Saved Games"
 msgstr ""
 
-#: src/dialogs.cpp:439
+#: src/dialogs.cpp:438
 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:444
+#: src/dialogs.cpp:443
 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:515
+#: src/dialogs.cpp:514
 msgid "Show replay"
 msgstr ""
 
-#: src/dialogs.cpp:518 src/multiplayer_create.cpp:74
+#: src/dialogs.cpp:517 src/multiplayer_create.cpp:74
 msgid "Load Game"
 msgstr ""
 
-#: src/dialogs.cpp:519
+#: src/dialogs.cpp:518
 msgid "Choose the game to load"
 msgstr ""
 
-#: src/dialogs.cpp:555 src/dialogs.cpp:567
+#: src/dialogs.cpp:554 src/dialogs.cpp:566
 msgid "Profile"
 msgstr ""
 
-#: src/dialogs.cpp:647 src/display.cpp:1043 src/help.cpp:1031
+#: src/dialogs.cpp:646 src/display.cpp:1043 src/help.cpp:1056
 msgid "level"
 msgstr ""
 
-#: src/dialogs.cpp:668 src/display.cpp:1061 src/help.cpp:1076
+#: src/dialogs.cpp:667 src/display.cpp:1061 src/help.cpp:1101
 msgid "HP: "
 msgstr ""
 
-#: src/dialogs.cpp:672 src/dialogs.cpp:680 src/display.cpp:1065
-#: src/display.cpp:1073 src/playturn.cpp:1979
+#: src/dialogs.cpp:671 src/dialogs.cpp:679 src/display.cpp:1065
+#: src/display.cpp:1073 src/playturn.cpp:1965
 msgid "XP: "
 msgstr ""
 
-#: src/dialogs.cpp:685 src/display.cpp:1077 src/help.cpp:1077
+#: src/dialogs.cpp:684 src/display.cpp:1077 src/help.cpp:1102
 msgid "Moves: "
 msgstr ""
 
@@ -6651,8 +6638,8 @@
 msgid "OK"
 msgstr ""
 
-#: src/filechooser.cpp:39 src/multiplayer_connect.cpp:494
-#: src/multiplayer_create.cpp:53 src/multiplayer_wait.cpp:147
+#: src/filechooser.cpp:39 src/multiplayer_connect.cpp:495
+#: src/multiplayer_create.cpp:53 src/multiplayer_wait.cpp:148
 msgid "Cancel"
 msgstr ""
 
@@ -6660,355 +6647,378 @@
 msgid "Vera.ttf"
 msgstr ""
 
-#: src/game.cpp:391
+#: src/game.cpp:140
+msgid "Do you want to save a replay of this scenario?"
+msgstr ""
+
+#: src/game.cpp:141 src/game.cpp:199 src/playturn.cpp:1550
+msgid "Name:"
+msgstr ""
+
+#: src/game.cpp:149 src/game.cpp:206 src/playturn.cpp:1567
+msgid "The game could not be saved"
+msgstr ""
+
+#: src/game.cpp:171 src/game.cpp:846 src/game.cpp:1265
+msgid "The game could not be loaded: "
+msgstr ""
+
+#: src/game.cpp:174 src/game.cpp:848 src/game.cpp:1267
+msgid "Error while playing the game: "
+msgstr ""
+
+#: src/game.cpp:177 src/game.cpp:854 src/game.cpp:1279
+msgid "The game map could not be loaded: "
+msgstr ""
+
+#: src/game.cpp:198
+msgid "Do you want to save your game?"
+msgstr ""
+
+#: src/game.cpp:219
+msgid "Unknown scenario: '"
+msgstr ""
+
+#: src/game.cpp:539
 msgid "The Battle for Wesnoth"
 msgstr ""
 
-#: src/game.cpp:619
+#: src/game.cpp:752
 msgid "Warning: The file you have tried to load is corrupt. Loading anyway.\n"
 msgstr ""
 
-#: src/game.cpp:641 src/multiplayer_connect.cpp:888
+#: src/game.cpp:774 src/multiplayer_connect.cpp:899
 msgid ""
 "This save is from a different version of the game. Do you want to try to "
 "load it?"
 msgstr ""
 
-#: src/game.cpp:649 src/game.cpp:652 src/multiplayer_connect.cpp:873
+#: src/game.cpp:782 src/game.cpp:785 src/multiplayer_connect.cpp:886
 msgid "The file you have tried to load is corrupt: '"
 msgstr ""
 
-#: src/game.cpp:655
+#: src/game.cpp:788
 msgid "File I/O Error while reading the game"
 msgstr ""
 
-#: src/game.cpp:738
+#: src/game.cpp:899
 msgid "Get More Campaigns..."
 msgstr ""
 
-#: src/game.cpp:739
+#: src/game.cpp:900
 msgid "Download more campaigns from a server on Internet."
 msgstr ""
 
-#: src/game.cpp:749
+#: src/game.cpp:910
 msgid "Choose the campaign you want to play:"
 msgstr ""
 
-#: src/game.cpp:778
+#: src/game.cpp:939
 msgid "Difficulty"
 msgstr ""
 
-#: src/game.cpp:779
+#: src/game.cpp:940
 msgid "Select difficulty level:"
 msgstr ""
 
-#: src/game.cpp:804
+#: src/game.cpp:965
 msgid "B"
 msgstr ""
 
-#: src/game.cpp:807
+#: src/game.cpp:968
 msgid "KB"
 msgstr ""
 
-#: src/game.cpp:810
+#: src/game.cpp:971
 msgid "MB"
 msgstr ""
 
-#: src/game.cpp:837
+#: src/game.cpp:996
 msgid "Connect to Server"
 msgstr ""
 
-#: src/game.cpp:838
+#: src/game.cpp:997
 msgid "You will now connect to a campaign server to download campaigns."
 msgstr ""
 
-#: src/game.cpp:839
+#: src/game.cpp:998
 msgid "Server: "
 msgstr ""
 
-#: src/game.cpp:852
+#: src/game.cpp:1011
 msgid "Could not connect to host."
 msgstr ""
 
-#: src/game.cpp:860
+#: src/game.cpp:1019
 msgid "Awaiting response from server"
 msgstr ""
 
-#: src/game.cpp:873
+#: src/game.cpp:1032
 msgid "Error communicating with the server."
 msgstr ""
 
-#: src/game.cpp:879 src/help.cpp:1098 src/playturn.cpp:2139
+#: src/game.cpp:1038 src/help.cpp:1125 src/help.cpp:1126 src/playturn.cpp:2124
 msgid "Name"
 msgstr ""
 
-#: src/game.cpp:880 src/titlescreen.cpp:169
+#: src/game.cpp:1039 src/titlescreen.cpp:169
 msgid "Version"
 msgstr ""
 
-#: src/game.cpp:881
+#: src/game.cpp:1040
 msgid "Author"
 msgstr ""
 
-#: src/game.cpp:882
+#: src/game.cpp:1041
 msgid "Downloads"
 msgstr ""
 
-#: src/game.cpp:883
+#: src/game.cpp:1042
 msgid "Size"
 msgstr ""
 
-#: src/game.cpp:927
+#: src/game.cpp:1071
 msgid "Publish campaign: "
 msgstr ""
 
-#: src/game.cpp:931
+#: src/game.cpp:1075
 msgid "Delete campaign: "
 msgstr ""
 
-#: src/game.cpp:935
+#: src/game.cpp:1079
 msgid "There are no campaigns available for download from this server."
 msgstr ""
 
-#: src/game.cpp:939
+#: src/game.cpp:1083
 msgid "Choose the campaign to download."
 msgstr ""
 
-#: src/game.cpp:939
+#: src/game.cpp:1083
 msgid "Get Campaign"
 msgstr ""
 
-#: src/game.cpp:958
+#: src/game.cpp:1102
 msgid "Downloading campaign..."
 msgstr ""
 
-#: src/game.cpp:972
+#: src/game.cpp:1116
 msgid "Cannot rescan the filesystem"
 msgstr ""
 
-#: src/game.cpp:983
+#: src/game.cpp:1127
 msgid "Campaign Installed"
 msgstr ""
 
-#: src/game.cpp:983
+#: src/game.cpp:1127
 msgid "The campaign has been installed."
 msgstr ""
 
-#: src/game.cpp:985
+#: src/game.cpp:1129
 msgid "Network communication error."
 msgstr ""
 
-#: src/game.cpp:987
+#: src/game.cpp:1131
 msgid "Remote host disconnected."
 msgstr ""
 
-#: src/game.cpp:989
-msgid ""
-"There was a problem creating the files necessary to install this campaign."
+#: src/game.cpp:1133
+msgid "There was a problem creating the files necessary to install this 
campaign."
 msgstr ""
 
-#: src/game.cpp:1001 src/game.cpp:1041 src/game.cpp:1066
-#: src/multiplayer.cpp:203 src/multiplayer_ui.cpp:35
+#: src/game.cpp:1145 src/game.cpp:1185 src/game.cpp:1210
+#: src/multiplayer.cpp:202 src/multiplayer_ui.cpp:34
 msgid "Connection timed out"
 msgstr ""
 
-#: src/game.cpp:1004 src/game.cpp:1043 src/game.cpp:1068
+#: src/game.cpp:1148 src/game.cpp:1187 src/game.cpp:1212
 msgid "The server responded with an error: \""
 msgstr ""
 
-#: src/game.cpp:1008
+#: src/game.cpp:1152
 msgid "Terms"
 msgstr ""
 
-#: src/game.cpp:1046 src/game.cpp:1071
+#: src/game.cpp:1190 src/game.cpp:1215
 msgid "Response"
 msgstr ""
 
-#: src/game.cpp:1086
+#: src/game.cpp:1228
 msgid "Join Official Server"
 msgstr ""
 
-#: src/game.cpp:1087
+#: src/game.cpp:1228
 msgid "Log on to the official Wesnoth multiplayer server"
 msgstr ""
 
-#: src/game.cpp:1089 src/multiplayer_lobby.cpp:29
+#: src/game.cpp:1229 src/multiplayer_lobby.cpp:29
 msgid "Join Game"
 msgstr ""
 
-#: src/game.cpp:1090
+#: src/game.cpp:1229
 msgid "Join a server or hosted game"
 msgstr ""
 
-#: src/game.cpp:1092
+#: src/game.cpp:1230
 msgid "Host Networked Game"
 msgstr ""
 
-#: src/game.cpp:1093
+#: src/game.cpp:1230
 msgid "Host a game without using a server"
 msgstr ""
 
-#: src/game.cpp:1095
+#: src/game.cpp:1231
 msgid "Hotseat Game"
 msgstr ""
 
-#: src/game.cpp:1096
+#: src/game.cpp:1231
 msgid "Play a multiplayer game sharing the same machine"
 msgstr ""
 
-#: src/game.cpp:1098
+#: src/game.cpp:1232
 msgid "Human vs AI"
 msgstr ""
 
-#: src/game.cpp:1099
+#: src/game.cpp:1232
 msgid "Play a game against AI opponents"
 msgstr ""
 
-#: src/game.cpp:1105 src/multiplayer.cpp:187
+#: src/game.cpp:1235 src/multiplayer.cpp:186
 msgid "Login: "
 msgstr ""
 
-#: src/game.cpp:1136
-msgid "The game could not be loaded: "
-msgstr ""
-
-#: src/game.cpp:1138
-msgid "Error while playing the game: "
-msgstr ""
-
-#: src/game.cpp:1150
-msgid "The game map could not be loaded: "
-msgstr ""
-
-#: src/game.cpp:1177
+#: src/game.cpp:1305
 msgid "Language"
 msgstr ""
 
-#: src/game.cpp:1178
+#: src/game.cpp:1306
 msgid "Choose your preferred language:"
 msgstr ""
 
-#: src/game.cpp:1267
+#: src/game.cpp:1391
 msgid "Warning: Errors occurred while loading game configuration files: '"
 msgstr ""
 
-#: src/game.cpp:1316
+#: src/game.cpp:1435
 msgid "Error loading game configuration files: '"
 msgstr ""
 
-#: src/game.cpp:1317
+#: src/game.cpp:1436
 msgid "' (The game will now exit)"
 msgstr ""
 
-#: src/game.cpp:1390
+#: src/game.cpp:1509
 msgid "Battle for Wesnoth"
 msgstr ""
 
-#: src/game_events.cpp:579
+#: src/game_events.cpp:574
 msgid "Victory:"
 msgstr ""
 
-#: src/game_events.cpp:582
+#: src/game_events.cpp:577
 msgid "Defeat:"
 msgstr ""
 
-#: src/help.cpp:1038
+#: src/help.cpp:1063
 msgid "Advances to: "
 msgstr ""
 
-#: src/help.cpp:1059
+#: src/help.cpp:1084
 msgid "Abilities: "
 msgstr ""
 
-#: src/help.cpp:1078
+#: src/help.cpp:1103
 msgid "Alignment: "
 msgstr ""
 
-#: src/help.cpp:1082
+#: src/help.cpp:1107
 msgid "Required XP: "
 msgstr ""
 
-#: src/help.cpp:1091 src/reports.cpp:236
+#: src/help.cpp:1118 src/reports.cpp:236
 msgid "attacks"
 msgstr ""
 
-#: src/help.cpp:1099 src/playturn.cpp:2138
+#: src/help.cpp:1129 src/help.cpp:1130 src/playturn.cpp:2123
 msgid "Type"
 msgstr ""
 
-#: src/help.cpp:1100
+#: src/help.cpp:1133 src/help.cpp:1134 src/unit_types.cpp:312
+msgid "Dmg"
+msgstr ""
+
+#: src/help.cpp:1137 src/help.cpp:1138
 msgid "Strikes"
 msgstr ""
 
-#: src/help.cpp:1101
+#: src/help.cpp:1141 src/help.cpp:1142
 msgid "Range"
 msgstr ""
 
-#: src/help.cpp:1102
+#: src/help.cpp:1145 src/help.cpp:1146
 msgid "Special"
 msgstr ""
 
-#: src/help.cpp:1142
+#: src/help.cpp:1191
 msgid "Resistances"
 msgstr ""
 
-#: src/help.cpp:1146
+#: src/help.cpp:1195 src/help.cpp:1196
 msgid "Attack Type"
 msgstr ""
 
-#: src/help.cpp:1147
+#: src/help.cpp:1199 src/help.cpp:1200
 msgid "Resistance"
 msgstr ""
 
-#: src/help.cpp:1172
+#: src/help.cpp:1227
 msgid "Terrain Modifiers"
 msgstr ""
 
-#: src/help.cpp:1176
+#: src/help.cpp:1231 src/help.cpp:1232
 msgid "Terrain"
 msgstr ""
 
-#: src/help.cpp:1178
+#: src/help.cpp:1239 src/help.cpp:1240
 msgid "Defense"
 msgstr ""
 
-#: src/help.cpp:1276
+#: src/help.cpp:1340
 msgid "or"
 msgstr ""
 
-#: src/help.cpp:1283
+#: src/help.cpp:1347
 msgid "This terrain acts as $terrains for movement and defense purposes."
 msgstr ""
 
-#: src/help.cpp:1285
+#: src/help.cpp:1349
 msgid "The terrain with the best modifier is chosen automatically."
 msgstr ""
 
-#: src/help.cpp:1289
+#: src/help.cpp:1353
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain."
 msgstr ""
 
-#: src/help.cpp:1291
+#: src/help.cpp:1355
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain."
 msgstr ""
 
-#: src/help.cpp:1293
+#: src/help.cpp:1357
 msgid "This terrain gives healing."
 msgstr ""
 
-#: src/help.cpp:2158
+#: src/help.cpp:2228
 msgid "< Back"
 msgstr ""
 
-#: src/help.cpp:2159
+#: src/help.cpp:2229
 msgid "Forward >"
 msgstr ""
 
-#: src/help.cpp:2636
+#: src/help.cpp:2716
 msgid "The Battle for Wesnoth Help"
 msgstr ""
 
@@ -7024,7 +7034,7 @@
 msgid "The End"
 msgstr ""
 
-#: src/language.cpp:41 src/language.cpp:177
+#: src/language.cpp:39 src/language.cpp:160
 msgid "System default language"
 msgstr ""
 
@@ -7088,123 +7098,123 @@
 msgid "Island"
 msgstr ""
 
-#: src/multiplayer.cpp:92
+#: src/multiplayer.cpp:91
 msgid "Connect to Host"
 msgstr ""
 
-#: src/multiplayer.cpp:94
+#: src/multiplayer.cpp:93
 msgid "Choose host to connect to: "
 msgstr ""
 
-#: src/multiplayer.cpp:133
+#: src/multiplayer.cpp:132
 msgid "Connecting to remote host..."
 msgstr ""
 
-#: src/multiplayer.cpp:142
+#: src/multiplayer.cpp:141
 msgid ""
 "The server requires version '$version1' while you are using version "
 "'$version2'"
 msgstr ""
 
-#: src/multiplayer.cpp:154
+#: src/multiplayer.cpp:153
 msgid "Server-side redirect loop"
 msgstr ""
 
-#: src/multiplayer.cpp:186
+#: src/multiplayer.cpp:185
 msgid "You must log in to this server"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:297
+#: src/multiplayer_connect.cpp:298
 msgid "(Vacant slot)"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:304
 msgid "Anonymous local player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:310
 msgid "Computer player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:312
+#: src/multiplayer_connect.cpp:313
 msgid "(Empty slot)"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:449
+#: src/multiplayer_connect.cpp:450
 msgid "No non-random sides in the current era"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:465
+#: src/multiplayer_connect.cpp:466
 msgid "Unable to find a leader type for faction $faction"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:479 src/multiplayer_connect.cpp:488
+#: src/multiplayer_connect.cpp:480 src/multiplayer_connect.cpp:489
 msgid "Team"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:486
+#: src/multiplayer_connect.cpp:487
 msgid "Player/Type"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:487
+#: src/multiplayer_connect.cpp:488
 msgid "Faction"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:489
+#: src/multiplayer_connect.cpp:490
 msgid "Color"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:490 src/playturn.cpp:1704 src/playturn.cpp:1711
+#: src/multiplayer_connect.cpp:491 src/playturn.cpp:1690 src/playturn.cpp:1697
 msgid "Gold"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:492
+#: src/multiplayer_connect.cpp:493
 msgid "Computer vs Computer"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:493
+#: src/multiplayer_connect.cpp:494
 msgid "I'm Ready"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:511
+#: src/multiplayer_connect.cpp:510
 msgid "The scenario is invalid because it has no sides."
 msgstr ""
 
-#: src/multiplayer_connect.cpp:788
+#: src/multiplayer_connect.cpp:800
 msgid "Game Lobby"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:808
+#: src/multiplayer_connect.cpp:820
 msgid "Network Player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:809
+#: src/multiplayer_connect.cpp:821
 msgid "Local Player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:810
+#: src/multiplayer_connect.cpp:822
 msgid "Computer Player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:811
+#: src/multiplayer_connect.cpp:823
 msgid "Empty"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:880
+#: src/multiplayer_connect.cpp:891
 msgid "This is not a multiplayer save"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:918
+#: src/multiplayer_connect.cpp:937
 msgid "Cannot find era $era"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:934
+#: src/multiplayer_connect.cpp:957
 msgid ""
 "Victory\n"
 "@Defeat enemy leader(s)"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:970
+#: src/multiplayer_connect.cpp:993
 msgid "Waiting for players to join..."
 msgstr ""
 
@@ -7284,35 +7294,35 @@
 msgid "$login's game"
 msgstr ""
 
-#: src/multiplayer_create.cpp:167
+#: src/multiplayer_create.cpp:166
 msgid "Invalid era selected"
 msgstr ""
 
-#: src/multiplayer_create.cpp:198
+#: src/multiplayer_create.cpp:197
 msgid "You must enter a name."
 msgstr ""
 
-#: src/multiplayer_create.cpp:207
+#: src/multiplayer_create.cpp:206
 msgid "Turns: "
 msgstr ""
 
-#: src/multiplayer_create.cpp:209
+#: src/multiplayer_create.cpp:208
 msgid "Unlimited Turns"
 msgstr ""
 
-#: src/multiplayer_create.cpp:216
+#: src/multiplayer_create.cpp:215
 msgid "Village Gold: "
 msgstr ""
 
-#: src/multiplayer_create.cpp:222
+#: src/multiplayer_create.cpp:221
 msgid "Experience Modifier: "
 msgstr ""
 
-#: src/multiplayer_create.cpp:325
+#: src/multiplayer_create.cpp:324
 msgid "Players: "
 msgstr ""
 
-#: src/multiplayer_create.cpp:386 src/multiplayer_lobby.cpp:30
+#: src/multiplayer_create.cpp:384 src/multiplayer_lobby.cpp:30
 msgid "Create Game"
 msgstr ""
 
@@ -7336,156 +7346,156 @@
 msgid "<no games open>"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:78
+#: src/multiplayer_ui.cpp:50
 msgid "Red"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:80
+#: src/multiplayer_ui.cpp:52
 msgid "Blue"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:82
+#: src/multiplayer_ui.cpp:54
 msgid "Green"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:84
+#: src/multiplayer_ui.cpp:56
 msgid "Yellow"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:86
+#: src/multiplayer_ui.cpp:58
 msgid "Purple"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:88
+#: src/multiplayer_ui.cpp:60
 msgid "Orange"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:90
+#: src/multiplayer_ui.cpp:62
 msgid "Grey"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:92
+#: src/multiplayer_ui.cpp:64
 msgid "White"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:94
+#: src/multiplayer_ui.cpp:66
 msgid "Brown"
 msgstr ""
 
-#: src/multiplayer_ui.cpp:96
+#: src/multiplayer_ui.cpp:68
 msgid "Invalid colour"
 msgstr ""
 
-#: src/multiplayer_wait.cpp:113
+#: src/multiplayer_wait.cpp:114
 msgid "Leader: "
 msgstr ""
 
-#: src/multiplayer_wait.cpp:115
+#: src/multiplayer_wait.cpp:116
 msgid "Recruits: "
 msgstr ""
 
-#: src/multiplayer_wait.cpp:148
+#: src/multiplayer_wait.cpp:149
 msgid "Waiting for game to start..."
 msgstr ""
 
-#: src/multiplayer_wait.cpp:167
+#: src/multiplayer_wait.cpp:168
 msgid "Getting game data..."
 msgstr ""
 
-#: src/multiplayer_wait.cpp:180
+#: src/multiplayer_wait.cpp:181
 msgid "No multiplayer sides available in this game"
 msgstr ""
 
-#: src/multiplayer_wait.cpp:207
+#: src/multiplayer_wait.cpp:208
 msgid "Era not available"
 msgstr ""
 
-#: src/multiplayer_wait.cpp:212
+#: src/multiplayer_wait.cpp:213
 msgid "No multiplayer sides found"
 msgstr ""
 
-#: src/multiplayer_wait.cpp:229
+#: src/multiplayer_wait.cpp:230
 msgid "Choose your side:"
 msgstr ""
 
-#: src/multiplayer_wait.cpp:374 src/unit.cpp:1164
+#: src/multiplayer_wait.cpp:411 src/unit.cpp:1151
 msgid "("
 msgstr ""
 
-#: src/multiplayer_wait.cpp:374 src/unit.cpp:1171
+#: src/multiplayer_wait.cpp:411 src/unit.cpp:1158
 msgid ")"
 msgstr ""
 
-#: src/multiplayer_wait.cpp:375 src/playturn.cpp:1801
+#: src/multiplayer_wait.cpp:412 src/playturn.cpp:1787
 msgid "unit^Gold"
 msgstr ""
 
-#: src/playlevel.cpp:602 src/playlevel.cpp:871
+#: src/playlevel.cpp:592 src/playlevel.cpp:859
 msgid "The file you have tried to load is corrupt"
 msgstr ""
 
-#: src/playlevel.cpp:755
+#: src/playlevel.cpp:743
 msgid "Game Over"
 msgstr ""
 
-#: src/playlevel.cpp:756
+#: src/playlevel.cpp:744
 msgid "The game is over."
 msgstr ""
 
-#: src/playlevel.cpp:769
+#: src/playlevel.cpp:757
 msgid "Defeat"
 msgstr ""
 
-#: src/playlevel.cpp:770
+#: src/playlevel.cpp:758
 msgid "You have been defeated!"
 msgstr ""
 
-#: src/playlevel.cpp:839
+#: src/playlevel.cpp:827
 msgid "Remaining gold: "
 msgstr ""
 
-#: src/playlevel.cpp:842
+#: src/playlevel.cpp:830
 msgid "Early finish bonus: "
 msgstr ""
 
-#: src/playlevel.cpp:844
+#: src/playlevel.cpp:832
 msgid "per turn"
 msgstr ""
 
-#: src/playlevel.cpp:845
+#: src/playlevel.cpp:833
 msgid "Turns finished early: "
 msgstr ""
 
-#: src/playlevel.cpp:847
+#: src/playlevel.cpp:835
 msgid "Bonus: "
 msgstr ""
 
-#: src/playlevel.cpp:849
+#: src/playlevel.cpp:837
 msgid "Gold: "
 msgstr ""
 
-#: src/playlevel.cpp:854
+#: src/playlevel.cpp:842
 #, no-c-format
 msgid "80% of gold is retained for the next scenario"
 msgstr ""
 
-#: src/playlevel.cpp:855
+#: src/playlevel.cpp:843
 msgid "Retained Gold: "
 msgstr ""
 
-#: src/playlevel.cpp:860
+#: src/playlevel.cpp:848
 msgid "Victory"
 msgstr ""
 
-#: src/playlevel.cpp:861
+#: src/playlevel.cpp:849
 msgid "You have emerged victorious!"
 msgstr ""
 
-#: src/playlevel.cpp:865
+#: src/playlevel.cpp:853
 msgid "Scenario Report"
 msgstr ""
 
-#: src/playlevel.cpp:886
+#: src/playlevel.cpp:874
 msgid ""
 "A network disconnection has occured, and the game cannot continue. Do you "
 "want to save the game?"
@@ -7519,246 +7529,237 @@
 msgid "Choose weapon:"
 msgstr ""
 
-#: src/playturn.cpp:1268
-msgid ""
-"You have not started your turn yet.  Do you really want to end your turn?"
+#: src/playturn.cpp:1270
+msgid "You have not started your turn yet.  Do you really want to end your 
turn?"
 msgstr ""
 
-#: src/playturn.cpp:1277 src/playturn.cpp:1282
+#: src/playturn.cpp:1279 src/playturn.cpp:1284
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1297
+#: src/playturn.cpp:1299
 msgid "Auto-Save"
 msgstr ""
 
-#: src/playturn.cpp:1299
+#: src/playturn.cpp:1301
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 
-#: src/playturn.cpp:1510
+#: src/playturn.cpp:1504
 msgid "Rename Unit"
 msgstr ""
 
-#: src/playturn.cpp:1556
-msgid "Name:"
-msgstr ""
-
-#: src/playturn.cpp:1559 src/playturn.cpp:1573
+#: src/playturn.cpp:1553 src/playturn.cpp:1567
 msgid "Error"
 msgstr ""
 
-#: src/playturn.cpp:1559
+#: src/playturn.cpp:1553
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
 msgstr ""
 
-#: src/playturn.cpp:1570
+#: src/playturn.cpp:1564
 msgid "Saved"
 msgstr ""
 
-#: src/playturn.cpp:1570
+#: src/playturn.cpp:1564
 msgid "The game has been saved"
 msgstr ""
 
-#: src/playturn.cpp:1573
-msgid "The game could not be saved"
-msgstr ""
-
-#: src/playturn.cpp:1703
+#: src/playturn.cpp:1689
 msgid "Leader"
 msgstr ""
 
-#: src/playturn.cpp:1705
+#: src/playturn.cpp:1691
 msgid "Villages"
 msgstr ""
 
-#: src/playturn.cpp:1707
+#: src/playturn.cpp:1693
 msgid "Upkeep"
 msgstr ""
 
-#: src/playturn.cpp:1708
+#: src/playturn.cpp:1694
 msgid "Income"
 msgstr ""
 
-#: src/playturn.cpp:1807
+#: src/playturn.cpp:1793
 msgid "You have no units available to recruit."
 msgstr ""
 
-#: src/playturn.cpp:1819
+#: src/playturn.cpp:1805
 msgid "Recruit"
 msgstr ""
 
-#: src/playturn.cpp:1820 src/playturn.cpp:2004
+#: src/playturn.cpp:1806 src/playturn.cpp:1990
 msgid "Select unit:"
 msgstr ""
 
-#: src/playturn.cpp:1854
+#: src/playturn.cpp:1840
 msgid "You don't have enough gold to recruit that unit"
 msgstr ""
 
-#: src/playturn.cpp:1912
+#: src/playturn.cpp:1898
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1914
+#: src/playturn.cpp:1900
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1919
+#: src/playturn.cpp:1905
 msgid "her"
 msgstr ""
 
-#: src/playturn.cpp:1919
+#: src/playturn.cpp:1905
 msgid "him"
 msgstr ""
 
-#: src/playturn.cpp:1960
+#: src/playturn.cpp:1946
 msgid "You are separated from your soldiers and may not recall them"
 msgstr ""
 
-#: src/playturn.cpp:1962
+#: src/playturn.cpp:1948
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
 msgstr ""
 
-#: src/playturn.cpp:1968
+#: src/playturn.cpp:1954
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 
-#: src/playturn.cpp:1978
+#: src/playturn.cpp:1964
 msgid "level: "
 msgstr ""
 
-#: src/playturn.cpp:1991
+#: src/playturn.cpp:1977
 msgid "Dismiss Unit"
 msgstr ""
 
-#: src/playturn.cpp:2003
+#: src/playturn.cpp:1989
 msgid "Recall"
 msgstr ""
 
-#: src/playturn.cpp:2049
+#: src/playturn.cpp:2034
 msgid "Message:"
 msgstr ""
 
-#: src/playturn.cpp:2049
+#: src/playturn.cpp:2034
 msgid "Send to allies only"
 msgstr ""
 
-#: src/playturn.cpp:2143 src/unit.cpp:1096
+#: src/playturn.cpp:2128 src/unit.cpp:1083
 msgid "Moves"
 msgstr ""
 
-#: src/playturn.cpp:2144
+#: src/playturn.cpp:2129
 msgid "Location"
 msgstr ""
 
-#: src/playturn.cpp:2192
+#: src/playturn.cpp:2177
 msgid "Unit List"
 msgstr ""
 
-#: src/playturn.cpp:2227 src/playturn.cpp:2289
+#: src/playturn.cpp:2212 src/playturn.cpp:2274
 msgid "Recruits"
 msgstr ""
 
-#: src/playturn.cpp:2233 src/playturn.cpp:2293
+#: src/playturn.cpp:2218 src/playturn.cpp:2278
 msgid "Recalls"
 msgstr ""
 
-#: src/playturn.cpp:2239 src/playturn.cpp:2297
+#: src/playturn.cpp:2224 src/playturn.cpp:2282
 msgid "Advancements"
 msgstr ""
 
-#: src/playturn.cpp:2245 src/playturn.cpp:2301
+#: src/playturn.cpp:2230 src/playturn.cpp:2286
 msgid "Losses"
 msgstr ""
 
-#: src/playturn.cpp:2251 src/playturn.cpp:2305
+#: src/playturn.cpp:2236 src/playturn.cpp:2290
 msgid "Kills"
 msgstr ""
 
-#: src/playturn.cpp:2257
+#: src/playturn.cpp:2242
 msgid "Damage Inflicted"
 msgstr ""
 
-#: src/playturn.cpp:2263
+#: src/playturn.cpp:2248
 msgid "Damage Taken"
 msgstr ""
 
-#: src/playturn.cpp:2269
+#: src/playturn.cpp:2254
 msgid "Damage Inflicted (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2276
+#: src/playturn.cpp:2261
 msgid "Damage Taken (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2282
+#: src/playturn.cpp:2267
 msgid "Statistics"
 msgstr ""
 
-#: src/playturn.cpp:2319
+#: src/playturn.cpp:2304
 msgid "Search"
 msgstr ""
 
-#: src/playturn.cpp:2329
+#: src/playturn.cpp:2314
 msgid "prompt^Command:"
 msgstr ""
 
-#: src/playturn.cpp:2340
+#: src/playturn.cpp:2325
 msgid "Chat Log"
 msgstr ""
 
-#: src/playturn.cpp:2405
+#: src/playturn.cpp:2390
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr ""
 
-#: src/playturn.cpp:2436
+#: src/playturn.cpp:2421
 msgid "Saved Theme Preference: "
 msgstr ""
 
-#: src/playturn.cpp:2442
+#: src/playturn.cpp:2427
 msgid "New theme will take effect on next new or loaded game."
 msgstr ""
 
-#: src/playturn.cpp:2527
+#: src/playturn.cpp:2512
 msgid "Place Label"
 msgstr ""
 
-#: src/playturn.cpp:2528
+#: src/playturn.cpp:2513
 msgid "Label:"
 msgstr ""
 
-#: src/playturn.cpp:2660
+#: src/playturn.cpp:2645
 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:2713
+#: src/playturn.cpp:2698
 msgid "Replace with AI"
 msgstr ""
 
-#: src/playturn.cpp:2714
+#: src/playturn.cpp:2699
 msgid "Replace with local player"
 msgstr ""
 
-#: src/playturn.cpp:2715
+#: src/playturn.cpp:2700
 msgid "Abort game"
 msgstr ""
 
-#: src/playturn.cpp:2718
+#: src/playturn.cpp:2703
 msgid "Replace with "
 msgstr ""
 
-#: src/playturn.cpp:2722
+#: src/playturn.cpp:2707
 msgid "has left the game. What do you want to do?"
 msgstr ""
 
@@ -7802,7 +7803,7 @@
 msgid "stone: "
 msgstr ""
 
-#: src/reports.cpp:235 src/unit_types.cpp:311
+#: src/reports.cpp:235
 msgid "damage"
 msgstr ""
 
@@ -7834,60 +7835,68 @@
 msgid "Observers:"
 msgstr ""
 
-#: src/serialization/parser.cpp:98
+#: src/serialization/parser.cpp:104
 msgid "Unexpected characters at line start"
 msgstr ""
 
-#: src/serialization/parser.cpp:124
-msgid "Missing closing tag for tag $tag at $pos"
+#: src/serialization/parser.cpp:130
+msgid "Missing closing tag for tag $tag (file $file, line $line)"
+msgstr ""
+
+#: src/serialization/parser.cpp:131
+msgid "Missing closing tag for tag $tag (line $line)"
 msgstr ""
 
-#: src/serialization/parser.cpp:139
+#: src/serialization/parser.cpp:146
 msgid "Unterminated [element] tag"
 msgstr ""
 
-#: src/serialization/parser.cpp:149 src/serialization/parser.cpp:185
+#: src/serialization/parser.cpp:157 src/serialization/parser.cpp:195
 msgid "Invalid tag name"
 msgstr ""
 
-#: src/serialization/parser.cpp:152
+#: src/serialization/parser.cpp:160
 msgid "Unterminated [+element] tag"
 msgstr ""
 
-#: src/serialization/parser.cpp:168
+#: src/serialization/parser.cpp:177
 msgid "Invalid closing tag name"
 msgstr ""
 
-#: src/serialization/parser.cpp:171
+#: src/serialization/parser.cpp:180
 msgid "Unterminated closing tag"
 msgstr ""
 
-#: src/serialization/parser.cpp:173
+#: src/serialization/parser.cpp:182
 msgid "Unexpected closing tag"
 msgstr ""
 
-#: src/serialization/parser.cpp:179
-msgid "Found invalid closing tag $tag2 for tag $tag (opened at $pos)"
+#: src/serialization/parser.cpp:187
+msgid "Found invalid closing tag for tag $tag (file $file, line $line)"
+msgstr ""
+
+#: src/serialization/parser.cpp:188
+msgid "Found invalid closing tag for tag $tag (line $line)"
 msgstr ""
 
-#: src/serialization/parser.cpp:204 src/serialization/parser.cpp:216
+#: src/serialization/parser.cpp:214 src/serialization/parser.cpp:226
 msgid "Empty variable name"
 msgstr ""
 
-#: src/serialization/parser.cpp:210
+#: src/serialization/parser.cpp:220
 msgid "Unexpected characters after variable name (expected , or =)"
 msgstr ""
 
-#: src/serialization/parser.cpp:238 src/serialization/parser.cpp:262
+#: src/serialization/parser.cpp:248 src/serialization/parser.cpp:272
 msgid "Unterminated quoted string"
 msgstr ""
 
-#: src/serialization/parser.cpp:285
-msgid " included from "
+#: src/serialization/parser.cpp:319
+msgid "$error in file $file (line $line, column $column)"
 msgstr ""
 
-#: src/serialization/parser.cpp:306
-msgid "$error at $pos"
+#: src/serialization/parser.cpp:320
+msgid "$error (line $line, column $column)"
 msgstr ""
 
 #: src/titlescreen.cpp:186
@@ -7960,30 +7969,31 @@
 msgid "-- The Tome of Wesnoth"
 msgstr ""
 
-#: src/unit.cpp:1042 src/unit.cpp:1169
-msgid "; "
+#: src/unit.cpp:1107
+msgid " XP to advance"
 msgstr ""
 
-#: src/unit.cpp:1121
-msgid "XP to advance"
+#: src/unit.cpp:1144
+msgid ": "
 msgstr ""
 
-#: src/unit.cpp:1160
-msgid ": "
+#: src/unit.cpp:1156
+msgid "; "
 msgstr ""
 
-#: src/unit_types.cpp:323
+#: src/unit_types.cpp:324
 msgid "strikes"
 msgstr ""
 
-#: src/unit_types.cpp:933
+#: src/unit_types.cpp:932
 msgid "chaotic"
 msgstr ""
 
-#: src/unit_types.cpp:933
+#: src/unit_types.cpp:932
 msgid "lawful"
 msgstr ""
 
-#: src/unit_types.cpp:933
+#: src/unit_types.cpp:932
 msgid "neutral"
 msgstr ""
+