diff --git a/po/wesnoth/es.po b/po/wesnoth/es.po
index 8d850f6270b..1dbfb8b6529 100644
--- a/po/wesnoth/es.po
+++ b/po/wesnoth/es.po
@@ -1,4 +1,3 @@
-# translation of es.po to Spanish.
 # Spanish translations for Battle for Wesnoth package.
 # Copyright (C) 2004,2006 Wesnoth development team
 # This file is distributed under the same license as the Battle for Wesnoth package.
@@ -13,12 +12,12 @@
 # Isaac Clerencia <isaac@warp.es>, 2006.
 msgid ""
 msgstr ""
-"Project-Id-Version: es\n"
+"Project-Id-Version: Wesnoth 1.2.0\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
-"POT-Creation-Date: 2006-07-01 14:03+0200\n"
-"PO-Revision-Date: 2006-07-28 11:07+0200\n"
+"POT-Creation-Date: 2006-07-28 11:13+0200\n"
+"PO-Revision-Date: 2006-08-21 00:25+0200\n"
 "Last-Translator: David Martínez Moreno <ender@debian.org>\n"
-"Language-Team:  <en@li.org>\n"
+"Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -311,9 +310,9 @@ msgid ""
 "up)."
 msgstr ""
 "Ralentiza:\n"
-"Este ataque ralentiza al objetivo hasta que acabe el turno. Una unidad afectada "
-"inflige la mitad del daño normal con sus ataques y se mueve a la mitad de "
-"velocidad (redondeando hacia arriba)."
+"Este ataque ralentiza al objetivo hasta que acabe el turno. Una unidad "
+"afectada inflige la mitad del daño normal con sus ataques y se mueve a la "
+"mitad de velocidad (redondeando hacia arriba)."
 
 #: data/abilities.cfg:451
 msgid "stones"
@@ -490,115 +489,115 @@ msgstr "Traducción danesa"
 msgid "Dutch Translation"
 msgstr "Traducción neerlandesa"
 
-#: data/about.cfg:229
+#: data/about.cfg:232
 msgid "English (GB) Translation"
 msgstr "Traducción británica"
 
-#: data/about.cfg:237
+#: data/about.cfg:240
 msgid "Esperanto Translation"
 msgstr "Traducción esperanto"
 
-#: data/about.cfg:247
+#: data/about.cfg:250
 msgid "Estonian Translation"
 msgstr "Traducción estonia"
 
-#: data/about.cfg:254
+#: data/about.cfg:257
 msgid "Filipino Translation"
 msgstr "Traducción filipina"
 
-#: data/about.cfg:261
+#: data/about.cfg:264
 msgid "Finnish Translation"
 msgstr "Traducción finesa"
 
-#: data/about.cfg:273
+#: data/about.cfg:276
 msgid "French Translation"
 msgstr "Traducción francesa"
 
-#: data/about.cfg:298
+#: data/about.cfg:304
 msgid "German Translation"
 msgstr "Traducción alemana"
 
-#: data/about.cfg:316
+#: data/about.cfg:322
 msgid "Greek Translation"
 msgstr "Traducción griega"
 
-#: data/about.cfg:326
+#: data/about.cfg:332
 msgid "Hebrew Translation"
 msgstr "Traducción hebrea"
 
-#: data/about.cfg:334
+#: data/about.cfg:340
 msgid "Hungarian Translation"
 msgstr "Traducción húngara"
 
-#: data/about.cfg:351
+#: data/about.cfg:357
 msgid "Indonesian Translation"
 msgstr "Traducción indonesia"
 
-#: data/about.cfg:358
+#: data/about.cfg:364
 msgid "Italian Translation"
 msgstr "Traducción italiana"
 
-#: data/about.cfg:373
+#: data/about.cfg:379
 msgid "Japanese Translation"
 msgstr "Traducción japonesa"
 
-#: data/about.cfg:382
+#: data/about.cfg:388
 msgid "Korean Translation"
 msgstr "Traducción coreana"
 
-#: data/about.cfg:389
+#: data/about.cfg:395
 msgid "Latin Translation"
 msgstr "Traducción al latín"
 
-#: data/about.cfg:396
+#: data/about.cfg:402
 msgid "Norwegian Translation"
 msgstr "Traducción noruega"
 
-#: data/about.cfg:407
+#: data/about.cfg:413
 msgid "Polish Translation"
 msgstr "Traducción polaca"
 
-#: data/about.cfg:424
+#: data/about.cfg:430
 msgid "Portuguese Translation"
 msgstr "Traducción portuguesa"
 
-#: data/about.cfg:431
+#: data/about.cfg:437
 msgid "Portuguese (Brazil) Translation"
 msgstr "Traducción al portugués de Brasil"
 
-#: data/about.cfg:446
+#: data/about.cfg:453
 msgid "Russian Translation"
 msgstr "Traducción rusa"
 
-#: data/about.cfg:456
+#: data/about.cfg:463
 msgid "Serbian Translation"
 msgstr "Traducción serbia"
 
-#: data/about.cfg:463
+#: data/about.cfg:471
 msgid "Slovak Translation"
 msgstr "Traducción eslovaca"
 
-#: data/about.cfg:470
+#: data/about.cfg:480
 msgid "Slovenian Translation"
 msgstr "Traducción eslovena"
 
-#: data/about.cfg:477
+#: data/about.cfg:487
 msgid "Spanish Translation"
 msgstr "Traducción española"
 
-#: data/about.cfg:490
+#: data/about.cfg:500
 msgid "Swedish Translation"
 msgstr "Traducción sueca"
 
-#: data/about.cfg:503
+#: data/about.cfg:513
 msgid "Turkish Translation"
 msgstr "Traducción turca"
 
-#: data/about.cfg:514 data/help.cfg:252
+#: data/about.cfg:524 data/help.cfg:252
 msgid "Contributors"
 msgstr "Colaboradores"
 
-#: data/about.cfg:530
+#: data/about.cfg:541
 msgid "Bots"
 msgstr "Robots"
 
@@ -637,227 +636,227 @@ msgstr ""
 "con la mayoría de enemigos ordinarios, y su maza de jinete puede encargarse "
 "del resto."
 
-#: data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg:20
-#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:34
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:24
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:216
+#: data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg:19
+#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:27
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:29
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:212
 #: data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg:114
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg:21
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg:20
-#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:21
-#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:103
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:39
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:249
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg:20
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg:19
+#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:20
+#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:95
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:31
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:241
 #: data/campaigns/Heir_To_The_Throne/units/Sea_Orc.cfg:20
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:44
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg:31
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:45
-#: data/tutorial/units/Commander.cfg:24 data/tutorial/units/Commander.cfg:216
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:29
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg:24
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:30
+#: data/tutorial/units/Commander.cfg:29 data/tutorial/units/Commander.cfg:212
 #: data/tutorial/units/Fighter.cfg:21 data/tutorial/units/Fighter.cfg:103
-#: data/tutorial/units/Fighteress.cfg:99 data/tutorial/units/Lord.cfg:39
-#: data/tutorial/units/Lord.cfg:249 data/units/Drake_Blademaster.cfg:73
-#: data/units/Drake_Clasher.cfg:77 data/units/Drake_Enforcer.cfg:69
-#: data/units/Drake_Flameheart.cfg:85 data/units/Drake_Flare.cfg:89
-#: data/units/Drake_Gladiator.cfg:74 data/units/Drake_Warrior.cfg:77
-#: data/units/Elvish_Archer.cfg:23 data/units/Elvish_Avenger.cfg:62
-#: data/units/Elvish_Captain.cfg:50 data/units/Elvish_Champion.cfg:23
-#: data/units/Elvish_Fighter.cfg:23 data/units/Elvish_Hero.cfg:22
-#: data/units/Elvish_Marksman.cfg:49 data/units/Elvish_Marshal.cfg:35
-#: data/units/Elvish_Outrider.cfg:30 data/units/Elvish_Ranger.cfg:59
-#: data/units/Elvish_Rider.cfg:33 data/units/Elvish_Scout.cfg:32
-#: data/units/Elvish_Sharpshooter.cfg:48
-#: data/units/Human_Horse_Grand_Knight.cfg:25
-#: data/units/Human_Horse_Knight.cfg:24 data/units/Human_Horse_Paladin.cfg:31
-#: data/units/Human_Loyalist_Bowman.cfg:23
-#: data/units/Human_Loyalist_Cavalier.cfg:42
-#: data/units/Human_Loyalist_Cavalryman.cfg:56
-#: data/units/Human_Loyalist_Dragoon.cfg:41
-#: data/units/Human_Loyalist_General.cfg:49
-#: data/units/Human_Loyalist_Grand_Marshal.cfg:45
-#: data/units/Human_Loyalist_Lieutenant.cfg:39
+#: data/tutorial/units/Fighteress.cfg:99 data/tutorial/units/Lord.cfg:31
+#: data/tutorial/units/Lord.cfg:241 data/units/Drake_Blademaster.cfg:66
+#: data/units/Drake_Clasher.cfg:76 data/units/Drake_Enforcer.cfg:68
+#: data/units/Drake_Flameheart.cfg:78 data/units/Drake_Flare.cfg:82
+#: data/units/Drake_Gladiator.cfg:67 data/units/Drake_Warrior.cfg:70
+#: data/units/Elvish_Archer.cfg:23 data/units/Elvish_Avenger.cfg:61
+#: data/units/Elvish_Captain.cfg:35 data/units/Elvish_Champion.cfg:22
+#: data/units/Elvish_Fighter.cfg:22 data/units/Elvish_Hero.cfg:21
+#: data/units/Elvish_Marksman.cfg:48 data/units/Elvish_Marshal.cfg:34
+#: data/units/Elvish_Outrider.cfg:29 data/units/Elvish_Ranger.cfg:58
+#: data/units/Elvish_Rider.cfg:32 data/units/Elvish_Scout.cfg:31
+#: data/units/Elvish_Sharpshooter.cfg:47
+#: data/units/Human_Horse_Grand_Knight.cfg:24
+#: data/units/Human_Horse_Knight.cfg:23 data/units/Human_Horse_Paladin.cfg:30
+#: data/units/Human_Loyalist_Bowman.cfg:22
+#: data/units/Human_Loyalist_Cavalier.cfg:35
+#: data/units/Human_Loyalist_Cavalryman.cfg:49
+#: data/units/Human_Loyalist_Dragoon.cfg:34
+#: data/units/Human_Loyalist_General.cfg:42
+#: data/units/Human_Loyalist_Grand_Marshal.cfg:38
+#: data/units/Human_Loyalist_Lieutenant.cfg:32
 #: data/units/Human_Loyalist_Longbowman.cfg:22
-#: data/units/Human_Loyalist_Master_Bowman.cfg:30
-#: data/units/Human_Loyalist_Royal_Guard.cfg:33
-#: data/units/Human_Loyalist_Sergeant.cfg:38
-#: data/units/Human_Loyalist_Swordsman.cfg:32 data/units/Naga_Fighter.cfg:30
-#: data/units/Naga_Myrmidon.cfg:34 data/units/Naga_Warrior.cfg:33
-#: data/units/Orcish_Grunt.cfg:39 data/units/Orcish_Leader.cfg:34
+#: data/units/Human_Loyalist_Master_Bowman.cfg:23
+#: data/units/Human_Loyalist_Royal_Guard.cfg:26
+#: data/units/Human_Loyalist_Sergeant.cfg:31
+#: data/units/Human_Loyalist_Swordsman.cfg:25 data/units/Naga_Fighter.cfg:23
+#: data/units/Naga_Myrmidon.cfg:27 data/units/Naga_Warrior.cfg:26
+#: data/units/Orcish_Grunt.cfg:39 data/units/Orcish_Leader.cfg:27
 msgid "sword"
 msgstr "espada"
 
-#: data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg:21
-#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:36
-#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:36
-#: data/campaigns/Eastern_Invasion/units/Skeletal_Dragon.cfg:31
-#: data/campaigns/Eastern_Invasion/units/Skeletal_Dragon.cfg:69
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:41
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:161
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:26
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:218
+#: data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg:20
+#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:29
+#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:29
+#: data/campaigns/Eastern_Invasion/units/Skeletal_Dragon.cfg:30
+#: data/campaigns/Eastern_Invasion/units/Skeletal_Dragon.cfg:68
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:35
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:155
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:31
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:214
 #: data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg:115
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg:23
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg:22
-#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:23
-#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:105
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:41
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:250
-#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:34
-#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:130
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg:22
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg:21
+#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:22
+#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:97
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:33
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:242
+#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:33
+#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:128
 #: data/campaigns/Heir_To_The_Throne/units/Sea_Orc.cfg:22
 #: data/campaigns/Heir_To_The_Throne/units/Sleeping_Gryphon.cfg:32
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:32
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:45
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg:32
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:46
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:29
-#: data/tutorial/units/Commander.cfg:26 data/tutorial/units/Commander.cfg:218
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:25
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:30
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg:25
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:31
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:22
+#: data/tutorial/units/Commander.cfg:31 data/tutorial/units/Commander.cfg:214
 #: data/tutorial/units/Fighter.cfg:23 data/tutorial/units/Fighter.cfg:105
 #: data/tutorial/units/Fighteress.cfg:30
-#: data/tutorial/units/Fighteress.cfg:100 data/tutorial/units/Lord.cfg:41
-#: data/tutorial/units/Lord.cfg:250 data/units/Drake_Blademaster.cfg:74
-#: data/units/Drake_Burner.cfg:70 data/units/Drake_Clasher.cfg:78
-#: data/units/Drake_Enforcer.cfg:70 data/units/Drake_Fighter.cfg:65
-#: data/units/Drake_Fire.cfg:77 data/units/Drake_Flameheart.cfg:86
-#: data/units/Drake_Flare.cfg:90 data/units/Drake_Gladiator.cfg:75
-#: data/units/Drake_Inferno.cfg:78 data/units/Drake_Slasher.cfg:77
-#: data/units/Drake_Warden.cfg:83 data/units/Drake_Warrior.cfg:78
-#: data/units/Dwarvish_Berserker.cfg:39 data/units/Dwarvish_Dragonguard.cfg:30
-#: data/units/Dwarvish_Fighter.cfg:31 data/units/Dwarvish_Lord.cfg:33
-#: data/units/Dwarvish_Lord.cfg:124 data/units/Dwarvish_Steelclad.cfg:33
-#: data/units/Dwarvish_Thunderer.cfg:47
-#: data/units/Dwarvish_Thunderguard.cfg:31
-#: data/units/Dwarvish_Ulfserker.cfg:39 data/units/Elvish_Archer.cfg:25
-#: data/units/Elvish_Avenger.cfg:64 data/units/Elvish_Captain.cfg:52
-#: data/units/Elvish_Champion.cfg:25 data/units/Elvish_Fighter.cfg:25
-#: data/units/Elvish_Hero.cfg:24 data/units/Elvish_Marksman.cfg:51
-#: data/units/Elvish_Marshal.cfg:37 data/units/Elvish_Outrider.cfg:32
-#: data/units/Elvish_Ranger.cfg:61 data/units/Elvish_Rider.cfg:35
-#: data/units/Elvish_Scout.cfg:34 data/units/Elvish_Sharpshooter.cfg:50
-#: data/units/Goblin_Direwolf_Rider.cfg:42
-#: data/units/Goblin_Direwolf_Rider.cfg:88 data/units/Goblin_Knight.cfg:42
-#: data/units/Goblin_Wolf_Rider.cfg:43 data/units/Gryphon.cfg:25
+#: data/tutorial/units/Fighteress.cfg:100 data/tutorial/units/Lord.cfg:33
+#: data/tutorial/units/Lord.cfg:242 data/units/Drake_Blademaster.cfg:67
+#: data/units/Drake_Burner.cfg:63 data/units/Drake_Clasher.cfg:77
+#: data/units/Drake_Enforcer.cfg:69 data/units/Drake_Fighter.cfg:64
+#: data/units/Drake_Fire.cfg:70 data/units/Drake_Flameheart.cfg:79
+#: data/units/Drake_Flare.cfg:83 data/units/Drake_Gladiator.cfg:68
+#: data/units/Drake_Inferno.cfg:71 data/units/Drake_Slasher.cfg:70
+#: data/units/Drake_Warden.cfg:76 data/units/Drake_Warrior.cfg:71
+#: data/units/Dwarvish_Berserker.cfg:32 data/units/Dwarvish_Dragonguard.cfg:23
+#: data/units/Dwarvish_Fighter.cfg:25 data/units/Dwarvish_Lord.cfg:27
+#: data/units/Dwarvish_Lord.cfg:118 data/units/Dwarvish_Steelclad.cfg:27
+#: data/units/Dwarvish_Thunderer.cfg:40
+#: data/units/Dwarvish_Thunderguard.cfg:24
+#: data/units/Dwarvish_Ulfserker.cfg:32 data/units/Elvish_Archer.cfg:25
+#: data/units/Elvish_Avenger.cfg:63 data/units/Elvish_Captain.cfg:37
+#: data/units/Elvish_Champion.cfg:24 data/units/Elvish_Fighter.cfg:24
+#: data/units/Elvish_Hero.cfg:23 data/units/Elvish_Marksman.cfg:50
+#: data/units/Elvish_Marshal.cfg:36 data/units/Elvish_Outrider.cfg:31
+#: data/units/Elvish_Ranger.cfg:60 data/units/Elvish_Rider.cfg:34
+#: data/units/Elvish_Scout.cfg:33 data/units/Elvish_Sharpshooter.cfg:49
+#: data/units/Goblin_Direwolf_Rider.cfg:35
+#: data/units/Goblin_Direwolf_Rider.cfg:81 data/units/Goblin_Knight.cfg:35
+#: data/units/Goblin_Wolf_Rider.cfg:36 data/units/Gryphon.cfg:25
 #: data/units/Gryphon_Master.cfg:26 data/units/Gryphon_Rider.cfg:26
-#: data/units/Human_Horse_Grand_Knight.cfg:27
-#: data/units/Human_Horse_Knight.cfg:26
-#: data/units/Human_Loyalist_Bowman.cfg:25
-#: data/units/Human_Loyalist_Cavalier.cfg:44
-#: data/units/Human_Loyalist_Cavalryman.cfg:58
-#: data/units/Human_Loyalist_Dragoon.cfg:43
-#: data/units/Human_Loyalist_Duelist.cfg:78
-#: data/units/Human_Loyalist_Fencer.cfg:83
-#: data/units/Human_Loyalist_General.cfg:51
-#: data/units/Human_Loyalist_Grand_Marshal.cfg:47
-#: data/units/Human_Loyalist_Halberdier.cfg:269
-#: data/units/Human_Loyalist_Lieutenant.cfg:41
+#: data/units/Human_Horse_Grand_Knight.cfg:26
+#: data/units/Human_Horse_Knight.cfg:25
+#: data/units/Human_Loyalist_Bowman.cfg:24
+#: data/units/Human_Loyalist_Cavalier.cfg:37
+#: data/units/Human_Loyalist_Cavalryman.cfg:51
+#: data/units/Human_Loyalist_Dragoon.cfg:36
+#: data/units/Human_Loyalist_Duelist.cfg:71
+#: data/units/Human_Loyalist_Fencer.cfg:108
+#: data/units/Human_Loyalist_General.cfg:44
+#: data/units/Human_Loyalist_Grand_Marshal.cfg:40
+#: data/units/Human_Loyalist_Halberdier.cfg:262
+#: data/units/Human_Loyalist_Lieutenant.cfg:34
 #: data/units/Human_Loyalist_Longbowman.cfg:24
-#: data/units/Human_Loyalist_Master_Bowman.cfg:32
+#: data/units/Human_Loyalist_Master_Bowman.cfg:25
 #: data/units/Human_Loyalist_Master_at_Arms.cfg:30
