wesnoth-cvs-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Cedric Duval
Subject: [Wesnoth-cvs-commits] wesnoth/po/es wesnoth.po
Date: Tue, 28 Sep 2004 10:48:09 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Cedric Duval <address@hidden>   04/09/28 08:19:05

Modified files:
        po/es          : wesnoth.po 

Log message:
        New french translation.

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

Patches:
Index: wesnoth/po/es/wesnoth.po
diff -u wesnoth/po/es/wesnoth.po:1.16 wesnoth/po/es/wesnoth.po:1.17
--- wesnoth/po/es/wesnoth.po:1.16       Tue Sep 21 09:40:31 2004
+++ wesnoth/po/es/wesnoth.po    Tue Sep 28 08:19:04 2004
@@ -7,32 +7,32 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.5-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-09-16 14:31+0200\n"
-"PO-Revision-Date: 2004-09-21 01:30+0200\n"
+"POT-Creation-Date: 2004-09-27 22:10+0200\n"
+"PO-Revision-Date: 2004-09-23 01:30+0200\n"
 "Last-Translator: David Martínez Moreno <address@hidden>\n"
-"Language-Team:  none\n"
+"Language-Team: David Martínez Moreno <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/game.cfg:319
+#: data/game.cfg:321
 msgid "loyal"
 msgstr "leal"
 
-#: data/game.cfg:327
+#: data/game.cfg:329
 msgid "strong"
 msgstr "fuerte"
 
-#: data/game.cfg:342
+#: data/game.cfg:344
 msgid "quick"
 msgstr "rápido"
 
-#: data/game.cfg:356
+#: data/game.cfg:358
 msgid "intelligent"
 msgstr "inteligente"
 
-#: data/game.cfg:365
+#: data/game.cfg:367
 msgid "resilient"
 msgstr "resistente"
 
@@ -182,7 +182,7 @@
 "la sección <ref>dst=income_and_upkeep text='Recaudación y mantenimiento'</"
 "ref> para obtener más información."
 
-#: data/help.cfg:85 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:85 src/help.cpp:772 src/help.cpp:773
 msgid "Movement"
 msgstr "Movimiento"
 
@@ -464,6 +464,21 @@
 "Keep in mind that while most units have three levels, not all do, and that "
 "occasional units (such as <ref>dst=unit_mage text=Mages</ref>) may have four."
 msgstr ""
+"Si ambas unidades sobreviven a una lucha, ganan un número de puntos de "
+"experiencia igual al nivel de la unidad contra la que están luchando. Si una 
"
+"unidad mata a otra en combate, sin embargo, ganará mucha más experiencia: 4 
"
+"si víctima era una unidad de nivel 0, 8 si era de nivel 1, 16 si era de "
+"nivel 2, 24 si era de nivel 3, y así sucesivamente.\n"
+"\n"
+"Para que la unidad gane un nivel, ha de conseguir un cierto número de puntos 
"
+"de experiencia (que son un 20% menos si tiene el rasgo «inteligente»). Una "
+"vez que haya conseguido esa cantidad, avanzará inmediatamente al siguiente "
+"nivel, curándose además en el proceso. En algunos casos, se le ofrecerá 
una "
+"opción entre los avances posibles.\n"
+"\n"
+"Tenga en mente que la gran mayoría de las unidades, pero no todas, tienen "
+"tres niveles, y que algunas unidades ocasionales (como los "
+"<ref>dst=unit_mage text=magos</ref>) pueden tener cuatro."
 
 #: data/help.cfg:161
 msgid "Healing"
@@ -789,68 +804,88 @@
 msgid "Default"
 msgstr "Predeterminado"
 
-#: data/multiplayer.cfg:23 data/multiplayer.cfg:98 data/multiplayer.cfg:173
-#: data/multiplayer.cfg:249
+#: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:185
+#: data/multiplayer.cfg:267 src/multiplayer_client.cpp:661
 msgid "&random-enemy.png,Random"
 msgstr "&random-enemy.png,Aleatorio"
 
-#: data/multiplayer.cfg:28 data/multiplayer.cfg:178
+#: data/multiplayer.cfg:28
+msgid "&human-lieutenant.png,Loyalists"
+msgstr "&human-lieutenant.png,Leales"
+
+#: data/multiplayer.cfg:40
+msgid "&elvish-captain.png,Rebels"
+msgstr "&elvish-captain.png,Rebeldes"
+
+#: data/multiplayer.cfg:52
+msgid "&orcish-warrior.png,Northerners"
+msgstr "&orcish-warrior.png,Norteños"
+
+#: data/multiplayer.cfg:64 data/multiplayer.cfg:145
+msgid "&undead-necromancer.png,Undead"
+msgstr "&undead-necromancer.png,No muertos"
+
+#: data/multiplayer.cfg:76
+msgid "&dwarf-warrior.png,Knalgan Alliance"
+msgstr "&dwarf-warrior.png,Alianza de Knalgan"
+
+#: data/multiplayer.cfg:88 data/multiplayer.cfg:169 data/multiplayer.cfg:250
+msgid "&drake-flare.png,Drakes"
+msgstr "&drake-flare.png,Dracos"
+
+#: data/multiplayer.cfg:101
+msgid "Classic"
+msgstr "Clásico"
+
+#: data/multiplayer.cfg:109
+msgid "&human-lieutenant.png,Humans"
+msgstr "&human-lieutenant.png,Humanos"
+
+#: data/multiplayer.cfg:121
+msgid "&elvish-captain.png,Elves"
+msgstr "&elvish-captain.png,Elfos"
+
+#: data/multiplayer.cfg:133
+msgid "&orcish-warrior.png,Orcs"
+msgstr "&orcish-warrio.png,Orcos"
+
+#: data/multiplayer.cfg:157
+msgid "&dwarf-warrior.png,Dwarves"
+msgstr "&dwarf-warrior.png,Enanos"
+
+#: data/multiplayer.cfg:182
+msgid "Age of Heroes"
+msgstr "La Era de los héroes"
+
+#: data/multiplayer.cfg:190
 msgid "&human-general.png,Loyalists"
 msgstr "&human-general.png,Leales"
 
-#: data/multiplayer.cfg:39 data/multiplayer.cfg:189
-msgid "&elvish-high-lord.png,Rebels"
-msgstr "&elvish-high-lord.png,Rebeldes"
+#: data/multiplayer.cfg:202
+msgid "&elvish-marshal.png,Rebels"
+msgstr "&elvish-marshal.png,Rebeldes"
 
-#: data/multiplayer.cfg:50 data/multiplayer.cfg:200
+#: data/multiplayer.cfg:214
 msgid "&orcish-warlord.png,Northerners"
 msgstr "&orcish-warlord.png,Norteños"
 
-#: data/multiplayer.cfg:61 data/multiplayer.cfg:136 data/multiplayer.cfg:211
+#: data/multiplayer.cfg:226
 msgid "&undead-lich.png,Undead"
 msgstr "&undead-lich.png,Muertos vivientes"
 
-#: data/multiplayer.cfg:72 data/multiplayer.cfg:222
+#: data/multiplayer.cfg:238
 msgid "&dwarf-lord.png,Knalgan Alliance"
 msgstr "&dwarf-lord.png,Alianza de Knalgan"
 
-#: data/multiplayer.cfg:83 data/multiplayer.cfg:158 data/multiplayer.cfg:233
-msgid "&drake-warrior.png,Drakes"
-msgstr "&drake-warrior.png,Draconianos"
-
-#: data/multiplayer.cfg:95
-msgid "Classic"
-msgstr "Clásico"
-
-#: data/multiplayer.cfg:103
-msgid "&human-general.png,Humans"
-msgstr "&human-general.png,Humanos"
-
-#: data/multiplayer.cfg:114
-msgid "&elvish-high-lord.png,Elves"
-msgstr "&elvish-high-lord.png,Elfos"
-
-#: data/multiplayer.cfg:125
-msgid "&orcish-warlord.png,Orcs"
-msgstr "&orcish-warlord.png,Orcos"
-
-#: data/multiplayer.cfg:147
-msgid "&dwarf-lord.png,Dwarves"
-msgstr "&dwarf-lord.png,Enanos"
-
-#: data/multiplayer.cfg:170
-msgid "Age of Heroes"
-msgstr "La Era de los héroes"
-
-#: data/multiplayer.cfg:246
+#: data/multiplayer.cfg:264
 msgid "Great War"
 msgstr "La Gran Guerra"
 
-#: data/multiplayer.cfg:254
+#: data/multiplayer.cfg:272
 msgid "&white-mage.png,Alliance of Light"
 msgstr "&white-mage.png,Alianza de la Luz"
 
-#: data/multiplayer.cfg:265
+#: data/multiplayer.cfg:284
 msgid "&undead-necromancer.png,Alliance of Darkness"
 msgstr "&undead-necromancer.png,Alianza de la Oscuridad"
 
@@ -862,6 +897,10 @@
 "Puedes venir si lo deseas, pero el líder sólo es interesante para hablar 
con "
 "Baldras."
 
+#: data/scenarios/multiplayer/An_Island.cfg:7
+msgid "An Island"
+msgstr "Una isla"
+
 #: data/scenarios/multiplayer/ForestOfFear.cfg:3
 msgid "Forest of Fear"
 msgstr "Bosque del Miedo"
@@ -913,8 +952,9 @@
 
 #: data/scenarios/multiplayer/Wesbowl.cfg:361
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
-#: data/scenarios/tutorial/tutorial1.cfg:292
-#: data/scenarios/tutorial/tutorial2.cfg:279 src/show_dialog.cpp:449
+#: data/scenarios/tutorial/Basic_Training.cfg:276
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
+#: src/show_dialog.cpp:449
 msgid "No"
 msgstr "No"
 
@@ -974,15 +1014,15 @@
 msgid "King of the Hill"
 msgstr "El rey de la colina"
 
-#: data/scenarios/tutorial/tutorial1.cfg:67
+#: data/scenarios/tutorial/Basic_Training.cfg:47
 msgid ""
 "I am here to learn how to fight in a battle. As an experienced elder mage, "
-"surely you can explain the art of combat to me."
+"surely you can explain the art of combat to me..."
 msgstr ""
 "Estoy aquí para aprender cómo luchar en una batalla. Como mago anciano con "
-"experiencia que eres, seguro que me puedes explicar el arte del combate."
+"experiencia que eres, seguro que me podrás explicar el arte del combate..."
 
-#: data/scenarios/tutorial/tutorial1.cfg:71
+#: data/scenarios/tutorial/Basic_Training.cfg:51
 msgid ""
 "Before entering any battle, you need to recruit units. To recruit a unit, "
 "right click on the castle tile on which you wish to recruit the unit. Then "
@@ -995,28 +1035,28 @@
 "selecciona «Reclutar», y «Aceptar». Sólo podrás reclutar unidades en 
las "
 "casillas de castillo que estén conectadas al torreón en el que esté tu 
líder."
 
-#: data/scenarios/tutorial/tutorial1.cfg:73
+#: data/scenarios/tutorial/Basic_Training.cfg:53
 msgid "Recruit a unit"
 msgstr "Reclutar una unidad"
 
-#: data/scenarios/tutorial/tutorial1.cfg:79
+#: data/scenarios/tutorial/Basic_Training.cfg:59
 msgid "Excellent! You have recruited an Elvish Fighter."
 msgstr "¡Excelente! Has reclutado un luchador elfo."
 
-#: data/scenarios/tutorial/tutorial1.cfg:81
-#: data/scenarios/tutorial/tutorial1.cfg:101
-#: data/scenarios/tutorial/tutorial1.cfg:136
-#: data/scenarios/tutorial/tutorial1.cfg:164
-#: data/scenarios/tutorial/tutorial1.cfg:182
-#: data/scenarios/tutorial/tutorial1.cfg:206
+#: data/scenarios/tutorial/Basic_Training.cfg:61
+#: data/scenarios/tutorial/Basic_Training.cfg:85
+#: data/scenarios/tutorial/Basic_Training.cfg:120
+#: data/scenarios/tutorial/Basic_Training.cfg:148
+#: data/scenarios/tutorial/Basic_Training.cfg:166
+#: data/scenarios/tutorial/Basic_Training.cfg:190
 msgid "What do I do next?"
 msgstr "¿Qué hago ahora?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:83
+#: data/scenarios/tutorial/Basic_Training.cfg:63
 msgid "How do I recruit units?"
 msgstr "¿Cómo recluto unidades?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:83
+#: data/scenarios/tutorial/Basic_Training.cfg:63
 msgid ""
 "To recruit a unit, right click on the castle tile on which you wish to "
 "recruit the unit. Then select Recruit, or just hold your cursor over the "
@@ -1031,7 +1071,7 @@
 "y selecciona «Aceptar». Para reclutar más rápido, puedes usar 
«Ctrl-Mayús-R» "
 "para reclutar al mismo tipo de unidad que solicitaste la vez anterior."
 
-#: data/scenarios/tutorial/tutorial1.cfg:84
+#: data/scenarios/tutorial/Basic_Training.cfg:64
 msgid ""
 "A leader is a unit that can recruit. This means that when the leader is on a "
 "keep, he can recruit units on the surrounding castle tiles. Leaders are "
@@ -1050,18 +1090,18 @@
 "pierdes la partida. La mayor parte de los escenarios se ganan derrotando al "
 "resto de líderes enemigos."
 
-#: data/scenarios/tutorial/tutorial1.cfg:84
+#: data/scenarios/tutorial/Basic_Training.cfg:64
 msgid "What's a leader?"
 msgstr "¿Qué es un líder?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:85
+#: data/scenarios/tutorial/Basic_Training.cfg:65
 msgid "How should I choose what kind of units to recruit?"
 msgstr "¿Cómo elijo qué tipo de unidades reclutar?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:85
+#: data/scenarios/tutorial/Basic_Training.cfg:65
 msgid ""
 "You have to carefully review their skills, which are displayed to the left "
-"of the unit selection box, and cost, which is displayed after the name of "
+"of the unit selection box,  and cost, which is displayed after the name of "
 "the unit. You will learn more about these statistics throughout the tutorial."
 msgstr ""
 "Has de sopesar cuidadosamente sus habilidades, que se muestran en la "
@@ -1069,11 +1109,11 @@
 "después del nombre de la unidad. Aprenderás más sobre las estadísticas a 
lo "
 "largo del tutorial."
 
-#: data/scenarios/tutorial/tutorial1.cfg:86
+#: data/scenarios/tutorial/Basic_Training.cfg:66
 msgid "What happens when I recruit a unit?"
 msgstr "¿Qué pasa cuando recluto una unidad?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:86
+#: data/scenarios/tutorial/Basic_Training.cfg:66
 msgid ""
 "When you recruit a unit, it appears at full health on a castle tile of your "
 "choice. It also receives two traits, which will be discussed later. It "
@@ -1083,7 +1123,7 @@
 "castillo de tu elección. También recibe dos rasgos, pero eso lo veremos 
más "
 "tarde. No podrá mover o atacar hasta que termines el turno."
 
-#: data/scenarios/tutorial/tutorial1.cfg:92
+#: data/scenarios/tutorial/Basic_Training.cfg:76
 msgid ""
 "Since units cannot move on the turn they are recruited, you must end your "
 "turn. To do this, simply click the 'End Turn' button in the lower-right hand "
@@ -1093,19 +1133,19 @@
 "reclutado, has de terminar tu turno. Para hacerlo, simplemente pulsa el "
 "botón «Fin de turno» que hay en la esquina inferior derecha de la 
pantalla."
 
-#: data/scenarios/tutorial/tutorial1.cfg:94
+#: data/scenarios/tutorial/Basic_Training.cfg:78
 msgid "End your turn"
 msgstr "Termina tu turno"
 
-#: data/scenarios/tutorial/tutorial1.cfg:99
+#: data/scenarios/tutorial/Basic_Training.cfg:83
 msgid "You have successfully ended your turn."
 msgstr "Has concluido tu turno con éxito."
 
-#: data/scenarios/tutorial/tutorial1.cfg:103
+#: data/scenarios/tutorial/Basic_Training.cfg:87
 msgid "How do I end my turn?"
 msgstr "¿Cómo termino mi turno?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:103
+#: data/scenarios/tutorial/Basic_Training.cfg:87
 msgid ""
 "One way to end your turn is to press 'Alt-E'. Alternatively, you can right-"
 "click and select End Turn, or select the End Turn button in the lower-right "
@@ -1115,11 +1155,11 @@
 "puedes pulsar el botón derecho del ratón y seleccionar «Fin de turno», o "
 "pulsar el botón de «Fin de turno» que hay en la esquina inferior derecha."
 
-#: data/scenarios/tutorial/tutorial1.cfg:104
+#: data/scenarios/tutorial/Basic_Training.cfg:88
 msgid "What happens when I end my turn?"
 msgstr "¿Qué sucede cuando termino mi turno?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:104
+#: data/scenarios/tutorial/Basic_Training.cfg:88
 msgid ""
 "When you end your turn, it becomes another side's turn and only that side "
 "has the right to move, until that side ends its turn. After all sides end "
@@ -1136,7 +1176,7 @@
 "puedes ver el turno actual en el que estás. Cuando este número exceda del "
 "máximo número de turnos permitido, perderás la partida."
 
-#: data/scenarios/tutorial/tutorial1.cfg:110
+#: data/scenarios/tutorial/Basic_Training.cfg:94
 msgid ""
 "Your next task is to move your Elvish Fighter. To move a unit, first select "
 "it, then select his destination. In this case, his destination is the forest "
@@ -1146,11 +1186,11 @@
 "selecciónala, y después selecciona su destino. En este caso, su destino es "
 "el bosque que hay al lado de Merle, el chamán elfo."
 
-#: data/scenarios/tutorial/tutorial1.cfg:112
+#: data/scenarios/tutorial/Basic_Training.cfg:96
 msgid "Move your Elvish Fighter next to Merle"
 msgstr "Mueve tu luchador elfo cerca de Merle."
 
-#: data/scenarios/tutorial/tutorial1.cfg:134
+#: data/scenarios/tutorial/Basic_Training.cfg:118
 msgid ""
 "Excellent! You have successfully moved your Elvish Fighter. However, since "
 "he moved next to an enemy unit, he has lost all his movement for this turn; "
@@ -1160,11 +1200,11 @@
 "se ha movido cerca de una unidad enemiga, ha perdido todo su movimiento de "
 "este turno. A esto se le llama «zona de control»."
 
-#: data/scenarios/tutorial/tutorial1.cfg:138
+#: data/scenarios/tutorial/Basic_Training.cfg:122
 msgid "How far can my Elvish Fighter move?"
 msgstr "¿Hasta dónde puede moverse mi luchador elfo?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:138
+#: data/scenarios/tutorial/Basic_Training.cfg:122
 msgid ""
 "Your Elvish Fighter begins with a certain number of move points each turn; "
 "this is called his speed. When your Elvish Fighter moves along a path, each "
@@ -1178,7 +1218,7 @@
 "twice to remove the course."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:139
+#: data/scenarios/tutorial/Basic_Training.cfg:123
 msgid ""
 "A unit's zone of control is the location consisting of all hexes the unit is "
 "adjacent to. Units cannot move through opponent's zones of control; they can "
@@ -1187,15 +1227,15 @@
 "weak and wounded units."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:139
+#: data/scenarios/tutorial/Basic_Training.cfg:123
 msgid "What's the zone of control?"
 msgstr "¿Qué es la zona de control?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:140
+#: data/scenarios/tutorial/Basic_Training.cfg:124
 msgid "How do I tell who is allied and who is an enemy?"
 msgstr "¿Cómo puedo saber quién es un aliado y quién es un enemigo?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:140
+#: data/scenarios/tutorial/Basic_Training.cfg:124
 msgid ""
 "Units you control have a green, yellow, or red energy circle above their "
 "health bar, the green vertical bar next to them. Units with full movement "
@@ -1206,7 +1246,7 @@
 "displayed as a disc below the unit."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:146
+#: data/scenarios/tutorial/Basic_Training.cfg:130
 msgid ""
 "Now, you need to attack with your fighter. To attack, first select a unit, "
 "then select its target, which must be next to the attacking unit. You will "
@@ -1217,19 +1257,19 @@
 "atacante. Entonces aparecerá el menú de opciones de ataque, donde deberás "
 "seleccionar qué tipo de ataque quieres usar."
 
-#: data/scenarios/tutorial/tutorial1.cfg:148
+#: data/scenarios/tutorial/Basic_Training.cfg:132
 msgid "Attack Merle"
 msgstr "Ataca a Merle"
 
-#: data/scenarios/tutorial/tutorial1.cfg:162
+#: data/scenarios/tutorial/Basic_Training.cfg:146
 msgid "You have successfully attacked Merle."
 msgstr "Has atacado a Merle correctamente."
 
-#: data/scenarios/tutorial/tutorial1.cfg:166
+#: data/scenarios/tutorial/Basic_Training.cfg:150
 msgid "Can Merle retaliate from my attack?"
 msgstr "¿Puede Merle devolver mi ataque?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:166
+#: data/scenarios/tutorial/Basic_Training.cfg:150
 msgid ""
 "Whenever a unit is attacked, it retaliates with one of their own weapons. "
 "This means that after each blow from the attacker, the defender retaliates "
@@ -1245,7 +1285,7 @@
 "Wesnoth."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:167