-#: data/units/Human_Loyalist_Royal_Guard.cfg:35
-#: data/units/Human_Loyalist_Sergeant.cfg:40
-#: data/units/Human_Loyalist_Swordsman.cfg:34
-#: data/units/Human_Outlaw_Assassin.cfg:48
-#: data/units/Human_Outlaw_Assassin.cfg:155
-#: data/units/Human_Outlaw_Poacher.cfg:38 data/units/Human_Outlaw_Rogue.cfg:34
-#: data/units/Human_Outlaw_Rogue.cfg:83 data/units/Human_Outlaw_Thief.cfg:87
-#: data/units/Human_Outlaw_Trapper.cfg:38 data/units/Merman_Triton.cfg:95
-#: data/units/Monster_Cave_Spider.cfg:43 data/units/Naga_Fighter.cfg:32
-#: data/units/Naga_Myrmidon.cfg:36 data/units/Naga_Warrior.cfg:35
-#: data/units/Ogre.cfg:22 data/units/Ogre_Young.cfg:22
-#: data/units/Orcish_Archer.cfg:78 data/units/Orcish_Assassin.cfg:32
-#: data/units/Orcish_Assassin.cfg:78 data/units/Orcish_Crossbowman.cfg:30
-#: data/units/Orcish_Grunt.cfg:41 data/units/Orcish_Leader.cfg:36
-#: data/units/Orcish_Ruler.cfg:35 data/units/Orcish_Slayer.cfg:32
-#: data/units/Orcish_Slayer.cfg:98 data/units/Orcish_Slurbow.cfg:31
-#: data/units/Orcish_Sovereign.cfg:36 data/units/Orcish_Warlord.cfg:31
-#: data/units/Orcish_Warrior.cfg:30 data/units/Undead_Bat_Blood.cfg:50
-#: data/units/Undead_Bat_Vampire.cfg:74 data/units/Undead_Corpse_Ghoul.cfg:42
-#: data/units/Undead_Corpse_Necrophage.cfg:41
-#: data/units/Undead_Skele_Bone_Shooter.cfg:44
-#: data/units/Undead_Skele_Death_Knight.cfg:46
-#: data/units/Undead_Skele_Deathblade.cfg:44
-#: data/units/Undead_Skele_Draug.cfg:45
-#: data/units/Undead_Skele_Revenant.cfg:43
-#: data/units/Undead_Skele_Soul_Shooter.cfg:34
-#: data/units/Undead_Skeleton.cfg:76
-#: data/units/Undead_Spirit_Nightgaunt.cfg:60
-#: data/units/Undead_Spirit_Shadow.cfg:34
-#: data/units/Undead_Spirit_Spectre.cfg:47
-#: data/units/Undead_Spirit_Wraith.cfg:24
+#: data/units/Human_Loyalist_Royal_Guard.cfg:28
+#: data/units/Human_Loyalist_Sergeant.cfg:33
+#: data/units/Human_Loyalist_Swordsman.cfg:27
+#: data/units/Human_Outlaw_Assassin.cfg:41
+#: data/units/Human_Outlaw_Assassin.cfg:148
+#: data/units/Human_Outlaw_Poacher.cfg:31 data/units/Human_Outlaw_Rogue.cfg:27
+#: data/units/Human_Outlaw_Rogue.cfg:76 data/units/Human_Outlaw_Thief.cfg:86
+#: data/units/Human_Outlaw_Trapper.cfg:31 data/units/Merman_Triton.cfg:88
+#: data/units/Monster_Cave_Spider.cfg:36 data/units/Naga_Fighter.cfg:25
+#: data/units/Naga_Myrmidon.cfg:29 data/units/Naga_Warrior.cfg:28
+#: data/units/Ogre.cfg:21 data/units/Ogre_Young.cfg:21
+#: data/units/Orcish_Archer.cfg:71 data/units/Orcish_Assassin.cfg:25
+#: data/units/Orcish_Assassin.cfg:71 data/units/Orcish_Crossbowman.cfg:23
+#: data/units/Orcish_Grunt.cfg:41 data/units/Orcish_Leader.cfg:29
+#: data/units/Orcish_Ruler.cfg:28 data/units/Orcish_Slayer.cfg:25
+#: data/units/Orcish_Slayer.cfg:91 data/units/Orcish_Slurbow.cfg:24
+#: data/units/Orcish_Sovereign.cfg:29 data/units/Orcish_Warlord.cfg:24
+#: data/units/Orcish_Warrior.cfg:23 data/units/Undead_Bat_Blood.cfg:43
+#: data/units/Undead_Bat_Vampire.cfg:67 data/units/Undead_Corpse_Ghoul.cfg:35
+#: data/units/Undead_Corpse_Necrophage.cfg:34
+#: data/units/Undead_Skele_Bone_Shooter.cfg:43
+#: data/units/Undead_Skele_Death_Knight.cfg:45
+#: data/units/Undead_Skele_Deathblade.cfg:43
+#: data/units/Undead_Skele_Draug.cfg:44
+#: data/units/Undead_Skele_Revenant.cfg:42
+#: data/units/Undead_Skele_Soul_Shooter.cfg:33
+#: data/units/Undead_Skeleton.cfg:69
+#: data/units/Undead_Spirit_Nightgaunt.cfg:53
+#: data/units/Undead_Spirit_Shadow.cfg:27
+#: data/units/Undead_Spirit_Spectre.cfg:46
+#: data/units/Undead_Spirit_Wraith.cfg:23
 msgid "blade"
 msgstr "de filo"
 
-#: data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg:58
-#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:72
-#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:72
-#: data/units/Human_Loyalist_Shock_Trooper.cfg:26
+#: data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg:57
+#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:65
+#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:65
+#: data/units/Human_Loyalist_Shock_Trooper.cfg:19
 msgid "morning star"
 msgstr "maza de jinete"
 
-#: data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg:59
-#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:73
-#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:73
+#: data/campaigns/Eastern_Invasion/units/Horse_Lord.cfg:58
+#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:66
+#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:66
 #: data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg:36
-#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:33
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lady.cfg:23
-#: data/campaigns/Heir_To_The_Throne/units/Youth.cfg:30
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:99
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg:33
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Princess.cfg:53
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Princess.cfg:99
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Queen.cfg:56
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Queen.cfg:102
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg:36
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg:37
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:49
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:38
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:59
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:98
-#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:33
+#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:26
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lady.cfg:22
+#: data/campaigns/Heir_To_The_Throne/units/Youth.cfg:23
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:92
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg:26
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Princess.cfg:55
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Princess.cfg:101
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Queen.cfg:58
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Queen.cfg:104
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg:29
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg:30
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:42
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:31
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:52
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:91
+#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:26
 #: data/tutorial/units/Elder_Mage.cfg:33 data/tutorial/units/Quintain.cfg:23
 #: data/tutorial/units/Youth.cfg:30 data/units/Boat_Galleon.cfg:22
-#: data/units/Drake_Enforcer.cfg:106 data/units/Drake_Gladiator.cfg:187
-#: data/units/Drake_Glider.cfg:84 data/units/Drake_Hurricane.cfg:99
-#: data/units/Drake_Sky.cfg:98 data/units/Dwarvish_Fighter.cfg:76
-#: data/units/Dwarvish_Lord.cfg:79 data/units/Dwarvish_Runemaster.cfg:29
-#: data/units/Dwarvish_Steelclad.cfg:78 data/units/Elvish_Druid.cfg:30
-#: data/units/Elvish_Druid.cfg:56 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:93 data/units/Elvish_Shaman.cfg:78
-#: data/units/Elvish_Shaman.cfg:104 data/units/Elvish_Shyde.cfg:31
-#: data/units/Elvish_Shyde.cfg:59 data/units/Elvish_Sorceress.cfg:26
-#: data/units/Elvish_Sorceress.cfg:93 data/units/Elvish_Sylph.cfg:28
-#: data/units/Elvish_Sylph.cfg:56 data/units/Goblin_Pillager.cfg:88
-#: data/units/Human_Loyalist_Heavy_Infantryman.cfg:28
-#: data/units/Human_Loyalist_Iron_Mauler.cfg:31
-#: data/units/Human_Loyalist_Shock_Trooper.cfg:28 data/units/Human_Mage.cfg:58
-#: data/units/Human_Mage_Arch.cfg:48 data/units/Human_Mage_Great.cfg:37
-#: data/units/Human_Mage_Red.cfg:58 data/units/Human_Mage_Silver.cfg:95
-#: data/units/Human_Mage_White.cfg:63 data/units/Human_Mage_of_Light.cfg:43
-#: data/units/Human_Outlaw.cfg:30 data/units/Human_Outlaw.cfg:75
-#: data/units/Human_Outlaw_Bandit.cfg:41
-#: data/units/Human_Outlaw_Footpad.cfg:30
-#: data/units/Human_Outlaw_Footpad.cfg:95 data/units/Human_Outlaw_Thug.cfg:29
-#: data/units/Mermaid_Diviner.cfg:47 data/units/Mermaid_Enchantress.cfg:33
-#: data/units/Mermaid_Enchantress.cfg:79 data/units/Mermaid_Initiate.cfg:36
-#: data/units/Mermaid_Initiate.cfg:82 data/units/Mermaid_Priestess.cfg:41
-#: data/units/Mermaid_Siren.cfg:37 data/units/Mermaid_Siren.cfg:82
+#: data/units/Drake_Enforcer.cfg:105 data/units/Drake_Gladiator.cfg:180
+#: data/units/Drake_Glider.cfg:77 data/units/Drake_Hurricane.cfg:92
+#: data/units/Drake_Sky.cfg:91 data/units/Dwarvish_Fighter.cfg:70
+#: data/units/Dwarvish_Lord.cfg:73 data/units/Dwarvish_Runemaster.cfg:22
+#: data/units/Dwarvish_Steelclad.cfg:72 data/units/Elvish_Druid.cfg:27
+#: data/units/Elvish_Druid.cfg:53 data/units/Elvish_Enchantress.cfg:25
+#: data/units/Elvish_Enchantress.cfg:92 data/units/Elvish_Shaman.cfg:30
+#: data/units/Elvish_Shaman.cfg:56 data/units/Elvish_Shyde.cfg:28
+#: data/units/Elvish_Shyde.cfg:56 data/units/Elvish_Sorceress.cfg:25
+#: data/units/Elvish_Sorceress.cfg:92 data/units/Elvish_Sylph.cfg:27
+#: data/units/Elvish_Sylph.cfg:55 data/units/Goblin_Pillager.cfg:81
+#: data/units/Human_Loyalist_Heavy_Infantryman.cfg:21
+#: data/units/Human_Loyalist_Iron_Mauler.cfg:24
+#: data/units/Human_Loyalist_Shock_Trooper.cfg:21 data/units/Human_Mage.cfg:51
+#: data/units/Human_Mage_Arch.cfg:41 data/units/Human_Mage_Great.cfg:30
+#: data/units/Human_Mage_Red.cfg:51 data/units/Human_Mage_Silver.cfg:88
+#: data/units/Human_Mage_White.cfg:88 data/units/Human_Mage_of_Light.cfg:68
+#: data/units/Human_Outlaw.cfg:23 data/units/Human_Outlaw.cfg:68
+#: data/units/Human_Outlaw_Bandit.cfg:34
+#: data/units/Human_Outlaw_Footpad.cfg:23
+#: data/units/Human_Outlaw_Footpad.cfg:88 data/units/Human_Outlaw_Thug.cfg:22
+#: data/units/Mermaid_Diviner.cfg:72 data/units/Mermaid_Enchantress.cfg:26
+#: data/units/Mermaid_Enchantress.cfg:72 data/units/Mermaid_Initiate.cfg:29
+#: data/units/Mermaid_Initiate.cfg:75 data/units/Mermaid_Priestess.cfg:66
+#: data/units/Mermaid_Siren.cfg:30 data/units/Mermaid_Siren.cfg:75
 #: data/units/Merman_Entangler.cfg:60 data/units/Merman_Netcaster.cfg:59
-#: data/units/Monster_Cave_Spider.cfg:111
-#: data/units/Monster_Cuttle_Fish.cfg:42
-#: data/units/Monster_Giant_Mudcrawler.cfg:54
-#: data/units/Monster_Giant_Mudcrawler.cfg:100
-#: data/units/Monster_Giant_Scorpion.cfg:101
-#: data/units/Monster_Mudcrawler.cfg:53 data/units/Monster_Tentacle.cfg:67
-#: data/units/Monster_Yeti.cfg:40 data/units/Saurian_Augur.cfg:37
-#: data/units/Saurian_Oracle.cfg:36 data/units/Saurian_Soothsayer.cfg:37
-#: data/units/Troll.cfg:27 data/units/Troll_Great.cfg:28
-#: data/units/Troll_Hero.cfg:27 data/units/Troll_Rocklobber.cfg:29
-#: data/units/Troll_Rocklobber.cfg:74 data/units/Troll_Warrior.cfg:28
-#: data/units/Troll_Whelp.cfg:28 data/units/Undead_Corpse_Soulless.cfg:52
-#: data/units/Undead_Corpse_Walking.cfg:51
-#: data/units/Undead_Necro_Dark_Sorcerer.cfg:33
-#: data/units/Undead_Necromancer.cfg:34
-#: data/units/Undead_Skeleton_Archer.cfg:40 data/units/Wose.cfg:37
-#: data/units/Wose_Ancient.cfg:30 data/units/Wose_Elder.cfg:29
+#: data/units/Monster_Cave_Spider.cfg:104
+#: data/units/Monster_Cuttle_Fish.cfg:35
+#: data/units/Monster_Giant_Mudcrawler.cfg:47
+#: data/units/Monster_Giant_Mudcrawler.cfg:93
+#: data/units/Monster_Giant_Scorpion.cfg:94
+#: data/units/Monster_Mudcrawler.cfg:46 data/units/Monster_Tentacle.cfg:60
+#: data/units/Monster_Yeti.cfg:32 data/units/Saurian_Augur.cfg:30
+#: data/units/Saurian_Oracle.cfg:29 data/units/Saurian_Soothsayer.cfg:30
+#: data/units/Troll.cfg:26 data/units/Troll_Great.cfg:27
+#: data/units/Troll_Hero.cfg:26 data/units/Troll_Rocklobber.cfg:28
+#: data/units/Troll_Rocklobber.cfg:73 data/units/Troll_Warrior.cfg:27
+#: data/units/Troll_Whelp.cfg:27 data/units/Undead_Corpse_Soulless.cfg:45
+#: data/units/Undead_Corpse_Walking.cfg:44
+#: data/units/Undead_Necro_Dark_Sorcerer.cfg:26
+#: data/units/Undead_Necromancer.cfg:27
+#: data/units/Undead_Skeleton_Archer.cfg:33 data/units/Wose.cfg:30
+#: data/units/Wose_Ancient.cfg:29 data/units/Wose_Elder.cfg:28
 msgid "impact"
 msgstr "impacto"
 
@@ -865,7 +864,7 @@ msgstr "impacto"
 msgid "Mounted Fighter"
 msgstr "Luchador montado"
 
-#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:30
+#: data/campaigns/Eastern_Invasion/units/Mounted_Fighter.cfg:24
 msgid ""
 "The nobles of the men of the plains are trained with the rest of the "
 "horsemen to become great warriors. However, they are also trained in "
@@ -881,7 +880,7 @@ msgstr ""
 msgid "Mounted Warrior"
 msgstr "Guerrero montado"
 
-#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:30
+#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:24
 msgid ""
 "Leaders of the plains, Mounted Warriors are skilled with the use of the "
 "sword and the morning star. Riding horses, they are able to move around the "
@@ -892,9 +891,9 @@ msgstr ""
 "y la maza de jinete. A lomos de sus caballos son capaces de moverse por el "
 "campo de batalla a gran velocidad, y ofrecer su ayuda en diferentes frentes."
 
-#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:34
-#: data/units/Orcish_Ruler.cfg:33 data/units/Orcish_Sovereign.cfg:34
-#: data/units/Orcish_Warlord.cfg:29 data/units/Orcish_Warrior.cfg:28
+#: data/campaigns/Eastern_Invasion/units/Mounted_Warrior.cfg:27
+#: data/units/Orcish_Ruler.cfg:26 data/units/Orcish_Sovereign.cfg:27
+#: data/units/Orcish_Warlord.cfg:22 data/units/Orcish_Warrior.cfg:21
 msgid "greatsword"
 msgstr "montante"
 
@@ -917,19 +916,19 @@ msgstr ""
 "de los que pensaron eso han vivido lo suficiente como para darse cuenta de "
 "su error."
 
-#: data/campaigns/Eastern_Invasion/units/Skeletal_Dragon.cfg:29
+#: data/campaigns/Eastern_Invasion/units/Skeletal_Dragon.cfg:28
 msgid "jaw"
 msgstr "mordisco"
 
-#: data/campaigns/Eastern_Invasion/units/Skeletal_Dragon.cfg:68
+#: data/campaigns/Eastern_Invasion/units/Skeletal_Dragon.cfg:67
 #: data/campaigns/Heir_To_The_Throne/units/Sleeping_Gryphon.cfg:30
-#: data/units/Drake_Burner.cfg:68 data/units/Drake_Fire.cfg:75
-#: data/units/Drake_Inferno.cfg:76 data/units/Goblin_Direwolf_Rider.cfg:86
+#: data/units/Drake_Burner.cfg:61 data/units/Drake_Fire.cfg:68
+#: data/units/Drake_Inferno.cfg:69 data/units/Goblin_Direwolf_Rider.cfg:79
 #: data/units/Gryphon.cfg:23 data/units/Gryphon_Master.cfg:24
-#: data/units/Gryphon_Rider.cfg:24 data/units/Undead_Corpse_Ghoul.cfg:40
-#: data/units/Undead_Corpse_Necrophage.cfg:39
-#: data/units/Undead_Spirit_Nightgaunt.cfg:59
-#: data/units/Undead_Spirit_Shadow.cfg:33
+#: data/units/Gryphon_Rider.cfg:24 data/units/Undead_Corpse_Ghoul.cfg:33
+#: data/units/Undead_Corpse_Necrophage.cfg:32
+#: data/units/Undead_Spirit_Nightgaunt.cfg:52
+#: data/units/Undead_Spirit_Shadow.cfg:26
 msgid "claws"
 msgstr "garras"
 
@@ -941,12 +940,12 @@ msgid "Current Maintainer"
 msgstr "Mantenedor actual"
 
 #: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:3
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:129
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:123
 msgid "female^Battle Princess"
 msgstr "Princesa guerrera"
 
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:35
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:155
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:30
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:149
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -959,54 +958,54 @@ msgstr ""
 "puede ayudar a aquellos que la rodean a combatir mejor gracias a su "
 "presencia."
 
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:39
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:159
-#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:32
-#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:128
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:33
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:153
+#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:31
+#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:126
 #: data/tutorial/units/Fighteress.cfg:28
-#: data/units/Human_Loyalist_Duelist.cfg:76
-#: data/units/Human_Loyalist_Fencer.cfg:81
+#: data/units/Human_Loyalist_Duelist.cfg:69
+#: data/units/Human_Loyalist_Fencer.cfg:106
 #: data/units/Human_Loyalist_Master_at_Arms.cfg:28
 msgid "sabre"
 msgstr "sable"
 
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:235
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:282
-#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:159
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:339
-#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:194
-#: data/tutorial/units/Commander.cfg:282 data/tutorial/units/Fighter.cfg:159
-#: data/tutorial/units/Fighteress.cfg:144 data/tutorial/units/Lord.cfg:339
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:229
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:278
+#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:151
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:331
+#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:192
+#: data/tutorial/units/Commander.cfg:278 data/tutorial/units/Fighter.cfg:159
+#: data/tutorial/units/Fighteress.cfg:144 data/tutorial/units/Lord.cfg:331
 msgid "scepter of fire"
 msgstr "cetro de fuego"
 
-#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:236
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:283
-#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:109
-#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:160
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:340
-#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:195
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:145
+#: data/campaigns/Heir_To_The_Throne/units/Battle_Princess.cfg:230
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:279
+#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:102
+#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:152
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:332
+#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:193
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:138
 #: data/campaigns/The_Rise_Of_Wesnoth/units/Fireball.cfg:26
 #: data/campaigns/The_Rise_Of_Wesnoth/units/Fireball.cfg:27
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:95
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:84
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:80
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:124
-#: data/tutorial/units/Commander.cfg:283
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:88
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:77
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:73
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:117
+#: data/tutorial/units/Commander.cfg:279
 #: data/tutorial/units/Elder_Mage.cfg:109 data/tutorial/units/Fighter.cfg:160
-#: data/tutorial/units/Fighteress.cfg:145 data/tutorial/units/Lord.cfg:340
-#: data/units/Drake_Blademaster.cfg:141 data/units/Drake_Burner.cfg:136
-#: data/units/Drake_Fighter.cfg:132 data/units/Drake_Fire.cfg:143
-#: data/units/Drake_Flameheart.cfg:163 data/units/Drake_Flare.cfg:167
-#: data/units/Drake_Glider.cfg:161 data/units/Drake_Hurricane.cfg:186
-#: data/units/Drake_Inferno.cfg:144 data/units/Drake_Sky.cfg:185
-#: data/units/Drake_Warrior.cfg:145 data/units/Dwarvish_Runemaster.cfg:77
-#: data/units/Goblin_Pillager.cfg:43 data/units/Human_Mage.cfg:124
-#: data/units/Human_Mage_Arch.cfg:113 data/units/Human_Mage_Great.cfg:102
-#: data/units/Human_Mage_Red.cfg:123 data/units/Human_Mage_Silver.cfg:153
-#: data/units/Orcish_Archer.cfg:352 data/units/Orcish_Crossbowman.cfg:124
-#: data/units/Orcish_Slurbow.cfg:165
+#: data/tutorial/units/Fighteress.cfg:145 data/tutorial/units/Lord.cfg:332
+#: data/units/Drake_Blademaster.cfg:134 data/units/Drake_Burner.cfg:129
+#: data/units/Drake_Fighter.cfg:131 data/units/Drake_Fire.cfg:136
+#: data/units/Drake_Flameheart.cfg:156 data/units/Drake_Flare.cfg:160
+#: data/units/Drake_Glider.cfg:154 data/units/Drake_Hurricane.cfg:179
+#: data/units/Drake_Inferno.cfg:137 data/units/Drake_Sky.cfg:178
+#: data/units/Drake_Warrior.cfg:138 data/units/Dwarvish_Runemaster.cfg:70
+#: data/units/Goblin_Pillager.cfg:36 data/units/Human_Mage.cfg:117
+#: data/units/Human_Mage_Arch.cfg:106 data/units/Human_Mage_Great.cfg:95
+#: data/units/Human_Mage_Red.cfg:116 data/units/Human_Mage_Silver.cfg:146
+#: data/units/Orcish_Archer.cfg:345 data/units/Orcish_Crossbowman.cfg:117
+#: data/units/Orcish_Slurbow.cfg:158
 msgid "fire"
 msgstr "fuego"
 
@@ -1028,100 +1027,100 @@ msgstr ""
 "usadas una vez por una antigua y olvidada civilización, se pueden mover más "
 "rápido que muchas otras unidades de caballería."
 