+#: data/scenarios/tutorial/Basic_Training.cfg:151
 msgid ""
 "Every attack does a certain amount of damage per hit, and can be used a "
 "certain number of times per battle. These numbers, called the attack's "
@@ -1257,11 +1297,11 @@
 "combat."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:167
+#: data/scenarios/tutorial/Basic_Training.cfg:151
 msgid "How can you tell how powerful a unit's attacks are?"
 msgstr "¿Cómo puedo saber cuán poderosos son los ataques de una unidad?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:168
+#: data/scenarios/tutorial/Basic_Training.cfg:152
 msgid ""
 "Units have the ability to block blows. The chance that a unit has to hit is "
 "based on the defender's skill at defending blows, and is listed on the "
@@ -1272,15 +1312,15 @@
 "del defensor para evitar los ataques, y se muestra en el menú de opciones de 
"
 "combate, después de los valores de daño y número de ataques del arco."
 
-#: data/scenarios/tutorial/tutorial1.cfg:168
+#: data/scenarios/tutorial/Basic_Training.cfg:152
 msgid "Will my fighter hit every time when he attacks?"
 msgstr "¿Mi luchador acertará todas las veces que ataque?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:174
+#: data/scenarios/tutorial/Basic_Training.cfg:158
 msgid "End your turn, and wait for Merle to attack you."
 msgstr "Termina tu turno, y espera a que Merle te ataque."
 
-#: data/scenarios/tutorial/tutorial1.cfg:180
+#: data/scenarios/tutorial/Basic_Training.cfg:164
 msgid ""
 "Your fighter has survived Merle's attack. Whenever a unit survives a battle, "
 "it gets experience from the combat. Once a unit gains enough experience, it "
@@ -1290,11 +1330,11 @@
 "a una abtalla, gana experiencia del combate. Una vez que la unidad ha ganado "
 "suficiente experiencia, avanza al siguiente nivel, y se hace más poderosa."
 
-#: data/scenarios/tutorial/tutorial1.cfg:184
+#: data/scenarios/tutorial/Basic_Training.cfg:168
 msgid "What's experience?"
 msgstr "¿Qué es la experiencia?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:184
+#: data/scenarios/tutorial/Basic_Training.cfg:168
 msgid ""
 "When a unit fights another unit, it gains experience, denoted 'XP', from the "
 "combat. The amount of experience gained is equal to the opponent's level, "
@@ -1303,11 +1343,11 @@
 "from killing an enemy is equal to 8 times the enemy's level."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:185
+#: data/scenarios/tutorial/Basic_Training.cfg:169
 msgid "What happens when a unit advances?"
 msgstr "¿Qué pasa cuando una unidad gana un nivel?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:185
+#: data/scenarios/tutorial/Basic_Training.cfg:169
 msgid ""
 "When a unit advances, it transforms into a different unit type. This unit "
 "type is dependent on what the unit was originally, but occasionally there "
@@ -1317,23 +1357,23 @@
 "been cast on it are removed. This is known as 'advance-heal'."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:191
+#: data/scenarios/tutorial/Basic_Training.cfg:175
 msgid "Move your fighter onto a village."
 msgstr "Mueve a tu luchador a una aldea."
 
-#: data/scenarios/tutorial/tutorial1.cfg:193
+#: data/scenarios/tutorial/Basic_Training.cfg:177
 msgid "Move your fighter onto a village"
 msgstr "Mueve a tu luchador a una aldea."
 
-#: data/scenarios/tutorial/tutorial1.cfg:204
+#: data/scenarios/tutorial/Basic_Training.cfg:188
 msgid "Villages heal the units on them."
 msgstr "Las aldeas sanan a las unidades que hay dentro de ellas."
 
-#: data/scenarios/tutorial/tutorial1.cfg:208
+#: data/scenarios/tutorial/Basic_Training.cfg:192
 msgid "What happens when a unit moves onto a village?"
 msgstr "¿Qué sucede cuando una unidad entra en una aldea?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:208
+#: data/scenarios/tutorial/Basic_Training.cfg:192
 msgid ""
 "Whenever a unit moves onto a village, he flags the village for his side. "
 "This action takes all of the unit's remaining movement. Villages flagged for "
@@ -1345,11 +1385,11 @@
 "on them 8 HP per turn."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:209
+#: data/scenarios/tutorial/Basic_Training.cfg:193
 msgid "How do I heal when there aren't any villages nearby?"
 msgstr "¿Cómo puedo sanarme si no hay aldeas cerca?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:209
+#: data/scenarios/tutorial/Basic_Training.cfg:193
 msgid ""
 "There are ways to heal even without villages. If a unit does not move or "
 "attack for 1 turn, he heals 2 HP from resting. However if an enemy attacks "
@@ -1359,7 +1399,7 @@
 "all your units are healed fully."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:215
+#: data/scenarios/tutorial/Basic_Training.cfg:199
 msgid ""
 "Now, you must defeat Merle by reducing her to 0 HP or lower. Just attack "
 "repeatedly."
@@ -1367,11 +1407,11 @@
 "Ahora, has de vencer a Merle reduciéndole a 0 PV o menos. Simplemente "
 "atácalo repetidamente."
 
-#: data/scenarios/tutorial/tutorial1.cfg:217
+#: data/scenarios/tutorial/Basic_Training.cfg:201
 msgid "Defeat Merle"
 msgstr "Derrota a Merle"
 
-#: data/scenarios/tutorial/tutorial1.cfg:232
+#: data/scenarios/tutorial/Basic_Training.cfg:216
 msgid ""
 "Oops! You moved your leader off of the keep. Remember, when your leader is "
 "not on a keep, you cannot recruit. Also remember that if your leader dies, "
@@ -1379,8 +1419,8 @@
 "back onto your keep."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:248
-#: data/scenarios/tutorial/tutorial2.cfg:233
+#: data/scenarios/tutorial/Basic_Training.cfg:232
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:222
 msgid ""
 "Unfortunately, you lost, because your leader was defeated. Hopefully you "
 "have gained wisdom from my teachings anyway."
@@ -1388,8 +1428,8 @@
 "Desafortunadamente, has perdido, ya que tu líder ha sido derrotado. De todas 
"
 "formas espero que hayas recibido sabiduría de mis enseñanzas."
 
-#: data/scenarios/tutorial/tutorial1.cfg:255
-#: data/scenarios/tutorial/tutorial2.cfg:240
+#: data/scenarios/tutorial/Basic_Training.cfg:239
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:229
 msgid ""
 "Unfortunately, you lost, because you ran out of time. Hopefully you have "
 "gained wisdom from my teachings anyway."
@@ -1397,34 +1437,34 @@
 "Desafortunadamente, has perdido, ya que se te ha acabado el tiempo. De todas "
 "formas espero que hayas recibido sabiduría de mis enseñanzas."
 
-#: data/scenarios/tutorial/tutorial1.cfg:265
+#: data/scenarios/tutorial/Basic_Training.cfg:249
 msgid "You have successfully completed the first training scenario."
 msgstr "Has completado el primer escenario de entrenamiento correctamente."
 
-#: data/scenarios/tutorial/tutorial1.cfg:267
-#: data/scenarios/tutorial/tutorial2.cfg:252
+#: data/scenarios/tutorial/Basic_Training.cfg:251
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:241
 msgid "Hooray!"
 msgstr "¡Hurra!"
 
-#: data/scenarios/tutorial/tutorial1.cfg:269
+#: data/scenarios/tutorial/Basic_Training.cfg:253
 msgid "How do I know how to complete a scenario? Will you always tell me?"
 msgstr "¿Cómo sé cómo completar un escenario? ¿Siempre me lo dirás?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:269
+#: data/scenarios/tutorial/Basic_Training.cfg:253
 msgid ""
 "Sometimes it is not clear how to win a scenario just by listening to the "
 "dialog. In this case you need to look at the scenario objectives, which "
 "appear after the opening dialog. It can also be accessed by clicking "
 "'Objectives' on the menu. The scenario objectives are a list of victory "
-"conditions and defeat conditions, and if any of the conditions are met, the "
-"level is over. Hopefully, it was a victory condition that was met."
+"conditions and defeat conditions, and when any of the conditions are met, "
+"the level is over. Hopefully, it was a victory condition that was met."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:270
+#: data/scenarios/tutorial/Basic_Training.cfg:254
 msgid "What happens when I win a scenario?"
 msgstr "¿Qué pasa cuando gano en un escenario?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:270
+#: data/scenarios/tutorial/Basic_Training.cfg:254
 msgid ""
 "When you win a scenario, all of your units survive and are revived to full "
 "health, and you do not have to pay them for the remaining turns. Also, if "
@@ -1433,35 +1473,36 @@
 "lost."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial1.cfg:276
-#: data/scenarios/tutorial/tutorial2.cfg:261
+#: data/scenarios/tutorial/Basic_Training.cfg:260
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:250
 msgid "Do you want to review any of the skills learned on this level?"
 msgstr ""
 "¿Quieres volver a ver alguna de las habilidades que has aprendido en este "
 "nivel?"
 
-#: data/scenarios/tutorial/tutorial1.cfg:278
-#: data/scenarios/tutorial/tutorial2.cfg:263 src/show_dialog.cpp:448
+#: data/scenarios/tutorial/Basic_Training.cfg:262
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
+#: src/show_dialog.cpp:448
 msgid "Yes"
 msgstr "Sí"
 
-#: data/scenarios/tutorial/tutorial1.cfg:280
-#: data/scenarios/tutorial/tutorial2.cfg:265
+#: data/scenarios/tutorial/Basic_Training.cfg:264
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:254
 msgid "I'm done reviewing skills!"
 msgstr "¡He acabado de ejercitar mis habilidades!"
 
-#: data/scenarios/tutorial/tutorial1.cfg:297
+#: data/scenarios/tutorial/Basic_Training.cfg:281
 msgid ""
 "Although you have completed your first scenario, your training is not yet "
 "over. We will now proceed to the next scenario, in which you will fight me "
 "in a mock battle."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:3
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:3
 msgid "Traits and Specialties"
 msgstr "Rasgos y especialidades"
 
-#: data/scenarios/tutorial/tutorial2.cfg:60
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:39
 msgid ""
 "Now you will be subject to a more difficult test. You must defeat me in mock "
 "battle."
@@ -1469,7 +1510,7 @@
 "Ahora te someteré a una prueba más difícil. Tendrás que derrotarme en un "
 "combate de mentira."
 
-#: data/scenarios/tutorial/tutorial2.cfg:64
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:43
 msgid ""
 "You can win most scenarios simply by defeating all enemy leaders. Win this "
 "scenario by defeating me. Your fighter from the previous scenario can help "
@@ -1478,7 +1519,7 @@
 "Elvish Fighters and Elvish Archers."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:79
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:64
 msgid ""
 "@Skills covered:\n"
 "Recalling\n"
@@ -1495,22 +1536,22 @@
 "Defeat Delfador"
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:86
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:75
 msgid "You have successfully recalled your Elvish Fighter."
 msgstr "Has reincorporado correctamente a tu luchador elfo."
 
-#: data/scenarios/tutorial/tutorial2.cfg:88
-#: data/scenarios/tutorial/tutorial2.cfg:102
-#: data/scenarios/tutorial/tutorial2.cfg:117
-#: data/scenarios/tutorial/tutorial2.cfg:131
-#: data/scenarios/tutorial/tutorial2.cfg:145
-#: data/scenarios/tutorial/tutorial2.cfg:159
-#: data/scenarios/tutorial/tutorial2.cfg:173
-#: data/scenarios/tutorial/tutorial2.cfg:206
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:77
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:91
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:106
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:120
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:134
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:148
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:162
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:195
 msgid "En guarde!"
 msgstr "¡En guardia!"
 
-#: data/scenarios/tutorial/tutorial2.cfg:90
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:79
 msgid ""
 "First, you must pay 20 pieces of gold for each unit you recall, regardless "
 "of the type of unit. Other than that, recalled units are basically like "
@@ -1518,15 +1559,15 @@
 "previous scenario will appear."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:90
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:79
 msgid "What happens when I recall a unit?"
 msgstr "¿Qué sucede cuando reincorporo una unidad?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:91
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:80
 msgid "How should I decide which units to recall?"
 msgstr "¿Cómo debería decidir qué unidades reincorporar?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:91
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:80
 msgid ""
 "You should usually recall units that have already advanced to the next "
 "level. However, you may also want to recall units that have high experience, "
@@ -1534,14 +1575,14 @@
 "for the scenario you are in; for example in a forest scenario, recall elves."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:100
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:89
 msgid ""
 "You may notice that your units have slightly different statistics than the "
 "statistics shown before you recruited them. This is because they have been "
 "assigned traits."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:104
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:93
 msgid ""
 "The function of traits is add variety by making units of the same type "
 "different from each other. This is done by randomly assigning each unit "
@@ -1550,11 +1591,11 @@
 "putting your cursor over that trait."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:104
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:93
 msgid "What do traits do?"
 msgstr "¿Qué hacen los diferentes rasgos?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:105
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:94
 msgid ""
 "There are five distinct traits, which have effects ranging from increasing a "
 "unit's hit points to decreasing the amount of XP required to advance. "
@@ -1563,11 +1604,11 @@
 "traits when they are recruited."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:105
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:94
 msgid "What kind of traits can my units get?"
 msgstr "¿Qué tipo de rasgos pueden tener mis unidades?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:115
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:104
 msgid ""
 "When you recruit and recall units, you lose gold. If this would cause you to "
 "have less than 0 gold, you cannot recruit or recall."
@@ -1575,11 +1616,11 @@
 "Cuando reclutas y reincorporar unidades, gastas oro. Si esto hace que tengas "
 "menos de 0 piezas de oro, no podrás reclutar o reincorporar a nadie."
 
-#: data/scenarios/tutorial/tutorial2.cfg:119
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:108
 msgid "How much gold do my units cost?"
 msgstr "¿Cuánto oro cuestan mis unidades?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:119
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:108
 msgid ""
 "You need to pay each unit you recruit or recall gold when you recruit it. "
 "The cost of recruiting a unit is displayed under the unit's name. The cost "
@@ -1591,11 +1632,11 @@
 "red arrow."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:120
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:109
 msgid "How do I get gold?"
 msgstr "¿Cómo consigo oro?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:120
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:109
 msgid ""
 "You begin each level with a percentage of gold from the previous level. If "
 "this is less than 100 gold, you begin with 100 gold instead. The amount of "
@@ -1605,7 +1646,7 @@
 "gold per turn."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:129
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:118
 msgid ""
 "The sun is setting over Wesnoth. The time of day affects how much damage "
 "units of different alignments can inflict upon each other."
@@ -1613,7 +1654,7 @@
 "El sol se pone en Wesnoth. La hora del día afecta a la cantidad de daño que 
"
 "pueden infligir las unidades de diferente alineamiento."
 
-#: data/scenarios/tutorial/tutorial2.cfg:133
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:122
 msgid ""
 "There are 3 alignments: Lawful, Neutral, and Chaotic. There are also 3 times "
 "of day: day, twilight, and night. During day, units of the alignment Lawful, "
@@ -1622,15 +1663,15 @@
 "normal damage. Neutral units such as elves are unaffected by day and night."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:133
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:122
 msgid "What are the different alignments and times of day?"
 msgstr "¿Qué tienen que ver los diferentes alineamientos y la hora del día?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:134
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:123
 msgid "How do I know what time of day it is?"
 msgstr "¿Cómo sé qué hora del día es?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:134
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:123
 msgid ""
 "The times of day usually progress in a sequence: dawn- identical to "
 "twilight, morning- day, evening- day, dusk- twilight, first-watch- night, "
@@ -1640,11 +1681,11 @@
 "can find out the current time of day by looking at the Status Table."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:143
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:132
 msgid "Each hex has a terrain, which gives the hex distinctive properties."
 msgstr "Cada hexágono tiene un terreno, que da al hexágono propiedades 
únicas."
 
-#: data/scenarios/tutorial/tutorial2.cfg:147
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:136
 msgid ""
 "Two terrains have properties which have already been described; namely "
 "villages and castle. However the properties of most terrains are more "
@@ -1657,15 +1698,15 @@
 "the time."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:147
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:136
 msgid "What are the different properties that terrains have?"
 msgstr "¿Cuáles son las distintas propiedades que tiene el terreno?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:148
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:137
 msgid "How do I find out the properties of a specific terrain?"
 msgstr "¿Cómo puedo ver las propiedades de un terreno en particular?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:148
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:137
 msgid ""
 "To find out the properties of a terrain with respect to a specific unit, "
 "right-click on the unit, select Unit Description, then select Terrain "
@@ -1676,13 +1717,13 @@
 "it will cost the selected unit to move through that hex."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:157
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:146
 msgid ""
 "Each attack has a damage type which affects how much damage different units "
 "take from that attack."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:161
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:150
 msgid ""
 "Each unit has a certain resistance against each attack type. This resistance "
 "is a percentage which is subtracted from the damage of opponent's weapons of "
@@ -1693,11 +1734,11 @@
 "100%."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:161
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:150
 msgid "How does resistance affect attack damage?"
 msgstr "¿Cómo afecta la resistencia al daño de los ataques?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:162
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:151
 msgid ""
 "There are 6 different damage types: blade, pierce, impact, fire, cold, and "
 "holy. Heavily armored units have high resistance to the physical types: "
@@ -1707,29 +1748,29 @@
 "unit, select Unit Description, then select Resistance."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:162
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:151
 msgid "What are the different damage types?"
 msgstr "¿Qué son los distintos tipos de daño?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:171
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:160
 msgid ""
 "Many units have a specialty which changes the rules of play in some way."
 msgstr ""
 "Muchas unidades tienen una especialidad que cambia las reglas de juego de "
 "una forma u otra."
 
-#: data/scenarios/tutorial/tutorial2.cfg:175
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:164
 msgid ""
 "Each specialty does something different; that's the whole point of a "
 "specialty. To find a description of a unit's specialty, put your cursor over "
 "the name of the specialty."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:175
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:164
 msgid "What do specialties do?"
 msgstr "¿Qué hacen las especialidades?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:176
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:165
 msgid ""
 "The specialties a unit gets are determined by the unit type; for example all "
 "generals have the specialty leadership. There are two kinds of specialties: "
@@ -1737,11 +1778,11 @@
 "specials only apply to one of the unit's attacks."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:176
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:165
 msgid "Which units get specialties?"
 msgstr "¿Qué unidades tienen especialidades?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:177
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:166
 msgid ""
 "There are many different specialties, and learning about them is one of the "
 "interesting parts of playing Wesnoth. The two most common specialties are "
@@ -1750,15 +1791,15 @@
 "while next to a unit of higher level with leadership."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:177
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:166
 msgid "What kinds of specialties can my units get?"
 msgstr "¿Qué tipos de especialidades pueden tener mis unidades?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:178
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:167
 msgid "How do I use specialties?"
 msgstr "¿Cómo uso las especialidades?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:178
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:167
 msgid ""
 "To use a specialty, you just have to move and/or attack with your units in a "
 "way which triggers the specialty. For example, in order to use leadership, "
@@ -1766,18 +1807,18 @@
 "the other unit."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:195
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:184
 msgid ""
 "Some objects change the statistics of the unit that triggered them. One of "
 "your units found a potion which will make him do more damage on his attack. "
 "To see his new combat statistics, look at the Status Table."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:202
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:191
 msgid "This potion increases the damage of all the drinker's attacks by four."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:208
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:197
 msgid ""
 "The objects you encounter are put in by the scenario designer, so they vary "
 "from campaign to campaign. In Heir to the Throne, most objects give the unit "
@@ -1785,56 +1826,55 @@
 "objects in a campaign."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:208
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:197
 msgid "What kind of objects am I likely to encounter?"
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:209
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:198
 msgid "How long do these objects last?"
 msgstr "¿Cuánto duran estos objetos?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:209
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:198
 msgid ""
 "Most objects are permanent changes to the unit that receives them. However a "
 "few objects, such as holy water, last only until the remainder of the level."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:223
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:212
 msgid ""
 "Remember to try to prevent the enemy from capturing villages, and to "
 "recapture the ones that they already have. This will cut off their gold "
 "supply and make them unable to recruit."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:250
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:239
 msgid ""
 "Congratulations! You have defeated me, and completed the second and final "
 "training scenario. Next, you may want to begin a campaign, or play "
 "multiplayer."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:254
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:243
 msgid "How do I play a campaign?"
 msgstr "¿Cómo juego una campaña?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:254
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:243
 msgid ""
 "To begin a campaign, run Wesnoth, select 'Campaign', select which campaign "
 "to play, then select Easy, Normal, or Hard. Heir to the Throne is the "
 "suggested for newcomers to Wesnoth."
 msgstr ""
 
-#: data/scenarios/tutorial/tutorial2.cfg:255
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:244
 msgid "How do I play multiplayer?"
 msgstr "¿Cómo juego en modo multijugador?"
 
-#: data/scenarios/tutorial/tutorial2.cfg:255
+#: data/scenarios/tutorial/Traits_and_Specialties.cfg:244
 msgid ""
-"To play Wesnoth against other people, select 'Multiplayer'. If you have the "
-"latest development version of Wesnoth, select 'Join Official Server'. "
-"However, if you have version 1.0, select 'Join Game', then type in 'server."
-"wesnoth.org'. This will connect you to the official Wesnoth server, where "
-"you can join a game by selecting it, then selecting 'Join Game'."
+"To play Wesnoth against other people, select 'Multiplayer'. Then select "
+"'Join Official Server'. This will connect you to the official Wesnoth "
+"server, where you can join a game by selecting it, then selecting 'Join "
+"Game'."
 msgstr ""
 
 #: data/scenarios/tutorial/utils.cfg:11
@@ -1893,13 +1933,17 @@
 msgid "End Turn"
 msgstr "Fin de turno"
 
-#: data/themes/default.cfg:126 data/themes/default.cfg:462
-msgid "hp"
-msgstr "pv"
-
-#: data/themes/default.cfg:133 data/themes/default.cfg:469
-msgid "xp"
-msgstr "px"
+#: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:667
+#: src/display.cpp:902 src/help.cpp:621 src/playturn.cpp:1954
+#: src/unit.cpp:1029
+msgid "HP"
+msgstr "PV"
+
+#: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:671
+#: src/dialogs.cpp:679 src/display.cpp:906 src/display.cpp:914
+#: src/playturn.cpp:1793 src/playturn.cpp:1955 src/unit.cpp:1088
+msgid "XP"
+msgstr "PX"
 
 #: data/themes/default.cfg:142 data/themes/default.cfg:478
 msgid "gold"
@@ -2196,7 +2240,7 @@
 "Este terreno actúa como un castillo, es decir, puede reclutar unidades y que 
"
 "aparezcan en este terreno."
 
-#: data/translations/english.cfg:89 src/help.cpp:874
+#: data/translations/english.cfg:89 src/help.cpp:875
 msgid "or"
 msgstr "o"
 
@@ -2819,10 +2863,13 @@
 #: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
-#: data/units/Drake_Mage.cfg:64 data/units/Drake_Warmage.cfg:74
-#: data/units/Ghost.cfg:20 data/units/Ghost.cfg:32 data/units/Initiate.cfg:20
-#: data/units/Lich.cfg:20 data/units/Lich.cfg:33 data/units/Necromancer.cfg:36
-#: data/units/Spectre.cfg:33 data/units/Wraith.cfg:33
+#: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
+#: data/units/Elvish_Sylph.cfg:83 data/units/Ghost.cfg:20
+#: data/units/Ghost.cfg:32 data/units/Initiate.cfg:20 data/units/Lich.cfg:20
+#: data/units/Lich.cfg:33 data/units/Necromancer.cfg:36
+#: data/units/Saurian_Icecaster.cfg:41 data/units/Saurian_Soothsayer.cfg:40
+#: data/units/Saurian_Tribalist.cfg:40 data/units/Spectre.cfg:33
+#: data/units/Wraith.cfg:33
 msgid "cold"
 msgstr "frío"
 
@@ -2846,11 +2893,12 @@
 #: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:79
 #: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
 #: data/units/Dark_Queen.cfg:29 data/units/Deathmaster.cfg:37
-#: data/units/Demilich.cfg:33 data/units/Drake_Mage.cfg:68
-#: data/units/Drake_Warmage.cfg:78 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
 #: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:63
-#: data/units/Elvish_High_Lord.cfg:38 data/units/Elvish_Lord.cfg:38
-#: data/units/Elvish_Shyde.cfg:26 data/units/Elvish_Shyde.cfg:72
+#: data/units/Elvish_Enchantress.cfg:121 data/units/Elvish_High_Lord.cfg:38
+#: data/units/Elvish_Lord.cfg:38 data/units/Elvish_Shyde.cfg:26
+#: data/units/Elvish_Shyde.cfg:72 data/units/Elvish_Sorceress.cfg:121
+#: data/units/Elvish_Sylph.cfg:26 data/units/Elvish_Sylph.cfg:84
 #: data/units/Fighter.cfg:86 data/units/Fireball.cfg:21
 #: data/units/Great_Mage.cfg:42 data/units/Great_Mage.cfg:118
 #: data/units/Initiate.cfg:21 data/units/Lich.cfg:34 data/units/Lord.cfg:105
@@ -2858,9 +2906,10 @@
 #: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
 #: data/units/Necromancer.cfg:37 data/units/Princess.cfg:79
 #: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
-#: data/units/Sea_Hag.cfg:31 data/units/Silver_Mage.cfg:44
-#: data/units/Silver_Mage.cfg:131 data/units/White_Mage.cfg:47
-#: data/units/White_Mage.cfg:106
+#: data/units/Saurian_Icecaster.cfg:42 data/units/Saurian_Soothsayer.cfg:41
+#: data/units/Saurian_Tribalist.cfg:41 data/units/Sea_Hag.cfg:31
+#: data/units/Silver_Mage.cfg:96 data/units/Silver_Mage.cfg:183
+#: data/units/White_Mage.cfg:47 data/units/White_Mage.cfg:106
 msgid "magical"
 msgstr "mágico"
 
@@ -2873,31 +2922,41 @@
 msgid "ambush,regenerates"
 msgstr ""
 
-#: data/units/Ancient_Wose.cfg:17 data/units/Elder_Wose.cfg:18
+#: data/units/Ancient_Wose.cfg:15
+msgid ""
+"Terrible and awe-inspiring, Ancient Woses are majestic treefolk not to be "
+"trifled with. Fearsome fighters, they resist many attacks while delivering "
+"devastating blows to their enemies. Resembling trees, they blend in with the "
+"forest until they make their attack."
+msgstr ""
+
+#: data/units/Ancient_Wose.cfg:18 data/units/Elder_Wose.cfg:19
 #: data/units/Wose.cfg:19
 msgid "crush"
 msgstr "aplastar"
 
-#: data/units/Ancient_Wose.cfg:18 data/units/Arch_Mage.cfg:24
+#: data/units/Ancient_Wose.cfg:19 data/units/Arch_Mage.cfg:24
 #: data/units/Arch_Mage.cfg:103 data/units/Bandit.cfg:20
 #: data/units/Bone_Shooter.cfg:25 data/units/Cave_Spider.cfg:29
 #: data/units/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:21
-#: data/units/Deathmaster.cfg:20 data/units/Drake_Beak.cfg:38
-#: data/units/Drake_Mage.cfg:20 data/units/Drake_Petit.cfg:38
-#: data/units/Drake_Slasher.cfg:76 data/units/Drake_Warmage.cfg:20
-#: data/units/Drake_Worker.cfg:20 data/units/Dwarvish_Dragonguard.cfg:21
-#: data/units/Dwarvish_Fighter.cfg:37 data/units/Dwarvish_Runemaster.cfg:21
+#: data/units/Deathmaster.cfg:20 data/units/Drake_Gladiator.cfg:58
+#: data/units/Drake_Glider.cfg:23 data/units/Drake_Sky.cfg:27
+#: data/units/Dwarvish_Dragonguard.cfg:21 data/units/Dwarvish_Fighter.cfg:37
+#: data/units/Dwarvish_Lord.cfg:42 data/units/Dwarvish_Runemaster.cfg:21
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
-#: data/units/Elder_Wose.cfg:19 data/units/Elvish_Druid.cfg:23
-#: data/units/Elvish_Druid.cfg:42 data/units/Elvish_Lady.cfg:17
+#: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:23
+#: data/units/Elvish_Druid.cfg:42 data/units/Elvish_Enchantress.cfg:26
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
 #: data/units/Elvish_Shaman.cfg:25 data/units/Elvish_Shaman.cfg:44
 #: data/units/Elvish_Shyde.cfg:25 data/units/Elvish_Shyde.cfg:51
+#: data/units/Elvish_Sorceress.cfg:26 data/units/Elvish_Sorceress.cfg:66
+#: data/units/Elvish_Sylph.cfg:25 data/units/Elvish_Sylph.cfg:52
 #: data/units/Fire_Dragon.cfg:41 data/units/Footpad.cfg:20
 #: data/units/Footpad.cfg:38 data/units/Galleon.cfg:18 data/units/Gate.cfg:24
 #: data/units/Giant_Mudcrawler.cfg:22 data/units/Giant_Mudcrawler.cfg:35
 #: data/units/Giant_Scorpion.cfg:38 data/units/Goblin_Pillager.cfg:36
 #: data/units/Great_Mage.cfg:24 data/units/Great_Mage.cfg:100
-#: data/units/Great_Troll.cfg:21 data/units/Heavy_Infantry.cfg:21
+#: data/units/Great_Troll.cfg:21 data/units/Heavy_Infantry.cfg:22
 #: data/units/Heavy_Infantryman.cfg:20 data/units/Iron_Mauler.cfg:20
 #: data/units/Mage_of_Light.cfg:30 data/units/Mage_of_Light.cfg:90
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
@@ -2905,14 +2964,17 @@
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
 #: data/units/Outlaw_Princess.cfg:24 data/units/Outlaw_Princess.cfg:42
 #: data/units/Outlaw_Queen.cfg:25 data/units/Outlaw_Queen.cfg:43
-#: data/units/Sea_Hag.cfg:29 data/units/Shock_Trooper.cfg:20
-#: data/units/Silver_Mage.cfg:26 data/units/Silver_Mage.cfg:113
-#: data/units/Skeleton_Archer.cfg:24 data/units/Soul_Shooter.cfg:25
-#: data/units/Soulless.cfg:20 data/units/Tentacle.cfg:22
-#: data/units/Thug.cfg:20 data/units/Troll.cfg:21 data/units/Troll_Hero.cfg:21
-#: data/units/Troll_Warrior.cfg:20 data/units/Troll_Whelp.cfg:21
-#: data/units/Walking_Corpse.cfg:20 data/units/Warrior_King.cfg:23
-#: data/units/Wose.cfg:20 data/units/Yeti.cfg:34 data/units/Youth.cfg:22
+#: data/units/Saurian_Icecaster.cfg:23 data/units/Saurian_Soothsayer.cfg:23
+#: data/units/Saurian_Tribalist.cfg:23 data/units/Sea_Hag.cfg:29
+#: data/units/Shock_Trooper.cfg:20 data/units/Silver_Mage.cfg:78
+#: data/units/Silver_Mage.cfg:165 data/units/Skeleton_Archer.cfg:24
+#: data/units/Soul_Shooter.cfg:25 data/units/Soulless.cfg:20
+#: data/units/Tentacle.cfg:22 data/units/Thug.cfg:20 data/units/Troll.cfg:21
+#: data/units/Troll_Hero.cfg:21 data/units/Troll_Rocklobber.cfg:21
+#: data/units/Troll_Rocklobber.cfg:39 data/units/Troll_Warrior.cfg:20
+#: data/units/Troll_Whelp.cfg:21 data/units/Walking_Corpse.cfg:20
+#: data/units/Warrior_King.cfg:23 data/units/Wose.cfg:20
+#: data/units/Yeti.cfg:34 data/units/Youth.cfg:22
 msgid "impact"
 msgstr "impacto"
 
@@ -2929,12 +2991,13 @@
 "enemigos."
 
 #: data/units/Arch_Mage.cfg:23 data/units/Arch_Mage.cfg:102
-#: data/units/Deathmaster.cfg:19 data/units/Drake_Mage.cfg:19
-#: data/units/Drake_Warmage.cfg:19 data/units/Elder_Mage.cfg:22
-#: data/units/Elvish_Druid.cfg:22 data/units/Elvish_Shaman.cfg:24
+#: data/units/Deathmaster.cfg:19 data/units/Elder_Mage.cfg:22
+#: data/units/Elvish_Druid.cfg:22 data/units/Elvish_Enchantress.cfg:25
+#: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
-#: data/units/Necromancer.cfg:19 data/units/Silver_Mage.cfg:25
-#: data/units/Silver_Mage.cfg:112
+#: data/units/Necromancer.cfg:19 data/units/Saurian_Icecaster.cfg:22
+#: data/units/Saurian_Soothsayer.cfg:22 data/units/Saurian_Tribalist.cfg:22
+#: data/units/Silver_Mage.cfg:77 data/units/Silver_Mage.cfg:164
 msgid "staff"
 msgstr "bastón"
 
@@ -2942,17 +3005,17 @@
 #: data/units/Elvish_High_Lord.cfg:36 data/units/Elvish_Lord.cfg:36
 #: data/units/Great_Mage.cfg:39 data/units/Great_Mage.cfg:115
 #: data/units/Red_Mage.cfg:39 data/units/Red_Mage.cfg:108
-#: data/units/Silver_Mage.cfg:41 data/units/Silver_Mage.cfg:128
+#: data/units/Silver_Mage.cfg:93 data/units/Silver_Mage.cfg:180
 msgid "fireball"
 msgstr "bola de fuego"
 
 #: data/units/Arch_Mage.cfg:40 data/units/Arch_Mage.cfg:119
 #: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:121
-#: data/units/Drake_Burner.cfg:44 data/units/Drake_Fighter.cfg:44
-#: data/units/Drake_Fire.cfg:43 data/units/Drake_Flameheart.cfg:22
-#: data/units/Drake_Flameheart.cfg:60 data/units/Drake_Guard.cfg:46
-#: data/units/Drake_Mage.cfg:38 data/units/Drake_Warmage.cfg:43
-#: data/units/Drake_Warrior.cfg:44 data/units/Dwarvish_Runemaster.cfg:38
+#: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
+#: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
+#: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
+#: data/units/Drake_Inferno.cfg:44 data/units/Drake_Sky.cfg:51
+#: data/units/Drake_Warrior.cfg:46 data/units/Dwarvish_Runemaster.cfg:38
 #: data/units/Elder_Mage.cfg:39 data/units/Elvish_High_Lord.cfg:37
 #: data/units/Elvish_Lord.cfg:37 data/units/Fighter.cfg:84
 #: data/units/Fire_Dragon.cfg:59 data/units/Fireball.cfg:18
@@ -2960,8 +3023,8 @@
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/Lord.cfg:103 data/units/Mage.cfg:37 data/units/Mage.cfg:104
 #: data/units/Princess.cfg:77 data/units/Red_Mage.cfg:40
-#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:42
-#: data/units/Silver_Mage.cfg:129
+#: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
+#: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr "fuego"
 
@@ -2971,19 +3034,19 @@
 
 #: data/units/Assassin.cfg:16 data/units/Duelist.cfg:16
 #: data/units/Fencer.cfg:16 data/units/Outlaw_Princess.cfg:17
-#: data/units/Rogue.cfg:16 data/units/Saurian.cfg:17
-#: data/units/Saurian_Warrior.cfg:17
+#: data/units/Rogue.cfg:16 data/units/Saurian.cfg:19
+#: data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr "hostigador"
 
 #: data/units/Assassin.cfg:17
 msgid ""
-"Assassins are masters of the night. Like Rogues, they can backstab and "
-"ignore enemy zones of control. They can also throw poison-tipped knives at "
-"their enemies from long range."
+"Assassins are masters of the night. Like Rogues, they can surround an "
+"opponent and backstab him, doing double damage. They can also throw poison-"
+"tipped knives at their enemies from long range."
 msgstr ""
-"Los asesinos son maestros de la noche. Como los ladrones, pueden apuñalar e "
-"ignorar las zonas de control del enemigo. También pueden lanzar cuchillos "
+"Los asesinos son maestros de la noche. Como los ladrones, pueden rodear y 
apuñalar "
+"a un oponente, haciéndole el doble de daño. También pueden lanzar 
cuchillos "
 "envenenados a sus enemigos a distancia."
 
 #: data/units/Assassin.cfg:20 data/units/Dwarvish_Thunderer.cfg:20
@@ -3001,19 +3064,20 @@
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
 #: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
-#: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:31
+#: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
 #: data/units/Commander.cfg:24 data/units/Commander.cfg:99
 #: data/units/Dark_Spirit.cfg:20 data/units/Death_Knight.cfg:20
 #: data/units/Direwolf_Rider.cfg:19 data/units/Direwolf_Rider.cfg:31
-#: data/units/Dragoon.cfg:28 data/units/Drake_Burner.cfg:21
-#: data/units/Drake_Clasher.cfg:20 data/units/Drake_Fighter.cfg:21
-#: data/units/Drake_Fire.cfg:20 data/units/Drake_Hatchling.cfg:20
-#: data/units/Drake_Slasher.cfg:21 data/units/Drake_Slave.cfg:20
-#: data/units/Drake_Warrior.cfg:21 data/units/Duelist.cfg:21
-#: data/units/Dwarvish_Berserker.cfg:28 data/units/Dwarvish_Fighter.cfg:20
-#: data/units/Dwarvish_Lord.cfg:25 data/units/Dwarvish_Lord.cfg:42
-#: data/units/Dwarvish_Steelclad.cfg:26 data/units/Dwarvish_Thunderer.cfg:21
+#: data/units/Dragoon.cfg:28 data/units/Drake_Burner.cfg:22
+#: data/units/Drake_Clasher.cfg:22 data/units/Drake_Fighter.cfg:22
+#: data/units/Drake_Fire.cfg:25 data/units/Drake_Flameheart.cfg:24
+#: data/units/Drake_Flare.cfg:24 data/units/Drake_Gladiator.cfg:26
+#: data/units/Drake_Inferno.cfg:25 data/units/Drake_Warrior.cfg:22
+#: data/units/Duelist.cfg:21 data/units/Dwarvish_Berserker.cfg:28
+#: data/units/Dwarvish_Fighter.cfg:20 data/units/Dwarvish_Lord.cfg:25
+#: data/units/Dwarvish_Lord.cfg:58 data/units/Dwarvish_Steelclad.cfg:26
+#: data/units/Dwarvish_Thunderer.cfg:21
 #: data/units/Dwarvish_Thunderguard.cfg:21
 #: data/units/Dwarvish_Ulfserker.cfg:28 data/units/Elvish_Archer.cfg:22
 #: data/units/Elvish_Archer.cfg:100 data/units/Elvish_Avenger.cfg:24
@@ -3028,8 +3092,8 @@
 #: data/units/Elvish_Sharpshooter.cfg:101 data/units/Fencer.cfg:21
 #: data/units/Fighter.cfg:21 data/units/Fighter.cfg:62
 #: data/units/Fire_Dragon.cfg:23 data/units/General.cfg:22
-#: data/units/Ghoul.cfg:20 data/units/Goblin_Direwolver.cfg:21
-#: data/units/Goblin_Direwolver.cfg:33 data/units/Goblin_Knight.cfg:19
+#: data/units/Ghoul.cfg:20 data/units/Goblin_Direwolver.cfg:22
+#: data/units/Goblin_Direwolver.cfg:34 data/units/Goblin_Knight.cfg:19
 #: data/units/Grand_Knight.cfg:21 data/units/Gryphon.cfg:19
 #: data/units/Gryphon_Master.cfg:22 data/units/Gryphon_Rider.cfg:20
 #: data/units/Halbardier.cfg:37 data/units/Knight.cfg:21
@@ -3040,7 +3104,7 @@
 #: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
 #: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:19
 #: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
-#: data/units/Orcish_Assassin.cfg:37 data/units/Orcish_Crossbow.cfg:22
+#: data/units/Orcish_Assassin.cfg:37 data/units/Orcish_Crossbow.cfg:23
 #: data/units/Orcish_Crossbowman.cfg:20 data/units/Orcish_Grunt.cfg:20
 #: data/units/Orcish_Leader.cfg:22 data/units/Orcish_Ruler.cfg:22
 #: data/units/Orcish_Shaman.cfg:19 data/units/Orcish_Shaman.cfg:62
@@ -3051,7 +3115,7 @@
 #: data/units/Princess.cfg:61 data/units/Red_Mage.cfg:24
 #: data/units/Red_Mage.cfg:93 data/units/Revenant.cfg:24
 #: data/units/Rogue.cfg:21 data/units/Rogue.cfg:39
-#: data/units/Royal_Guard.cfg:20 data/units/Scout.cfg:21
+#: data/units/Royal_Guard.cfg:20 data/units/Scout.cfg:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
 #: data/units/Skeletal_Dragon.cfg:48 data/units/Skeleton.cfg:25
@@ -3066,7 +3130,7 @@
 
 #: data/units/Assassin.cfg:25 data/units/Nightgaunt.cfg:25
 #: data/units/Rogue.cfg:25 data/units/Shadow.cfg:25 data/units/Thief.cfg:24
-#: src/actions.cpp:487
+#: src/actions.cpp:490
 msgid "backstab"
 msgstr "puñalada"
 
@@ -3077,7 +3141,7 @@
 #: data/units/Assassin.cfg:50 data/units/Cave_Spider.cfg:24
 #: data/units/Cuttle_Fish.cfg:36 data/units/Direwolf_Rider.cfg:35
 #: data/units/Ghoul.cfg:24 data/units/Giant_Scorpion.cfg:22
-#: data/units/Goblin_Direwolver.cfg:37 data/units/Necrophage.cfg:24
+#: data/units/Goblin_Direwolver.cfg:38 data/units/Necrophage.cfg:24
 #: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
 msgid "poison"
 msgstr "veneno"
@@ -3088,19 +3152,19 @@
 
 #: data/units/Bandit.cfg:16
 msgid ""
-"Armed with heavy mace, Bandits are adept at robbing and killing at night."
+"Armed with a heavy mace, Bandits are adept at robbing and killing at night. "
+"Wearing brown cloaks and black hoods, they steal from the peasants who live "
+"near them when not fighting against invaders."
 msgstr ""
-"Armados con mazas, los bandidos son especialmente buenos matando y robando "
-"de noche."
 