-#: data/campaigns/Heir_To_The_Throne/units/Chocobone.cfg:23
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Chocobone.cfg:23
-#: data/campaigns/The_South_Guard/units/Chocobone.cfg:23
-#: data/units/Drake_Clasher.cfg:133 data/units/Drake_Enforcer.cfg:141
-#: data/units/Drake_Gladiator.cfg:130 data/units/Dwarvish_Guardsman.cfg:31
-#: data/units/Dwarvish_Guardsman.cfg:97 data/units/Dwarvish_Sentinel.cfg:45
-#: data/units/Dwarvish_Sentinel.cfg:111 data/units/Dwarvish_Stalwart.cfg:40
-#: data/units/Dwarvish_Stalwart.cfg:106 data/units/Goblin_Impaler.cfg:30
-#: data/units/Goblin_Impaler.cfg:191 data/units/Goblin_Rouser.cfg:40
-#: data/units/Goblin_Spearman.cfg:29 data/units/Goblin_Spearman.cfg:75
-#: data/units/Human_Horseman.cfg:25
-#: data/units/Human_Loyalist_Javelineer.cfg:34
-#: data/units/Human_Loyalist_Javelineer.cfg:112
-#: data/units/Human_Loyalist_Spearman.cfg:63
-#: data/units/Human_Loyalist_Spearman.cfg:244
-#: data/units/Merman_Entangler.cfg:24 data/units/Merman_Hunter.cfg:29
-#: data/units/Merman_Hunter.cfg:236 data/units/Merman_Javelineer.cfg:29
-#: data/units/Merman_Javelineer.cfg:156 data/units/Merman_Netcaster.cfg:23
-#: data/units/Merman_Spearman.cfg:28 data/units/Merman_Spearman.cfg:235
-#: data/units/Saurian_Ambusher.cfg:34 data/units/Saurian_Ambusher.cfg:90
-#: data/units/Saurian_Flanker.cfg:35 data/units/Saurian_Flanker.cfg:91
-#: data/units/Saurian_Skirmisher.cfg:35 data/units/Saurian_Skirmisher.cfg:91
+#: data/campaigns/Heir_To_The_Throne/units/Chocobone.cfg:22
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Chocobone.cfg:22
+#: data/campaigns/The_South_Guard/units/Chocobone.cfg:22
+#: data/units/Drake_Clasher.cfg:132 data/units/Drake_Enforcer.cfg:140
+#: data/units/Drake_Gladiator.cfg:123 data/units/Dwarvish_Guardsman.cfg:30
+#: data/units/Dwarvish_Guardsman.cfg:96 data/units/Dwarvish_Sentinel.cfg:38
+#: data/units/Dwarvish_Sentinel.cfg:104 data/units/Dwarvish_Stalwart.cfg:33
+#: data/units/Dwarvish_Stalwart.cfg:99 data/units/Goblin_Impaler.cfg:23
+#: data/units/Goblin_Impaler.cfg:184 data/units/Goblin_Rouser.cfg:40
+#: data/units/Goblin_Spearman.cfg:22 data/units/Goblin_Spearman.cfg:68
+#: data/units/Human_Horseman.cfg:24
+#: data/units/Human_Loyalist_Javelineer.cfg:27
+#: data/units/Human_Loyalist_Javelineer.cfg:105
+#: data/units/Human_Loyalist_Spearman.cfg:62
+#: data/units/Human_Loyalist_Spearman.cfg:243
+#: data/units/Merman_Entangler.cfg:24 data/units/Merman_Hunter.cfg:22
+#: data/units/Merman_Hunter.cfg:229 data/units/Merman_Javelineer.cfg:22
+#: data/units/Merman_Javelineer.cfg:149 data/units/Merman_Netcaster.cfg:23
+#: data/units/Merman_Spearman.cfg:21 data/units/Merman_Spearman.cfg:228
+#: data/units/Saurian_Ambusher.cfg:27 data/units/Saurian_Ambusher.cfg:83
+#: data/units/Saurian_Flanker.cfg:28 data/units/Saurian_Flanker.cfg:84
+#: data/units/Saurian_Skirmisher.cfg:28 data/units/Saurian_Skirmisher.cfg:84
 msgid "spear"
 msgstr "lanza"
 
-#: data/campaigns/Heir_To_The_Throne/units/Chocobone.cfg:24
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:91
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:131
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Chocobone.cfg:24
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:71
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:72
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:58
-#: data/campaigns/The_South_Guard/units/Chocobone.cfg:24
-#: data/tutorial/units/Commander.cfg:91 data/tutorial/units/Lord.cfg:131
+#: data/campaigns/Heir_To_The_Throne/units/Chocobone.cfg:23
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:96
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:123
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Chocobone.cfg:23
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:56
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:57
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:51
+#: data/campaigns/The_South_Guard/units/Chocobone.cfg:23
+#: data/tutorial/units/Commander.cfg:96 data/tutorial/units/Lord.cfg:123
 #: data/units/Boat_Pirate_Galleon.cfg:21
-#: data/units/Boat_Transport_Galleon.cfg:21 data/units/Drake_Clasher.cfg:134
-#: data/units/Drake_Enforcer.cfg:142 data/units/Drake_Gladiator.cfg:131
-#: data/units/Drake_Slasher.cfg:143 data/units/Drake_Warden.cfg:149
-#: data/units/Dwarvish_Dragonguard.cfg:77 data/units/Dwarvish_Guardsman.cfg:33
-#: data/units/Dwarvish_Guardsman.cfg:98 data/units/Dwarvish_Sentinel.cfg:47
-#: data/units/Dwarvish_Sentinel.cfg:112 data/units/Dwarvish_Stalwart.cfg:42
-#: data/units/Dwarvish_Stalwart.cfg:107 data/units/Dwarvish_Thunderer.cfg:112
-#: data/units/Dwarvish_Thunderguard.cfg:96 data/units/Elvish_Archer.cfg:91
-#: data/units/Elvish_Avenger.cfg:130 data/units/Elvish_Captain.cfg:108
-#: data/units/Elvish_Champion.cfg:101 data/units/Elvish_Druid.cfg:86
-#: data/units/Elvish_Fighter.cfg:81 data/units/Elvish_Hero.cfg:90
-#: data/units/Elvish_Marksman.cfg:117 data/units/Elvish_Marshal.cfg:93
-#: data/units/Elvish_Outrider.cfg:100 data/units/Elvish_Ranger.cfg:127
-#: data/units/Elvish_Rider.cfg:103 data/units/Elvish_Scout.cfg:102
-#: data/units/Elvish_Sharpshooter.cfg:116 data/units/Elvish_Shyde.cfg:89
-#: data/units/Goblin_Impaler.cfg:31 data/units/Goblin_Impaler.cfg:192
-#: data/units/Goblin_Rouser.cfg:42 data/units/Goblin_Spearman.cfg:30
-#: data/units/Goblin_Spearman.cfg:76
-#: data/units/Human_Horse_Grand_Knight.cfg:74
-#: data/units/Human_Horse_Knight.cfg:73 data/units/Human_Horse_Lancer.cfg:26
-#: data/units/Human_Horse_Paladin.cfg:80 data/units/Human_Horseman.cfg:26
-#: data/units/Human_Loyalist_Bowman.cfg:90
-#: data/units/Human_Loyalist_Cavalier.cfg:112
-#: data/units/Human_Loyalist_Dragoon.cfg:111
-#: data/units/Human_Loyalist_Duelist.cfg:124
-#: data/units/Human_Loyalist_General.cfg:127
-#: data/units/Human_Loyalist_Grand_Marshal.cfg:103
-#: data/units/Human_Loyalist_Halberdier.cfg:38
-#: data/units/Human_Loyalist_Javelineer.cfg:35
-#: data/units/Human_Loyalist_Javelineer.cfg:113
-#: data/units/Human_Loyalist_Lieutenant.cfg:97
+#: data/units/Boat_Transport_Galleon.cfg:21 data/units/Drake_Clasher.cfg:133
+#: data/units/Drake_Enforcer.cfg:141 data/units/Drake_Gladiator.cfg:124
+#: data/units/Drake_Slasher.cfg:136 data/units/Drake_Warden.cfg:142
+#: data/units/Dwarvish_Dragonguard.cfg:70 data/units/Dwarvish_Guardsman.cfg:32
+#: data/units/Dwarvish_Guardsman.cfg:97 data/units/Dwarvish_Sentinel.cfg:40
+#: data/units/Dwarvish_Sentinel.cfg:105 data/units/Dwarvish_Stalwart.cfg:35
+#: data/units/Dwarvish_Stalwart.cfg:100 data/units/Dwarvish_Thunderer.cfg:105
+#: data/units/Dwarvish_Thunderguard.cfg:89 data/units/Elvish_Archer.cfg:91
+#: data/units/Elvish_Avenger.cfg:129 data/units/Elvish_Captain.cfg:93
+#: data/units/Elvish_Champion.cfg:100 data/units/Elvish_Druid.cfg:83
+#: data/units/Elvish_Fighter.cfg:80 data/units/Elvish_Hero.cfg:89
+#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Marshal.cfg:92
+#: data/units/Elvish_Outrider.cfg:99 data/units/Elvish_Ranger.cfg:126
+#: data/units/Elvish_Rider.cfg:102 data/units/Elvish_Scout.cfg:101
+#: data/units/Elvish_Sharpshooter.cfg:115 data/units/Elvish_Shyde.cfg:86
+#: data/units/Goblin_Impaler.cfg:24 data/units/Goblin_Impaler.cfg:185
+#: data/units/Goblin_Rouser.cfg:42 data/units/Goblin_Spearman.cfg:23
+#: data/units/Goblin_Spearman.cfg:69
+#: data/units/Human_Horse_Grand_Knight.cfg:73
+#: data/units/Human_Horse_Knight.cfg:72 data/units/Human_Horse_Lancer.cfg:25
+#: data/units/Human_Horse_Paladin.cfg:79 data/units/Human_Horseman.cfg:25
+#: data/units/Human_Loyalist_Bowman.cfg:89
+#: data/units/Human_Loyalist_Cavalier.cfg:105
+#: data/units/Human_Loyalist_Dragoon.cfg:104
+#: data/units/Human_Loyalist_Duelist.cfg:117
+#: data/units/Human_Loyalist_General.cfg:120
+#: data/units/Human_Loyalist_Grand_Marshal.cfg:96
+#: data/units/Human_Loyalist_Halberdier.cfg:31
+#: data/units/Human_Loyalist_Javelineer.cfg:28
+#: data/units/Human_Loyalist_Javelineer.cfg:106
+#: data/units/Human_Loyalist_Lieutenant.cfg:90
 #: data/units/Human_Loyalist_Longbowman.cfg:89
-#: data/units/Human_Loyalist_Master_Bowman.cfg:79
+#: data/units/Human_Loyalist_Master_Bowman.cfg:72
 #: data/units/Human_Loyalist_Master_at_Arms.cfg:242
-#: data/units/Human_Loyalist_Pikeman.cfg:61
-#: data/units/Human_Loyalist_Sergeant.cfg:106
-#: data/units/Human_Loyalist_Spearman.cfg:64
-#: data/units/Human_Loyalist_Spearman.cfg:245
-#: data/units/Human_Outlaw_Poacher.cfg:83
-#: data/units/Human_Outlaw_Trapper.cfg:83 data/units/Human_Peasant.cfg:31
-#: data/units/Human_Peasant.cfg:87 data/units/Merman_Entangler.cfg:25
-#: data/units/Merman_Fighter.cfg:30 data/units/Merman_Hoplite.cfg:36
-#: data/units/Merman_Hunter.cfg:30 data/units/Merman_Hunter.cfg:237
-#: data/units/Merman_Javelineer.cfg:30 data/units/Merman_Javelineer.cfg:157
-#: data/units/Merman_Netcaster.cfg:24 data/units/Merman_Spearman.cfg:29
-#: data/units/Merman_Spearman.cfg:236 data/units/Merman_Triton.cfg:30
-#: data/units/Merman_Warrior.cfg:29 data/units/Monster_Cuttle_Fish.cfg:204
-#: data/units/Monster_Giant_Scorpion.cfg:32
-#: data/units/Monster_Sea_Serpent.cfg:29 data/units/Orcish_Archer.cfg:264
-#: data/units/Orcish_Crossbowman.cfg:76 data/units/Orcish_Leader.cfg:82
-#: data/units/Orcish_Ruler.cfg:81 data/units/Orcish_Slurbow.cfg:107
-#: data/units/Orcish_Sovereign.cfg:82 data/units/Orcish_Warlord.cfg:97
-#: data/units/Saurian_Ambusher.cfg:36 data/units/Saurian_Ambusher.cfg:92
-#: data/units/Saurian_Flanker.cfg:37 data/units/Saurian_Flanker.cfg:93
-#: data/units/Saurian_Skirmisher.cfg:37 data/units/Saurian_Skirmisher.cfg:93
-#: data/units/Undead_Skele_Bone_Shooter.cfg:90
-#: data/units/Undead_Skele_Death_Knight.cfg:103
-#: data/units/Undead_Skele_Soul_Shooter.cfg:80
-#: data/units/Undead_Skeleton_Archer.cfg:86
+#: data/units/Human_Loyalist_Pikeman.cfg:54
+#: data/units/Human_Loyalist_Sergeant.cfg:99
+#: data/units/Human_Loyalist_Spearman.cfg:63
+#: data/units/Human_Loyalist_Spearman.cfg:244
+#: data/units/Human_Outlaw_Poacher.cfg:76
+#: data/units/Human_Outlaw_Trapper.cfg:76 data/units/Human_Peasant.cfg:24
+#: data/units/Human_Peasant.cfg:80 data/units/Merman_Entangler.cfg:25
+#: data/units/Merman_Fighter.cfg:23 data/units/Merman_Hoplite.cfg:36
+#: data/units/Merman_Hunter.cfg:23 data/units/Merman_Hunter.cfg:230
+#: data/units/Merman_Javelineer.cfg:23 data/units/Merman_Javelineer.cfg:150
+#: data/units/Merman_Netcaster.cfg:24 data/units/Merman_Spearman.cfg:22
+#: data/units/Merman_Spearman.cfg:229 data/units/Merman_Triton.cfg:23
+#: data/units/Merman_Warrior.cfg:22 data/units/Monster_Cuttle_Fish.cfg:197
+#: data/units/Monster_Giant_Scorpion.cfg:25
+#: data/units/Monster_Sea_Serpent.cfg:22 data/units/Orcish_Archer.cfg:257
+#: data/units/Orcish_Crossbowman.cfg:69 data/units/Orcish_Leader.cfg:75
+#: data/units/Orcish_Ruler.cfg:74 data/units/Orcish_Slurbow.cfg:100
+#: data/units/Orcish_Sovereign.cfg:75 data/units/Orcish_Warlord.cfg:100
+#: data/units/Saurian_Ambusher.cfg:29 data/units/Saurian_Ambusher.cfg:85
+#: data/units/Saurian_Flanker.cfg:30 data/units/Saurian_Flanker.cfg:86
+#: data/units/Saurian_Skirmisher.cfg:30 data/units/Saurian_Skirmisher.cfg:86
+#: data/units/Undead_Skele_Bone_Shooter.cfg:89
+#: data/units/Undead_Skele_Death_Knight.cfg:102
+#: data/units/Undead_Skele_Soul_Shooter.cfg:79
+#: data/units/Undead_Skeleton_Archer.cfg:79
 msgid "pierce"
 msgstr "perforante"
 
@@ -1139,42 +1138,42 @@ msgstr ""
 "capaces de convertir a los vivos en piedra. No hace falta decir que esto las "
 "hace tremendamente peligrosas."
 
-#: data/campaigns/Heir_To_The_Throne/units/Cockatrice.cfg:20
+#: data/campaigns/Heir_To_The_Throne/units/Cockatrice.cfg:19
 msgid "gaze"
 msgstr "mirada"
 
-#: data/campaigns/Heir_To_The_Throne/units/Cockatrice.cfg:21
+#: data/campaigns/Heir_To_The_Throne/units/Cockatrice.cfg:20
 #: data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg:58
 #: data/campaigns/Heir_To_The_Throne/units/Dark_Queen.cfg:59
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg:78
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg:67
-#: data/campaigns/The_South_Guard/units/Demilich.cfg:26
-#: data/campaigns/The_South_Guard/units/Demilich.cfg:44
-#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:57
-#: data/units/Elvish_Enchantress.cfg:147 data/units/Elvish_Sorceress.cfg:152
-#: data/units/Elvish_Sylph.cfg:90 data/units/Saurian_Augur.cfg:72
-#: data/units/Saurian_Oracle.cfg:71 data/units/Saurian_Soothsayer.cfg:72
-#: data/units/Undead_Necro_Ancient_Lich.cfg:39
-#: data/units/Undead_Necro_Ancient_Lich.cfg:87
-#: data/units/Undead_Necro_Dark_Adept.cfg:34
-#: data/units/Undead_Necro_Dark_Sorcerer.cfg:78
-#: data/units/Undead_Necro_Lich.cfg:38 data/units/Undead_Necro_Lich.cfg:86
-#: data/units/Undead_Necromancer.cfg:82 data/units/Undead_Spirit_Ghost.cfg:33
-#: data/units/Undead_Spirit_Ghost.cfg:101
-#: data/units/Undead_Spirit_Spectre.cfg:95
-#: data/units/Undead_Spirit_Wraith.cfg:82
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg:77
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg:66
+#: data/campaigns/The_South_Guard/units/Demilich.cfg:25
+#: data/campaigns/The_South_Guard/units/Demilich.cfg:43
+#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:50
+#: data/units/Elvish_Enchantress.cfg:146 data/units/Elvish_Sorceress.cfg:151
+#: data/units/Elvish_Sylph.cfg:89 data/units/Saurian_Augur.cfg:65
+#: data/units/Saurian_Oracle.cfg:64 data/units/Saurian_Soothsayer.cfg:65
+#: data/units/Undead_Necro_Ancient_Lich.cfg:29
+#: data/units/Undead_Necro_Ancient_Lich.cfg:77
+#: data/units/Undead_Necro_Dark_Adept.cfg:27
+#: data/units/Undead_Necro_Dark_Sorcerer.cfg:71
+#: data/units/Undead_Necro_Lich.cfg:31 data/units/Undead_Necro_Lich.cfg:79
+#: data/units/Undead_Necromancer.cfg:75 data/units/Undead_Spirit_Ghost.cfg:26
+#: data/units/Undead_Spirit_Ghost.cfg:94
+#: data/units/Undead_Spirit_Spectre.cfg:94
+#: data/units/Undead_Spirit_Wraith.cfg:81
 msgid "cold"
 msgstr "frío"
 
 #: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:3
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:195
-#: data/tutorial/units/Commander.cfg:3 data/tutorial/units/Commander.cfg:195
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:186
+#: data/tutorial/units/Commander.cfg:3 data/tutorial/units/Commander.cfg:186
 msgid "Commander"
 msgstr "Comandante"
 
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:20
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:212
-#: data/tutorial/units/Commander.cfg:20 data/tutorial/units/Commander.cfg:212
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:26
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:209
+#: data/tutorial/units/Commander.cfg:26 data/tutorial/units/Commander.cfg:209
 msgid ""
 "The rank of Commander is held by those who lead battle groups into combat. "
 "Possessing leadership skills, they give lower-level units in adjacent hexes "
@@ -1189,27 +1188,27 @@ msgstr ""
 "aunque a pesar de todo llevan un arco para usarlo cuando es necesario. Si el "
 "comandante muere, se acabó la batalla."
 
-#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:90
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:129
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:70
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:71
-#: data/tutorial/units/Commander.cfg:90 data/tutorial/units/Lord.cfg:129
-#: data/units/Elvish_Archer.cfg:89 data/units/Elvish_Avenger.cfg:128
-#: data/units/Elvish_Captain.cfg:106 data/units/Elvish_Champion.cfg:99
-#: data/units/Elvish_Fighter.cfg:79 data/units/Elvish_Hero.cfg:88
-#: data/units/Elvish_Marshal.cfg:91 data/units/Elvish_Outrider.cfg:98
-#: data/units/Elvish_Ranger.cfg:125 data/units/Elvish_Rider.cfg:101
-#: data/units/Elvish_Scout.cfg:100 data/units/Human_Loyalist_Bowman.cfg:89
+#: data/campaigns/Heir_To_The_Throne/units/Commander.cfg:95
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:121
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:55
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:56
+#: data/tutorial/units/Commander.cfg:95 data/tutorial/units/Lord.cfg:121
+#: data/units/Elvish_Archer.cfg:89 data/units/Elvish_Avenger.cfg:127
+#: data/units/Elvish_Captain.cfg:91 data/units/Elvish_Champion.cfg:98
+#: data/units/Elvish_Fighter.cfg:78 data/units/Elvish_Hero.cfg:87
+#: data/units/Elvish_Marshal.cfg:90 data/units/Elvish_Outrider.cfg:97
+#: data/units/Elvish_Ranger.cfg:124 data/units/Elvish_Rider.cfg:100
+#: data/units/Elvish_Scout.cfg:99 data/units/Human_Loyalist_Bowman.cfg:88
 #: data/units/Human_Loyalist_Longbowman.cfg:88
-#: data/units/Human_Loyalist_Master_Bowman.cfg:78
-#: data/units/Human_Outlaw_Poacher.cfg:82
-#: data/units/Human_Outlaw_Trapper.cfg:82 data/units/Orcish_Archer.cfg:262
-#: data/units/Orcish_Archer.cfg:350 data/units/Orcish_Leader.cfg:80
-#: data/units/Orcish_Ruler.cfg:79 data/units/Orcish_Sovereign.cfg:80
-#: data/units/Orcish_Warlord.cfg:95
-#: data/units/Undead_Skele_Bone_Shooter.cfg:88
-#: data/units/Undead_Skele_Soul_Shooter.cfg:78
-#: data/units/Undead_Skeleton_Archer.cfg:84
+#: data/units/Human_Loyalist_Master_Bowman.cfg:71
+#: data/units/Human_Outlaw_Poacher.cfg:75
+#: data/units/Human_Outlaw_Trapper.cfg:75 data/units/Orcish_Archer.cfg:255
+#: data/units/Orcish_Archer.cfg:343 data/units/Orcish_Leader.cfg:73
+#: data/units/Orcish_Ruler.cfg:72 data/units/Orcish_Sovereign.cfg:73
+#: data/units/Orcish_Warlord.cfg:98
+#: data/units/Undead_Skele_Bone_Shooter.cfg:87
+#: data/units/Undead_Skele_Soul_Shooter.cfg:77
+#: data/units/Undead_Skeleton_Archer.cfg:77
 msgid "bow"
 msgstr "arco"
 