-#: data/units/Bandit.cfg:19 data/units/Drake_Slasher.cfg:75
-#: data/units/Drake_Worker.cfg:19 data/units/Great_Troll.cfg:20
-#: data/units/Heavy_Infantry.cfg:20 data/units/Heavy_Infantryman.cfg:19
-#: data/units/Iron_Mauler.cfg:19 data/units/Mage_of_Light.cfg:29
-#: data/units/Mage_of_Light.cfg:89 data/units/Outlaw.cfg:20
-#: data/units/Outlaw.cfg:93 data/units/Outlaw_Princess.cfg:23
-#: data/units/Outlaw_Queen.cfg:24 data/units/Shock_Trooper.cfg:19
-#: data/units/Troll_Warrior.cfg:19 data/units/Warrior_King.cfg:22
+#: data/units/Bandit.cfg:19 data/units/Drake_Gladiator.cfg:57
+#: data/units/Great_Troll.cfg:20 data/units/Heavy_Infantry.cfg:21
+#: data/units/Heavy_Infantryman.cfg:19 data/units/Iron_Mauler.cfg:19
+#: data/units/Mage_of_Light.cfg:29 data/units/Mage_of_Light.cfg:89
+#: data/units/Outlaw.cfg:20 data/units/Outlaw.cfg:93
+#: data/units/Outlaw_Princess.cfg:23 data/units/Outlaw_Queen.cfg:24
+#: data/units/Shock_Trooper.cfg:19 data/units/Troll_Warrior.cfg:19
+#: data/units/Warrior_King.cfg:22
 msgid "mace"
 msgstr "maza"
 
@@ -3113,36 +3177,35 @@
 msgid "leadership,skirmisher"
 msgstr "liderazgo,hostigadora"
 
-#: data/units/Battle_Princess.cfg:19 data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:19
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
-"great combatant and leader. The units of lower level around the Princess "
-"will fight better due to her presence. The Princess is a skilled skirmisher, "
-"and ignores enemy zones of control."
+"great combatant and leader. Now battle-hardened and strong of will, they can "
+"now aid those around them in the art of combat."
 msgstr ""
-"Noble de nacimiento, la Princesa ha aprendido esgrima con los más grandes "
-"generales, y tácticas con los más grandes sabios, convirtiéndola tanto en "
-"una gran luchadora como en una gran líder. Las unidades de nivel más bajo "
-"que la rodeen lucharán mejor gracias a su presencia. La Princesa es una "
-"hábil hostigadora, e ignora las zonas de control."
+"Noble de nacimiento, la princesa ha aprendido esgrima con los más grandes "
+"generales, y tácticas con los más grandes sabios, convirtiéndola en "
+"una gran luchadora y líder. Curtida en la batalla y de voluntad fuerte, 
ayuda "
+"a aquellos que la rodean a combatir mejor gracias a su presencia."
 
 #: data/units/Battle_Princess.cfg:22 data/units/Battle_Princess.cfg:60
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
-#: data/units/Cavalry.cfg:30 data/units/Cavalryman.cfg:28
+#: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
-#: data/units/Dragoon.cfg:27 data/units/Drake_Clasher.cfg:19
-#: data/units/Drake_Fighter.cfg:20 data/units/Drake_Slasher.cfg:20
-#: data/units/Drake_Warrior.cfg:20 data/units/Elvish_Archer.cfg:21
-#: data/units/Elvish_Archer.cfg:99 data/units/Elvish_Avenger.cfg:23
-#: data/units/Elvish_Avenger.cfg:96 data/units/Elvish_Captain.cfg:23
-#: data/units/Elvish_Champion.cfg:21 data/units/Elvish_Fighter.cfg:23
-#: data/units/Elvish_Hero.cfg:21 data/units/Elvish_High_Lord.cfg:20
-#: data/units/Elvish_Lord.cfg:20 data/units/Elvish_Marksman.cfg:21
-#: data/units/Elvish_Marksman.cfg:99 data/units/Elvish_Marshal.cfg:24
-#: data/units/Elvish_Outrider.cfg:23 data/units/Elvish_Ranger.cfg:21
-#: data/units/Elvish_Ranger.cfg:98 data/units/Elvish_Rider.cfg:30
-#: data/units/Elvish_Scout.cfg:31 data/units/Elvish_Sharpshooter.cfg:21
+#: data/units/Dragoon.cfg:27 data/units/Drake_Clasher.cfg:21
+#: data/units/Drake_Flameheart.cfg:23 data/units/Drake_Flare.cfg:23
+#: data/units/Drake_Gladiator.cfg:25 data/units/Drake_Warrior.cfg:21
+#: data/units/Elvish_Archer.cfg:21 data/units/Elvish_Archer.cfg:99
+#: data/units/Elvish_Avenger.cfg:23 data/units/Elvish_Avenger.cfg:96
+#: data/units/Elvish_Captain.cfg:23 data/units/Elvish_Champion.cfg:21
+#: data/units/Elvish_Fighter.cfg:23 data/units/Elvish_Hero.cfg:21
+#: data/units/Elvish_High_Lord.cfg:20 data/units/Elvish_Lord.cfg:20
+#: data/units/Elvish_Marksman.cfg:21 data/units/Elvish_Marksman.cfg:99
+#: data/units/Elvish_Marshal.cfg:24 data/units/Elvish_Outrider.cfg:23
+#: data/units/Elvish_Ranger.cfg:21 data/units/Elvish_Ranger.cfg:98
+#: data/units/Elvish_Rider.cfg:30 data/units/Elvish_Scout.cfg:31
+#: data/units/Elvish_Sharpshooter.cfg:21
 #: data/units/Elvish_Sharpshooter.cfg:100 data/units/Fighter.cfg:20
 #: data/units/Fighter.cfg:61 data/units/General.cfg:21
 #: data/units/Grand_Knight.cfg:19 data/units/Knight.cfg:20
@@ -3155,12 +3218,26 @@
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
 #: data/units/Princess.cfg:22 data/units/Princess.cfg:60
-#: data/units/Royal_Guard.cfg:19 data/units/Scout.cfg:20
+#: data/units/Royal_Guard.cfg:19 data/units/Scout.cfg:21
 #: data/units/Sea_Orc.cfg:19 data/units/Sergeant.cfg:21
 #: data/units/Swordsman.cfg:19
 msgid "sword"
 msgstr "espada"
 
+#: data/units/Battle_Princess.cfg:57
+msgid ""
+"A noble at birth, the princess has learnt swordplay with the greatest "
+"generals, and battle tactics with the greatest sages, making her both a "
+"great combatant and leader. The units of lower level around the Princess "
+"will fight better due to her presence. The Princess is a skilled skirmisher, "
+"and ignores enemy zones of control."
+msgstr ""
+"Noble de nacimiento, la Princesa ha aprendido esgrima con los más grandes "
+"generales, y tácticas con los más grandes sabios, convirtiéndola tanto en "
+"una gran luchadora como en una gran líder. Las unidades de nivel más bajo "
+"que la rodeen lucharán mejor gracias a su presencia. La princesa es una "
+"hábil hostigadora, e ignora las zonas de control."
+
 #: data/units/Battle_Princess.cfg:76 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
 #: data/units/Princess.cfg:76
@@ -3175,16 +3252,17 @@
 msgid ""
 "Blood Bats are fast and can drain the blood of those they attack, thereby "
 "healing themselves, even to the point where they become stronger than they "
-"began the battle! Such is their fury that the fur of these undead flying "
+"began the battle. Such is their fury that the fur of these undead flying "
 "beasts is tainted red with the blood of their victims."
 msgstr ""
 "La piel de este no muerto volador está teñida con la sangre de sus 
víctimas. "
-"El chupasangre es rápido, y puede drenar la sangre de los que ataca, "
-"curándose así él mismo. ¡A traves de su drenaje, puede acabar más fuerte 
que "
-"al principio de la batalla!"
+"Los chupasangres son rápidos, y pueden absorber la sangre de aquellos a los 
que atacan, "
+"curándose a sí mismos, hasta el punto de que pueden acabar más fuertes que 
"
+"al principio de la batalla. Es tal la furia de estas bestias voladoras no 
muertas que "
+"su piel está teñida del rojo de la sangre de sus víctimas."
 
 #: data/units/Blood_Bat.cfg:19 data/units/Cave_Spider.cfg:19
-#: data/units/Direwolf_Rider.cfg:18 data/units/Goblin_Direwolver.cfg:20
+#: data/units/Direwolf_Rider.cfg:18 data/units/Goblin_Direwolver.cfg:21
 #: data/units/Goblin_Knight.cfg:18 data/units/Sea_Serpent.cfg:19
 #: data/units/Vampire_Bat.cfg:19 data/units/Wolf_Rider.cfg:20
 msgid "fangs"
@@ -3205,8 +3283,8 @@
 
 #: data/units/Bone_Shooter.cfg:24 data/units/Giant_Mudcrawler.cfg:33
 #: data/units/Skeleton_Archer.cfg:23 data/units/Soulless.cfg:19
-#: data/units/Troll_Whelp.cfg:20 data/units/Walking_Corpse.cfg:19
-#: data/units/Yeti.cfg:33
+#: data/units/Troll_Rocklobber.cfg:20 data/units/Troll_Whelp.cfg:20
+#: data/units/Walking_Corpse.cfg:19 data/units/Yeti.cfg:33
 msgid "fist"
 msgstr "puño"
 
@@ -3233,12 +3311,12 @@
 #: data/units/Cavalier.cfg:49 data/units/Chocobone.cfg:21
 #: data/units/Commander.cfg:46 data/units/Cuttle_Fish.cfg:27
 #: data/units/Death_Knight.cfg:37 data/units/Dragoon.cfg:49
-#: data/units/Drake_Clasher.cfg:52 data/units/Drake_Guard.cfg:23
-#: data/units/Drake_Slasher.cfg:53 data/units/Duelist.cfg:32
-#: data/units/Dwarvish_Dragonguard.cfg:39 data/units/Dwarvish_Guardsman.cfg:26
-#: data/units/Dwarvish_Guardsman.cfg:39 data/units/Dwarvish_Sentinel.cfg:28
-#: data/units/Dwarvish_Sentinel.cfg:41 data/units/Dwarvish_Stalwart.cfg:28
-#: data/units/Dwarvish_Stalwart.cfg:41 data/units/Dwarvish_Thunderer.cfg:41
+#: data/units/Drake_Clasher.cfg:40 data/units/Drake_Gladiator.cfg:44
+#: data/units/Duelist.cfg:32 data/units/Dwarvish_Dragonguard.cfg:39
+#: data/units/Dwarvish_Guardsman.cfg:26 data/units/Dwarvish_Guardsman.cfg:39
+#: data/units/Dwarvish_Sentinel.cfg:28 data/units/Dwarvish_Sentinel.cfg:41
+#: data/units/Dwarvish_Stalwart.cfg:28 data/units/Dwarvish_Stalwart.cfg:41
+#: data/units/Dwarvish_Thunderer.cfg:41
 #: data/units/Dwarvish_Thunderguard.cfg:47 data/units/Elvish_Archer.cfg:39
 #: data/units/Elvish_Archer.cfg:117 data/units/Elvish_Avenger.cfg:40
 #: data/units/Elvish_Avenger.cfg:113 data/units/Elvish_Captain.cfg:40
@@ -3251,27 +3329,29 @@
 #: data/units/Elvish_Sharpshooter.cfg:39
 #: data/units/Elvish_Sharpshooter.cfg:118 data/units/Elvish_Shyde.cfg:71
 #: data/units/General.cfg:45 data/units/Giant_Scorpion.cfg:20
+#: data/units/Goblin_Impaler.cfg:21 data/units/Goblin_Impaler.cfg:39
+#: data/units/Goblin_Spearman.cfg:21 data/units/Goblin_Spearman.cfg:33
 #: data/units/Grand_Knight.cfg:37 data/units/Halbardier.cfg:19
 #: data/units/Horseman.cfg:21 data/units/Knight.cfg:37
 #: data/units/Lancer.cfg:21 data/units/Lieutenant.cfg:39
 #: data/units/Longbowman.cfg:39 data/units/Lord.cfg:40
 #: data/units/Master_Bowman.cfg:33 data/units/Merman.cfg:20
-#: data/units/Merman_Lord.cfg:21 data/units/Naga.cfg:21
+#: data/units/Merman_Lord.cfg:22 data/units/Naga.cfg:21
 #: data/units/Noble_Commander.cfg:42 data/units/Noble_Lord.cfg:41
-#: data/units/Orcish_Archer.cfg:37 data/units/Orcish_Crossbow.cfg:40
+#: data/units/Orcish_Archer.cfg:37 data/units/Orcish_Crossbow.cfg:41
 #: data/units/Orcish_Crossbowman.cfg:39 data/units/Orcish_Leader.cfg:38
 #: data/units/Orcish_Ruler.cfg:39 data/units/Orcish_Shaman.cfg:26
 #: data/units/Orcish_Shaman.cfg:69 data/units/Orcish_Shaman.cfg:112
 #: data/units/Orcish_Sovereign.cfg:43 data/units/Orcish_Warlord.cfg:30
 #: data/units/Paladin.cfg:42 data/units/Peasant.cfg:21
 #: data/units/Peasant.cfg:34 data/units/Pikeman.cfg:20
-#: data/units/Pirate_Galleon.cfg:62 data/units/Poacher.cfg:42
-#: data/units/Saurian.cfg:21 data/units/Saurian.cfg:38
-#: data/units/Saurian_Warrior.cfg:21 data/units/Saurian_Warrior.cfg:38
+#: data/units/Pirate_Galleon.cfg:16 data/units/Poacher.cfg:42
+#: data/units/Saurian.cfg:23 data/units/Saurian.cfg:40
+#: data/units/Saurian_Warrior.cfg:23 data/units/Saurian_Warrior.cfg:40
 #: data/units/Sea_Hag.cfg:21 data/units/Sea_Serpent.cfg:20
 #: data/units/Sergeant.cfg:39 data/units/Skeleton_Archer.cfg:41
 #: data/units/Soul_Shooter.cfg:38 data/units/Spearman.cfg:20
-#: data/units/Spearman.cfg:33 data/units/Transport_Galleon.cfg:16
+#: data/units/Spearman.cfg:33 data/units/Transport_Galleon.cfg:17
 #: data/units/Trapper.cfg:42 data/units/Triton.cfg:20
 #: data/units/Vampire_Lady.cfg:34 data/units/Wall_Guard.cfg:36
 #: data/units/Watch_Tower.cfg:18
@@ -3283,9 +3363,12 @@
 msgstr "Arquero"
 
 #: data/units/Bowman.cfg:17
+#, fuzzy
 msgid ""
 "Immersed from childhood in the ways of archery, the young Bowmen are the "
-"most common ranged combatants in Wesnothian armies."
+"most common ranged combatants in Wesnothian armies. They do not undergo as "
+"rigorous a training as the spearman or heavy infantry, because their battle "
+"tactic requires more finess than brute strength."
 msgstr ""
 "Entrenados desde la infancia en el tiro, los jóvenes arqueros son las tropas 
"
 "de apoyo de largo alcance más comunes entre los ejércitos de Wesnoth."
@@ -3297,8 +3380,8 @@
 #: data/units/Cavalier.cfg:24
 msgid ""
 "Only the most experienced and heroic Dragoons can achieve to ride the "
-"battlefield as Cavaliers. Armed with magic pistol artifacts, keen swords and "
-"fine armours are one of the best troops mounted in all know world."
+"battlefield as Cavaliers. Armed with magical artifacts, keen swords and fine "
+"armours, they are one of the best mounted troops in all know world."
 msgstr ""
 
 #: data/units/Cavalier.cfg:48 data/units/Dragoon.cfg:48
@@ -3312,8 +3395,9 @@
 #: data/units/Cavalryman.cfg:25
 msgid ""
 "The best riders in Wesnoth are recruited into the military to become "
-"Cavalrymen. This strictly disciplined force is especially suited to "
-"capturing and holding villages."
+"Cavalrymen. A Cavalryman, strictly disciplined, does not charge across the "
+"field of battle like a horseman, but makes more of an effort to hold his "
+"position."
 msgstr ""
 
 #: data/units/Cave_Spider.cfg:3
@@ -3336,41 +3420,44 @@
 msgstr "telaraña"
 
 #: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:43
-#: data/units/Elvish_Shaman.cfg:45 data/units/Elvish_Shyde.cfg:52
-#: data/units/Goblin_Pillager.cfg:37
+#: data/units/Elvish_Enchantress.cfg:67 data/units/Elvish_Shaman.cfg:45
+#: data/units/Elvish_Shyde.cfg:52 data/units/Elvish_Sorceress.cfg:67
+#: data/units/Elvish_Sylph.cfg:53 data/units/Goblin_Pillager.cfg:37
 msgid "slow"
 msgstr "ralentiza"
 
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
-msgstr "Chocobone"
+msgstr "Chocobo"
 
 #: data/units/Chocobone.cfg:17
+#, fuzzy
 msgid ""
 "Riding the bones of ostrich-like large birds once used as mounts by a lost "
-"civilization, the skeleton Chocobones can move faster than most cavalry "
+"civilization, the skeletal Chocobones can move faster than most cavalry "
 "units."
 msgstr ""
-"Montando en el esqueleto de una gran ave usada por una antigua y olvidada "
-"civilización, los Chocobones se pueden mover más rápido que muchas otras "
+"Montando los esqueletos de unas grandes aves usadas una vez por una antigua y 
olvidada "
+"civilización, los chocobos se pueden mover más rápido que muchas otras "
 "unidades de caballería."
 
-#: data/units/Chocobone.cfg:20 data/units/Drake_Clasher.cfg:51
-#: data/units/Drake_Guard.cfg:22 data/units/Drake_Slasher.cfg:52
-#: data/units/Dwarvish_Guardsman.cfg:24 data/units/Dwarvish_Guardsman.cfg:38
-#: data/units/Dwarvish_Sentinel.cfg:26 data/units/Dwarvish_Sentinel.cfg:40
-#: data/units/Dwarvish_Stalwart.cfg:26 data/units/Dwarvish_Stalwart.cfg:40
-#: data/units/Horseman.cfg:20 data/units/Saurian.cfg:19
-#: data/units/Saurian.cfg:36 data/units/Saurian_Warrior.cfg:19
-#: data/units/Saurian_Warrior.cfg:36 data/units/Spearman.cfg:19
-#: data/units/Spearman.cfg:32
+#: data/units/Chocobone.cfg:20 data/units/Drake_Clasher.cfg:39
+#: data/units/Drake_Gladiator.cfg:43 data/units/Dwarvish_Guardsman.cfg:24
+#: data/units/Dwarvish_Guardsman.cfg:38 data/units/Dwarvish_Sentinel.cfg:26
+#: data/units/Dwarvish_Sentinel.cfg:40 data/units/Dwarvish_Stalwart.cfg:26
+#: data/units/Dwarvish_Stalwart.cfg:40 data/units/Goblin_Impaler.cfg:20
+#: data/units/Goblin_Impaler.cfg:38 data/units/Goblin_Spearman.cfg:20
+#: data/units/Goblin_Spearman.cfg:32 data/units/Horseman.cfg:20
+#: data/units/Saurian.cfg:21 data/units/Saurian.cfg:38
+#: data/units/Saurian_Warrior.cfg:21 data/units/Saurian_Warrior.cfg:38
+#: data/units/Spearman.cfg:19 data/units/Spearman.cfg:32
 msgid "spear"
 msgstr "lanza"
 
 #: data/units/Chocobone.cfg:23 data/units/Grand_Knight.cfg:38
 #: data/units/Horseman.cfg:22 data/units/Knight.cfg:38
-#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:360
-#: src/actions.cpp:478
+#: data/units/Lancer.cfg:22 data/units/Paladin.cfg:43 src/actions.cpp:363
+#: src/actions.cpp:481
 msgid "charge"
 msgstr "carga"
 
@@ -3379,20 +3466,21 @@
 msgstr "Basilisco"
 
 #: data/units/Cockatrice.cfg:16
+#, fuzzy
 msgid ""
 "At first sight, these mystical snake-like creatures appear weak, but looks "
 "are deceiving. With just a glance at their enemies, Cockatrices can turn "
-"them into stone!"
+"them into stone until the source of their power is destroyed."
 msgstr ""
-"A bote pronto, estas místicas criaturas parecidas a una serpiente quizá "
+"A bote pronto, estas criaturas místicas parecidas a una serpiente quizá "
 "parezcan débiles, pero las apariencias engañan: ¡con sólo mirar a sus "
-"enemigos los convierten en piedra!"
+"enemigos los convierten en piedra! La única cura es destruir su fuente de 
poder."
 
 #: data/units/Cockatrice.cfg:21
 msgid "gaze"
 msgstr "mirada"
 
-#: data/units/Cockatrice.cfg:26 src/actions.cpp:717 src/actions.cpp:857
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:728 src/actions.cpp:876
 #: src/reports.cpp:122
 msgid "stone"
 msgstr "piedra"
@@ -3402,7 +3490,8 @@
 msgstr "Comandante"
 
 #: data/units/Commander.cfg:11 data/units/Commander.cfg:86
-#: data/units/Death_Knight.cfg:14 data/units/Elvish_Captain.cfg:11
+#: data/units/Death_Knight.cfg:14 data/units/Drake_Flameheart.cfg:16
+#: data/units/Drake_Flare.cfg:11 data/units/Elvish_Captain.cfg:11
 #: data/units/Elvish_Marshal.cfg:12 data/units/Fire_Dragon.cfg:7
 #: data/units/General.cfg:16 data/units/Lieutenant.cfg:16
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
@@ -3410,12 +3499,20 @@
 #: data/units/Orcish_Leader.cfg:9 data/units/Orcish_Ruler.cfg:9
 #: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:17
 #: data/units/Princess.cfg:55 data/units/Sergeant.cfg:17
-#: data/units/Warrior_King.cfg:17 src/actions.cpp:350 src/actions.cpp:468
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:353 src/actions.cpp:471
 msgid "leadership"
 msgstr "liderazgo"
 
-#: data/units/Commander.cfg:20 data/units/Commander.cfg:95
-#: data/units/Noble_Commander.cfg:19
+#: data/units/Commander.cfg:20
+msgid ""
+"The rank of Commander is held by those who lead battle groups into combat. "
+"Possessing leadership skills, they give lower-level units improved "
+"performance in combat. Commanders are best skilled with the sword, although "
+"they also carry a bow to use when necessary. If the Commander is lost, so is "
+"the battle."
+msgstr ""
+
+#: data/units/Commander.cfg:95 data/units/Noble_Commander.cfg:19
 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 "
@@ -3454,10 +3551,13 @@
 #: data/units/Dark_Adept.cfg:19
 msgid ""
 "Dark Adepts are psychotic fanatics who dabble in black magic, using its "
-"power to cause death and destruction."
+"power to cause death and destruction. They devote themselves completely to "
+"the study of this magic, not bothering to learn how to defend themselves in "
+"close combat."
 msgstr ""
 "Practicantes de la Magia Negra, los adeptos oscuros son psicóticos 
fanáticos "
-"que usan sus poderes para causar muerte y destrucción."
+"que usan sus poderes para causar muerte y destrucción. Están completamente 
dedicados "
+"al estudio de esta magia, sin preocuparse en aprender cómo defenderse en 
combate cuerpo a cuerpo."
 
 #: data/units/Dark_Adept.cfg:22 data/units/Necromancer.cfg:35
 msgid "chill wave"
@@ -3469,7 +3569,7 @@
 
 #: data/units/Dark_Queen.cfg:15
 msgid ""
-"Asheviere, the evil queen mother has terrorized Wesnoth for many years. Her "
+"The evil queen mother Asheviere has terrorized Wesnoth for many years. Her "
 "knowledge of magic makes her a worthy foe in combat, although her power is "
 "mostly derived from those she commands."
 msgstr ""
@@ -3507,9 +3607,12 @@
 msgstr "Caballero de la Muerte"
 
 #: data/units/Death_Knight.cfg:16
+#, fuzzy
 msgid ""
-"Sometimes the mightiest warriors and generals, cursed with hate and angst, "
-"came back to this world as Death Knights."
+"Sometimes the mightiest warriors and generals, cursed with hate and a sense "
+"of betrayal, came back to this world as Death Knights. Wielding the same "
+"weapons as they did before, they command the Undead in their quest for "
+"revenge."
 msgstr ""
 "A veces, los mejores guerreros y generales, malditos con el odio y la furia, "
 "vuelven a este mundo como Caballeros de la Muerte."
@@ -3521,7 +3624,7 @@
 
 #: data/units/Death_Knight.cfg:36 data/units/Duelist.cfg:31
 #: data/units/General.cfg:44 data/units/Lieutenant.cfg:38
-#: data/units/Orcish_Crossbow.cfg:39 data/units/Orcish_Crossbowman.cfg:38
+#: data/units/Orcish_Crossbow.cfg:40 data/units/Orcish_Crossbowman.cfg:38
 #: data/units/Sergeant.cfg:38 data/units/Wall_Guard.cfg:35
 msgid "crossbow"
 msgstr "ballesta"
@@ -3570,10 +3673,9 @@
 "enemies."
 msgstr ""
 
-#: data/units/Direwolf_Rider.cfg:30 data/units/Drake_Burner.cfg:20
-#: data/units/Drake_Fire.cfg:19 data/units/Drake_Flameheart.cfg:20
-#: data/units/Drake_Hatchling.cfg:19 data/units/Drake_Slave.cfg:19
-#: data/units/Ghoul.cfg:19 data/units/Goblin_Direwolver.cfg:32
+#: data/units/Direwolf_Rider.cfg:30 data/units/Drake_Burner.cfg:21
+#: data/units/Drake_Fire.cfg:24 data/units/Drake_Inferno.cfg:24
+#: data/units/Ghoul.cfg:19 data/units/Goblin_Direwolver.cfg:33
 #: data/units/Gryphon.cfg:18 data/units/Gryphon_Master.cfg:21
 #: data/units/Gryphon_Rider.cfg:19 data/units/Necrophage.cfg:19
 #: data/units/Nightgaunt.cfg:20 data/units/Shadow.cfg:20
@@ -3587,114 +3689,195 @@
 
 #: data/units/Dragoon.cfg:24
 msgid ""
-"Riding fast horses and armed with sword and magical pistol artifacts, "
-"Dragoons make versatile troops."
+"Riding a fast horse and armed with sword and a magical artifact, a Dragoon "
+"make a versatile enemy."
 msgstr ""
 "Montados en veloces caballos y armados con espada y pistolas mágicas, los "
-"dragones son unas tropas muy versátiles."
-
-#: data/units/Drake_Beak.cfg:3
-msgid "Drake Beak"
-msgstr ""
-
-#: data/units/Drake_Beak.cfg:16
-msgid ""
-"Smaller than most Drakes, the Beaks are therefore more agile and can fight "
-"even when flying."
-msgstr ""
+"dragones pueden ser unos enemigos muy versátiles."
 
-#: data/units/Drake_Beak.cfg:37 data/units/Drake_Petit.cfg:37
-msgid "beak"
-msgstr "pico"
-
-#: data/units/Drake_Burner.cfg:3
+#: data/units/Drake_Burner.cfg:4
 msgid "Drake Burner"
 msgstr "Draco incendiario"
 
-#: data/units/Drake_Burner.cfg:17
+#: data/units/Drake_Burner.cfg:18
 msgid ""
-"Not only can the Drake Burners wield their claws with deadly skill, but they "
-"possess the fire-breathing abilities of their remote ancestors. Enemies are "
-"well advised to keep their distance."
+"Not only can a Drake Burner wield its claws with deadly skill, but it still "
+"possesses the fire-breathing abilities of its remote ancestors. Enemies "
+"would be well advised to keep their distance. The most skilled Burners will "
+"often go on to become Fire Drakes who seek to master their internal fire, or "
+"Drake Flares who aspire to be leaders of their kind."
 msgstr ""
 
-#: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:42
-#: data/units/Drake_Fire.cfg:41 data/units/Drake_Flameheart.cfg:58
-#: data/units/Drake_Guard.cfg:44 data/units/Drake_Mage.cfg:36
-#: data/units/Drake_Warmage.cfg:41 data/units/Drake_Warrior.cfg:42
-#: data/units/Fire_Dragon.cfg:57
+#: data/units/Drake_Burner.cfg:40 data/units/Drake_Fighter.cfg:44
+#: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
+#: data/units/Drake_Flare.cfg:42 data/units/Drake_Glider.cfg:45
+#: data/units/Drake_Inferno.cfg:42 data/units/Drake_Sky.cfg:49
+#: data/units/Drake_Warrior.cfg:44 data/units/Fire_Dragon.cfg:57
 msgid "fire breath"
 msgstr "aliento de fuego"
 
-#: data/units/Drake_Clasher.cfg:3
+#: data/units/Drake_Clasher.cfg:4
 msgid "Drake Clasher"
 msgstr ""
 
-#: data/units/Drake_Fighter.cfg:3
+#: data/units/Drake_Clasher.cfg:18
+msgid ""
+"With their stumpy vestigial wings and inability to use their great internal "
+"fire as a weapon some may think that these Drakes are disadvantaged, they "
+"would be mistaken. To compensate they have become great craftsmen that can "
+"fabricate weapons with emerald edges, and wear heavy armour. The Clashers' "
+"weapons of choice are the sword and spear, which they use to great effect. "
+"The greatest Clashers can become Drake Gladiators or Slashers."
+msgstr ""
+
+#: data/units/Drake_Fighter.cfg:4
 msgid "Drake Fighter"
 msgstr "Luchador draco"
 
-#: data/units/Drake_Fire.cfg:3
+#: data/units/Drake_Fighter.cfg:18
+msgid ""
+"Drake Fighters wield curved scimitars with deadly skill, and possess the "
+"fire breathing skills of their ancestors. The most skilled Fighters go on to "
+"join the ranks of the elite Drake Warriors."
+msgstr ""
+
+#: data/units/Drake_Fighter.cfg:21
+msgid "scimitar"
+msgstr ""
+
+#: data/units/Drake_Fire.cfg:4
 msgid "Fire Drake"
 msgstr "Draco de fuego"
 
-#: data/units/Drake_Flameheart.cfg:3
+#: data/units/Drake_Fire.cfg:18
+msgid ""
+"The great fire drakes equip themselves with silver plated armour to defend "
+"themselves from serious injuries. Although their melee technique is "
+"primitive, they have mastered their internal fire and are to be feared. The "
+"most ferocious Fire Drakes become the flying configurations known as Drake "
+"Infernos."
+msgstr ""
+
+#: data/units/Drake_Flameheart.cfg:4
 msgid "Drake Flameheart"
 msgstr "Corazón de fuego draco"
 
-#: data/units/Drake_Guard.cfg:3
-msgid "Drake Guard"
-msgstr "Draco guardián"
+#: data/units/Drake_Flameheart.cfg:20
+msgid ""
+"There is an old saying that, 'The generals in Drake armies have fire in "
+"their veins instead of blood'. Nobody would doubt the truth in that saying "
+"after facing these towering creatures of sheer devastation... However, "
+"butween their crackling flames and their wicked swords, few who meet them "
+"survive to confirm this saying."
+msgstr ""
 
-#: data/units/Drake_Hatchling.cfg:3
-msgid "Drake Hatchling"
+#: data/units/Drake_Flare.cfg:4
+#, fuzzy
+msgid "Drake Flare"
+msgstr "Esclavo draco"
+
+#: data/units/Drake_Flare.cfg:20
+msgid ""
+"Drake Flares aspire to be leaders of their kind. While their mastery of "
+"their internal fire is not as great as some of their kin these Drakes have "
+"broader asperations. They are skilled with swords, and they aspire to be the "
+"greatest of their kind."
 msgstr ""
 
-#: data/units/Drake_Mage.cfg:3
-msgid "Drake Mage"
-msgstr "Draco mago"
+#: data/units/Drake_Gladiator.cfg:4
+msgid "Drake Gladiator"
+msgstr "Gladiador draco"
 
-#: data/units/Drake_Mage.cfg:16
-msgid "Like all Mages, the Drake Mages are capable of using magic in battle."
-msgstr "Como todos los magos, el mago draco es capaz de usar magia en combate."
+#: data/units/Drake_Gladiator.cfg:19
+msgid ""
+"With their stumpy vestigial wings and inability to use their great internal "
+"fire as a weapon some may think that these Drakes are disadvantaged, they "
+"would be mistaken. Drakes Gladiators protect their vulnerable hides with "
+"thick brass armour and they arm themselves with as many emerald edged "
+"weapons as possible to fend off whatever opponents may await them."
+msgstr ""
 
-#: data/units/Drake_Mage.cfg:63 data/units/Drake_Warmage.cfg:73
-msgid "ice shot"
-msgstr "golpe de hielo"
+#: data/units/Drake_Glider.cfg:4
+#, fuzzy
+msgid "Drake Glider"
+msgstr "Luchador draco"
 
-#: data/units/Drake_Petit.cfg:3
-msgid "Drake Petit"
-msgstr "Pequeño draco"
+#: data/units/Drake_Glider.cfg:19
+msgid ""
+"Drake Gliders wear as little armour as possible so they can quickly escape "
+"their foes when they leave their caves. These Drakes are compotent fighters, "
+"possesing the internal fire common to many of their kin. Gliders can also "
+"effectively use their speed to viciously slam their opponents into "
+"submission. The best gliders can look forward to being accepted into the "
+"ranks of the high flying Sky Drakes."
+msgstr ""
 
-#: data/units/Drake_Slasher.cfg:3
-msgid "Drake Slasher"
+#: data/units/Drake_Glider.cfg:22 data/units/Drake_Sky.cfg:26
+#, fuzzy
+msgid "slam"
+msgstr "Isla"
+
+#: data/units/Drake_Inferno.cfg:4
+#, fuzzy
+msgid "Inferno Drake"
+msgstr "Draco de fuego"
+
+#: data/units/Drake_Inferno.cfg:18
+msgid ""
+"The flying configurations known as Drake Infernos wear massive gold armour "
+"that is almost impenetrable. These drakes are also practically immune to "
+"fire as they have adjusted to hiding in the cones of volcanoes. Drake "
+"Infernos have utterly mastered their internal fire, and rival their "
+"predecessors the Dragons in their ability to use it."
 msgstr ""
 
-#: data/units/Drake_Slave.cfg:3
-msgid "Drake Slave"
-msgstr "Esclavo draco"
+#: data/units/Drake_Sky.cfg:3
+#, fuzzy
+msgid "Sky Drake"
+msgstr "Draco de fuego"
 
-#: data/units/Drake_Slave.cfg:16
-msgid "Drake Slaves are servile members of this reptilian race."
+#: data/units/Drake_Slasher.cfg:4
+msgid "Drake Slasher"
 msgstr ""
 
-#: data/units/Drake_Warmage.cfg:3
-msgid "Drake Warmage"
+#: data/units/Drake_Slasher.cfg:18
+msgid ""
+"With their stumpy vestigial wings and inability to use their great internal "
+"fire as a weapon some may think that these Drakes are disadvantaged, they "
+"would be mistaken. To compensate they have become great craftsmen that can "
+"fabricate weapons with emerald edges, and wear heavy armour. The Slashers' "
+"weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
-#: data/units/Drake_Warrior.cfg:3
+#: data/units/Drake_Slasher.cfg:21
+msgid "sword "
+msgstr "espada "
+
+#: data/units/Drake_Slasher.cfg:22
+msgid "blade "
+msgstr "de filo "
+
+#: data/units/Drake_Slasher.cfg:39
+msgid "spear "
+msgstr "lanza "
+
+#: data/units/Drake_Slasher.cfg:40
+msgid "pierce "
+msgstr "perforante "
+
+#: data/units/Drake_Slasher.cfg:42
+msgid "first strike "
+msgstr "ataca primero "
+
+#: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Guerrero draco"
 
-#: data/units/Drake_Worker.cfg:3
-msgid "Drake Worker"
-msgstr "Trabajador draco"
-
-#: data/units/Drake_Worker.cfg:16
-msgid "More advanced Drakes, the Workers fight with their own sharp claws."
+#: data/units/Drake_Warrior.cfg:18
+msgid ""
+"Drake Fighters wield swords with great skill, and possess the fire breathing "
+"skills of their ancestors."
 msgstr ""
-"Los trabajadores dracos, algo más avanzados, luchan con sus propias garras, "
-"muy afiladas."
 
 #: data/units/Duelist.cfg:3
 msgid "Duelist"
@@ -3779,7 +3962,8 @@
 msgid "axe"
 msgstr "hacha"
 
-#: data/units/Dwarvish_Fighter.cfg:36 data/units/Dwarvish_Steelclad.cfg:42
+#: data/units/Dwarvish_Fighter.cfg:36 data/units/Dwarvish_Lord.cfg:41
+#: data/units/Dwarvish_Steelclad.cfg:42
 msgid "hammer"
 msgstr "martillo"
 
@@ -3788,7 +3972,7 @@
 msgstr "Guardia enano"
 
 #: data/units/Dwarvish_Guardsman.cfg:15 data/units/Dwarvish_Sentinel.cfg:17
-#: data/units/Dwarvish_Stalwart.cfg:17 src/actions.cpp:496
+#: data/units/Dwarvish_Stalwart.cfg:17 src/actions.cpp:499
 msgid "steadfast"
 msgstr "firmeza"
 
@@ -3814,7 +3998,7 @@
 "distancia. Su extraordinaria armadura está hecha de las aleaciones más 
duras "
 "que saben forjar los enanos."
 
-#: data/units/Dwarvish_Lord.cfg:41
+#: data/units/Dwarvish_Lord.cfg:57
 msgid "hatchet"
 msgstr "destral"
 
@@ -3945,6 +4129,16 @@
 msgid "Elder Wose"
 msgstr "Wose anciano"
 
+#: data/units/Elder_Wose.cfg:16
+msgid ""
+"Elder Woses have grown great and tall. Towering over most enemies, they can "
+"deliver crushing blows, while resisting the enemy's counterattacks. Watching "
+"one unexpectedly come stalking towards you out of a forest is a terrifying "
+"sight. They are still very slow and stiff, being nearly immune to arrows but "
+"still quite flammable. Drawing energy from nature around them, Elder Woses "
+"can quickly heal themselves in the face of tremendous injuries."
+msgstr ""
+
 #: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:81
 msgid "Elvish Archer"
 msgstr "Arquero elfo"
@@ -4029,6 +4223,28 @@
 msgid "thorns"
 msgstr "espinas"
 
+#: data/units/Elvish_Enchantress.cfg:3
+#, fuzzy
+msgid "Elvish Enchantress"
+msgstr "Chamán elfo"
+
+#: data/units/Elvish_Enchantress.cfg:21
+msgid ""
+"The Elven Enchantresses are masters of offensive magic, striking at their "
+"enemies both with blasts of icy wind drawn from the ethereal plane, and "
+"magically animate roots with which they bind their enemies in place."
+msgstr ""
+
+#: data/units/Elvish_Enchantress.cfg:65 data/units/Elvish_Shaman.cfg:43
+#: data/units/Elvish_Sorceress.cfg:65
+msgid "entangle"
+msgstr "enredar"
+
+#: data/units/Elvish_Enchantress.cfg:116 data/units/Elvish_Sorceress.cfg:116
+#: data/units/Elvish_Sylph.cfg:82
+msgid "fey gale"
+msgstr ""
+
 #: data/units/Elvish_Fighter.cfg:3
 msgid "Elvish Fighter"
 msgstr "Luchador elfo"
@@ -4075,9 +4291,10 @@
 msgid "Elvish Lady"
 msgstr "Dama elfa"
 
-#: data/units/Elvish_Lady.cfg:16 data/units/Galleon.cfg:17
-msgid "dummy"
-msgstr "ataque cualquiera"
+#: data/units/Elvish_Lady.cfg:17
+#, fuzzy
+msgid "shove"
+msgstr "Movimientos"
 
 #: data/units/Elvish_Lord.cfg:3
 msgid "Elvish Lord"
@@ -4201,10 +4418,6 @@
 "enemigo. Su ataque enredador ralentiza y reduce el número de ataques de sus "
 "enemigos. También posee habilidades de curación básicas."
 
-#: data/units/Elvish_Shaman.cfg:43
-msgid "entangle"
-msgstr "enredar"
-
 #: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
 msgid "Elvish Sharpshooter"
 msgstr "Saetero elfo"
@@ -4232,10 +4445,39 @@
 "transformas en unas criaturas capaces de volar ágilmente en los bosques "
 "élficos."
 
-#: data/units/Elvish_Shyde.cfg:24
+#: data/units/Elvish_Shyde.cfg:24 data/units/Elvish_Sylph.cfg:24
 msgid "faerie touch"
 msgstr "toque faérico"
 
+#: data/units/Elvish_Sorceress.cfg:3
+#, fuzzy
+msgid "Elvish Sorceress"
+msgstr "Arquero elfo"
+
+#: data/units/Elvish_Sorceress.cfg:21
+msgid ""
+"Eschewing the study of healing in favor of more aggressive uses of magic, "
+"Elvish Sorceresses have become quite proficient at ranged combat.  Their "
+"entangling attack is notably more effective than before, and they can call "
+"upon bursts of chilling ethereal wind to smite those who oppose them."
+msgstr ""
+
+#: data/units/Elvish_Sylph.cfg:3
+#, fuzzy
+msgid "Elvish Sylph"
+msgstr "Shyde elfa"
+
+#: data/units/Elvish_Sylph.cfg:20
+msgid ""
+"Elvish Sylphs are scions of beauty in the mortal plane.  Having fully "
+"developed their faerie side, they transform into creatures of both worlds, "
+"wielding powerful magic against their enemies."
+msgstr ""
+
+#: data/units/Elvish_Sylph.cfg:51
+msgid "gossamer"
+msgstr ""
+
 #: data/units/Fencer.cfg:3
 msgid "Fencer"
 msgstr "Esgrimidor"
@@ -4324,7 +4566,7 @@
 
 #: data/units/Footpad.cfg:37 data/units/Outlaw.cfg:38
 #: data/units/Outlaw.cfg:111 data/units/Outlaw_Princess.cfg:41
-#: data/units/Outlaw_Queen.cfg:42
+#: data/units/Outlaw_Queen.cfg:42 data/units/Troll_Rocklobber.cfg:38
 msgid "sling"
 msgstr "honda"
 
@@ -4332,6 +4574,10 @@
 msgid "Galleon"
 msgstr "Galeón"
 