@@ -1238,7 +1237,7 @@ msgstr "cetro"
 msgid "Elder Mage"
 msgstr "Mago anciano"
 
-#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:29
+#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:22
 #: data/tutorial/units/Elder_Mage.cfg:29
 msgid ""
 "Once great, Elder Magi have seen their power a little diminished from "
@@ -1250,28 +1249,28 @@ msgstr ""
 "combates. Aún así, en el campo de batalla se lo sigue temiendo por sus "
 "potentes relámpagos."
 
-#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:31
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Princess.cfg:52
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Queen.cfg:55
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:48
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:37
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:58
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:97
-#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:32
-#: data/tutorial/units/Elder_Mage.cfg:31 data/units/Elvish_Druid.cfg:29
-#: data/units/Elvish_Enchantress.cfg:25 data/units/Elvish_Shaman.cfg:77
-#: data/units/Elvish_Sorceress.cfg:25 data/units/Human_Mage.cfg:56
-#: data/units/Human_Mage_Arch.cfg:46 data/units/Human_Mage_Great.cfg:35
-#: data/units/Human_Mage_Red.cfg:56 data/units/Human_Mage_Silver.cfg:93
-#: data/units/Human_Mage_White.cfg:61 data/units/Mermaid_Diviner.cfg:45
-#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:34
-#: data/units/Mermaid_Priestess.cfg:39 data/units/Saurian_Augur.cfg:35
-#: data/units/Saurian_Oracle.cfg:34 data/units/Saurian_Soothsayer.cfg:35
-#: data/units/Undead_Necro_Dark_Sorcerer.cfg:31
+#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:24
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Princess.cfg:54
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Queen.cfg:57
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:41
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:30
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:51
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:90
+#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:25
+#: data/tutorial/units/Elder_Mage.cfg:31 data/units/Elvish_Druid.cfg:26
+#: data/units/Elvish_Enchantress.cfg:24 data/units/Elvish_Shaman.cfg:29
+#: data/units/Elvish_Sorceress.cfg:24 data/units/Human_Mage.cfg:49
+#: data/units/Human_Mage_Arch.cfg:39 data/units/Human_Mage_Great.cfg:28
+#: data/units/Human_Mage_Red.cfg:49 data/units/Human_Mage_Silver.cfg:86
+#: data/units/Human_Mage_White.cfg:86 data/units/Mermaid_Diviner.cfg:70
+#: data/units/Mermaid_Enchantress.cfg:24 data/units/Mermaid_Initiate.cfg:27
+#: data/units/Mermaid_Priestess.cfg:64 data/units/Saurian_Augur.cfg:28
+#: data/units/Saurian_Oracle.cfg:27 data/units/Saurian_Soothsayer.cfg:28
+#: data/units/Undead_Necro_Dark_Sorcerer.cfg:24
 msgid "staff"
 msgstr "bastón"
 
-#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:107
+#: data/campaigns/Heir_To_The_Throne/units/Elder_Mage.cfg:100
 #: data/tutorial/units/Elder_Mage.cfg:107
 msgid "lightning"
 msgstr "relámpago"
@@ -1292,10 +1291,10 @@ msgstr ""
 "potencial. Silenciosos y contemplativos en tiempos de paz, un Alto Señor "
 "encolerizado es una visión sobrecogedora."
 
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg:77
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg:66
-#: data/units/Elvish_Enchantress.cfg:146 data/units/Elvish_Sorceress.cfg:151
-#: data/units/Elvish_Sylph.cfg:89
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_High_Lord.cfg:76
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lord.cfg:65
+#: data/units/Elvish_Enchantress.cfg:145 data/units/Elvish_Sorceress.cfg:150
+#: data/units/Elvish_Sylph.cfg:88
 msgid "faerie fire"
 msgstr "fuego faérico"
 
@@ -1303,7 +1302,7 @@ msgstr "fuego faérico"
 msgid "female^Elvish Lady"
 msgstr "Dama elfa"
 
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lady.cfg:19
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lady.cfg:18
 msgid ""
 "Elves choose their leaders for their power and wisdom; foresight is what has "
 "protected them in times of uncertainty. Their just reign is rewarded by the "
@@ -1315,7 +1314,7 @@ msgstr ""
 "recompensado por la lealtad incondicional de su gente, que es el mayor "
 "regalo al que cualquier dirigente puede aspirar."
 
-#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lady.cfg:22
+#: data/campaigns/Heir_To_The_Throne/units/Elvish_Lady.cfg:21
 msgid "shove"
 msgstr "empujón"
 
@@ -1334,13 +1333,13 @@ msgstr ""
 "dominio de las artes mágicas es verdaderamente temible."
 
 #: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:3
-#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:86
+#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:79
 #: data/tutorial/units/Fighter.cfg:3 data/tutorial/units/Fighter.cfg:86
 msgid "Fighter"
 msgstr "Luchador"
 
 #: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:17
-#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:99
+#: data/campaigns/Heir_To_The_Throne/units/Fighter.cfg:92
 #: data/tutorial/units/Fighter.cfg:17 data/tutorial/units/Fighter.cfg:99
 #: data/tutorial/units/Fighteress.cfg:24 data/tutorial/units/Fighteress.cfg:96
 msgid ""
@@ -1353,15 +1352,15 @@ msgstr ""
 "convertirse en un gran guerrero algún día."
 
 #: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:3
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:220
-#: data/tutorial/units/Lord.cfg:3 data/tutorial/units/Lord.cfg:220
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:212
+#: data/tutorial/units/Lord.cfg:3 data/tutorial/units/Lord.cfg:212
 msgid "Lord"
 msgstr "Señor"
 
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:35
-#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:245
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:41
-#: data/tutorial/units/Lord.cfg:35 data/tutorial/units/Lord.cfg:245
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:28
+#: data/campaigns/Heir_To_The_Throne/units/Lord.cfg:237
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Lord.cfg:27
+#: data/tutorial/units/Lord.cfg:28 data/tutorial/units/Lord.cfg:237
 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 "
@@ -1378,7 +1377,7 @@ msgid "female^Princess"
 msgstr "Princesa"
 
 #: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:28
-#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:124
+#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:123
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@@ -1393,7 +1392,7 @@ msgstr ""
 "presencia. La princesa es además ágil y diestra, teniendo habilidades casi "
 "de ladrón."
 
-#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:100
+#: data/campaigns/Heir_To_The_Throne/units/Princess.cfg:99
 msgid "Princess"
 msgstr "Princesa"
 
@@ -1429,7 +1428,7 @@ msgstr "¡Shhhh! ¡El grifo duerme! ¡Más te vale no despertarlo!"
 msgid "Youth"
 msgstr "Joven"
 
-#: data/campaigns/Heir_To_The_Throne/units/Youth.cfg:24
+#: data/campaigns/Heir_To_The_Throne/units/Youth.cfg:18
 #: data/tutorial/units/Youth.cfg:24
 msgid ""
 "Today almost a boy, by his devotion to the crown he is seeking to become a "
@@ -1438,8 +1437,8 @@ msgstr ""
 "Hoy casi un niño, busca convertirse en Señor por su devoción a la Corona, "
 "para unirse a la elite de luchadores humanos."
 
-#: data/campaigns/Heir_To_The_Throne/units/Youth.cfg:28
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg:31
+#: data/campaigns/Heir_To_The_Throne/units/Youth.cfg:21
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg:24
 #: data/tutorial/units/Youth.cfg:28
 msgid "training sword"
 msgstr "espada de entrenamiento"
@@ -1448,7 +1447,7 @@ msgstr "espada de entrenamiento"
 msgid "Fire Dragon"
 msgstr "Dragón de fuego"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:26
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:20
 msgid ""
 "A fire dragon is an ancient and horrifying being that normally lives only in "
 "hushed rumor and fantastic stories. It is normal for centuries to pass "
@@ -1461,21 +1460,21 @@ msgid ""
 "often take underlings whom they lead to victory."
 msgstr ""
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:30
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:23
 msgid "bite"
 msgstr "mordisco"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:96
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:89
 msgid "tail"
 msgstr "cola"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:143
-#: data/units/Drake_Blademaster.cfg:139 data/units/Drake_Burner.cfg:134
-#: data/units/Drake_Fighter.cfg:130 data/units/Drake_Fire.cfg:141
-#: data/units/Drake_Flameheart.cfg:161 data/units/Drake_Flare.cfg:165
-#: data/units/Drake_Glider.cfg:159 data/units/Drake_Hurricane.cfg:184
-#: data/units/Drake_Inferno.cfg:142 data/units/Drake_Sky.cfg:183
-#: data/units/Drake_Warrior.cfg:143
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Fire_Dragon.cfg:136
+#: data/units/Drake_Blademaster.cfg:132 data/units/Drake_Burner.cfg:127
+#: data/units/Drake_Fighter.cfg:129 data/units/Drake_Fire.cfg:134
+#: data/units/Drake_Flameheart.cfg:154 data/units/Drake_Flare.cfg:158
+#: data/units/Drake_Glider.cfg:152 data/units/Drake_Hurricane.cfg:177
+#: data/units/Drake_Inferno.cfg:135 data/units/Drake_Sky.cfg:176
+#: data/units/Drake_Warrior.cfg:136
 msgid "fire breath"
 msgstr "aliento de fuego"
 
@@ -1494,7 +1493,7 @@ msgstr ""
 msgid "Noble Commander"
 msgstr "Comandante noble"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:40
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Commander.cfg:26
 msgid ""
 "The rank of a noble Commander is held by those who lead battle groups into "
 "combat. Possessing leadership skills, they give lower-level units in "
@@ -1513,7 +1512,7 @@ msgstr ""
 msgid "Noble Fighter"
 msgstr "Luchador noble"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg:27
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Fighter.cfg:21
 msgid ""
 "Young and brash, Fighters fight with a sword, and are vulnerable to ranged "
 "attacks from enemies. However they have the potential to become great "
@@ -1531,7 +1530,7 @@ msgstr "Señor noble"
 msgid "Noble Youth"
 msgstr "Joven noble"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg:27
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Noble_Youth.cfg:21
 msgid ""
 "Today he is a young man, by his devotion to the crown he is seeking to "
 "become a Lord -- to join the elite of humanity."
@@ -1555,10 +1554,10 @@ msgstr ""
 "escogido vivir fuera de la ley. Sueña con fundar su propio reinado con lo "
 "que obtiene de sus víctimas en los caminos."
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Princess.cfg:98
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Queen.cfg:101
-#: data/units/Human_Outlaw.cfg:74 data/units/Human_Outlaw_Footpad.cfg:94
-#: data/units/Troll_Rocklobber.cfg:73
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Princess.cfg:100
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Outlaw_Queen.cfg:103
+#: data/units/Human_Outlaw.cfg:67 data/units/Human_Outlaw_Footpad.cfg:87
+#: data/units/Troll_Rocklobber.cfg:72
 msgid "sling"
 msgstr "honda"
 
@@ -1586,20 +1585,20 @@ msgstr ""
 msgid "female^Vampire Lady"
 msgstr "Dama vampiro"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:24
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:18
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appearance drinking "
 "the blood of the living."
 msgstr ""
 "Fría y bella, mantiene su eterna juventud bebiendo la sangre de los vivos."
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:28
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:21
 msgid "blood kiss"
 msgstr "beso de sangre"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:56
-#: data/units/Saurian_Augur.cfg:71 data/units/Saurian_Oracle.cfg:70
-#: data/units/Saurian_Soothsayer.cfg:71
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Vampire_Lady.cfg:49
+#: data/units/Saurian_Augur.cfg:64 data/units/Saurian_Oracle.cfg:63
+#: data/units/Saurian_Soothsayer.cfg:64
 msgid "curse"
 msgstr "maldición"
 
@@ -1607,7 +1606,7 @@ msgstr "maldición"
 msgid "Warrior King"
 msgstr "Rey guerrero"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg:31
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg:25
 msgid ""
 "As the leaders of the human Kingdoms, Kings are responsible for ruling and "
 "protecting their subjects. Kings can coordinate the attacks of level 1 and 2 "
@@ -1617,12 +1616,12 @@ msgstr ""
 "proteger a sus súbditos. Asimismo, los reyes pueden coordinar los ataques de "
 "unidades cercanas de nivel 1 y 2 para que mejore su eficiencia en combate."
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg:35
-#: data/units/Drake_Enforcer.cfg:105 data/units/Drake_Gladiator.cfg:186
-#: data/units/Human_Loyalist_Heavy_Infantryman.cfg:27
-#: data/units/Human_Loyalist_Iron_Mauler.cfg:30
-#: data/units/Human_Mage_of_Light.cfg:42 data/units/Human_Outlaw.cfg:29
-#: data/units/Human_Outlaw_Bandit.cfg:40 data/units/Troll_Great.cfg:27
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Warrior_King.cfg:28
+#: data/units/Drake_Enforcer.cfg:104 data/units/Drake_Gladiator.cfg:179
+#: data/units/Human_Loyalist_Heavy_Infantryman.cfg:20
+#: data/units/Human_Loyalist_Iron_Mauler.cfg:23
+#: data/units/Human_Mage_of_Light.cfg:67 data/units/Human_Outlaw.cfg:22
+#: data/units/Human_Outlaw_Bandit.cfg:33 data/units/Troll_Great.cfg:26
 msgid "mace"
 msgstr "maza"
 
@@ -1630,7 +1629,7 @@ msgstr "maza"
 msgid "Wose Sapling"
 msgstr "Wose joven"
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg:31
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg:25
 msgid ""
 "Rarely seen, even by elves, a Wose is an order of creature about which "
 "little is known. The elves are the source of most of this knowledge; they "
@@ -1660,9 +1659,9 @@ msgstr ""
 "hay a su alrededor, sin que necesiten entrar en aldeas para obtener sustento "
 "y ayuda."
 
-#: data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg:36
-#: data/units/Wose.cfg:36 data/units/Wose_Ancient.cfg:29
-#: data/units/Wose_Elder.cfg:28
+#: data/campaigns/The_Rise_Of_Wesnoth/units/Wose_Sapling.cfg:29
+#: data/units/Wose.cfg:29 data/units/Wose_Ancient.cfg:28
+#: data/units/Wose_Elder.cfg:27
 msgid "crush"
 msgstr "aplastar"
 
@@ -1682,26 +1681,26 @@ msgstr ""
 "inexorablemente su cuerpo, y convirtiéndose en un no muerto. En poco tiempo "
 "será por entero un no muerto, y será temible."
 
-#: data/campaigns/The_South_Guard/units/Demilich.cfg:24
-#: data/units/Undead_Corpse_Soulless.cfg:50
-#: data/units/Undead_Corpse_Walking.cfg:49
-#: data/units/Undead_Necro_Ancient_Lich.cfg:37
-#: data/units/Undead_Necro_Lich.cfg:36 data/units/Undead_Spirit_Ghost.cfg:31
+#: data/campaigns/The_South_Guard/units/Demilich.cfg:23
+#: data/units/Undead_Corpse_Soulless.cfg:43
+#: data/units/Undead_Corpse_Walking.cfg:42
+#: data/units/Undead_Necro_Ancient_Lich.cfg:27
+#: data/units/Undead_Necro_Lich.cfg:29 data/units/Undead_Spirit_Ghost.cfg:24
 msgid "touch"
 msgstr "toque"
 
-#: data/campaigns/The_South_Guard/units/Demilich.cfg:43
-#: data/units/Undead_Necro_Ancient_Lich.cfg:86
-#: data/units/Undead_Necro_Lich.cfg:85
+#: data/campaigns/The_South_Guard/units/Demilich.cfg:42
+#: data/units/Undead_Necro_Ancient_Lich.cfg:76
+#: data/units/Undead_Necro_Lich.cfg:78
 msgid "chill tempest"
 msgstr "ola de frío"
 
 #: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:4
-#: data/units/Human_Mage_Arch.cfg:167
+#: data/units/Human_Mage_Arch.cfg:160
 msgid "female^Arch Mage"
 msgstr "Archimaga"
 
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:32
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:26
 msgid ""
 "The title of Arch Mage is conferred only after a lifetime of study and "
 "achievement to match. Arch Magi are often employed in positions of "
@@ -1736,20 +1735,20 @@ msgstr ""
 "Notas especiales: las bolas de fuego del archimago son mágicas, y siempre "
 "tienen una alta probabilidad de impactar a un oponente."
 
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:94
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:83
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:79
-#: data/units/Human_Mage_Arch.cfg:112 data/units/Human_Mage_Great.cfg:101
-#: data/units/Human_Mage_Red.cfg:122
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg:87
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:76
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:72
+#: data/units/Human_Mage_Arch.cfg:105 data/units/Human_Mage_Great.cfg:94
+#: data/units/Human_Mage_Red.cfg:115
 msgid "fireball"
 msgstr "bola de fuego"
 
 #: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:4
-#: data/units/Human_Mage_Great.cfg:156
+#: data/units/Human_Mage_Great.cfg:149
 msgid "female^Great Mage"
 msgstr "Gran maga"
 
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:33
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg:27
 msgid ""
 "Any person who is even considered for the title of Great Mage is quite "
 "nearly a legend in their own time, and town criers have forcibly learnt "
@@ -1782,11 +1781,11 @@ msgstr ""
 "probabilidad de que alcancen su objetivo es siempre muy elevada. "
 
 #: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:4
-#: data/units/Human_Mage_Red.cfg:178
+#: data/units/Human_Mage_Red.cfg:171
 msgid "female^Red Mage"
 msgstr "Maga Roja"
 
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:32
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg:26
 msgid ""
 "Upon the successful termination of their apprenticeship, a mage is stripped "
 "of the blue robes of an apprentice, and given the red robes of a master. The "
@@ -1821,11 +1820,11 @@ msgstr ""
 "que la probabilidad de que alcancen su objetivo es siempre muy elevada."
 
 #: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:4
-#: data/units/Human_Mage_Silver.cfg:188
+#: data/units/Human_Mage_Silver.cfg:192
 msgid "female^Silver Mage"
 msgstr "Maga de Plata"
 
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:39
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:33
 msgid ""
 "The many paths that a mage can take in study lead to strikingly different "
 "ends. Silver magi have devoted themselves to a study of the forces that bind "
@@ -1881,8 +1880,8 @@ msgstr ""
 "Además, pueden teletransportarse instantáneamente entre dos aldeas, siempre "
 "y cuando ambas pertenezcan a su bando y la de destino no esté ya ocupada."
 
-#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:123
-#: data/units/Human_Mage.cfg:122 data/units/Human_Mage_Silver.cfg:151
+#: data/campaigns/Under_the_Burning_Suns/units/Elyssa_Silver_Mage.cfg:116
+#: data/units/Human_Mage.cfg:115 data/units/Human_Mage_Silver.cfg:144
 msgid "missile"
 msgstr "proyectil"
 
@@ -1891,7 +1890,7 @@ msgstr "proyectil"
 msgid "Necromancer"
 msgstr "Nigromante"
 
-#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:28
+#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:22
 msgid ""
 "One of the greatest circles of what is considered 'black magic' is the art "
 "of necromancy, the terrible ability to awaken the dead with false life. It "
@@ -1909,9 +1908,9 @@ msgid ""
 "with the plague, and any foe struck down by it will rise again in unlife."
 msgstr ""
 
-#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:56
-#: data/units/Undead_Necro_Dark_Sorcerer.cfg:77
-#: data/units/Undead_Necromancer.cfg:81
+#: data/campaigns/Under_the_Burning_Suns/units/Necromancer2.cfg:49
+#: data/units/Undead_Necro_Dark_Sorcerer.cfg:70
+#: data/units/Undead_Necromancer.cfg:74
 msgid "chill wave"
 msgstr "ola de frío"
 
@@ -2073,15 +2072,15 @@ msgstr "No muertos"
 msgid "DejaVuSans.ttf,FreeSans.ttf,sazanami-gothic.ttf,gkai00mp.ttf"
 msgstr "DejaVuSans.ttf,FreeSans.ttf,sazanami-gothic.ttf,gkai00mp.ttf"
 
-#: data/game.cfg:35
+#: data/game.cfg:37
 msgid "Binary Saves"
 msgstr "Comprimir partidas"
 
-#: data/game.cfg:42
+#: data/game.cfg:44
 msgid "Show Combat"
 msgstr "Mostrar combate"
 
-#: data/game.cfg:49
+#: data/game.cfg:51
 msgid "Mouse Scrolling"
 msgstr "Desplazamiento con ratón"
 
@@ -3720,7 +3719,7 @@ msgstr ""
 #: data/terrain.cfg:200 data/terrain.cfg:220 data/terrain.cfg:230
 #: data/terrain.cfg:240 data/terrain.cfg:250 data/terrain.cfg:260
 #: data/terrain.cfg:270 data/terrain.cfg:280 data/terrain.cfg:290
-#: src/reports.cpp:379
+#: src/reports.cpp:383
 msgid "Village"
 msgstr "Aldea"
 
@@ -4959,39 +4958,39 @@ msgid ""
 "can be cured in town or by a unit which cures."
 msgstr ""
 
-#: data/team_colors.cfg:4
+#: data/team-colors.cfg:4
 msgid "Red"
 msgstr "Rojo"
 
-#: data/team_colors.cfg:10
+#: data/team-colors.cfg:10
 msgid "Blue"
 msgstr "Azul"
 
-#: data/team_colors.cfg:16
+#: data/team-colors.cfg:16
 msgid "Green"
 msgstr "Verde"
 