+#: data/units/Galleon.cfg:17
+msgid "dummy"
+msgstr "ataque cualquiera"
+
 #: data/units/Gate.cfg:3
 msgid "Gate"
 msgstr "Puerta"
@@ -4425,6 +4671,24 @@
 msgid "pincers"
 msgstr "pinzas"
 
+#: data/units/Goblin_Impaler.cfg:4
+#, fuzzy
+msgid "Goblin Impaler"
+msgstr "Saqueador goblin"
+
+#: data/units/Goblin_Impaler.cfg:17
+msgid ""
+"Goblins tend to try and make up for their general idiocy, frailty, and lack "
+"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"numbers. These are the larger and more able kinsmen of the Goblin Spearman."
+msgstr ""
+
+#: data/units/Goblin_Impaler.cfg:25 data/units/Halbardier.cfg:23
+#: data/units/Halbardier.cfg:41 data/units/Pikeman.cfg:24
+#: data/units/Spearman.cfg:24
+msgid "firststrike"
+msgstr "primer golpe"
+
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Caballero goblin"
@@ -4459,6 +4723,20 @@
 msgid "net"
 msgstr "red"
 
+#: data/units/Goblin_Spearman.cfg:4
+#, fuzzy
+msgid "Goblin Spearman"
+msgstr "Lancero"
+
+#: data/units/Goblin_Spearman.cfg:17
+msgid ""
+"Goblins tend to try and make up for their general idiocy, frailty, and lack "
+"of sophisticated weaponry by attempting to overwhelm there foes by sheer "
+"numbers. Though lacking in decent armour or weapons, these meagre spearmen "
+"are well-equipped for a war of attrition. The best Goblin Spearman can look "
+"forward to becoming Goblin Impalers."
+msgstr ""
+
 #: data/units/Grand_Knight.cfg:3
 msgid "Grand Knight"
 msgstr "Gran caballero"
@@ -4495,7 +4773,8 @@
 
 #: data/units/Great_Troll.cfg:7 data/units/Tentacle.cfg:7
 #: data/units/Troll.cfg:7 data/units/Troll_Hero.cfg:7
-#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+#: data/units/Troll_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
+#: data/units/Troll_Whelp.cfg:7
 msgid "regenerates"
 msgstr "regenera"
 
@@ -4571,11 +4850,6 @@
 msgid "halberd"
 msgstr "alabarda"
 
-#: data/units/Halbardier.cfg:23 data/units/Halbardier.cfg:41
-#: data/units/Pikeman.cfg:24 data/units/Spearman.cfg:24
-msgid "firststrike"
-msgstr "primer golpe"
-
 #: data/units/Heavy_Infantryman.cfg:3
 msgid "Heavy Infantryman"
 msgstr "Infantería pesada"
@@ -4803,7 +5077,7 @@
 "Como diestra criatura 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.cfg:19 data/units/Merman_Lord.cfg:20
+#: data/units/Merman.cfg:19 data/units/Merman_Lord.cfg:21
 #: data/units/Naga.cfg:20 data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr "tridente"
@@ -4959,7 +5233,7 @@
 msgid "darts"
 msgstr "dardos"
 
-#: data/units/Orcish_Crossbow.cfg:21 data/units/Orcish_Crossbowman.cfg:19
+#: data/units/Orcish_Crossbow.cfg:22 data/units/Orcish_Crossbowman.cfg:19
 msgid "short sword"
 msgstr "espada corta"
 
@@ -5239,11 +5513,11 @@
 msgid "pike"
 msgstr "pica"
 
-#: data/units/Pirate_Galleon.cfg:49
+#: data/units/Pirate_Galleon.cfg:3
 msgid "Pirate Galleon"
 msgstr "Galeón pirata"
 
-#: data/units/Pirate_Galleon.cfg:61 data/units/Transport_Galleon.cfg:15
+#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr "balista"
@@ -5333,14 +5607,84 @@
 "fuertes y resistentes guerreros del ejército. Sólo aparecen en situaciones "
 "críticas y, hasta ahora, siempre han tenido éxito en sus empresas."
 
-#: data/units/Saurian.cfg:3
+#: data/units/Saurian.cfg:4
 msgid "Saurian"
 msgstr "Saurio"
 
-#: data/units/Saurian_Warrior.cfg:3
+#: data/units/Saurian.cfg:17
+msgid ""
+"Saurians are skilled in the use of the spear. Despite their lethargic cold "
+"blooded heritage, and their relative frailty, they are highly valued as "
+"scouts as the can navigate through rough terrain and around opponents. The "
+"best Saurians go on to become Saurian Warriors."
+msgstr ""
+
+#: data/units/Saurian_Icecaster.cfg:4
+#, fuzzy
+msgid "Saurian Icecaster"
+msgstr "Guerrero saurio"
+
+#: data/units/Saurian_Icecaster.cfg:17
+msgid ""
+"Saurian Icecasters have cast aside their role as healers to refine their "
+"skills with the dark arts. While frail, they posses deep knowledge of cold "
+"magic and retain their abilities as healers."
+msgstr ""
+
+#: data/units/Saurian_Icecaster.cfg:19 data/units/Saurian_Tribalist.cfg:20
+#, fuzzy
+msgid "skirmisher,heals"
+msgstr "hostigador"
+
+#: data/units/Saurian_Icecaster.cfg:40 data/units/Saurian_Soothsayer.cfg:39
+#: data/units/Saurian_Tribalist.cfg:39
+#, fuzzy
+msgid "frost blast"
+msgstr "ataca primero"
+
+#: data/units/Saurian_Soothsayer.cfg:4
+#, fuzzy
+msgid "Saurian Soothsayer"
+msgstr "Guerrero saurio"
+
+#: data/units/Saurian_Soothsayer.cfg:18
+msgid ""
+"Saurian Soothsayers are highly valued as healers because they can provide "
+"aide to their friends regardless of terrain or opposition. In addition to "
+"cure their allies they posses knowledge of cold magic."
+msgstr ""
+
+#: data/units/Saurian_Soothsayer.cfg:20
+#, fuzzy
+msgid "skirmisher,cures"
+msgstr "hostigador,cura"
+
+#: data/units/Saurian_Tribalist.cfg:4
+#, fuzzy
+msgid "Saurian Tribalist"
+msgstr "Guerrero saurio"
+
+#: data/units/Saurian_Tribalist.cfg:18
+msgid ""
+"Despite their lethargic cold blooded heritage, and their relative frailty, "
+"Saurian Tribalists are valued as healers because they can provide aide to "
+"their allies regardless of terrain or opposition. In addition to healing "
+"they posses knowledge of cold magic."
+msgstr ""
+
+#: data/units/Saurian_Warrior.cfg:4
 msgid "Saurian Warrior"
 msgstr "Guerrero saurio"
 
+#: data/units/Saurian_Warrior.cfg:17
+msgid ""
+"Saurian Warriors are highly skilled in the use of the spear. Despite their "
+"lethargic cold blooded heritage, and their relative frailty, they are highly "
+"valued as scouts as the can navigate through rough terrain and around "
+"opponents. Saurian Warriors posses the strength to take full advantage of "
+"this fact."
+msgstr ""
+
 #: data/units/Sea_Hag.cfg:3
 msgid "Sea Hag"
 msgstr "Bruja marina"
@@ -5362,10 +5706,11 @@
 msgstr "Orco marino"
 
 #: data/units/Sea_Orc.cfg:16
+#, fuzzy
 msgid ""
-"While often viewed as inferior to their land loving counterparts Sea Orcs "
+"While often viewed as inferior to their land loving counterparts, Sea Orcs "
 "represent a great leap for all goblinoids as they have adapted to aquatic "
-"environments. With their curved swords they are compotent fighters, although "
+"environments. With their curved swords they are competent fighters, although "
 "their lack of a ranged attack and poor defence on land do represent "
 "strategic weaknesses."
 msgstr ""
@@ -5429,15 +5774,15 @@
 "mueven lentamente, son inmensamente poderosos, y por ello se los teme en "
 "todo Wesnoth y más allá."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:90
+#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
 msgid "Silver Mage"
 msgstr "Mago de Plata"
 
-#: data/units/Silver_Mage.cfg:21 data/units/Silver_Mage.cfg:108
+#: data/units/Silver_Mage.cfg:21 data/units/Silver_Mage.cfg:160
 msgid "teleport"
 msgstr "teletransporte"
 
-#: data/units/Silver_Mage.cfg:22 data/units/Silver_Mage.cfg:109
+#: data/units/Silver_Mage.cfg:22 data/units/Silver_Mage.cfg:161
 msgid ""
 "Silver Mages are the most deft of foot and elusive of all mages. They can "
 "teleport from any friendly village to another, translating themselves in an "
@@ -5611,6 +5956,12 @@
 msgid "Transport Galleon"
 msgstr "Galeón de transporte"
 
+#: data/units/Transport_Galleon.cfg:13
+msgid ""
+"Transport Galleons are well-armed ships that carry troops. If they reach the "
+"shore, they can deposit the troops to attack."
+msgstr ""
+
 #: data/units/Trapper.cfg:3
 msgid "Trapper"
 msgstr "Trampero"
@@ -5665,6 +6016,23 @@
 "regenerarse increíblemente rápido, recobrándose de las heridas en el 
fragor "
 "de la lucha."
 
+#: data/units/Troll_Rocklobber.cfg:3
+#, fuzzy
+msgid "Troll Rocklobber"
+msgstr "Troll héroe"
+
+#: data/units/Troll_Rocklobber.cfg:17
+#, fuzzy
+msgid ""
+"Trolls are humanoid monsters that have the amazing ability to regenerate, "
+"recovering from their wounds during battle. These trolls have armed "
+"themselves with large rocks they hurl at their opponents."
+msgstr ""
+"Los trolls son unos monstruos humanoides capaces de regenerarse, "
+"recobrándose de las heridas en el fragor de la batalla. Aunque este troll es 
"
+"una débil cría, esta raza es conocida por su increíblemente rápido "
+"desarrollo."
+
 #: data/units/Troll_Warrior.cfg:3
 msgid "Troll Warrior"
 msgstr "Troll guerrero"
@@ -5824,6 +6192,17 @@
 msgid "Wose"
 msgstr "Wose"
 
+#: data/units/Wose.cfg:16
+msgid ""
+"Woses are treelike creatures of legend. They rose from the forest, and when "
+"in a forest they are indistinguishable from ordinary trees. Their form is "
+"very slow and stiff, so they cannot avoid attacks very well. Their tough "
+"bark is highly resistant to cold, crushing attacks, and arrows, although "
+"blades have no trouble cutting through it, and they are very flammable. By "
+"drawing nutrients from the ground and energy from the sun, Woses can regrow "
+"missing limbs after a fight."
+msgstr ""
+
 #: data/units/Wraith.cfg:3
 msgid "Wraith"
 msgstr "Espectro"
@@ -5929,18 +6308,19 @@
 msgstr "+Responsable de internacionalizción"
 
 #: src/about.cpp:129
-msgid "+Brazilian Translation"
-msgstr "+Traducción brasileña"
+#, fuzzy
+msgid "+Basque Translation"
+msgstr "+Traducción danesa"
 
-#: src/about.cpp:134
+#: src/about.cpp:133
 msgid "+Catalan Translation"
 msgstr "+Traducción catalana"
 
-#: src/about.cpp:139
+#: src/about.cpp:138
 msgid "+Czech Translation"
 msgstr "+Traducción checa"
 
-#: src/about.cpp:148
+#: src/about.cpp:147
 msgid "+Danish Translation"
 msgstr "+Traducción danesa"
 
@@ -5948,146 +6328,147 @@
 msgid "+Dutch Translation"
 msgstr "+Traducción neerlandesa"
 
-#: src/about.cpp:156
+#: src/about.cpp:157
 msgid "+Finnish Translation"
 msgstr "+Traducción finesa"
 
-#: src/about.cpp:160
+#: src/about.cpp:161
 msgid "+French Translation"
 msgstr "+Traducción francesa"
 
-#: src/about.cpp:172
+#: src/about.cpp:173
 msgid "+German Translation"
 msgstr "+Traducción alemana"
 
-#: src/about.cpp:181
+#: src/about.cpp:183
 msgid "+Hungarian Translation"
 msgstr "+Traducción húngara"
 
-#: src/about.cpp:186
+#: src/about.cpp:188
 msgid "+Italian Translation"
 msgstr "+Traducción italiana"
 
-#: src/about.cpp:193
+#: src/about.cpp:195
 msgid "+Norwegian Translation"
 msgstr "+Traducción noruega"
 
-#: src/about.cpp:199
+#: src/about.cpp:201
 msgid "+Polish Translation"
 msgstr "+Traducción polaca"
 
-#: src/about.cpp:205
-msgid "+Portuguese Translation"
+#: src/about.cpp:207
+#, fuzzy
+msgid "+Portuguese (Brazil) Translation"
 msgstr "+Traducción portuguesa"
 
-#: src/about.cpp:210
+#: src/about.cpp:215
 msgid "+Slovak Translation"
 msgstr "+Traducción eslovaca"
 
-#: src/about.cpp:214
+#: src/about.cpp:219
 msgid "+Spanish Translation"
 msgstr "+Traducción española"
 
-#: src/about.cpp:222
+#: src/about.cpp:227
 msgid "+Swedish Translation"
 msgstr "+Traducción sueca"
 
-#: src/about.cpp:229
+#: src/about.cpp:234
 msgid "+Contributors"
 msgstr "+Colaboradores"
 
-#: src/about.cpp:237
+#: src/about.cpp:242
 msgid "+ Bots"
 msgstr "+ Robots"
 
-#: src/about.cpp:264 src/help.cpp:2372 src/show_dialog.cpp:468
+#: src/about.cpp:269 src/help.cpp:2373 src/show_dialog.cpp:468
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/actions.cpp:93
+#: src/actions.cpp:96
 msgid "You don't have a leader to recruit with."
 msgstr "No tienes un líder con el que reclutar."
 
-#: src/actions.cpp:97
+#: src/actions.cpp:100
 msgid "You must have your leader on a keep to recruit or recall units."
 msgstr ""
 "Debes tener al líder en un torreón para reclutar o reincorporar unidades."
 
-#: src/actions.cpp:114
+#: src/actions.cpp:117
 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:202
+#: src/actions.cpp:205
 msgid "none"
 msgstr "ninguna"
 
-#: src/actions.cpp:318 src/actions.cpp:435
+#: src/actions.cpp:321 src/actions.cpp:438
 msgid "base damage"
 msgstr "daño básico"
 
-#: src/actions.cpp:328
+#: src/actions.cpp:331
 msgid "attacker resistance vs"
 msgstr "resistencia del atacante contra"
 
-#: src/actions.cpp:328
+#: src/actions.cpp:331
 msgid "attacker vulnerability vs"
 msgstr "debilidad del atacante contra"
 
-#: src/actions.cpp:360 src/actions.cpp:478 src/actions.cpp:487
+#: src/actions.cpp:363 src/actions.cpp:481 src/actions.cpp:490
 msgid "Doubled"
 msgstr "Doblado"
 
-#: src/actions.cpp:388 src/actions.cpp:523
+#: src/actions.cpp:391 src/actions.cpp:526
 msgid "total damage"
 msgstr "daño neto"
 
-#: src/actions.cpp:445
+#: src/actions.cpp:448
 msgid "defender resistance vs"
 msgstr "resistencia del defensor contra"
 
-#: src/actions.cpp:445
+#: src/actions.cpp:448
 msgid "defender vulnerability vs"
 msgstr "debilidad del defensor contra"
 
-#: src/actions.cpp:496
+#: src/actions.cpp:499
 msgid "Halved"
 msgstr "A la mitad"
 
-#: src/actions.cpp:703 src/actions.cpp:842 src/display.cpp:878
+#: src/actions.cpp:714 src/actions.cpp:861 src/display.cpp:878
 #: src/reports.cpp:115
 msgid "poisoned"
 msgstr "envenenado"
 
-#: src/actions.cpp:708 src/actions.cpp:847 src/display.cpp:874
+#: src/actions.cpp:719 src/actions.cpp:866 src/display.cpp:874
 #: src/reports.cpp:110
 msgid "slowed"
 msgstr "ralentizado"
 
-#: src/actions.cpp:1718
+#: src/actions.cpp:1738
 msgid "Ambushed!"
 msgstr "¡Emboscada!"
 
-#: src/actions.cpp:1746
+#: src/actions.cpp:1766
 msgid "Friendly unit sighted"
 msgstr "¡Aliado avistada!"
 
-#: src/actions.cpp:1748
+#: src/actions.cpp:1768
 msgid "Enemy unit sighted!"
 msgstr "¡Enemigo avistado!"
 
-#: src/actions.cpp:1753
+#: src/actions.cpp:1773
 msgid "$friends Friendly units sighted"
 msgstr "$friends unidades aliadas avistadas"
 
-#: src/actions.cpp:1755
+#: src/actions.cpp:1775
 msgid "$enemies Enemy units sighted!"
 msgstr "¡$enemies unidades enemigas avistadas!"
 
-#: src/actions.cpp:1759
+#: src/actions.cpp:1779
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Unidades avistadas ($friends aliadas, $enemies enemigas)"
 
-#: src/actions.cpp:1780
+#: src/actions.cpp:1800
 msgid "(press $hotkey to continue)"
 msgstr "(pulse $hotkey para continuar)"
 
@@ -6103,9 +6484,9 @@
 msgid "No objectives available"
 msgstr "Objetivos no disponibles"
 
-#: src/dialogs.cpp:174
-msgid "Save"
-msgstr "Guardar"
+#: src/dialogs.cpp:174 src/hotkeys.cpp:132
+msgid "Save Game"
+msgstr "Guardar partida"
 
 #: src/dialogs.cpp:176
 msgid "Overwrite?"
@@ -6131,11 +6512,11 @@
 msgid "#(Invalid)"
 msgstr "#(Inválido)"
 
-#: src/dialogs.cpp:365 src/game.cpp:989
+#: src/dialogs.cpp:365 src/game.cpp:924
 msgid "Campaign"
 msgstr "Campaña"
 
-#: src/dialogs.cpp:367 src/game.cpp:1125
+#: src/dialogs.cpp:367 src/game.cpp:1143
 msgid "Multiplayer"
 msgstr "Multijugador"
 
@@ -6155,7 +6536,7 @@
 msgid "Scenario Start"
 msgstr "Inicio del escenario"
 
-#: src/dialogs.cpp:384 src/game.cpp:1101
+#: src/dialogs.cpp:384 src/game.cpp:954
 msgid "Difficulty"
 msgstr "Dificultad"
 
@@ -6216,33 +6597,22 @@
 msgstr "Perfil"
 
 #: src/dialogs.cpp:646 src/display.cpp:884 src/help.cpp:567
-#: src/playturn.cpp:1784
+#: src/playturn.cpp:1791
 msgid "level"
 msgstr "nivel"
 
-#: src/dialogs.cpp:667 src/display.cpp:902 src/help.cpp:621
-#: src/playturn.cpp:1947 src/unit.cpp:1034
-msgid "HP"
-msgstr "PV"
-
-#: src/dialogs.cpp:671 src/dialogs.cpp:679 src/display.cpp:906
-#: src/display.cpp:914 src/playturn.cpp:1786 src/playturn.cpp:1948
-#: src/unit.cpp:1093
-msgid "XP"
-msgstr "PX"
-
 #: src/dialogs.cpp:684 src/display.cpp:918 src/help.cpp:622
-#: src/playturn.cpp:1949 src/unit.cpp:1070
+#: src/playturn.cpp:1956 src/unit.cpp:1065
 msgid "Moves"
 msgstr "Movimientos"
 
 #: src/dialogs.cpp:697 src/display.cpp:935 src/help.cpp:699
-#: src/playturn.cpp:599 src/reports.cpp:230
+#: src/playturn.cpp:597 src/reports.cpp:230
 msgid "melee"
 msgstr "meleé"
 
 #: src/dialogs.cpp:698 src/display.cpp:936 src/help.cpp:699
-#: src/playturn.cpp:599 src/reports.cpp:231
+#: src/playturn.cpp:597 src/reports.cpp:231
 msgid "ranged"
 msgstr "distancia"
 
@@ -6254,7 +6624,7 @@
 msgid "invisible"
 msgstr "invisible"
 
-#: src/font.cpp:164
+#: src/font.cpp:169
 msgid "Vera.ttf"
 msgstr "Vera.ttf"
 
@@ -6274,11 +6644,11 @@
 msgid "Do you want to save your game?"
 msgstr "¿Quiere guardar el juego?"
 
-#: src/game.cpp:648
+#: src/game.cpp:591
 msgid "The Battle for Wesnoth"
 msgstr "La Batalla por Wesnoth"
 
-#: src/game.cpp:868 src/multiplayer_connect.cpp:106
+#: src/game.cpp:788 src/multiplayer_connect.cpp:106
 msgid ""
 "This save is from a different version of the game. Do you want to try to "
 "load it?"
@@ -6286,138 +6656,172 @@
 "Esta partida guardada es de otra versión del juego. ¿Quiere intentar "
 "cargarla igualmente?"
 
-#: src/game.cpp:879 src/game.cpp:884 src/playlevel.cpp:549
+#: src/game.cpp:800 src/game.cpp:805 src/playlevel.cpp:549
 #: src/playlevel.cpp:789
 msgid "The file you have tried to load is corrupt"
 msgstr "El fichero que ha intentado cargar está corrompido."
 