-#: data/team_colors.cfg:22
+#: data/team-colors.cfg:22
 msgid "Purple"
 msgstr "Morado"
 
-#: data/team_colors.cfg:28
+#: data/team-colors.cfg:28
 msgid "Orange"
 msgstr "Naranja"
 
-#: data/team_colors.cfg:34
+#: data/team-colors.cfg:34
 msgid "Black"
 msgstr "Negro"
 
-#: data/team_colors.cfg:40
+#: data/team-colors.cfg:40
 msgid "White"
 msgstr "Blanco"
 
-#: data/team_colors.cfg:46
+#: data/team-colors.cfg:46
 msgid "Brown"
 msgstr "Marrón"
 
-#: data/team_colors.cfg:52
+#: data/team-colors.cfg:52
 msgid "Teal"
 msgstr "Verde azulado"
 
@@ -5076,11 +5075,11 @@ msgstr "Acciones"
 msgid "End Turn"
 msgstr "Fin de turno"
 
-#: data/themes/default.cfg:171 src/menu_events.cpp:234 src/unit.cpp:2383
+#: data/themes/default.cfg:171 src/menu_events.cpp:234 src/unit.cpp:2412
 msgid "HP"
 msgstr "pv"
 
-#: data/themes/default.cfg:180 src/menu_events.cpp:235 src/menu_events.cpp:688
+#: data/themes/default.cfg:180 src/menu_events.cpp:235 src/menu_events.cpp:691
 msgid "XP"
 msgstr "PX"
 
@@ -5657,7 +5656,7 @@ msgstr ""
 "poseen la habilidad de aliento flamígero de sus antepasados. Los luchadores "
 "más avezados pasan a engrosar las filas de la elite, los guerreros dracos."
 
-#: data/units/Drake_Fighter.cfg:64
+#: data/units/Drake_Fighter.cfg:63
 msgid "scimitar"
 msgstr "cimitarra"
 
@@ -5766,8 +5765,8 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Drake_Glider.cfg:83 data/units/Drake_Hurricane.cfg:98
-#: data/units/Drake_Sky.cfg:97
+#: data/units/Drake_Glider.cfg:76 data/units/Drake_Hurricane.cfg:91
+#: data/units/Drake_Sky.cfg:90
 msgid "slam"
 msgstr "caída"
 
@@ -5856,10 +5855,10 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Drake_Slasher.cfg:76 data/units/Drake_Slasher.cfg:142
-#: data/units/Drake_Warden.cfg:82 data/units/Drake_Warden.cfg:148
-#: data/units/Human_Loyalist_Halberdier.cfg:36
-#: data/units/Human_Loyalist_Halberdier.cfg:267
+#: data/units/Drake_Slasher.cfg:69 data/units/Drake_Slasher.cfg:135
+#: data/units/Drake_Warden.cfg:75 data/units/Drake_Warden.cfg:141
+#: data/units/Human_Loyalist_Halberdier.cfg:29
+#: data/units/Human_Loyalist_Halberdier.cfg:260
 msgid "halberd"
 msgstr "alabarda"
 
@@ -5914,7 +5913,7 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Dwarvish_Berserker.cfg:37 data/units/Dwarvish_Ulfserker.cfg:37
+#: data/units/Dwarvish_Berserker.cfg:30 data/units/Dwarvish_Ulfserker.cfg:30
 msgid "berserker frenzy"
 msgstr "furia berserker"
 
@@ -5942,18 +5941,18 @@ msgstr ""
 "ciudadelas enanas son admirados y temidos por igual: son capaces de partir "
 "en dos al guerrero más poderoso de un solo tiro."
 
-#: data/units/Dwarvish_Dragonguard.cfg:28 data/units/Dwarvish_Thunderer.cfg:45
-#: data/units/Dwarvish_Thunderguard.cfg:29
-#: data/units/Human_Outlaw_Assassin.cfg:46
-#: data/units/Human_Outlaw_Poacher.cfg:36 data/units/Human_Outlaw_Rogue.cfg:32
-#: data/units/Human_Outlaw_Thief.cfg:85 data/units/Human_Outlaw_Trapper.cfg:36
-#: data/units/Orcish_Archer.cfg:76 data/units/Orcish_Assassin.cfg:30
-#: data/units/Orcish_Slayer.cfg:30 data/units/Undead_Skele_Bone_Shooter.cfg:42
-#: data/units/Undead_Skele_Soul_Shooter.cfg:32
+#: data/units/Dwarvish_Dragonguard.cfg:21 data/units/Dwarvish_Thunderer.cfg:38
+#: data/units/Dwarvish_Thunderguard.cfg:22
+#: data/units/Human_Outlaw_Assassin.cfg:39
+#: data/units/Human_Outlaw_Poacher.cfg:29 data/units/Human_Outlaw_Rogue.cfg:25
+#: data/units/Human_Outlaw_Thief.cfg:84 data/units/Human_Outlaw_Trapper.cfg:29
+#: data/units/Orcish_Archer.cfg:69 data/units/Orcish_Assassin.cfg:23
+#: data/units/Orcish_Slayer.cfg:23 data/units/Undead_Skele_Bone_Shooter.cfg:41
+#: data/units/Undead_Skele_Soul_Shooter.cfg:31
 msgid "dagger"
 msgstr "daga"
 
-#: data/units/Dwarvish_Dragonguard.cfg:76
+#: data/units/Dwarvish_Dragonguard.cfg:69
 msgid "dragonstaff"
 msgstr "dragonera"
 
@@ -5961,7 +5960,7 @@ msgstr "dragonera"
 msgid "Dwarvish Fighter"
 msgstr "Luchador enano"
 
-#: data/units/Dwarvish_Fighter.cfg:19
+#: data/units/Dwarvish_Fighter.cfg:20
 msgid ""
 "Dwarvish Fighters wield mighty battle axes and hammers, which make them "
 "feared opponents in close range combat. They are excellent in mountainous "
@@ -5973,15 +5972,15 @@ msgstr ""
 "los hace unos enemigos temibles. Su fuerza y resistencia compensa su "
 "lentitud."
 
-#: data/units/Dwarvish_Fighter.cfg:30
-#: data/units/Undead_Skele_Deathblade.cfg:43
-#: data/units/Undead_Skele_Draug.cfg:43
-#: data/units/Undead_Skele_Revenant.cfg:42 data/units/Undead_Skeleton.cfg:75
+#: data/units/Dwarvish_Fighter.cfg:24
+#: data/units/Undead_Skele_Deathblade.cfg:42
+#: data/units/Undead_Skele_Draug.cfg:42
+#: data/units/Undead_Skele_Revenant.cfg:41 data/units/Undead_Skeleton.cfg:68
 msgid "axe"
 msgstr "hacha"
 
-#: data/units/Dwarvish_Fighter.cfg:75 data/units/Dwarvish_Lord.cfg:78
-#: data/units/Dwarvish_Steelclad.cfg:77 data/units/Troll_Warrior.cfg:27
+#: data/units/Dwarvish_Fighter.cfg:69 data/units/Dwarvish_Lord.cfg:72
+#: data/units/Dwarvish_Steelclad.cfg:71 data/units/Troll_Warrior.cfg:26
 msgid "hammer"
 msgstr "martillo"
 
@@ -6008,7 +6007,7 @@ msgstr ""
 msgid "Dwarvish Lord"
 msgstr "Señor Enano"
 
-#: data/units/Dwarvish_Lord.cfg:16
+#: data/units/Dwarvish_Lord.cfg:17
 msgid ""
 "Clad in shining armor, these dwarves look like kings from under the "
 "mountains. They wield axe and hammer with masterful skill, and can hit a "
@@ -6020,12 +6019,12 @@ msgstr ""
 "acertar a un objetivo con un hacha de mano a muchos pasos. Aunque son "
 "lentos, estos enanos son un testamento de la habilidad de su raza."
 
-#: data/units/Dwarvish_Lord.cfg:32 data/units/Dwarvish_Steelclad.cfg:31
-#: data/units/Undead_Skele_Death_Knight.cfg:45
+#: data/units/Dwarvish_Lord.cfg:26 data/units/Dwarvish_Steelclad.cfg:25
+#: data/units/Undead_Skele_Death_Knight.cfg:44
 msgid "battle axe"
 msgstr "hacha de batalla"
 
-#: data/units/Dwarvish_Lord.cfg:123
+#: data/units/Dwarvish_Lord.cfg:117
 msgid "hatchet"
 msgstr "destral"
 
@@ -6045,11 +6044,11 @@ msgstr ""
 "presencia imbuyen de poder. Aunque se lo ve muy pocas veces en combate, un "
 "maestro de estas runas puede usarlas de un modo terrible."
 
-#: data/units/Dwarvish_Runemaster.cfg:28
+#: data/units/Dwarvish_Runemaster.cfg:21
 msgid "runic hammer"
 msgstr "martillo rúnico"
 
-#: data/units/Dwarvish_Runemaster.cfg:75
+#: data/units/Dwarvish_Runemaster.cfg:68
 msgid "Lightning bolt"
 msgstr "Relámpago"
 
@@ -6091,7 +6090,7 @@ msgstr ""
 msgid "Dwarvish Steelclad"
 msgstr "Guardián de Acero enano"
 
-#: data/units/Dwarvish_Steelclad.cfg:15
+#: data/units/Dwarvish_Steelclad.cfg:16
 msgid ""
 "The more experienced Dwarvish Steelclad fighters wear heavy chain mail and "
 "plate armor, for which they are rightly famous."
@@ -6122,8 +6121,8 @@ msgstr ""
 "suerte de no tener que seguir luchando contra los enanos, y juraron no "
 "hacerlo nunca más."
 
-#: data/units/Dwarvish_Thunderer.cfg:111
-#: data/units/Dwarvish_Thunderguard.cfg:95
+#: data/units/Dwarvish_Thunderer.cfg:104
+#: data/units/Dwarvish_Thunderguard.cfg:88
 msgid "thunderstick"
 msgstr "atronadora"
 
@@ -6179,7 +6178,7 @@ msgstr ""
 msgid "Elvish Archer"
 msgstr "Arquero elfo"
 
-#: data/units/Elvish_Archer.cfg:19
+#: data/units/Elvish_Archer.cfg:20
 msgid ""
 "Elves have always had a reputation for archery, a skill that, for many "
 "reasons, comes naturally to them. Even the frail of body can be deadly with "
@@ -6195,7 +6194,7 @@ msgstr ""
 "deja en cierto modo vulnerables, su gracia natural asegura que pueden ser "
 "mejores que cualquier recluta humano novato."
 
-#: data/units/Elvish_Archer.cfg:195
+#: data/units/Elvish_Archer.cfg:201
 msgid "female^Elvish Archer"
 msgstr "Arquera elfa"
 
@@ -6230,7 +6229,7 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Elvish_Avenger.cfg:222
+#: data/units/Elvish_Avenger.cfg:207
 msgid "female^Elvish Avenger"
 msgstr "Vengadora elfa"
 
@@ -6283,7 +6282,7 @@ msgstr ""
 msgid "female^Elvish Druid"
 msgstr "Druida elfa"
 
-#: data/units/Elvish_Druid.cfg:22
+#: data/units/Elvish_Druid.cfg:20
 msgid ""
 "The magic of the wood elves is poorly suited for combat, but effective "
 "nonetheless. The forests in which they live can be quickened by a word of "
@@ -6304,11 +6303,11 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Elvish_Druid.cfg:55 data/units/Elvish_Shyde.cfg:58
+#: data/units/Elvish_Druid.cfg:52 data/units/Elvish_Shyde.cfg:55
 msgid "ensnare"
 msgstr "atrapar"
 
-#: data/units/Elvish_Druid.cfg:85 data/units/Elvish_Shyde.cfg:88
+#: data/units/Elvish_Druid.cfg:82 data/units/Elvish_Shyde.cfg:85
 msgid "thorns"
 msgstr "espinas"
 
@@ -6330,8 +6329,8 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Elvish_Enchantress.cfg:92 data/units/Elvish_Shaman.cfg:103
-#: data/units/Elvish_Sorceress.cfg:92
+#: data/units/Elvish_Enchantress.cfg:91 data/units/Elvish_Shaman.cfg:55
+#: data/units/Elvish_Sorceress.cfg:91
 msgid "entangle"
 msgstr "enredar"
 
@@ -6392,11 +6391,11 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Elvish_Marksman.cfg:115 data/units/Elvish_Sharpshooter.cfg:114
+#: data/units/Elvish_Marksman.cfg:114 data/units/Elvish_Sharpshooter.cfg:113
 msgid "longbow"
 msgstr "arco largo"
 
-#: data/units/Elvish_Marksman.cfg:222
+#: data/units/Elvish_Marksman.cfg:207
 msgid "female^Elvish Marksman"
 msgstr "Tiradora elfa"
 
@@ -6473,7 +6472,7 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Elvish_Ranger.cfg:219
+#: data/units/Elvish_Ranger.cfg:204
 msgid "female^Elvish Ranger"
 msgstr "Montaraz elfa"
 
@@ -6523,7 +6522,7 @@ msgstr ""
 msgid "female^Elvish Shaman"
 msgstr "Chamán elfa"
 
-#: data/units/Elvish_Shaman.cfg:70
+#: data/units/Elvish_Shaman.cfg:23
 msgid ""
 "Being partly faerie in nature, elves have an inherent capability for magic. "
 "This is realized in their affinity with the natural world, which they can "
@@ -6568,7 +6567,7 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Elvish_Sharpshooter.cfg:231
+#: data/units/Elvish_Sharpshooter.cfg:216
 msgid "female^Elvish Sharpshooter"
 msgstr "Saetera elfa"
 
@@ -6576,7 +6575,7 @@ msgstr "Saetera elfa"
 msgid "female^Elvish Shyde"
 msgstr "Hada elfa"
 
-#: data/units/Elvish_Shyde.cfg:22
+#: data/units/Elvish_Shyde.cfg:20
 msgid ""
 "Devotion to her faerie side will eventually transform an elf maiden into a "
 "creature of both worlds. Guided by a nature which is little understood, "
@@ -6592,7 +6591,7 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Elvish_Shyde.cfg:29 data/units/Elvish_Sylph.cfg:26
+#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Sylph.cfg:25
 msgid "faerie touch"
 msgstr "toque faérico"
 
@@ -6637,7 +6636,7 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Elvish_Sylph.cfg:55
+#: data/units/Elvish_Sylph.cfg:54
 msgid "gossamer"
 msgstr "hilo de araña"
 
@@ -6674,10 +6673,10 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Goblin_Direwolf_Rider.cfg:40 data/units/Goblin_Knight.cfg:40
-#: data/units/Goblin_Wolf_Rider.cfg:41 data/units/Monster_Cave_Spider.cfg:41
-#: data/units/Monster_Sea_Serpent.cfg:27 data/units/Undead_Bat_Blood.cfg:48
-#: data/units/Undead_Bat_Vampire.cfg:72
+#: data/units/Goblin_Direwolf_Rider.cfg:33 data/units/Goblin_Knight.cfg:33
+#: data/units/Goblin_Wolf_Rider.cfg:34 data/units/Monster_Cave_Spider.cfg:34
+#: data/units/Monster_Sea_Serpent.cfg:20 data/units/Undead_Bat_Blood.cfg:41
+#: data/units/Undead_Bat_Vampire.cfg:65
 msgid "fangs"
 msgstr "colmillos"
 
@@ -6744,11 +6743,11 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Goblin_Pillager.cfg:41
+#: data/units/Goblin_Pillager.cfg:34
 msgid "torch"
 msgstr "antorcha"
 
-#: data/units/Goblin_Pillager.cfg:87 data/units/Merman_Entangler.cfg:59
+#: data/units/Goblin_Pillager.cfg:80 data/units/Merman_Entangler.cfg:59
 #: data/units/Merman_Netcaster.cfg:58
 msgid "net"
 msgstr "red"
@@ -6904,9 +6903,9 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Human_Horse_Grand_Knight.cfg:73
-#: data/units/Human_Horse_Knight.cfg:72 data/units/Human_Horse_Lancer.cfg:25
-#: data/units/Human_Horse_Paladin.cfg:79
+#: data/units/Human_Horse_Grand_Knight.cfg:72
+#: data/units/Human_Horse_Knight.cfg:71 data/units/Human_Horse_Lancer.cfg:24
+#: data/units/Human_Horse_Paladin.cfg:78
 msgid "lance"
 msgstr "lanza"
 
@@ -6977,9 +6976,9 @@ msgstr ""
 "\n"
 "Notas especiales:"
 
-#: data/units/Human_Horse_Paladin.cfg:33 data/units/Human_Mage_White.cfg:148
-#: data/units/Human_Mage_of_Light.cfg:108 data/units/Mermaid_Diviner.cfg:92
-#: data/units/Mermaid_Priestess.cfg:56
+#: data/units/Human_Horse_Paladin.cfg:32 data/units/Human_Mage_White.cfg:173
+#: data/units/Human_Mage_of_Light.cfg:133 data/units/Mermaid_Diviner.cfg:117
+#: data/units/Mermaid_Priestess.cfg:81
 msgid "holy"
 msgstr "sagrado"
 
@@ -7041,17 +7040,17 @@ msgstr ""
 "distancia les permite atacar a sus enemigos a placer, y su intervención ha "
 "cambiado el rumbo de algunas de las grandes batallas en la historia."
 
-#: data/units/Human_Loyalist_Cavalier.cfg:110
-#: data/units/Human_Loyalist_Dragoon.cfg:109
-#: data/units/Human_Loyalist_Duelist.cfg:122
-#: data/units/Human_Loyalist_General.cfg:125
-#: data/units/Human_Loyalist_Grand_Marshal.cfg:101
-#: data/units/Human_Loyalist_Lieutenant.cfg:95
+#: data/units/Human_Loyalist_Cavalier.cfg:103
+#: data/units/Human_Loyalist_Dragoon.cfg:102
+#: data/units/Human_Loyalist_Duelist.cfg:115
+#: data/units/Human_Loyalist_General.cfg:118
+#: data/units/Human_Loyalist_Grand_Marshal.cfg:94
+#: data/units/Human_Loyalist_Lieutenant.cfg:88
 #: data/units/Human_Loyalist_Master_at_Arms.cfg:240
-#: data/units/Human_Loyalist_Sergeant.cfg:104
-#: data/units/Orcish_Crossbowman.cfg:74 data/units/Orcish_Crossbowman.cfg:122
-#: data/units/Orcish_Slurbow.cfg:105 data/units/Orcish_Slurbow.cfg:163
-#: data/units/Undead_Skele_Death_Knight.cfg:101
+#: data/units/Human_Loyalist_Sergeant.cfg:97
+#: data/units/Orcish_Crossbowman.cfg:67 data/units/Orcish_Crossbowman.cfg:115
+#: data/units/Orcish_Slurbow.cfg:98 data/units/Orcish_Slurbow.cfg:156
+#: data/units/Undead_Skele_Death_Knight.cfg:100
 msgid "crossbow"
 msgstr "ballesta"
 
@@ -7124,7 +7123,8 @@ msgstr ""
 "en una de las dos órdenes de escuderos, para entrenarlos en el arte de la "
 "monta o la esgrima. Los duelistas reciben este nombre debido a una práctica "
 "por desgracia muy común entre los jóvenes aristócratas, que en el calor de "
-"una riña a menudo pretenden hacer una demostración de sus derechos de nacimiento.\n"
+"una riña a menudo pretenden hacer una demostración de sus derechos de "
+"nacimiento.\n"
 "\n"
 "Los duelistas experimentados, que normalmente parecen nobles, aunque casi "
 "siempre lo sean, llevan con ellos una pequeña ballesta fácilmente "
@@ -7164,8 +7164,8 @@ msgstr ""
 "Armados con sólo una daga y un estoque, los esgrimidores son ligeros y "
 "rápidos y muy útiles cuando los contrincantes están limitados por sus "
 "pesadas armaduras. Su estrategia es sencilla: se mueven en círculos "
-"alrededor de las tropas lentas, como la infantería pesada, a gran velocidad, de forma que "
-"las víctimas no alcanzan a ver de dónde llegan los ataques.\n"
+"alrededor de las tropas lentas, como la infantería pesada, a gran velocidad, "
+"de forma que las víctimas no alcanzan a ver de dónde llegan los ataques.\n"
 "\n"
 "Notas especiales:"
 
@@ -7182,9 +7182,9 @@ msgid ""
 "Special Notes:"
 msgstr ""
 "Como los grandes líderes de las tropas humanas, los generales son "
-"responsables de la protección de zonas grandes e importantes en los reinos a los "
-"que han jurado lealtad. Su entrenamiento y experiencia bastan para cumplir "
-"todas las órdenes que se les den.\n"
+"responsables de la protección de zonas grandes e importantes en los reinos a "
+"los que han jurado lealtad. Su entrenamiento y experiencia bastan para "
+"cumplir todas las órdenes que se les den.\n"
 "\n"
 "Notas especiales:"
 
@@ -7234,8 +7234,8 @@ msgstr ""
 "de las cuales descienden. Como cualquier alabardero puede confirmar, este "
 "arma consta de 4 sorprendentes tipos de ataque, 2 más que una lanza o una "
 "pica: la punta, la cuchilla, el pincho de la base de la barra y la parte "
-"interna de la cuchilla, que puede ser usada en movimiento de adelante hacia atrás "
-"hacia el alabardero. Todo esto la convierte en un arma increíblemente "
+"interna de la cuchilla, que puede ser usada en movimiento de adelante hacia "
+"atrás hacia el alabardero. Todo esto la convierte en un arma increíblemente "
 "versátil en lucha cuerpo a cuerpo, especialmente empleada contra "
 "caballería.\n"
 "\n"
@@ -7399,6 +7399,8 @@ msgstr ""
 msgid "Master at Arms"
 msgstr "Maestro de armas"
 