-#: src/game.cpp:984
+#: src/game.cpp:809
+msgid "File I/O Error while reading the game"
+msgstr ""
+
+#: src/game.cpp:914
 msgid " ,Get More Campaigns..."
 msgstr ", Obtener más campañas..."
 
-#: src/game.cpp:990
+#: src/game.cpp:915
+msgid "Download more campaigns from a server on Internet."
+msgstr ""
+
+#: src/game.cpp:925
 msgid "Choose the campaign you want to play:"
 msgstr "Seleccione la campaña que quiera jugar:"
 
-#: src/game.cpp:1000
+#: src/game.cpp:955
+msgid "Select difficulty level:"
+msgstr "Seleccione el nivel de dificultad:"
+
+#: src/game.cpp:974
 msgid "Connect to Server"
 msgstr "Conectar al servidor"
 
-#: src/game.cpp:1001
+#: src/game.cpp:975
 msgid "You will now connect to a campaign server to download campaigns."
 msgstr ""
 "Ahora se realizará una conexión a un servidor de campañas para descargar "
 "escenarios."
 
-#: src/game.cpp:1002
+#: src/game.cpp:976
 msgid "Server: "
 msgstr "Servidor: "
 
-#: src/game.cpp:1014
+#: src/game.cpp:988
 msgid "Could not connect to host."
 msgstr "No ha sido posible conectar al servidor."
 
-#: src/game.cpp:1014 src/game.cpp:1029 src/game.cpp:1035 src/game.cpp:1046
-#: src/game.cpp:1065 src/game.cpp:1075 src/game.cpp:1078 src/game.cpp:1081
+#: src/game.cpp:988 src/game.cpp:1003 src/game.cpp:1009 src/game.cpp:1030
+#: src/game.cpp:1054 src/game.cpp:1068 src/game.cpp:1070 src/game.cpp:1072
+#: src/game.cpp:1084 src/game.cpp:1087 src/game.cpp:1122 src/game.cpp:1124
 #: src/playturn.cpp:1396 src/playturn.cpp:1410
 msgid "Error"
 msgstr "Error"
 
-#: src/game.cpp:1022
+#: src/game.cpp:996
 msgid "Awaiting response from server"
 msgstr "Esperando respuesta por parte del servidor"
 
-#: src/game.cpp:1035
+#: src/game.cpp:1009
 msgid "Error communicating with the server."
 msgstr "Error de comunicación con el servidor."
 
-#: src/game.cpp:1046
+#: src/game.cpp:1014
+msgid ",Name,Version,Author,Downloads"
+msgstr ""
+
+#: src/game.cpp:1026
+#, fuzzy
+msgid "Publish campaign: "
+msgstr "Capitán elfo"
+
+#: src/game.cpp:1030
 msgid "There are no campaigns available for download from this server."
 msgstr "No hay campañas disponibles para descargar de este servidor."
 
-#: src/game.cpp:1050
+#: src/game.cpp:1034
 msgid "Choose the campaign to download."
 msgstr "Escoja la campaña a descargar."
 
-#: src/game.cpp:1050
+#: src/game.cpp:1034
 msgid "Get Campaign"
 msgstr "Obtener campaña"
 
-#: src/game.cpp:1059
+#: src/game.cpp:1048
 msgid "Downloading campaign..."
 msgstr "Descargando campaña..."
 
-#: src/game.cpp:1071
+#: src/game.cpp:1066
 msgid "Campaign Installed"
 msgstr "Campaña instalada"
 
-#: src/game.cpp:1071
-msgid ""
-"The campaign has been installed. You will have to restart Wesnoth before you "
-"can play it."
-msgstr ""
-"La campaña ha sido instalada. Tendrá que reiniciar Wesnoth para poder jugar 
"
-"a ella."
+#: src/game.cpp:1066
+#, fuzzy
+msgid "The campaign has been installed."
+msgstr "El juego ha sido guardado."
 
-#: src/game.cpp:1075
+#: src/game.cpp:1068
 msgid "Network communication error."
 msgstr "Error de comunicación de red."
 
-#: src/game.cpp:1078
+#: src/game.cpp:1070
 msgid "Remote host disconnected."
 msgstr "Equipo remoto desconectado."
 
-#: src/game.cpp:1081
+#: src/game.cpp:1072
 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:1102
-msgid "Select difficulty level:"
-msgstr "Seleccione el nivel de dificultad:"
+#: src/game.cpp:1084 src/game.cpp:1122 src/multiplayer_client.cpp:42
+#: src/multiplayer_client.cpp:314
+msgid "Connection timed out"
+msgstr "Conexión terminada"
+
+#: src/game.cpp:1087 src/game.cpp:1124
+msgid "The server responded with an error: \""
+msgstr ""
+
+#: src/game.cpp:1090
+#, fuzzy
+msgid "Terms"
+msgstr "Equipo"
+
+#: src/game.cpp:1126
+#, fuzzy
+msgid "Response"
+msgstr "piedra"
 
-#: src/game.cpp:1120
+#: src/game.cpp:1138
 msgid "Join Official Server"
 msgstr "Unirse al servidor oficial"
 
-#: src/game.cpp:1120
+#: src/game.cpp:1138
 msgid "Log on to the official Wesnoth multiplayer server"
 msgstr "Entrar al servidor multijugador oficial de Wesnoth"
 
-#: src/game.cpp:1121 src/multiplayer_lobby.cpp:157
+#: src/game.cpp:1139 src/multiplayer_lobby.cpp:157
 msgid "Join Game"
 msgstr "Unirse a la partida"
 
-#: src/game.cpp:1121
+#: src/game.cpp:1139
 msgid "Join a server or hosted game"
 msgstr "Unirse a un servidor o a un juego"
 
-#: src/game.cpp:1122
+#: src/game.cpp:1140
 msgid "Host Multiplayer Game"
 msgstr "Hospedar partida multijugador"
 
-#: src/game.cpp:1122
+#: src/game.cpp:1140
 msgid "Host a game without using a server"
 msgstr "Hospedar un juego sin usar un servidor remoto"
 
-#: src/game.cpp:1125 src/multiplayer_client.cpp:269
+#: src/game.cpp:1143 src/multiplayer_client.cpp:298
 msgid "Login"
 msgstr "Entrar"
 
-#: src/game.cpp:1205
+#: src/game.cpp:1220
 msgid "Language"
 msgstr "Idioma"
 
-#: src/game.cpp:1206
+#: src/game.cpp:1221
 msgid "Choose your preferred language"
 msgstr "Elija su idioma preferido"
 
-#: src/game.cpp:1291
+#: src/game.cpp:1449
 msgid "Could not initialize video. Exiting.\n"
 msgstr "No puedo iniciar sistema gráfico. Saliendo.\n"
 
-#: src/game.cpp:1293
+#: src/game.cpp:1451
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "No puedo iniciar tipografía. Saliendo.\n"
 
@@ -6441,15 +6845,15 @@
 msgid "attacks"
 msgstr "ataques"
 
-#: src/help.cpp:646 src/help.cpp:647 src/playturn.cpp:1946
+#: src/help.cpp:646 src/help.cpp:647 src/playturn.cpp:1953
 msgid "Name"
 msgstr "Nombre"
 
-#: src/help.cpp:650 src/help.cpp:651 src/playturn.cpp:1945
+#: src/help.cpp:650 src/help.cpp:651 src/playturn.cpp:1952
 msgid "Type"
 msgstr "Tipo"
 
-#: src/help.cpp:654 src/help.cpp:655 src/unit_types.cpp:301
+#: src/help.cpp:654 src/help.cpp:655 src/unit_types.cpp:302
 msgid "Dmg"
 msgstr "Daño"
 
@@ -6465,39 +6869,39 @@
 msgid "Special"
 msgstr "Especial"
 
-#: src/help.cpp:723
+#: src/help.cpp:724
 msgid "Resistances"
 msgstr "Resistencias"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:728 src/help.cpp:729
 msgid "Attack Type"
 msgstr "Tipo de ataque"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:732 src/help.cpp:733
 msgid "Resistance"
 msgstr "Resistencia"
 
-#: src/help.cpp:763
+#: src/help.cpp:764
 msgid "Terrain Modifiers"
 msgstr "Modificadores por terreno"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:768 src/help.cpp:769
 msgid "Terrain"
 msgstr "Terreno"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:776 src/help.cpp:777
 msgid "Defense"
 msgstr "Defensa"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1877
 msgid "< Back"
 msgstr "< Atrás"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1878
 msgid "Forward >"
 msgstr "Adelante >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2376
 msgid "The Battle for Wesnoth Help"
 msgstr "Sección de ayuda de La Batalla por Wesnoth"
 
@@ -6509,7 +6913,7 @@
 msgid "End Unit Turn"
 msgstr "Finalizar turno de unidad"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1525
+#: src/hotkeys.cpp:122 src/playturn.cpp:1531
 msgid "Leader"
 msgstr "Líder"
 
@@ -6549,11 +6953,7 @@
 msgid "Rename Unit"
 msgstr "Renombrar unidad"
 
-#: src/hotkeys.cpp:132
-msgid "Save Game"
-msgstr "Guardar partida"
-
-#: src/hotkeys.cpp:134
+#: src/hotkeys.cpp:134 src/playturn.cpp:1640
 msgid "Recruit"
 msgstr "Reclutar"
 
@@ -6561,7 +6961,7 @@
 msgid "Repeat Recruit"
 msgstr "Repetir reclutamiento"
 
-#: src/hotkeys.cpp:136
+#: src/hotkeys.cpp:136 src/playturn.cpp:1818
 msgid "Recall"
 msgstr "Reincorporar"
 
@@ -6597,11 +6997,11 @@
 msgid "Scenario Objectives"
 msgstr "Objetivos del escenario"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:1998
+#: src/hotkeys.cpp:146 src/playturn.cpp:2005
 msgid "Unit List"
 msgstr "Lista de unidades"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2086
+#: src/hotkeys.cpp:147 src/playturn.cpp:2093
 msgid "Statistics"
 msgstr "Estadísticas"
 
@@ -6721,9 +7121,9 @@
 msgid "Do you really want to quit?"
 msgstr "¿Está seguro de que quieres salir?"
 
-#: src/hotkeys.cpp:358 src/hotkeys.cpp:542
-msgid "Quit?"
-msgstr "¿Salir?"
+#: src/hotkeys.cpp:358 src/hotkeys.cpp:542 src/multiplayer_lobby.cpp:159
+msgid "Quit"
+msgstr "Salir"
 
 #: src/intro.cpp:87
 msgid "Next"
@@ -6769,7 +7169,7 @@
 msgid "Bump Size"
 msgstr "Elevación"
 
-#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1526
+#: src/mapgen_dialog.cpp:82 src/playturn.cpp:1532
 msgid "Villages"
 msgstr "Aldeas"
 
@@ -6835,7 +7235,7 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Permite a usuarios que no juegan ver la partida"
 
-#: src/multiplayer.cpp:123 src/multiplayer_client.cpp:119
+#: src/multiplayer.cpp:123 src/multiplayer_client.cpp:145
 #: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:456
 #: src/show_dialog.cpp:462
 msgid "Cancel"
@@ -6918,60 +7318,70 @@
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/multiplayer_client.cpp:42 src/multiplayer_client.cpp:285
-msgid "Connection timed out"
-msgstr "Conexión terminada"
-
 #: src/multiplayer_client.cpp:59
 msgid "Receiving game list..."
 msgstr "Recibiendo lista de partidas..."
 
-#: src/multiplayer_client.cpp:95 src/multiplayer_connect.cpp:381
-#: src/multiplayer_connect.cpp:383 src/playlevel.cpp:769 src/playturn.cpp:1525
-#: src/playturn.cpp:1530 src/playturn.cpp:1616
+#: src/multiplayer_client.cpp:121 src/multiplayer_connect.cpp:389
+#: src/multiplayer_connect.cpp:391 src/playlevel.cpp:769 src/playturn.cpp:1531
+#: src/playturn.cpp:1536 src/playturn.cpp:1622
 msgid "Gold"
 msgstr "Oro"
 
-#: src/multiplayer_client.cpp:113
+#: src/multiplayer_client.cpp:139
 msgid "Waiting for game to start..."
 msgstr "Esperando a que la partida empiece..."
 
-#: src/multiplayer_client.cpp:221
+#: src/multiplayer_client.cpp:250
 msgid "Choose host to connect to"
 msgstr "Escoja servidor al que conectar"
 
-#: src/multiplayer_client.cpp:239
+#: src/multiplayer_client.cpp:268
 msgid "Connecting to remote host..."
 msgstr "Conectando al servidor remoto..."
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:297
 msgid "You must log in to this server"
 msgstr "Debe entrar en el servidor"
 
-#: src/multiplayer_client.cpp:348
+#: src/multiplayer_client.cpp:377
 msgid "Getting game data..."
 msgstr "Obteniendo datos de la partida..."
 
-#: src/multiplayer_client.cpp:399
+#: src/multiplayer_client.cpp:429
 msgid "There are no available sides in this game."
 msgstr "No hay más bandos disponibles en este juego."
 
-#: src/multiplayer_client.cpp:441
+#: src/multiplayer_client.cpp:477
 msgid "Choose your side:"
 msgstr "Escoja su bando:"
 
-#: src/multiplayer_client.cpp:466
+#: src/multiplayer_client.cpp:507
 msgid "The game has been cancelled"
 msgstr "La partida ha sido cancelada."
 
-#: src/multiplayer_client.cpp:470
+#: src/multiplayer_client.cpp:511
 msgid "The side you have chosen is no longer available"
 msgstr "El bando que ha escogido ya no está disponible."
 
-#: src/multiplayer_client.cpp:506
+#: src/multiplayer_client.cpp:547
 msgid "Show replay of game up to save point?"
 msgstr "¿Mostrar repetición del juego hasta el momento de ser guardado?"
 
+#: src/multiplayer_client.cpp:686 src/multiplayer_client.cpp:689
+msgid "?"
+msgstr ""
+
+#: src/multiplayer_client.cpp:780
+#, fuzzy
+msgid "Leader: "
+msgstr "Líder"
+
+#: src/multiplayer_client.cpp:782
+#, fuzzy
+msgid "Recruits: "
+msgstr "Reclutas"
+
 #: src/multiplayer_connect.cpp:48
 msgid " Computer vs Computer "
 msgstr " Ordenador contra Ordenador "
@@ -6984,7 +7394,7 @@
 msgid "This is not a multiplayer save"
 msgstr "Ésta no es una partida guardada en modo multijugador."
 
-#: src/multiplayer_connect.cpp:241
+#: src/multiplayer_connect.cpp:247
 msgid ""
 "Victory\n"
 "@Defeat enemy leader(s)"
@@ -6992,81 +7402,81 @@
 "Victoria\n"
 "@Derrota al/los líder/es enemigo/s"
 
-#: src/multiplayer_connect.cpp:261
+#: src/multiplayer_connect.cpp:267
 msgid "Network Player"
 msgstr "Jugador en red"
 
-#: src/multiplayer_connect.cpp:262
+#: src/multiplayer_connect.cpp:268
 msgid "Local Player"
 msgstr "Jugador local"
 
-#: src/multiplayer_connect.cpp:263 src/multiplayer_connect.cpp:470
-#: src/multiplayer_connect.cpp:584 src/multiplayer_connect.cpp:678
+#: src/multiplayer_connect.cpp:269 src/multiplayer_connect.cpp:491
+#: src/multiplayer_connect.cpp:611 src/multiplayer_connect.cpp:720
 msgid "Computer Player"
 msgstr "IA (computadora)"
 
-#: src/multiplayer_connect.cpp:264
+#: src/multiplayer_connect.cpp:270
 msgid "Empty"
 msgstr "Vacío"
 
-#: src/multiplayer_connect.cpp:291 src/multiplayer_connect.cpp:371
-#: src/multiplayer_connect.cpp:374
+#: src/multiplayer_connect.cpp:297 src/multiplayer_connect.cpp:379
+#: src/multiplayer_connect.cpp:382
 msgid "Team"
 msgstr "Equipo"
 
-#: src/multiplayer_connect.cpp:299
+#: src/multiplayer_connect.cpp:307
 msgid "Red"
 msgstr "Rojo"
 
-#: src/multiplayer_connect.cpp:301
+#: src/multiplayer_connect.cpp:309
 msgid "Blue"
 msgstr "Azul"
 
-#: src/multiplayer_connect.cpp:303
+#: src/multiplayer_connect.cpp:311
 msgid "Green"
 msgstr "Verde"
 
-#: src/multiplayer_connect.cpp:305
+#: src/multiplayer_connect.cpp:313
 msgid "Yellow"
 msgstr "Amarillo"
 
-#: src/multiplayer_connect.cpp:307
+#: src/multiplayer_connect.cpp:315
 msgid "Purple"
 msgstr "Morado"
 
-#: src/multiplayer_connect.cpp:309
+#: src/multiplayer_connect.cpp:317
 msgid "Orange"
 msgstr "Naranja"
 
-#: src/multiplayer_connect.cpp:311
+#: src/multiplayer_connect.cpp:319
 msgid "Grey"
 msgstr "Gris"
 
-#: src/multiplayer_connect.cpp:313
+#: src/multiplayer_connect.cpp:321
 msgid "White"
 msgstr "Blanco"
 
-#: src/multiplayer_connect.cpp:315
+#: src/multiplayer_connect.cpp:323
 msgid "Brown"
 msgstr "Marrón"
 
-#: src/multiplayer_connect.cpp:360
+#: src/multiplayer_connect.cpp:368
 msgid "Game Lobby"
 msgstr "Sala de juego"
 
-#: src/multiplayer_connect.cpp:363 src/multiplayer_connect.cpp:365
+#: src/multiplayer_connect.cpp:371 src/multiplayer_connect.cpp:373
 msgid "Player/Type"
 msgstr "Jugador/Tipo"
 
-#: src/multiplayer_connect.cpp:366 src/multiplayer_connect.cpp:369
+#: src/multiplayer_connect.cpp:374 src/multiplayer_connect.cpp:377
 msgid "Faction"
 msgstr "Bando"
 
-#: src/multiplayer_connect.cpp:376 src/multiplayer_connect.cpp:379
+#: src/multiplayer_connect.cpp:384 src/multiplayer_connect.cpp:387
 msgid "Color"
 msgstr "Color"
 
-#: src/multiplayer_connect.cpp:533 src/multiplayer_connect.cpp:537
+#: src/multiplayer_connect.cpp:560 src/multiplayer_connect.cpp:564
 msgid "Waiting for network players to join"
 msgstr "Esperando a que se unan jugadores..."
 
@@ -7086,10 +7496,6 @@
 msgid "Observe Game"
 msgstr "Observar juego"
 
-#: src/multiplayer_lobby.cpp:159
-msgid "Quit"
-msgstr "Salir"
-
 #: src/playlevel.cpp:688
 msgid "Game Over"
 msgstr "Fin del juego"
@@ -7155,50 +7561,50 @@
 msgid "It is now your turn"
 msgstr "Es su turno."
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:486
 msgid "Attacker"
 msgstr "Atacante"
 
-#: src/playturn.cpp:490
+#: src/playturn.cpp:488
 msgid "Defender"
 msgstr "Defensor"
 
-#: src/playturn.cpp:514 src/playturn.cpp:633
+#: src/playturn.cpp:512 src/playturn.cpp:631
 msgid "Damage Calculations"
 msgstr "Cálculos del daño"
 
-#: src/playturn.cpp:599
+#: src/playturn.cpp:597
 msgid "Melee"
 msgstr "Meleé"
 
-#: src/playturn.cpp:612 src/reports.cpp:210
+#: src/playturn.cpp:610 src/reports.cpp:210
 msgid "vs"
 msgstr "contra"
 
-#: src/playturn.cpp:645
+#: src/playturn.cpp:643
 msgid "Attack Enemy"
 msgstr "Atacar al enemigo"
 
-#: src/playturn.cpp:646
+#: src/playturn.cpp:644
 msgid "Choose weapon"
 msgstr "Escoger arma"
 
-#: src/playturn.cpp:1127
+#: src/playturn.cpp:1125
 msgid ""
 "You have not started your turn yet.  Do you really want to end your turn?"
 msgstr "Aún no ha empezado el turno. ¿Está seguro de que quiere terminarlo?"
 
-#: src/playturn.cpp:1136 src/playturn.cpp:1141
+#: src/playturn.cpp:1134 src/playturn.cpp:1139
 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/playturn.cpp:1157
+#: src/playturn.cpp:1155
 msgid "Auto-Save"
 msgstr "Autoguardado"
 
-#: src/playturn.cpp:1159
+#: src/playturn.cpp:1157
 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 "
@@ -7220,31 +7626,31 @@
 msgid "The game has been saved"
 msgstr "El juego ha sido guardado."
 
-#: src/playturn.cpp:1526
+#: src/playturn.cpp:1532
 msgid "Units"
 msgstr "Unidades"
 
-#: src/playturn.cpp:1527
+#: src/playturn.cpp:1533
 msgid "Income"
 msgstr "Ingresos"
 
-#: src/playturn.cpp:1527
+#: src/playturn.cpp:1533
 msgid "Upkeep"
 msgstr "Mantenimiento"
 
-#: src/playturn.cpp:1622
+#: src/playturn.cpp:1628
 msgid "You have no units available to recruit."
 msgstr "No tiene unidades disponibles para reclutar."
 