+# Arreglar lo de 
+# «and are free to roam the land should they so choose.»
 #: data/units/Human_Loyalist_Master_at_Arms.cfg:21
 #, fuzzy
 msgid ""
@@ -7416,19 +7418,18 @@ msgid ""
 "\n"
 "Special Notes:"
 msgstr ""
-"Los maestros esgrimidores tiene un envidiado lugar en la vida. A pesar de su "
-"temerario y peligroso estilo de vida, ha llegado el momento de que reciban "
-"su recompensa. Famosos por su habilidad y sus irreputables maneras, estos "
-"hombres son verdaderos aristócratas, y en ellos se fijan las damiselas de "
-"las mejores familias.\n"
+"Los maestros esgrimidores tiene un envidiado lugar en la vida. A pesar de "
+"que el suyo es un temerario y peligroso estilo de vida, han llegado al punto "
+"en el es hora de que reciban su recompensa. Famosos por su habilidad y sus "
+"costumbres libertinas, estos caballeros se comportan como verdaderos "
+"aristócratas, y en ellos se fijan las damiselas de las mejores familias.\n"
 "\n"
 "Generalmente, se pueden permitir el lujo de elegir sus servicios, por lo que "
-"es común encontrarlos como capitanes de la guardia de un castillo, o como "
-"maestros en una academia militar, posiciones en las que su recargada "
-"presencia resulta, además de aceptada, útil.\n"
+"suelen por lo que es común encontrarlos como capitanes de la guardia de un "
+"castillo, o como maestros en una academia militar, posiciones en las que su "
+"recargada presencia resulta, además de aceptada, útil.\n"
 "\n"
-"Notas especiales:su habilidad como hostigador permite a estos maestros "
-"esgrimidores atravesar las zonas de control de sus oponentes sin detenerse."
+"Notas especiales:"
 
 #: data/units/Human_Loyalist_Pikeman.cfg:3
 msgid "Pikeman"
@@ -7457,7 +7458,7 @@ msgstr ""
 "Notas especiales: la longitud de sus armas permite a los piqueros golpear "
 "primero en lucha cuerpo a cuerpo, incluso al defenderse."
 
-#: data/units/Human_Loyalist_Pikeman.cfg:60
+#: data/units/Human_Loyalist_Pikeman.cfg:53
 msgid "pike"
 msgstr "pica"
 
@@ -7619,7 +7620,7 @@ msgstr ""
 "Notas especiales:el ataque a distancia de los magos es mágico, por lo que "
 "siempre tiene una alta probabilidad de alcanzar a su adversario."
 
-#: data/units/Human_Mage.cfg:166
+#: data/units/Human_Mage.cfg:173
 msgid "female^Mage"
 msgstr "Maga"
 
@@ -7830,12 +7831,12 @@ msgstr ""
 "magos blancos son capaces de sanar a las unidades que estén a su alrededor, "
 "y curar su envenamiento."
 
-#: data/units/Human_Mage_White.cfg:147 data/units/Human_Mage_of_Light.cfg:107
-#: data/units/Mermaid_Diviner.cfg:91 data/units/Mermaid_Priestess.cfg:55
+#: data/units/Human_Mage_White.cfg:172 data/units/Human_Mage_of_Light.cfg:132
+#: data/units/Mermaid_Diviner.cfg:116 data/units/Mermaid_Priestess.cfg:80
 msgid "lightbeam"
 msgstr "rayo de luz"
 
-#: data/units/Human_Mage_White.cfg:209
+#: data/units/Human_Mage_White.cfg:234
 msgid "female^White Mage"
 msgstr "Maga Blanca"
 
@@ -7873,7 +7874,7 @@ msgstr ""
 "También tienen el poder de la iluminación, que incrementa la cantidad de luz "
 "presente en la zona en que se encuentra el mago."
 
-#: data/units/Human_Mage_of_Light.cfg:169
+#: data/units/Human_Mage_of_Light.cfg:194
 msgid "female^Mage of Light"
 msgstr "Maga de la Luz"
 
@@ -7898,7 +7899,7 @@ msgstr ""
 "conscientes de su capacidad para matar, y prefieren el sigilo de la noche "
 "para lanzar sus ataques. "
 
-#: data/units/Human_Outlaw.cfg:121
+#: data/units/Human_Outlaw.cfg:114
 msgid "female^Outlaw"
 msgstr "Forajida"
 
@@ -7931,12 +7932,12 @@ msgstr ""
 "aparecer por sorpresa por su espalda. Sus cuchillos arrojadizos están "
 "también envenenados, lo que consumirá poco a poco la fuerza de un enemigo."
 
-#: data/units/Human_Outlaw_Assassin.cfg:153
-#: data/units/Human_Outlaw_Rogue.cfg:81
+#: data/units/Human_Outlaw_Assassin.cfg:146
+#: data/units/Human_Outlaw_Rogue.cfg:74
 msgid "knife"
 msgstr "cuchillo"
 
-#: data/units/Human_Outlaw_Assassin.cfg:214
+#: data/units/Human_Outlaw_Assassin.cfg:207
 msgid "female^Assassin"
 msgstr "Asesina"
 
@@ -7978,12 +7979,12 @@ msgstr ""
 "muy útil en combate y, a pesar de su pobre armamento, son bastante buenos "
 "acosando a sus enemigos, especialmente al amparo de la oscuridad."
 
-#: data/units/Human_Outlaw_Footpad.cfg:29 data/units/Human_Outlaw_Thug.cfg:28
-#: data/units/Troll.cfg:26 data/units/Troll_Hero.cfg:26
+#: data/units/Human_Outlaw_Footpad.cfg:22 data/units/Human_Outlaw_Thug.cfg:21
+#: data/units/Troll.cfg:25 data/units/Troll_Hero.cfg:25
 msgid "club"
 msgstr "garrote"
 
-#: data/units/Human_Outlaw_Footpad.cfg:141
+#: data/units/Human_Outlaw_Footpad.cfg:134
 msgid "female^Footpad"
 msgstr "Salteadora"
 
@@ -7999,6 +8000,7 @@ msgstr ""
 "Los cazadores furtivos confían en su experiencia en la caza y son más "
 "valiosos en bosques y pantanos, y por la noche."
 
+# ¿Mejor Bribón, quizás?
 #: data/units/Human_Outlaw_Rogue.cfg:3
 msgid "Rogue"
 msgstr "Pícaro"
@@ -8027,7 +8029,7 @@ msgstr ""
 "distrae al enemigo, estos pueden acuchillarle por la espalda, infligiendo el "
 "doble de daño."
 
-#: data/units/Human_Outlaw_Rogue.cfg:129
+#: data/units/Human_Outlaw_Rogue.cfg:122
 msgid "female^Rogue"
 msgstr "Pícara"
 
@@ -8061,7 +8063,7 @@ msgstr ""
 "al enemigo, éste puede acercarse sigilosamente y asestarle una puñalada por "
 "la espalda, duplicando así el daño infligido."
 
-#: data/units/Human_Outlaw_Thief.cfg:134
+#: data/units/Human_Outlaw_Thief.cfg:133
 msgid "female^Thief"
 msgstr "Ladrona"
 
@@ -8112,7 +8114,7 @@ msgstr ""
 "defienden con uñas sus casas. De todas formas, si sus tropas son campesinos, "
 "es que definitivamente no tiene nada mejor."
 
-#: data/units/Human_Peasant.cfg:30 data/units/Human_Peasant.cfg:86
+#: data/units/Human_Peasant.cfg:23 data/units/Human_Peasant.cfg:79
 msgid "pitchfork"
 msgstr "horca"
 
@@ -8174,8 +8176,8 @@ msgstr ""
 "son mágicas por naturaleza, por lo que siempre poseen una alta probabilidad "
 "de alcanzar su objetivo."
 
-#: data/units/Mermaid_Enchantress.cfg:77 data/units/Mermaid_Initiate.cfg:80
-#: data/units/Mermaid_Siren.cfg:80
+#: data/units/Mermaid_Enchantress.cfg:70 data/units/Mermaid_Initiate.cfg:73
+#: data/units/Mermaid_Siren.cfg:73
 msgid "water spray"
 msgstr "chorro de agua"
 
@@ -8274,7 +8276,7 @@ msgstr ""
 "Notas especiales: los ataques de una sirena son mágicos por naturaleza, por "
 "lo que la probabilidad de que alcancen su objetivo es muy alta."
 
-#: data/units/Mermaid_Siren.cfg:35
+#: data/units/Mermaid_Siren.cfg:28
 msgid "naia touch"
 msgstr "toque de náyade"
 
@@ -8314,9 +8316,9 @@ msgstr ""
 "Como diestras criaturas de los mares que son, los sirénidos son rápidos y "
 "fuertes en cualquier ambiente acuático, pero son torpes en tierra firme."
 
-#: data/units/Merman_Fighter.cfg:29 data/units/Merman_Hoplite.cfg:35
-#: data/units/Merman_Triton.cfg:29 data/units/Merman_Triton.cfg:94
-#: data/units/Merman_Warrior.cfg:28
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:35
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Triton.cfg:87
+#: data/units/Merman_Warrior.cfg:21
 msgid "trident"
 msgstr "tridente"
 
@@ -8471,7 +8473,7 @@ msgstr ""
 "envenenando a sus enemigos, y lanzar telarañas a largo, ralentizando a sus "
 "enemigos."
 
-#: data/units/Monster_Cave_Spider.cfg:110
+#: data/units/Monster_Cave_Spider.cfg:103
 msgid "web"
 msgstr "telaraña"
 
@@ -8494,11 +8496,11 @@ msgstr ""
 "distancia. La mejor forma de sobrevivir a un encuentro con unas lindezas "
 "como estas es permanecer alejado de la costa."
 
-#: data/units/Monster_Cuttle_Fish.cfg:41 data/units/Monster_Tentacle.cfg:65
+#: data/units/Monster_Cuttle_Fish.cfg:34 data/units/Monster_Tentacle.cfg:58
 msgid "tentacle"
 msgstr "tentáculo"
 
-#: data/units/Monster_Cuttle_Fish.cfg:203
+#: data/units/Monster_Cuttle_Fish.cfg:196
 msgid "ink"
 msgstr "tinta"
 
@@ -8517,14 +8519,14 @@ msgstr ""
 "vomitando pedazos de barro hacia sus oponentes, o golpeándolos con sus puños "
 "de barro."
 
-#: data/units/Monster_Giant_Mudcrawler.cfg:52 data/units/Monster_Yeti.cfg:39
-#: data/units/Troll_Rocklobber.cfg:27 data/units/Troll_Whelp.cfg:26
-#: data/units/Undead_Skeleton_Archer.cfg:38
+#: data/units/Monster_Giant_Mudcrawler.cfg:45 data/units/Monster_Yeti.cfg:31
+#: data/units/Troll_Rocklobber.cfg:26 data/units/Troll_Whelp.cfg:25
+#: data/units/Undead_Skeleton_Archer.cfg:31
 msgid "fist"
 msgstr "puño"
 
-#: data/units/Monster_Giant_Mudcrawler.cfg:98
-#: data/units/Monster_Mudcrawler.cfg:51
+#: data/units/Monster_Giant_Mudcrawler.cfg:91
+#: data/units/Monster_Mudcrawler.cfg:44
 msgid "mud glob"
 msgstr "bola de barro"
 
@@ -8533,7 +8535,6 @@ msgid "Giant Scorpion"
 msgstr "Escorpión gigante"
 
 #: data/units/Monster_Giant_Scorpion.cfg:20
-#, fuzzy
 msgid ""
 "A normal scorpion is dangerous enough - one the size of a man needs little "
 "explanation.\n"
@@ -8541,13 +8542,15 @@ msgid ""
 "Special Notes:"
 msgstr ""
 "Un escorpión normal ya es de por sí peligroso. Uno del tamaño de un hombre "
-"precisa pocas explicaciones más.\t"
+"precisa pocas explicaciones más.\n"
+"\n"
+"Notas especiales:"
 
-#: data/units/Monster_Giant_Scorpion.cfg:31
+#: data/units/Monster_Giant_Scorpion.cfg:24
 msgid "sting"
 msgstr "aguijón"
 
-#: data/units/Monster_Giant_Scorpion.cfg:100
+#: data/units/Monster_Giant_Scorpion.cfg:93
 msgid "pincers"
 msgstr "pinzas"
 
@@ -8623,7 +8626,7 @@ msgstr ""
 "bajo ellas. Son pequeñas, y de constitución algo frágil, pero a menudo mucho "
 "más ágiles que sus oponentes."
 
-#: data/units/Naga_Fighter.cfg:76
+#: data/units/Naga_Fighter.cfg:69
 msgid "Nagini Fighter"
 msgstr "Luchador nagini"
 
@@ -8646,11 +8649,11 @@ msgstr ""
 "cualquier terreno abierto, sino que su habilidad para nadar les dota de una "
 "movilidad letal."
 
-#: data/units/Naga_Myrmidon.cfg:80
+#: data/units/Naga_Myrmidon.cfg:73
 msgid "Nagini Myrmidon"
 msgstr "Mirmidón nagini"
 
-#: data/units/Naga_Myrmidon.cfg:83
+#: data/units/Naga_Myrmidon.cfg:76
 msgid ""
 "The most practiced of the nagini blademasters are initiated into the caste "
 "of the Myrmidon, masters of their twin-bladed art. They strike as fast as "
@@ -8686,7 +8689,7 @@ msgstr ""
 "poderosos en tierra firme, pero la fricción del agua les resulta un "
 "impedimento para hacerlo."
 
-#: data/units/Naga_Warrior.cfg:79
+#: data/units/Naga_Warrior.cfg:72
 msgid "Nagini Warrior"
 msgstr "Guerrero nagini"
 
@@ -8706,7 +8709,7 @@ msgstr ""
 "aunque son una versión muy grande y deformada de ellos. Aunque se les puede "
 "dar esquinazo o engañar fácilmente, no debe subestimarse su fuerza."
 
-#: data/units/Ogre.cfg:21 data/units/Ogre_Young.cfg:21
+#: data/units/Ogre.cfg:20 data/units/Ogre_Young.cfg:20
 msgid "cleaver"
 msgstr "trituracarne"
 
@@ -8766,7 +8769,7 @@ msgstr ""
 "a sus enemigos, y las víctimas de éste veneno sufrirán sus efectos hasta que "
 "se curen en una aldea o con la ayuda de un sanador."
 
-#: data/units/Orcish_Assassin.cfg:76 data/units/Orcish_Slayer.cfg:96
+#: data/units/Orcish_Assassin.cfg:69 data/units/Orcish_Slayer.cfg:89
 msgid "throwing knives"
 msgstr "cuchillos voladores"
 
@@ -8785,7 +8788,7 @@ msgstr ""
 "Aunque no es tan efectivo como un tirador élfico a larga distancia, es más "
 "resistente y puede defenderse algo mejor en el cuerpo a cuerpo que los elfos."
 
-#: data/units/Orcish_Crossbowman.cfg:28 data/units/Orcish_Slurbow.cfg:29
+#: data/units/Orcish_Crossbowman.cfg:21 data/units/Orcish_Slurbow.cfg:22
 msgid "short sword"
 msgstr "espada corta"
 
@@ -8966,7 +8969,7 @@ msgstr ""
 msgid "Saurian Augur"
 msgstr "Augurador saurio"
 
-#: data/units/Saurian_Augur.cfg:28
+#: data/units/Saurian_Augur.cfg:22
 #, fuzzy
 msgid ""
 "Despite their lethargic cold blooded heritage, and their relative frailty, "
@@ -9008,8 +9011,7 @@ msgstr ""
 msgid "Saurian Oracle"
 msgstr "Oráculo saurio"
 
-#: data/units/Saurian_Oracle.cfg:27
-#, fuzzy
+#: data/units/Saurian_Oracle.cfg:21
 msgid ""
 "Saurian Oracles have eschewed any further training in healing and curing in "
 "order to refine their skills with the dark arts. While frail, they can call "
@@ -9021,7 +9023,9 @@ msgstr ""
 "Los hechiceros de hielo saurios han evitado continuar con cualquier "
 "entrenamiento en sanación y curación para refinar sus habilidades en artes "
 "oscuras. Aunque son frágiles, pueden convocar la magia del norte helado, y "
-"aún así retienen sus habilidades básicas de sanación."
+"aún así retienen sus habilidades básicas de sanación.\n"
+"\n"
+"Notas especiales:"
 
 #: data/units/Saurian_Skirmisher.cfg:3
 msgid "Saurian Skirmisher"
@@ -9048,7 +9052,7 @@ msgstr ""
 msgid "Saurian Soothsayer"
 msgstr "Saurio vidente"
 
-#: data/units/Saurian_Soothsayer.cfg:28
+#: data/units/Saurian_Soothsayer.cfg:22
 #, fuzzy
 msgid ""
 "Saurian Soothsayers are highly valued as healers because they can provide "
@@ -9316,7 +9320,6 @@ msgid "Soulless"
 msgstr "Desalmado"
 
 #: data/units/Undead_Corpse_Soulless.cfg:20
-#, fuzzy
 msgid ""
 "These animated walking corpses have become strong from long experience "
 "fighting the living.\n"
@@ -9324,14 +9327,15 @@ msgid ""
 "Special Notes:"
 msgstr ""
 "Estos muertos andantes se han hecho fuertes gracias a una larga experiencia "
-"luchando contra los vivos."
+"luchando contra los vivos.\n"
+"\n"
+"Notas especiales:"
 
 #: data/units/Undead_Corpse_Walking.cfg:4
 msgid "Walking Corpse"
 msgstr "Muerto andante"
 
 #: data/units/Undead_Corpse_Walking.cfg:19
-#, fuzzy
 msgid ""
 "Walking Corpses are the bodies of the dead, re-animated by dark magic. "
 "Although weak in combat, these zombies can spread their curse to those they "
@@ -9341,15 +9345,16 @@ msgid ""
 msgstr ""
 "Los muertos andantes son cadáveres que han sido animados con magia negra. "
 "Aunque son débiles en el mano a mano, los muertos andantes son capaces de "
-"esparcir su maldición a aquellos que matan, incrementando el ejército no "
-"muerto."
+"esparcir su maldición entre aquellos que matan, incrementando el ejército no "
+"muerto.\n"
+"\n"
+"Notas especiales:"
 
 #: data/units/Undead_Necro_Ancient_Lich.cfg:3
 msgid "Ancient Lich"
 msgstr "Cadáver anciano"
 
-#: data/units/Undead_Necro_Ancient_Lich.cfg:22
-#, fuzzy
+#: data/units/Undead_Necro_Ancient_Lich.cfg:19
 msgid ""
 "A being of this order is a herald of the age long past. Anyone who "
 "encounters an Ancient Lich likely has far worse things to worry about than "
@@ -9361,9 +9366,7 @@ msgstr ""
 "encuentre a un cadáver anciano probablemente tienen cosas mucho más "
 "terribles de las que preocuparse que de la muerte.\n"
 "\n"
-"Notas especiales: los ataques a distancia de un cadáver son mágicos, y "
-"siempre tienen una alta probabilidad de impactar a un oponente. El toque de "
-"un cadáver drena la vida de la víctima para dársela al cadáver."
+"Notas especiales:"
 
 #: data/units/Undead_Necro_Dark_Adept.cfg:4
 msgid "Dark Adept"
@@ -9400,12 +9403,12 @@ msgstr ""
 "Notas especiales: los ataques de un adepto oscuro son mágicos, y siempre "
 "tienen una alta probabilidad de impactar a un oponente."
 
-#: data/units/Undead_Necro_Dark_Adept.cfg:33
+#: data/units/Undead_Necro_Dark_Adept.cfg:26
 #, fuzzy
 msgid "shadow wave"
 msgstr "empujón"
 
-#: data/units/Undead_Necro_Dark_Adept.cfg:177
+#: data/units/Undead_Necro_Dark_Adept.cfg:170
 msgid "female^Dark Adept"
 msgstr "Adepta oscura"
 
@@ -9476,17 +9479,16 @@ msgid ""
 "Special Notes:"
 msgstr ""
 
-#: data/units/Undead_Necromancer.cfg:32
-#, fuzzy
+#: data/units/Undead_Necromancer.cfg:25
 msgid "plague staff"
-msgstr "plaga"
+msgstr "vara de plaga"
 
 #: data/units/Undead_Skele_Bone_Shooter.cfg:3
 msgid "Bone Shooter"
 msgstr "Lanzahuesos"
 
+# ¿Quizas estaria mejor utilizar aljaba que carcaj?
 #: data/units/Undead_Skele_Bone_Shooter.cfg:17
-#, fuzzy
 msgid ""
 "Of a dark sorcerer's creations, some take more strongly to the false life "
 "given them. Potency of life is given equipment to match; archers, in "
@@ -9503,7 +9505,9 @@ msgstr ""
 "arsenal macabro. Sus carcajs están repletos de flechas que no están hechas "
 "de madera, sino de los huesos de sus víctimas. Apodados simplemente "
 "«lanzahuesos» por los que tienen la desgracia de ser sus enemigos, estas "
-"abominaciones aterran a todos los seres vivos."
+"abominaciones aterran a todos los seres vivos.\n"
+"\n"
+"Notas especiales:"
 
 #: data/units/Undead_Skele_Death_Knight.cfg:3
 msgid "Death Knight"
@@ -9683,9 +9687,9 @@ msgstr ""
 "Notas especiales:Los fantasmas presentan elevadas resistencias al daño, y se "
 "desplazan despacio sobre las aguas."
 
-#: data/units/Undead_Spirit_Ghost.cfg:100
-#: data/units/Undead_Spirit_Spectre.cfg:94
-#: data/units/Undead_Spirit_Wraith.cfg:81
+#: data/units/Undead_Spirit_Ghost.cfg:93
+#: data/units/Undead_Spirit_Spectre.cfg:93
+#: data/units/Undead_Spirit_Wraith.cfg:80
 msgid "wail"
 msgstr "lamento"
 