-#: src/playturn.cpp:1635
-msgid "Recruit unit"
-msgstr "Reclutar unidad"
+#: src/playturn.cpp:1641 src/playturn.cpp:1819
+msgid "Select unit"
+msgstr "Seleccionar unidad"
 
-#: src/playturn.cpp:1664
+#: src/playturn.cpp:1670
 msgid "You don't have enough gold to recruit that unit"
 msgstr "No tiene suficiente oro para reclutar a esta unidad."
 
-#: src/playturn.cpp:1722
+#: src/playturn.cpp:1728
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
@@ -7252,7 +7658,7 @@
 "¡Mi señor, esta unidad es veterana y tiene experiencia! ¿Realmente 
queréis "
 "licenciar a $noun?"
 
-#: src/playturn.cpp:1724
+#: src/playturn.cpp:1730
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
@@ -7260,19 +7666,20 @@
 "¡Mi señor, está unidad está a punto de subir de nivel! ¿Realmente 
queréis "
 "licenciar a $noun?"
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1735
 msgid "her"
 msgstr "ella"
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1735
 msgid "him"
 msgstr "él"
 
-#: src/playturn.cpp:1768
-msgid "You are seperated from your soldiers and may not recall them"
+#: src/playturn.cpp:1775
+#, fuzzy
+msgid "You are separated from your soldiers and may not recall them"
 msgstr "Está separado de sus soldados y no puede reincorporarlos."
 
-#: src/playturn.cpp:1770
+#: src/playturn.cpp:1777
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
@@ -7280,92 +7687,88 @@
 "No hay tropas disponibles para reincorporar.\n"
 "(Debe tener veteranos supervivientes de escenarios previos.)"
 
-#: src/playturn.cpp:1776
+#: src/playturn.cpp:1783
 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/playturn.cpp:1799
+#: src/playturn.cpp:1806
 msgid "Dismiss Unit"
 msgstr "Licenciar unidad"
 
-#: src/playturn.cpp:1812
-msgid "Select unit"
-msgstr "Seleccionar unidad"
-
-#: src/playturn.cpp:1856
+#: src/playturn.cpp:1863
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/playturn.cpp:1856
+#: src/playturn.cpp:1863
 msgid "Send to allies only"
 msgstr "Mandarlo sólo a aliados"
 
-#: src/playturn.cpp:1950
+#: src/playturn.cpp:1957
 msgid "Location"
 msgstr "Lugar"
 
-#: src/playturn.cpp:2032 src/playturn.cpp:2092
+#: src/playturn.cpp:2039 src/playturn.cpp:2099
 msgid "Recruits"
 msgstr "Reclutas"
 
-#: src/playturn.cpp:2038 src/playturn.cpp:2096
+#: src/playturn.cpp:2045 src/playturn.cpp:2103
 msgid "Recalls"
 msgstr "Veteranos"
 
-#: src/playturn.cpp:2044 src/playturn.cpp:2100
+#: src/playturn.cpp:2051 src/playturn.cpp:2107
 msgid "Advancements"
 msgstr "Avances"
 
-#: src/playturn.cpp:2050 src/playturn.cpp:2104
+#: src/playturn.cpp:2057 src/playturn.cpp:2111
 msgid "Losses"
 msgstr "Pérdidas"
 
-#: src/playturn.cpp:2056 src/playturn.cpp:2108
+#: src/playturn.cpp:2063 src/playturn.cpp:2115
 msgid "Kills"
 msgstr "Muertos"
 
-#: src/playturn.cpp:2062
+#: src/playturn.cpp:2069
 msgid "Damage Inflicted"
 msgstr "Daño infligido"
 
-#: src/playturn.cpp:2068
+#: src/playturn.cpp:2075
 msgid "Damage Taken"
 msgstr "Daño recibido"
 
-#: src/playturn.cpp:2074
+#: src/playturn.cpp:2081
 msgid "Damage Inflicted (EV)"
 msgstr "Daño infligido (VE)"
 
-#: src/playturn.cpp:2081
+#: src/playturn.cpp:2088
 msgid "Damage Taken (EV)"
 msgstr "Daño recibido (VE)"
 
-#: src/playturn.cpp:2123
+#: src/playturn.cpp:2130
 msgid "Search"
 msgstr "Buscar"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2140
 msgid "prompt^Command:"
 msgstr "Orden:"
 
-#: src/playturn.cpp:2144
+#: src/playturn.cpp:2151
 msgid "Chat Log"
 msgstr "Registro de conversaciones"
 
-#: src/playturn.cpp:2209
+#: src/playturn.cpp:2216
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "No se encontró una etiquieta o unidad con la cadena «$search»."
 
-#: src/playturn.cpp:2283
+#: src/playturn.cpp:2293
 msgid "Place Label"
 msgstr "Poner etiqueta"
 
-#: src/playturn.cpp:2284
+#: src/playturn.cpp:2294
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/playturn.cpp:2407
+#: src/playturn.cpp:2417
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
@@ -7373,23 +7776,23 @@
 "El juego no está sincronizado y tendrá que salir. ¿Quiere guardar un "
 "registro de error de su partida?"
 
-#: src/playturn.cpp:2459
+#: src/playturn.cpp:2469
 msgid "Replace with AI"
 msgstr "Reemplazar con IA"
 
-#: src/playturn.cpp:2460
+#: src/playturn.cpp:2470
 msgid "Replace with local player"
 msgstr "Reemplazar con jugador local"
 
-#: src/playturn.cpp:2461
+#: src/playturn.cpp:2471
 msgid "Abort game"
 msgstr "Terminar juego"
 
-#: src/playturn.cpp:2464
+#: src/playturn.cpp:2474
 msgid "Replace with "
 msgstr "Reemplazar con "
 
-#: src/playturn.cpp:2468
+#: src/playturn.cpp:2478
 msgid "has left the game. What do you want to do?"
 msgstr "ha dejado el juego. ¿Qué quiere hacer?"
 
@@ -7470,47 +7873,47 @@
 msgid "Version"
 msgstr "Versión"
 
-#: src/titlescreen.cpp:160
+#: src/titlescreen.cpp:162
 msgid "TitleScreen button^Tutorial"
 msgstr "Tutorial"
 
-#: src/titlescreen.cpp:161
+#: src/titlescreen.cpp:163
 msgid "TitleScreen button^Campaign"
 msgstr "Campaña"
 
-#: src/titlescreen.cpp:162
+#: src/titlescreen.cpp:164
 msgid "TitleScreen button^Multiplayer"
 msgstr "Multijugador"
 
-#: src/titlescreen.cpp:163
+#: src/titlescreen.cpp:165
 msgid "TitleScreen button^Load"
 msgstr "Cargar"
 
-#: src/titlescreen.cpp:164
+#: src/titlescreen.cpp:166
 msgid "TitleScreen button^Language"
 msgstr "Idioma"
 
-#: src/titlescreen.cpp:165
+#: src/titlescreen.cpp:167
 msgid "TitleScreen button^Preferences"
 msgstr "Preferencias"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:168
 msgid "TitleScreen button^About"
 msgstr "Acerca de..."
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:169
 msgid "TitleScreen button^Quit"
 msgstr "Salir"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:170
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Jugar un tutorial para familiarizarse con el juego"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:171
 msgid "Start a new single player campaign"
 msgstr "Empieza una nueva campaña para un solo jugador"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:172
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -7518,47 +7921,47 @@
 "Juega en modo multijugador (varios jugadores, LAN, o Internet), o solo en un "
 "escenario contra la IA"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:173
 msgid "Load a single player saved game"
 msgstr "Carga una partida grabada"
 
-#: src/titlescreen.cpp:172
+#: src/titlescreen.cpp:174
 msgid "Change the language"
 msgstr "Cambia el idioma"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:175
 msgid "Configure the game's settings"
 msgstr "Configura los parámetros del juego"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:176
 msgid "View the credits"
 msgstr "Muestra a los colaboradores"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:177
 msgid "Quit the game"
 msgstr "Salir del juego"
 
-#: src/titlescreen.cpp:199
+#: src/titlescreen.cpp:201
 msgid "More"
 msgstr "Más"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:208
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Compendio de Guerra y Virtud"
 
-#: src/unit_types.cpp:313
+#: src/unit_types.cpp:314
 msgid "strikes"
 msgstr "ataques"
 
-#: src/unit_types.cpp:886
+#: src/unit_types.cpp:891
 msgid "chaotic"
 msgstr "caótico"
 
-#: src/unit_types.cpp:886
+#: src/unit_types.cpp:891
 msgid "lawful"
 msgstr "legal"
 
-#: src/unit_types.cpp:886
+#: src/unit_types.cpp:891
 msgid "neutral"
 msgstr "neutral"
 
@@ -7570,6 +7973,65 @@
 msgid "Deletion of the file failed."
 msgstr "Ha habido algún fallo en el proceso de borrado."
 
+#~ msgid "hp"
+#~ msgstr "pv"
+
+#~ msgid "xp"
+#~ msgstr "px"
+
+#~ msgid ""
+#~ "Armed with heavy mace, Bandits are adept at robbing and killing at night."
+#~ msgstr ""
+#~ "Armados con mazas, los bandidos son especialmente buenos matando y "
+#~ "robando de noche."
+
+#~ msgid "beak"
+#~ msgstr "pico"
+
+#~ msgid "Drake Guard"
+#~ msgstr "Draco guardián"
+
+#~ msgid "Drake Mage"
+#~ msgstr "Draco mago"
+
+#~ msgid ""
+#~ "Like all Mages, the Drake Mages are capable of using magic in battle."
+#~ msgstr ""
+#~ "Como todos los magos, el mago draco es capaz de usar magia en combate."
+
+#~ msgid "ice shot"
+#~ msgstr "golpe de hielo"
+
+#~ msgid "Drake Petit"
+#~ msgstr "Pequeño draco"
+
+#~ msgid "Drake Worker"
+#~ msgstr "Trabajador draco"
+
+#~ msgid "More advanced Drakes, the Workers fight with their own sharp claws."
+#~ msgstr ""
+#~ "Los trabajadores dracos, algo más avanzados, luchan con sus propias "
+#~ "garras, muy afiladas."
+
+#~ msgid "+Brazilian Translation"
+#~ msgstr "+Traducción brasileña"
+
+#~ msgid "Save"
+#~ msgstr "Guardar"
+
+#~ msgid ""
+#~ "The campaign has been installed. You will have to restart Wesnoth before "
+#~ "you can play it."
+#~ msgstr ""
+#~ "La campaña ha sido instalada. Tendrá que reiniciar Wesnoth para poder "
+#~ "jugar a ella."
+
+#~ msgid "Quit?"
+#~ msgstr "¿Salir?"
+
+#~ msgid "Recruit unit"
+#~ msgstr "Reclutar unidad"
+
 #~ msgid "You must have at least"
 #~ msgstr "Debe tener al menos"
 
@@ -8020,167 +8482,19 @@
 #~ msgid "Oh no, I'm defeated."
 #~ msgstr "¡Oh no!, he sido derrotado."
 
-#~ msgid ""
-#~ "My son!  I should have never brought him to this fight.  Now we are to "
-#~ "return to our caverns, and we will never go back."
-#~ msgstr ""
-#~ "¡Mi hijo! Nunca debería haberte metido en esta lucha. Vamos a las "
-#~ "cavernas y no volvamos a salir más."
-
-#~ msgid "Our troll friends are over.  Without them there is no hope."
-#~ msgstr "Nuestros aliados trolls se retiran, sin ellos no hay esperanza."
-
-#~ msgid "Argh!  I die!"
-#~ msgstr "¡Argh! ¡He sido derrotado!"
-
-#~ msgid ""
-#~ "We've succeeded!  We've passed through the Mountains of Haag!  Look at "
-#~ "these green hills!  The land of the free tribes is near now.  I can see "
-#~ "the walls of Barag-Gor in the distance."
-#~ msgstr ""
-#~ "¡Lo hemos conseguido! ¡Hemos atravesado las montañas! Mirad esas 
colinas "
-#~ "verdes, las tierras de las tribus libres están ahí. Puedo ver las "
-#~ "murallas de Barag-Gor allí a lo lejos."
-
-#~ msgid ""
-#~ "Blemaker, many thanks for your help in this fight.  Would you like to "
-#~ "join us in our journey with your son?  Your help would be very "
-#~ "appreciated!"
-#~ msgstr ""
-#~ "Blemaker, muchas gracias por tu ayuda en la batalla ¿te gustaría unirte 
a "
-#~ "nosotros en esta lucha junto a tu hijo? ¡Apreciaríamos mucho tu ayuda!"
-
-#~ msgid "Father, I'd like to join them.  Would you mind it?"
-#~ msgstr "Padre, me quiero unir a ellos ¿Te importa?"
-
-#~ msgid ""
-#~ "My son, you're old enough to discover the world.  Me, I have to stay "
-#~ "here.  But take care, there are plenty of creatures that seek our end, "
-#~ "like elves or humans.  They are as clever as merciless."
-#~ msgstr ""
-#~ "Hijo mío, eres mayor para descubrir el mundo. Yo tengo que quedarme 
aquí. "
-#~ "Pero ten cuidado, hay muchas criaturas que quieren matarnos, como elfos o "
-#~ "humanos. Son tan astutos como despiadados."
-
-#~ msgid "Thanks, father.  Don't worry, I'll take care of myself."
-#~ msgstr "Gracias, padre. No te preocupes, me cuidaré."
-
-#~ msgid ""
-#~ "Grüü, many thanks for your help in this fight.  I'm sorry for your "
-#~ "father.  Would you like to join us in our journey?  Your help would be "
-#~ "very appreciated!"
-#~ msgstr ""
-#~ "Grüü, muchas gracias por tu ayuda en la lucha, lo siento por tu padre. "
-#~ "¿Te gustaría unirte a nosotros? ¡Apreciaríamos mucho tu ayuda!"
-
-#~ msgid ""
-#~ "My father would have come to help you.  I would insult his memory not to "
-#~ "help you.  I come!"
-#~ msgstr ""
-#~ "Mi padre iría para ayudarte. Insultaría su memoria si no fuera. ¡Iré!"
-
 #~ msgid "Ouch!  This hurts!"
 #~ msgstr "¡Ouch! ¡Eso duele!"
 
-#~ msgid "The council will never be complete again.  This is hopeless."
-#~ msgstr "El concilio nunca se podrá volver a reunir, ya no hay esperanza."
-
 #~ msgid "Argh!  I'm done.  My people is doomed!"
 #~ msgstr "¡Argh! Estoy acabado. ¡Mi gente está condenada!"
 
-#~ msgid ""
-#~ "Rahul I, King of Wesnoth, concluded peace with orcs in his 4th year of "
-#~ "reign.  He ended a 15 year war with Black Eye Karun, ruler of the orcs.  "
-#~ "A peace treaty defined which lands were devoted to orcs or humans.  Years "
-#~ "that followed peace were prosperous."
-#~ msgstr ""
-#~ "Rahul I, rey de Wesnoth, firmó la paz con los Orcos en su 4º año de "
-#~ "reinado. Acabó con una guerra que duraba ya 15 años con Black Eye Karun. 
"
-#~ "El tratado claramente señalaba cuáles eran los límites de cada "
-#~ "territorio, y los años que siguieron a este tratado fueron prósperos y "
-#~ "pacíficos."
-
-#~ msgid ""
-#~ "In the thirteenth year of Howgarth III, tension began to rise between "
-#~ "Orcish tribes and human northern earldoms.  Famine led humans to colonize "
-#~ "some orcish lands and to push orcs to desolated hills."
-#~ msgstr ""
-#~ "En el decimotercer año de reinado de Howgart III, empezaron a surgir "
-#~ "tensiones entre los orcos y los hombres. Los condados del norte se "
-#~ "lanzaron a la colonización de las tierras al norte de sus límites, "
-#~ "llevados por el hambre. Los orcos se vieron forzados a refugiarse en las "
-#~ "colinas."
-
-#~ msgid ""
-#~ "Of course, this caused violent orcish riots as orcs systematically "
-#~ "slaughtered human colonies and villages that were on their lands.  Then, "
-#~ "earl Lanbec'h decided to definitively address the Orcish menace and "
-#~ "conferred a small army to his son-in-law baron Albert."
-#~ msgstr ""
-#~ "Por supuesto, esto produjo fortísimos ataques por parte de los orcos, que 
"
-#~ "sistemáticamente masacraron todas las aldeas humanas y colonos en sus "
-#~ "tierras. Entonces, el conde Lanbec'h decidió acabar de una vez por todas "
-#~ "con la amenaza orca y envió un pequeño ejército al mando de su hijo "
-#~ "político, el barón Albert."
-
-#~ msgid ""
-#~ "Baron Albert personally led a small vanguard with the mission to "
-#~ "establish a bridgehead inside Orcish lands."
-#~ msgstr ""
-#~ "El barón Albert dirigió personalmente una pequeña avanzadilla para "
-#~ "establecer una pequeña fortaleza en territorio orco."
-
 #~ msgid "A New Chance"
 #~ msgstr "Una nueva oportunidad"
 
-#~ msgid ""
-#~ "\n"
-#~ "Victory:\n"
-#~ "@Clear the land of monsters\n"
-#~ "Defeat:\n"
-#~ "#Death of Gwiti Ha'atel\n"
-#~ "#Turns run out"
-#~ msgstr ""
-#~ "\n"
-#~ "Victoria:\n"
-#~ "@Limpiar los terrenos de monstruos\n"
-#~ "Derrota:\n"
-#~ "#Muerte de Gwiti Ha'atel\n"
-#~ "#Fin de los turnos"
-
 #~ msgid "Brother Against Brother"
 #~ msgstr "Hermano contra Hermano"
 
 #~ msgid ""
-#~ "\n"
-#~ "Victory:\n"
-#~ "@Defeat your brother Nati Ha'atel\n"
-#~ "Defeat:\n"
-#~ "#Death of Gwiti Ha'atel\n"
-#~ "#Turns run out"
-#~ msgstr ""
-#~ "\n"
-#~ "Victoria:\n"
-#~ "@Derrota a tu hermano Nati Ha'atel\n"
-#~ "Derrota:\n"
-#~ "#Muerte de Gwiti Ha'atel\n"
-#~ "#Fin de los turnos"
-
-#~ msgid ""
-#~ "As the sun set, Gwiti discovered that his arch-rival and brother, Nati, "
-#~ "had already ensconced himself nearby."
-#~ msgstr ""
-#~ "Mientras el sol se ponía, Gwiti descubrío que su archirrival y hermano, "
-#~ "Nati, se había escondido cerca."
-
-#~ msgid ""
-#~ "Ah, hated brother mine. Look well upon the setting sun, for you shall not "
-#~ "live to see another in this land."
-#~ msgstr ""
-#~ "Ah, mi odiado hermano. Mira bien el sol, es la última vez que lo verás "
-#~ "ponerse en esta tierra."
-
-#~ msgid ""
 #~ "This land? Do you truly not know where we are? Then you are a greater "
 #~ "fool than I had thought."
 #~ msgstr ""
@@ -8301,22 +8615,6 @@
 #~ msgid "Inside the Tower"
 #~ msgstr "Dentro de la torre"
 
-#~ msgid ""
-#~ "If my memory serves, this tower should have three floors. I should be "
-#~ "able to find the Book in a few hours...!"
-#~ msgstr ""
-#~ "Si mi memoria no falla, esta torre tiene tres plantas. ¡Unas pocas horas "
-#~ "más y encontraremos el libro!"
-
-#~ msgid "Hayaargghh! We have arrived! Command us, Master!"
-#~ msgstr "¡Hayaargghh! ¡Hemos llegado! ¡Maestro, llévanos!"
-
-#~ msgid "There's a secret door here! This must be the library."
-#~ msgstr "¡Hay una puerta secreta aquí! ¡Esto debe ser la biblioteca!"
-
-#~ msgid "Well, well, well. Thirty-five pieces of gold were in this chest!"
-#~ msgstr "Bien, bien, bien, ¡hay 35 piezas de oro en este cofre!"
-
 #~ msgid "Blast it, the chest is empty!"
 #~ msgstr "¡Maldita sea, está vacío!"
 
@@ -8344,13 +8642,6 @@
 #~ msgid "Haha, this chest holds scores of gold coins!"
 #~ msgstr "¡Jaja, dentro de este cofre había montones de oro!"
 
-#~ msgid ""
-#~ "This is not the tome Crelanu wrote...hmmm... but it contains its "
-#~ "whereabouts!"
-#~ msgstr ""
-#~ "Este no es el libro que escribió Crelanu... Mmmmm... ¡pero dice dónde "
-#~ "está el libro que buscamos!"
-
 #~ msgid "We're done in here! Let's go slay some more enemies."
 #~ msgstr "¡Hemos acabado aquí ya! ¡A matar a más enemigos!"
 
@@ -8562,13 +8853,6 @@
 #~ msgid "File"
 #~ msgstr "Fichero"
 
-#~ msgid ""
-#~ "Bugg: Control of the seas! A small step for me, a great leap for all "
-#~ "goblinoids! *Glub*"
-#~ msgstr ""
-#~ "Bugg: ¡¡Controlad los mares!! ¡¡Un pequeño paso para mí, pero un 
gran "
-#~ "salto para los goblins!! *Glub*"
-
 #~ msgid "Race"
 #~ msgstr "Raza"
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]