@@ -9760,8 +9764,8 @@ msgstr ""
 "recuperar la suya propia. Los espectros presentan una resistencia inusual al "
 "daño, y se desplazan lentamente sobre el agua."
 
-#: data/units/Undead_Spirit_Spectre.cfg:46
-#: data/units/Undead_Spirit_Wraith.cfg:23
+#: data/units/Undead_Spirit_Spectre.cfg:45
+#: data/units/Undead_Spirit_Wraith.cfg:22
 msgid "baneblade"
 msgstr "hoja maldita"
 
@@ -9846,8 +9850,8 @@ msgstr ""
 "Hay una curiosa historia sobre un granjero que tenía un gran roble en su "
 "prado, un árbol que ya estaba cuando su padre horadó por primera vez la "
 "tierra en aquel paraje, y bajo el que habían sucedido muchas cosas a él y su "
-"familia. Por ello, fue un gran golpe para él descubrir una mañana al levantarse "
-"que el árbol se había, de alguna manera, desvanecido, sin dejar "
+"familia. Por ello, fue un gran golpe para él descubrir una mañana al "
+"levantarse que el árbol se había, de alguna manera, desvanecido, sin dejar "
 "nada salvo un enorme agujero en la tierra donde pasó tantos años. El pobre "
 "granjero nunca volvió a ser el mismo después de aquello.\n"
 "\n"
@@ -9882,7 +9886,8 @@ msgstr ""
 "criaturas que andan bajo de ellos. Esta es la principal razón por la que son "
 "vistos muy de cuando en cuando; permaneciendo adormecido como normalmente "
 "hacen, un wose de esa estatura no parece más que un árbol con una extraña "
-"forma. Incluso un elfo puede llegar a confundirse, si no presta mucha atención.\n"
+"forma. Incluso un elfo puede llegar a confundirse, si no presta mucha "
+"atención.\n"
 "\n"
 "Los woses no son guerreros en ningún caso, aunque la fuerza que poseen es "
 "obviamente capaz de la mayor de las violencias, si alguien llegase a "
@@ -9919,7 +9924,7 @@ msgstr "+"
 msgid "+  "
 msgstr "+"
 
-#: src/about.cpp:217 src/help.cpp:2774
+#: src/about.cpp:217 src/help.cpp:2768
 msgid "Close"
 msgstr "Cerrar"
 
@@ -9936,43 +9941,43 @@ msgstr ""
 msgid "There are no vacant castle tiles in which to recruit a unit."
 msgstr "No hay zonas de castillo libres para reclutar unidades."
 
-#: src/actions.cpp:927 src/actions.cpp:1161
+#: src/actions.cpp:937 src/actions.cpp:1177
 msgid "poisoned"
 msgstr "envenenado"
 
-#: src/actions.cpp:935 src/actions.cpp:1169
+#: src/actions.cpp:945 src/actions.cpp:1185
 msgid "slowed"
 msgstr "ralentizado"
 
-#: src/actions.cpp:946 src/actions.cpp:1181
+#: src/actions.cpp:956 src/actions.cpp:1197
 msgid "stone"
 msgstr "piedra"
 
-#: src/actions.cpp:1977
+#: src/actions.cpp:1995
 msgid "Ambushed!"
 msgstr "¡Emboscada!"
 
-#: src/actions.cpp:2012
+#: src/actions.cpp:2030
 msgid "Friendly unit sighted"
 msgstr "¡Aliado avistado!"
 
-#: src/actions.cpp:2014
+#: src/actions.cpp:2032
 msgid "Enemy unit sighted!"
 msgstr "¡Enemigo avistado!"
 
-#: src/actions.cpp:2019
+#: src/actions.cpp:2037
 msgid "$friends Friendly units sighted"
 msgstr "$friends unidades aliadas avistadas"
 
-#: src/actions.cpp:2021
+#: src/actions.cpp:2039
 msgid "$enemies Enemy units sighted!"
 msgstr "¡$enemies unidades enemigas avistadas!"
 
-#: src/actions.cpp:2025
+#: src/actions.cpp:2043
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Unidades avistadas ($friends aliadas, $enemies enemigas)"
 
-#: src/actions.cpp:2040
+#: src/actions.cpp:2058
 msgid "(press $hotkey to continue)"
 msgstr "(pulse $hotkey para continuar)"
 
@@ -10000,7 +10005,7 @@ msgstr "¿Sobreescribir?"
 msgid "Save already exists. Do you want to overwrite it ?"
 msgstr "La partida ya existe. ¿Quiere sobreescribirla?"
 
-#: src/dialogs.cpp:226 src/dialogs.cpp:514
+#: src/dialogs.cpp:226
 msgid "Don't ask me again!"
 msgstr "¡No me lo vuelvas a preguntar!"
 
@@ -10008,67 +10013,67 @@ msgstr "¡No me lo vuelvas a preguntar!"
 msgid "Do you really want to delete this game?"
 msgstr "¿Está seguro de que quiere borrarlo?"
 
-#: src/dialogs.cpp:366
+#: src/dialogs.cpp:371
 msgid "%a %b %d %H:%M %Y"
 msgstr "%a %b %d %H:%M %Y"
 
-#: src/dialogs.cpp:383
+#: src/dialogs.cpp:388
 msgid "#(Invalid)"
 msgstr "#(Inválido)"
 
-#: src/dialogs.cpp:388 src/game.cpp:773
+#: src/dialogs.cpp:393 src/game.cpp:776
 msgid "Campaign"
 msgstr "Campaña"
 
-#: src/dialogs.cpp:390 src/game.cpp:1165
+#: src/dialogs.cpp:395 src/game.cpp:1168
 msgid "Multiplayer"
 msgstr "Multijugador"
 
-#: src/dialogs.cpp:392
+#: src/dialogs.cpp:397
 msgid "Tutorial"
 msgstr "Tutorial"
 
-#: src/dialogs.cpp:400
+#: src/dialogs.cpp:405
 msgid "replay"
 msgstr "repetición"
 
-#: src/dialogs.cpp:402 src/menu_events.cpp:375 src/multiplayer_lobby.cpp:345
+#: src/dialogs.cpp:407 src/menu_events.cpp:375 src/multiplayer_lobby.cpp:345
 msgid "Turn"
 msgstr "Turno"
 
-#: src/dialogs.cpp:404
+#: src/dialogs.cpp:409
 msgid "Scenario Start"
 msgstr "Inicio del escenario"
 
-#: src/dialogs.cpp:407
+#: src/dialogs.cpp:412
 msgid "Difficulty: "
 msgstr "Dificultad: "
 
-#: src/dialogs.cpp:409
+#: src/dialogs.cpp:414
 msgid "Version: "
 msgstr "Versión: "
 
-#: src/dialogs.cpp:433 src/dialogs.cpp:449
+#: src/dialogs.cpp:438 src/dialogs.cpp:454
 msgid "%b %d %y"
 msgstr "%d de %b del %y"
 
-#: src/dialogs.cpp:439
+#: src/dialogs.cpp:444
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: src/dialogs.cpp:442
+#: src/dialogs.cpp:447
 msgid "%A, %H:%M"
 msgstr "%A, %H:%M"
 
-#: src/dialogs.cpp:445
+#: src/dialogs.cpp:450
 msgid "%b %d"
 msgstr "%d de %b"
 
-#: src/dialogs.cpp:469
+#: src/dialogs.cpp:474
 msgid "No Saved Games"
 msgstr "No hay ningún juego guardado."
 
-#: src/dialogs.cpp:470
+#: src/dialogs.cpp:475
 msgid ""
 "There are no saved games to load.\n"
 "(Games are saved automatically when you complete a scenario)"
@@ -10080,70 +10085,46 @@ msgstr ""
 msgid "Delete Save"
 msgstr "Borrar partida"
 
-#: src/dialogs.cpp:504
-msgid "Import Saved Games"
-msgstr "Importar partidas grabadas"
-
-#: src/dialogs.cpp:505
-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 ""
-"Su directorio de partidas grabadas contiene algunos ficheros de una versión "
-"anterior de la Batalla de Wesnoth. ¿Desea actualizarlos? Esto puede llevar "
-"algo de tiempo..."
-
-#: src/dialogs.cpp:510
-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 ""
-"Su directorio de partidas grabadas contiene algunos ficheros que parece que "
-"no hayan sido generados por esta versión del juego. ¿Desea registrar estos "
-"ficheros dentro del juego?"
-
-#: src/dialogs.cpp:565
+#: src/dialogs.cpp:497
 msgid "Date"
 msgstr "Fecha"
 
-#: src/dialogs.cpp:565 src/game.cpp:901 src/help.cpp:1177
-#: src/menu_events.cpp:233 src/menu_events.cpp:686
-#: src/multiplayer_lobby.cpp:32
+#: src/dialogs.cpp:497 src/game.cpp:904 src/help.cpp:1177
+#: src/menu_events.cpp:233 src/menu_events.cpp:689
+#: src/multiplayer_lobby.cpp:33
 msgid "Name"
 msgstr "Nombre"
 
-#: src/dialogs.cpp:591
+#: src/dialogs.cpp:523
 msgid "Show replay"
 msgstr "Muestra repetición"
 
-#: src/dialogs.cpp:594 src/multiplayer_create.cpp:83
+#: src/dialogs.cpp:526 src/multiplayer_create.cpp:83
 msgid "Load Game"
 msgstr "Cargar partida"
 
-#: src/dialogs.cpp:595
+#: src/dialogs.cpp:527
 msgid "Choose the game to load"
 msgstr "Escoja partida a cargar"
 
-#: src/dialogs.cpp:632 src/dialogs.cpp:644
+#: src/dialogs.cpp:566 src/dialogs.cpp:578
 msgid "Profile"
 msgstr "Perfil"
 
-#: src/dialogs.cpp:727 src/help.cpp:1094
+#: src/dialogs.cpp:661 src/help.cpp:1094
 msgid "level"
 msgstr "nivel"
 
 # Aquí queda muy mal poner pv en minúscula.
-#: src/dialogs.cpp:749 src/help.cpp:1152
+#: src/dialogs.cpp:683 src/help.cpp:1152
 msgid "HP: "
 msgstr "PV: "
 
-#: src/dialogs.cpp:753 src/dialogs.cpp:761
+#: src/dialogs.cpp:687 src/dialogs.cpp:695
 msgid "XP: "
 msgstr "PX: "
 
-#: src/dialogs.cpp:766 src/help.cpp:1153
+#: src/dialogs.cpp:700 src/help.cpp:1153
 msgid "Moves: "
 msgstr "Movimiento: "
 
@@ -10151,7 +10132,7 @@ msgstr "Movimiento: "
 msgid "Screenshot"
 msgstr "Instantánea"
 
-#: src/game.cpp:398 src/game.cpp:1249
+#: src/game.cpp:398 src/game.cpp:1252
 msgid "The Battle for Wesnoth"
 msgstr "La Batalla por Wesnoth"
 
@@ -10177,253 +10158,254 @@ msgstr "El fichero que ha intentado cargar está corrupto: '"
 msgid "File I/O Error while reading the game"
 msgstr "Error de E/S en el fichero mientras se intentaba su lectura."
 
-#: src/game.cpp:774
+#: src/game.cpp:777
 msgid "Choose the campaign you want to play:"
 msgstr "Seleccione la campaña que quiera jugar:"
 
-#: src/game.cpp:797
+#: src/game.cpp:800
 msgid "Difficulty"
 msgstr "Dificultad"
 
-#: src/game.cpp:798
+#: src/game.cpp:801
 msgid "Select difficulty level:"
 msgstr "Seleccione el nivel de dificultad:"
 
-#: src/game.cpp:823
+#: src/game.cpp:826
 msgid "B"
 msgstr "B"
 
-#: src/game.cpp:826
+#: src/game.cpp:829
 msgid "KB"
 msgstr "KB"
 
-#: src/game.cpp:829
+#: src/game.cpp:832
 msgid "MB"
 msgstr "MB"
 
-#: src/game.cpp:856
+#: src/game.cpp:859
 msgid "Connect to Server"
 msgstr "Conectar al servidor"
 
-#: src/game.cpp:857
+#: src/game.cpp:860
 msgid "You will now connect to a server to download add-ons."
 msgstr ""
-"Ahora se realizará una conexión a un servidor para descargar "
-"expansiones."
+"Ahora se realizará una conexión a un servidor para descargar expansiones."
 
-#: src/game.cpp:858
+#: src/game.cpp:861
 msgid "Server: "
 msgstr "Servidor: "
 
-#: src/game.cpp:871
+#: src/game.cpp:874
 msgid "Could not connect to host."
 msgstr "No ha sido posible conectar al servidor."
 
-#: src/game.cpp:879
+#: src/game.cpp:882
 msgid "Asking for list of add-ons"
 msgstr "Pidiendo lista de expansiones"
 
-#: src/game.cpp:892
+#: src/game.cpp:895
 msgid "Error communicating with the server."
 msgstr "Error de comunicación con el servidor."
 
-#: src/game.cpp:901 src/titlescreen.cpp:237
+#: src/game.cpp:904 src/titlescreen.cpp:237
 msgid "Version"
 msgstr "Versión"
 
-#: src/game.cpp:902
+#: src/game.cpp:905
 msgid "Author"
 msgstr "Autor"
 
-#: src/game.cpp:902
+#: src/game.cpp:905
 msgid "Downloads"
 msgstr "Descargas"
 
-#: src/game.cpp:902
+#: src/game.cpp:905
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/game.cpp:963
+#: src/game.cpp:966
 msgid "Publish add-on: "
 msgstr "Publicar expansión: "
 
-#: src/game.cpp:967
+#: src/game.cpp:970
 msgid "Delete add-on: "
 msgstr "Borrar expansión: "
 
-#: src/game.cpp:971
+#: src/game.cpp:974
 msgid "There are no add-ons available for download from this server."
 msgstr "No hay expansiones disponibles para descargar de este servidor."
 
-#: src/game.cpp:978
+#: src/game.cpp:981
 msgid "Choose the add-on to download."
 msgstr "Escoja la expansión que desea descargar."
 
-#: src/game.cpp:978
+#: src/game.cpp:981
 msgid "Get Add-ons"
 msgstr "Obtener expansiones"
 
-#: src/game.cpp:998
+#: src/game.cpp:1001
 msgid "Downloading add-on..."
 msgstr "Descargando expansión..."
 
-#: src/game.cpp:1022
+#: src/game.cpp:1025
 msgid "Cannot rescan the filesystem"
 msgstr "No se pudo revisar de nuevo el sistema de ficheros"
 
-#: src/game.cpp:1037
+#: src/game.cpp:1040
 msgid "Add-on Installed"
 msgstr "Expansión instalada"
 
-#: src/game.cpp:1037
+#: src/game.cpp:1040
 msgid "The add-on has been installed."
 msgstr "La expansión ha sido instalada."
 
-#: src/game.cpp:1039
+#: src/game.cpp:1042
 msgid "Network communication error."
 msgstr "Error de comunicación de red."
 
-#: src/game.cpp:1041
+#: src/game.cpp:1044
 msgid "Remote host disconnected."
 msgstr "Equipo remoto desconectado."
 
-#: src/game.cpp:1043
+#: src/game.cpp:1046
 msgid ""
 "There was a problem creating the files necessary to install this campaign."
 msgstr ""
 "Hubo un problema al crear los ficheros necesarios para instalar esta campaña."
 
-#: src/game.cpp:1055 src/game.cpp:1094 src/game.cpp:1119
-#: src/multiplayer.cpp:209 src/multiplayer_ui.cpp:35 src/playcampaign.cpp:342
+#: src/game.cpp:1058 src/game.cpp:1097 src/game.cpp:1122
+#: src/multiplayer.cpp:210 src/multiplayer_ui.cpp:35 src/playcampaign.cpp:342
 msgid "Connection timed out"
 msgstr "Conexión terminada"
 
-#: src/game.cpp:1058 src/game.cpp:1096 src/game.cpp:1121
+#: src/game.cpp:1061 src/game.cpp:1099 src/game.cpp:1124
 msgid "The server responded with an error: \""
 msgstr "El servidor respondió con un error: \""
 
-#: src/game.cpp:1062
+#: src/game.cpp:1065
 msgid "Terms"
 msgstr "Términos"
 
-#: src/game.cpp:1092
+#: src/game.cpp:1095
 msgid "Sending add-on"
 msgstr "Enviando expansión..."
 
-#: src/game.cpp:1099 src/game.cpp:1124 src/multiplayer_wait.cpp:317
+#: src/game.cpp:1102 src/game.cpp:1127 src/multiplayer_wait.cpp:317
 msgid "Response"
 msgstr "Respuesta"
 
-#: src/game.cpp:1146
+#: src/game.cpp:1149
 msgid "Join Official Server"
 msgstr "Unirse al servidor oficial"
 
-#: src/game.cpp:1147
+#: src/game.cpp:1150
 msgid "Log on to the official Wesnoth multiplayer server"
 msgstr "Entrar al servidor multijugador oficial de Wesnoth"
 
-#: src/game.cpp:1149 src/multiplayer_lobby.cpp:463
+#: src/game.cpp:1152 src/multiplayer_lobby.cpp:463
 msgid "Join Game"
 msgstr "Unirse a la partida"
 
-#: src/game.cpp:1150
+#: src/game.cpp:1153
 msgid "Join a server or hosted game"
 msgstr "Unirse a un servidor o a un juego"
 
-#: src/game.cpp:1152
+#: src/game.cpp:1155
 msgid "Host Networked Game"
 msgstr "Hospedar partida en red"
 
-#: src/game.cpp:1153
+#: src/game.cpp:1156
 msgid "Host a game without using a server"
 msgstr "Hospedar una partida sin usar un servidor remoto"
 
-#: src/game.cpp:1155
+#: src/game.cpp:1158
 msgid "Hotseat Game"
 msgstr "Partida compartiendo silla"
 
-#: src/game.cpp:1156
+#: src/game.cpp:1159
 msgid "Play a multiplayer game sharing the same machine"
 msgstr "Jugar en multijugador usando la misma máquina"
 
-#: src/game.cpp:1158
+#: src/game.cpp:1161
 msgid "Human vs AI"
 msgstr "Humanos contra IA"
 
-#: src/game.cpp:1159
+#: src/game.cpp:1162
 msgid "Play a game against AI opponents"
 msgstr "Jugar una partida contra oponentes con IA"
 
-#: src/game.cpp:1167 src/multiplayer.cpp:189
+#: src/game.cpp:1170 src/multiplayer.cpp:190
 msgid "Login: "
 msgstr "Usuario: "
 
-#: src/game.cpp:1169 src/multiplayer.cpp:194
+#: src/game.cpp:1172 src/multiplayer.cpp:195
 msgid ""
 "The login name you chose is too long, please use a login with less than 18 "
 "characters"
-msgstr "El nombre de usuario que ha escogido es muy largo. Por favor, escoja "
-"un nombre de menos de 18 caracteres"
+msgstr ""
+"El nombre de usuario que ha escogido es muy largo. Por favor, escoja un "
+"nombre de menos de 18 caracteresEl nombre de usuario que ha escogido es muy "
+"largo. Por favor, escoja un nombre de menos de 18 caracteres"
 
-#: src/game.cpp:1203 src/playcampaign.cpp:107 src/playcampaign.cpp:321
+#: src/game.cpp:1206 src/playcampaign.cpp:107 src/playcampaign.cpp:321
 msgid "The game could not be loaded: "
 msgstr "La partida no se ha podido cargar: "
 
-#: src/game.cpp:1205 src/playcampaign.cpp:109 src/playcampaign.cpp:324
+#: src/game.cpp:1208 src/playcampaign.cpp:109 src/playcampaign.cpp:324
 msgid "Error while playing the game: "
 msgstr "Error durante el juego: "
 
-#: src/game.cpp:1217 src/playcampaign.cpp:111 src/playcampaign.cpp:327
+#: src/game.cpp:1220 src/playcampaign.cpp:111 src/playcampaign.cpp:327
 msgid "The game map could not be loaded: "
 msgstr "El mapa del juego no se ha podido cargar: "
 
-#: src/game.cpp:1241
+#: src/game.cpp:1244
 msgid "Language"
 msgstr "Idioma"
 
-#: src/game.cpp:1242
+#: src/game.cpp:1245
 msgid "Choose your preferred language:"
 msgstr "Elija su idioma preferido:"
 
-#: src/game.cpp:1387
+#: src/game.cpp:1390
 msgid "The following add-on campaign(s) had errors and could not be loaded:"
 msgstr ""
 "La/s siguiente/s campaña/s adicionales contienen errores y no se ha/n podido "
 "cargar: "
 
-#: src/game.cpp:1392
+#: src/game.cpp:1395
 msgid "ERROR DETAILS:"
 msgstr "DETALLES DEL ERROR:"
 
-#: src/game.cpp:1406
+#: src/game.cpp:1409
 msgid "Warning: Errors occurred while loading game configuration files: '"
 msgstr "Aviso: Errores cargando ficheros de configuración del juego: '"
 
-#: src/game.cpp:1456
+#: src/game.cpp:1459
 msgid "Error loading game configuration files: '"
 msgstr "Error cargando ficheros de configuración del juego: '"
 
-#: src/game.cpp:1457
+#: src/game.cpp:1460
 msgid "' (The game will now exit)"
 msgstr "' (el juego finalizará en este momento)"
 
-#: src/game.cpp:1592
+#: src/game.cpp:1595
 msgid "Battle for Wesnoth"
 msgstr "La Batalla por Wesnoth"
 
-#: src/game.cpp:1734
+#: src/game.cpp:1737
 msgid "Loading title screen."
 msgstr "Cargando pantalla inicial."
 
-#: src/game_events.cpp:733
+#: src/game_events.cpp:735
 msgid "Victory:"
 msgstr "Victoria:"
 
-#: src/game_events.cpp:737
+#: src/game_events.cpp:739
 msgid "Defeat:"
 msgstr "Derrota:"
 
-#: src/gamestatus.cpp:556
+#: src/gamestatus.cpp:500
 msgid "Could not write to file"
 msgstr "No ha sido posible escribir en el fichero."
 
@@ -10451,7 +10433,7 @@ msgstr "PX requeridos: "
 msgid "attacks"
 msgstr "ataques"
 
-#: src/help.cpp:1178 src/menu_events.cpp:232 src/menu_events.cpp:685
+#: src/help.cpp:1178 src/menu_events.cpp:232 src/menu_events.cpp:688
 msgid "Type"
 msgstr "Tipo"
 
@@ -10547,11 +10529,11 @@ msgstr "Adelante >"
 msgid "Reference to unknown topic: "
 msgstr "Referencia a apartado desconocido: "
 
-#: src/help.cpp:2777
+#: src/help.cpp:2771
 msgid "The Battle for Wesnoth Help"
 msgstr "Sección de ayuda de La Batalla por Wesnoth"
 
-#: src/help.cpp:2825
+#: src/help.cpp:2819
 msgid "Parse error when parsing help text: "
 msgstr "Error durante el procesado de la ayuda: "
 
@@ -10655,7 +10637,7 @@ msgstr "Daño recibido (VE)"
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: src/menu_events.cpp:237 src/unit.cpp:2414
+#: src/menu_events.cpp:237 src/unit.cpp:2443
 msgid "Moves"
 msgstr "Movimientos"
 
@@ -10718,174 +10700,173 @@ msgstr "El juego ha sido guardado."
 msgid "The game could not be saved"
 msgstr "La partida no se ha podido guardar."
 
-#: src/menu_events.cpp:475 src/menu_events.cpp:477 src/play_controller.cpp:641
+#: src/menu_events.cpp:478 src/menu_events.cpp:480 src/play_controller.cpp:640
 #: src/playcampaign.cpp:118
 msgid "Auto-Save"
 msgstr "Autoguardado"
 
-#: src/menu_events.cpp:480
+#: src/menu_events.cpp:483
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 "El juego no se ha podido guardar automáticamente. Por favor, guárdelo "
 "manualmente."
 
-#: src/menu_events.cpp:504
+#: src/menu_events.cpp:507
 msgid "Chat Log"
 msgstr "Registro de conversaciones"
 
-#: src/menu_events.cpp:514
+#: src/menu_events.cpp:517
 msgid "Message:"
 msgstr "Mensaje:"
 
-#: src/menu_events.cpp:515
+#: src/menu_events.cpp:518
 msgid "Send to allies only"
 msgstr "Mandarlo sólo a aliados"
 
-#: src/menu_events.cpp:565 src/multiplayer_wait.cpp:407
+#: src/menu_events.cpp:568 src/multiplayer_wait.cpp:407
 msgid "unit^Gold"
 msgstr "Oro"
 
-#: src/menu_events.cpp:571
+#: src/menu_events.cpp:574
 msgid "You have no units available to recruit."
 msgstr "No tiene unidades disponibles para reclutar."
 
-#: src/menu_events.cpp:582
+#: src/menu_events.cpp:585
 msgid "Recruit"
 msgstr "Reclutar"
 
-#: src/menu_events.cpp:583 src/menu_events.cpp:726
+#: src/menu_events.cpp:586 src/menu_events.cpp:729
 msgid "Select unit:"
 msgstr "Seleccionar unidad:"
 
-#: src/menu_events.cpp:623
+#: src/menu_events.cpp:626
 msgid "You don't have enough gold to recruit that unit"
 msgstr "No tiene suficiente oro para reclutar a esta unidad."
 
-#: src/menu_events.cpp:678
+#: src/menu_events.cpp:681
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Está separado de sus soldados y no puede reincorporarlos."
 
-#: src/menu_events.cpp:680
-#, fuzzy
+#: src/menu_events.cpp:683
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
 msgstr ""
 "No hay tropas disponibles para reincorporar.\n"
-"(Debe tener veteranos supervivientes de escenarios previos)."
+"(Debe tener veteranos supervivientes de un escenario previo)."
 
-#: src/menu_events.cpp:687
+#: src/menu_events.cpp:690
 msgid "Level"
 msgstr "Nivel"
 
-#: src/menu_events.cpp:714
+#: src/menu_events.cpp:717
 msgid "Dismiss Unit"
 msgstr "Licenciar unidad"
 
-#: src/menu_events.cpp:725
+#: src/menu_events.cpp:728
 msgid "Recall"
 msgstr "Reincorporar"
 
-#: src/menu_events.cpp:737
+#: src/menu_events.cpp:740
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 "Ha de tener por lo menos $cost piezas de oro para reincorporar a una unidad."
 
-#: src/menu_events.cpp:1061
+#: src/menu_events.cpp:1064
 msgid ""
 "You have not started your turn yet. Do you really want to end your turn?"
 msgstr ""
 "Aún no ha hecho nada en este turno. ¿Está seguro de que quiere terminar el "
 "turno?"
 
-#: src/menu_events.cpp:1069 src/menu_events.cpp:1074
+#: src/menu_events.cpp:1072 src/menu_events.cpp:1077
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr ""
 "Algunas unidades todavía tienen puntos de movimiento. ¿Quiere finalizar su "
 "turno?"
 
-#: src/menu_events.cpp:1115
+#: src/menu_events.cpp:1118
 msgid "Rename Unit"
 msgstr "Renombrar unidad"
 
-#: src/menu_events.cpp:1199
+#: src/menu_events.cpp:1202
 msgid "Place Label"
 msgstr "Poner etiqueta"
 
-#: src/menu_events.cpp:1200
+#: src/menu_events.cpp:1203
 msgid "Label:"
 msgstr "Etiqueta:"
 
-#: src/menu_events.cpp:1298
+#: src/menu_events.cpp:1301
 msgid "Search"
 msgstr "Buscar"
 
-#: src/menu_events.cpp:1340
+#: src/menu_events.cpp:1343
 msgid "Commands: whisper ignore emote. Type /help [command] for more help."
 msgstr ""
 
-#: src/menu_events.cpp:1391
+#: src/menu_events.cpp:1394
 msgid ""
 "Sends private message. You can't send messages to players that control any "
 "side in game. Usage: /whisper [nick] [message]"
 msgstr ""
 
-#: src/menu_events.cpp:1395
+#: src/menu_events.cpp:1398
 msgid "Add player to your ignore list. Usage: /ignore add [argument]"
 msgstr ""
 
-#: src/menu_events.cpp:1397
+#: src/menu_events.cpp:1400
 msgid "Remove player from your ignore list. Usage: /ignore remove [argument]"
 msgstr ""
 
-#: src/menu_events.cpp:1399
+#: src/menu_events.cpp:1402
 msgid "Clear your ignore list. Usage: /ignore clear"
 msgstr ""
 
-#: src/menu_events.cpp:1401
+#: src/menu_events.cpp:1404
 msgid "Show your ignore list. Usage: /ignore list"
 msgstr ""
 
-#: src/menu_events.cpp:1403
+#: src/menu_events.cpp:1406
 msgid "Unknown subcommand"
 msgstr "Suborden desconocida"
 
-#: src/menu_events.cpp:1406
+#: src/menu_events.cpp:1409
 msgid ""
 "Ignore messages from players on this list. Usage: /ignore [subcommand] "
 "[argument](optional) Subcommands: add remove list clear. Type /help ignore "
 "[subcommand] for more info."
 msgstr ""
 
-#: src/menu_events.cpp:1409
+#: src/menu_events.cpp:1412
 msgid "Send an emotion or personal action in chat. Usage: /emote [message]"
 msgstr ""
 
-#: src/menu_events.cpp:1411
+#: src/menu_events.cpp:1414
 msgid "Unknown command"
 msgstr "Orden desconocida"
 
-#: src/menu_events.cpp:1428
+#: src/menu_events.cpp:1431
 msgid "Added to ignore list: "
 msgstr "Añadido a lista de usuarios a ignorar"
 
-#: src/menu_events.cpp:1430 src/menu_events.cpp:1440
+#: src/menu_events.cpp:1433 src/menu_events.cpp:1443
 msgid "Invalid username: "
 msgstr "Nombre de usuario inválido"
 
-#: src/menu_events.cpp:1438 src/menu_events.cpp:1464
+#: src/menu_events.cpp:1441 src/menu_events.cpp:1467
 msgid "Removed from ignore list: "
 msgstr "Eliminado de lista de usuarios a ignorar"
 
-#: src/menu_events.cpp:1469
+#: src/menu_events.cpp:1472
 msgid "Unknown command: "
 msgstr "Orden desconocida: "
 
-#: src/menu_events.cpp:1570
+#: src/menu_events.cpp:1573
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "No se encontró una etiquieta o unidad con la cadena «$search»."
 
-#: src/menu_events.cpp:1700
+#: src/menu_events.cpp:1705
 msgid "prompt^Command:"
 msgstr "Orden:"
 
@@ -10949,24 +10930,23 @@ msgstr "Atacar al enemigo"
 msgid "Choose weapon:"
 msgstr "Escoger arma:"
 
-#: src/multiplayer.cpp:94
+#: src/multiplayer.cpp:95
 msgid "Connect to Host"
 msgstr "Conectar al servidor del juego"
 
-#: src/multiplayer.cpp:96
+#: src/multiplayer.cpp:97
 msgid "Choose host to connect to: "
 msgstr "Escoja servidor al que conectar:"
 
-#: src/multiplayer.cpp:125 src/multiplayer.cpp:162
+#: src/multiplayer.cpp:126 src/multiplayer.cpp:163
 msgid "Connecting to Server..."
 msgstr "Conectar al servidor..."
 
-#: src/multiplayer.cpp:135
-#, fuzzy
+#: src/multiplayer.cpp:136
 msgid "Reading from Server..."
-msgstr "Conectar al servidor..."
+msgstr "Recibiendo datos del servidor..."
 
-#: src/multiplayer.cpp:144
+#: src/multiplayer.cpp:145
 msgid ""
 "The server requires version '$version1' while you are using version "
 "'$version2'"
@@ -10974,25 +10954,25 @@ msgstr ""
 "El servidor requiere una versión $version1, y usted está usando la versión "
 "$version2."
 
-#: src/multiplayer.cpp:156
+#: src/multiplayer.cpp:157
 msgid "Server-side redirect loop"
 msgstr "Bucle en la redirección del servidor"
 
-#: src/multiplayer.cpp:188
+#: src/multiplayer.cpp:189
 msgid "You must log in to this server"
 msgstr "Debe entrar en el servidor"
 
-#: src/multiplayer.cpp:368 src/multiplayer.cpp:383
+#: src/multiplayer.cpp:369 src/multiplayer.cpp:384
 #: src/multiplayer_wait.cpp:188
 msgid "No multiplayer sides available in this game"
 msgstr "No hay más bandos de multijugador disponibles en este juego."
 
-#: src/multiplayer.cpp:369 src/multiplayer.cpp:384
+#: src/multiplayer.cpp:370 src/multiplayer.cpp:385
 #: src/multiplayer_wait.cpp:217
 msgid "Era not available"
 msgstr "Era no disponible"
 
-#: src/multiplayer.cpp:370 src/multiplayer.cpp:385
+#: src/multiplayer.cpp:371 src/multiplayer.cpp:386
 #: src/multiplayer_wait.cpp:222
 msgid "No multiplayer sides found"
 msgstr "No se han encontrado bandos multijugador"
@@ -11003,19 +10983,18 @@ msgid "Normal"
 msgstr "Normal"
 
 #: src/multiplayer_connect.cpp:269 src/multiplayer_connect.cpp:361
-#: src/multiplayer_wait.cpp:406 src/multiplayer_wait.cpp:411 src/unit.cpp:2499
+#: src/multiplayer_wait.cpp:406 src/multiplayer_wait.cpp:411 src/unit.cpp:2528
 msgid "("
 msgstr "("
 
 #: src/multiplayer_connect.cpp:269 src/multiplayer_connect.cpp:361
-#: src/multiplayer_wait.cpp:406 src/multiplayer_wait.cpp:414 src/unit.cpp:2506
+#: src/multiplayer_wait.cpp:406 src/multiplayer_wait.cpp:414 src/unit.cpp:2535
 msgid ")"
 msgstr ")"
 
 #: src/multiplayer_connect.cpp:339
-#, fuzzy
 msgid "Default AI"
-msgstr "Predeterminado"
+msgstr "IA predeterminada"
 
 #: src/multiplayer_connect.cpp:390
 msgid "(Vacant slot)"
@@ -11161,13 +11140,12 @@ msgid "Settings..."
 msgstr "Ajustes..."
 
 #: src/multiplayer_create.cpp:106
-#, fuzzy
 msgid "The maximum number of turns the game can last"
 msgstr "El máximo número de turnos que puede durar la partida"
 
 #: src/multiplayer_create.cpp:109
 msgid "Enables user time limit"
-msgstr ""
+msgstr "Activa límite de tiempo por usuario"
 
 #: src/multiplayer_create.cpp:115
 msgid "Longest time allowed for first turn (seconds)"
@@ -11281,26 +11259,25 @@ msgstr "Modificador a la experiencia: "
 msgid "Players: "
 msgstr "Jugadores: "
 
-#: src/multiplayer_lobby.cpp:32
+#: src/multiplayer_lobby.cpp:33
 msgid "Map"
 msgstr "Mapa"
 
-#: src/multiplayer_lobby.cpp:33
+#: src/multiplayer_lobby.cpp:34
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/multiplayer_lobby.cpp:33
+#: src/multiplayer_lobby.cpp:34
 msgid "Status"
 msgstr "Estado"
 
-#: src/multiplayer_lobby.cpp:103
+#: src/multiplayer_lobby.cpp:104
 msgid "--no games open--"
 msgstr "<no hay juegos abiertos>"
 
 #: src/multiplayer_lobby.cpp:297 src/multiplayer_lobby.cpp:300
-#, fuzzy
 msgid "Unknown era"
-msgstr "Escenario desconocido: '"
+msgstr "Era desconocida"
 
 #: src/multiplayer_lobby.cpp:322 src/multiplayer_lobby.cpp:338
 msgid "Unknown scenario"
@@ -11338,7 +11315,7 @@ msgstr "Opciones"
 msgid "Quit"
 msgstr "Salir"
 
-#: src/multiplayer_lobby.cpp:473
+#: src/multiplayer_lobby.cpp:472
 msgid "Skip quickly to the active turn when observing"
 msgstr "Saltar rápidamente al turno activo (cuando se observa)"
 
@@ -11382,16 +11359,16 @@ msgstr "No ha sido posible añadir un socket más."
 msgid "Could not send initial handshake"
 msgstr "No se pudo enviar el saludo inicial."
 
-#: src/play_controller.cpp:377 src/playsingle_controller.cpp:331
+#: src/play_controller.cpp:376 src/playsingle_controller.cpp:331
 #: src/playsingle_controller.cpp:372
 msgid "The file you have tried to load is corrupt"
 msgstr "El fichero que ha intentado cargar está corrompido."
 
-#: src/play_controller.cpp:645
+#: src/play_controller.cpp:644
 msgid "Back to start"
 msgstr "Volver a empezar"
 
-#: src/play_controller.cpp:647
+#: src/play_controller.cpp:646
 msgid "Back to turn "
 msgstr "Volver al turno "
 
@@ -11417,13 +11394,14 @@ msgstr "Descargando próximo nivel..."
 
 #: src/playcampaign.cpp:413
 msgid "Do you want to save your game? (Also erases Auto-Save files)"
-msgstr "¿Quiere guardar el juego? (Esto también borrará los ficheros de autoguardado)"
+msgstr ""
+"¿Quiere guardar el juego? (Esto también borrará los ficheros de autoguardado)"
 
 #: src/playcampaign.cpp:440
 msgid "Unknown scenario: '"
 msgstr "Escenario desconocido: '"
 
-#: src/playmp_controller.cpp:241
+#: src/playmp_controller.cpp:245
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
@@ -11530,7 +11508,8 @@ msgstr "invisible: "
 msgid ""
 "This unit has been slowed. It will only deal half its normal damage when "
 "attacking."
-msgstr "Esta unidad ha sido ralentizada. Sólo podrá infligir la mitad del daño "
+msgstr ""
+"Esta unidad ha sido ralentizada. Sólo podrá infligir la mitad del daño "
 "normal en sus ataques."
 
 #: src/reports.cpp:135
@@ -11576,31 +11555,31 @@ msgstr "alcance del arma: "
 msgid "damage type: "
 msgstr "tipo de daño: "
 
-#: src/reports.cpp:324
+#: src/reports.cpp:328
 msgid "Lawful units: "
 msgstr "Unidades legales: "
 
-#: src/reports.cpp:326
+#: src/reports.cpp:330
 msgid "Neutral units: "
 msgstr "Unidades neutrales: "
 
-#: src/reports.cpp:327
+#: src/reports.cpp:331
 msgid "Chaotic units: "
 msgstr "Unidades caóticas: "
 
-#: src/reports.cpp:381
+#: src/reports.cpp:385
 msgid "Owned village"
 msgstr "Aldea propia"
 
-#: src/reports.cpp:383
+#: src/reports.cpp:387
 msgid "Enemy village"
 msgstr "Aldea enemiga"
 
-#: src/reports.cpp:385
+#: src/reports.cpp:389
 msgid "Allied village"
 msgstr "Aldea aliada"
 
-#: src/reports.cpp:459
+#: src/reports.cpp:463
 msgid "Observers:"
 msgstr "Observadores:"
 
@@ -11685,9 +11664,8 @@ msgid "TitleScreen button^Load"
 msgstr "Cargar"
 
 #: src/titlescreen.cpp:258
-#, fuzzy
 msgid "TitleScreen button^Get Add-ons"
-msgstr "Cargar"
+msgstr "Expansiones"
 
 #: src/titlescreen.cpp:259
 msgid "TitleScreen button^Language"
@@ -11727,7 +11705,10 @@ msgstr "Carga una partida grabada"
 
 #: src/titlescreen.cpp:267
 msgid "Download usermade campaigns, eras, or map packs"
-msgstr "Descarga campañas, eras, o paquetes de mapas creados por otros usuarios"
+msgstr ""
+"Descarga campañas, eras, o paquetes de mapas creados por otros "
+"usuariosDescarga campañas, eras, o paquetes de mapas creados por otros "
+"usuarios"
 
 #: src/titlescreen.cpp:268
 msgid "Change the language"
@@ -11757,15 +11738,15 @@ msgstr "Ayuda"
 msgid "Help Wesnoth by sending us information"
 msgstr "Ayude a Wesnoth enviándonos información"
 
-#: src/unit.cpp:2349 src/unit.cpp:2504
+#: src/unit.cpp:2378 src/unit.cpp:2533
 msgid "; "
 msgstr "; "
 
-#: src/unit.cpp:2431
+#: src/unit.cpp:2460
 msgid "XP to advance"
 msgstr "PX para subir de nivel"
 
-#: src/unit.cpp:2495
+#: src/unit.cpp:2524
 msgid ": "
 msgstr ": "
 
@@ -11795,11 +11776,17 @@ msgid ""
 "beginners and new players.  Wesnoth keeps summaries of your games: you can "
 "help us improve game play by giving permission to send these summaries "
 "(anonymously) to wesnoth.org.\n"
-msgstr "Wesnoth descansa en voluntarios como usted para obtener sugerencias, "
-"especialmente de principiantes y nuevos jugadores. ¿Sabía que Wesnoth mantiene "
-"resúmenes de sus juegos? Puede ayudarnos a mejorar su experiencia de juego "
-"dando permiso para enviarnos esos resúmenes (de forma anónima, por supuesto) a "
-"wesnoth.org.\n"
+msgstr ""
+"Wesnoth descansa en voluntarios como usted para obtener sugerencias, "
+"especialmente de principiantes y nuevos jugadores. ¿Sabía que Wesnoth "
+"mantiene resúmenes de sus juegos? Puede ayudarnos a mejorar su experiencia "
+"de juego dando permiso para enviarnos esos resúmenes (de forma anónima, por "
+"supuesto) a wesnoth.org.\n"
+"Wesnoth descansa en voluntarios como usted para obtener sugerencias, "
+"especialmente de principiantes y nuevos jugadores. ¿Sabía que Wesnoth "
+"mantiene resúmenes de sus juegos? Puede ayudarnos a mejorar su experiencia "
+"de juego dando permiso para enviarnos esos resúmenes (de forma anónima, por "
+"supuesto) a wesnoth.org.\n"
 
 #: src/upload_log.cpp:284
 msgid "Summaries are stored here:"
@@ -11812,3 +11799,24 @@ msgstr "Puede ver los resultados en:"
 #: src/upload_log.cpp:291
 msgid "Help us make Wesnoth better for you!"
 msgstr "¡Ayúdenos a hacer un mejor Wesnoth para todos!"
+
+#~ msgid "Import Saved Games"
+#~ msgstr "Importar partidas grabadas"
+
+#~ 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 ""
+#~ "Su directorio de partidas grabadas contiene algunos ficheros de una "
+#~ "versión anterior de la Batalla de Wesnoth. ¿Desea actualizarlos? Esto "
+#~ "puede llevar algo de tiempo..."
+
+#~ 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 ""
+#~ "Su directorio de partidas grabadas contiene algunos ficheros que parece "
+#~ "que no hayan sido generados por esta versión del juego. ¿Desea registrar "
+#~ "estos ficheros dentro del juego?"