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

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

[Wesnoth-cvs-commits] wesnoth/po wesnoth/ca.po wesnoth/cs.po wesnoth/...


From: Yann Dirson
Subject: [Wesnoth-cvs-commits] wesnoth/po wesnoth/ca.po wesnoth/cs.po wesnoth/...
Date: Thu, 21 Oct 2004 16:28:28 -0400

CVSROOT:        /cvsroot/wesnoth
Module name:    wesnoth
Branch:         
Changes by:     Yann Dirson <address@hidden>    04/10/21 20:22:42

Modified files:
        po/wesnoth     : ca.po cs.po da.po de.po el_GR.po es.po eu.po 
                         fi.po fr.po hu.po it.po nl.po no.po pl.po 
                         pt_BR.po ru.po sk.po sl.po sv.po wesnoth.pot 
        po/wesnoth-ei  : fr.po 
        po/wesnoth-httt: ca.po cs.po da.po de.po el_GR.po es.po eu.po 
                         fi.po fr.po hu.po it.po nl.po no.po pl.po 
                         pt_BR.po ru.po sk.po sl.po sv.po 
                         wesnoth-httt.pot 
        po/wesnoth-sotbe: ca.po cs.po da.po de.po el_GR.po es.po eu.po 
                          fi.po fr.po hu.po it.po nl.po no.po pl.po 
                          pt_BR.po ru.po sk.po sl.po sv.po 
                          wesnoth-sotbe.pot 

Log message:
        sync pot/po files with code

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/ca.po.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/cs.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/da.po.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/de.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/el_GR.po.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/es.po.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/eu.po.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/fi.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/fr.po.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/hu.po.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/it.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/nl.po.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/no.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/pl.po.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/pt_BR.po.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/ru.po.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/sk.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/sl.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/sv.po.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth/wesnoth.pot.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-ei/fr.po.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/ca.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/cs.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/da.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/de.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/el_GR.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/es.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/eu.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/fi.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/fr.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/hu.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/it.po.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/nl.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/no.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/pl.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/pt_BR.po.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/ru.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/sk.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/sl.po.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/sv.po.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-httt/wesnoth-httt.pot.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/ca.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/cs.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/da.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/de.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/el_GR.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/es.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/eu.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/fi.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/fr.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/hu.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/it.po.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/nl.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/no.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/pl.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/pt_BR.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/ru.po.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/sk.po.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/sl.po.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/sv.po.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/wesnoth/wesnoth/po/wesnoth-sotbe/wesnoth-sotbe.pot.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: wesnoth/po/wesnoth-ei/fr.po
diff -u wesnoth/po/wesnoth-ei/fr.po:1.6 wesnoth/po/wesnoth-ei/fr.po:1.7
--- wesnoth/po/wesnoth-ei/fr.po:1.6     Wed Oct 20 15:35:11 2004
+++ wesnoth/po/wesnoth-ei/fr.po Thu Oct 21 20:22:41 2004
@@ -1490,8 +1490,8 @@
 "Yes, the prophecy. I know of what the lich spoke. It all started in the "
 "reign of Haldric VII..."
 msgstr ""
-"Ah oui, la prophétie. Je sais ce dont parlait la liche. Tout a commencé "
-"au cours du règne d'Haldric VII..."
+"Ah oui, la prophétie. Je sais ce dont parlait la liche. Tout a commencé au "
+"cours du règne d'Haldric VII..."
 
 #: data/scenarios/Eastern_Invasion/Throne_Room.cfg:27
 msgid ""
@@ -1500,7 +1500,8 @@
 "worried."
 msgstr ""
 "Le plus grand devin du pays, Galdren, prédit qu'un jour, un jour prochain, "
-"un mal terrible s'étendrait sur tout le pays. Le roi, évidemment, était 
inquiet."
+"un mal terrible s'étendrait sur tout le pays. Le roi, évidemment, était "
+"inquiet."
 
 #: data/scenarios/Eastern_Invasion/Throne_Room.cfg:32
 msgid ""
@@ -1527,9 +1528,9 @@
 "new advisor."
 msgstr ""
 "Le roi, désireux de choisir un bon conseiller, nous envoya devant Galdren. "
-"Puis il s'entretint avec le devin en privé. Personne ne sait ce qui fut dit, 
mais "
-"lorsqu'il ressortit, il annonça que le devin était mort et qu'il m'avait 
choisi "
-"comme nouveau conseiller."
+"Puis il s'entretint avec le devin en privé. Personne ne sait ce qui fut dit, 
"
+"mais lorsqu'il ressortit, il annonça que le devin était mort et qu'il "
+"m'avait choisi comme nouveau conseiller."
 
 #: data/scenarios/Eastern_Invasion/Throne_Room.cfg:47
 msgid ""
@@ -1539,9 +1540,9 @@
 "his."
 msgstr ""
 "Ravan prit cela calmement, en tout cas nous le pensions, mais maintenant je "
-"crois que ce fut le début de sa chute. Il s'engagea dans de longues 
discussions avec les "
-"esprits des ténèbres, espérant découvrir leurs faiblesses, mais ce furent 
eux qui "
-"trouvèrent les siennes."
+"crois que ce fut le début de sa chute. Il s'engagea dans de longues "
+"discussions avec les esprits des ténèbres, espérant découvrir leurs "
+"faiblesses, mais ce furent eux qui trouvèrent les siennes."
 
 #: data/scenarios/Eastern_Invasion/Throne_Room.cfg:52
 msgid ""
@@ -1559,10 +1560,10 @@
 "respected member of the court. When I came out, he revealed himself, named "
 "himself Mal-Ravanal, and challenged me to a duel."
 msgstr ""
-"Un jour, il se déguisa et vint au château où j'habitais. Il exigea de me 
voir et "
-"les gardes le laissèrent entrer, car il était encore un membre éminent de "
-"la cour. Lorsque j'arrivais, il se dévoila, se présenta en tant que 
Mal-Ravanal, "
-"et me provoqua en duel."
+"Un jour, il se déguisa et vint au château où j'habitais. Il exigea de me "
+"voir et les gardes le laissèrent entrer, car il était encore un membre "
+"éminent de la cour. Lorsque j'arrivais, il se dévoila, se présenta en tant 
"
+"que Mal-Ravanal, et me provoqua en duel."
 
 #: data/scenarios/Eastern_Invasion/Throne_Room.cfg:62
 msgid ""
@@ -2198,7 +2199,8 @@
 
 #: data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:202
 msgid "Very well. But is this... Mal-Ravanal, that you spoke of, is he here?"
-msgstr "Très bien. Mais est-ce... Mal-Ravanal, dont vous parliez, est-il en 
ce lieu ?"
+msgstr ""
+"Très bien. Mais est-ce... Mal-Ravanal, dont vous parliez, est-il en ce lieu 
?"
 
 #: data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:207
 msgid "I do not think so, but he might be here, hiding."
@@ -2241,13 +2243,13 @@
 "Gweddry, as a commander, are a coward. You claim to have defeated my lord's "
 "captains, but it was really your hordes, not you."
 msgstr ""
-"Il dit : Bien, vous avez vaincu certains de mes capitaines. Bon travail. Mais 
c'était juste "
-"une petite partie de ma horde. Il me serait aisé de vous vaincre. Mais je ne 
"
-"pense pas que cela rende honneur à ma puissance. Je parle de mon pouvoir "
-"personnel, pas de celui de mes légions. Et cela m'amène à mon second 
point. "
-"Vous, Gweddry, en tant que commandant, vous êtes un lâche. Vous prétendez "
-"avoir vaincu les capitaines de mon seigneur, mais cette victoire est celle de 
"
-"vos hordes, pas la vôtre."
+"Il dit : Bien, vous avez vaincu certains de mes capitaines. Bon travail. "
+"Mais c'était juste une petite partie de ma horde. Il me serait aisé de vous 
"
+"vaincre. Mais je ne pense pas que cela rende honneur à ma puissance. Je "
+"parle de mon pouvoir personnel, pas de celui de mes légions. Et cela 
m'amène "
+"à mon second point. Vous, Gweddry, en tant que commandant, vous êtes un "
+"lâche. Vous prétendez avoir vaincu les capitaines de mon seigneur, mais "
+"cette victoire est celle de vos hordes, pas la vôtre."
 
 #: data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:295
 msgid "What is the point of this message? All you do is insult us!"
@@ -2270,8 +2272,8 @@
 "What are his terms? I won't accept anything obviously weighted towards his "
 "victory!"
 msgstr ""
-"Quelles sont ses conditions ? Je n'accepterai rien qui soit évidemment 
biaisé "
-"en sa faveur !'"
+"Quelles sont ses conditions ? Je n'accepterai rien qui soit évidemment "
+"biaisé en sa faveur !'"
 
 #: data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:310
 msgid ""
@@ -2280,8 +2282,9 @@
 "the death, until either you or he is destroyed!"
 msgstr ""
 "Cela ne fait que prouver que vous êtes un lâche. Qu'importe, voici ses "
-"conditions : prenez vos six meilleurs guerriers et je prendrai les six miens. 
"
-"Puis nous combattrons jusqu'au trépas, soit votre mort, soit sa destruction."
+"conditions : prenez vos six meilleurs guerriers et je prendrai les six "
+"miens. Puis nous combattrons jusqu'au trépas, soit votre mort, soit sa "
+"destruction."
 
 #: data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg:315
 msgid ""
Index: wesnoth/po/wesnoth-httt/ca.po
diff -u wesnoth/po/wesnoth-httt/ca.po:1.3 wesnoth/po/wesnoth-httt/ca.po:1.4
--- wesnoth/po/wesnoth-httt/ca.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/ca.po       Thu Oct 21 20:22:41 2004
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: wesnoth\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-05 14:33+0200\n"
 "Last-Translator: Jordà Polo <address@hidden>\n"
 "Language-Team: Català\n"
@@ -341,6 +341,54 @@
 "#Mort de Kalenz\n"
 "#Fi dels torns"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "La Badia de les Perles"
Index: wesnoth/po/wesnoth-httt/cs.po
diff -u wesnoth/po/wesnoth-httt/cs.po:1.3 wesnoth/po/wesnoth-httt/cs.po:1.4
--- wesnoth/po/wesnoth-httt/cs.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/cs.po       Thu Oct 21 20:22:41 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-30 12:32+0200\n"
 "Last-Translator: David Nečas <address@hidden>\n"
 "Language-Team: Czech\n"
@@ -332,6 +332,54 @@
 "#Smrt Kalenze\n"
 "Vyčerpání počtu kol"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "Zatoka perel"
Index: wesnoth/po/wesnoth-httt/da.po
diff -u wesnoth/po/wesnoth-httt/da.po:1.3 wesnoth/po/wesnoth-httt/da.po:1.4
--- wesnoth/po/wesnoth-httt/da.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/da.po       Thu Oct 21 20:22:41 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: wesnoth-httt\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-12 22:23+0200\n"
 "Last-Translator: Mathias Bundgaard Svensson <address@hidden>\n"
 "Language-Team:  <address@hidden>\n"
@@ -380,6 +380,55 @@
 "#Kalenz dør\n"
 "#Løber tør for ture"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "Jeg tror du tager fejl! Du vil hjælpe mig med at blive dronning!"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "Perlebugten"
Index: wesnoth/po/wesnoth-httt/de.po
diff -u wesnoth/po/wesnoth-httt/de.po:1.3 wesnoth/po/wesnoth-httt/de.po:1.4
--- wesnoth/po/wesnoth-httt/de.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/de.po       Thu Oct 21 20:22:41 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-11 12:11+0100\n"
 "Last-Translator: Christoph Berg <address@hidden>\n"
 "Language-Team: none\n"
@@ -273,6 +273,54 @@
 "#Turns run out"
 msgstr ""
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr ""
Index: wesnoth/po/wesnoth-httt/el_GR.po
diff -u wesnoth/po/wesnoth-httt/el_GR.po:1.3 
wesnoth/po/wesnoth-httt/el_GR.po:1.4
--- wesnoth/po/wesnoth-httt/el_GR.po:1.3        Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/el_GR.po    Thu Oct 21 20:22:41 2004
@@ -8,7 +8,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-03 14:33+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -270,6 +270,54 @@
 "#Turns run out"
 msgstr ""
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr ""
Index: wesnoth/po/wesnoth-httt/es.po
diff -u wesnoth/po/wesnoth-httt/es.po:1.4 wesnoth/po/wesnoth-httt/es.po:1.5
--- wesnoth/po/wesnoth-httt/es.po:1.4   Mon Oct 18 17:09:13 2004
+++ wesnoth/po/wesnoth-httt/es.po       Thu Oct 21 20:22:41 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.6-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-18 13:30+0200\n"
 "Last-Translator: David Martínez Moreno <address@hidden>\n"
 "Language-Team:  David Martínez Moreno <address@hidden>\n"
@@ -370,6 +370,55 @@
 "#Muerte de Kalenz\n"
 "#Fin de los turnos"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "¡Creo que os confundís! ¡"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "La Bahía de las Perlas"
Index: wesnoth/po/wesnoth-httt/eu.po
diff -u wesnoth/po/wesnoth-httt/eu.po:1.3 wesnoth/po/wesnoth-httt/eu.po:1.4
--- wesnoth/po/wesnoth-httt/eu.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/eu.po       Thu Oct 21 20:22:41 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-02 21:57+0200\n"
 "Last-Translator:  Alfredo Beaumont Sainz <address@hidden>\n"
 "Language-Team: Basque\n"
@@ -272,6 +272,54 @@
 "#Turns run out"
 msgstr ""
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr ""
Index: wesnoth/po/wesnoth-httt/fi.po
diff -u wesnoth/po/wesnoth-httt/fi.po:1.3 wesnoth/po/wesnoth-httt/fi.po:1.4
--- wesnoth/po/wesnoth-httt/fi.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/fi.po       Thu Oct 21 20:22:41 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-08-08 15:00+0200\n"
 "Last-Translator: Pasi Kallinen <address@hidden>\n"
 "Language-Team: none\n"
@@ -271,6 +271,54 @@
 "#Turns run out"
 msgstr ""
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr ""
Index: wesnoth/po/wesnoth-httt/fr.po
diff -u wesnoth/po/wesnoth-httt/fr.po:1.3 wesnoth/po/wesnoth-httt/fr.po:1.4
--- wesnoth/po/wesnoth-httt/fr.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/fr.po       Thu Oct 21 20:22:41 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-29 23:24+0200\n"
 "Last-Translator: Wesnoth French Translation Team <address@hidden>\n"
 "Language-Team: Language fr\n"
@@ -386,6 +386,55 @@
 "#Mort de Kalenz\n"
 "#Expiration des tours"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "Je dirais que vous faites erreur ! Vous m'aiderez à devenir reine !"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "La baie des perles"
Index: wesnoth/po/wesnoth-httt/hu.po
diff -u wesnoth/po/wesnoth-httt/hu.po:1.3 wesnoth/po/wesnoth-httt/hu.po:1.4
--- wesnoth/po/wesnoth-httt/hu.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/hu.po       Thu Oct 21 20:22:41 2004
@@ -7,7 +7,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-10 12:29+0200\n"
 "Last-Translator: Széll Tamás <address@hidden>\n"
 "Language-Team: none\n"
@@ -321,6 +321,54 @@
 "#Turns run out"
 msgstr ""
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "A Gyöngyök Öble"
Index: wesnoth/po/wesnoth-httt/it.po
diff -u wesnoth/po/wesnoth-httt/it.po:1.5 wesnoth/po/wesnoth-httt/it.po:1.6
--- wesnoth/po/wesnoth-httt/it.po:1.5   Tue Oct 19 21:35:14 2004
+++ wesnoth/po/wesnoth-httt/it.po       Thu Oct 21 20:22:41 2004
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-19 21:33+0100\n"
 "Last-Translator: RokStar <address@hidden>\n"
 "Language-Team: none\n"
@@ -361,6 +361,55 @@
 "#Morte di Kalenz\n"
 "#Fine dei turni a disposizione"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "Vi state sbagliando! Aiuterete me a divenire Regina!"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "La Baia delle Perle"
Index: wesnoth/po/wesnoth-httt/nl.po
diff -u wesnoth/po/wesnoth-httt/nl.po:1.3 wesnoth/po/wesnoth-httt/nl.po:1.4
--- wesnoth/po/wesnoth-httt/nl.po:1.3   Sun Oct 17 12:52:43 2004
+++ wesnoth/po/wesnoth-httt/nl.po       Thu Oct 21 20:22:41 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-16 15:12-0000\n"
 "Last-Translator: Pieter Vermeylen <address@hidden>\n"
 "Language-Team: dutch\n"
@@ -370,6 +370,55 @@
 "#Dood van Kalenz\n"
 "#Beurten zijn om"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "Ik denk dat je je vergist! Je zult mij helpen koningin te worden!"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "De Parelbaai"
Index: wesnoth/po/wesnoth-httt/no.po
diff -u wesnoth/po/wesnoth-httt/no.po:1.3 wesnoth/po/wesnoth-httt/no.po:1.4
--- wesnoth/po/wesnoth-httt/no.po:1.3   Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-httt/no.po       Thu Oct 21 20:22:41 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-18 20:18+0100\n"
 "Last-Translator: Erik <address@hidden>\n"
 "Language-Team: none\n"
@@ -358,6 +358,55 @@
 "#Li'sar dør\n"
 "#Kalenz dør"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "Jeg tror dere tar feil! Dere skal hjelpe meg bli dronning!"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "Perlebukta"
Index: wesnoth/po/wesnoth-httt/pl.po
diff -u wesnoth/po/wesnoth-httt/pl.po:1.3 wesnoth/po/wesnoth-httt/pl.po:1.4
--- wesnoth/po/wesnoth-httt/pl.po:1.3   Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-httt/pl.po       Thu Oct 21 20:22:41 2004
@@ -2,7 +2,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-08-08 15:00+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -265,6 +265,54 @@
 "#Turns run out"
 msgstr ""
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr ""
Index: wesnoth/po/wesnoth-httt/pt_BR.po
diff -u wesnoth/po/wesnoth-httt/pt_BR.po:1.5 
wesnoth/po/wesnoth-httt/pt_BR.po:1.6
--- wesnoth/po/wesnoth-httt/pt_BR.po:1.5        Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-httt/pt_BR.po    Thu Oct 21 20:22:41 2004
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-09 18:28+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -381,6 +381,55 @@
 "#Morte de Kalenz\n"
 "#Fim dos turnos"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "Eu acho que você está enganado! Você irá ME ajudar a virar rainha!"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "A Baía das Pérolas"
Index: wesnoth/po/wesnoth-httt/ru.po
diff -u wesnoth/po/wesnoth-httt/ru.po:1.7 wesnoth/po/wesnoth-httt/ru.po:1.8
--- wesnoth/po/wesnoth-httt/ru.po:1.7   Wed Oct 20 15:59:38 2004
+++ wesnoth/po/wesnoth-httt/ru.po       Thu Oct 21 20:22:41 2004
@@ -2,7 +2,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-20 18:00+0300\n"
 "Last-Translator: Alexandr Menovchicov <address@hidden>\n"
 "Language-Team: none\n"
@@ -284,6 +284,54 @@
 "#Смерть Каленза\n"
 "#Конец количества разрешённых ходов"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "Залив жемчуга!"
Index: wesnoth/po/wesnoth-httt/sk.po
diff -u wesnoth/po/wesnoth-httt/sk.po:1.3 wesnoth/po/wesnoth-httt/sk.po:1.4
--- wesnoth/po/wesnoth-httt/sk.po:1.3   Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-httt/sk.po       Thu Oct 21 20:22:41 2004
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-20 17:12+0200\n"
 "Last-Translator: Viliam Búr <address@hidden>\n"
 "Language-Team: none\n"
@@ -355,6 +355,55 @@
 "#Zomrie Kalenz\n"
 "#Vyprší čas"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "To si nejako pletieš! Zo mňa bude kráľovná!"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "Perlový záliv"
Index: wesnoth/po/wesnoth-httt/sl.po
diff -u wesnoth/po/wesnoth-httt/sl.po:1.2 wesnoth/po/wesnoth-httt/sl.po:1.3
--- wesnoth/po/wesnoth-httt/sl.po:1.2   Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-httt/sl.po       Thu Oct 21 20:22:41 2004
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.6-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-08-08 15:00+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -265,6 +265,54 @@
 "#Turns run out"
 msgstr ""
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr ""
Index: wesnoth/po/wesnoth-httt/sv.po
diff -u wesnoth/po/wesnoth-httt/sv.po:1.6 wesnoth/po/wesnoth-httt/sv.po:1.7
--- wesnoth/po/wesnoth-httt/sv.po:1.6   Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-httt/sv.po       Thu Oct 21 20:22:41 2004
@@ -2,7 +2,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-15 17:22+0200\n"
 "Last-Translator: tephlon\n"
 "Language-Team: Swedish\n"
@@ -364,6 +364,55 @@
 "#Kalenz dör\n"
 "#Dragen tar slut"
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+#, fuzzy
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr "Ni tar fel! Ni kommer att hjälpa mig att bli drottning!"
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr "Pärlbukten"
Index: wesnoth/po/wesnoth-httt/wesnoth-httt.pot
diff -u wesnoth/po/wesnoth-httt/wesnoth-httt.pot:1.3 
wesnoth/po/wesnoth-httt/wesnoth-httt.pot:1.4
--- wesnoth/po/wesnoth-httt/wesnoth-httt.pot:1.3        Sun Oct 17 12:47:50 2004
+++ wesnoth/po/wesnoth-httt/wesnoth-httt.pot    Thu Oct 21 20:22:41 2004
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -264,6 +264,54 @@
 "#Turns run out"
 msgstr ""
 
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:142
+msgid ""
+"So, these rebels come at last to face me, while most of my army is off "
+"fighting the fickle clans."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:146
+msgid ""
+"Surrender, mother. The land's blood is spent. I have come to take my "
+"rightful place."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:150
+msgid ""
+"Ahh. My own daughter, a turncoat. So it is true. Such treason my reign must "
+"endure! But endure it will."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:154
+msgid ""
+"How long must the people endure your rule? Give the throne to your daughter. "
+"She is the rightful heir. We even hold the scepter to prove it!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:158
+msgid ""
+"Delfador! My old tormentor! Treason! Men! Seize them! Kill them! Kill them "
+"all!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:169
+msgid "Treason! The evil ones have slain me!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:173
+msgid "And so passes Asheviere, the dark queen of Wesnoth."
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:177
+msgid "We have won at last! Li'sar! You will be queen!"
+msgstr ""
+
+#: data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg:181
+msgid ""
+"Yes, but I won't ever forget what you have done for me, Konrad, Delfador, "
+"and Kalenz."
+msgstr ""
+
 #: data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg:4
 msgid "The Bay of Pearls"
 msgstr ""
Index: wesnoth/po/wesnoth-sotbe/ca.po
diff -u wesnoth/po/wesnoth-sotbe/ca.po:1.3 wesnoth/po/wesnoth-sotbe/ca.po:1.4
--- wesnoth/po/wesnoth-sotbe/ca.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/ca.po      Thu Oct 21 20:22:41 2004
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: wesnoth\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-05 14:33+0200\n"
 "Last-Translator: Jordà Polo <address@hidden>\n"
 "Language-Team: Català\n"
@@ -229,7 +229,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -267,16 +267,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/cs.po
diff -u wesnoth/po/wesnoth-sotbe/cs.po:1.3 wesnoth/po/wesnoth-sotbe/cs.po:1.4
--- wesnoth/po/wesnoth-sotbe/cs.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/cs.po      Thu Oct 21 20:22:41 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-13 12:28+0200\n"
 "Last-Translator: David Nečas <address@hidden>\n"
 "Language-Team: Czech\n"
@@ -254,9 +254,10 @@
 msgstr "A když ne?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 "Tak dobijí Prestim silou pěti na jednoho, a budeme se už jen modlit k 
matce "
 "zemi."
@@ -299,22 +300,26 @@
 "nikdy neuvidíme."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "Je načase jim ukázat, kdo je tu pánem. Vyšleme Mocnou hordu, aby "
 "pronásledovala ustupující jednotky. Nedáme jim spát, dokud nedostaneme "
 "hraběte Lanbeca!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "A tak se ještě setkáme v druhé kapitole, Syn Černého oka II, Mocná 
horda."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "Ne! Zdi Prestimu jsou v troskách. Jsme ztraceni!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/da.po
diff -u wesnoth/po/wesnoth-sotbe/da.po:1.4 wesnoth/po/wesnoth-sotbe/da.po:1.5
--- wesnoth/po/wesnoth-sotbe/da.po:1.4  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/da.po      Thu Oct 21 20:22:41 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: wesnoth-sotbe\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-12 21:47+0200\n"
 "Last-Translator: Mathias Bundgaard Svensson <address@hidden>\n"
 "Language-Team:  <address@hidden>\n"
@@ -265,9 +265,10 @@
 msgstr "Og hvis vi fejler?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr "Så vil de angribe Prestim fem til en. Vi må bare bede for moder 
jord."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -308,21 +309,25 @@
 "borge, og vil ikke komme ud af dem."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "Nu er det tid til at vise dem hvem vi er og lede den Store Folk om bag dem! "
 "De vil ikke finde hvile før vi har gjort Earl Lanbec'h fattig!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "Kapou'e vil komme tilbage i Søn af det Storte Øje kapitel II, Det Store 
Flok."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "Nej, Prestims mure er ødelagt, vi er færdige!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/de.po
diff -u wesnoth/po/wesnoth-sotbe/de.po:1.3 wesnoth/po/wesnoth-sotbe/de.po:1.4
--- wesnoth/po/wesnoth-sotbe/de.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/de.po      Thu Oct 21 20:22:42 2004
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-20 10:10+0100\n"
 "Last-Translator: Christoph Berg <address@hidden>\n"
 "Language-Team: none\n"
@@ -273,9 +273,10 @@
 msgstr "Und wenn wir versagen?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr "Dann werden szie die Sztadt einnehmen."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -316,23 +317,27 @@
 "sich in seinen Festungen verkrichen und so bald nicht mehr herauskommen."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "Jetzt ist es Zeit, den Krieg in das Land unserer Feinde zu tragen! Die Große 
"
 "Horde wird nicht eher ruhen, als bis wir Graf Lanbec'h gefunden und getötet "
 "haben!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "Kapou'e wird zurückkommen im zweiten Teil der Kampagne mit dem Titel 'Die "
 "Große Horde'."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "Nein! Einer der Türme wurde zerstört. Wir haben verloren!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/el_GR.po
diff -u wesnoth/po/wesnoth-sotbe/el_GR.po:1.3 
wesnoth/po/wesnoth-sotbe/el_GR.po:1.4
--- wesnoth/po/wesnoth-sotbe/el_GR.po:1.3       Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/el_GR.po   Thu Oct 21 20:22:42 2004
@@ -8,7 +8,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-03 14:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -210,7 +210,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -248,16 +248,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/es.po
diff -u wesnoth/po/wesnoth-sotbe/es.po:1.7 wesnoth/po/wesnoth-sotbe/es.po:1.8
--- wesnoth/po/wesnoth-sotbe/es.po:1.7  Mon Oct 18 18:11:35 2004
+++ wesnoth/po/wesnoth-sotbe/es.po      Thu Oct 21 20:22:42 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.6-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-18 13:15+0200\n"
 "Last-Translator: David Martínez Moreno <address@hidden>\n"
 "Language-Team: David Martínez Moreno <address@hidden>\n"
@@ -257,9 +257,10 @@
 msgstr "¿Y si fallamos?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 "Entonces asaltarán Prestim en una proporción de cinco a uno. Que la madre "
 "tierra nos asista."
@@ -302,20 +303,24 @@
 "a su fortaleza y no creo que salgan de ahí."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "¡Es hora de mostrarles quiénes somos y de llevar a la Gran Horda detrás "
 "suyo! ¡No tendrán descanso hasta que acabemos con Earl Lanbec'h!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr "Kapou'e volverá en El hijo de Ojonegro, capítulo II: «La Gran 
Horda»."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "¡No! ¡Han destruido los muros de Prestim! ¡Estamos acabados!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/eu.po
diff -u wesnoth/po/wesnoth-sotbe/eu.po:1.3 wesnoth/po/wesnoth-sotbe/eu.po:1.4
--- wesnoth/po/wesnoth-sotbe/eu.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/eu.po      Thu Oct 21 20:22:42 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-02 21:57+0200\n"
 "Last-Translator:  Alfredo Beaumont Sainz <address@hidden>\n"
 "Language-Team: Basque\n"
@@ -210,7 +210,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -248,16 +248,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/fi.po
diff -u wesnoth/po/wesnoth-sotbe/fi.po:1.3 wesnoth/po/wesnoth-sotbe/fi.po:1.4
--- wesnoth/po/wesnoth-sotbe/fi.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/fi.po      Thu Oct 21 20:22:42 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-08-08 15:00+0200\n"
 "Last-Translator: Pasi Kallinen <address@hidden>\n"
 "Language-Team: none\n"
@@ -211,7 +211,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -249,16 +249,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/fr.po
diff -u wesnoth/po/wesnoth-sotbe/fr.po:1.3 wesnoth/po/wesnoth-sotbe/fr.po:1.4
--- wesnoth/po/wesnoth-sotbe/fr.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/fr.po      Thu Oct 21 20:22:42 2004
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.7.11-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-05 19:06+0200\n"
 "Last-Translator: Wesnoth French Translation Team <address@hidden>\n"
 "Language-Team: Language fr\n"
@@ -271,9 +271,10 @@
 msgstr "Et si nous échouons ?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 "Lorsqu'ils assailliront Prestim à cinq contre un, nous devrons simplement "
 "prier la Terre nourricière."
@@ -317,22 +318,26 @@
 "dans leurs forteresses et n'en sortiront plus."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "Il est maintenant temps de leur montrer qui nous sommes et de mener la "
 "Grande Horde à leurs trousses ! Ils ne connaitront pas le repos tant que "
 "nous n'aurons pas destitué le comte Lanbec'h !"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "Kapou'e reviendra dans le fils de l'Œil Noir, chapitre II 'La GrandeHorde'."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "NON ! Les murs de Prestim ont été détruits, nous sommes perdus !"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/hu.po
diff -u wesnoth/po/wesnoth-sotbe/hu.po:1.3 wesnoth/po/wesnoth-sotbe/hu.po:1.4
--- wesnoth/po/wesnoth-sotbe/hu.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/hu.po      Thu Oct 21 20:22:42 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: wesnoth-sotbe\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-10 12:29+0200\n"
 "Last-Translator: Széll Tamás <address@hidden>\n"
 "Language-Team: Hungarian <address@hidden>\n"
@@ -225,7 +225,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -263,18 +263,21 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "Kapou'e vissza fog térni a Sötét Sem fiának második részében, a ,,Nagy 
"
 "Hordában''."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "Nem! Prestim falai összeomlottak, végünk van!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/it.po
diff -u wesnoth/po/wesnoth-sotbe/it.po:1.4 wesnoth/po/wesnoth-sotbe/it.po:1.5
--- wesnoth/po/wesnoth-sotbe/it.po:1.4  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/it.po      Thu Oct 21 20:22:42 2004
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-16 11:12+0100\n"
 "Last-Translator: RokStar <address@hidden>\n"
 "Language-Team: none\n"
@@ -250,9 +250,10 @@
 msgstr "E se falliamo?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 "Allora assalteranno Prestim cinque contro uno. Dovremmo pregare madre terra."
 
@@ -293,22 +294,26 @@
 "nelle loro fortezze e non ne usciranno."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "Questo è il momento di mostrargli chi siamo, guidando la Grande Orda contro "
 "di loro! Non avranno riposo finché non riusciremo a destituire Earl 
Lanbec'h!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "Kapou'e tornerà di nuovo in 'Il figlio di Black Eye capirolo II, La Grande "
 "Orda'."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "No! Le mura di prestim sono state distrutte, siamo finiti!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/nl.po
diff -u wesnoth/po/wesnoth-sotbe/nl.po:1.3 wesnoth/po/wesnoth-sotbe/nl.po:1.4
--- wesnoth/po/wesnoth-sotbe/nl.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/nl.po      Thu Oct 21 20:22:42 2004
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-16 14:47-0000\n"
 "Last-Translator: Pieter Vermeylen <address@hidden>\n"
 "Language-Team: none\n"
@@ -267,9 +267,10 @@
 msgstr "En indien we falen."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 "Dan zullen ze Prestim vijf man tegen een aanvallen. We zullen tot moeder "
 "aarde moeten bidden dan."
@@ -311,23 +312,27 @@
 "niet meer durven buiten te komen."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "Het is tijd om de mensen te tonen wie we zijn! Het is tijd om de Grote Meute "
 "op hun achterhoede te laten inbeuken! De Grote Meute zal niet rusten "
 "vooraleer Graaf Lanbec'h een dakloze is!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "Kapou'e zal terugkomen in Zoon van het Zwarte Oog hoofdstuk II, De Grote "
 "Meute."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "Nee! De muren van prestim hebben het begeven, we zijn er geweest!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/no.po
diff -u wesnoth/po/wesnoth-sotbe/no.po:1.3 wesnoth/po/wesnoth-sotbe/no.po:1.4
--- wesnoth/po/wesnoth-sotbe/no.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/no.po      Thu Oct 21 20:22:42 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-18 20:19+0100\n"
 "Last-Translator: Erik <address@hidden>\n"
 "Language-Team: none\n"
@@ -246,9 +246,10 @@
 msgstr "Og om vi ikke kan det?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr "Da vil de angripe Prestim fem mot en. Vi må bare be moder jord."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -287,20 +288,24 @@
 "festningene sine og kommer ikke ut av dem."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "NÃ¥ skal vi vise dem hvem vi er og lede Storhorden etter dem! De skal ikke 
få "
 "hvile før jarl Lanbec'h har mistet alt!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr "Kapou'e vil komme tilbake i Sortøyes Sønn kapittel II, 'Storhorden'."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "Nei! Prestims murer er falt, det er ute med oss!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/pl.po
diff -u wesnoth/po/wesnoth-sotbe/pl.po:1.3 wesnoth/po/wesnoth-sotbe/pl.po:1.4
--- wesnoth/po/wesnoth-sotbe/pl.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/pl.po      Thu Oct 21 20:22:42 2004
@@ -2,7 +2,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-08-08 15:00+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -205,7 +205,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -243,16 +243,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/pt_BR.po
diff -u wesnoth/po/wesnoth-sotbe/pt_BR.po:1.3 
wesnoth/po/wesnoth-sotbe/pt_BR.po:1.4
--- wesnoth/po/wesnoth-sotbe/pt_BR.po:1.3       Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/pt_BR.po   Thu Oct 21 20:22:42 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-11 21:11+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -211,7 +211,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -249,16 +249,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/ru.po
diff -u wesnoth/po/wesnoth-sotbe/ru.po:1.7 wesnoth/po/wesnoth-sotbe/ru.po:1.8
--- wesnoth/po/wesnoth-sotbe/ru.po:1.7  Wed Oct 20 15:59:39 2004
+++ wesnoth/po/wesnoth-sotbe/ru.po      Thu Oct 21 20:22:42 2004
@@ -2,7 +2,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-20 18:08+0300\n"
 "Last-Translator: Alexandr Menovchicov <address@hidden>\n"
 "Language-Team: none\n"
@@ -207,7 +207,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -245,16 +245,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/sk.po
diff -u wesnoth/po/wesnoth-sotbe/sk.po:1.3 wesnoth/po/wesnoth-sotbe/sk.po:1.4
--- wesnoth/po/wesnoth-sotbe/sk.po:1.3  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/sk.po      Thu Oct 21 20:22:42 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-09-20 17:12+0200\n"
 "Last-Translator: Viliam Búr <address@hidden>\n"
 "Language-Team: none\n"
@@ -244,9 +244,10 @@
 msgstr "A ak nie?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 "Potom zaútočia na Prestim v presile piati na jedného. Nech nám je matka 
zem "
 "milostivá."
@@ -287,22 +288,26 @@
 "morálku ľudí. Teraz ustúpia do svojich pevností a nevylezú z nich."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "Prišiel čas ukázať im, kto sme, a viesť Veľkú Hordu za nimi! Nebudú 
mať "
 "pokoja, kým nepadne gróf Lanbec'h!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "Kapou'e sa ešte ukáže v druhej kapitole kampane Syn Čierneho Oka: 
'Veľká "
 "Horda'."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "Nie! Múry Prestimi sú zničené, je s nami koniec!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/sl.po
diff -u wesnoth/po/wesnoth-sotbe/sl.po:1.2 wesnoth/po/wesnoth-sotbe/sl.po:1.3
--- wesnoth/po/wesnoth-sotbe/sl.po:1.2  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/sl.po      Thu Oct 21 20:22:42 2004
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.6-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-08-08 15:00+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -205,7 +205,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -243,16 +243,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/sv.po
diff -u wesnoth/po/wesnoth-sotbe/sv.po:1.5 wesnoth/po/wesnoth-sotbe/sv.po:1.6
--- wesnoth/po/wesnoth-sotbe/sv.po:1.5  Sun Oct 17 12:52:44 2004
+++ wesnoth/po/wesnoth-sotbe/sv.po      Thu Oct 21 20:22:42 2004
@@ -2,7 +2,7 @@
 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-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: 2004-10-16 02:43+0200\n"
 "Last-Translator: tephlon\n"
 "Language-Team: Swedish\n"
@@ -251,9 +251,10 @@
 msgstr "Och om vi misslyckas?"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
+#, fuzzy
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 "Då kommer de att anfalla Prestim med fem mot en. Vi får helt enkelt be till 
"
 "moder jord."
@@ -297,21 +298,25 @@
 "kärntorn, och vågar sig säkert inte ut igen."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
+#, fuzzy
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 "Det är nu dags att visa dem vilka vi är, och att leda den stora horden mot "
 "dem! De kommer inte att få någon ro tills vi har utblottat Greve Lanbec'h!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
+#, fuzzy
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 "Kapou'e kommer tillbaka i Svartögats son, kapitel II, 'Den Stora Horden'."
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+#, fuzzy
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr "Nej! Prestims murar har fallit, vi är förlorade!"
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth-sotbe/wesnoth-sotbe.pot
diff -u wesnoth/po/wesnoth-sotbe/wesnoth-sotbe.pot:1.4 
wesnoth/po/wesnoth-sotbe/wesnoth-sotbe.pot:1.5
--- wesnoth/po/wesnoth-sotbe/wesnoth-sotbe.pot:1.4      Sun Oct 17 12:47:50 2004
+++ wesnoth/po/wesnoth-sotbe/wesnoth-sotbe.pot  Thu Oct 21 20:22:42 2004
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:44+0200\n"
+"POT-Creation-Date: 2004-10-21 22:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -204,7 +204,7 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:257
 msgid ""
 "Then they will assault Prestim at five versus one.  We'll just have to pray "
-"mother earth."
+"Mother earth."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:263
@@ -242,16 +242,17 @@
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:425
 msgid ""
 "It is now time to show them who we are and to lead the Great Horde to their "
-"tails!  They won't have a rest untill we'll destitute Earl Lanbec'h!"
+"tails!  They won't have a rest until we'll destitute Earl Lanbec'h!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:432
 msgid ""
-"Kapou'e will come back in Son of the Black Eye chapter II, 'The Great Horde'."
+"Kapou'e will come back in Son of the Black Eye, chapter II: 'The Great "
+"Horde'."
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg:449
-msgid "No!  The walls of prestim are destroyed, we are done!"
+msgid "No!  The walls of Prestim are destroyed, we are done!"
 msgstr ""
 
 #: data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg:8
Index: wesnoth/po/wesnoth/ca.po
diff -u wesnoth/po/wesnoth/ca.po:1.9 wesnoth/po/wesnoth/ca.po:1.10
--- wesnoth/po/wesnoth/ca.po:1.9        Sun Oct 17 12:52:51 2004
+++ wesnoth/po/wesnoth/ca.po    Thu Oct 21 20:22:40 2004
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ca\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-10-12 16:23+0200\n"
 "Last-Translator: Jordà Polo <address@hidden>\n"
 "Language-Team: Català\n"
@@ -19,7 +19,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "lleial"
 
@@ -51,11 +51,11 @@
 msgid "Traits"
 msgstr "Trets"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr ""
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr ""
 
@@ -194,7 +194,7 @@
 "<ref>dst=income_and_upkeep text='Guanys i manteniment'</ref> per a més "
 "informació."
 
-#: data/help.cfg:84 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:84 src/help.cpp:747 src/help.cpp:748
 msgid "Movement"
 msgstr "Moviment"
 
@@ -499,7 +499,7 @@
 "<ref>dst=abilities text='habilitats'</ref>, però ara ja sabeu tot el que "
 "necessiteu per jugar la campanya Hereu al tron. Divertiu-vos, i bona sort!"
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr "Quant a"
 
@@ -749,7 +749,7 @@
 msgstr "Per defecte"
 
 #: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:196
-#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:658
+#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:663
 msgid "&random-enemy.png,Random"
 msgstr "&random-enemy.png,Aleatori"
 
@@ -866,6 +866,24 @@
 msgid "Random map"
 msgstr "Mapa aleatori"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Mapa aleatori"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Mapa aleatori"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Mapa aleatori"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -911,7 +929,7 @@
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/Basic_Training.cfg:276
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
-#: src/show_dialog.cpp:453
+#: src/show_dialog.cpp:472
 msgid "No"
 msgstr "No"
 
@@ -1495,7 +1513,7 @@
 
 #: data/scenarios/tutorial/Basic_Training.cfg:262
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
-#: src/show_dialog.cpp:452
+#: src/show_dialog.cpp:471
 msgid "Yes"
 msgstr "Si"
 
@@ -1962,6 +1980,111 @@
 msgid "Underground"
 msgstr "Sota terra"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr ""
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Aigua profunda"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Aigua baixa"
+
+#: data/terrain.cfg:39 data/terrain.cfg:60 data/terrain.cfg:139
+#: data/terrain.cfg:148 data/terrain.cfg:166 data/terrain.cfg:229
+#: src/reports.cpp:309
+msgid "Village"
+msgstr "Vila"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Aigua baixa"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Gel"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Pont"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Sorra"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Camí"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Terra"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Herba"
+
+#: data/terrain.cfg:158
+msgid "Snow"
+msgstr ""
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Turons"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Muntanyes"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Bosc"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Paret de la cova"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Cova"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Castell"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Campament"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Terra de Nans"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Torre"
+
+#: data/terrain.cfg:288
+msgid "Canyon"
+msgstr ""
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menú"
@@ -1975,14 +2098,14 @@
 msgstr "Fi del torn"
 
 #: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:670
-#: src/display.cpp:941 src/help.cpp:621 src/playturn.cpp:1956
+#: src/display.cpp:941 src/help.cpp:612 src/playturn.cpp:1957
 #: src/unit.cpp:1034
 msgid "HP"
 msgstr "HP"
 
 #: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:674
 #: src/dialogs.cpp:682 src/display.cpp:945 src/display.cpp:953
-#: src/playturn.cpp:1795 src/playturn.cpp:1957 src/unit.cpp:1093
+#: src/playturn.cpp:1796 src/playturn.cpp:1958 src/unit.cpp:1093
 msgid "XP"
 msgstr "XP"
 
@@ -2058,31 +2181,29 @@
 "Dia: -25% de mal\n"
 "Nit: +25% de mal"
 
-#: data/translations/english.cfg:23
+#: data/translations/english.cfg:21
 msgid ""
-"Heals:\n"
-"Allows the unit to heal adjacent friendly units at the beginning of the "
-"turn.\n"
+"Ambush:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"A unit cared for by a healer may heal up to 4 HP per turn.\n"
-"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
-"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
-"care of a village or a unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 msgstr ""
-"Guareix:\n"
-"Guareix unitats amigues adjacents al princi del torn.\n"
-"Cada unitat pot recuperar fins a 4 punts de vida per torn.\n"
-"És possible sanar fins a 8 punts de vida en un torn, per a totes les "
-"unitats.\n"
-"Una unitat enverinada no pot ser guarida, haurà de buscar una vila o una "
-"unitat amb l'habilitat de cura."
+"Emboscada:\n"
+"Aquesta unitat pot amagar-se al bosc i passar inadvertida pels seus "
+"enemics.\n"
+"Les unitats enemigues no podran veure ni atacar aquesta unitat quan estigui "
+"al bosc, excepte en els torns inmediatament després de que hagi atacat o bé 
"
+"si hi ha unitats enemigues al costat."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "guareix"
+#: data/translations/english.cfg:23 data/units/Elvish_Avenger.cfg:18
+#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
+#: data/units/Elvish_Ranger.cfg:94
+msgid "ambush"
+msgstr ""
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 msgid ""
 "Cures:\n"
 "This unit combines herbal remedies with magic to heal units more quickly "
@@ -2104,27 +2225,57 @@
 "Les unitats enverinades no rebran cap curació addicional durant el torn en "
 "que són tractades del seu enverinament."
 
-#: data/translations/english.cfg:35 data/units/Elvish_Druid.cfg:19
-#: data/units/Elvish_Shyde.cfg:19 data/units/White_Mage.cfg:12
-#: data/units/White_Mage.cfg:71
+#: data/translations/english.cfg:33 data/units/Elvish_Druid.cfg:19
+#: data/units/Elvish_Shyde.cfg:19 data/units/Mermaid_Priestess.cfg:7
+#: data/units/White_Mage.cfg:12 data/units/White_Mage.cfg:71
 msgid "cures"
 msgstr "cura"
 
-#: data/translations/english.cfg:38
+#: data/translations/english.cfg:40
 msgid ""
-"Teleport:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heals:\n"
+"Allows the unit to heal adjacent friendly units at the beginning of the "
+"turn.\n"
+"\n"
+"A unit cared for by a healer may heal up to 4 HP per turn.\n"
+"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
+"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
+"care of a village or a unit that can cure."
 msgstr ""
-"Teletransporta:\n"
-"Aquesta unitat pot teletransportar-se entre dos viles amigues de manera "
-"instantània."
+"Guareix:\n"
+"Guareix unitats amigues adjacents al princi del torn.\n"
+"Cada unitat pot recuperar fins a 4 punts de vida per torn.\n"
+"És possible sanar fins a 8 punts de vida en un torn, per a totes les "
+"unitats.\n"
+"Una unitat enverinada no pot ser guarida, haurà de buscar una vila o una "
+"unitat amb l'habilitat de cura."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "guareix"
+
+#: data/translations/english.cfg:47
+msgid ""
+"Illuminates:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
 msgstr ""
+"Ilumina:\n"
+"Aquesta unitat ilumina l'àrea que l'envolta, fent que les unitats legals "
+"lluitin millor, i les caòtiques pitjor.\n"
+"Qualsevol unitat adjacent a aquesta lluitará com ho faria al vespre quan és 
"
+"de nit, y com ho faria al alba durant la vesprada."
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "viles"
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2137,7 +2288,7 @@
 "millor.\n"
 "Les unitats properes de nivell inferior faran més mal en el camp de batalla."
 
-#: data/translations/english.cfg:47 data/units/Commander.cfg:11
+#: data/translations/english.cfg:56 data/units/Commander.cfg:11
 #: data/units/Commander.cfg:86 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
@@ -2146,55 +2297,45 @@
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
 #: data/units/Noble_Commander.cfg:10 data/units/Noble_Lord.cfg:10
 #: 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:353 src/actions.cpp:471
+#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
+#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:355 src/actions.cpp:474
 msgid "leadership"
 msgstr "lideratge"
 
-#: data/translations/english.cfg:52
+#: data/translations/english.cfg:59
+#, fuzzy
 msgid ""
-"Ambush:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
+"Loyal:\n"
+"Never more than 1 upkeep."
+msgstr "Només requereix 1 moneda d'or de manteniment."
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Emboscada:\n"
-"Aquesta unitat pot amagar-se al bosc i passar inadvertida pels seus "
-"enemics.\n"
-"Les unitats enemigues no podran veure ni atacar aquesta unitat quan estigui "
-"al bosc, excepte en els torns inmediatament després de que hagi atacat o bé 
"
-"si hi ha unitats enemigues al costat."
 
-#: data/translations/english.cfg:54 data/units/Elvish_Avenger.cfg:18
-#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
-#: data/units/Elvish_Ranger.cfg:94
-msgid "ambush"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
 msgstr ""
 
-#: data/translations/english.cfg:59
+#: data/translations/english.cfg:69
 msgid ""
-"Illuminates:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
+"Regenerates:\n"
+"The unit will heal itself 8 hp per turn. If it is poisoned, it will remove "
+"the poison instead of healing."
 msgstr ""
-"Ilumina:\n"
-"Aquesta unitat ilumina l'àrea que l'envolta, fent que les unitats legals "
-"lluitin millor, i les caòtiques pitjor.\n"
-"Qualsevol unitat adjacent a aquesta lluitará com ho faria al vespre quan és 
"
-"de nit, y com ho faria al alba durant la vesprada."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "viles"
+#: data/translations/english.cfg:71 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_Rocklobber.cfg:7
+#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+msgid "regenerates"
+msgstr ""
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 msgid ""
 "Skirmisher:\n"
 "This unit is skilled in moving past enemies quickly, and ignores all Enemy "
@@ -2204,117 +2345,130 @@
 "Aquesta unitat és hàbil movent-se entre els enemics ràpidament. Ignora 
totes "
 "les zones de control."
 
-#: data/translations/english.cfg:66 data/units/Assassin.cfg:16
+#: data/translations/english.cfg:76 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:19 data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr "hostilitza"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Només requereix 1 moneda d'or de manteniment."
-
-#: data/translations/english.cfg:72
-msgid "This unit takes half normal damage when it did not initiate the attack."
+#: data/translations/english.cfg:79
+#, fuzzy
+msgid ""
+"Steadfast:\n"
+"This unit takes half normal damage when it did not initiate the attack."
 msgstr "Aquesta unitat rep la meitat de mal quan no ha iniciat l'atac."
 
-#: data/translations/english.cfg:74 data/units/Dwarvish_Guardsman.cfg:15
+#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
 #: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: src/actions.cpp:499
+#: data/units/Merman_Hoplite.cfg:13 src/actions.cpp:502
 msgid "steadfast"
 msgstr ""
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teletransporta:\n"
+"Aquesta unitat pot teletransportar-se entre dos viles amigues de manera "
+"instantània."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr ""
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "mal mínim"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Partida"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Escenari"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Configura bàndols:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Tria la configuració dels equips:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "No ha estat possible connectar al servidor remot."
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Esperant jugadors"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Ple"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Disponible"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Observador"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Descriu unitat"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Pantalla completa o finestra?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Pantalla:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Finestra"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Velocitat:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normal"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Paràmetres del so"
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Opcions"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Tria escenari"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 "Aquest terreny actua com $terrains pel que fa al moviment i la defensa."
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "El terreny amb la millor bonificació es tria automàticament."
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Aquest terreny proporciona curació."
 
-#: data/translations/english.cfg:107
+#: data/translations/english.cfg:119
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain"
@@ -2322,25 +2476,25 @@
 "Aquest terreny actua com a torre, és a dir, podeu reclutar unitats a la zona 
"
 "de castell del voltant quan un líder s'hi troba a sobre."
 
-#: data/translations/english.cfg:108
+#: data/translations/english.cfg:120
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain"
 msgstr "Aquest terreny actua com castell, és a dir, podeu reclutar-hi 
unitats."
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "o"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Taula de resistencies"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Vegeu també..."
 
-#: data/translations/english.cfg:117
+#: data/translations/english.cfg:129
 msgid ""
 "Backstab:\n"
 "This attack deals double damage if a friendly unit is on the opposite side "
@@ -2350,13 +2504,17 @@
 "Aquest atac causa el doble de mal si una unitat amiga està al costat oposat "
 "de l'objectiu."
 
-#: data/translations/english.cfg:119 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:490
-msgid "backstab"
-msgstr "punyalada"
+#: data/translations/english.cfg:132
+msgid ""
+"Berserk:\n"
+"Whether used offensively or defensively, this attack presses the engagement "
+"until one of the combatants is slain."
+msgstr ""
+"Rauxa:\n"
+"Ja sigui utilitzada ofensiva o defensivament, aquesta atac allarga la lluita "
+"fins la mort d'un dels dos combatents."
 
-#: data/translations/english.cfg:122
+#: data/translations/english.cfg:135
 msgid ""
 "Charge:\n"
 "This attack deals double damage to the target. It also causes this unit to "
@@ -2366,14 +2524,7 @@
 "Aquest atac causa el doble de mal. També fa que la unitat que el realitza "
 "prengui el doble de mal per part del seu contrincant."
 
-#: data/translations/english.cfg:124 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:363 src/actions.cpp:481
-msgid "charge"
-msgstr "carrega"
-
-#: data/translations/english.cfg:127
+#: data/translations/english.cfg:138
 msgid ""
 "Drain:\n"
 "This unit drains health from living units, healing itself for half the "
@@ -2383,18 +2534,15 @@
 "Aquesta unitat drena energia de les unitats amb vida, curant-se a ella "
 "mateixa la meitat de la quantitat drenada."
 
-#: data/translations/english.cfg:129 data/units/Ancient_Lich.cfg:24
-#: data/units/Blood_Bat.cfg:24 data/units/Dark_Spirit.cfg:24
-#: data/units/Demilich.cfg:23 data/units/Lich.cfg:24
-#: data/units/Orcish_Shaman.cfg:30 data/units/Orcish_Shaman.cfg:73
-#: data/units/Orcish_Shaman.cfg:116 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Spectre.cfg:24 data/units/Vampire_Bat.cfg:24
-#: data/units/Vampire_Lady.cfg:25 data/units/Vampire_Lady.cfg:38
-#: data/units/Wraith.cfg:24
-msgid "drain"
-msgstr "drena"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Primer cop:\n"
+"Aquesta unitat sempre ataca primer, encara que estigui defensant."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2402,32 +2550,7 @@
 "Màgic:\n"
 "Aquest atac sempre té un 70% de possibilitats de colpejar."
 
-#: data/translations/english.cfg:134 data/units/Ancient_Lich.cfg:34
-#: data/units/Arch_Mage.cfg:42 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/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:64 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 data/units/Mage.cfg:39
-#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
-#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
-#: data/units/Princess.cfg:79 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 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àgic"
-
-#: data/translations/english.cfg:137
+#: data/translations/english.cfg:147
 msgid ""
 "Marksman:\n"
 "When used offensively, this attack always has at least a 60% chance to hit."
@@ -2435,13 +2558,7 @@
 "Tirador:\n"
 "Quan s'utilitza ofensivament, sempre té un 60% de possibilitats de colpejar."
 
-#: data/translations/english.cfg:139 data/units/Elvish_Marksman.cfg:39
-#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
-msgid "marksman"
-msgstr ""
-
-#: data/translations/english.cfg:142
+#: data/translations/english.cfg:150
 msgid ""
 "Plague:\n"
 "If this unit kills a living target and that unit was not stationed in a "
@@ -2451,12 +2568,7 @@
 "Si mata un contrincant viu que no estigui en una vila, aquest s'aixecarà "
 "entre els morts i lluitarà per a tu."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr ""
-
-#: data/translations/english.cfg:147
+#: data/translations/english.cfg:153
 msgid ""
 "Poison:\n"
 "This attack poisons the target. Poisoned units lose 8 HP every turn until "
@@ -2466,16 +2578,7 @@
 "Aquest atac enverina el seu blanc. Les unitats enverinades perden 8 punts de "
 "vida cada torn fins que son curades o bé arriban a un punt de vida."
 
-#: data/translations/english.cfg:149 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:38
-#: data/units/Necrophage.cfg:24 data/units/Orcish_Assassin.cfg:41
-#: data/units/Orcish_Slayer.cfg:46
-msgid "poison"
-msgstr "verí"
-
-#: data/translations/english.cfg:152
+#: data/translations/english.cfg:156
 msgid ""
 "Slow:\n"
 "This attack slows the target. Slowed units move at half normal speed and "
@@ -2486,15 +2589,7 @@
 "meitat de la seva velocitat habitual i poden realitzar menys atacs en combat "
 "durant un torn."
 
-#: data/translations/english.cfg:154 data/units/Cave_Spider.cfg:38
-#: data/units/Elvish_Druid.cfg:44 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 "alenteix"
-
-#: data/translations/english.cfg:157
+#: data/translations/english.cfg:159
 msgid ""
 "Stone:\n"
 "This attack turns the target to stone. Units that have been turned to stone "
@@ -2504,196 +2599,89 @@
 "Aquesta unitat pot convertir els seus enemics en pedra. Les unitats "
 "petrificades no es poden moure ni atacar."
 
-#: data/translations/english.cfg:159 data/units/Cockatrice.cfg:26
-#: src/actions.cpp:728 src/actions.cpp:876 src/reports.cpp:122
-msgid "stone"
-msgstr "pedra"
-
 #: data/translations/english.cfg:162
-msgid ""
-"Berserk:\n"
-"Whether used offensively or defensively, this attack presses the engagement "
-"until one of the combatants is slain."
-msgstr ""
-"Rauxa:\n"
-"Ja sigui utilitzada ofensiva o defensivament, aquesta atac allarga la lluita "
-"fins la mort d'un dels dos combatents."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr ""
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Primer cop:\n"
-"Aquesta unitat sempre ataca primer, encara que estigui defensant."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "primer cop"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfs"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orcs"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Humans"
 
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "No morts"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Aigua profunda"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Aigua baixa"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Sorra"
-
-#: data/translations/english.cfg:182 data/translations/english.cfg:184
-#: data/translations/english.cfg:185 data/translations/english.cfg:186
-#: data/translations/english.cfg:187 data/translations/english.cfg:188
-#: src/reports.cpp:310
-msgid "Village"
-msgstr "Vila"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Pantà"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Gel"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Camí"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Terra"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Herba"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Turons"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Muntanyes"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Bosc"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Pont"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Castell"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Torre"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Cova"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Paret de la cova"
-
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Campament"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orcs"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "No morts"
+
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "El pont de $name, L'encreuament de $name"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "El camí de $name, El pas de $name, Ruta de $name"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "Riu $name, El riu $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "Bosc $name, El bosc de $name"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "Llac $name"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr ""
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "Bosc $name, El bosc de $name"
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ""
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr ""
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr ""
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr ""
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr ""
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Proper consell"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Consell del dia"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "No mostris consells"
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
@@ -2701,7 +2689,7 @@
 "Les unitats legals lluiten millor de dia, les caòtiques lluiten millor de "
 "nit. Les neutrals no es veuen afectades pel dia i la nit."
 
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:186
 msgid ""
 "In a campaign, you can use veteran units from previous scenarios by using "
 "the 'recall' option."
@@ -2710,7 +2698,7 @@
 "En una campanya, podeu fer servir unitats veteranes dels escenaris anteriors "
 "mitjançant l'opció 'Reincorpora'."
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
 "Different units have weaknesses against different types of attacks. Right-"
@@ -2719,7 +2707,7 @@
 "types."
 msgstr ""
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
 "hitting them in battle. The defensive rating for the currently selected unit "
@@ -2727,7 +2715,7 @@
 "the screen."
 msgstr ""
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
 "poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -2735,83 +2723,83 @@
 "the 'cure' ability."
 msgstr ""
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
 "menu. By recalling the same units over and over, you can build up a powerful "
 "and experienced army."
 msgstr ""
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
 "unit moves into an enemy's Zone of Control, it may not move any further that "
 "turn."
 msgstr ""
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
 "itself in the terrain it is standing in, however magical attacks always have "
 "a 70% chance to hit, and marksman attacks have at least 60% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
 msgstr ""
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
 "hitpoints at the beginning of their next turn."
 msgstr ""
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
 "terrain, while most mounted units don't get any defensive advantage in "
 "villages and castles."
 msgstr ""
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
 "weapons, but are vulnerable to attacks with piercing weapons, including bows "
 "and spears."
 msgstr ""
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
 "experience. Units killing an enemy will gain 8 experience for every level of "
 "the unit they kill."
 msgstr ""
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
 "fight very well in hills and mountains."
 msgstr ""
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
 "troops, wait for better conditions and then attack."
 msgstr ""
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
 "expendable units in some directions to delay enemy units."
 msgstr ""
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
 msgstr ""
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
 "depending on the number of villages on the map, and the number of turns you "
@@ -2819,7 +2807,7 @@
 "villages and waiting for turns to run out."
 msgstr ""
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
 "just the keep they start on. You can capture a keep from an enemy and "
@@ -2827,75 +2815,75 @@
 "for you on their keep so you can recruit there."
 msgstr ""
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
 "impact, fire, and holy attacks."
 msgstr ""
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
 "side fight better."
 msgstr ""
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
 "onto the village and attack you, while enjoying the defense and healing of "
 "the village."
 msgstr ""
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
 "ability or trait."
 msgstr ""
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr ""
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
 "you can undo your move by pressing 'u'."
 msgstr ""
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
 "them."
 msgstr ""
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
 "needing to attack anything themselves."
 msgstr ""
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
 "them one less attack than they would normally have. It is thus very "
 "effective against units that have a few powerful attacks."
 msgstr ""
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr ""
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
 "fight."
 msgstr ""
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
@@ -2925,7 +2913,7 @@
 
 #: data/units/Ancient_Lich.cfg:20 data/units/Ancient_Lich.cfg:33
 #: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
-#: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
+#: data/units/Dark_Queen.cfg:28 data/units/Dark_Queen.cfg:29
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
 #: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
@@ -2938,12 +2926,49 @@
 msgid "cold"
 msgstr "fred"
 
+#: data/units/Ancient_Lich.cfg:24 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:23
+#: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:30
+#: data/units/Orcish_Shaman.cfg:73 data/units/Orcish_Shaman.cfg:116
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
+#: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:24
+msgid "drain"
+msgstr "drena"
+
 #: data/units/Ancient_Lich.cfg:32 data/units/Deathmaster.cfg:35
 #: data/units/Demilich.cfg:31 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr "màgia"
 
+#: data/units/Ancient_Lich.cfg:34 data/units/Arch_Mage.cfg:42
+#: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:30 data/units/Deathmaster.cfg:37
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:64
+#: 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
+#: data/units/Mage.cfg:39 data/units/Mage.cfg:106
+#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
+#: data/units/Mermaid_Diviner.cfg:37 data/units/Mermaid_Enchantress.cfg:35
+#: data/units/Mermaid_Initiate.cfg:35 data/units/Mermaid_Priestess.cfg:35
+#: data/units/Mermaid_Siren.cfg:26 data/units/Mermaid_Siren.cfg:37
+#: data/units/Necromancer.cfg:37 data/units/Princess.cfg:80
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: 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àgic"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Wose ancià"
@@ -2969,7 +2994,7 @@
 #: 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/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:22
 #: 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
@@ -2977,19 +3002,24 @@
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
 #: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:24
 #: data/units/Elvish_Druid.cfg:43 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:20
 #: 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/Footpad.cfg:38 data/units/Galleon.cfg:19 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: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/Mermaid_Diviner.cfg:27 data/units/Mermaid_Enchantress.cfg:24
+#: data/units/Mermaid_Enchantress.cfg:33 data/units/Mermaid_Initiate.cfg:24
+#: data/units/Mermaid_Initiate.cfg:33 data/units/Mermaid_Priestess.cfg:25
+#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
+#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
 #: data/units/Noble_Youth.cfg:22 data/units/Outlaw.cfg:21
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3009,7 +3039,7 @@
 msgid "impact"
 msgstr "impacta"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Arximag"
 
@@ -3026,6 +3056,8 @@
 #: data/units/Elvish_Druid.cfg:23 data/units/Elvish_Enchantress.cfg:25
 #: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
+#: data/units/Mermaid_Diviner.cfg:26 data/units/Mermaid_Enchantress.cfg:23
+#: data/units/Mermaid_Initiate.cfg:23 data/units/Mermaid_Priestess.cfg:24
 #: 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
@@ -3041,7 +3073,7 @@
 msgstr "bola de foc"
 
 #: 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/Battle_Princess.cfg:78 data/units/Commander.cfg:121
 #: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
 #: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
@@ -3053,12 +3085,17 @@
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/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/Princess.cfg:78 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
 #: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr "foc"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Arximag"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Assassí"
@@ -3086,7 +3123,7 @@
 msgstr "daga"
 
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
-#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
 #: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
@@ -3124,21 +3161,22 @@
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Lord.cfg:86
 #: data/units/Mage.cfg:21 data/units/Mage.cfg:88
-#: data/units/Master_Bowman.cfg:21 data/units/Necrophage.cfg:20
-#: data/units/Nightgaunt.cfg:21 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: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 data/units/Orcish_Shaman.cfg:105
-#: data/units/Orcish_Slayer.cfg:20 data/units/Orcish_Slayer.cfg:42
-#: data/units/Orcish_Sovereign.cfg:22 data/units/Orcish_Warlord.cfg:19
-#: data/units/Orcish_Warrior.cfg:20 data/units/Poacher.cfg:25
-#: data/units/Princess.cfg:23 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/Master_Bowman.cfg:21 data/units/Merman_Triton.cfg:34
+#: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
+#: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
+#: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:20
+#: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
+#: 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
+#: data/units/Orcish_Shaman.cfg:105 data/units/Orcish_Slayer.cfg:20
+#: data/units/Orcish_Slayer.cfg:42 data/units/Orcish_Sovereign.cfg:22
+#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:20
+#: data/units/Poacher.cfg:25 data/units/Princess.cfg:24
+#: data/units/Princess.cfg:62 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:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
@@ -3146,16 +3184,30 @@
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:20
 #: data/units/Swordsman.cfg:20 data/units/Thief.cfg:20
 #: data/units/Trapper.cfg:25 data/units/Vampire_Bat.cfg:20
-#: data/units/Vampire_Lady.cfg:20 data/units/White_Mage.cfg:29
+#: data/units/Vampire_Lady.cfg:21 data/units/White_Mage.cfg:29
 #: data/units/White_Mage.cfg:88 data/units/Wolf_Rider.cfg:21
 #: data/units/Wraith.cfg:20 data/units/Young_Ogre.cfg:19
 msgid "blade"
 msgstr "fulla"
 
+#: 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:493
+msgid "backstab"
+msgstr "punyalada"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "ganivet"
 
+#: 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:38 data/units/Necrophage.cfg:24
+#: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
+msgid "poison"
+msgstr "verí"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandit"
@@ -3181,16 +3233,16 @@
 msgid "mace"
 msgstr "maça"
 
-#: data/units/Battle_Princess.cfg:3 data/units/Battle_Princess.cfg:41
-#: data/units/Princess.cfg:3 data/units/Princess.cfg:41
-msgid "Princess"
+#: data/units/Battle_Princess.cfg:3 data/units/Princess.cfg:3
+#, fuzzy
+msgid "female^Princess"
 msgstr "Princesa"
 
-#: data/units/Battle_Princess.cfg:17 data/units/Battle_Princess.cfg:55
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr "lideratge,hostilitza"
 
-#: data/units/Battle_Princess.cfg:19
+#: data/units/Battle_Princess.cfg:20
 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 "
@@ -3203,7 +3255,7 @@
 "habilitats de lluita dels seus soldats de rang inferior. La princesa és, "
 "tammateix, àgil i destra, posseint habilitats pròpies fins i tot d'un 
lladre."
 
-#: data/units/Battle_Princess.cfg:22 data/units/Battle_Princess.cfg:60
+#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
 #: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
@@ -3227,18 +3279,22 @@
 #: data/units/Longbowman.cfg:21 data/units/Lord.cfg:22 data/units/Lord.cfg:85
 #: data/units/Master_Bowman.cfg:20 data/units/Noble_Commander.cfg:23
 #: data/units/Noble_Fighter.cfg:20 data/units/Noble_Lord.cfg:22
-#: data/units/Ogre.cfg:18 data/units/Orcish_Grunt.cfg:19
+#: data/units/Ogre.cfg:19 data/units/Orcish_Grunt.cfg:19
 #: data/units/Orcish_Leader.cfg:21 data/units/Orcish_Ruler.cfg:21
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
-#: data/units/Princess.cfg:22 data/units/Princess.cfg:60
+#: data/units/Princess.cfg:23 data/units/Princess.cfg:61
 #: 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 "espasa"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Princesa"
+
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -3252,9 +3308,9 @@
 "unitats de nivell baix que estiguin al seu voltant es veuran beneficiades "
 "per la seva presència. La Princesa, a més, ignora les zones de control."
 
-#: data/units/Battle_Princess.cfg:76 data/units/Commander.cfg:120
+#: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
-#: data/units/Princess.cfg:76
+#: data/units/Princess.cfg:77
 msgid "scepter of fire"
 msgstr "ceptre de foc"
 
@@ -3347,7 +3403,13 @@
 #: 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:22
+#: data/units/Merman.cfg:20 data/units/Merman_Entangler.cfg:19
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:23
+#: data/units/Merman_Hunter.cfg:19 data/units/Merman_Hunter.cfg:27
+#: data/units/Merman_Javelineer.cfg:19 data/units/Merman_Javelineer.cfg:27
+#: data/units/Merman_Lord.cfg:22 data/units/Merman_Netcaster.cfg:19
+#: data/units/Merman_Spearman.cfg:19 data/units/Merman_Spearman.cfg:27
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Warrior.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:41 data/units/Orcish_Crossbowman.cfg:39
@@ -3356,7 +3418,7 @@
 #: 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:16
+#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
 #: 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
@@ -3364,7 +3426,7 @@
 #: 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:17 data/units/Trapper.cfg:42
-#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:34
+#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:35
 #: data/units/Wall_Guard.cfg:36 data/units/Watch_Tower.cfg:18
 msgid "pierce"
 msgstr "perfora"
@@ -3427,6 +3489,14 @@
 msgid "web"
 msgstr "teranyina"
 
+#: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:44
+#: 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
+#: data/units/Merman_Entangler.cfg:29 data/units/Merman_Netcaster.cfg:29
+msgid "slow"
+msgstr "alenteix"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Chocobo"
@@ -3448,13 +3518,24 @@
 #: 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/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
+#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
+#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
+#: data/units/Merman_Spearman.cfg:26 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 "llança"
 
+#: 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:365
+#: src/actions.cpp:484
+msgid "charge"
+msgstr "carrega"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Basilisc"
@@ -3470,6 +3551,11 @@
 msgid "gaze"
 msgstr ""
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "pedra"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Comandant"
@@ -3534,17 +3620,18 @@
 msgstr "onada de fred"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Reina Obscura"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 msgid ""
 "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 ""
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "ceptre"
 
@@ -3805,6 +3892,12 @@
 "weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
+#: data/units/Drake_Slasher.cfg:42 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 ""
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr ""
@@ -3856,6 +3949,10 @@
 msgid "berserker frenzy"
 msgstr ""
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr ""
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr ""
@@ -4024,6 +4121,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr ""
 
+#: data/units/Dwarvish_Ulfserker.cfg:16
+msgid ""
+"Dwarves are an ancient race of powerful fighters. Ulfserkers are the most "
+"ferocious of these in battle: they attack without stopping fighting until "
+"either their enemy or they are dead, no matter how many wounds they receive."
+msgstr ""
+
 #: data/units/Elder_Mage.cfg:3
 msgid "Elder Mage"
 msgstr "Mag ancià"
@@ -4057,7 +4161,7 @@
 "can quickly heal themselves in the face of tremendous injuries."
 msgstr ""
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr "Arquer elf"
 
@@ -4068,7 +4172,12 @@
 "make up a large portion of the Elvish military."
 msgstr ""
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Arquer elf"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Venjador elf"
 
@@ -4080,6 +4189,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Venjador elf"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Capità elf"
@@ -4109,7 +4223,8 @@
 "converteix en una unitat hàbil en curta i llarga distància."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Druïda elf"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4131,7 +4246,7 @@
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4194,10 +4309,18 @@
 "temibles per les boles de foc que són capaços de llançar."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Donzella elf"
 
 #: data/units/Elvish_Lady.cfg:17
+msgid ""
+"Elvish lady Parandra is one of the most respected elves ever. Her ability to "
+"see through the fogs of destiny has gained her a wisely used authority among "
+"her people, guiding them in times of uncertainty."
+msgstr ""
+
+#: data/units/Elvish_Lady.cfg:19
 msgid "shove"
 msgstr ""
 
@@ -4213,7 +4336,7 @@
 "El Senyo elf és un combatent ferotge, hàbil amb l'espasa i temible per les "
 "boles de foc que és capaç de llançar."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Tirador elf"
 
@@ -4231,6 +4354,17 @@
 msgid "longbow"
 msgstr ""
 
+#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
+#: data/units/Elvish_Sharpshooter.cfg:40
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+msgid "marksman"
+msgstr ""
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Tirador elf"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Mariscal elf"
@@ -4261,7 +4395,7 @@
 "l'arc a cavall, així com l'espasa, abans de tornar a amagar-se entre els "
 "boscos."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Guardaboscos elf"
 
@@ -4273,6 +4407,11 @@
 "just made an attack, or there are enemies adjacent to them."
 msgstr ""
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Guardaboscos elf"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr ""
@@ -4297,7 +4436,8 @@
 "en combat."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Bruixot elf"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4310,7 +4450,7 @@
 "l'enemic. El seu atac ralentitza i redueix el nombre d'atacs de la víctima, "
 "i les seves habilitats curatives sanen les tropes aliades."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Franctirador elf"
 
@@ -4322,8 +4462,14 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Franctirador elf"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Nimfa elf"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4342,8 +4488,9 @@
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
-msgstr ""
+#, fuzzy
+msgid "female^Elvish Sorceress"
+msgstr "Arquer elf"
 
 #: data/units/Elvish_Sorceress.cfg:21
 msgid ""
@@ -4354,7 +4501,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4452,7 +4599,15 @@
 msgid "Galleon"
 msgstr "Gal·leó"
 
-#: data/units/Galleon.cfg:17
+#: data/units/Galleon.cfg:16
+msgid ""
+"Even people happily living in their home eventually need some kind of "
+"transport through the seas, even if they only go fishing or to trade goods. "
+"The galleon is perfect for this purpose: it's fast and resilient, but not "
+"prepared to fight, and is able to adapt to many different tasks."
+msgstr ""
+
+#: data/units/Galleon.cfg:18
 msgid "dummy"
 msgstr ""
 
@@ -4561,12 +4716,6 @@
 "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 ""
-
 #: data/units/Goblin_Knight.cfg:3
 #, fuzzy
 msgid "Goblin Knight"
@@ -4600,7 +4749,8 @@
 msgid "torch"
 msgstr ""
 
-#: data/units/Goblin_Pillager.cfg:35
+#: data/units/Goblin_Pillager.cfg:35 data/units/Merman_Entangler.cfg:26
+#: data/units/Merman_Netcaster.cfg:26
 msgid "net"
 msgstr ""
 
@@ -4646,7 +4796,7 @@
 "serving beneath them."
 msgstr ""
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 #, fuzzy
 msgid "Great Mage"
 msgstr "Gran Mag"
@@ -4662,17 +4812,15 @@
 "de vila en vila, projectant el seu poder a totes les zones del camp de "
 "batalla."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Gran Mag"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr ""
 
-#: 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_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
-#: data/units/Troll_Whelp.cfg:7
-msgid "regenerates"
-msgstr ""
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4880,7 +5028,7 @@
 "el lideratge dels Senyors milloren les habilitats de nivell inferior que "
 "l'envolten."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr ""
 
@@ -4903,12 +5051,17 @@
 msgid "missile"
 msgstr ""
 
-#: data/units/Mage_of_Light.cfg:3 data/units/Mage_of_Light.cfg:66
+#: data/units/Mage.cfg:70
+msgid "female^Mage"
+msgstr ""
+
+#: data/units/Mage_of_Light.cfg:3
 #, fuzzy
 msgid "Mage of Light"
 msgstr "Mag de la Llum"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr ""
 
@@ -4932,16 +5085,23 @@
 "al vespre, i com si encara no s'hagués fet fos durant la nit."
 
 #: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
+#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
 #: data/units/White_Mage.cfg:44 data/units/White_Mage.cfg:103
 msgid "lightbeam"
 msgstr ""
 
 #: data/units/Mage_of_Light.cfg:46 data/units/Mage_of_Light.cfg:106
+#: data/units/Mermaid_Diviner.cfg:35 data/units/Mermaid_Priestess.cfg:33
 #: data/units/Paladin.cfg:26 data/units/White_Mage.cfg:45
 #: data/units/White_Mage.cfg:104
 msgid "holy"
 msgstr ""
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Mag de la Llum"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr ""
@@ -4953,12 +5113,27 @@
 "only by that of the Elves."
 msgstr ""
 
-#: data/units/Merman.cfg:3
-#, fuzzy
-msgid "Merman"
-msgstr "Sirènid"
+#: data/units/Mermaid_Diviner.cfg:3
+msgid "female^Mermaid Diviner"
+msgstr ""
+
+#: data/units/Mermaid_Diviner.cfg:23
+msgid ""
+"The most devout and pious amongst the mermaids gain the striking power of "
+"illumination, which prevents their surroundings from ever seeing true "
+"night.  Their power is a stalwart counter to the forces of darkness."
+msgstr ""
+
+#: data/units/Mermaid_Enchantress.cfg:3
+msgid "female^Mermaid Enchantress"
+msgstr ""
 
-#: data/units/Merman.cfg:16
+#: data/units/Mermaid_Enchantress.cfg:20 data/units/Mermaid_Siren.cfg:20
+#: data/units/Merman.cfg:16 data/units/Merman_Entangler.cfg:15
+#: data/units/Merman_Fighter.cfg:18 data/units/Merman_Hoplite.cfg:19
+#: data/units/Merman_Hunter.cfg:15 data/units/Merman_Javelineer.cfg:15
+#: data/units/Merman_Netcaster.cfg:15 data/units/Merman_Spearman.cfg:15
+#: data/units/Merman_Triton.cfg:18 data/units/Merman_Warrior.cfg:18
 #, fuzzy
 msgid ""
 "Skilled creatures of the sea, Mermen are powerful and quick in any watery "
@@ -4967,11 +5142,97 @@
 "El Sirènid és una criatura dels mars, ràpida i forta dins el seu hàbitat, 
el "
 "líquid element, però no fora, a terra ferma."
 
-#: 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
+#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:31
+#: data/units/Mermaid_Siren.cfg:33 data/units/Sea_Hag.cfg:27
+msgid "water spray"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:3
+msgid "female^Mermaid Initiate"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:20
+msgid ""
+"Young Mermaids are often initiated in the water magics of their people.  "
+"Despite their frailty, this makes them formidable opponents, as they can "
+"call upon the very water about them to smite their enemies."
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:3
+msgid "female^Mermaid Priestess"
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:21
+msgid ""
+"The more learned among the mermaids often take a path of holy study.  This "
+"leaves them quite capable of ministering to the wounds of their comrades, as "
+"well as being a potent defense against the unworldly."
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:3
+msgid "female^Siren"
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:23
+#, fuzzy
+msgid "naia touch"
+msgstr "toc"
+
+#: data/units/Merman.cfg:3
+#, fuzzy
+msgid "Merman"
+msgstr "Sirènid"
+
+#: data/units/Merman.cfg:19 data/units/Merman_Fighter.cfg:21
+#: data/units/Merman_Hoplite.cfg:22 data/units/Merman_Lord.cfg:21
+#: data/units/Merman_Triton.cfg:21 data/units/Merman_Triton.cfg:33
+#: data/units/Merman_Warrior.cfg:21 data/units/Naga.cfg:20
+#: data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr ""
 
+#: data/units/Merman_Entangler.cfg:3
+msgid "Merman Entangler"
+msgstr ""
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Guerrer"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Sirènid"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Sirènid"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+msgid "Merman Netcaster"
+msgstr ""
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Llancer"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "Sirènid"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Troll Guerrer"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr ""
@@ -4983,9 +5244,8 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-#, fuzzy
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 #, fuzzy
@@ -5034,10 +5294,6 @@
 "to hide at night, leaving no trace of their presence."
 msgstr ""
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr ""
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr ""
@@ -5076,7 +5332,7 @@
 msgid "Ogre"
 msgstr "Ogre"
 
-#: data/units/Ogre.cfg:15
+#: data/units/Ogre.cfg:16
 #, fuzzy
 msgid ""
 "Ogres are stupid giant humanoids that usually live alone in the wilderness. "
@@ -5191,7 +5447,7 @@
 msgstr ""
 
 #: data/units/Orcish_Shaman.cfg:25 data/units/Orcish_Shaman.cfg:68
-#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:33
+#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:34
 msgid "curse"
 msgstr ""
 
@@ -5284,7 +5540,7 @@
 "de la llutia amb dos armes el fa temible. La seva única dificultat és "
 "l'incapacitat d'usar arcs."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr ""
 
@@ -5292,12 +5548,16 @@
 msgid "Outlaws fight better at night."
 msgstr ""
 
+#: data/units/Outlaw.cfg:75
+msgid "female^Outlaw"
+msgstr ""
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+msgid "female^Outlaw Princess"
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5309,7 +5569,7 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+msgid "female^Outlaw Queen"
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5381,7 +5641,14 @@
 msgid "Pirate Galleon"
 msgstr ""
 
-#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
+#: data/units/Pirate_Galleon.cfg:14
+msgid ""
+"Pirate galleons are to transport ships what wolves are to sheeps. Ships full "
+"of goods shouldn't be lonely, far away from any land, better to help them to "
+"avoid it being sunk from overloading..."
+msgstr ""
+
+#: data/units/Pirate_Galleon.cfg:16 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr ""
@@ -5396,7 +5663,7 @@
 "in forests and swamps."
 msgstr ""
 
-#: data/units/Princess.cfg:19 data/units/Princess.cfg:57
+#: data/units/Princess.cfg:20 data/units/Princess.cfg:58
 #, fuzzy
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
@@ -5411,7 +5678,7 @@
 "de lluita dels seus soldats de rang inferior. La princesa és, tammateix, "
 "àgil i destra, posseint habilitats pròpies fins i tot d'un lladre."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 #, fuzzy
 msgid "Red Mage"
 msgstr "Mag Roig"
@@ -5428,6 +5695,11 @@
 "ràpid de moviments, el Mag Roig és un valiós aliat en gairebé qualsevol "
 "situació."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Mag Roig"
+
 #: data/units/Revenant.cfg:3
 #, fuzzy
 msgid "Revenant"
@@ -5547,14 +5819,14 @@
 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 "
+"valued as scouts as they 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
 #, fuzzy
-msgid "Sea Hag"
+msgid "female^Sea Hag"
 msgstr "Bruixa del Mar"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5566,10 +5838,6 @@
 "Les Bruixes del Mar són les Nagues més velles i experimentades, les quals "
 "han après a controlar la Màgia de l'Aigua en benefici propi."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr ""
-
 #: data/units/Sea_Orc.cfg:3
 #, fuzzy
 msgid "Sea Orc"
@@ -5634,7 +5902,7 @@
 "mouen lentament, el seu poder és immens, el què els converteix en una 
força "
 "temuda allà on van."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr ""
 
@@ -5645,10 +5913,23 @@
 "instant. They are also highly resistant to most forms of magical attack."
 msgstr ""
 
+#: data/units/Silver_Mage.cfg:142
+msgid "female^Silver Mage"
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr ""
 
+#: data/units/Skeletal_Dragon.cfg:17
+msgid ""
+"Long ago one of the mightiest living creatures, the feared Dragon has become "
+"only bones and dark sinew. Long after its death, it was raised through the "
+"dark powers of necromancy, which it now serves. The Skeletal Dragon may look "
+"like nothing more than a pile of bones, but few people who thought that way "
+"lived long enough to change their minds."
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr ""
@@ -5719,6 +6000,10 @@
 "fighting the living."
 msgstr ""
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr ""
+
 #: data/units/Spearman.cfg:3
 #, fuzzy
 msgid "Spearman"
@@ -5919,16 +6204,17 @@
 "la sang de les víctimes per tal de recuperar la seva salut."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
-msgstr ""
+#, fuzzy
+msgid "female^Vampire Lady"
+msgstr "Rat-penat Vampíric"
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
 "the blood of the living."
 msgstr ""
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr ""
 
@@ -5986,7 +6272,7 @@
 "miscellaneous items at them with ballistas."
 msgstr ""
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 #, fuzzy
 msgid "White Mage"
 msgstr "Mag Blanc"
@@ -6005,6 +6291,11 @@
 "envers els no morts, els quals pateixen danys terribles dels rajos de llum "
 "dels mags."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Mag Blanc"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Genet de Llop"
@@ -6208,7 +6499,7 @@
 msgid "+ Bots"
 msgstr ""
 
-#: src/about.cpp:276 src/help.cpp:2372 src/show_dialog.cpp:472
+#: src/about.cpp:276 src/help.cpp:2350 src/show_dialog.cpp:491
 msgid "Close"
 msgstr ""
 
@@ -6228,74 +6519,74 @@
 msgid "none"
 msgstr ""
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr ""
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr ""
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr ""
 
-#: src/actions.cpp:363 src/actions.cpp:481 src/actions.cpp:490
+#: src/actions.cpp:365 src/actions.cpp:484 src/actions.cpp:493
 msgid "Doubled"
 msgstr ""
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr ""
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr ""
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr ""
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 #, fuzzy
 msgid "Halved"
 msgstr "Cova"
 
-#: src/actions.cpp:714 src/actions.cpp:861 src/display.cpp:917
+#: src/actions.cpp:716 src/actions.cpp:862 src/display.cpp:917
 #: src/reports.cpp:115
 msgid "poisoned"
 msgstr ""
 
-#: src/actions.cpp:719 src/actions.cpp:866 src/display.cpp:913
+#: src/actions.cpp:721 src/actions.cpp:867 src/display.cpp:913
 #: src/reports.cpp:110
 msgid "slowed"
 msgstr ""
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr ""
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr ""
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr ""
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr ""
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr ""
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr ""
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr ""
 
@@ -6355,7 +6646,7 @@
 msgid "replay"
 msgstr ""
 
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1384
+#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1385
 msgid "Turn"
 msgstr ""
 
@@ -6415,23 +6706,23 @@
 msgid "Profile"
 msgstr ""
 
-#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:567
-#: src/playturn.cpp:1793
+#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:564
+#: src/playturn.cpp:1794
 msgid "level"
 msgstr ""
 
-#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:622
-#: src/playturn.cpp:1958 src/unit.cpp:1070
+#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:613
+#: src/playturn.cpp:1959 src/unit.cpp:1070
 msgid "Moves"
 msgstr ""
 
-#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:230
+#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:230
 msgid "melee"
 msgstr ""
 
-#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:231
+#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:231
 msgid "ranged"
 msgstr ""
 
@@ -6451,11 +6742,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr ""
 
-#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1393
+#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1394
 msgid "Name:"
 msgstr ""
 
-#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1410
+#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1411
 msgid "The game could not be saved"
 msgstr ""
 
@@ -6518,8 +6809,8 @@
 #: src/game.cpp:999 src/game.cpp:1014 src/game.cpp:1020 src/game.cpp:1053
 #: src/game.cpp:1082 src/game.cpp:1096 src/game.cpp:1098 src/game.cpp:1100
 #: src/game.cpp:1112 src/game.cpp:1115 src/game.cpp:1150 src/game.cpp:1152
-#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1396
-#: src/playturn.cpp:1410
+#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1397
+#: src/playturn.cpp:1411
 msgid "Error"
 msgstr ""
 
@@ -6583,7 +6874,7 @@
 msgstr ""
 
 #: src/game.cpp:1112 src/game.cpp:1150 src/game.cpp:1174
-#: src/multiplayer_client.cpp:42 src/multiplayer_client.cpp:314
+#: src/multiplayer_client.cpp:45 src/multiplayer_client.cpp:319
 msgid "Connection timed out"
 msgstr ""
 
@@ -6641,7 +6932,7 @@
 msgid "Play a game against AI opponents"
 msgstr ""
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr ""
 
@@ -6661,79 +6952,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr ""
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr ""
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr ""
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr ""
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr ""
 
-#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1955
+#: src/help.cpp:636 src/help.cpp:637 src/playturn.cpp:1956
 msgid "Name"
 msgstr ""
 
-#: src/help.cpp:649 src/help.cpp:650 src/playturn.cpp:1954
+#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1955
 msgid "Type"
 msgstr ""
 
-#: src/help.cpp:653 src/help.cpp:654 src/unit_types.cpp:302
+#: src/help.cpp:644 src/help.cpp:645 src/unit_types.cpp:302
 msgid "Dmg"
 msgstr ""
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr ""
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr ""
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr ""
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr ""
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr ""
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr ""
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr ""
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr ""
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr ""
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr ""
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr ""
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr ""
 
@@ -6745,7 +7036,7 @@
 msgid "End Unit Turn"
 msgstr ""
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr ""
 
@@ -6781,11 +7072,11 @@
 msgid "Unit Description"
 msgstr "Descriu unitat"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Renomena unitat"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Recluta"
 
@@ -6793,7 +7084,7 @@
 msgid "Repeat Recruit"
 msgstr ""
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Reincorpora"
 
@@ -6829,11 +7120,11 @@
 msgid "Scenario Objectives"
 msgstr "Objectius de l'escenari"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Llista d'unitats"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Estadístiques"
 
@@ -6941,7 +7232,7 @@
 msgid "Speak to All"
 msgstr ""
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr ""
 
@@ -7001,7 +7292,7 @@
 msgid "Bump Size"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr ""
 
@@ -7049,15 +7340,11 @@
 msgid "Enemy units cannot be seen unless they are in range of your units"
 msgstr ""
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr ""
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr ""
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr ""
 
@@ -7065,13 +7352,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr ""
 
-#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:145
-#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:460
-#: src/show_dialog.cpp:466
+#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:148
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:479
+#: src/show_dialog.cpp:485
 msgid "Cancel"
 msgstr ""
 
-#: src/multiplayer.cpp:120 src/show_dialog.cpp:446 src/show_dialog.cpp:459
+#: src/multiplayer.cpp:120 src/show_dialog.cpp:465 src/show_dialog.cpp:478
 msgid "Ok"
 msgstr ""
 
@@ -7145,70 +7432,70 @@
 msgid "Warning"
 msgstr ""
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:121 src/multiplayer_connect.cpp:386
-#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1531
-#: src/playturn.cpp:1536 src/playturn.cpp:1623
+#: src/multiplayer_client.cpp:124 src/multiplayer_connect.cpp:386
+#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1532
+#: src/playturn.cpp:1537 src/playturn.cpp:1624
 msgid "Gold"
 msgstr ""
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "No ha estat possible connectar al servidor remot."
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr ""
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr ""
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr ""
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr ""
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr ""
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr ""
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:683 src/multiplayer_client.cpp:686
+#: src/multiplayer_client.cpp:688 src/multiplayer_client.cpp:691
 msgid "?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:777
+#: src/multiplayer_client.cpp:782
 msgid "Leader: "
 msgstr ""
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 #, fuzzy
 msgid "Recruits: "
 msgstr "Recluta"
@@ -7239,8 +7526,8 @@
 msgid "Local Player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:498
-#: src/multiplayer_connect.cpp:621 src/multiplayer_connect.cpp:727
+#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:496
+#: src/multiplayer_connect.cpp:610 src/multiplayer_connect.cpp:716
 msgid "Computer Player"
 msgstr ""
 
@@ -7305,7 +7592,7 @@
 msgid "Color"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:570 src/multiplayer_connect.cpp:574
+#: src/multiplayer_connect.cpp:559 src/multiplayer_connect.cpp:563
 msgid "Waiting for network players to join"
 msgstr ""
 
@@ -7388,219 +7675,219 @@
 msgid "It is now your turn"
 msgstr ""
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr ""
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr ""
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr ""
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr ""
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr ""
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr ""
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr ""
 
-#: src/playturn.cpp:1125
+#: src/playturn.cpp:1126
 msgid ""
 "You have not started your turn yet.  Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1134 src/playturn.cpp:1139
+#: src/playturn.cpp:1135 src/playturn.cpp:1140
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr ""
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
 msgstr ""
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 #, fuzzy
 msgid "Saved"
 msgstr "Cova"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr ""
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr ""
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr ""
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr ""
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr ""
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr ""
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1730
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1731
+#: src/playturn.cpp:1732
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr ""
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr ""
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr ""
 
-#: src/playturn.cpp:1779
+#: src/playturn.cpp:1780
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
 msgstr ""
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr ""
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr ""
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr ""
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr ""
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr ""
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr ""
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr ""
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr ""
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr ""
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr ""
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr ""
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr ""
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr ""
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr ""
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr ""
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr ""
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr ""
 
-#: src/playturn.cpp:2421
+#: src/playturn.cpp:2422
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
 msgstr ""
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr ""
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr ""
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr ""
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr ""
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr ""
 
@@ -7652,94 +7939,94 @@
 msgid "Chaotic units"
 msgstr "Unitats caòtiques"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr ""
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr ""
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 #, fuzzy
 msgid "Allied village"
 msgstr "Saquejador Goblin"
 
-#: src/show_dialog.cpp:934
+#: src/show_dialog.cpp:953
 msgid "KB"
 msgstr "kB"
 
-#: src/titlescreen.cpp:149
+#: src/titlescreen.cpp:155
 msgid "Version"
 msgstr "Versió"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Tutoria"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Campanya"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Multijugador"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Carrega"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Idioma"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Preferències"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Surt"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Comença la tutoria per familiaritzar-te amb el joc"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Comença una nova campanya"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
 msgstr ""
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Carrega una partida desada"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Canvia l'idioma"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Configura les opcions de joc"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr ""
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Surt del joc"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Més"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr ""
 
@@ -7747,17 +8034,17 @@
 msgid "strikes"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 #, fuzzy
 msgid "chaotic"
 msgstr "Caòtic"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 #, fuzzy
 msgid "lawful"
 msgstr "Legal"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 #, fuzzy
 msgid "neutral"
 msgstr "Neutral"
@@ -7770,5 +8057,18 @@
 msgid "Deletion of the file failed."
 msgstr ""
 
+#~ msgid "first strike"
+#~ msgstr "primer cop"
+
+#~ msgid "Swamp"
+#~ msgstr "Pantà"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#, fuzzy
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #~ msgid "TitleScreen button^About"
 #~ msgstr "Quant a"
Index: wesnoth/po/wesnoth/cs.po
diff -u wesnoth/po/wesnoth/cs.po:1.7 wesnoth/po/wesnoth/cs.po:1.8
--- wesnoth/po/wesnoth/cs.po:1.7        Sun Oct 17 12:52:52 2004
+++ wesnoth/po/wesnoth/cs.po    Thu Oct 21 20:22:40 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-09-30 12:32+0200\n"
 "Last-Translator: David Nečas <address@hidden>\n"
 "Language-Team: Czech\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "věrný"
 
@@ -50,11 +50,11 @@
 msgid "Traits"
 msgstr "Vlastnosti"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Jednotky"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Schopnosti"
 
@@ -195,7 +195,7 @@
 "potřebuješ také peníze na jejich vydržování. Pro více informací viz "
 "<ref>dst=income_and_upkeep text='Příjmy a výdaje'</ref>."
 
-#: data/help.cfg:84 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:84 src/help.cpp:747 src/help.cpp:748
 msgid "Movement"
 msgstr "Pohyby"
 
@@ -603,7 +603,7 @@
 "<ref>dst=abilities text=schopnostmi</ref>, ale nyní víš vše, co 
potřebuješ "
 "ke hře Dědice trůnu. Dobře se bav a mnoho štěstí!"
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 #, fuzzy
 msgid "About"
 msgstr "Mladík"
@@ -912,7 +912,7 @@
 msgstr "Standardní"
 
 #: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:196
-#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:658
+#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:663
 msgid "&random-enemy.png,Random"
 msgstr "&random-enemy.png,Náhodný"
 
@@ -1029,6 +1029,24 @@
 msgid "Random map"
 msgstr "Náhodná mapa"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Náhodná mapa"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Náhodná mapa"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Náhodná mapa"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -1073,7 +1091,7 @@
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/Basic_Training.cfg:276
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
-#: src/show_dialog.cpp:453
+#: src/show_dialog.cpp:472
 msgid "No"
 msgstr "Ne"
 
@@ -1671,7 +1689,7 @@
 
 #: data/scenarios/tutorial/Basic_Training.cfg:262
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
-#: src/show_dialog.cpp:452
+#: src/show_dialog.cpp:471
 msgid "Yes"
 msgstr "Ano"
 
@@ -2242,6 +2260,113 @@
 msgid "Underground"
 msgstr "Podzemí"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Ochrana tmy"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Hluboká voda"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Mělká voda"
+
+#: data/terrain.cfg:39 data/terrain.cfg:60 data/terrain.cfg:139
+#: data/terrain.cfg:148 data/terrain.cfg:166 data/terrain.cfg:229
+#: src/reports.cpp:309
+msgid "Village"
+msgstr "Vesnice"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Mělká voda"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Led"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Most"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Písek"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Cesta"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Bahno"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Louka"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Stín"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Kopce"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Hory"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Les"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Zeď jeskyně"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Jeskyně"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Hrad"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Ležení"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Trpasličí pustina"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Tvrz"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "žádná"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menu"
@@ -2255,14 +2380,14 @@
 msgstr "Ukonči kolo"
 
 #: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:670
-#: src/display.cpp:941 src/help.cpp:621 src/playturn.cpp:1956
+#: src/display.cpp:941 src/help.cpp:612 src/playturn.cpp:1957
 #: src/unit.cpp:1034
 msgid "HP"
 msgstr "Životů"
 
 #: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:674
 #: src/dialogs.cpp:682 src/display.cpp:945 src/display.cpp:953
-#: src/playturn.cpp:1795 src/playturn.cpp:1957 src/unit.cpp:1093
+#: src/playturn.cpp:1796 src/playturn.cpp:1958 src/unit.cpp:1093
 msgid "XP"
 msgstr "Zkušenost"
 
@@ -2339,33 +2464,29 @@
 "Den: -25% poškození\n"
 "Noc: +25% poškození"
 
-#: data/translations/english.cfg:23
+#: data/translations/english.cfg:21
 msgid ""
-"Heals:\n"
-"Allows the unit to heal adjacent friendly units at the beginning of the "
-"turn.\n"
+"Ambush:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"A unit cared for by a healer may heal up to 4 HP per turn.\n"
-"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
-"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
-"care of a village or a unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 msgstr ""
-"Léčení:\n"
-"Jednotka dokáže léčit spřátelené jednotky na vedlejších polích na 
začátku "
-"tahu.\n"
+"Přepadení:\n"
+"Jednotka se dokáže ukrýt v lese a zůstat nezpozorována svými 
nepřáteli.\n"
 "\n"
-"Jedna zraněná jednotka se může za jeden tah vyléčit až o 4 životy.\n"
-"Léčitel může v jednom tahu vyléčit všechny opatrované jednotky celkem 
o 8 "
-"životů.\n"
-"Léčitel nedokáže uzdravit otrávenou jednotku; taková jednotka musí 
vyhledat "
-"pomoc ve vesnici nebo u jednotky, která dokáže uzdravovat."
+"Nepřátelské jednotky nemohou spatřit ani napadnout tuto jednotku v lese, "
+"pouze v tahu bezprostředně po jejím útoku nebo jsou-li na sousedních 
polích "
+"nepřátelské jednotky."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "léčení"
+#: data/translations/english.cfg:23 data/units/Elvish_Avenger.cfg:18
+#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
+#: data/units/Elvish_Ranger.cfg:94
+msgid "ambush"
+msgstr "přepadení"
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 msgid ""
 "Cures:\n"
 "This unit combines herbal remedies with magic to heal units more quickly "
@@ -2390,27 +2511,60 @@
 "Uzdravovatel dokáže uzdravit i otrávenou jednotku, ale tato jednotka už v 
"
 "daném tahu nebude dále léčena."
 
-#: data/translations/english.cfg:35 data/units/Elvish_Druid.cfg:19
-#: data/units/Elvish_Shyde.cfg:19 data/units/White_Mage.cfg:12
-#: data/units/White_Mage.cfg:71
+#: data/translations/english.cfg:33 data/units/Elvish_Druid.cfg:19
+#: data/units/Elvish_Shyde.cfg:19 data/units/Mermaid_Priestess.cfg:7
+#: data/units/White_Mage.cfg:12 data/units/White_Mage.cfg:71
 msgid "cures"
 msgstr "uzdravování"
 
-#: data/translations/english.cfg:38
+#: data/translations/english.cfg:40
 msgid ""
-"Teleport:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heals:\n"
+"Allows the unit to heal adjacent friendly units at the beginning of the "
+"turn.\n"
+"\n"
+"A unit cared for by a healer may heal up to 4 HP per turn.\n"
+"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
+"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
+"care of a village or a unit that can cure."
 msgstr ""
-"Teleportace:\n"
-"Tato jednotka se dokáže v okamžiku přemístit z jedné spřátelené 
vesnice do "
-"druhé."
+"Léčení:\n"
+"Jednotka dokáže léčit spřátelené jednotky na vedlejších polích na 
začátku "
+"tahu.\n"
+"\n"
+"Jedna zraněná jednotka se může za jeden tah vyléčit až o 4 životy.\n"
+"Léčitel může v jednom tahu vyléčit všechny opatrované jednotky celkem 
o 8 "
+"životů.\n"
+"Léčitel nedokáže uzdravit otrávenou jednotku; taková jednotka musí 
vyhledat "
+"pomoc ve vesnici nebo u jednotky, která dokáže uzdravovat."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleportace"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "léčení"
+
+#: data/translations/english.cfg:47
+msgid ""
+"Illuminates:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
+msgstr ""
+"Osvětlení:\n"
+"Tato jednotka osvětlí okolní prostor, takže denní jednotky budou bojovat 
"
+"lépe a noční jednotky hůře.\n"
+"\n"
+"Jednotky na sousedních polích budou bojovat v noci jako za soumraku a za "
+"soumraku jako ve dne."
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "osvětlení, uzdravování"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2424,7 +2578,7 @@
 "Spřátelené jednotky nižší úrovně na sousedních polích způsobí v 
boji větší "
 "poškození."
 
-#: data/translations/english.cfg:47 data/units/Commander.cfg:11
+#: data/translations/english.cfg:56 data/units/Commander.cfg:11
 #: data/units/Commander.cfg:86 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
@@ -2433,56 +2587,45 @@
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
 #: data/units/Noble_Commander.cfg:10 data/units/Noble_Lord.cfg:10
 #: 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:353 src/actions.cpp:471
+#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
+#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:355 src/actions.cpp:474
 msgid "leadership"
 msgstr "velení"
 
-#: data/translations/english.cfg:52
+#: data/translations/english.cfg:59
+#, fuzzy
 msgid ""
-"Ambush:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
+"Loyal:\n"
+"Never more than 1 upkeep."
+msgstr "nikdy si nebere více než jeden zlaťák"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Přepadení:\n"
-"Jednotka se dokáže ukrýt v lese a zůstat nezpozorována svými 
nepřáteli.\n"
-"\n"
-"Nepřátelské jednotky nemohou spatřit ani napadnout tuto jednotku v lese, "
-"pouze v tahu bezprostředně po jejím útoku nebo jsou-li na sousedních 
polích "
-"nepřátelské jednotky."
 
-#: data/translations/english.cfg:54 data/units/Elvish_Avenger.cfg:18
-#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
-#: data/units/Elvish_Ranger.cfg:94
-msgid "ambush"
-msgstr "přepadení"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "rouška tmy"
 
-#: data/translations/english.cfg:59
+#: data/translations/english.cfg:69
 msgid ""
-"Illuminates:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
+"Regenerates:\n"
+"The unit will heal itself 8 hp per turn. If it is poisoned, it will remove "
+"the poison instead of healing."
 msgstr ""
-"Osvětlení:\n"
-"Tato jednotka osvětlí okolní prostor, takže denní jednotky budou bojovat 
"
-"lépe a noční jednotky hůře.\n"
-"\n"
-"Jednotky na sousedních polích budou bojovat v noci jako za soumraku a za "
-"soumraku jako ve dne."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "osvětlení, uzdravování"
+#: data/translations/english.cfg:71 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_Rocklobber.cfg:7
+#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+msgid "regenerates"
+msgstr "regeneruje"
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 msgid ""
 "Skirmisher:\n"
 "This unit is skilled in moving past enemies quickly, and ignores all Enemy "
@@ -2492,118 +2635,131 @@
 "Tato jednotka je zvyklá pohybovat se mezi nepřáteli a ignoruje všechny "
 "oblasti kontroly."
 
-#: data/translations/english.cfg:66 data/units/Assassin.cfg:16
+#: data/translations/english.cfg:76 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:19 data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr "průbojnost"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "nikdy si nebere více než jeden zlaťák"
-
-#: data/translations/english.cfg:72
-msgid "This unit takes half normal damage when it did not initiate the attack."
+#: data/translations/english.cfg:79
+#, fuzzy
+msgid ""
+"Steadfast:\n"
+"This unit takes half normal damage when it did not initiate the attack."
 msgstr ""
 "Tato jednotka utrpí jen polovinu normálního poškození, pokud 
neiniciovala "
 "útok."
 
-#: data/translations/english.cfg:74 data/units/Dwarvish_Guardsman.cfg:15
+#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
 #: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: src/actions.cpp:499
+#: data/units/Merman_Hoplite.cfg:13 src/actions.cpp:502
 msgid "steadfast"
 msgstr "pevně stojící"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teleportace:\n"
+"Tato jednotka se dokáže v okamžiku přemístit z jedné spřátelené 
vesnice do "
+"druhé."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleportace"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "minimální poškození"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Hra"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scénář"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Nastavení stran:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Vyber si nastavení týmu:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Spojení se vzdáleným hostitelem se nezdařilo"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Čekám, až se připojí ostatní hráči"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Obsazeno"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Prázdné"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Pozorovatel"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Popis jednotky"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Přes celou obrazovku nebo v okně?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Obrazovka:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "V okně"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Rychlost:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normální"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Nastavení zvuku..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Volby"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Zvol scénář"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr "Tento terén se z hledika pohybu a obrany chová jako $terrains"
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Terén s nejlepšími modifikátory se vybírá automaticky"
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Tento terén léčí"
 
-#: data/translations/english.cfg:107
+#: data/translations/english.cfg:119
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain"
@@ -2611,25 +2767,25 @@
 "Tento terén se chová jako tvrz, tj. je-li v něm tvůj vůdce, můžeš 
verbovat "
 "jednotky."
 
-#: data/translations/english.cfg:108
+#: data/translations/english.cfg:120
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain"
 msgstr "Tento terén se chová jako hrad, tj. můžeš do něj verbovat 
jednotky."
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "nebo"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Tabulka obrany jednotky"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Viz také..."
 
-#: data/translations/english.cfg:117
+#: data/translations/english.cfg:129
 msgid ""
 "Backstab:\n"
 "This attack deals double damage if a friendly unit is on the opposite side "
@@ -2639,13 +2795,17 @@
 "Tento útok působí dvojnásobné poranění, když se na opačné straně 
protivníka "
 "nachází spřátelená jednotka."
 
-#: data/translations/english.cfg:119 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:490
-msgid "backstab"
-msgstr "zezadu"
+#: data/translations/english.cfg:132
+msgid ""
+"Berserk:\n"
+"Whether used offensively or defensively, this attack presses the engagement "
+"until one of the combatants is slain."
+msgstr ""
+"Na život a na smrt:\n"
+"Boj trvá tak dlouho, dokud jeden z protivníků nezemře, a to při útoku i 
v "
+"obraně."
 
-#: data/translations/english.cfg:122
+#: data/translations/english.cfg:135
 msgid ""
 "Charge:\n"
 "This attack deals double damage to the target. It also causes this unit to "
@@ -2655,14 +2815,7 @@
 "Tento útok působí dvojnásobné poranění protivníka. Také ale znamená 
"
 "dvojnásobné poranění útočníka při protivníkově obraně."
 
-#: data/translations/english.cfg:124 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:363 src/actions.cpp:481
-msgid "charge"
-msgstr "výpad"
-
-#: data/translations/english.cfg:127
+#: data/translations/english.cfg:138
 msgid ""
 "Drain:\n"
 "This unit drains health from living units, healing itself for half the "
@@ -2672,18 +2825,15 @@
 "Tato jednotka vysává životní sílu z živých jednotek, čímž se sama 
léči o "
 "polovinu poranění, jež útokem způsobila."
 
-#: data/translations/english.cfg:129 data/units/Ancient_Lich.cfg:24
-#: data/units/Blood_Bat.cfg:24 data/units/Dark_Spirit.cfg:24
-#: data/units/Demilich.cfg:23 data/units/Lich.cfg:24
-#: data/units/Orcish_Shaman.cfg:30 data/units/Orcish_Shaman.cfg:73
-#: data/units/Orcish_Shaman.cfg:116 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Spectre.cfg:24 data/units/Vampire_Bat.cfg:24
-#: data/units/Vampire_Lady.cfg:25 data/units/Vampire_Lady.cfg:38
-#: data/units/Wraith.cfg:24
-msgid "drain"
-msgstr "vysátí"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"První úder:\n"
+"Tato jednotka v souboji vždy udeří první, i když se brání."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2691,32 +2841,7 @@
 "Magický:\n"
 "Tento útok je magický, a má vždy 70% šanci zásahu."
 
-#: data/translations/english.cfg:134 data/units/Ancient_Lich.cfg:34
-#: data/units/Arch_Mage.cfg:42 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/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:64 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 data/units/Mage.cfg:39
-#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
-#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
-#: data/units/Princess.cfg:79 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 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 "magické"
-
-#: data/translations/english.cfg:137
+#: data/translations/english.cfg:147
 msgid ""
 "Marksman:\n"
 "When used offensively, this attack always has at least a 60% chance to hit."
@@ -2724,13 +2849,7 @@
 "Odstřelovač:\n"
 "Tento útok má vždy alespoň 60% šanci zásahu, je-li užit ofensivně."
 
-#: data/translations/english.cfg:139 data/units/Elvish_Marksman.cfg:39
-#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
-msgid "marksman"
-msgstr "odstřelovač"
-
-#: data/translations/english.cfg:142
+#: data/translations/english.cfg:150
 msgid ""
 "Plague:\n"
 "If this unit kills a living target and that unit was not stationed in a "
@@ -2740,12 +2859,7 @@
 "Pokud tato jednotka zabije živého protívníka, který nebyl ve vesnici, 
jeho "
 "mrtvola povstane a přidá se na její stranu."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "nákaza"
-
-#: data/translations/english.cfg:147
+#: data/translations/english.cfg:153
 msgid ""
 "Poison:\n"
 "This attack poisons the target. Poisoned units lose 8 HP every turn until "
@@ -2755,16 +2869,7 @@
 "Tento útok způsobuje protivníkovi otravu. Otrávené jednotky ztrácejí 8 
"
 "životů za kolo, dokud se nevylečí nebo počet životů neklesne na jeden."
 
-#: data/translations/english.cfg:149 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:38
-#: data/units/Necrophage.cfg:24 data/units/Orcish_Assassin.cfg:41
-#: data/units/Orcish_Slayer.cfg:46
-msgid "poison"
-msgstr "otrava"
-
-#: data/translations/english.cfg:152
+#: data/translations/english.cfg:156
 msgid ""
 "Slow:\n"
 "This attack slows the target. Slowed units move at half normal speed and "
@@ -2774,15 +2879,7 @@
 "Tento útok zpomaluje protivníka. Zpomalené jednotky se pohybují 
poloviční "
 "rychlostí a mají po dobu jednoho kola o jeden útok méně než obvykle."
 
-#: data/translations/english.cfg:154 data/units/Cave_Spider.cfg:38
-#: data/units/Elvish_Druid.cfg:44 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 "zpomalení"
-
-#: data/translations/english.cfg:157
+#: data/translations/english.cfg:159
 msgid ""
 "Stone:\n"
 "This attack turns the target to stone. Units that have been turned to stone "
@@ -2792,197 +2889,89 @@
 "Tento útok promění protivníka v kámen. Jednotky proměněné v kámen se 
nemohou "
 "hýbat ani útočit."
 
-#: data/translations/english.cfg:159 data/units/Cockatrice.cfg:26
-#: src/actions.cpp:728 src/actions.cpp:876 src/reports.cpp:122
-#, fuzzy
-msgid "stone"
-msgstr "zkamenění"
-
 #: data/translations/english.cfg:162
-msgid ""
-"Berserk:\n"
-"Whether used offensively or defensively, this attack presses the engagement "
-"until one of the combatants is slain."
-msgstr ""
-"Na život a na smrt:\n"
-"Boj trvá tak dlouho, dokud jeden z protivníků nezemře, a to při útoku i 
v "
-"obraně."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "na život a na smrt"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"První úder:\n"
-"Tato jednotka v souboji vždy udeří první, i když se brání."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "první úder"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfové"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Skřeti"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Lidé"
 
-#: data/translations/english.cfg:175
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Skřeti"
+
+#: data/translations/english.cfg:165
 msgid "Undead"
 msgstr "Nemrtví"
 
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Hluboká voda"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Mělká voda"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Písek"
-
-#: data/translations/english.cfg:182 data/translations/english.cfg:184
-#: data/translations/english.cfg:185 data/translations/english.cfg:186
-#: data/translations/english.cfg:187 data/translations/english.cfg:188
-#: src/reports.cpp:310
-msgid "Village"
-msgstr "Vesnice"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Mokřina"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Led"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Cesta"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Bahno"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Louka"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Kopce"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Hory"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Les"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Most"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Hrad"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Tvrz"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Jeskyně"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Zeď jeskyně"
-
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Ležení"
-
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "Most $name,Brod $name"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "Silnice $name,Průsmyk $name,Cesta $name"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "Řeka $name,řeka $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "Les $name,Les $name"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "Jezero $name"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr ""
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "Les $name,Les $name"
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ""
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr ""
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr ""
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr ""
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr ""
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Další tip"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Tip dne"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Nezobrazuj tipy"
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
@@ -2990,7 +2979,7 @@
 "Denní jednotky bojují lépe ve dne, noční jednotky bojují lépe v noci. "
 "Neutrální jednotky denní doba nijak neovlivňuje."
 
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:186
 msgid ""
 "In a campaign, you can use veteran units from previous scenarios by using "
 "the 'recall' option."
@@ -2998,7 +2987,7 @@
 "V tažení můžeš využívat zkušené jednotky z minulých scénářů 
pomocí volby "
 "„Přivolej“."
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
 "Different units have weaknesses against different types of attacks. Right-"
@@ -3011,7 +3000,7 @@
 "jednotku pravým tlačítkem myši a vyber „Popis jednotky“, tam klikni 
na "
 "„Odolnost“, a uvidíš, jak je jednotka odolná vůči jednotlivým 
typům útoku."
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
 "hitting them in battle. The defensive rating for the currently selected unit "
@@ -3022,7 +3011,7 @@
 "zasáhne. Hodnocení obrany právě vybrané jednotky v právě vybraném 
terénu se "
 "zobrazuje v pravém horním rohu obrazovky."
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
 "poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -3034,7 +3023,7 @@
 "přesunem do vesnice nebo umístěním vedle jednotky, která má schopnost "
 "uzdravovat."
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
 "menu. By recalling the same units over and over, you can build up a powerful "
@@ -3044,7 +3033,7 @@
 "Vyvoláváním stále stejných jednotek znovu a znovu můžeš vybudovat 
silnou a "
 "zkušenou armádu."
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
 "unit moves into an enemy's Zone of Control, it may not move any further that "
@@ -3054,7 +3043,7 @@
 "šestiúhelníků. Pokud se jednotka posune do oblasti kontroly nepřítele, "
 "nemůže už se v tomtéž kole pohnout dále."
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
 "itself in the terrain it is standing in, however magical attacks always have "
@@ -3064,13 +3053,13 @@
 "terénu, v němž stojí; avšak magické útoky mají vždy 70% šanci 
zasáhnout a "
 "odstřelovači mají vždy alespoň 60% šanci zasáhnout."
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
 msgstr ""
 "Jednotky umístěné ve vesnicích se uzdravují o 8 životů na začátku 
svého kola."
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
 "hitpoints at the beginning of their next turn."
@@ -3078,7 +3067,7 @@
 "Jednotky, které se nepohnou ani neútočí během svého kola, se uzdraví o 
dva "
 "životy na začátku příštího kola."
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
 "terrain, while most mounted units don't get any defensive advantage in "
@@ -3088,7 +3077,7 @@
 "ostatních terénů, zatímco většina jízdních jednotek nezískává ve 
vesnicích a "
 "hradech žádnou obrannou výhodu."
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
 "weapons, but are vulnerable to attacks with piercing weapons, including bows "
@@ -3097,7 +3086,7 @@
 "Jednotky jedoucí na koních jsou obecně odolné proti útoku čepelí či 
úderem, "
 "ale jsou zranitelné bodnými zbraněmi, včetně luků a kopí."
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
 "experience. Units killing an enemy will gain 8 experience for every level of "
@@ -3107,7 +3096,7 @@
 "zkušenost. Jednotka, která zabila nepřítele, získá 8 zkušenostních 
bodů za "
 "každou úroveň jednotky, kterou zabila."
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
 "fight very well in hills and mountains."
@@ -3115,7 +3104,7 @@
 "Elfské jednotky se pohybují a bojují velmi dobře v lese. Trpasličí 
jednotky "
 "se pohybují a bojují velmi dobře v kopcích a horách."
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
 "troops, wait for better conditions and then attack."
@@ -3123,7 +3112,7 @@
 "Často je klíčová trpělivost. Než útočit ve špatných podmínkách 
nebo s malým "
 "vojskem, raději počkej na lepší podmínky a zaútoč potom."
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
 "expendable units in some directions to delay enemy units."
@@ -3131,12 +3120,12 @@
 "Pokud na tebe útočí z několika stran, může být dobrý nápad poslat "
 "postradatelné jednotky do některých stran, aby zdržely nepřátelské 
jednotky."
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
 msgstr "Neboj se ustoupit a přeskupit; je to často klíčem k vítězství."
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
 "depending on the number of villages on the map, and the number of turns you "
@@ -3147,7 +3136,7 @@
 "závisí na počtu vesnic na mapě a počtu kol, o něž jsi skončil 
dříve. Takto "
 "vždy získáš více zlaťáků než obsazováním vesnic a čekáním do 
konce kol."
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
 "just the keep they start on. You can capture a keep from an enemy and "
@@ -3159,7 +3148,7 @@
 "z ní. Také tví spojenci mohou být ochotni uvolnit ti místo ve své 
tvrzi, "
 "abys odtamtud mohl verbovat."
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
 "impact, fire, and holy attacks."
@@ -3167,7 +3156,7 @@
 "Kostlivci jsou odolní vůči útokům čepelí a bodání, ale bezbranní 
vůči "
 "úderům, ohni a svatému útoku."
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
 "side fight better."
@@ -3175,7 +3164,7 @@
 "Jednotky se schopností velet zlepšují bojové schopnosti jednotek nižší 
"
 "úrovně na sousedních polích."
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
 "onto the village and attack you, while enjoying the defense and healing of "
@@ -3185,22 +3174,22 @@
 "přesunout nepřátelská jednotka a zaútočit na tebe, užívajíc si 
přitom výhod "
 "vesnice: obranu a léčení."
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
 "ability or trait."
 msgstr ""
 "Když podržíš kursor myši nad schopností či vlastností, ukáže se 
její popis."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr "Chraň zraněné jednotky řadou jednotek, abys jim umožnil zotavit 
se."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Přečti si seznam klávesových zkratek v menu Nastavení."
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
 "you can undo your move by pressing 'u'."
@@ -3208,7 +3197,7 @@
 "Pohneš-li s jednotkou, ale nezaútočíš ani nezjistíš žádné 
dodatečné "
 "informace, můžeš její pohyb vrátit zpět stisknutím „u“."
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
 "them."
@@ -3216,7 +3205,7 @@
 "Můžeš se podívat, jak daleko mohou nepřátelské jednotky dojít, když 
na ně "
 "přesuneš kursor myši."
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
 "needing to attack anything themselves."
@@ -3224,7 +3213,7 @@
 "Ber s sebou do útoků i léčitele -- vyhrají tvé bitvy, aniž musí sami "
 "zaútočit."
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
 "them one less attack than they would normally have. It is thus very "
@@ -3234,11 +3223,11 @@
 "odebírá jeden útok, jenž by normálně měly. Je proto velmi účinný 
proti "
 "jednotkám, které mají málo útoků, avšak silných."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Svaté útoky jsou velmi účinné proti nemrtvým."
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
 "fight."
@@ -3246,7 +3235,7 @@
 "Když jsou jednotky povýšeny, současně se zcela uzdraví. To může při 
moudrém "
 "využití zvrátit bitvu."
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
@@ -3279,7 +3268,7 @@
 
 #: data/units/Ancient_Lich.cfg:20 data/units/Ancient_Lich.cfg:33
 #: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
-#: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
+#: data/units/Dark_Queen.cfg:28 data/units/Dark_Queen.cfg:29
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
 #: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
@@ -3292,12 +3281,49 @@
 msgid "cold"
 msgstr "chlad"
 
+#: data/units/Ancient_Lich.cfg:24 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:23
+#: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:30
+#: data/units/Orcish_Shaman.cfg:73 data/units/Orcish_Shaman.cfg:116
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
+#: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:24
+msgid "drain"
+msgstr "vysátí"
+
 #: data/units/Ancient_Lich.cfg:32 data/units/Deathmaster.cfg:35
 #: data/units/Demilich.cfg:31 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr "magie"
 
+#: data/units/Ancient_Lich.cfg:34 data/units/Arch_Mage.cfg:42
+#: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:30 data/units/Deathmaster.cfg:37
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:64
+#: 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
+#: data/units/Mage.cfg:39 data/units/Mage.cfg:106
+#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
+#: data/units/Mermaid_Diviner.cfg:37 data/units/Mermaid_Enchantress.cfg:35
+#: data/units/Mermaid_Initiate.cfg:35 data/units/Mermaid_Priestess.cfg:35
+#: data/units/Mermaid_Siren.cfg:26 data/units/Mermaid_Siren.cfg:37
+#: data/units/Necromancer.cfg:37 data/units/Princess.cfg:80
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: 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 "magické"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Prastarý stromový muž"
@@ -3323,7 +3349,7 @@
 #: 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/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:22
 #: 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
@@ -3331,19 +3357,24 @@
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
 #: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:24
 #: data/units/Elvish_Druid.cfg:43 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:20
 #: 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/Footpad.cfg:38 data/units/Galleon.cfg:19 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: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/Mermaid_Diviner.cfg:27 data/units/Mermaid_Enchantress.cfg:24
+#: data/units/Mermaid_Enchantress.cfg:33 data/units/Mermaid_Initiate.cfg:24
+#: data/units/Mermaid_Initiate.cfg:33 data/units/Mermaid_Priestess.cfg:25
+#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
+#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
 #: data/units/Noble_Youth.cfg:22 data/units/Outlaw.cfg:21
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3363,7 +3394,7 @@
 msgid "impact"
 msgstr "úder"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Arcimág"
 
@@ -3379,6 +3410,8 @@
 #: data/units/Elvish_Druid.cfg:23 data/units/Elvish_Enchantress.cfg:25
 #: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
+#: data/units/Mermaid_Diviner.cfg:26 data/units/Mermaid_Enchantress.cfg:23
+#: data/units/Mermaid_Initiate.cfg:23 data/units/Mermaid_Priestess.cfg:24
 #: 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
@@ -3394,7 +3427,7 @@
 msgstr "ohnivá koule"
 
 #: 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/Battle_Princess.cfg:78 data/units/Commander.cfg:121
 #: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
 #: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
@@ -3406,12 +3439,17 @@
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/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/Princess.cfg:78 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
 #: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr "oheň"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Arcimág"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Vrah"
@@ -3439,7 +3477,7 @@
 msgstr "dýka"
 
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
-#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
 #: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
@@ -3477,21 +3515,22 @@
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Lord.cfg:86
 #: data/units/Mage.cfg:21 data/units/Mage.cfg:88
-#: data/units/Master_Bowman.cfg:21 data/units/Necrophage.cfg:20
-#: data/units/Nightgaunt.cfg:21 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: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 data/units/Orcish_Shaman.cfg:105
-#: data/units/Orcish_Slayer.cfg:20 data/units/Orcish_Slayer.cfg:42
-#: data/units/Orcish_Sovereign.cfg:22 data/units/Orcish_Warlord.cfg:19
-#: data/units/Orcish_Warrior.cfg:20 data/units/Poacher.cfg:25
-#: data/units/Princess.cfg:23 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/Master_Bowman.cfg:21 data/units/Merman_Triton.cfg:34
+#: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
+#: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
+#: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:20
+#: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
+#: 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
+#: data/units/Orcish_Shaman.cfg:105 data/units/Orcish_Slayer.cfg:20
+#: data/units/Orcish_Slayer.cfg:42 data/units/Orcish_Sovereign.cfg:22
+#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:20
+#: data/units/Poacher.cfg:25 data/units/Princess.cfg:24
+#: data/units/Princess.cfg:62 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:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
@@ -3499,16 +3538,30 @@
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:20
 #: data/units/Swordsman.cfg:20 data/units/Thief.cfg:20
 #: data/units/Trapper.cfg:25 data/units/Vampire_Bat.cfg:20
-#: data/units/Vampire_Lady.cfg:20 data/units/White_Mage.cfg:29
+#: data/units/Vampire_Lady.cfg:21 data/units/White_Mage.cfg:29
 #: data/units/White_Mage.cfg:88 data/units/Wolf_Rider.cfg:21
 #: data/units/Wraith.cfg:20 data/units/Young_Ogre.cfg:19
 msgid "blade"
 msgstr "čepel"
 
+#: 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:493
+msgid "backstab"
+msgstr "zezadu"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "nůž"
 
+#: 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:38 data/units/Necrophage.cfg:24
+#: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
+msgid "poison"
+msgstr "otrava"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandita"
@@ -3534,16 +3587,16 @@
 msgid "mace"
 msgstr "palice"
 
-#: data/units/Battle_Princess.cfg:3 data/units/Battle_Princess.cfg:41
-#: data/units/Princess.cfg:3 data/units/Princess.cfg:41
-msgid "Princess"
+#: data/units/Battle_Princess.cfg:3 data/units/Princess.cfg:3
+#, fuzzy
+msgid "female^Princess"
 msgstr "Princezna"
 
-#: data/units/Battle_Princess.cfg:17 data/units/Battle_Princess.cfg:55
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr "velení, průbojnost"
 
-#: data/units/Battle_Princess.cfg:19
+#: data/units/Battle_Princess.cfg:20
 #, fuzzy
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
@@ -3556,7 +3609,7 @@
 "bojovnicí a vůdkyní. Jednotky s nižší úrovní bojují v její 
přítomnosti lépe. "
 "Princezna je také mrštná, obratná a má schopnosti podobné zlodějovým."
 
-#: data/units/Battle_Princess.cfg:22 data/units/Battle_Princess.cfg:60
+#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
 #: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
@@ -3580,18 +3633,22 @@
 #: data/units/Longbowman.cfg:21 data/units/Lord.cfg:22 data/units/Lord.cfg:85
 #: data/units/Master_Bowman.cfg:20 data/units/Noble_Commander.cfg:23
 #: data/units/Noble_Fighter.cfg:20 data/units/Noble_Lord.cfg:22
-#: data/units/Ogre.cfg:18 data/units/Orcish_Grunt.cfg:19
+#: data/units/Ogre.cfg:19 data/units/Orcish_Grunt.cfg:19
 #: data/units/Orcish_Leader.cfg:21 data/units/Orcish_Ruler.cfg:21
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
-#: data/units/Princess.cfg:22 data/units/Princess.cfg:60
+#: data/units/Princess.cfg:23 data/units/Princess.cfg:61
 #: 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 "meč"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Princezna"
+
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -3600,9 +3657,9 @@
 "and ignores enemy zones of control."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:76 data/units/Commander.cfg:120
+#: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
-#: data/units/Princess.cfg:76
+#: data/units/Princess.cfg:77
 msgid "scepter of fire"
 msgstr "ohnivé žezlo"
 
@@ -3696,7 +3753,13 @@
 #: 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:22
+#: data/units/Merman.cfg:20 data/units/Merman_Entangler.cfg:19
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:23
+#: data/units/Merman_Hunter.cfg:19 data/units/Merman_Hunter.cfg:27
+#: data/units/Merman_Javelineer.cfg:19 data/units/Merman_Javelineer.cfg:27
+#: data/units/Merman_Lord.cfg:22 data/units/Merman_Netcaster.cfg:19
+#: data/units/Merman_Spearman.cfg:19 data/units/Merman_Spearman.cfg:27
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Warrior.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:41 data/units/Orcish_Crossbowman.cfg:39
@@ -3705,7 +3768,7 @@
 #: 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:16
+#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
 #: 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
@@ -3713,7 +3776,7 @@
 #: 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:17 data/units/Trapper.cfg:42
-#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:34
+#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:35
 #: data/units/Wall_Guard.cfg:36 data/units/Watch_Tower.cfg:18
 msgid "pierce"
 msgstr "bodnutí"
@@ -3786,6 +3849,14 @@
 msgid "web"
 msgstr "pavučina"
 
+#: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:44
+#: 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
+#: data/units/Merman_Entangler.cfg:29 data/units/Merman_Netcaster.cfg:29
+msgid "slow"
+msgstr "zpomalení"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Kostipštros"
@@ -3807,13 +3878,24 @@
 #: 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/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
+#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
+#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
+#: data/units/Merman_Spearman.cfg:26 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 "oštěp"
 
+#: 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:365
+#: src/actions.cpp:484
+msgid "charge"
+msgstr "výpad"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Bazilišek"
@@ -3832,6 +3914,12 @@
 msgid "gaze"
 msgstr "pohled"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+#, fuzzy
+msgid "stone"
+msgstr "zkamenění"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Velitel"
@@ -3904,10 +3992,11 @@
 msgstr "vlna mrazu"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Temná královna"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 msgid ""
 "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 "
@@ -3917,7 +4006,7 @@
 "magie ji činí v boji úctyhodným protivníkem, ačkoli její moc pochází 
zejména "
 "z těch, jimž velí."
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "žezlo"
 
@@ -4189,6 +4278,12 @@
 "weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
+#: data/units/Drake_Slasher.cfg:42 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 "první úder"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Dračí válečník"
@@ -4238,6 +4333,10 @@
 msgid "berserker frenzy"
 msgstr "válečená zuřivost"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "na život a na smrt"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Trpasličí dračí stráž"
@@ -4414,6 +4513,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Trpaslík ulfserk"
 
+#: data/units/Dwarvish_Ulfserker.cfg:16
+msgid ""
+"Dwarves are an ancient race of powerful fighters. Ulfserkers are the most "
+"ferocious of these in battle: they attack without stopping fighting until "
+"either their enemy or they are dead, no matter how many wounds they receive."
+msgstr ""
+
 #: data/units/Elder_Mage.cfg:3
 msgid "Elder Mage"
 msgstr "Starý mág"
@@ -4445,7 +4551,7 @@
 "can quickly heal themselves in the face of tremendous injuries."
 msgstr ""
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr "Elfí lučištník"
 
@@ -4459,7 +4565,12 @@
 "na dálku. Díky tomu, že dokáží rychle a přesně vystřelit mnoho 
šípů, jsou "
 "hlavní součást elfské armády."
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Elfí lučištník"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Elfí mstitel"
 
@@ -4475,6 +4586,11 @@
 "dokáží přepadávat své nepřátele z lesa, protože v lese nemohou být 
spatřeni, "
 "pokud právě nezaútočili."
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Elfí mstitel"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Elfí kapitán"
@@ -4504,7 +4620,8 @@
 "svým protivníkům škodu zblízka i na dálku."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Elfí druidka"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4526,7 +4643,8 @@
 msgstr "ostny"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Elfí čarodějka"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4587,10 +4705,18 @@
 "ničivé ohnivé koule."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Elfí paní"
 
 #: data/units/Elvish_Lady.cfg:17
+msgid ""
+"Elvish lady Parandra is one of the most respected elves ever. Her ability to "
+"see through the fogs of destiny has gained her a wisely used authority among "
+"her people, guiding them in times of uncertainty."
+msgstr ""
+
+#: data/units/Elvish_Lady.cfg:19
 msgid "shove"
 msgstr "žduchnutí"
 
@@ -4606,7 +4732,7 @@
 "Elfí lordi jsou obávaní v boji, zblízka bojují mečem a na dálku 
vrhají "
 "ničivé ohnivé koule."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Elfí odstřelovač"
 
@@ -4628,6 +4754,17 @@
 msgid "longbow"
 msgstr "dlouhý luk"
 
+#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
+#: data/units/Elvish_Sharpshooter.cfg:40
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+msgid "marksman"
+msgstr "odstřelovač"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Elfí odstřelovač"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Elfí maršál"
@@ -4657,7 +4794,7 @@
 "slabší jednotky a odkrytá křídla. Zruční v boji s lukem i mečem, 
tvrdě "
 "udeří, než opět zmizí v lese, unikajíce odvetě."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Elfí hraničář"
 
@@ -4672,6 +4809,11 @@
 "dálky, je to opravdu všestranný bojovník. Hraničáři jsou nejlepší 
zálesáci, "
 "a dokud jsou v lese, tak je nepřítel nedokáže spatřit, dokud sami 
nezaútočí."
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Elfí hraničář"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Elfí jezdec"
@@ -4697,7 +4839,8 @@
 "jízdě na koni nemají vskutku sobě rovné, avšak scházejí mu bojové 
schopnosti."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Elfí šamanka"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4710,7 +4853,7 @@
 "nepřátelům. Její zamotávací ůtoky zpomalují protivníky a snižují 
možnosti "
 "jejich útoku. Ovládá také základní schopnosti ošetřování."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Elfí ostrostřelec"
 
@@ -4725,8 +4868,14 @@
 "přesní, což jim zaručuje 60% šanci zasáhu, i když střílejí velice 
rychle. "
 "Ostrostřelci jsou vynikající k odstřelování opevněných nepřátel."
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Elfí ostrostřelec"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Elfí víla"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4744,7 +4893,8 @@
 msgstr "dotek víly"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Elfí vědma"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4756,7 +4906,8 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Elfí sylfa"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4857,7 +5008,15 @@
 msgid "Galleon"
 msgstr "Galeona"
 
-#: data/units/Galleon.cfg:17
+#: data/units/Galleon.cfg:16
+msgid ""
+"Even people happily living in their home eventually need some kind of "
+"transport through the seas, even if they only go fishing or to trade goods. "
+"The galleon is perfect for this purpose: it's fast and resilient, but not "
+"prepared to fight, and is able to adapt to many different tasks."
+msgstr ""
+
+#: data/units/Galleon.cfg:18
 msgid "dummy"
 msgstr "fiktivní"
 
@@ -4968,12 +5127,6 @@
 "nedostatek propracovaných zbraní zdrcením nepřátel svým pouhým 
počtem. Toto "
 "jsou větši a schopnější příbuzní goblinů s oštěpem."
 
-#: 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 "první úder"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Goblinský rytíř"
@@ -5003,7 +5156,8 @@
 msgid "torch"
 msgstr "louč"
 
-#: data/units/Goblin_Pillager.cfg:35
+#: data/units/Goblin_Pillager.cfg:35 data/units/Merman_Entangler.cfg:26
+#: data/units/Merman_Netcaster.cfg:26
 msgid "net"
 msgstr "síť"
 
@@ -5055,7 +5209,7 @@
 "serving beneath them."
 msgstr ""
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 msgid "Great Mage"
 msgstr "Velký mág"
 
@@ -5067,17 +5221,15 @@
 "Velký mág je obdivovaný a obávaný protivník, protože svou mocí 
převyšuje i "
 "arcimága."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Velký mág"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Velký trol"
 
-#: 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_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
-#: data/units/Troll_Whelp.cfg:7
-msgid "regenerates"
-msgstr "regeneruje"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -5290,7 +5442,7 @@
 "zachází i s lukem. Podobně jako velitel má i lord vůdcovské schopnosti 
a "
 "pomahá jednotkám nižší úrovně na sousedních polích."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Mág"
 
@@ -5309,11 +5461,16 @@
 msgid "missile"
 msgstr "střela"
 
-#: data/units/Mage_of_Light.cfg:3 data/units/Mage_of_Light.cfg:66
+#: data/units/Mage.cfg:70
+msgid "female^Mage"
+msgstr ""
+
+#: data/units/Mage_of_Light.cfg:3
 msgid "Mage of Light"
 msgstr "Mág světla"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "osvětlení, uzdravování"
 
@@ -5335,16 +5492,23 @@
 "vedlejších polích."
 
 #: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
+#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
 #: data/units/White_Mage.cfg:44 data/units/White_Mage.cfg:103
 msgid "lightbeam"
 msgstr "paprsek světla"
 
 #: data/units/Mage_of_Light.cfg:46 data/units/Mage_of_Light.cfg:106
+#: data/units/Mermaid_Diviner.cfg:35 data/units/Mermaid_Priestess.cfg:33
 #: data/units/Paladin.cfg:26 data/units/White_Mage.cfg:45
 #: data/units/White_Mage.cfg:104
 msgid "holy"
 msgstr "svaté"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Mág světla"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Mistr lučištník"
@@ -5359,11 +5523,28 @@
 "člověk doufat. Jejich schopnosti s touto smrtící zbraní překonávají 
jen "
 "elfové."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Vodní muž"
+#: data/units/Mermaid_Diviner.cfg:3
+msgid "female^Mermaid Diviner"
+msgstr ""
+
+#: data/units/Mermaid_Diviner.cfg:23
+msgid ""
+"The most devout and pious amongst the mermaids gain the striking power of "
+"illumination, which prevents their surroundings from ever seeing true "
+"night.  Their power is a stalwart counter to the forces of darkness."
+msgstr ""
 
-#: data/units/Merman.cfg:16
+#: data/units/Mermaid_Enchantress.cfg:3
+#, fuzzy
+msgid "female^Mermaid Enchantress"
+msgstr "Elfí čarodějka"
+
+#: data/units/Mermaid_Enchantress.cfg:20 data/units/Mermaid_Siren.cfg:20
+#: data/units/Merman.cfg:16 data/units/Merman_Entangler.cfg:15
+#: data/units/Merman_Fighter.cfg:18 data/units/Merman_Hoplite.cfg:19
+#: data/units/Merman_Hunter.cfg:15 data/units/Merman_Javelineer.cfg:15
+#: data/units/Merman_Netcaster.cfg:15 data/units/Merman_Spearman.cfg:15
+#: data/units/Merman_Triton.cfg:18 data/units/Merman_Warrior.cfg:18
 msgid ""
 "Skilled creatures of the sea, Mermen are powerful and quick in any watery "
 "environment, but struggle greatly to move on land."
@@ -5371,11 +5552,98 @@
 "Vodní muži, zkušení obyvatelé moře, jsou silní a rychlí v každém 
vodním "
 "prostředí, ale velice se trápí při pohybu po souši."
 
-#: 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
+#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:31
+#: data/units/Mermaid_Siren.cfg:33 data/units/Sea_Hag.cfg:27
+msgid "water spray"
+msgstr "vodní sprška"
+
+#: data/units/Mermaid_Initiate.cfg:3
+msgid "female^Mermaid Initiate"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:20
+msgid ""
+"Young Mermaids are often initiated in the water magics of their people.  "
+"Despite their frailty, this makes them formidable opponents, as they can "
+"call upon the very water about them to smite their enemies."
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:3
+msgid "female^Mermaid Priestess"
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:21
+msgid ""
+"The more learned among the mermaids often take a path of holy study.  This "
+"leaves them quite capable of ministering to the wounds of their comrades, as "
+"well as being a potent defense against the unworldly."
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:3
+msgid "female^Siren"
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:23
+#, fuzzy
+msgid "naia touch"
+msgstr "dotek víly"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Vodní muž"
+
+#: data/units/Merman.cfg:19 data/units/Merman_Fighter.cfg:21
+#: data/units/Merman_Hoplite.cfg:22 data/units/Merman_Lord.cfg:21
+#: data/units/Merman_Triton.cfg:21 data/units/Merman_Triton.cfg:33
+#: data/units/Merman_Warrior.cfg:21 data/units/Naga.cfg:20
+#: data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr "trojzubec"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "zamotání"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Dračí bojovník"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Vodní muž"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Vodní muž"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Ještěrák metající led"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Pěšák s oštěpem"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Německý překlad"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Ještěrácký bojovník"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Blátožrout"
@@ -5389,8 +5657,8 @@
 "sprškami vařící vody."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Vodní rejpal"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5440,10 +5708,6 @@
 "snaze ukrýt čisté zlo tvořící jejich duši. Tyto ohavné stvůry se 
dokáží v "
 "noci ukrýt tak, že nezanechají žádnou stopu své přítomnosti."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "rouška tmy"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Vznešený velitel"
@@ -5486,7 +5750,7 @@
 msgid "Ogre"
 msgstr "Obr"
 
-#: data/units/Ogre.cfg:15
+#: data/units/Ogre.cfg:16
 msgid ""
 "Ogres are stupid giant humanoids that usually live alone in the wilderness. "
 "While they can be easily outrun or outsmarted, their strength is not to be "
@@ -5603,7 +5867,7 @@
 msgstr ""
 
 #: data/units/Orcish_Shaman.cfg:25 data/units/Orcish_Shaman.cfg:68
-#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:33
+#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:34
 msgid "curse"
 msgstr "prokletí"
 
@@ -5695,7 +5959,7 @@
 "váženými mezi ostatními skřety, a velmi obávanými svými nepřáteli. 
Jejich "
 "jedinou slabostí je neschopnost vládnout lukem."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Zbojník"
 
@@ -5703,12 +5967,18 @@
 msgid "Outlaws fight better at night."
 msgstr "Zbojníci bojují lépe v noci."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Zbojník"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr "Zbojníci bojují lépe v noci. Zbojnice vypadají dobře, když to 
dělají."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Paní zbojníků"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5720,7 +5990,8 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Královna zbojíků"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5791,7 +6062,14 @@
 msgid "Pirate Galleon"
 msgstr "Pirátská galeona"
 
-#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
+#: data/units/Pirate_Galleon.cfg:14
+msgid ""
+"Pirate galleons are to transport ships what wolves are to sheeps. Ships full "
+"of goods shouldn't be lonely, far away from any land, better to help them to "
+"avoid it being sunk from overloading..."
+msgstr ""
+
+#: data/units/Pirate_Galleon.cfg:16 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr "balista"
@@ -5808,7 +6086,7 @@
 "Pytláci se spoléhají na své lovecké zkušenosti a jsou 
nejužitečnější v noci "
 "a v lesích a močálech."
 
-#: data/units/Princess.cfg:19 data/units/Princess.cfg:57
+#: data/units/Princess.cfg:20 data/units/Princess.cfg:58
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@@ -5821,7 +6099,7 @@
 "bojovnicí a vůdkyní. Jednotky s nižší úrovní bojují v její 
přítomnosti lépe. "
 "Princezna je také mrštná, obratná a má schopnosti podobné zlodějovým."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Rudý mág"
 
@@ -5835,6 +6113,11 @@
 "zásah. Rudý mág je dobrý ve dne i v noci, má rychlé nohy a je cenný v 
téměř "
 "každé situaci."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Rudý mág"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Revenant"
@@ -5948,10 +6231,11 @@
 msgstr "Ještěrácký bojovník"
 
 #: data/units/Saurian_Warrior.cfg:17
+#, fuzzy
 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 "
+"valued as scouts as they can navigate through rough terrain and around "
 "opponents. Saurian Warriors posses the strength to take full advantage of "
 "this fact."
 msgstr ""
@@ -5961,7 +6245,8 @@
 "Ještěráčí bojovníci mají dostatečnou sílu, aby této skutečnosti 
plně využili."
 
 #: data/units/Sea_Hag.cfg:3
-msgid "Sea Hag"
+#, fuzzy
+msgid "female^Sea Hag"
 msgstr "Ochechule"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5972,10 +6257,6 @@
 "Ochechule jsou starší a zkušenejší vodní rejpalové, kteří se 
naučili ovládat "
 "vodní magii."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "vodní sprška"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Mořský skřet"
@@ -6042,7 +6323,7 @@
 "avšak jsou nesmírně silní, a tudíž i obávaní nejen po celém 
Wesnothu, ale i "
 "v dalších zemích."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Stříbrný mág"
 
@@ -6057,10 +6338,24 @@
 "přesouvaje se během okamžiku. Jsou také vysoce odolní proti většině 
druhů "
 "magických útoků."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Stříbrný mág"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Drak kostlivec"
 
+#: data/units/Skeletal_Dragon.cfg:17
+msgid ""
+"Long ago one of the mightiest living creatures, the feared Dragon has become "
+"only bones and dark sinew. Long after its death, it was raised through the "
+"dark powers of necromancy, which it now serves. The Skeletal Dragon may look "
+"like nothing more than a pile of bones, but few people who thought that way "
+"lived long enough to change their minds."
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr "čelist"
@@ -6128,6 +6423,10 @@
 msgstr ""
 "Tyto oživlé chodící mrtvoly zesílily dlouhou zkušeností v boji s 
živými."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "nákaza"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Pěšák s oštěpem"
@@ -6325,10 +6624,11 @@
 "jejich zdraví, a přidávají ho ke svému."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Upíří dáma"
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
 "the blood of the living."
@@ -6336,7 +6636,7 @@
 "Chladná a krásná upíří dáma udržuje svůj věčně mladistvý vzhled 
díky "
 "popíjení krve živých."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "krvavý polibek"
 
@@ -6394,7 +6694,7 @@
 "Strážní věže jsou vhodná místa k odhalení nepřátel a metání 
nejrůznějších "
 "předmětů balistami."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Bílý mág"
 
@@ -6410,6 +6710,11 @@
 "vesnici. Bílý mág je silný v boji s nemrtvými, kterým paprsek světla "
 "způsobuje těžká poranění."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Bílý mág"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Vlčí jezdec"
@@ -6621,7 +6926,7 @@
 msgid "+ Bots"
 msgstr "+ Boti"
 
-#: src/about.cpp:276 src/help.cpp:2372 src/show_dialog.cpp:472
+#: src/about.cpp:276 src/help.cpp:2350 src/show_dialog.cpp:491
 msgid "Close"
 msgstr "Zavřít"
 
@@ -6641,73 +6946,73 @@
 msgid "none"
 msgstr "žádná"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "základní poškození"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "odolnost útočníka vs."
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "zranitelnost útočníka vs."
 
-#: src/actions.cpp:363 src/actions.cpp:481 src/actions.cpp:490
+#: src/actions.cpp:365 src/actions.cpp:484 src/actions.cpp:493
 msgid "Doubled"
 msgstr "Zdvojnásobeno"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "celkové poškození"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "odolnost obránce vs."
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "zranitelnost obránce vs."
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Zmenšeno na polovinu"
 
-#: src/actions.cpp:714 src/actions.cpp:861 src/display.cpp:917
+#: src/actions.cpp:716 src/actions.cpp:862 src/display.cpp:917
 #: src/reports.cpp:115
 msgid "poisoned"
 msgstr "otrávený"
 
-#: src/actions.cpp:719 src/actions.cpp:866 src/display.cpp:913
+#: src/actions.cpp:721 src/actions.cpp:867 src/display.cpp:913
 #: src/reports.cpp:110
 msgid "slowed"
 msgstr "zpomalený"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Přepadení!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Spřátelená jednotka spatřena"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Nepřátelská jednotka na dohled!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends spřátelených jednotek spatřeno"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies nepřátelských jednotek na dohled!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Jednotky na dohled! ($friends spřátelených, $enemies 
nepřátelských)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(stiskni $hotkey k pokračování)"
 
@@ -6767,7 +7072,7 @@
 msgid "replay"
 msgstr "záznam"
 
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1384
+#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1385
 msgid "Turn"
 msgstr "Kolo"
 
@@ -6835,23 +7140,23 @@
 msgid "Profile"
 msgstr "Profil"
 
-#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:567
-#: src/playturn.cpp:1793
+#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:564
+#: src/playturn.cpp:1794
 msgid "level"
 msgstr "úroveň"
 
-#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:622
-#: src/playturn.cpp:1958 src/unit.cpp:1070
+#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:613
+#: src/playturn.cpp:1959 src/unit.cpp:1070
 msgid "Moves"
 msgstr "Kroků"
 
-#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:230
+#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:230
 msgid "melee"
 msgstr "zblízka"
 
-#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:231
+#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:231
 msgid "ranged"
 msgstr "na dálku"
 
@@ -6871,11 +7176,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Chceš uložit záznam této hry?"
 
-#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1393
+#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1394
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1410
+#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1411
 msgid "The game could not be saved"
 msgstr "Hru se nepodařlo uložit"
 
@@ -6938,8 +7243,8 @@
 #: src/game.cpp:999 src/game.cpp:1014 src/game.cpp:1020 src/game.cpp:1053
 #: src/game.cpp:1082 src/game.cpp:1096 src/game.cpp:1098 src/game.cpp:1100
 #: src/game.cpp:1112 src/game.cpp:1115 src/game.cpp:1150 src/game.cpp:1152
-#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1396
-#: src/playturn.cpp:1410
+#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1397
+#: src/playturn.cpp:1411
 msgid "Error"
 msgstr "Chyba"
 
@@ -7002,7 +7307,7 @@
 msgstr "Vytvoření souborů potřebných k instalaci tažení neproběhlo v 
pořádku."
 
 #: src/game.cpp:1112 src/game.cpp:1150 src/game.cpp:1174
-#: src/multiplayer_client.cpp:42 src/multiplayer_client.cpp:314
+#: src/multiplayer_client.cpp:45 src/multiplayer_client.cpp:319
 msgid "Connection timed out"
 msgstr "Časový limit pro připojení vypršel"
 
@@ -7061,7 +7366,7 @@
 msgid "Play a game against AI opponents"
 msgstr ""
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr "Jméno"
 
@@ -7081,79 +7386,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Nemohu inicializovat fonty. Končím.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Povyšuje na"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Povaha"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Potřebné zkušenosti"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "útoky"
 
-#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1955
+#: src/help.cpp:636 src/help.cpp:637 src/playturn.cpp:1956
 msgid "Name"
 msgstr "Jméno"
 
-#: src/help.cpp:649 src/help.cpp:650 src/playturn.cpp:1954
+#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1955
 msgid "Type"
 msgstr "Typ"
 
-#: src/help.cpp:653 src/help.cpp:654 src/unit_types.cpp:302
+#: src/help.cpp:644 src/help.cpp:645 src/unit_types.cpp:302
 msgid "Dmg"
 msgstr "Poškození"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Údery"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Vzdálenost"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Zláštnosti"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Odolnosti"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Druh útoku"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Odolnost proti útoku"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Terénní činitelé"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Terén"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Obrana"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Zpět"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Dále >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Nápověda Bitvy o Wesnoth"
 
@@ -7165,7 +7470,7 @@
 msgid "End Unit Turn"
 msgstr "Ukončit kolo jednotky"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Vůdce"
 
@@ -7201,11 +7506,11 @@
 msgid "Unit Description"
 msgstr "Popis jednotky"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Přejmenuj"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Naverbuj"
 
@@ -7213,7 +7518,7 @@
 msgid "Repeat Recruit"
 msgstr "Zopakuj verbování"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Přivolej"
 
@@ -7249,11 +7554,11 @@
 msgid "Scenario Objectives"
 msgstr "Úkoly scénáře"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Seznam jednotek"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statistiky"
 
@@ -7361,7 +7666,7 @@
 msgid "Speak to All"
 msgstr "Mluv ke všem"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Nápověda"
 
@@ -7421,7 +7726,7 @@
 msgid "Bump Size"
 msgstr "Hrbolatost"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Vesnic"
 
@@ -7469,15 +7774,11 @@
 msgid "Enemy units cannot be seen unless they are in range of your units"
 msgstr "Nepřátelské jednotky nejsou vidět, dokud nejsou v dosahu tvých"
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Ochrana tmy"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "Neprozkoumané části mapy nejsou vidět"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Pozorovatelé"
 
@@ -7485,13 +7786,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Povolit uživatelům, kteří nehrají, pozorovat hru"
 
-#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:145
-#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:460
-#: src/show_dialog.cpp:466
+#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:148
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:479
+#: src/show_dialog.cpp:485
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/multiplayer.cpp:120 src/show_dialog.cpp:446 src/show_dialog.cpp:459
+#: src/multiplayer.cpp:120 src/show_dialog.cpp:465 src/show_dialog.cpp:478
 msgid "Ok"
 msgstr "OK"
 
@@ -7567,70 +7868,70 @@
 msgid "Warning"
 msgstr "Varování"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Přijímání seznamu her..."
 
-#: src/multiplayer_client.cpp:121 src/multiplayer_connect.cpp:386
-#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1531
-#: src/playturn.cpp:1536 src/playturn.cpp:1623
+#: src/multiplayer_client.cpp:124 src/multiplayer_connect.cpp:386
+#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1532
+#: src/playturn.cpp:1537 src/playturn.cpp:1624
 msgid "Gold"
 msgstr "Zlatých"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Čekám, až hra začne..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Připoj se na server"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Vyber si hostitele k připojení"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Připojuji se k vzdálenému hostiteli..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "K tomuto serveru se musíš přihlásit"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Získávám data o hře..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "V této hře nejsou k disposici žádné strany."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Vyber si svoji stranu:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Hra byla zrušena"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Strana, kterou sis zvoli, již není k disposici"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Zobrazit záznam hry až do okamžiku uložení?"
 
-#: src/multiplayer_client.cpp:683 src/multiplayer_client.cpp:686
+#: src/multiplayer_client.cpp:688 src/multiplayer_client.cpp:691
 msgid "?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:777
+#: src/multiplayer_client.cpp:782
 msgid "Leader: "
 msgstr "Vůdce: "
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr "Verbuje: "
 
@@ -7662,8 +7963,8 @@
 msgid "Local Player"
 msgstr "Místní hráč"
 
-#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:498
-#: src/multiplayer_connect.cpp:621 src/multiplayer_connect.cpp:727
+#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:496
+#: src/multiplayer_connect.cpp:610 src/multiplayer_connect.cpp:716
 msgid "Computer Player"
 msgstr "Počítačový hráč"
 
@@ -7728,7 +8029,7 @@
 msgid "Color"
 msgstr "Barva"
 
-#: src/multiplayer_connect.cpp:570 src/multiplayer_connect.cpp:574
+#: src/multiplayer_connect.cpp:559 src/multiplayer_connect.cpp:563
 msgid "Waiting for network players to join"
 msgstr "Čekám, až se připojí další hráči"
 
@@ -7811,52 +8112,52 @@
 msgid "It is now your turn"
 msgstr "Nyní je řada na tobě"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Útočník"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Obránce"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Výpočet poškození"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Zblízka"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "vs."
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Zaútoč na nepřítele"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Vyber zbraň"
 
-#: src/playturn.cpp:1125
+#: src/playturn.cpp:1126
 msgid ""
 "You have not started your turn yet.  Do you really want to end your turn?"
 msgstr "Zatím jsi nezačal svoje kolo. Chceš opravdu ukončit kolo?"
 
-#: src/playturn.cpp:1134 src/playturn.cpp:1139
+#: src/playturn.cpp:1135 src/playturn.cpp:1140
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr "Některé jednotky ztratí kroky. Chceš opravdu ukončit kolo?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Automatické uložení"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr "Hru se nepodařilo uložit automaticky. Ulož ji, prosím, ručně."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -7864,35 +8165,35 @@
 "Jména uložených her nemohou obsahovat dvojtečky, lomítka nebo zpětná "
 "lomítka. Zvol prosím jiné jméno."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Uloženo"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Hra byla uložena"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Příjmy"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Výdaje"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Nemáš žádné jednotky, které bys mohl naverbovat."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Vyber jednotku"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Nemáš dost peněz k naverbování této jednotky"
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1730
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
@@ -7900,7 +8201,7 @@
 "Můj pane, toto je zkušená jednotka, která již byla povýšena! Určitě 
se jí "
 "chceš zbavit?"
 
-#: src/playturn.cpp:1731
+#: src/playturn.cpp:1732
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
@@ -7908,19 +8209,19 @@
 "Můj pane, tato jednotka má velkou naději na povýšení! Určitě se jí 
chceš "
 "zbavit?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "ho"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "ji"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Jsi oddělen od svých vojáků a nemůžeš je přivolat"
 
-#: src/playturn.cpp:1779
+#: src/playturn.cpp:1780
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
@@ -7928,87 +8229,87 @@
 "Nejsou k disposici žádní vojáci k přivolání\n"
 "(musíš mít někoho, kdo přežil z minulého scénáře)."
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "Potřebuje alespoň $cost zlaťáků k přivolání jednotky"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Propusť jednotku"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Zpráva"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Pošli jen spojencům"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Umístění"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Naverbováno"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Přivoláno"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Povýšení"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Ztráty"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Zabito"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Způsobené poranění"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Utržené poranění"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Způsobené poranění (odhad)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Utržené poranění (odhad)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Najdi popisek nebo jednotku"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Příkaz:"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Záznam rozhovoru"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "Nenašel jsem popisek ani jednotku obsahující „$search“."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Umísti popisek"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Název"
 
-#: src/playturn.cpp:2421
+#: src/playturn.cpp:2422
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
@@ -8016,23 +8317,23 @@
 "Porušil se souběh her a je zapotřebí je ukončit. Chceš uložit záznam 
chyb "
 "své hry?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Nahraď počítačovým hráčem"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Nahraď místním hráčem"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Přeruš hru"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Nahraď"
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "opustil(a) hru. Co s tím chceš dělat?"
 
@@ -8094,94 +8395,94 @@
 msgid "Chaotic units"
 msgstr "Nočních jednotek"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Vlastní vesnice"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Nepřátelská vesnice"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Spojenecká vesnice"
 
-#: src/show_dialog.cpp:934
+#: src/show_dialog.cpp:953
 msgid "KB"
 msgstr "kB"
 
-#: src/titlescreen.cpp:149
+#: src/titlescreen.cpp:155
 msgid "Version"
 msgstr "Verze"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Výcvik"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Nová hra"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Více hráčů"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Načíst"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Jazyk"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Nastavení "
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Konec"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Začni výcvik, ve kterém se s hrou seznámíš"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Začni novou hru pro jednoho hráče"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
 msgstr ""
 "Hrej hru více hráčů (horké křeslo, LAN nebo Internet) nebo proti 
počítači"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Načtení hry pro jednoho hráče"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Změna jazyka"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Změň nastavení hry"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Ukaž zásluhy"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Ukončit hru"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Více"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Kniha Wesnothu"
 
@@ -8189,15 +8490,15 @@
 msgid "strikes"
 msgstr "úderů"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "noční"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "denní"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutrální"
 
@@ -8209,6 +8510,18 @@
 msgid "Deletion of the file failed."
 msgstr "Smazání souboru se nezdařilo."
 
+#~ msgid "first strike"
+#~ msgstr "první úder"
+
+#~ msgid "Swamp"
+#~ msgstr "Mokřina"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Vodní rejpal"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Hostitelská hra více hráčů"
 
Index: wesnoth/po/wesnoth/da.po
diff -u wesnoth/po/wesnoth/da.po:1.9 wesnoth/po/wesnoth/da.po:1.10
--- wesnoth/po/wesnoth/da.po:1.9        Sun Oct 17 12:52:53 2004
+++ wesnoth/po/wesnoth/da.po    Thu Oct 21 20:22:40 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: wesnoth\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-09-13 17:48+0200\n"
 "Last-Translator: Mathias Bundgaard Svensson <address@hidden>\n"
 "Language-Team:  <address@hidden>\n"
@@ -18,7 +18,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "loyal"
 
@@ -50,11 +50,11 @@
 msgid "Traits"
 msgstr "Karaktertræk"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Enheder"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Evner"
 
@@ -195,7 +195,7 @@
 "koster også penge at støtte dem. Se <ref>dst=income_and_upkepp "
 "text=Inkomster og Udgifter</ref> for mere information."
 
-#: data/help.cfg:84 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:84 src/help.cpp:747 src/help.cpp:748
 msgid "Movement"
 msgstr "Bevægelse"
 
@@ -528,7 +528,7 @@
 "fun, and good luck!"
 msgstr ""
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr "Om"
 
@@ -779,7 +779,7 @@
 msgstr "Standard"
 
 #: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:196
-#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:658
+#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:663
 msgid "&random-enemy.png,Random"
 msgstr "&random-enemy.png,Tilfældig"
 
@@ -896,6 +896,24 @@
 msgid "Random map"
 msgstr "Tilfældig bane"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Tilfældig bane"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Tilfældig bane"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Tilfældig bane"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowling"
@@ -942,7 +960,7 @@
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/Basic_Training.cfg:276
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
-#: src/show_dialog.cpp:453
+#: src/show_dialog.cpp:472
 msgid "No"
 msgstr "Nej"
 
@@ -1482,7 +1500,7 @@
 
 #: data/scenarios/tutorial/Basic_Training.cfg:262
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
-#: src/show_dialog.cpp:452
+#: src/show_dialog.cpp:471
 msgid "Yes"
 msgstr "Ja"
 
@@ -1960,6 +1978,113 @@
 msgid "Underground"
 msgstr "Underjordisk"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Tildækket"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Dybt Vand"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Lav Vand"
+
+#: data/terrain.cfg:39 data/terrain.cfg:60 data/terrain.cfg:139
+#: data/terrain.cfg:148 data/terrain.cfg:166 data/terrain.cfg:229
+#: src/reports.cpp:309
+msgid "Village"
+msgstr "Landsby"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Lav Vand"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Is"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Bro"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Sand"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Vej"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Jord"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Græslandskab"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Skygge"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Bakker"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Bjerge"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Skov"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Hulevæg"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Hule"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Slot"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Lejrplads"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Dværgisk Ødemark"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Slotstårn"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "ingen"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menu"
@@ -1973,14 +2098,14 @@
 msgstr "Slut Tur"
 
 #: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:670
-#: src/display.cpp:941 src/help.cpp:621 src/playturn.cpp:1956
+#: src/display.cpp:941 src/help.cpp:612 src/playturn.cpp:1957
 #: src/unit.cpp:1034
 msgid "HP"
 msgstr "HP"
 
 #: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:674
 #: src/dialogs.cpp:682 src/display.cpp:945 src/display.cpp:953
-#: src/playturn.cpp:1795 src/playturn.cpp:1957 src/unit.cpp:1093
+#: src/playturn.cpp:1796 src/playturn.cpp:1958 src/unit.cpp:1093
 msgid "XP"
 msgstr "XP"
 
@@ -2056,32 +2181,29 @@
 "Dag: -25% Skade\n"
 "Nat: +25% Skade"
 
-#: data/translations/english.cfg:23
+#: data/translations/english.cfg:21
 msgid ""
-"Heals:\n"
-"Allows the unit to heal adjacent friendly units at the beginning of the "
-"turn.\n"
+"Ambush:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"A unit cared for by a healer may heal up to 4 HP per turn.\n"
-"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
-"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
-"care of a village or a unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 msgstr ""
-"Heler:\n"
-"Tillader enheden at hele sideliggende allierede enheder i starten af "
-"runden.\n"
+"Overfald:\n"
+"Denne enhed kan skjule sig i skoven og forblive uset af sine fjender.\n"
 "\n"
-"En enhed, der bliver tilset af en heler, kan heles op til 4 HP per runde.\n"
-"En heler kan hele ialt 8 HP per runde for hver eneste enhed, denne tilser.\n"
-"En forgiftet enhed kan ikke blive kureret for sin gift af en heler og må "
-"søge hjælp i en landsby eller ved en enhed, som har evnen til at kurere."
+"Fjendtlige enheder kan ikke se eller angribe denne enhed, når den befinder "
+"sig i skoven, bortset fra ethvert træk foretaget lige efter, at denne enhed "
+"har angrebet."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "healer"
+#: data/translations/english.cfg:23 data/units/Elvish_Avenger.cfg:18
+#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
+#: data/units/Elvish_Ranger.cfg:94
+msgid "ambush"
+msgstr "overfald"
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 msgid ""
 "Cures:\n"
 "This unit combines herbal remedies with magic to heal units more quickly "
@@ -2107,27 +2229,59 @@
 "En, der evner at kurere, kan kurere en forgiftet enhed, men dog vil denne "
 "enhed så ikke modtage mere heling i samme runde."
 
-#: data/translations/english.cfg:35 data/units/Elvish_Druid.cfg:19
-#: data/units/Elvish_Shyde.cfg:19 data/units/White_Mage.cfg:12
-#: data/units/White_Mage.cfg:71
+#: data/translations/english.cfg:33 data/units/Elvish_Druid.cfg:19
+#: data/units/Elvish_Shyde.cfg:19 data/units/Mermaid_Priestess.cfg:7
+#: data/units/White_Mage.cfg:12 data/units/White_Mage.cfg:71
 msgid "cures"
 msgstr "helbreder"
 
-#: data/translations/english.cfg:38
+#: data/translations/english.cfg:40
 msgid ""
-"Teleport:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heals:\n"
+"Allows the unit to heal adjacent friendly units at the beginning of the "
+"turn.\n"
+"\n"
+"A unit cared for by a healer may heal up to 4 HP per turn.\n"
+"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
+"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
+"care of a village or a unit that can cure."
 msgstr ""
-"Teleportering:\n"
-"Denne enhed kan på ingen tid teleportere mellem to hvilke som helst "
-"allierede landsbyer."
+"Heler:\n"
+"Tillader enheden at hele sideliggende allierede enheder i starten af "
+"runden.\n"
+"\n"
+"En enhed, der bliver tilset af en heler, kan heles op til 4 HP per runde.\n"
+"En heler kan hele ialt 8 HP per runde for hver eneste enhed, denne tilser.\n"
+"En forgiftet enhed kan ikke blive kureret for sin gift af en heler og må "
+"søge hjælp i en landsby eller ved en enhed, som har evnen til at kurere."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleportering"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "healer"
+
+#: data/translations/english.cfg:47
+msgid ""
+"Illuminates:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
+msgstr ""
+"Oplyser:\n"
+"Denne enhed oplyser det omkringliggende område og får derved lovlydige "
+"enheder til at kæmpe bedre, hvorimod kaotiske enheder kæmper dårligere.\n"
+"\n"
+"Enhver anden enhed, der er sideliggende til denne enhed, vil kunne kæmpe, "
+"som hvis det var aften, når det er nat, og som hvis det var dag, når det er 
"
+"aften."
+
+#: data/translations/english.cfg:49
+msgid "illuminates"
+msgstr "oplyser"
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2142,7 +2296,7 @@
 "Sideliggende allierede enheder af lavere rang vil kunne gøre mere skade i "
 "kamp."
 
-#: data/translations/english.cfg:47 data/units/Commander.cfg:11
+#: data/translations/english.cfg:56 data/units/Commander.cfg:11
 #: data/units/Commander.cfg:86 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
@@ -2151,56 +2305,45 @@
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
 #: data/units/Noble_Commander.cfg:10 data/units/Noble_Lord.cfg:10
 #: 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:353 src/actions.cpp:471
+#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
+#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:355 src/actions.cpp:474
 msgid "leadership"
 msgstr "leder-evner"
 
-#: data/translations/english.cfg:52
+#: data/translations/english.cfg:59
+#, fuzzy
 msgid ""
-"Ambush:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
+"Loyal:\n"
+"Never more than 1 upkeep."
+msgstr "Aldrig mere end 1 udgift"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Overfald:\n"
-"Denne enhed kan skjule sig i skoven og forblive uset af sine fjender.\n"
-"\n"
-"Fjendtlige enheder kan ikke se eller angribe denne enhed, når den befinder "
-"sig i skoven, bortset fra ethvert træk foretaget lige efter, at denne enhed "
-"har angrebet."
 
-#: data/translations/english.cfg:54 data/units/Elvish_Avenger.cfg:18
-#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
-#: data/units/Elvish_Ranger.cfg:94
-msgid "ambush"
-msgstr "overfald"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "nattesnak"
 
-#: data/translations/english.cfg:59
+#: data/translations/english.cfg:69
 msgid ""
-"Illuminates:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
+"Regenerates:\n"
+"The unit will heal itself 8 hp per turn. If it is poisoned, it will remove "
+"the poison instead of healing."
 msgstr ""
-"Oplyser:\n"
-"Denne enhed oplyser det omkringliggende område og får derved lovlydige "
-"enheder til at kæmpe bedre, hvorimod kaotiske enheder kæmper dårligere.\n"
-"\n"
-"Enhver anden enhed, der er sideliggende til denne enhed, vil kunne kæmpe, "
-"som hvis det var aften, når det er nat, og som hvis det var dag, når det er 
"
-"aften."
 
-#: data/translations/english.cfg:61
-msgid "illuminates"
-msgstr "oplyser"
+#: data/translations/english.cfg:71 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_Rocklobber.cfg:7
+#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+msgid "regenerates"
+msgstr "gendanner"
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 msgid ""
 "Skirmisher:\n"
 "This unit is skilled in moving past enemies quickly, and ignores all Enemy "
@@ -2210,118 +2353,131 @@
 "Denne enhed er trænet i at bevæge sig hurtigt forbi fjender og ignorerer "
 "alle fjendtlige kontrolzonerl."
 
-#: data/translations/english.cfg:66 data/units/Assassin.cfg:16
+#: data/translations/english.cfg:76 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:19 data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr "hurtig-kæmper"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Aldrig mere end 1 udgift"
-
-#: data/translations/english.cfg:72
-msgid "This unit takes half normal damage when it did not initiate the attack."
+#: data/translations/english.cfg:79
+#, fuzzy
+msgid ""
+"Steadfast:\n"
+"This unit takes half normal damage when it did not initiate the attack."
 msgstr ""
 "Denne enhed tager det halve af normal skade når den ikke selv starter "
 "angrebet."
 
-#: data/translations/english.cfg:74 data/units/Dwarvish_Guardsman.cfg:15
+#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
 #: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: src/actions.cpp:499
+#: data/units/Merman_Hoplite.cfg:13 src/actions.cpp:502
 msgid "steadfast"
 msgstr "urokkelig"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teleportering:\n"
+"Denne enhed kan på ingen tid teleportere mellem to hvilke som helst "
+"allierede landsbyer."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleportering"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "minimum skade"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Spil"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scenarie"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Vælg Sider:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Vælg Hold-Indstillinger:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Kunne ikke forbindes til fjern-værten"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Venter på andre netværksspillere"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Optaget"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Ledig"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Overskuer"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Beskriv Enhed"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Fuld Skærm eller Vindue?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Display:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "I Vindue"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Hastighed:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normal"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Lyd-Indstillinger..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Indstillinger"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Vælg Scenarie"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr "Dette terræn opfører sig som $terrains i bevægelses- og 
forsvars-sager"
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Terrænet med de bedste egenskaber vælges automatisk"
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Terrænet giver healing"
 
-#: data/translations/english.cfg:107
+#: data/translations/english.cfg:119
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain"
@@ -2329,7 +2485,7 @@
 "Dette terræn opfører sig som et slotstårn, det vil sige, at du kan 
rekrutere "
 "enheder hvis lederen står på dette felt"
 
-#: data/translations/english.cfg:108
+#: data/translations/english.cfg:120
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain"
@@ -2337,19 +2493,19 @@
 "Dette terræn opfører sig som en borg, det vil sige, at du kan rekrutere "
 "enheder et felt med dette terræn."
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "eller"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Enhedens forsvars-tabel"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Se Også..."
 
-#: data/translations/english.cfg:117
+#: data/translations/english.cfg:129
 msgid ""
 "Backstab:\n"
 "This attack deals double damage if a friendly unit is on the opposite side "
@@ -2359,13 +2515,17 @@
 "Dette angreb giver dobelt skade hvis der står en enhed på den modsatte side 
"
 "af målet, og hvis at denne enhed holder med angriberen."
 
-#: data/translations/english.cfg:119 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:490
-msgid "backstab"
-msgstr "dolke i ryggen"
+#: data/translations/english.cfg:132
+msgid ""
+"Berserk:\n"
+"Whether used offensively or defensively, this attack presses the engagement "
+"until one of the combatants is slain."
+msgstr ""
+"Berserk:\n"
+"NÃ¥r dette angreb bliver brugt offensivt eller deffensivt, presser det "
+"engagementet indtil den ene af kæmperne er døde."
 
-#: data/translations/english.cfg:122
+#: data/translations/english.cfg:135
 msgid ""
 "Charge:\n"
 "This attack deals double damage to the target. It also causes this unit to "
@@ -2375,14 +2535,7 @@
 "Dette angreb giver dobbelt skade til målet. Det gør også at denne enhed "
 "tager dobelt skade fra målets modangreb."
 
-#: data/translations/english.cfg:124 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:363 src/actions.cpp:481
-msgid "charge"
-msgstr "gallopere"
-
-#: data/translations/english.cfg:127
+#: data/translations/english.cfg:138
 msgid ""
 "Drain:\n"
 "This unit drains health from living units, healing itself for half the "
@@ -2392,18 +2545,15 @@
 "Denne enhed får liv fra levende enheder, healer sig selv med halvdelen af "
 "skaden den giver."
 
-#: data/translations/english.cfg:129 data/units/Ancient_Lich.cfg:24
-#: data/units/Blood_Bat.cfg:24 data/units/Dark_Spirit.cfg:24
-#: data/units/Demilich.cfg:23 data/units/Lich.cfg:24
-#: data/units/Orcish_Shaman.cfg:30 data/units/Orcish_Shaman.cfg:73
-#: data/units/Orcish_Shaman.cfg:116 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Spectre.cfg:24 data/units/Vampire_Bat.cfg:24
-#: data/units/Vampire_Lady.cfg:25 data/units/Vampire_Lady.cfg:38
-#: data/units/Wraith.cfg:24
-msgid "drain"
-msgstr "dræne"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Slå Først:\n"
+"Denne enhed slår altid først med hans angreb, selv hvis han forsvarer."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2411,32 +2561,7 @@
 "Magisk:\n"
 "Dette angrab har altid en 70% chance for at ramme."
 
-#: data/translations/english.cfg:134 data/units/Ancient_Lich.cfg:34
-#: data/units/Arch_Mage.cfg:42 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/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:64 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 data/units/Mage.cfg:39
-#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
-#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
-#: data/units/Princess.cfg:79 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 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 "magisk"
-
-#: data/translations/english.cfg:137
+#: data/translations/english.cfg:147
 msgid ""
 "Marksman:\n"
 "When used offensively, this attack always has at least a 60% chance to hit."
@@ -2445,13 +2570,7 @@
 "NÃ¥r dette angreb bruges offensivt, vil det altid have mindst 60% chance for "
 "at ramme."
 
-#: data/translations/english.cfg:139 data/units/Elvish_Marksman.cfg:39
-#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
-msgid "marksman"
-msgstr "jagtskytte"
-
-#: data/translations/english.cfg:142
+#: data/translations/english.cfg:150
 msgid ""
 "Plague:\n"
 "If this unit kills a living target and that unit was not stationed in a "
@@ -2460,12 +2579,7 @@
 "Sygdom: Hvis denne enhed dræber et levende mål og den enhed ikke var i en "
 "landsby, vil det døde måls lig rejse sig op af jorden og kæmpe for dig."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "sygdom"
-
-#: data/translations/english.cfg:147
+#: data/translations/english.cfg:153
 msgid ""
 "Poison:\n"
 "This attack poisons the target. Poisoned units lose 8 HP every turn until "
@@ -2475,236 +2589,112 @@
 "Dette angreb forgifter målet. Forgiftede enheder taber 8 HP hver tur indtil "
 "de er kurerede eller reducerede til 1 HP."
 
-#: data/translations/english.cfg:149 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:38
-#: data/units/Necrophage.cfg:24 data/units/Orcish_Assassin.cfg:41
-#: data/units/Orcish_Slayer.cfg:46
-msgid "poison"
-msgstr "gift"
-
-#: data/translations/english.cfg:152
+#: data/translations/english.cfg:156
 msgid ""
 "Slow:\n"
 "This attack slows the target. Slowed units move at half normal speed and "
 "receive one less attack than normal in combat for the duration of one turn."
 msgstr ""
-"Nedsløve:\n"
-"Dette angrib nedsløver målet. Nedsløvede enheder bevæger sig halvt så "
-"hurtigt og har kun en mindre angrebstur end normalt. Enheder er kun "
-"nedsløvede i en tur."
-
-#: data/translations/english.cfg:154 data/units/Cave_Spider.cfg:38
-#: data/units/Elvish_Druid.cfg:44 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 "nedsløve"
-
-#: data/translations/english.cfg:157
-msgid ""
-"Stone:\n"
-"This attack turns the target to stone. Units that have been turned to stone "
-"may not move or attack."
-msgstr ""
-"Forstene:\n"
-"Dette angreb laver målet om til sten. Enheder der bliver lavet til sten må "
-"ikke bevæge sig eller angribe."
-
-#: data/translations/english.cfg:159 data/units/Cockatrice.cfg:26
-#: src/actions.cpp:728 src/actions.cpp:876 src/reports.cpp:122
-msgid "stone"
-msgstr "sten"
-
-#: data/translations/english.cfg:162
-msgid ""
-"Berserk:\n"
-"Whether used offensively or defensively, this attack presses the engagement "
-"until one of the combatants is slain."
-msgstr ""
-"Berserk:\n"
-"NÃ¥r dette angreb bliver brugt offensivt eller deffensivt, presser det "
-"engagementet indtil den ene af kæmperne er døde."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "berserk"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Slå Først:\n"
-"Denne enhed slår altid først med hans angreb, selv hvis han forsvarer."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "slå først"
-
-#: data/translations/english.cfg:172
-msgid "Elves"
-msgstr "Elvere"
-
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orker"
-
-#: data/translations/english.cfg:174
-msgid "Humans"
-msgstr "Mennesker"
-
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Levende-døde"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Dybt Vand"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Lav Vand"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Sand"
-
-#: data/translations/english.cfg:182 data/translations/english.cfg:184
-#: data/translations/english.cfg:185 data/translations/english.cfg:186
-#: data/translations/english.cfg:187 data/translations/english.cfg:188
-#: src/reports.cpp:310
-msgid "Village"
-msgstr "Landsby"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Sump"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Is"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Vej"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Jord"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Græslandskab"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Bakker"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Bjerge"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Skov"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Bro"
+"Nedsløve:\n"
+"Dette angrib nedsløver målet. Nedsløvede enheder bevæger sig halvt så "
+"hurtigt og har kun en mindre angrebstur end normalt. Enheder er kun "
+"nedsløvede i en tur."
 
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Slot"
+#: data/translations/english.cfg:159
+msgid ""
+"Stone:\n"
+"This attack turns the target to stone. Units that have been turned to stone "
+"may not move or attack."
+msgstr ""
+"Forstene:\n"
+"Dette angreb laver målet om til sten. Enheder der bliver lavet til sten må "
+"ikke bevæge sig eller angribe."
 
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Slotstårn"
+#: data/translations/english.cfg:162
+msgid "Elves"
+msgstr "Elvere"
 
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Hule"
+#: data/translations/english.cfg:163
+msgid "Humans"
+msgstr "Mennesker"
 
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Hulevæg"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orker"
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Lejrplads"
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Levende-døde"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "$name's Bro,$name's Korsvej"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "$name's Landevej, $name's Pas, Stien af $name"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "$name Flod,Flod $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "$name Skov,$name's Skov"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "$name Sø"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr "$name|stad,$name|købing,$name|ton"
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "$name Skov,$name's Skov"
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr "$name|købing,$name|borg,$name|krydsning,$river|borg,$river|krydsning"
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr "$river|bro,$river|bro,$river|bro,$name|købing,$name|bro"
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr "$name|købing,$name|ton,$name|mark"
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr "$name|købing,$name|ton,$name|lund,$name Skov"
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr "$name|købing,$name|stad,$name|ton,$name|høj,$name|top"
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 "$name|købing,$name|stad,$name|ton,$name|bjerg,$name|bjerg,$name|klint,$name|"
 "klint"
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Næste tip"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Dagens tip"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Vis ikke tips"
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
@@ -2712,7 +2702,7 @@
 "Lovlydige enheder kæmper bedre om dagen, og kaotiske neheder beder om "
 "natten. Neutrale enheder er upåvirkede af nat og dag."
 
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:186
 msgid ""
 "In a campaign, you can use veteran units from previous scenarios by using "
 "the 'recall' option."
@@ -2720,7 +2710,7 @@
 "I en kampange kan du bruge trænede enheder fra tidligere scenarier ved at "
 "bruge genindkald funtionen."
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
 "Different units have weaknesses against different types of attacks. Right-"
@@ -2733,7 +2723,7 @@
 "Højreklik på en enhed og vælg Enhedsbeskrivelse. Nederst på siden står 
hvor "
 "stor svaghed den har over for de forskellige typer."
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
 "hitting them in battle. The defensive rating for the currently selected unit "
@@ -2744,7 +2734,7 @@
 "at ramme dem i kamp. Den defensive rating står altid i det øvre højre "
 "hjørne, for den valgte enhed i det aktuelle terræn."
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
 "poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -2756,7 +2746,7 @@
 "kurered ved at flytte dem til en landsby, eller ved at placere dem ved siden "
 "af en enhed med healings evnen."
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
 "menu. By recalling the same units over and over, you can build up a powerful "
@@ -2766,14 +2756,14 @@
 "menuen. Ved at genindkalde enheder igen og igen kan du opbygge en kraftfuld "
 "og erfaren hær."
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
 "unit moves into an enemy's Zone of Control, it may not move any further that "
 "turn."
 msgstr "Alle enheder har en Kontrolzone i hver af de omkring liggende felter."
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
 "itself in the terrain it is standing in, however magical attacks always have "
@@ -2783,12 +2773,12 @@
 "forsvare sig i det terræn den står i, men magiske angreb har altid 70% "
 "chance for at ramme, og jagtskytter har en mindst 60% chance."
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
 msgstr "Enheder der står i en landsby får 8 HP i starten af hver tur."
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
 "hitpoints at the beginning of their next turn."
@@ -2796,7 +2786,7 @@
 "Enheder der ikke bevæger sig eller angriber i løbet af deres tur hviler 
sig, "
 "og vil modtage 2 HP i begyndelsen af deres tur."
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
 "terrain, while most mounted units don't get any defensive advantage in "
@@ -2806,7 +2796,7 @@
 "terræntyper, men det fleste ridende enheder ikke for nogen fordel af at 
være "
 "i landsbyer og borge."
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
 "weapons, but are vulnerable to attacks with piercing weapons, including bows "
@@ -2816,7 +2806,7 @@
 "Slagkraftsvåben, men er sårbare over fro Går Igennem våben, der iblandt 
buer "
 "og spyd."
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
 "experience. Units killing an enemy will gain 8 experience for every level of "
@@ -2825,7 +2815,7 @@
 "At give det dræbende angreb er den bedste med at få erfaring på. Enheder 
der "
 "dræber en fjende vil få 8 erfaring for hvert level enheden de dræber er 
på."
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
 "fight very well in hills and mountains."
@@ -2833,7 +2823,7 @@
 "Elviske enheder bevæger sig og kæmper godt i skov. Dværgiske enheder 
bevæger "
 "sig og kæmper godt i bakker og bjerge."
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
 "troops, wait for better conditions and then attack."
@@ -2841,7 +2831,7 @@
 "Tålmodighed er ofte nøglen til sejr. I stedet for at angribe under dårlige 
"
 "forhold eller med få tropper, vent på bedre forhold og angrib så."
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
 "expendable units in some directions to delay enemy units."
@@ -2849,13 +2839,13 @@
 "Når du bliver angrebet fra alle retninger kan det ofte være en idé at 
sende "
 "undværlige tropper i andre retninger for at forsinke fjenden."
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
 msgstr ""
 "Vær ikke bange for tilbagetov eller omgrupering, det er ofte nøglen til 
sejr."
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
 "depending on the number of villages on the map, and the number of turns you "
@@ -2867,7 +2857,7 @@
 "du har igen når du afslutter. Du vil altid lettere kunne få guld på denne "
 "måde, end ved at ovetage landsbyer og lade turene løbe ud."
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
 "just the keep they start on. You can capture a keep from an enemy and "
@@ -2879,7 +2869,7 @@
 "et slotstårn fra en fjende og rekrutere derfra. Nogle af dine allierede vil "
 "måske give dig plads i deres slotstårn så du kan rekrutere derfra."
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
 "impact, fire, and holy attacks."
@@ -2887,7 +2877,7 @@
 "Skeletter er modstandsdygtige mod går igennem- og klinge angreb, men er "
 "sårbare mod slagkraft, ild og hellige angreb."
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
 "side fight better."
@@ -2895,7 +2885,7 @@
 "Enheder med leder-evner kan få enheder med lavere rang, der er på samme "
 "side, til at kæmpe bedre."
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
 "onto the village and attack you, while enjoying the defense and healing of "
@@ -2905,7 +2895,7 @@
 "på. En fjende kan flytte hen på landsbyen og angribe dig, men han nyder 
godt "
 "af landsbyens forsvar og healing."
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
 "ability or trait."
@@ -2913,17 +2903,17 @@
 "Ved at holde musen over en evne eller et karaktertræk kan du se information "
 "om denne evne eller dette karatertræk."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Brug linier af enheder til at beskytte sårede enheder, for at lade dem komme 
"
 "til hægterne igen."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Læs listen af genvejstaster i indstillings-menuen."
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
 "you can undo your move by pressing 'u'."
@@ -2931,7 +2921,7 @@
 "Hvis du flytter en enhed, men ikke angriber eller finde nogen specielle "
 "informationer, kan omgøre bevægelsen ved at trykke u."
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
 "them."
@@ -2939,7 +2929,7 @@
 "Du kan se hvor lang fjendlige enheder kan bevæge sig ved at holde musen over 
"
 "dem."
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
 "needing to attack anything themselves."
@@ -2947,18 +2937,18 @@
 "Brug healere til at støtte dine angreb - de vil vinde dine kampe uden at "
 "behøve selv at angribe noget."
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
 "them one less attack than they would normally have. It is thus very "
 "effective against units that have a few powerful attacks."
 msgstr ""
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Hellige angreb er meget stærke mod levende-døde."
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
 "fight."
@@ -2966,7 +2956,7 @@
 "Enheder bliver healet når de bliver forfremmet. Brug dette visdomsfuldt, det 
"
 "kan vende en kamp."
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
@@ -2998,7 +2988,7 @@
 
 #: data/units/Ancient_Lich.cfg:20 data/units/Ancient_Lich.cfg:33
 #: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
-#: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
+#: data/units/Dark_Queen.cfg:28 data/units/Dark_Queen.cfg:29
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
 #: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
@@ -3011,12 +3001,49 @@
 msgid "cold"
 msgstr "kulde"
 
+#: data/units/Ancient_Lich.cfg:24 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:23
+#: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:30
+#: data/units/Orcish_Shaman.cfg:73 data/units/Orcish_Shaman.cfg:116
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
+#: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:24
+msgid "drain"
+msgstr "dræne"
+
 #: data/units/Ancient_Lich.cfg:32 data/units/Deathmaster.cfg:35
 #: data/units/Demilich.cfg:31 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr "magi"
 
+#: data/units/Ancient_Lich.cfg:34 data/units/Arch_Mage.cfg:42
+#: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:30 data/units/Deathmaster.cfg:37
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:64
+#: 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
+#: data/units/Mage.cfg:39 data/units/Mage.cfg:106
+#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
+#: data/units/Mermaid_Diviner.cfg:37 data/units/Mermaid_Enchantress.cfg:35
+#: data/units/Mermaid_Initiate.cfg:35 data/units/Mermaid_Priestess.cfg:35
+#: data/units/Mermaid_Siren.cfg:26 data/units/Mermaid_Siren.cfg:37
+#: data/units/Necromancer.cfg:37 data/units/Princess.cfg:80
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: 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 "magisk"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Ældgammel Wose"
@@ -3042,7 +3069,7 @@
 #: 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/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:22
 #: 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
@@ -3050,19 +3077,24 @@
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
 #: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:24
 #: data/units/Elvish_Druid.cfg:43 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:20
 #: 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/Footpad.cfg:38 data/units/Galleon.cfg:19 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: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/Mermaid_Diviner.cfg:27 data/units/Mermaid_Enchantress.cfg:24
+#: data/units/Mermaid_Enchantress.cfg:33 data/units/Mermaid_Initiate.cfg:24
+#: data/units/Mermaid_Initiate.cfg:33 data/units/Mermaid_Priestess.cfg:25
+#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
+#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
 #: data/units/Noble_Youth.cfg:22 data/units/Outlaw.cfg:21
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3082,7 +3114,7 @@
 msgid "impact"
 msgstr "slagkraft"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Ærke-Troldmand"
 
@@ -3099,6 +3131,8 @@
 #: data/units/Elvish_Druid.cfg:23 data/units/Elvish_Enchantress.cfg:25
 #: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
+#: data/units/Mermaid_Diviner.cfg:26 data/units/Mermaid_Enchantress.cfg:23
+#: data/units/Mermaid_Initiate.cfg:23 data/units/Mermaid_Priestess.cfg:24
 #: 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
@@ -3114,7 +3148,7 @@
 msgstr "ildkugle"
 
 #: 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/Battle_Princess.cfg:78 data/units/Commander.cfg:121
 #: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
 #: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
@@ -3126,12 +3160,17 @@
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/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/Princess.cfg:78 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
 #: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr "ild"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Ærke-Troldmand"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Lejemorder"
@@ -3156,7 +3195,7 @@
 msgstr "dolk"
 
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
-#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
 #: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
@@ -3194,21 +3233,22 @@
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Lord.cfg:86
 #: data/units/Mage.cfg:21 data/units/Mage.cfg:88
-#: data/units/Master_Bowman.cfg:21 data/units/Necrophage.cfg:20
-#: data/units/Nightgaunt.cfg:21 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: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 data/units/Orcish_Shaman.cfg:105
-#: data/units/Orcish_Slayer.cfg:20 data/units/Orcish_Slayer.cfg:42
-#: data/units/Orcish_Sovereign.cfg:22 data/units/Orcish_Warlord.cfg:19
-#: data/units/Orcish_Warrior.cfg:20 data/units/Poacher.cfg:25
-#: data/units/Princess.cfg:23 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/Master_Bowman.cfg:21 data/units/Merman_Triton.cfg:34
+#: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
+#: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
+#: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:20
+#: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
+#: 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
+#: data/units/Orcish_Shaman.cfg:105 data/units/Orcish_Slayer.cfg:20
+#: data/units/Orcish_Slayer.cfg:42 data/units/Orcish_Sovereign.cfg:22
+#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:20
+#: data/units/Poacher.cfg:25 data/units/Princess.cfg:24
+#: data/units/Princess.cfg:62 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:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
@@ -3216,16 +3256,30 @@
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:20
 #: data/units/Swordsman.cfg:20 data/units/Thief.cfg:20
 #: data/units/Trapper.cfg:25 data/units/Vampire_Bat.cfg:20
-#: data/units/Vampire_Lady.cfg:20 data/units/White_Mage.cfg:29
+#: data/units/Vampire_Lady.cfg:21 data/units/White_Mage.cfg:29
 #: data/units/White_Mage.cfg:88 data/units/Wolf_Rider.cfg:21
 #: data/units/Wraith.cfg:20 data/units/Young_Ogre.cfg:19
 msgid "blade"
 msgstr "klinge"
 
+#: 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:493
+msgid "backstab"
+msgstr "dolke i ryggen"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "kniv"
 
+#: 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:38 data/units/Necrophage.cfg:24
+#: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
+msgid "poison"
+msgstr "gift"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Røver"
@@ -3248,16 +3302,16 @@
 msgid "mace"
 msgstr "stridskølle"
 
-#: data/units/Battle_Princess.cfg:3 data/units/Battle_Princess.cfg:41
-#: data/units/Princess.cfg:3 data/units/Princess.cfg:41
-msgid "Princess"
+#: data/units/Battle_Princess.cfg:3 data/units/Princess.cfg:3
+#, fuzzy
+msgid "female^Princess"
 msgstr "Prinsesse"
 
-#: data/units/Battle_Princess.cfg:17 data/units/Battle_Princess.cfg:55
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr "leder-evner,hurtig-kæmper"
 
-#: data/units/Battle_Princess.cfg:19
+#: data/units/Battle_Princess.cfg:20
 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 "
@@ -3269,7 +3323,7 @@
 "både en stor kriger og leder. Nu hvor hun er kamphærdet og stærk af vilje, 
"
 "kan de kommer de andre omkring dem til hjælp i kampens kunst."
 
-#: data/units/Battle_Princess.cfg:22 data/units/Battle_Princess.cfg:60
+#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
 #: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
@@ -3293,18 +3347,22 @@
 #: data/units/Longbowman.cfg:21 data/units/Lord.cfg:22 data/units/Lord.cfg:85
 #: data/units/Master_Bowman.cfg:20 data/units/Noble_Commander.cfg:23
 #: data/units/Noble_Fighter.cfg:20 data/units/Noble_Lord.cfg:22
-#: data/units/Ogre.cfg:18 data/units/Orcish_Grunt.cfg:19
+#: data/units/Ogre.cfg:19 data/units/Orcish_Grunt.cfg:19
 #: data/units/Orcish_Leader.cfg:21 data/units/Orcish_Ruler.cfg:21
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
-#: data/units/Princess.cfg:22 data/units/Princess.cfg:60
+#: data/units/Princess.cfg:23 data/units/Princess.cfg:61
 #: 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 "sværd"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Prinsesse"
+
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -3313,9 +3371,9 @@
 "and ignores enemy zones of control."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:76 data/units/Commander.cfg:120
+#: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
-#: data/units/Princess.cfg:76
+#: data/units/Princess.cfg:77
 msgid "scepter of fire"
 msgstr "Ildscepteret"
 
@@ -3405,7 +3463,13 @@
 #: 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:22
+#: data/units/Merman.cfg:20 data/units/Merman_Entangler.cfg:19
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:23
+#: data/units/Merman_Hunter.cfg:19 data/units/Merman_Hunter.cfg:27
+#: data/units/Merman_Javelineer.cfg:19 data/units/Merman_Javelineer.cfg:27
+#: data/units/Merman_Lord.cfg:22 data/units/Merman_Netcaster.cfg:19
+#: data/units/Merman_Spearman.cfg:19 data/units/Merman_Spearman.cfg:27
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Warrior.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:41 data/units/Orcish_Crossbowman.cfg:39
@@ -3414,7 +3478,7 @@
 #: 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:16
+#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
 #: 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
@@ -3422,7 +3486,7 @@
 #: 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:17 data/units/Trapper.cfg:42
-#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:34
+#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:35
 #: data/units/Wall_Guard.cfg:36 data/units/Watch_Tower.cfg:18
 msgid "pierce"
 msgstr "går igennem"
@@ -3485,6 +3549,14 @@
 msgid "web"
 msgstr "spind"
 
+#: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:44
+#: 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
+#: data/units/Merman_Entangler.cfg:29 data/units/Merman_Netcaster.cfg:29
+msgid "slow"
+msgstr "nedsløve"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Chocobone"
@@ -3503,13 +3575,24 @@
 #: 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/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
+#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
+#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
+#: data/units/Merman_Spearman.cfg:26 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 "spyd"
 
+#: 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:365
+#: src/actions.cpp:484
+msgid "charge"
+msgstr "gallopere"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Basilisk"
@@ -3525,6 +3608,11 @@
 msgid "gaze"
 msgstr "stirren"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "sten"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Kommandør"
@@ -3586,17 +3674,18 @@
 msgstr "kold bølge"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Mørk dronning"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 msgid ""
 "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 ""
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "scepter"
 
@@ -3863,6 +3952,12 @@
 "weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
+#: data/units/Drake_Slasher.cfg:42 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 "slå først"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Drake Kriger"
@@ -3907,6 +4002,10 @@
 msgid "berserker frenzy"
 msgstr "berserker vanvid"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "berserk"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Dværgisk Dragevagt"
@@ -4076,6 +4175,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Dværgisk Ulfserker"
 
+#: data/units/Dwarvish_Ulfserker.cfg:16
+msgid ""
+"Dwarves are an ancient race of powerful fighters. Ulfserkers are the most "
+"ferocious of these in battle: they attack without stopping fighting until "
+"either their enemy or they are dead, no matter how many wounds they receive."
+msgstr ""
+
 #: data/units/Elder_Mage.cfg:3
 msgid "Elder Mage"
 msgstr "Aldrende Troldmand"
@@ -4109,7 +4215,7 @@
 "can quickly heal themselves in the face of tremendous injuries."
 msgstr ""
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr "Elvisk Bueskytte"
 
@@ -4120,7 +4226,12 @@
 "make up a large portion of the Elvish military."
 msgstr ""
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Elvisk Bueskytte"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Elvisk Hævner"
 
@@ -4132,6 +4243,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Elvisk Hævner"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Elvisk Kaptajn"
@@ -4162,7 +4278,8 @@
 "både på nær og fjern afstand."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Elvisk Druide"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4185,7 +4302,7 @@
 msgstr "torne"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4246,10 +4363,18 @@
 "hold og altødelæggende ildkugler på lang afstand."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Elviske Lady"
 
 #: data/units/Elvish_Lady.cfg:17
+msgid ""
+"Elvish lady Parandra is one of the most respected elves ever. Her ability to "
+"see through the fogs of destiny has gained her a wisely used authority among "
+"her people, guiding them in times of uncertainty."
+msgstr ""
+
+#: data/units/Elvish_Lady.cfg:19
 msgid "shove"
 msgstr "skubbe"
 
@@ -4265,7 +4390,7 @@
 "Den Elviske Herre er frygtet i kamp både med sit sværd i nærkamp og sine "
 "ildkugler på lang distance."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Elvisk Jagtskytte"
 
@@ -4283,6 +4408,17 @@
 msgid "longbow"
 msgstr "langbue"
 
+#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
+#: data/units/Elvish_Sharpshooter.cfg:40
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+msgid "marksman"
+msgstr "jagtskytte"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Elvisk Jagtskytte"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Elvisk Marskal"
@@ -4313,7 +4449,7 @@
 "skoven såvel som i åbent landskab. De kan endda bruge en bue, mens de er 
til "
 "hest."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Elvisk Ranger"
 
@@ -4325,6 +4461,11 @@
 "just made an attack, or there are enemies adjacent to them."
 msgstr ""
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Elvisk Ranger"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Elvisk Rytter"
@@ -4351,7 +4492,8 @@
 "råstyrke i kamp"
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Elvisk Shaman"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4365,7 +4507,7 @@
 "langsommere både til at flytte sig og til at angribe. Shamaner har også "
 "healene evner."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Elvisk Skarpskytte"
 
@@ -4377,8 +4519,14 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Elvisk Skarpskytte"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Elvisk Skovfe"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4397,8 +4545,9 @@
 msgstr "fe-kontakt"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
-msgstr ""
+#, fuzzy
+msgid "female^Elvish Sorceress"
+msgstr "Elvisk Bueskytte"
 
 #: data/units/Elvish_Sorceress.cfg:21
 msgid ""
@@ -4409,7 +4558,8 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Elvisk Luftånd"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4507,7 +4657,15 @@
 msgid "Galleon"
 msgstr "Galeon"
 
-#: data/units/Galleon.cfg:17
+#: data/units/Galleon.cfg:16
+msgid ""
+"Even people happily living in their home eventually need some kind of "
+"transport through the seas, even if they only go fishing or to trade goods. "
+"The galleon is perfect for this purpose: it's fast and resilient, but not "
+"prepared to fight, and is able to adapt to many different tasks."
+msgstr ""
+
+#: data/units/Galleon.cfg:18
 msgid "dummy"
 msgstr ""
 
@@ -4608,12 +4766,6 @@
 "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 "slå først"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Goblin-Ridder"
@@ -4642,7 +4794,8 @@
 msgid "torch"
 msgstr "fakkel"
 
-#: data/units/Goblin_Pillager.cfg:35
+#: data/units/Goblin_Pillager.cfg:35 data/units/Merman_Entangler.cfg:26
+#: data/units/Merman_Netcaster.cfg:26
 msgid "net"
 msgstr "net"
 
@@ -4687,7 +4840,7 @@
 "serving beneath them."
 msgstr ""
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 msgid "Great Mage"
 msgstr "Stor-Troldmand"
 
@@ -4701,17 +4854,15 @@
 "Troldmanden teleportere mellem byer, hvilket strækker dennes storslåede "
 "kræfter til alle slagmarkens hjørner."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Stor-Troldmand"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Stor Trold"
 
-#: 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_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
-#: data/units/Troll_Whelp.cfg:7
-msgid "regenerates"
-msgstr "gendanner"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4911,7 +5062,7 @@
 "leder-evner og forbedrer dermed alle lavere rangerende enheder på "
 "sideliggende felter."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Troldmand"
 
@@ -4933,11 +5084,16 @@
 msgid "missile"
 msgstr "projektil"
 
-#: data/units/Mage_of_Light.cfg:3 data/units/Mage_of_Light.cfg:66
+#: data/units/Mage.cfg:70
+msgid "female^Mage"
+msgstr ""
+
+#: data/units/Mage_of_Light.cfg:3
 msgid "Mage of Light"
 msgstr "Lysets Troldmand"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "oplyser,kurerer"
 
@@ -4960,16 +5116,23 @@
 "det var dag, når det er aften og som aften, når det er nat"
 
 #: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
+#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
 #: data/units/White_Mage.cfg:44 data/units/White_Mage.cfg:103
 msgid "lightbeam"
 msgstr "lysstråle"
 
 #: data/units/Mage_of_Light.cfg:46 data/units/Mage_of_Light.cfg:106
+#: data/units/Mermaid_Diviner.cfg:35 data/units/Mermaid_Priestess.cfg:33
 #: data/units/Paladin.cfg:26 data/units/White_Mage.cfg:45
 #: data/units/White_Mage.cfg:104
 msgid "holy"
 msgstr "hellig"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Lysets Troldmand"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Mester Bueskytte"
@@ -4981,11 +5144,27 @@
 "only by that of the Elves."
 msgstr ""
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Havmand"
+#: data/units/Mermaid_Diviner.cfg:3
+msgid "female^Mermaid Diviner"
+msgstr ""
+
+#: data/units/Mermaid_Diviner.cfg:23
+msgid ""
+"The most devout and pious amongst the mermaids gain the striking power of "
+"illumination, which prevents their surroundings from ever seeing true "
+"night.  Their power is a stalwart counter to the forces of darkness."
+msgstr ""
 
-#: data/units/Merman.cfg:16
+#: data/units/Mermaid_Enchantress.cfg:3
+msgid "female^Mermaid Enchantress"
+msgstr ""
+
+#: data/units/Mermaid_Enchantress.cfg:20 data/units/Mermaid_Siren.cfg:20
+#: data/units/Merman.cfg:16 data/units/Merman_Entangler.cfg:15
+#: data/units/Merman_Fighter.cfg:18 data/units/Merman_Hoplite.cfg:19
+#: data/units/Merman_Hunter.cfg:15 data/units/Merman_Javelineer.cfg:15
+#: data/units/Merman_Netcaster.cfg:15 data/units/Merman_Spearman.cfg:15
+#: data/units/Merman_Triton.cfg:18 data/units/Merman_Warrior.cfg:18
 msgid ""
 "Skilled creatures of the sea, Mermen are powerful and quick in any watery "
 "environment, but struggle greatly to move on land."
@@ -4993,11 +5172,97 @@
 "Som et af havets veltrænede skabninger er Havmanden stærk og hurtig i "
 "ethvert hav-miljø, men han må kæmpe hårdt for at klare sig på land."
 
-#: 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
+#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:31
+#: data/units/Mermaid_Siren.cfg:33 data/units/Sea_Hag.cfg:27
+msgid "water spray"
+msgstr "sprøjte med vand"
+
+#: data/units/Mermaid_Initiate.cfg:3
+msgid "female^Mermaid Initiate"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:20
+msgid ""
+"Young Mermaids are often initiated in the water magics of their people.  "
+"Despite their frailty, this makes them formidable opponents, as they can "
+"call upon the very water about them to smite their enemies."
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:3
+msgid "female^Mermaid Priestess"
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:21
+msgid ""
+"The more learned among the mermaids often take a path of holy study.  This "
+"leaves them quite capable of ministering to the wounds of their comrades, as "
+"well as being a potent defense against the unworldly."
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:3
+msgid "female^Siren"
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:23
+#, fuzzy
+msgid "naia touch"
+msgstr "fe-kontakt"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Havmand"
+
+#: data/units/Merman.cfg:19 data/units/Merman_Fighter.cfg:21
+#: data/units/Merman_Hoplite.cfg:22 data/units/Merman_Lord.cfg:21
+#: data/units/Merman_Triton.cfg:21 data/units/Merman_Triton.cfg:33
+#: data/units/Merman_Warrior.cfg:21 data/units/Naga.cfg:20
+#: data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr "trefork"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "snøre"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Drake Kæmper"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Havmand"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Havmand"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+msgid "Merman Netcaster"
+msgstr ""
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Soldat"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Tysk Oversættelse"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Øgle Kriger"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Mudderkravler"
@@ -5011,8 +5276,8 @@
 "sprøjte med kogende vand."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5057,10 +5322,6 @@
 "to hide at night, leaving no trace of their presence."
 msgstr ""
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "nattesnak"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Ædel Kommandør"
@@ -5098,7 +5359,7 @@
 msgid "Ogre"
 msgstr "Ogre"
 
-#: data/units/Ogre.cfg:15
+#: data/units/Ogre.cfg:16
 msgid ""
 "Ogres are stupid giant humanoids that usually live alone in the wilderness. "
 "While they can be easily outrun or outsmarted, their strength is not to be "
@@ -5206,7 +5467,7 @@
 msgstr ""
 
 #: data/units/Orcish_Shaman.cfg:25 data/units/Orcish_Shaman.cfg:68
-#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:33
+#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:34
 msgid "curse"
 msgstr "forbande"
 
@@ -5294,7 +5555,7 @@
 "blandt orkerne og meget frygtet af sine fjender. Den eneste svaghed er den "
 "manglende evne til at anvende en bue."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Lovløs"
 
@@ -5302,6 +5563,11 @@
 msgid "Outlaws fight better at night."
 msgstr "Lovløse kæmper bedre om natten."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Lovløs"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
@@ -5309,7 +5575,8 @@
 "det."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Lovløs Prinsesse"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5321,7 +5588,8 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Lovløs Dronning"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5388,7 +5656,14 @@
 msgid "Pirate Galleon"
 msgstr "Pirat Galeon"
 
-#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
+#: data/units/Pirate_Galleon.cfg:14
+msgid ""
+"Pirate galleons are to transport ships what wolves are to sheeps. Ships full "
+"of goods shouldn't be lonely, far away from any land, better to help them to "
+"avoid it being sunk from overloading..."
+msgstr ""
+
+#: data/units/Pirate_Galleon.cfg:16 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr "katapult"
@@ -5403,7 +5678,7 @@
 "in forests and swamps."
 msgstr ""
 
-#: data/units/Princess.cfg:19 data/units/Princess.cfg:57
+#: data/units/Princess.cfg:20 data/units/Princess.cfg:58
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@@ -5418,7 +5693,7 @@
 "tilstedeværelse. Prinsessen er også hurtig og smidig og har evner, der "
 "ligner en tyvs."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Rød Troldmand"
 
@@ -5432,6 +5707,11 @@
 "sandsynlighed rammer præcist. De kan kæmpe både nat og dag og er hurtige 
på "
 "fødderne, og en rød troldmand er værdifuld i stort set alle situationer"
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Rød Troldmand"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Dødsgænger"
@@ -5544,13 +5824,14 @@
 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 "
+"valued as scouts as they 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"
+#, fuzzy
+msgid "female^Sea Hag"
 msgstr "Søuhyre"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5560,10 +5841,6 @@
 msgstr ""
 "Søuhyrer er ældre og mere erfarne Nagaer der har lært at bruge vandmagi."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "sprøjte med vand"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Hav-Ork"
@@ -5624,7 +5901,7 @@
 "and even into the lands beyond."
 msgstr ""
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Sølv Troldmand"
 
@@ -5635,10 +5912,24 @@
 "instant. They are also highly resistant to most forms of magical attack."
 msgstr ""
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Sølv Troldmand"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Skelet Drage"
 
+#: data/units/Skeletal_Dragon.cfg:17
+msgid ""
+"Long ago one of the mightiest living creatures, the feared Dragon has become "
+"only bones and dark sinew. Long after its death, it was raised through the "
+"dark powers of necromancy, which it now serves. The Skeletal Dragon may look "
+"like nothing more than a pile of bones, but few people who thought that way "
+"lived long enough to change their minds."
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr "kæbe"
@@ -5703,6 +5994,10 @@
 "fighting the living."
 msgstr ""
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "sygdom"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Soldat"
@@ -5888,16 +6183,17 @@
 "fra offeret og med dette heale sig selv."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Vampyr Dame"
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
 "the blood of the living."
 msgstr "Kold og smuk, holder hun sig evig und ved at drikke de levendes blod."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "blods-kys"
 
@@ -5956,7 +6252,7 @@
 "Vagttårne er et godt at sted spotte fjender fra og så skude forskellige 
ting "
 "med dem med katapulter."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Hvid Troldmand"
 
@@ -5974,6 +6270,11 @@
 "Den hvide troldmand kæmper godt mod de levende døde, der tager stor skade 
af "
 "denne troldmands hvide lys"
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Hvid Troldmand"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Ulve-Ridder"
@@ -6182,7 +6483,7 @@
 msgid "+ Bots"
 msgstr "+ Bots"
 
-#: src/about.cpp:276 src/help.cpp:2372 src/show_dialog.cpp:472
+#: src/about.cpp:276 src/help.cpp:2350 src/show_dialog.cpp:491
 msgid "Close"
 msgstr "Luk"
 
@@ -6204,73 +6505,73 @@
 msgid "none"
 msgstr "ingen"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "basis skade"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "angribers modstandskraft mod"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "angribers svaghed mod"
 
-#: src/actions.cpp:363 src/actions.cpp:481 src/actions.cpp:490
+#: src/actions.cpp:365 src/actions.cpp:484 src/actions.cpp:493
 msgid "Doubled"
 msgstr "Fordoblet"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "total skade"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "forsvarers modstandskraft mod"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "forsvarers svaghed mod"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Halveret"
 
-#: src/actions.cpp:714 src/actions.cpp:861 src/display.cpp:917
+#: src/actions.cpp:716 src/actions.cpp:862 src/display.cpp:917
 #: src/reports.cpp:115
 msgid "poisoned"
 msgstr "forgiftet"
 
-#: src/actions.cpp:719 src/actions.cpp:866 src/display.cpp:913
+#: src/actions.cpp:721 src/actions.cpp:867 src/display.cpp:913
 #: src/reports.cpp:110
 msgid "slowed"
 msgstr "nedsløvede"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Baghold!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Allieret enhed opdaget"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Fjendtlig enhed opdaget!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends Allierede enhed opdaget"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies Fjendtlige enhed opdaget!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Enheder opdaget! ($friends allierede, $enemies fjendtlige)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(tryk på $hotkey for at fortsætte)"
 
@@ -6330,7 +6631,7 @@
 msgid "replay"
 msgstr "replay"
 
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1384
+#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1385
 msgid "Turn"
 msgstr "Tur"
 
@@ -6397,23 +6698,23 @@
 msgid "Profile"
 msgstr "Profil"
 
-#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:567
-#: src/playturn.cpp:1793
+#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:564
+#: src/playturn.cpp:1794
 msgid "level"
 msgstr "niveau"
 
-#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:622
-#: src/playturn.cpp:1958 src/unit.cpp:1070
+#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:613
+#: src/playturn.cpp:1959 src/unit.cpp:1070
 msgid "Moves"
 msgstr "Bevægelser"
 
-#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:230
+#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:230
 msgid "melee"
 msgstr "nærkamp"
 
-#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:231
+#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:231
 msgid "ranged"
 msgstr "langrækkende"
 
@@ -6433,11 +6734,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Vil du gemme en replay af dette scenarie?"
 
-#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1393
+#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1394
 msgid "Name:"
 msgstr "Navn: "
 
-#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1410
+#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1411
 msgid "The game could not be saved"
 msgstr "Spillet kunne ikke gemmes"
 
@@ -6503,8 +6804,8 @@
 #: src/game.cpp:999 src/game.cpp:1014 src/game.cpp:1020 src/game.cpp:1053
 #: src/game.cpp:1082 src/game.cpp:1096 src/game.cpp:1098 src/game.cpp:1100
 #: src/game.cpp:1112 src/game.cpp:1115 src/game.cpp:1150 src/game.cpp:1152
-#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1396
-#: src/playturn.cpp:1410
+#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1397
+#: src/playturn.cpp:1411
 msgid "Error"
 msgstr "Fejl"
 
@@ -6568,7 +6869,7 @@
 "denne kampagne."
 
 #: src/game.cpp:1112 src/game.cpp:1150 src/game.cpp:1174
-#: src/multiplayer_client.cpp:42 src/multiplayer_client.cpp:314
+#: src/multiplayer_client.cpp:45 src/multiplayer_client.cpp:319
 msgid "Connection timed out"
 msgstr "Forbindelsestiden løb ud."
 
@@ -6624,7 +6925,7 @@
 msgid "Play a game against AI opponents"
 msgstr ""
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr "Login"
 
@@ -6644,79 +6945,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Kunne ikke indlæse skrifttyper. Afslutter.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Forfremmes til"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr ""
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Krævet XP"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "angreb"
 
-#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1955
+#: src/help.cpp:636 src/help.cpp:637 src/playturn.cpp:1956
 msgid "Name"
 msgstr "Navn"
 
-#: src/help.cpp:649 src/help.cpp:650 src/playturn.cpp:1954
+#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1955
 msgid "Type"
 msgstr "Type"
 
-#: src/help.cpp:653 src/help.cpp:654 src/unit_types.cpp:302
+#: src/help.cpp:644 src/help.cpp:645 src/unit_types.cpp:302
 msgid "Dmg"
 msgstr "Skade"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr ""
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Rækkevidde"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Special"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Modstandskrafter"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Angrebs Type"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Modstandskraft"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Terræn Ændringer"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Terræn"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Forsvar"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Tilbage"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Fremad >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Kampen om Wesnoth Hjælp"
 
@@ -6728,7 +7029,7 @@
 msgid "End Unit Turn"
 msgstr "Slut Enheds Tur"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Leder"
 
@@ -6764,11 +7065,11 @@
 msgid "Unit Description"
 msgstr "Enhedsbeskrivelse"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Omdøb Enhed"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Rekruter"
 
@@ -6776,7 +7077,7 @@
 msgid "Repeat Recruit"
 msgstr "Gentag Rekrutering"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Genindkald"
 
@@ -6812,11 +7113,11 @@
 msgid "Scenario Objectives"
 msgstr "Scenariets Mission"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Enheds Liste"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statistikker"
 
@@ -6924,7 +7225,7 @@
 msgid "Speak to All"
 msgstr "Tal til Alle"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Hjælp"
 
@@ -6984,7 +7285,7 @@
 msgid "Bump Size"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Landsbyer"
 
@@ -7033,15 +7334,11 @@
 msgstr ""
 "Fjender kan ikke ses medmindre de er inden for dine enheders rækkevidde."
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Tildækket"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "Dette kort er ukendt indtil du udforsker det"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Observator"
 
@@ -7049,13 +7346,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Tillad brugere der ikke spiller, at kigge på"
 
-#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:145
-#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:460
-#: src/show_dialog.cpp:466
+#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:148
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:479
+#: src/show_dialog.cpp:485
 msgid "Cancel"
 msgstr "Annuller"
 
-#: src/multiplayer.cpp:120 src/show_dialog.cpp:446 src/show_dialog.cpp:459
+#: src/multiplayer.cpp:120 src/show_dialog.cpp:465 src/show_dialog.cpp:478
 msgid "Ok"
 msgstr "Ok"
 
@@ -7131,69 +7428,69 @@
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Henter spil liste..."
 
-#: src/multiplayer_client.cpp:121 src/multiplayer_connect.cpp:386
-#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1531
-#: src/playturn.cpp:1536 src/playturn.cpp:1623
+#: src/multiplayer_client.cpp:124 src/multiplayer_connect.cpp:386
+#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1532
+#: src/playturn.cpp:1537 src/playturn.cpp:1624
 msgid "Gold"
 msgstr "Guld"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Venter på at spillet skal starte..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 msgid "Connect to Host"
 msgstr "Forbind til Server"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Vælg en vært at forbinde til"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Oprretter forbindelse..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Du må logge ind på serveren"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Henter spil data..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Der er ingen sider tilgængelige i dette spil."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Vælg din side:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Spillet er blevet annulleret"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Den side du har valgt er ikke længere tilgængelig"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Vil et replay af spillet indtil gemme punktet?"
 
-#: src/multiplayer_client.cpp:683 src/multiplayer_client.cpp:686
+#: src/multiplayer_client.cpp:688 src/multiplayer_client.cpp:691
 msgid "?"
 msgstr "?"
 
-#: src/multiplayer_client.cpp:777
+#: src/multiplayer_client.cpp:782
 msgid "Leader: "
 msgstr "Leder: "
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr "Rekruteringer. "
 
@@ -7225,8 +7522,8 @@
 msgid "Local Player"
 msgstr "Lokal Spiller"
 
-#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:498
-#: src/multiplayer_connect.cpp:621 src/multiplayer_connect.cpp:727
+#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:496
+#: src/multiplayer_connect.cpp:610 src/multiplayer_connect.cpp:716
 msgid "Computer Player"
 msgstr "Computer Spiller"
 
@@ -7291,7 +7588,7 @@
 msgid "Color"
 msgstr "Farve"
 
-#: src/multiplayer_connect.cpp:570 src/multiplayer_connect.cpp:574
+#: src/multiplayer_connect.cpp:559 src/multiplayer_connect.cpp:563
 msgid "Waiting for network players to join"
 msgstr "Venter på at netværksspillere tilslutter sig"
 
@@ -7376,55 +7673,55 @@
 msgid "It is now your turn"
 msgstr "Det er nu din tur"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Angriber"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Forsvarer"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Skades beregninger"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Nærkamp"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "mod"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Angrib Fjende"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Vælg våben"
 
-#: src/playturn.cpp:1125
+#: src/playturn.cpp:1126
 msgid ""
 "You have not started your turn yet.  Do you really want to end your turn?"
 msgstr ""
 "Du har ikke startet din tur endnu. Vil du virkelig slutte den før den er "
 "begyndt?"
 
-#: src/playturn.cpp:1134 src/playturn.cpp:1139
+#: src/playturn.cpp:1135 src/playturn.cpp:1140
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr ""
 "Nogle enheder kan bevæge sig længere. Vil du virkelig afslutte din tur?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Auto-Gem"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr "Kunne ikke auto-gemme. Gem venligst spillet manuelt."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -7432,35 +7729,35 @@
 "Spilnavne må ikke indeholde koloner eller nogen form for skråstrege. Vælg "
 "venligts et andet navn."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Gemt"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Spillet er blevet gemt"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Inkomst"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Udgifter"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Du har ingen enheder at rekrutere."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Vælg enhed"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Du har ikke nok guld til at rekrutere denne enhed"
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1730
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
@@ -7468,7 +7765,7 @@
 "Min herre, denne enhed er erfaren. Han er blevet forfremmet.Vil du virkelig "
 "sætte $noun fri fra tjeneste?"
 
-#: src/playturn.cpp:1731
+#: src/playturn.cpp:1732
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
@@ -7476,19 +7773,19 @@
 "My lord, denne enhed er tæt på at blive forfremmet! Vil du virkelig sætte "
 "$noun fri fra tjeneste?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "hende"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "ham"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Du er adskilt fra dine soldater og kan ikke genindkalde dem"
 
-#: src/playturn.cpp:1779
+#: src/playturn.cpp:1780
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
@@ -7496,109 +7793,109 @@
 "Der er ingen soldat der kan genindkaldes\n"
 "(Du må have trænede soldater fra et tidligere scenarie)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "Du må have mindst $cost guldstykker for at genindkalde en enhed."
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Send bort"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Besked"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Send kun til allierede"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Lokalitet"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Rekruteringer"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Genindkaldelser"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Forfremmelser"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Tab"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Drab"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Skade påført"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Skade taget"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Skade påført (forventet værdi)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Skade taget (forventet værdi)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Søg"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Kommando:"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Chat Log"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "Kunne ikke finde label eller enhed der indeholder strengen @search."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Sæt Label"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Label"
 
-#: src/playturn.cpp:2421
+#: src/playturn.cpp:2422
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
 msgstr ""
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Erstart med en Computer."
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Erstat med lokal spiller"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Afslut spil"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Erstat med"
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "har forladt spillet. Hvad vil du?"
 
@@ -7660,63 +7957,63 @@
 msgid "Chaotic units"
 msgstr "Kaotiske enheder"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Ejet landsby"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Fjendtlig landsby"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Allieret landsby"
 
-#: src/show_dialog.cpp:934
+#: src/show_dialog.cpp:953
 msgid "KB"
 msgstr "kB"
 
-#: src/titlescreen.cpp:149
+#: src/titlescreen.cpp:155
 msgid "Version"
 msgstr "Version"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Tutorial"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Kampagne"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Multiplayer"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Hent"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Sprog"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Indstillinger"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Afslut"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Start en tutorial for at lære spillet at kende"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Start en ny single player kampagne"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -7724,31 +8021,31 @@
 "Spil multiplayer (lokalt, over LAN eller over Internettet) eller et enkelt "
 "scenarie mod en Computer"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Hent et single player gemt spil"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Skift sprog"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Spil indstillinger"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Se credits"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Afslut spillet"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Mere"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Bogen om Wesnoth"
 
@@ -7756,15 +8053,15 @@
 msgid "strikes"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "kaotisk"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "lovlydig"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutral"
 
@@ -7775,3 +8072,15 @@
 #: src/widgets/file_chooser.cpp:173
 msgid "Deletion of the file failed."
 msgstr "Slettelse af fil mislykkedes"
+
+#~ msgid "first strike"
+#~ msgstr "slå først"
+
+#~ msgid "Swamp"
+#~ msgstr "Sump"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
Index: wesnoth/po/wesnoth/de.po
diff -u wesnoth/po/wesnoth/de.po:1.7 wesnoth/po/wesnoth/de.po:1.8
--- wesnoth/po/wesnoth/de.po:1.7        Sun Oct 17 12:52:53 2004
+++ wesnoth/po/wesnoth/de.po    Thu Oct 21 20:22:40 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-09-29 18:04+0100\n"
 "Last-Translator: Christoph Berg <address@hidden>\n"
 "Language-Team: none\n"
@@ -17,7 +17,7 @@
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "loyal"
 
@@ -49,11 +49,11 @@
 msgid "Traits"
 msgstr "Charakteristiken"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Einheiten"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr ""
 
@@ -199,7 +199,7 @@
 "<ref>dst=inkome_and_upkeep text='Einkommen und Unterhaltskosten'</ref>, wenn "
 "Sie dazu mehr Informationen möchten."
 
-#: data/help.cfg:84 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:84 src/help.cpp:747 src/help.cpp:748
 msgid "Movement"
 msgstr "Bewegungskosten"
 
@@ -626,7 +626,7 @@
 "anschauen, allerdings wissen Sie schon alles, was zum Spielen des Szenarios "
 "\"Der Thronerbe\" wichtig ist. Viel Spaß dabei!"
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 #, fuzzy
 msgid "About"
 msgstr "Jüngling"
@@ -930,7 +930,7 @@
 msgstr "Standard"
 
 #: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:196
-#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:658
+#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:663
 msgid "&random-enemy.png,Random"
 msgstr "&random-enemy.png,Zufall"
 
@@ -1046,6 +1046,24 @@
 msgid "Random map"
 msgstr "Zufallskarte"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Zufallskarte"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Zufallskarte"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Zufallskarte"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -1087,7 +1105,7 @@
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/Basic_Training.cfg:276
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
-#: src/show_dialog.cpp:453
+#: src/show_dialog.cpp:472
 msgid "No"
 msgstr "Nein"
 
@@ -1713,7 +1731,7 @@
 
 #: data/scenarios/tutorial/Basic_Training.cfg:262
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
-#: src/show_dialog.cpp:452
+#: src/show_dialog.cpp:471
 msgid "Yes"
 msgstr "Ja"
 
@@ -2321,6 +2339,112 @@
 msgid "Underground"
 msgstr "Untergrund"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Schleier der Finsternis"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Tiefes Wasser"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Seichtes Wasser"
+
+#: data/terrain.cfg:39 data/terrain.cfg:60 data/terrain.cfg:139
+#: data/terrain.cfg:148 data/terrain.cfg:166 data/terrain.cfg:229
+#: src/reports.cpp:309
+msgid "Village"
+msgstr "Dorf"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Seichtes Wasser"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Eis"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Brücke"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Sand"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Straße"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr ""
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Grassland"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Schatten"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Hügel"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Berge"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Wald"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Höhlenwnad"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Höhle"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Burg"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Lager"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Zwergische Einöde"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Bergfried"
+
+#: data/terrain.cfg:288
+msgid "Canyon"
+msgstr ""
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Spiel"
@@ -2334,14 +2458,14 @@
 msgstr "Runde beenden"
 
 #: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:670
-#: src/display.cpp:941 src/help.cpp:621 src/playturn.cpp:1956
+#: src/display.cpp:941 src/help.cpp:612 src/playturn.cpp:1957
 #: src/unit.cpp:1034
 msgid "HP"
 msgstr "LE"
 
 #: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:674
 #: src/dialogs.cpp:682 src/display.cpp:945 src/display.cpp:953
-#: src/playturn.cpp:1795 src/playturn.cpp:1957 src/unit.cpp:1093
+#: src/playturn.cpp:1796 src/playturn.cpp:1958 src/unit.cpp:1093
 msgid "XP"
 msgstr "EP"
 
@@ -2419,36 +2543,30 @@
 "Tag: -25% Schaden\n"
 "Nacht: +25% Schaden"
 
-#: data/translations/english.cfg:23
+#: data/translations/english.cfg:21
 #, fuzzy
 msgid ""
-"Heals:\n"
-"Allows the unit to heal adjacent friendly units at the beginning of the "
-"turn.\n"
+"Ambush:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"A unit cared for by a healer may heal up to 4 HP per turn.\n"
-"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
-"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
-"care of a village or a unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 msgstr ""
-"Heilen:\n"
-"Angrenzende Einheiten werden zu Beginn Eurer Runde geheilt. Allows the unit "
-"to heal adjacent friendly units at the beginning of the turn.\n"
+"Hinterhalt:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"Eine Einheit, um die sich ein Heiler kümmert, erhält bis zu vier LP pro "
-"Runde zurück.\n"
-"Ein Heiler kann bis zu 8 LP pro Runde heilen A healer may heal a total of 8 "
-"HP per turn, for all units it cares for.\n"
-"Eine vergiftete Einheit, kann nicht von einem A poisoned unit cannot be "
-"cured of its poison by a healer, and must seek the care of a village or a "
-"unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "heilen"
+#: data/translations/english.cfg:23 data/units/Elvish_Avenger.cfg:18
+#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
+#: data/units/Elvish_Ranger.cfg:94
+msgid "ambush"
+msgstr "Hinterhalt"
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 #, fuzzy
 msgid ""
 "Cures:\n"
@@ -2473,27 +2591,64 @@
 "A curer can cure a unit of poison, although that unit will receive no "
 "additional healing on the turn it is cured of the poison."
 
-#: data/translations/english.cfg:35 data/units/Elvish_Druid.cfg:19
-#: data/units/Elvish_Shyde.cfg:19 data/units/White_Mage.cfg:12
-#: data/units/White_Mage.cfg:71
+#: data/translations/english.cfg:33 data/units/Elvish_Druid.cfg:19
+#: data/units/Elvish_Shyde.cfg:19 data/units/Mermaid_Priestess.cfg:7
+#: data/units/White_Mage.cfg:12 data/units/White_Mage.cfg:71
 msgid "cures"
 msgstr "kurieren"
 
-#: data/translations/english.cfg:38
+#: data/translations/english.cfg:40
 #, fuzzy
 msgid ""
-"Teleport:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heals:\n"
+"Allows the unit to heal adjacent friendly units at the beginning of the "
+"turn.\n"
+"\n"
+"A unit cared for by a healer may heal up to 4 HP per turn.\n"
+"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
+"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
+"care of a village or a unit that can cure."
 msgstr ""
-"Teleportieren:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heilen:\n"
+"Angrenzende Einheiten werden zu Beginn Eurer Runde geheilt. Allows the unit "
+"to heal adjacent friendly units at the beginning of the turn.\n"
+"\n"
+"Eine Einheit, um die sich ein Heiler kümmert, erhält bis zu vier LP pro "
+"Runde zurück.\n"
+"Ein Heiler kann bis zu 8 LP pro Runde heilen A healer may heal a total of 8 "
+"HP per turn, for all units it cares for.\n"
+"Eine vergiftete Einheit, kann nicht von einem A poisoned unit cannot be "
+"cured of its poison by a healer, and must seek the care of a village or a "
+"unit that can cure."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "heilen"
+
+#: data/translations/english.cfg:47
+#, fuzzy
+msgid ""
+"Illuminates:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
 msgstr ""
+"Lichtaura:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "Dörfer"
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:54
 #, fuzzy
 msgid ""
 "Leadership:\n"
@@ -2508,7 +2663,7 @@
 "\n"
 "Adjacent friendly units of lower level will do more damage in battle."
 
-#: data/translations/english.cfg:47 data/units/Commander.cfg:11
+#: data/translations/english.cfg:56 data/units/Commander.cfg:11
 #: data/units/Commander.cfg:86 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
@@ -2517,58 +2672,44 @@
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
 #: data/units/Noble_Commander.cfg:10 data/units/Noble_Lord.cfg:10
 #: 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:353 src/actions.cpp:471
+#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
+#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:355 src/actions.cpp:474
 msgid "leadership"
 msgstr "Führungsqualitäten"
 
-#: data/translations/english.cfg:52
-#, fuzzy
+#: data/translations/english.cfg:59
 msgid ""
-"Ambush:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
+"Loyal:\n"
+"Never more than 1 upkeep."
 msgstr ""
-"Hinterhalt:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
 
-#: data/translations/english.cfg:54 data/units/Elvish_Avenger.cfg:18
-#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
-#: data/units/Elvish_Ranger.cfg:94
-msgid "ambush"
-msgstr "Hinterhalt"
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
+msgstr ""
 
-#: data/translations/english.cfg:59
-#, fuzzy
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr ""
+
+#: data/translations/english.cfg:69
 msgid ""
-"Illuminates:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
+"Regenerates:\n"
+"The unit will heal itself 8 hp per turn. If it is poisoned, it will remove "
+"the poison instead of healing."
 msgstr ""
-"Lichtaura:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "Dörfer"
+#: data/translations/english.cfg:71 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_Rocklobber.cfg:7
+#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+msgid "regenerates"
+msgstr "Regeneration"
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 #, fuzzy
 msgid ""
 "Skirmisher:\n"
@@ -2579,155 +2720,168 @@
 "This unit is skilled in moving past enemies quickly, and ignores all Enemy "
 "Zones of Control."
 
-#: data/translations/english.cfg:66 data/units/Assassin.cfg:16
+#: data/translations/english.cfg:76 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:19 data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr "Plänkler"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr ""
-
-#: data/translations/english.cfg:72
-msgid "This unit takes half normal damage when it did not initiate the attack."
+#: data/translations/english.cfg:79
+msgid ""
+"Steadfast:\n"
+"This unit takes half normal damage when it did not initiate the attack."
 msgstr ""
 
-#: data/translations/english.cfg:74 data/units/Dwarvish_Guardsman.cfg:15
+#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
 #: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: src/actions.cpp:499
+#: data/units/Merman_Hoplite.cfg:13 src/actions.cpp:502
 msgid "steadfast"
 msgstr ""
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+#, fuzzy
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teleportieren:\n"
+"This unit may teleport between any two friendly villages instantly."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr ""
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr ""
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Spiel"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Szenario"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr ""
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr ""
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr ""
 "Es konnte keine Verbindung mit dem entfernten Server/Gastgeber hergestellt "
 "werden"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr ""
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr ""
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr ""
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Beobachter"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr ""
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr ""
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr ""
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr ""
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr ""
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr ""
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr ""
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr ""
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr ""
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr ""
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr ""
 
-#: data/translations/english.cfg:107
+#: data/translations/english.cfg:119
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain"
 msgstr ""
 
-#: data/translations/english.cfg:108
+#: data/translations/english.cfg:120
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain"
 msgstr ""
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr ""
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr ""
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr ""
 
-#: data/translations/english.cfg:117
+#: data/translations/english.cfg:129
 msgid ""
 "Backstab:\n"
 "This attack deals double damage if a friendly unit is on the opposite side "
 "of the target."
 msgstr ""
 
-#: data/translations/english.cfg:119 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:490
-msgid "backstab"
+#: data/translations/english.cfg:132
+msgid ""
+"Berserk:\n"
+"Whether used offensively or defensively, this attack presses the engagement "
+"until one of the combatants is slain."
 msgstr ""
 
-#: data/translations/english.cfg:122
+#: data/translations/english.cfg:135
 msgid ""
 "Charge:\n"
 "This attack deals double damage to the target. It also causes this unit to "
@@ -2739,14 +2893,7 @@
 "vollkommen vernachlässigt, erleidet er bei einem Gegentreffer ebenfalls "
 "doppelten Schaden."
 
-#: data/translations/english.cfg:124 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:363 src/actions.cpp:481
-msgid "charge"
-msgstr "Ansturm"
-
-#: data/translations/english.cfg:127
+#: data/translations/english.cfg:138
 #, fuzzy
 msgid ""
 "Drain:\n"
@@ -2757,295 +2904,134 @@
 "This unit drains health from living units, healing itself for half the "
 "amount of damage it deals."
 
-#: data/translations/english.cfg:129 data/units/Ancient_Lich.cfg:24
-#: data/units/Blood_Bat.cfg:24 data/units/Dark_Spirit.cfg:24
-#: data/units/Demilich.cfg:23 data/units/Lich.cfg:24
-#: data/units/Orcish_Shaman.cfg:30 data/units/Orcish_Shaman.cfg:73
-#: data/units/Orcish_Shaman.cfg:116 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Spectre.cfg:24 data/units/Vampire_Bat.cfg:24
-#: data/units/Vampire_Lady.cfg:25 data/units/Vampire_Lady.cfg:38
-#: data/units/Wraith.cfg:24
-msgid "drain"
-msgstr "Lebensentzug"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:134 data/units/Ancient_Lich.cfg:34
-#: data/units/Arch_Mage.cfg:42 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/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:64 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 data/units/Mage.cfg:39
-#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
-#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
-#: data/units/Princess.cfg:79 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 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 ""
-
-#: data/translations/english.cfg:137
+#: data/translations/english.cfg:147
 msgid ""
 "Marksman:\n"
 "When used offensively, this attack always has at least a 60% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:139 data/units/Elvish_Marksman.cfg:39
-#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
-msgid "marksman"
-msgstr "Schießkunst"
-
-#: data/translations/english.cfg:142
+#: data/translations/english.cfg:150
 msgid ""
 "Plague:\n"
 "If this unit kills a living target and that unit was not stationed in a "
 "village, the dead target's corpse will rise up and fight for you."
 msgstr ""
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr ""
-
-#: data/translations/english.cfg:147
+#: data/translations/english.cfg:153
 msgid ""
 "Poison:\n"
 "This attack poisons the target. Poisoned units lose 8 HP every turn until "
 "they are cured or are reduced to 1 HP."
 msgstr ""
 
-#: data/translations/english.cfg:149 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:38
-#: data/units/Necrophage.cfg:24 data/units/Orcish_Assassin.cfg:41
-#: data/units/Orcish_Slayer.cfg:46
-msgid "poison"
-msgstr "Vergiften"
-
-#: data/translations/english.cfg:152
+#: data/translations/english.cfg:156
 msgid ""
 "Slow:\n"
 "This attack slows the target. Slowed units move at half normal speed and "
 "receive one less attack than normal in combat for the duration of one turn."
 msgstr ""
 
-#: data/translations/english.cfg:154 data/units/Cave_Spider.cfg:38
-#: data/units/Elvish_Druid.cfg:44 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 "Verlangsamen"
-
-#: data/translations/english.cfg:157
+#: data/translations/english.cfg:159
 msgid ""
 "Stone:\n"
 "This attack turns the target to stone. Units that have been turned to stone "
 "may not move or attack."
 msgstr ""
 
-#: data/translations/english.cfg:159 data/units/Cockatrice.cfg:26
-#: src/actions.cpp:728 src/actions.cpp:876 src/reports.cpp:122
-msgid "stone"
-msgstr "Versteinern"
-
 #: data/translations/english.cfg:162
-msgid ""
-"Berserk:\n"
-"Whether used offensively or defensively, this attack presses the engagement "
-"until one of the combatants is slain."
-msgstr ""
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr ""
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "Erstschlag"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfen"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orks"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Menschen"
 
-#: data/translations/english.cfg:175
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orks"
+
+#: data/translations/english.cfg:165
 msgid "Undead"
 msgstr "Untote"
 
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Tiefes Wasser"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Seichtes Wasser"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Sand"
-
-#: data/translations/english.cfg:182 data/translations/english.cfg:184
-#: data/translations/english.cfg:185 data/translations/english.cfg:186
-#: data/translations/english.cfg:187 data/translations/english.cfg:188
-#: src/reports.cpp:310
-msgid "Village"
-msgstr "Dorf"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Sumpf"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Eis"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Straße"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr ""
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Grassland"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Hügel"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Berge"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Wald"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Brücke"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Burg"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Bergfried"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Höhle"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Höhlenwnad"
-
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Lager"
-
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr ""
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr ""
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr ""
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr ""
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr ""
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr ""
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+msgid "$name|harbor,$name|port"
+msgstr ""
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ""
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr ""
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr ""
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr ""
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr ""
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr ""
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr ""
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Nicht nochmal fragen"
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
@@ -3054,7 +3040,7 @@
 "Schutze der Nacht Angriffsvorteile genießen. Neutrale Einheiten sind vom 
Tag-"
 "Nacht-Wechsel nicht betroffen."
 
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:186
 msgid ""
 "In a campaign, you can use veteran units from previous scenarios by using "
 "the 'recall' option."
@@ -3062,7 +3048,7 @@
 "In einer Kampagne könnt Ihr erfahrene Einheiten aus dem vorherigen Szenario "
 "wieder einsetzen, indem Ihr die Option 'Einberufen ' verwendet."
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
 "Different units have weaknesses against different types of attacks. Right-"
@@ -3077,7 +3063,7 @@
 "'Resistenz' gibt Euch darüber Auskunft, wie hoch der jeweilige Widerstand "
 "gegen eine bestimmte Schadensart ist."
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
 "hitting them in battle. The defensive rating for the currently selected unit "
@@ -3089,7 +3075,7 @@
 "Verteidigungswert der gewählten Einheit wird in der rechten oberen Ecke "
 "angezeigt."
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
 "poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -3101,7 +3087,7 @@
 "übrig. Vergiftete Einheiten können kuriert  werden, wenn Ihr sie in ein 
Dorf "
 "führt oder sie neben einer Einheit mit der Fähigkeit 'Kurieren' platziert."
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
 "menu. By recalling the same units over and over, you can build up a powerful "
@@ -3111,7 +3097,7 @@
 "einberuft. Wenn Ihr dies über mehrer Szenarien tut, bilden diese Einheiten "
 "eine immer mächtiger und erfahrener werdende Armee."
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
 "unit moves into an enemy's Zone of Control, it may not move any further that "
@@ -3121,7 +3107,7 @@
 "eine Eurer Einheiten in die Nähe einer gegnerischen Einheit begibt, kann sie 
"
 "sich in dieser Runde nicht weiter bewegen."
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
 "itself in the terrain it is standing in, however magical attacks always have "
@@ -3134,14 +3120,14 @@
 "von 70%. Darüber hinaus gibt es noch Einheiten, die über das Wissen der "
 "Schießkunst verfügen. Diese haben eine Trefferwahrscheinlichkeit von 60%."
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
 msgstr ""
 "Einheiten, die in einem Dorf stationiert sind, regenerieren 8 Lebenspunkt zu "
 "Beginn der nächsten Runde. "
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
 "hitpoints at the beginning of their next turn."
@@ -3150,7 +3136,7 @@
 "angreifen, können sich etwas ausruhen. Deshalb erhalten sie bei Beginn der "
 "nächsten Runde 2 Lebenspunkte zurück."
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
 "terrain, while most mounted units don't get any defensive advantage in "
@@ -3160,7 +3146,7 @@
 "übrigen Gelände, während die meisten berittenen Einheiten keinen Vorteil 
bei "
 "der Verteidigung in Dörfern oder Burgen genießen."
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
 "weapons, but are vulnerable to attacks with piercing weapons, including bows "
@@ -3170,7 +3156,7 @@
 "und Wuchtwaffen, sind dafür aber verwundbarer gegen Angriffen mit "
 "Stichwaffen, Speeren sowie Pfeilen."
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
 "experience. Units killing an enemy will gain 8 experience for every level of "
@@ -3180,7 +3166,7 @@
 "gewinnen. Jede Einheit, die einen Feind tötet, erhalten pro Stufe des "
 "Gegners 8 Erfahrungspunkte."
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
 "fight very well in hills and mountains."
@@ -3189,7 +3175,7 @@
 "beweglicher und kämpfen geschickter, wohingegen Zwerge, deren Behausungen in 
"
 "den Hügeln und Bergen Wesnoths liegt, dort einen Heimvorteil genießen."
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
 "troops, wait for better conditions and then attack."
@@ -3198,7 +3184,7 @@
 "unter schlechten Bedingungen zu attackieren, solltet Ihr lieber auf bessere "
 "Bedingungen für einen Angriff warten."
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
 "expendable units in some directions to delay enemy units."
@@ -3207,7 +3193,7 @@
 "gute Idee, entbehrliche Einheiten in andere Richtungen zu schicken, um den "
 "gegnerischen Angriff zu verzögern. "
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
 msgstr ""
@@ -3215,7 +3201,7 @@
 "neu zu gruppieren, denn dieses Vorgehen kann über Sieg und Niederlage "
 "entscheiden."
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
 "depending on the number of villages on the map, and the number of turns you "
@@ -3229,7 +3215,7 @@
 "ihr sämtliche Dörfer auf der Karte besetzt und bis zum Ablauf des "
 "Rundenlimits wartet."
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
 "just the keep they start on. You can capture a keep from an enemy and "
@@ -3242,7 +3228,7 @@
 "Möglichkeit, dass Eure Verbündeten für Euch Platz in ihrer Burg schaffen, "
 "damit Ihr dort Einheiten ausbilden könnt."
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
 "impact, fire, and holy attacks."
@@ -3251,7 +3237,7 @@
 "gehen sie unter den Schlägen von Hieb- oder geweihten Waffen sowie dem "
 "Einfluss von Feuer schnell zu Grunde."
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
 "side fight better."
@@ -3259,7 +3245,7 @@
 "Niedrig stufige Truppen, die an der Seite einer Einheit mit "
 "Führungsqualitäten kämpfen, genießen Vorteile im Kampf."
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
 "onto the village and attack you, while enjoying the defense and healing of "
@@ -3270,7 +3256,7 @@
 "attackieren, während sie selbst von den Verteidigungs- und Heilungsboni "
 "profitiert."
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
 "ability or trait."
@@ -3278,19 +3264,19 @@
 "Wenn Ihr den Mauszeiger über eine Fähigkeit oder Eigenschaft einer Einheit "
 "bewegt, wird Euch die jeweilige Beschreibung angezeigt."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Ihr solltet versuchen, einen Ring um Eure verwundeten Einheiten zu ziehen, "
 "um es dem Gegner schwerer zu machen, diese anzugreifen."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr ""
 "Lest Euch die Liste der Tastenkombinationen durch, um schnelleren Zugriff "
 "auf die Funktionen des Spiels zu bekommen."
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
 "you can undo your move by pressing 'u'."
@@ -3300,7 +3286,7 @@
 "hat - beispielsweise neue Dörfer oder gegnerische Einheiten -  bzw. noch "
 "keine gegnerische Einheit angegriffen hat."
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
 "them."
@@ -3308,7 +3294,7 @@
 "Ihr könnt feststellen, wie weit sich gegnerische Einheiten in ihrer Runde "
 "bewegen können. Zeigt einfach mit dem Mauszeiger auf sie."
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
 "needing to attack anything themselves."
@@ -3316,7 +3302,7 @@
 "Unterstützt Eure angreifenden Einheiten durch Heiler - diese können den "
 "Kampf gewinnen, ohne ein einziges mal anzugreifen."
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
 "them one less attack than they would normally have. It is thus very "
@@ -3326,11 +3312,11 @@
 "wirkungsvoll gegen starke Einheiten, da ihre Bewegungsrate gesenkt wird und "
 "zudem ihre Angriffszahl um die Hälfte reduziert wird."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Untote sind sehr anfällig gegen geweihte Waffe und heilige Magie."
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
 "fight."
@@ -3338,7 +3324,7 @@
 "Einheiten werden vollständig geheilt, sobald sie eine Stufe aufsteigen. Klug 
"
 "eingesetzt, kann dies einen Kampf entscheiden."
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
@@ -3374,7 +3360,7 @@
 
 #: data/units/Ancient_Lich.cfg:20 data/units/Ancient_Lich.cfg:33
 #: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
-#: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
+#: data/units/Dark_Queen.cfg:28 data/units/Dark_Queen.cfg:29
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
 #: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
@@ -3387,12 +3373,49 @@
 msgid "cold"
 msgstr "Kälte"
 
+#: data/units/Ancient_Lich.cfg:24 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:23
+#: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:30
+#: data/units/Orcish_Shaman.cfg:73 data/units/Orcish_Shaman.cfg:116
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
+#: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:24
+msgid "drain"
+msgstr "Lebensentzug"
+
 #: data/units/Ancient_Lich.cfg:32 data/units/Deathmaster.cfg:35
 #: data/units/Demilich.cfg:31 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr "Kälteschock"
 
+#: data/units/Ancient_Lich.cfg:34 data/units/Arch_Mage.cfg:42
+#: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:30 data/units/Deathmaster.cfg:37
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:64
+#: 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
+#: data/units/Mage.cfg:39 data/units/Mage.cfg:106
+#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
+#: data/units/Mermaid_Diviner.cfg:37 data/units/Mermaid_Enchantress.cfg:35
+#: data/units/Mermaid_Initiate.cfg:35 data/units/Mermaid_Priestess.cfg:35
+#: data/units/Mermaid_Siren.cfg:26 data/units/Mermaid_Siren.cfg:37
+#: data/units/Necromancer.cfg:37 data/units/Princess.cfg:80
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: 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 ""
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Alter Waldschrat"
@@ -3418,7 +3441,7 @@
 #: 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/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:22
 #: 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
@@ -3426,19 +3449,24 @@
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
 #: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:24
 #: data/units/Elvish_Druid.cfg:43 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:20
 #: 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/Footpad.cfg:38 data/units/Galleon.cfg:19 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: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/Mermaid_Diviner.cfg:27 data/units/Mermaid_Enchantress.cfg:24
+#: data/units/Mermaid_Enchantress.cfg:33 data/units/Mermaid_Initiate.cfg:24
+#: data/units/Mermaid_Initiate.cfg:33 data/units/Mermaid_Priestess.cfg:25
+#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
+#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
 #: data/units/Noble_Youth.cfg:22 data/units/Outlaw.cfg:21
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3458,7 +3486,7 @@
 msgid "impact"
 msgstr "Wucht"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Erzmagier"
 
@@ -3475,6 +3503,8 @@
 #: data/units/Elvish_Druid.cfg:23 data/units/Elvish_Enchantress.cfg:25
 #: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
+#: data/units/Mermaid_Diviner.cfg:26 data/units/Mermaid_Enchantress.cfg:23
+#: data/units/Mermaid_Initiate.cfg:23 data/units/Mermaid_Priestess.cfg:24
 #: 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
@@ -3490,7 +3520,7 @@
 msgstr "Feuerball"
 
 #: 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/Battle_Princess.cfg:78 data/units/Commander.cfg:121
 #: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
 #: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
@@ -3502,12 +3532,17 @@
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/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/Princess.cfg:78 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
 #: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr "Feuer"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Erzmagier"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Attentäter"
@@ -3536,7 +3571,7 @@
 msgstr "Dolch"
 
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
-#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
 #: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
@@ -3574,21 +3609,22 @@
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Lord.cfg:86
 #: data/units/Mage.cfg:21 data/units/Mage.cfg:88
-#: data/units/Master_Bowman.cfg:21 data/units/Necrophage.cfg:20
-#: data/units/Nightgaunt.cfg:21 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: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 data/units/Orcish_Shaman.cfg:105
-#: data/units/Orcish_Slayer.cfg:20 data/units/Orcish_Slayer.cfg:42
-#: data/units/Orcish_Sovereign.cfg:22 data/units/Orcish_Warlord.cfg:19
-#: data/units/Orcish_Warrior.cfg:20 data/units/Poacher.cfg:25
-#: data/units/Princess.cfg:23 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/Master_Bowman.cfg:21 data/units/Merman_Triton.cfg:34
+#: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
+#: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
+#: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:20
+#: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
+#: 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
+#: data/units/Orcish_Shaman.cfg:105 data/units/Orcish_Slayer.cfg:20
+#: data/units/Orcish_Slayer.cfg:42 data/units/Orcish_Sovereign.cfg:22
+#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:20
+#: data/units/Poacher.cfg:25 data/units/Princess.cfg:24
+#: data/units/Princess.cfg:62 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:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
@@ -3596,16 +3632,30 @@
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:20
 #: data/units/Swordsman.cfg:20 data/units/Thief.cfg:20
 #: data/units/Trapper.cfg:25 data/units/Vampire_Bat.cfg:20
-#: data/units/Vampire_Lady.cfg:20 data/units/White_Mage.cfg:29
+#: data/units/Vampire_Lady.cfg:21 data/units/White_Mage.cfg:29
 #: data/units/White_Mage.cfg:88 data/units/Wolf_Rider.cfg:21
 #: data/units/Wraith.cfg:20 data/units/Young_Ogre.cfg:19
 msgid "blade"
 msgstr "Klinge"
 
+#: 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:493
+msgid "backstab"
+msgstr ""
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "Messer"
 
+#: 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:38 data/units/Necrophage.cfg:24
+#: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
+msgid "poison"
+msgstr "Vergiften"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandit"
@@ -3628,16 +3678,16 @@
 msgid "mace"
 msgstr "Streitkolben"
 
-#: data/units/Battle_Princess.cfg:3 data/units/Battle_Princess.cfg:41
-#: data/units/Princess.cfg:3 data/units/Princess.cfg:41
-msgid "Princess"
+#: data/units/Battle_Princess.cfg:3 data/units/Princess.cfg:3
+#, fuzzy
+msgid "female^Princess"
 msgstr "Prinzessin"
 
-#: data/units/Battle_Princess.cfg:17 data/units/Battle_Princess.cfg:55
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:19
+#: data/units/Battle_Princess.cfg:20
 #, fuzzy
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
@@ -3652,7 +3702,7 @@
 "haben und auf einem benachbartem Feld stehen erhalten einen Bonus im Kampf. "
 "Die Prinzessin ignoriert Zonen der feindlichen Kontrolle."
 
-#: data/units/Battle_Princess.cfg:22 data/units/Battle_Princess.cfg:60
+#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
 #: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
@@ -3676,18 +3726,22 @@
 #: data/units/Longbowman.cfg:21 data/units/Lord.cfg:22 data/units/Lord.cfg:85
 #: data/units/Master_Bowman.cfg:20 data/units/Noble_Commander.cfg:23
 #: data/units/Noble_Fighter.cfg:20 data/units/Noble_Lord.cfg:22
-#: data/units/Ogre.cfg:18 data/units/Orcish_Grunt.cfg:19
+#: data/units/Ogre.cfg:19 data/units/Orcish_Grunt.cfg:19
 #: data/units/Orcish_Leader.cfg:21 data/units/Orcish_Ruler.cfg:21
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
-#: data/units/Princess.cfg:22 data/units/Princess.cfg:60
+#: data/units/Princess.cfg:23 data/units/Princess.cfg:61
 #: 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 "Schwert"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Prinzessin"
+
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -3702,9 +3756,9 @@
 "haben und auf einem benachbartem Feld stehen erhalten einen Bonus im Kampf. "
 "Die Prinzessin ignoriert Zonen der feindlichen Kontrolle."
 
-#: data/units/Battle_Princess.cfg:76 data/units/Commander.cfg:120
+#: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
-#: data/units/Princess.cfg:76
+#: data/units/Princess.cfg:77
 msgid "scepter of fire"
 msgstr "Zepter des Feuers"
 
@@ -3798,7 +3852,13 @@
 #: 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:22
+#: data/units/Merman.cfg:20 data/units/Merman_Entangler.cfg:19
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:23
+#: data/units/Merman_Hunter.cfg:19 data/units/Merman_Hunter.cfg:27
+#: data/units/Merman_Javelineer.cfg:19 data/units/Merman_Javelineer.cfg:27
+#: data/units/Merman_Lord.cfg:22 data/units/Merman_Netcaster.cfg:19
+#: data/units/Merman_Spearman.cfg:19 data/units/Merman_Spearman.cfg:27
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Warrior.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:41 data/units/Orcish_Crossbowman.cfg:39
@@ -3807,7 +3867,7 @@
 #: 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:16
+#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
 #: 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
@@ -3815,7 +3875,7 @@
 #: 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:17 data/units/Trapper.cfg:42
-#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:34
+#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:35
 #: data/units/Wall_Guard.cfg:36 data/units/Watch_Tower.cfg:18
 msgid "pierce"
 msgstr "Stich"
@@ -3892,6 +3952,14 @@
 msgid "web"
 msgstr "Netz"
 
+#: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:44
+#: 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
+#: data/units/Merman_Entangler.cfg:29 data/units/Merman_Netcaster.cfg:29
+msgid "slow"
+msgstr "Verlangsamen"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Knochenreiter"
@@ -3913,13 +3981,24 @@
 #: 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/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
+#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
+#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
+#: data/units/Merman_Spearman.cfg:26 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 "Speer"
 
+#: 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:365
+#: src/actions.cpp:484
+msgid "charge"
+msgstr "Ansturm"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Gorgonit"
@@ -3938,6 +4017,11 @@
 msgid "gaze"
 msgstr "Blick"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "Versteinern"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Feldherr"
@@ -4016,17 +4100,18 @@
 msgstr "Frostwelle"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Dunkle Königin"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 msgid ""
 "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 ""
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "Zepter"
 
@@ -4312,6 +4397,12 @@
 "weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
+#: data/units/Drake_Slasher.cfg:42 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 "Erstschlag"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Drake Krieger"
@@ -4363,6 +4454,10 @@
 msgid "berserker frenzy"
 msgstr "Raserei"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr ""
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Zwergen Drachenwächter"
@@ -4539,6 +4634,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Zwergen Ulfserker"
 
+#: data/units/Dwarvish_Ulfserker.cfg:16
+msgid ""
+"Dwarves are an ancient race of powerful fighters. Ulfserkers are the most "
+"ferocious of these in battle: they attack without stopping fighting until "
+"either their enemy or they are dead, no matter how many wounds they receive."
+msgstr ""
+
 #: data/units/Elder_Mage.cfg:3
 msgid "Elder Mage"
 msgstr "Alter Magier"
@@ -4571,7 +4673,7 @@
 "can quickly heal themselves in the face of tremendous injuries."
 msgstr ""
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr "Elfenbogenschütze"
 
@@ -4586,7 +4688,12 @@
 "schnell und zielsicher abzufeuern sind diese Bogenschützen ein sehr "
 "wichtiger Bestandteil der Elfentruppen."
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Elfenbogenschütze"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Elfenrächer"
 
@@ -4602,6 +4709,11 @@
 "weil sie in den Wäldern solange unsichtbar sind bis sie ihre Feinde aus dem "
 "Hinterhalt angreifen."
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Elfenrächer"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Elfenhauptmann"
@@ -4631,7 +4743,8 @@
 "sehr großen Schaden im Nahkampf wie im Fernkampf."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Elfendruidin"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4654,7 +4767,8 @@
 msgstr "Dornen"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Elfenmystikerin"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4716,10 +4830,18 @@
 "als auch mit verheerenden Feuerbällen aus der Distanz."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
-msgstr ""
+#, fuzzy
+msgid "female^Elvish Lady"
+msgstr "Elfenbaron"
 
 #: data/units/Elvish_Lady.cfg:17
+msgid ""
+"Elvish lady Parandra is one of the most respected elves ever. Her ability to "
+"see through the fogs of destiny has gained her a wisely used authority among "
+"her people, guiding them in times of uncertainty."
+msgstr ""
+
+#: data/units/Elvish_Lady.cfg:19
 #, fuzzy
 msgid "shove"
 msgstr "BP"
@@ -4736,7 +4858,7 @@
 "Elfenbarone sind fürchterliche Gegner, sowohl im Nahkampf mit dem Schwert "
 "als auch mit verheerenden Feuerbällen aus der Distanz."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Elfenlangbogenschütze"
 
@@ -4759,6 +4881,17 @@
 msgid "longbow"
 msgstr "Langbogen"
 
+#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
+#: data/units/Elvish_Sharpshooter.cfg:40
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+msgid "marksman"
+msgstr "Schießkunst"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Elfenlangbogenschütze"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Elfenmarschall"
@@ -4791,7 +4924,7 @@
 "Rückschlag haben. Diese Kämpfer sind sowohl im Schwertkampf als auch im "
 "Umgang mit dem Bogen ausgebildet."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Elfenwaldhüter"
 
@@ -4808,6 +4941,11 @@
 "im Wald solange für ihre Gegner unsichtbar, bis sie angreifen oder sich die "
 "Gegner auf einem benachbartem Feld befinden."
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Elfenwaldhüter"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Elfenreiter"
@@ -4835,7 +4973,8 @@
 "es ihnen an können."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Elfenschamanin"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4850,7 +4989,7 @@
 "Elfenschamaninnen über grundlegende Heilkenntnisse und können so 
befreundete "
 "Einheiten, die auf einem benachbarten Feld stehen, heilen."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Elfenscharfschütze"
 
@@ -4866,8 +5005,14 @@
 "auch wenn sie sehr schnell hintereinander schießen. Sie sind bestens "
 "geeignet, Gegner auszulöschen die sich verschanzt haben."
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Elfenscharfschütze"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Waldfee"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4886,7 +5031,8 @@
 msgstr "Feenhauch"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Elfenzauberin"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4898,7 +5044,8 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Sylphide"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -5006,7 +5153,15 @@
 msgid "Galleon"
 msgstr "Galleone"
 
-#: data/units/Galleon.cfg:17
+#: data/units/Galleon.cfg:16
+msgid ""
+"Even people happily living in their home eventually need some kind of "
+"transport through the seas, even if they only go fishing or to trade goods. "
+"The galleon is perfect for this purpose: it's fast and resilient, but not "
+"prepared to fight, and is able to adapt to many different tasks."
+msgstr ""
+
+#: data/units/Galleon.cfg:18
 msgid "dummy"
 msgstr ""
 
@@ -5116,12 +5271,6 @@
 "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 "Erstschlag"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Kobold Raubritter"
@@ -5158,7 +5307,8 @@
 msgid "torch"
 msgstr "Fackel"
 
-#: data/units/Goblin_Pillager.cfg:35
+#: data/units/Goblin_Pillager.cfg:35 data/units/Merman_Entangler.cfg:26
+#: data/units/Merman_Netcaster.cfg:26
 msgid "net"
 msgstr "Netz"
 
@@ -5208,7 +5358,7 @@
 "serving beneath them."
 msgstr ""
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 msgid "Great Mage"
 msgstr "Großmagier"
 
@@ -5220,17 +5370,15 @@
 "Hohe Magier sind eindrucksvolle und furchteinflößende Gegner, ihre Kräfte "
 "übersteigen sogar noch die der Erzmagier."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Großmagier"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr ""
 
-#: 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_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
-#: data/units/Troll_Whelp.cfg:7
-msgid "regenerates"
-msgstr "Regeneration"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -5453,7 +5601,7 @@
 "niedrigerem Rang, die auf einem benachbartem Feld stehen erhalten einen "
 "Bonus im Kampf."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Magier"
 
@@ -5474,11 +5622,16 @@
 msgid "missile"
 msgstr "Magiegeschoss"
 
-#: data/units/Mage_of_Light.cfg:3 data/units/Mage_of_Light.cfg:66
+#: data/units/Mage.cfg:70
+msgid "female^Mage"
+msgstr ""
+
+#: data/units/Mage_of_Light.cfg:3
 msgid "Mage of Light"
 msgstr "Magier des Lichtes"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr ""
 
@@ -5500,16 +5653,23 @@
 "der Dämmerung."
 
 #: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
+#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
 #: data/units/White_Mage.cfg:44 data/units/White_Mage.cfg:103
 msgid "lightbeam"
 msgstr "Heiliges Licht"
 
 #: data/units/Mage_of_Light.cfg:46 data/units/Mage_of_Light.cfg:106
+#: data/units/Mermaid_Diviner.cfg:35 data/units/Mermaid_Priestess.cfg:33
 #: data/units/Paladin.cfg:26 data/units/White_Mage.cfg:45
 #: data/units/White_Mage.cfg:104
 msgid "holy"
 msgstr "Heilig"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Magier des Lichtes"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Meisterbogenschütze"
@@ -5524,11 +5684,28 @@
 "ihre Fertigkeiten im Umgang mit dem Bogen werden nur noch von den Elfen "
 "übertroffen."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Wassermann"
+#: data/units/Mermaid_Diviner.cfg:3
+msgid "female^Mermaid Diviner"
+msgstr ""
+
+#: data/units/Mermaid_Diviner.cfg:23
+msgid ""
+"The most devout and pious amongst the mermaids gain the striking power of "
+"illumination, which prevents their surroundings from ever seeing true "
+"night.  Their power is a stalwart counter to the forces of darkness."
+msgstr ""
+
+#: data/units/Mermaid_Enchantress.cfg:3
+#, fuzzy
+msgid "female^Mermaid Enchantress"
+msgstr "Elfenmystikerin"
 
-#: data/units/Merman.cfg:16
+#: data/units/Mermaid_Enchantress.cfg:20 data/units/Mermaid_Siren.cfg:20
+#: data/units/Merman.cfg:16 data/units/Merman_Entangler.cfg:15
+#: data/units/Merman_Fighter.cfg:18 data/units/Merman_Hoplite.cfg:19
+#: data/units/Merman_Hunter.cfg:15 data/units/Merman_Javelineer.cfg:15
+#: data/units/Merman_Netcaster.cfg:15 data/units/Merman_Spearman.cfg:15
+#: data/units/Merman_Triton.cfg:18 data/units/Merman_Warrior.cfg:18
 msgid ""
 "Skilled creatures of the sea, Mermen are powerful and quick in any watery "
 "environment, but struggle greatly to move on land."
@@ -5536,11 +5713,98 @@
 "Wassermänner kommen aus den Tiefen des Meeres, sie sind stark und schnell in 
"
 "Meeren, Seen und Flüssen - aber sehr schlecht an Land."
 
-#: 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
+#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:31
+#: data/units/Mermaid_Siren.cfg:33 data/units/Sea_Hag.cfg:27
+msgid "water spray"
+msgstr "Peitschende Gischt"
+
+#: data/units/Mermaid_Initiate.cfg:3
+msgid "female^Mermaid Initiate"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:20
+msgid ""
+"Young Mermaids are often initiated in the water magics of their people.  "
+"Despite their frailty, this makes them formidable opponents, as they can "
+"call upon the very water about them to smite their enemies."
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:3
+msgid "female^Mermaid Priestess"
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:21
+msgid ""
+"The more learned among the mermaids often take a path of holy study.  This "
+"leaves them quite capable of ministering to the wounds of their comrades, as "
+"well as being a potent defense against the unworldly."
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:3
+msgid "female^Siren"
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:23
+#, fuzzy
+msgid "naia touch"
+msgstr "Feenhauch"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Wassermann"
+
+#: data/units/Merman.cfg:19 data/units/Merman_Fighter.cfg:21
+#: data/units/Merman_Hoplite.cfg:22 data/units/Merman_Lord.cfg:21
+#: data/units/Merman_Triton.cfg:21 data/units/Merman_Triton.cfg:33
+#: data/units/Merman_Warrior.cfg:21 data/units/Naga.cfg:20
+#: data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr "Dreizack"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "Verstrickung"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Drake Kämpfer"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Wassermann"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Wassermann"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Saurianischer Krieger"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Speerträger"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Deutsche Übersetzung"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Saurianischer Krieger"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Schlammkriecher"
@@ -5554,8 +5818,8 @@
 "greifen an indem sie siedendes Wasser auf ihre Feinde spritzen."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Seeteufel"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5607,10 +5871,6 @@
 "verächtlichen Kreaturen sind in der Lage sich Nachts zu verstecken ohne "
 "irgendwelche Spuren zu hinterlassen."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr ""
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Edler Feldherr"
@@ -5654,7 +5914,7 @@
 msgid "Ogre"
 msgstr "Oger"
 
-#: data/units/Ogre.cfg:15
+#: data/units/Ogre.cfg:16
 msgid ""
 "Ogres are stupid giant humanoids that usually live alone in the wilderness. "
 "While they can be easily outrun or outsmarted, their strength is not to be "
@@ -5800,7 +6060,7 @@
 "zu heilen."
 
 #: data/units/Orcish_Shaman.cfg:25 data/units/Orcish_Shaman.cfg:68
-#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:33
+#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:34
 msgid "curse"
 msgstr "Fluch"
 
@@ -5906,7 +6166,7 @@
 "der Orkkriger siegreich hervor, doch nützen ihm seine beiden Schwerter wenig 
"
 "gegen einen Pfeilhagel."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Geächteter"
 
@@ -5914,6 +6174,11 @@
 msgid "Outlaws fight better at night."
 msgstr "Geächtete kämpfen bei Nacht besser als am Tag."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Geächteter"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
@@ -5921,7 +6186,8 @@
 "besonders guten Eindruck."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Geächtete Prinzessin"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5938,7 +6204,8 @@
 "Königreich zu gründen."
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Geächtete Königin"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -6018,7 +6285,14 @@
 msgid "Pirate Galleon"
 msgstr "Piraten-Galleone"
 
-#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
+#: data/units/Pirate_Galleon.cfg:14
+msgid ""
+"Pirate galleons are to transport ships what wolves are to sheeps. Ships full "
+"of goods shouldn't be lonely, far away from any land, better to help them to "
+"avoid it being sunk from overloading..."
+msgstr ""
+
+#: data/units/Pirate_Galleon.cfg:16 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr "Ballista"
@@ -6035,7 +6309,7 @@
 "Wilddiebe verlassen sich auf ihre Jagderfahrung und kämpfen am besten Nachts 
"
 "und in Wäldern und Sümpfen."
 
-#: data/units/Princess.cfg:19 data/units/Princess.cfg:57
+#: data/units/Princess.cfg:20 data/units/Princess.cfg:58
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@@ -6050,7 +6324,7 @@
 "haben und auf einem benachbartem Feld stehen erhalten einen Bonus im Kampf. "
 "Die Prinzessin ignoriert Zonen der feindlichen Kontrolle."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Roter Magier"
 
@@ -6065,6 +6339,11 @@
 "auch bei Nacht gleich gut kämpfen sind sie in fast jeder Situation wertvolle 
"
 "Mitstreiter."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Roter Magier"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Wiedergänger"
@@ -6184,13 +6463,14 @@
 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 "
+"valued as scouts as they 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"
+#, fuzzy
+msgid "female^Sea Hag"
 msgstr "Seefurie"
 
 #: data/units/Sea_Hag.cfg:17
@@ -6201,10 +6481,6 @@
 "Seefurien sind ältere und erfahrenere Seeteufel, die gelernt haben mit Magie 
"
 "das Wasser zu beherrschen und es gegen ihre Feinde einzusetzen."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "Peitschende Gischt"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Seeork"
@@ -6279,7 +6555,7 @@
 "sich nur langsam fortbewegen, sind sie sehr stark und werden in ganz Wesnoth "
 "und sogar in angrenzenden Ländern gefürchtet."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Silberner Magier"
 
@@ -6293,10 +6569,24 @@
 "allen befreundeten Dörfern hin und her Teleportieren, außerdem sind sie 
sehr "
 "Widerstandsfähig gegen die meisten magischen Angriffe."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Silberner Magier"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Skelettdrache"
 
+#: data/units/Skeletal_Dragon.cfg:17
+msgid ""
+"Long ago one of the mightiest living creatures, the feared Dragon has become "
+"only bones and dark sinew. Long after its death, it was raised through the "
+"dark powers of necromancy, which it now serves. The Skeletal Dragon may look "
+"like nothing more than a pile of bones, but few people who thought that way "
+"lived long enough to change their minds."
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr "Kiefer"
@@ -6367,6 +6657,10 @@
 "Diese wandelnden Leichen sind durch die Erfahrungen im Kampf gegen die "
 "Lebenden stärker geworden."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr ""
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Speerträger"
@@ -6587,10 +6881,11 @@
 "Fledermaus."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Vampirin"
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
 "the blood of the living."
@@ -6598,7 +6893,7 @@
 "Wunderschön aber kalt, erhält sie ihr jugendliches Angesicht dadurch das 
sie "
 "das Blut der Lebenden trinkt."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "Kuss des Blutes"
 
@@ -6660,7 +6955,7 @@
 "Beobachtungstürme werden genutzt um herannahende Feinde ausfindig zu machen, 
"
 "um danach verschiedene Geschosse mit Ballistas auf sie zu feuern."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Weisser Magier"
 
@@ -6677,6 +6972,11 @@
 "würden. In Kämpfen gegen Untote sind Weiße Magier mit ihrem Heiligen Licht 
"
 "mächtige Kämpfer die hohen Schaden anrichten."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Weisser Magier"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Wolfreiter"
@@ -6894,7 +7194,7 @@
 msgid "+ Bots"
 msgstr "+Bots"
 
-#: src/about.cpp:276 src/help.cpp:2372 src/show_dialog.cpp:472
+#: src/about.cpp:276 src/help.cpp:2350 src/show_dialog.cpp:491
 msgid "Close"
 msgstr "Schließen"
 
@@ -6916,73 +7216,73 @@
 msgid "none"
 msgstr ""
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "Grundschaden"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "Resistenz des Angreifers gegen"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "Verwundbarkeit des Angreifers gegen"
 
-#: src/actions.cpp:363 src/actions.cpp:481 src/actions.cpp:490
+#: src/actions.cpp:365 src/actions.cpp:484 src/actions.cpp:493
 msgid "Doubled"
 msgstr "Verdoppelt"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "Gesamtschaden"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "Resistenz des Verteidigers gegen"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "Verwundbarkeit des Verteidigers gegen"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Halbiert"
 
-#: src/actions.cpp:714 src/actions.cpp:861 src/display.cpp:917
+#: src/actions.cpp:716 src/actions.cpp:862 src/display.cpp:917
 #: src/reports.cpp:115
 msgid "poisoned"
 msgstr "vergiftet"
 
-#: src/actions.cpp:719 src/actions.cpp:866 src/display.cpp:913
+#: src/actions.cpp:721 src/actions.cpp:867 src/display.cpp:913
 #: src/reports.cpp:110
 msgid "slowed"
 msgstr "verlangsamt"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr ""
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Verbündete Einheit gesichtet!"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Gegnerische Einheit gesichtet!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends verbündete Einheiten gesichtet!"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies gegnerische Einheiten gesichtet!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Einheiten gesichtet! ($friends verbündete, $enemies gegnerische)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr ""
 
@@ -7042,7 +7342,7 @@
 msgid "replay"
 msgstr ""
 
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1384
+#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1385
 msgid "Turn"
 msgstr "Runde"
 
@@ -7104,23 +7404,23 @@
 msgid "Profile"
 msgstr "Profil"
 
-#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:567
-#: src/playturn.cpp:1793
+#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:564
+#: src/playturn.cpp:1794
 msgid "level"
 msgstr "Stufe"
 
-#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:622
-#: src/playturn.cpp:1958 src/unit.cpp:1070
+#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:613
+#: src/playturn.cpp:1959 src/unit.cpp:1070
 msgid "Moves"
 msgstr "BP"
 
-#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:230
+#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:230
 msgid "melee"
 msgstr "Nahkampf"
 
-#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:231
+#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:231
 msgid "ranged"
 msgstr "Fernkampf"
 
@@ -7140,11 +7440,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Möchtet Ihr den Spielverlauf dieses Szearios speichern?"
 
-#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1393
+#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1394
 msgid "Name:"
 msgstr "Name:"
 
-#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1410
+#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1411
 msgid "The game could not be saved"
 msgstr "Der Spielstand konnte nicht gespeichert werden"
 
@@ -7208,8 +7508,8 @@
 #: src/game.cpp:999 src/game.cpp:1014 src/game.cpp:1020 src/game.cpp:1053
 #: src/game.cpp:1082 src/game.cpp:1096 src/game.cpp:1098 src/game.cpp:1100
 #: src/game.cpp:1112 src/game.cpp:1115 src/game.cpp:1150 src/game.cpp:1152
-#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1396
-#: src/playturn.cpp:1410
+#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1397
+#: src/playturn.cpp:1411
 msgid "Error"
 msgstr "Fehler"
 
@@ -7274,7 +7574,7 @@
 msgstr ""
 
 #: src/game.cpp:1112 src/game.cpp:1150 src/game.cpp:1174
-#: src/multiplayer_client.cpp:42 src/multiplayer_client.cpp:314
+#: src/multiplayer_client.cpp:45 src/multiplayer_client.cpp:319
 msgid "Connection timed out"
 msgstr ""
 
@@ -7335,7 +7635,7 @@
 msgid "Play a game against AI opponents"
 msgstr ""
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr "Euer Name"
 
@@ -7355,79 +7655,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr ""
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr ""
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr ""
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Benötigte EP"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "Attacken"
 
-#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1955
+#: src/help.cpp:636 src/help.cpp:637 src/playturn.cpp:1956
 msgid "Name"
 msgstr "Name"
 
-#: src/help.cpp:649 src/help.cpp:650 src/playturn.cpp:1954
+#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1955
 msgid "Type"
 msgstr "Typ"
 
-#: src/help.cpp:653 src/help.cpp:654 src/unit_types.cpp:302
+#: src/help.cpp:644 src/help.cpp:645 src/unit_types.cpp:302
 msgid "Dmg"
 msgstr "Schaden"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Attacken"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Reichweite"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr ""
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Resistenztabelle"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Angriffsart"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Resistenz"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Gelände Einschränkungen"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Gelände"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Verteidigung"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Zurück"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Vorwärts >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Hilfe zu Battle for Wesnoth"
 
@@ -7439,7 +7739,7 @@
 msgid "End Unit Turn"
 msgstr ""
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Herrführer"
 
@@ -7475,11 +7775,11 @@
 msgid "Unit Description"
 msgstr "Einheitenbeschreibung"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Einheit umbenennen"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Ausbilden"
 
@@ -7487,7 +7787,7 @@
 msgid "Repeat Recruit"
 msgstr "Ausbilden wiederholen"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Einberufen"
 
@@ -7523,11 +7823,11 @@
 msgid "Scenario Objectives"
 msgstr "Missionsziele"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Einheitenübersicht"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -7635,7 +7935,7 @@
 msgid "Speak to All"
 msgstr "Zu allen sprechen"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Hilfe"
 
@@ -7695,7 +7995,7 @@
 msgid "Bump Size"
 msgstr "Hügelgrösse"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Dörfer"
 
@@ -7745,16 +8045,12 @@
 "Feindliche Einheiten werden erst sichtbar, wenn sie in Reichweite der "
 "Eigenen sind"
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Schleier der Finsternis"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr ""
 "Die Karte ist verdeckt, bis sie von befreundeten Einheiten erkundet wurde"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Beobachter"
 
@@ -7762,13 +8058,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Erlaubt es das Spiel als Unbeteiligter zu betrachten"
 
-#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:145
-#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:460
-#: src/show_dialog.cpp:466
+#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:148
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:479
+#: src/show_dialog.cpp:485
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/multiplayer.cpp:120 src/show_dialog.cpp:446 src/show_dialog.cpp:459
+#: src/multiplayer.cpp:120 src/show_dialog.cpp:465 src/show_dialog.cpp:478
 msgid "Ok"
 msgstr "Okay"
 
@@ -7842,70 +8138,70 @@
 msgid "Warning"
 msgstr "Warnung"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:121 src/multiplayer_connect.cpp:386
-#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1531
-#: src/playturn.cpp:1536 src/playturn.cpp:1623
+#: src/multiplayer_client.cpp:124 src/multiplayer_connect.cpp:386
+#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1532
+#: src/playturn.cpp:1537 src/playturn.cpp:1624
 msgid "Gold"
 msgstr "Gold"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Mit Kampagnenserver verbinden"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr ""
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Verbinde zum Server/Gastgeber..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr ""
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Empfange Spieldaten..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Es sind keine Plätze in dieser Partie verfügbar."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Wählt Eure Fraktion:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Das Spiel wurde vom Spielleiter abgebrochen."
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr ""
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:683 src/multiplayer_client.cpp:686
+#: src/multiplayer_client.cpp:688 src/multiplayer_client.cpp:691
 msgid "?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:777
+#: src/multiplayer_client.cpp:782
 msgid "Leader: "
 msgstr "Herrführer:"
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr "Eiheiten:"
 
@@ -7937,8 +8233,8 @@
 msgid "Local Player"
 msgstr "Lokaler Spieler"
 
-#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:498
-#: src/multiplayer_connect.cpp:621 src/multiplayer_connect.cpp:727
+#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:496
+#: src/multiplayer_connect.cpp:610 src/multiplayer_connect.cpp:716
 msgid "Computer Player"
 msgstr "Computer"
 
@@ -8003,7 +8299,7 @@
 msgid "Color"
 msgstr "Farbe"
 
-#: src/multiplayer_connect.cpp:570 src/multiplayer_connect.cpp:574
+#: src/multiplayer_connect.cpp:559 src/multiplayer_connect.cpp:563
 msgid "Waiting for network players to join"
 msgstr ""
 
@@ -8087,56 +8383,56 @@
 msgid "It is now your turn"
 msgstr "Ihr seid an der Reihe"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Angreifer"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Verteidiger"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Schadensberechnung"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Nahkampf"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "gegen"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Gegner angreifen"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Waffe auswählen"
 
-#: src/playturn.cpp:1125
+#: src/playturn.cpp:1126
 msgid ""
 "You have not started your turn yet.  Do you really want to end your turn?"
 msgstr ""
 "Ihr habt Euren Zug noch nicht begonnen. Wollt Ihr diese Runde wirklich schon "
 "beenden?"
 
-#: src/playturn.cpp:1134 src/playturn.cpp:1139
+#: src/playturn.cpp:1135 src/playturn.cpp:1140
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr ""
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 "Der Spielstand konnte nicht automatisch gespeichert werden. Ihr solltet den "
 "Spielstand manuell speichern."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -8144,41 +8440,41 @@
 "Der Name eines Spielstands darf folgende Zeichen nicht enthalten: »/«, 
»\\« "
 "und »:«. Bitte verwendet einen anderen Namen."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr ""
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Der Spielstand wurde gespeichert"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Einkommen"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Ausgaben"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr ""
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Einheit auswählen"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Ihr verfügt nicht über genug Gold, um diese Einheit auszubilden."
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1730
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1731
+#: src/playturn.cpp:1732
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
@@ -8186,19 +8482,19 @@
 "Diese Einheit steht kurz vor dem Stufenaufstieg! Wollt Ihr $noun wirklich "
 "entlassen?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr ""
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr ""
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Ihr seid von Euren Soldaten getrennt und könnt diese nicht 
einberufen."
 
-#: src/playturn.cpp:1779
+#: src/playturn.cpp:1780
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
@@ -8206,91 +8502,91 @@
 "Ihr verfügt über keine Truppen, die Ihr einberufen könntet.\n"
 "(Ihr benötigt überlebende Veteranen aus früheren Szenarien)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 "Ihr benötigt mindestens $cost Goldstücke, um eine Einheit einberufen zu "
 "können."
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Einheit entlassen"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Nachricht"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Nur an Verbündete senden"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Standort"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Ausgebildet"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Einberufungen"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Stufenaufstiege"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Verluste"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Tötungen"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Verursachter Schaden"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Erhaltener Schaden"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Suchen"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Befehl:"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Gesprächsprotokoll"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr ""
 "Eine Beschriftung oder Einheit, deren Name »$search« enthält, konnte nicht 
"
 "gefunden werden."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Beschriftung erstellen"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Beschriftung"
 
-#: src/playturn.cpp:2421
+#: src/playturn.cpp:2422
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
@@ -8298,23 +8594,23 @@
 "Das Spiel läuft nicht mehr syncron und muss beendet werden. Möchtet Ihr "
 "einen Fehlerbericht dieses Spiels abspeichern?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Durch Computer ersetzen"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Durch lokalen Spieler ersetzen"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Spiel abbrechen"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Ersetzen durch "
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "hat das Spiel verlassen. Was wollt Ihr tun?"
 
@@ -8366,63 +8662,63 @@
 msgid "Chaotic units"
 msgstr "Lichtscheue Einheiten"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Eigenes Dorf"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Gegnerisches Dorf"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Verbündetes Dorf"
 
-#: src/show_dialog.cpp:934
+#: src/show_dialog.cpp:953
 msgid "KB"
 msgstr "KB"
 
-#: src/titlescreen.cpp:149
+#: src/titlescreen.cpp:155
 msgid "Version"
 msgstr "Version"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Einführung"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Kampagnen"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Mehrspieler"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Laden"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Sprache"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Einstellungen"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Beenden"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Führt in die Grundzüge des Spieles ein"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Eine neue Einzelspielerkampagne starten"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -8430,31 +8726,31 @@
 "Mehrspielerpartie (Hotseat, LAN, Internet) / ein Szenario gegen den Computer "
 "spielen"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Einzelspieler Spielstand laden"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Spracheinstellungen ändern"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Globale Einstellungen des Spiels verändern"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Mitwirkende anzeigen"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Das Spiel beenden"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Nächste Seite"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Das Buch von Wesnoth"
 
@@ -8462,15 +8758,15 @@
 msgid "strikes"
 msgstr "Attacken"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "lichtscheu"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "redlich"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutral"
 
@@ -8482,6 +8778,18 @@
 msgid "Deletion of the file failed."
 msgstr ""
 
+#~ msgid "first strike"
+#~ msgstr "Erstschlag"
+
+#~ msgid "Swamp"
+#~ msgstr "Sumpf"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Seeteufel"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Mehrspielerpartie eröffnen"
 
Index: wesnoth/po/wesnoth/el_GR.po
diff -u wesnoth/po/wesnoth/el_GR.po:1.5 wesnoth/po/wesnoth/el_GR.po:1.6
--- wesnoth/po/wesnoth/el_GR.po:1.5     Wed Oct 20 12:14:35 2004
+++ wesnoth/po/wesnoth/el_GR.po Thu Oct 21 20:22:40 2004
@@ -8,7 +8,7 @@
 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-10-17 14:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-10-03 15:21+0200\n"
 "Last-Translator: Konstantinos Karasavvas <address@hidden>\n"
 "Language-Team: Greek <address@hidden>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "πιστή"
 
@@ -49,11 +49,11 @@
 msgid "Traits"
 msgstr ""
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Μονάδες"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Ικανότητες"
 
@@ -139,7 +139,7 @@
 "Upkeep'</ref> for more information."
 msgstr ""
 
-#: data/help.cfg:84 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:84 src/help.cpp:747 src/help.cpp:748
 msgid "Movement"
 msgstr "Κίνηση"
 
@@ -373,7 +373,7 @@
 "fun, and good luck!"
 msgstr ""
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr ""
 
@@ -613,7 +613,7 @@
 msgstr ""
 
 #: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:196
-#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:658
+#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:663
 msgid "&random-enemy.png,Random"
 msgstr ""
 
@@ -728,6 +728,21 @@
 msgid "Random map"
 msgstr ""
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+msgid "Random map (Desert)"
+msgstr ""
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+msgid "Random map (Marsh)"
+msgstr ""
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+msgid "Random map (Winter)"
+msgstr ""
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr ""
@@ -767,7 +782,7 @@
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/Basic_Training.cfg:276
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
-#: src/show_dialog.cpp:453
+#: src/show_dialog.cpp:472
 msgid "No"
 msgstr ""
 
@@ -1229,7 +1244,7 @@
 
 #: data/scenarios/tutorial/Basic_Training.cfg:262
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
-#: src/show_dialog.cpp:452
+#: src/show_dialog.cpp:471
 msgid "Yes"
 msgstr ""
 
@@ -1660,6 +1675,111 @@
 msgid "Underground"
 msgstr ""
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Καλυμμένος Χάρτης"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Βαθιά Νερά"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Ρηχά Νερά"
+
+#: data/terrain.cfg:39 data/terrain.cfg:60 data/terrain.cfg:139
+#: data/terrain.cfg:148 data/terrain.cfg:166 data/terrain.cfg:229
+#: src/reports.cpp:309
+msgid "Village"
+msgstr "Χωριό"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Ρηχά Νερά"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Πάγος"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Γέφυρα"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Άμμος"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Δρόμος"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Χώμα"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Λιβάδι"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Σκιά"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Λόφοι"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Βουνά"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Δάσος"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Τοίχωμα Σπηλιάς"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Σπηλιά"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Κάστρο"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Στρατόπεδο"
+
+#: data/terrain.cfg:258
+msgid "Dwarven castle"
+msgstr ""
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Πύργος"
+
+#: data/terrain.cfg:288
+msgid "Canyon"
+msgstr ""
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr ""
@@ -1673,14 +1793,14 @@
 msgstr "Τέλος Γύρου"
 
 #: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:670
-#: src/display.cpp:941 src/help.cpp:621 src/playturn.cpp:1956
+#: src/display.cpp:941 src/help.cpp:612 src/playturn.cpp:1957
 #: src/unit.cpp:1034
 msgid "HP"
 msgstr ""
 
 #: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:674
 #: src/dialogs.cpp:682 src/display.cpp:945 src/display.cpp:953
-#: src/playturn.cpp:1795 src/playturn.cpp:1957 src/unit.cpp:1093
+#: src/playturn.cpp:1796 src/playturn.cpp:1958 src/unit.cpp:1093
 msgid "XP"
 msgstr ""
 
@@ -1746,24 +1866,30 @@
 "Night: +25% Damage"
 msgstr ""
 
-#: data/translations/english.cfg:23
+#: data/translations/english.cfg:21
 msgid ""
-"Heals:\n"
-"Allows the unit to heal adjacent friendly units at the beginning of the "
-"turn.\n"
+"Ambush:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"A unit cared for by a healer may heal up to 4 HP per turn.\n"
-"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
-"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
-"care of a village or a unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 msgstr ""
+"Ενέδρα:\n"
+"Αυτή η μονάδα μπορεί να κρυφτεί σε δάσος 
και να μείνει αθέατη από τους "
+"εχθρούς της.\n"
+"\n"
+"Οι εχθρικές μονάδες δε μπορούν να δουν 
ούτε να επιτεθούν αυτή τη μονάδα όταν "
+"είναι σε δάσος εκτός αν η μονάδα επιτεθεί 
όπου εμφανίζεται ή αν υπάρχουν "
+"εχθρικές μονάδες δίπλα από αυτή τη μονάδα."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "γιατρεύει"
+#: data/translations/english.cfg:23 data/units/Elvish_Avenger.cfg:18
+#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
+#: data/units/Elvish_Ranger.cfg:94
+msgid "ambush"
+msgstr "ενέδρα"
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 msgid ""
 "Cures:\n"
 "This unit combines herbal remedies with magic to heal units more quickly "
@@ -1777,24 +1903,45 @@
 "additional healing on the turn it is cured of the poison."
 msgstr ""
 
-#: data/translations/english.cfg:35 data/units/Elvish_Druid.cfg:19
-#: data/units/Elvish_Shyde.cfg:19 data/units/White_Mage.cfg:12
-#: data/units/White_Mage.cfg:71
+#: data/translations/english.cfg:33 data/units/Elvish_Druid.cfg:19
+#: data/units/Elvish_Shyde.cfg:19 data/units/Mermaid_Priestess.cfg:7
+#: data/units/White_Mage.cfg:12 data/units/White_Mage.cfg:71
 msgid "cures"
 msgstr "θεραπεύει"
 
-#: data/translations/english.cfg:38
+#: data/translations/english.cfg:40
 msgid ""
-"Teleport:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heals:\n"
+"Allows the unit to heal adjacent friendly units at the beginning of the "
+"turn.\n"
+"\n"
+"A unit cared for by a healer may heal up to 4 HP per turn.\n"
+"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
+"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
+"care of a village or a unit that can cure."
 msgstr ""
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "τηλεμεταφορά"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "γιατρεύει"
+
+#: data/translations/english.cfg:47
+msgid ""
+"Illuminates:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
+msgstr ""
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "φωτίζει,θεραπεύει"
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -1803,7 +1950,7 @@
 "Adjacent friendly units of lower level will do more damage in battle."
 msgstr ""
 
-#: data/translations/english.cfg:47 data/units/Commander.cfg:11
+#: data/translations/english.cfg:56 data/units/Commander.cfg:11
 #: data/units/Commander.cfg:86 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
@@ -1812,525 +1959,360 @@
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
 #: data/units/Noble_Commander.cfg:10 data/units/Noble_Lord.cfg:10
 #: 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:353 src/actions.cpp:471
+#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
+#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:355 src/actions.cpp:474
 msgid "leadership"
 msgstr "ηγεσία"
 
-#: data/translations/english.cfg:52
+#: data/translations/english.cfg:59
 msgid ""
-"Ambush:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
+"Loyal:\n"
+"Never more than 1 upkeep."
 msgstr ""
-"Ενέδρα:\n"
-"Αυτή η μονάδα μπορεί να κρυφτεί σε δάσος 
και να μείνει αθέατη από τους "
-"εχθρούς της.\n"
-"\n"
-"Οι εχθρικές μονάδες δε μπορούν να δουν 
ούτε να επιτεθούν αυτή τη μονάδα όταν "
-"είναι σε δάσος εκτός αν η μονάδα επιτεθεί 
όπου εμφανίζεται ή αν υπάρχουν "
-"εχθρικές μονάδες δίπλα από αυτή τη μονάδα."
 
-#: data/translations/english.cfg:54 data/units/Elvish_Avenger.cfg:18
-#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
-#: data/units/Elvish_Ranger.cfg:94
-msgid "ambush"
-msgstr "ενέδρα"
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
+msgstr ""
 
-#: data/translations/english.cfg:59
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "νυχτοκυνηγός"
+
+#: data/translations/english.cfg:69
 msgid ""
-"Illuminates:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
+"Regenerates:\n"
+"The unit will heal itself 8 hp per turn. If it is poisoned, it will remove "
+"the poison instead of healing."
 msgstr ""
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "φωτίζει,θεραπεύει"
+#: data/translations/english.cfg:71 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_Rocklobber.cfg:7
+#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+msgid "regenerates"
+msgstr "αναπλάθεται"
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 msgid ""
 "Skirmisher:\n"
 "This unit is skilled in moving past enemies quickly, and ignores all Enemy "
 "Zones of Control."
 msgstr ""
 
-#: data/translations/english.cfg:66 data/units/Assassin.cfg:16
+#: data/translations/english.cfg:76 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:19 data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr "ακροβολιστής"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr ""
-
-#: data/translations/english.cfg:72
-msgid "This unit takes half normal damage when it did not initiate the attack."
+#: data/translations/english.cfg:79
+msgid ""
+"Steadfast:\n"
+"This unit takes half normal damage when it did not initiate the attack."
 msgstr ""
 
-#: data/translations/english.cfg:74 data/units/Dwarvish_Guardsman.cfg:15
+#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
 #: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: src/actions.cpp:499
+#: data/units/Merman_Hoplite.cfg:13 src/actions.cpp:502
 msgid "steadfast"
 msgstr ""
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "τηλεμεταφορά"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "ελάχιστη ζημιά"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Παιχνίδι"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Σενάριο"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Προσαρμογή Πλευρών:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Επιλέξτε Ρυθμίσεις Ομάδας:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Η σύνδεση με τον απομακρυσμένο Η/Υ 
απέτυχε"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr ""
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr ""
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr ""
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Παρατηρητής"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr ""
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Πλήρης Οθόνη ή σε Παράθυρο;"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr ""
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Σε Παράθυρο"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Ταχύτητα:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Φυσιολογική"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Ρυθμίσεις Ήχου..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Επιλογές"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Επιλέξτε Σενάριο"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr ""
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr ""
 
-#: data/translations/english.cfg:107
+#: data/translations/english.cfg:119
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain"
 msgstr ""
 
-#: data/translations/english.cfg:108
+#: data/translations/english.cfg:120
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain"
 msgstr ""
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr ""
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr ""
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Δείτε Επίσης..."
 
-#: data/translations/english.cfg:117
+#: data/translations/english.cfg:129
 msgid ""
 "Backstab:\n"
 "This attack deals double damage if a friendly unit is on the opposite side "
 "of the target."
 msgstr ""
 
-#: data/translations/english.cfg:119 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:490
-msgid "backstab"
+#: data/translations/english.cfg:132
+msgid ""
+"Berserk:\n"
+"Whether used offensively or defensively, this attack presses the engagement "
+"until one of the combatants is slain."
 msgstr ""
 
-#: data/translations/english.cfg:122
+#: data/translations/english.cfg:135
 msgid ""
 "Charge:\n"
 "This attack deals double damage to the target. It also causes this unit to "
 "take double damage from the target's counterattack."
 msgstr ""
 
-#: data/translations/english.cfg:124 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:363 src/actions.cpp:481
-msgid "charge"
-msgstr ""
-
-#: data/translations/english.cfg:127
+#: data/translations/english.cfg:138
 msgid ""
 "Drain:\n"
 "This unit drains health from living units, healing itself for half the "
 "amount of damage it deals."
 msgstr ""
 
-#: data/translations/english.cfg:129 data/units/Ancient_Lich.cfg:24
-#: data/units/Blood_Bat.cfg:24 data/units/Dark_Spirit.cfg:24
-#: data/units/Demilich.cfg:23 data/units/Lich.cfg:24
-#: data/units/Orcish_Shaman.cfg:30 data/units/Orcish_Shaman.cfg:73
-#: data/units/Orcish_Shaman.cfg:116 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Spectre.cfg:24 data/units/Vampire_Bat.cfg:24
-#: data/units/Vampire_Lady.cfg:25 data/units/Vampire_Lady.cfg:38
-#: data/units/Wraith.cfg:24
-msgid "drain"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
 msgstr ""
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:134 data/units/Ancient_Lich.cfg:34
-#: data/units/Arch_Mage.cfg:42 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/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:64 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 data/units/Mage.cfg:39
-#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
-#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
-#: data/units/Princess.cfg:79 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 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 ""
-
-#: data/translations/english.cfg:137
+#: data/translations/english.cfg:147
 msgid ""
 "Marksman:\n"
 "When used offensively, this attack always has at least a 60% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:139 data/units/Elvish_Marksman.cfg:39
-#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
-msgid "marksman"
-msgstr "δεινός σκοπευτής"
-
-#: data/translations/english.cfg:142
+#: data/translations/english.cfg:150
 msgid ""
 "Plague:\n"
 "If this unit kills a living target and that unit was not stationed in a "
 "village, the dead target's corpse will rise up and fight for you."
 msgstr ""
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "πανούκλα"
-
-#: data/translations/english.cfg:147
-msgid ""
-"Poison:\n"
-"This attack poisons the target. Poisoned units lose 8 HP every turn until "
-"they are cured or are reduced to 1 HP."
-msgstr ""
-
-#: data/translations/english.cfg:149 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:38
-#: data/units/Necrophage.cfg:24 data/units/Orcish_Assassin.cfg:41
-#: data/units/Orcish_Slayer.cfg:46
-msgid "poison"
-msgstr "δηλητήριο"
-
-#: data/translations/english.cfg:152
-msgid ""
-"Slow:\n"
-"This attack slows the target. Slowed units move at half normal speed and "
-"receive one less attack than normal in combat for the duration of one turn."
-msgstr ""
-
-#: data/translations/english.cfg:154 data/units/Cave_Spider.cfg:38
-#: data/units/Elvish_Druid.cfg:44 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 ""
-
-#: data/translations/english.cfg:157
-msgid ""
-"Stone:\n"
-"This attack turns the target to stone. Units that have been turned to stone "
-"may not move or attack."
-msgstr ""
-
-#: data/translations/english.cfg:159 data/units/Cockatrice.cfg:26
-#: src/actions.cpp:728 src/actions.cpp:876 src/reports.cpp:122
-msgid "stone"
-msgstr ""
-
-#: data/translations/english.cfg:162
-msgid ""
-"Berserk:\n"
-"Whether used offensively or defensively, this attack presses the engagement "
-"until one of the combatants is slain."
-msgstr ""
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr ""
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr ""
-
-#: data/translations/english.cfg:172
-msgid "Elves"
-msgstr ""
-
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr ""
-
-#: data/translations/english.cfg:174
-msgid "Humans"
-msgstr ""
-
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr ""
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Βαθιά Νερά"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Ρηχά Νερά"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Άμμος"
-
-#: data/translations/english.cfg:182 data/translations/english.cfg:184
-#: data/translations/english.cfg:185 data/translations/english.cfg:186
-#: data/translations/english.cfg:187 data/translations/english.cfg:188
-#: src/reports.cpp:310
-msgid "Village"
-msgstr "Χωριό"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Βάλτος"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Τούνδρα"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Πάγος"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Δρόμος"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Χώμα"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Λιβάδι"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Λόφοι"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Βουνά"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Δάσος"
+#: data/translations/english.cfg:153
+msgid ""
+"Poison:\n"
+"This attack poisons the target. Poisoned units lose 8 HP every turn until "
+"they are cured or are reduced to 1 HP."
+msgstr ""
 
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Γέφυρα"
+#: data/translations/english.cfg:156
+msgid ""
+"Slow:\n"
+"This attack slows the target. Slowed units move at half normal speed and "
+"receive one less attack than normal in combat for the duration of one turn."
+msgstr ""
 
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Κάστρο"
+#: data/translations/english.cfg:159
+msgid ""
+"Stone:\n"
+"This attack turns the target to stone. Units that have been turned to stone "
+"may not move or attack."
+msgstr ""
 
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Πύργος"
+#: data/translations/english.cfg:162
+msgid "Elves"
+msgstr ""
 
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Σπηλιά"
+#: data/translations/english.cfg:163
+msgid "Humans"
+msgstr ""
 
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Τοίχωμα Σπηλιάς"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr ""
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Στρατόπεδο"
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr ""
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr ""
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr ""
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr ""
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr ""
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr ""
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr ""
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+msgid "$name|harbor,$name|port"
+msgstr ""
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ""
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr ""
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr ""
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr ""
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr ""
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Επόμενη συμβουλή"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Συμβουλή της Ημέρας"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr ""
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
 msgstr ""
 
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:186
 msgid ""
 "In a campaign, you can use veteran units from previous scenarios by using "
 "the 'recall' option."
 msgstr ""
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
 "Different units have weaknesses against different types of attacks. Right-"
@@ -2339,7 +2321,7 @@
 "types."
 msgstr ""
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
 "hitting them in battle. The defensive rating for the currently selected unit "
@@ -2347,7 +2329,7 @@
 "the screen."
 msgstr ""
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
 "poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -2355,83 +2337,83 @@
 "the 'cure' ability."
 msgstr ""
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
 "menu. By recalling the same units over and over, you can build up a powerful "
 "and experienced army."
 msgstr ""
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
 "unit moves into an enemy's Zone of Control, it may not move any further that "
 "turn."
 msgstr ""
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
 "itself in the terrain it is standing in, however magical attacks always have "
 "a 70% chance to hit, and marksman attacks have at least 60% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
 msgstr ""
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
 "hitpoints at the beginning of their next turn."
 msgstr ""
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
 "terrain, while most mounted units don't get any defensive advantage in "
 "villages and castles."
 msgstr ""
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
 "weapons, but are vulnerable to attacks with piercing weapons, including bows "
 "and spears."
 msgstr ""
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
 "experience. Units killing an enemy will gain 8 experience for every level of "
 "the unit they kill."
 msgstr ""
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
 "fight very well in hills and mountains."
 msgstr ""
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
 "troops, wait for better conditions and then attack."
 msgstr ""
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
 "expendable units in some directions to delay enemy units."
 msgstr ""
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
 msgstr ""
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
 "depending on the number of villages on the map, and the number of turns you "
@@ -2439,7 +2421,7 @@
 "villages and waiting for turns to run out."
 msgstr ""
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
 "just the keep they start on. You can capture a keep from an enemy and "
@@ -2447,75 +2429,75 @@
 "for you on their keep so you can recruit there."
 msgstr ""
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
 "impact, fire, and holy attacks."
 msgstr ""
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
 "side fight better."
 msgstr ""
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
 "onto the village and attack you, while enjoying the defense and healing of "
 "the village."
 msgstr ""
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
 "ability or trait."
 msgstr ""
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr ""
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
 "you can undo your move by pressing 'u'."
 msgstr ""
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
 "them."
 msgstr ""
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
 "needing to attack anything themselves."
 msgstr ""
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
 "them one less attack than they would normally have. It is thus very "
 "effective against units that have a few powerful attacks."
 msgstr ""
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr ""
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
 "fight."
 msgstr ""
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
@@ -2541,7 +2523,7 @@
 
 #: data/units/Ancient_Lich.cfg:20 data/units/Ancient_Lich.cfg:33
 #: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
-#: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
+#: data/units/Dark_Queen.cfg:28 data/units/Dark_Queen.cfg:29
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
 #: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
@@ -2554,12 +2536,49 @@
 msgid "cold"
 msgstr ""
 
+#: data/units/Ancient_Lich.cfg:24 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:23
+#: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:30
+#: data/units/Orcish_Shaman.cfg:73 data/units/Orcish_Shaman.cfg:116
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
+#: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:24
+msgid "drain"
+msgstr ""
+
 #: data/units/Ancient_Lich.cfg:32 data/units/Deathmaster.cfg:35
 #: data/units/Demilich.cfg:31 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr ""
 
+#: data/units/Ancient_Lich.cfg:34 data/units/Arch_Mage.cfg:42
+#: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:30 data/units/Deathmaster.cfg:37
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:64
+#: 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
+#: data/units/Mage.cfg:39 data/units/Mage.cfg:106
+#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
+#: data/units/Mermaid_Diviner.cfg:37 data/units/Mermaid_Enchantress.cfg:35
+#: data/units/Mermaid_Initiate.cfg:35 data/units/Mermaid_Priestess.cfg:35
+#: data/units/Mermaid_Siren.cfg:26 data/units/Mermaid_Siren.cfg:37
+#: data/units/Necromancer.cfg:37 data/units/Princess.cfg:80
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: 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 ""
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr ""
@@ -2585,7 +2604,7 @@
 #: 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/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:22
 #: 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
@@ -2593,19 +2612,24 @@
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
 #: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:24
 #: data/units/Elvish_Druid.cfg:43 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:20
 #: 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/Footpad.cfg:38 data/units/Galleon.cfg:19 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: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/Mermaid_Diviner.cfg:27 data/units/Mermaid_Enchantress.cfg:24
+#: data/units/Mermaid_Enchantress.cfg:33 data/units/Mermaid_Initiate.cfg:24
+#: data/units/Mermaid_Initiate.cfg:33 data/units/Mermaid_Priestess.cfg:25
+#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
+#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
 #: data/units/Noble_Youth.cfg:22 data/units/Outlaw.cfg:21
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2625,7 +2649,7 @@
 msgid "impact"
 msgstr ""
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr ""
 
@@ -2640,6 +2664,8 @@
 #: data/units/Elvish_Druid.cfg:23 data/units/Elvish_Enchantress.cfg:25
 #: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
+#: data/units/Mermaid_Diviner.cfg:26 data/units/Mermaid_Enchantress.cfg:23
+#: data/units/Mermaid_Initiate.cfg:23 data/units/Mermaid_Priestess.cfg:24
 #: 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
@@ -2655,7 +2681,7 @@
 msgstr ""
 
 #: 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/Battle_Princess.cfg:78 data/units/Commander.cfg:121
 #: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
 #: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
@@ -2667,12 +2693,16 @@
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/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/Princess.cfg:78 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
 #: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr ""
 
+#: data/units/Arch_Mage.cfg:82
+msgid "female^Arch Mage"
+msgstr ""
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr ""
@@ -2697,7 +2727,7 @@
 msgstr "στιλέτο"
 
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
-#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
 #: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
@@ -2735,21 +2765,22 @@
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Lord.cfg:86
 #: data/units/Mage.cfg:21 data/units/Mage.cfg:88
-#: data/units/Master_Bowman.cfg:21 data/units/Necrophage.cfg:20
-#: data/units/Nightgaunt.cfg:21 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: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 data/units/Orcish_Shaman.cfg:105
-#: data/units/Orcish_Slayer.cfg:20 data/units/Orcish_Slayer.cfg:42
-#: data/units/Orcish_Sovereign.cfg:22 data/units/Orcish_Warlord.cfg:19
-#: data/units/Orcish_Warrior.cfg:20 data/units/Poacher.cfg:25
-#: data/units/Princess.cfg:23 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/Master_Bowman.cfg:21 data/units/Merman_Triton.cfg:34
+#: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
+#: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
+#: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:20
+#: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
+#: 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
+#: data/units/Orcish_Shaman.cfg:105 data/units/Orcish_Slayer.cfg:20
+#: data/units/Orcish_Slayer.cfg:42 data/units/Orcish_Sovereign.cfg:22
+#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:20
+#: data/units/Poacher.cfg:25 data/units/Princess.cfg:24
+#: data/units/Princess.cfg:62 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:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
@@ -2757,16 +2788,30 @@
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:20
 #: data/units/Swordsman.cfg:20 data/units/Thief.cfg:20
 #: data/units/Trapper.cfg:25 data/units/Vampire_Bat.cfg:20
-#: data/units/Vampire_Lady.cfg:20 data/units/White_Mage.cfg:29
+#: data/units/Vampire_Lady.cfg:21 data/units/White_Mage.cfg:29
 #: data/units/White_Mage.cfg:88 data/units/Wolf_Rider.cfg:21
 #: data/units/Wraith.cfg:20 data/units/Young_Ogre.cfg:19
 msgid "blade"
 msgstr "λεπίδα"
 
+#: 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:493
+msgid "backstab"
+msgstr ""
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "μαχαίρι"
 
+#: 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:38 data/units/Necrophage.cfg:24
+#: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
+msgid "poison"
+msgstr "δηλητήριο"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr ""
@@ -2789,16 +2834,16 @@
 msgid "mace"
 msgstr "σφύρα"
 
-#: data/units/Battle_Princess.cfg:3 data/units/Battle_Princess.cfg:41
-#: data/units/Princess.cfg:3 data/units/Princess.cfg:41
-msgid "Princess"
+#: data/units/Battle_Princess.cfg:3 data/units/Princess.cfg:3
+#, fuzzy
+msgid "female^Princess"
 msgstr "Πριγκήπισσα"
 
-#: data/units/Battle_Princess.cfg:17 data/units/Battle_Princess.cfg:55
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr "ηγεσία,ακροβολιστής"
 
-#: data/units/Battle_Princess.cfg:19
+#: data/units/Battle_Princess.cfg:20
 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 "
@@ -2806,7 +2851,7 @@
 "now aid those around them in the art of combat."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:22 data/units/Battle_Princess.cfg:60
+#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
 #: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
@@ -2830,18 +2875,22 @@
 #: data/units/Longbowman.cfg:21 data/units/Lord.cfg:22 data/units/Lord.cfg:85
 #: data/units/Master_Bowman.cfg:20 data/units/Noble_Commander.cfg:23
 #: data/units/Noble_Fighter.cfg:20 data/units/Noble_Lord.cfg:22
-#: data/units/Ogre.cfg:18 data/units/Orcish_Grunt.cfg:19
+#: data/units/Ogre.cfg:19 data/units/Orcish_Grunt.cfg:19
 #: data/units/Orcish_Leader.cfg:21 data/units/Orcish_Ruler.cfg:21
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
-#: data/units/Princess.cfg:22 data/units/Princess.cfg:60
+#: data/units/Princess.cfg:23 data/units/Princess.cfg:61
 #: 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 "σπαθί"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Πριγκήπισσα"
+
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -2850,9 +2899,9 @@
 "and ignores enemy zones of control."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:76 data/units/Commander.cfg:120
+#: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
-#: data/units/Princess.cfg:76
+#: data/units/Princess.cfg:77
 msgid "scepter of fire"
 msgstr "φλεγόμενο σκήπτρο"
 
@@ -2940,7 +2989,13 @@
 #: 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:22
+#: data/units/Merman.cfg:20 data/units/Merman_Entangler.cfg:19
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:23
+#: data/units/Merman_Hunter.cfg:19 data/units/Merman_Hunter.cfg:27
+#: data/units/Merman_Javelineer.cfg:19 data/units/Merman_Javelineer.cfg:27
+#: data/units/Merman_Lord.cfg:22 data/units/Merman_Netcaster.cfg:19
+#: data/units/Merman_Spearman.cfg:19 data/units/Merman_Spearman.cfg:27
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Warrior.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:41 data/units/Orcish_Crossbowman.cfg:39
@@ -2949,7 +3004,7 @@
 #: 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:16
+#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
 #: 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
@@ -2957,7 +3012,7 @@
 #: 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:17 data/units/Trapper.cfg:42
-#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:34
+#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:35
 #: data/units/Wall_Guard.cfg:36 data/units/Watch_Tower.cfg:18
 msgid "pierce"
 msgstr ""
@@ -3016,6 +3071,14 @@
 msgid "web"
 msgstr "ιστός"
 
+#: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:44
+#: 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
+#: data/units/Merman_Entangler.cfg:29 data/units/Merman_Netcaster.cfg:29
+msgid "slow"
+msgstr ""
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr ""
@@ -3034,13 +3097,24 @@
 #: 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/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
+#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
+#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
+#: data/units/Merman_Spearman.cfg:26 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 "δόρυ"
 
+#: 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:365
+#: src/actions.cpp:484
+msgid "charge"
+msgstr ""
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr ""
@@ -3056,6 +3130,11 @@
 msgid "gaze"
 msgstr ""
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr ""
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr ""
@@ -3114,17 +3193,17 @@
 msgstr ""
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+msgid "female^Dark Queen"
 msgstr ""
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 msgid ""
 "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 ""
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "σκήπτρο"
 
@@ -3378,6 +3457,12 @@
 "weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
+#: data/units/Drake_Slasher.cfg:42 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 ""
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr ""
@@ -3419,6 +3504,10 @@
 msgid "berserker frenzy"
 msgstr ""
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr ""
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr ""
@@ -3570,6 +3659,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr ""
 
+#: data/units/Dwarvish_Ulfserker.cfg:16
+msgid ""
+"Dwarves are an ancient race of powerful fighters. Ulfserkers are the most "
+"ferocious of these in battle: they attack without stopping fighting until "
+"either their enemy or they are dead, no matter how many wounds they receive."
+msgstr ""
+
 #: data/units/Elder_Mage.cfg:3
 msgid "Elder Mage"
 msgstr ""
@@ -3599,7 +3695,7 @@
 "can quickly heal themselves in the face of tremendous injuries."
 msgstr ""
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr ""
 
@@ -3610,7 +3706,11 @@
 "make up a large portion of the Elvish military."
 msgstr ""
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+msgid "female^Elvish Archer"
+msgstr ""
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr ""
 
@@ -3622,6 +3722,10 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+msgid "female^Elvish Avenger"
+msgstr ""
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr ""
@@ -3645,7 +3749,7 @@
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+msgid "female^Elvish Druid"
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:20
@@ -3664,7 +3768,7 @@
 msgstr "αγκάθια"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -3717,10 +3821,17 @@
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+msgid "female^Elvish Lady"
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:17
+msgid ""
+"Elvish lady Parandra is one of the most respected elves ever. Her ability to "
+"see through the fogs of destiny has gained her a wisely used authority among "
+"her people, guiding them in times of uncertainty."
+msgstr ""
+
+#: data/units/Elvish_Lady.cfg:19
 msgid "shove"
 msgstr ""
 
@@ -3734,7 +3845,7 @@
 "devastating balls of fire at long range."
 msgstr ""
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr ""
 
@@ -3752,6 +3863,16 @@
 msgid "longbow"
 msgstr "μακρύ τόξο"
 
+#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
+#: data/units/Elvish_Sharpshooter.cfg:40
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+msgid "marksman"
+msgstr "δεινός σκοπευτής"
+
+#: data/units/Elvish_Marksman.cfg:80
+msgid "female^Elvish Marksman"
+msgstr ""
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr ""
@@ -3775,7 +3896,7 @@
 "they strike hard before melting into the woods again to evade response."
 msgstr ""
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr ""
 
@@ -3787,6 +3908,10 @@
 "just made an attack, or there are enemies adjacent to them."
 msgstr ""
 
+#: data/units/Elvish_Ranger.cfg:79
+msgid "female^Elvish Ranger"
+msgstr ""
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr ""
@@ -3808,7 +3933,7 @@
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+msgid "female^Elvish Shaman"
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -3818,7 +3943,7 @@
 "they may attack. Shamans also possess basic healing abilities."
 msgstr ""
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr ""
 
@@ -3830,8 +3955,12 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+msgid "female^Elvish Sharpshooter"
+msgstr ""
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+msgid "female^Elvish Shyde"
 msgstr ""
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -3846,7 +3975,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -3858,7 +3987,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -3950,7 +4079,15 @@
 msgid "Galleon"
 msgstr ""
 
-#: data/units/Galleon.cfg:17
+#: data/units/Galleon.cfg:16
+msgid ""
+"Even people happily living in their home eventually need some kind of "
+"transport through the seas, even if they only go fishing or to trade goods. "
+"The galleon is perfect for this purpose: it's fast and resilient, but not "
+"prepared to fight, and is able to adapt to many different tasks."
+msgstr ""
+
+#: data/units/Galleon.cfg:18
 msgid "dummy"
 msgstr ""
 
@@ -4042,12 +4179,6 @@
 "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 ""
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr ""
@@ -4072,7 +4203,8 @@
 msgid "torch"
 msgstr "δαυλός"
 
-#: data/units/Goblin_Pillager.cfg:35
+#: data/units/Goblin_Pillager.cfg:35 data/units/Merman_Entangler.cfg:26
+#: data/units/Merman_Netcaster.cfg:26
 msgid "net"
 msgstr "δίχτυ"
 
@@ -4117,7 +4249,7 @@
 "serving beneath them."
 msgstr ""
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 msgid "Great Mage"
 msgstr ""
 
@@ -4127,17 +4259,14 @@
 "in power."
 msgstr ""
 
+#: data/units/Great_Mage.cfg:79
+msgid "female^Great Mage"
+msgstr ""
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr ""
 
-#: 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_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
-#: data/units/Troll_Whelp.cfg:7
-msgid "regenerates"
-msgstr "αναπλάθεται"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4306,7 +4435,7 @@
 "level units."
 msgstr ""
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Μάγος"
 
@@ -4322,11 +4451,16 @@
 msgid "missile"
 msgstr ""
 
-#: data/units/Mage_of_Light.cfg:3 data/units/Mage_of_Light.cfg:66
+#: data/units/Mage.cfg:70
+msgid "female^Mage"
+msgstr ""
+
+#: data/units/Mage_of_Light.cfg:3
 msgid "Mage of Light"
 msgstr ""
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "φωτίζει,θεραπεύει"
 
@@ -4342,16 +4476,22 @@
 msgstr ""
 
 #: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
+#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
 #: data/units/White_Mage.cfg:44 data/units/White_Mage.cfg:103
 msgid "lightbeam"
 msgstr ""
 
 #: data/units/Mage_of_Light.cfg:46 data/units/Mage_of_Light.cfg:106
+#: data/units/Mermaid_Diviner.cfg:35 data/units/Mermaid_Priestess.cfg:33
 #: data/units/Paladin.cfg:26 data/units/White_Mage.cfg:45
 #: data/units/White_Mage.cfg:104
 msgid "holy"
 msgstr ""
 
+#: data/units/Mage_of_Light.cfg:66
+msgid "female^Mage of Light"
+msgstr ""
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr ""
@@ -4363,21 +4503,115 @@
 "only by that of the Elves."
 msgstr ""
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
+#: data/units/Mermaid_Diviner.cfg:3
+msgid "female^Mermaid Diviner"
 msgstr ""
 
-#: data/units/Merman.cfg:16
+#: data/units/Mermaid_Diviner.cfg:23
+msgid ""
+"The most devout and pious amongst the mermaids gain the striking power of "
+"illumination, which prevents their surroundings from ever seeing true "
+"night.  Their power is a stalwart counter to the forces of darkness."
+msgstr ""
+
+#: data/units/Mermaid_Enchantress.cfg:3
+msgid "female^Mermaid Enchantress"
+msgstr ""
+
+#: data/units/Mermaid_Enchantress.cfg:20 data/units/Mermaid_Siren.cfg:20
+#: data/units/Merman.cfg:16 data/units/Merman_Entangler.cfg:15
+#: data/units/Merman_Fighter.cfg:18 data/units/Merman_Hoplite.cfg:19
+#: data/units/Merman_Hunter.cfg:15 data/units/Merman_Javelineer.cfg:15
+#: data/units/Merman_Netcaster.cfg:15 data/units/Merman_Spearman.cfg:15
+#: data/units/Merman_Triton.cfg:18 data/units/Merman_Warrior.cfg:18
 msgid ""
 "Skilled creatures of the sea, Mermen are powerful and quick in any watery "
 "environment, but struggle greatly to move on land."
 msgstr ""
 
-#: 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
+#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:31
+#: data/units/Mermaid_Siren.cfg:33 data/units/Sea_Hag.cfg:27
+msgid "water spray"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:3
+msgid "female^Mermaid Initiate"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:20
+msgid ""
+"Young Mermaids are often initiated in the water magics of their people.  "
+"Despite their frailty, this makes them formidable opponents, as they can "
+"call upon the very water about them to smite their enemies."
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:3
+msgid "female^Mermaid Priestess"
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:21
+msgid ""
+"The more learned among the mermaids often take a path of holy study.  This "
+"leaves them quite capable of ministering to the wounds of their comrades, as "
+"well as being a potent defense against the unworldly."
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:3
+msgid "female^Siren"
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:23
+msgid "naia touch"
+msgstr ""
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr ""
+
+#: data/units/Merman.cfg:19 data/units/Merman_Fighter.cfg:21
+#: data/units/Merman_Hoplite.cfg:22 data/units/Merman_Lord.cfg:21
+#: data/units/Merman_Triton.cfg:21 data/units/Merman_Triton.cfg:33
+#: data/units/Merman_Warrior.cfg:21 data/units/Naga.cfg:20
+#: data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr "τρίαινα"
 
+#: data/units/Merman_Entangler.cfg:3
+msgid "Merman Entangler"
+msgstr ""
+
+#: data/units/Merman_Fighter.cfg:3
+msgid "Merman Fighter"
+msgstr ""
+
+#: data/units/Merman_Hoplite.cfg:3
+msgid "Merman Hoplite"
+msgstr ""
+
+#: data/units/Merman_Hunter.cfg:3
+msgid "Merman Hunter"
+msgstr ""
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+msgid "Merman Netcaster"
+msgstr ""
+
+#: data/units/Merman_Spearman.cfg:3
+msgid "Merman Spearman"
+msgstr ""
+
+#: data/units/Merman_Triton.cfg:3
+msgid "Merman Triton"
+msgstr ""
+
+#: data/units/Merman_Warrior.cfg:3
+msgid "Merman Warrior"
+msgstr ""
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr ""
@@ -4389,7 +4623,7 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
+msgid "female^Naga"
 msgstr ""
 
 #: data/units/Naga.cfg:17
@@ -4430,10 +4664,6 @@
 "to hide at night, leaving no trace of their presence."
 msgstr ""
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "νυχτοκυνηγός"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr ""
@@ -4471,7 +4701,7 @@
 msgid "Ogre"
 msgstr ""
 
-#: data/units/Ogre.cfg:15
+#: data/units/Ogre.cfg:16
 msgid ""
 "Ogres are stupid giant humanoids that usually live alone in the wilderness. "
 "While they can be easily outrun or outsmarted, their strength is not to be "
@@ -4565,7 +4795,7 @@
 msgstr ""
 
 #: data/units/Orcish_Shaman.cfg:25 data/units/Orcish_Shaman.cfg:68
-#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:33
+#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:34
 msgid "curse"
 msgstr ""
 
@@ -4644,7 +4874,7 @@
 "weakness is their inability to wield the bow."
 msgstr ""
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr ""
 
@@ -4652,12 +4882,16 @@
 msgid "Outlaws fight better at night."
 msgstr ""
 
+#: data/units/Outlaw.cfg:75
+msgid "female^Outlaw"
+msgstr ""
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+msgid "female^Outlaw Princess"
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -4669,7 +4903,7 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+msgid "female^Outlaw Queen"
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -4732,7 +4966,14 @@
 msgid "Pirate Galleon"
 msgstr ""
 
-#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
+#: data/units/Pirate_Galleon.cfg:14
+msgid ""
+"Pirate galleons are to transport ships what wolves are to sheeps. Ships full "
+"of goods shouldn't be lonely, far away from any land, better to help them to "
+"avoid it being sunk from overloading..."
+msgstr ""
+
+#: data/units/Pirate_Galleon.cfg:16 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr ""
@@ -4747,7 +4988,7 @@
 "in forests and swamps."
 msgstr ""
 
-#: data/units/Princess.cfg:19 data/units/Princess.cfg:57
+#: data/units/Princess.cfg:20 data/units/Princess.cfg:58
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@@ -4756,7 +4997,7 @@
 "having skills like that of a thief."
 msgstr ""
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr ""
 
@@ -4767,6 +5008,10 @@
 "Red Mages are therefore valuable in almost all situations."
 msgstr ""
 
+#: data/units/Red_Mage.cfg:72
+msgid "female^Red Mage"
+msgstr ""
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr ""
@@ -4869,13 +5114,13 @@
 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 "
+"valued as scouts as they 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"
+msgid "female^Sea Hag"
 msgstr ""
 
 #: data/units/Sea_Hag.cfg:17
@@ -4884,10 +5129,6 @@
 "the water magic."
 msgstr ""
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr ""
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr ""
@@ -4943,7 +5184,7 @@
 "and even into the lands beyond."
 msgstr ""
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr ""
 
@@ -4954,10 +5195,23 @@
 "instant. They are also highly resistant to most forms of magical attack."
 msgstr ""
 
+#: data/units/Silver_Mage.cfg:142
+msgid "female^Silver Mage"
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr ""
 
+#: data/units/Skeletal_Dragon.cfg:17
+msgid ""
+"Long ago one of the mightiest living creatures, the feared Dragon has become "
+"only bones and dark sinew. Long after its death, it was raised through the "
+"dark powers of necromancy, which it now serves. The Skeletal Dragon may look "
+"like nothing more than a pile of bones, but few people who thought that way "
+"lived long enough to change their minds."
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr "σαγόνι"
@@ -5016,6 +5270,10 @@
 "fighting the living."
 msgstr ""
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "πανούκλα"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr ""
@@ -5177,16 +5435,16 @@
 msgstr ""
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+msgid "female^Vampire Lady"
 msgstr ""
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
 "the blood of the living."
 msgstr ""
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr ""
 
@@ -5239,7 +5497,7 @@
 "miscellaneous items at them with ballistas."
 msgstr ""
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr ""
 
@@ -5251,6 +5509,10 @@
 "high damage from their light beam"
 msgstr ""
 
+#: data/units/White_Mage.cfg:65
+msgid "female^White Mage"
+msgstr ""
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr ""
@@ -5445,7 +5707,7 @@
 msgid "+ Bots"
 msgstr ""
 
-#: src/about.cpp:276 src/help.cpp:2372 src/show_dialog.cpp:472
+#: src/about.cpp:276 src/help.cpp:2350 src/show_dialog.cpp:491
 msgid "Close"
 msgstr "Κλείσιμο"
 
@@ -5465,73 +5727,73 @@
 msgid "none"
 msgstr ""
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr ""
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr ""
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr ""
 
-#: src/actions.cpp:363 src/actions.cpp:481 src/actions.cpp:490
+#: src/actions.cpp:365 src/actions.cpp:484 src/actions.cpp:493
 msgid "Doubled"
 msgstr ""
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr ""
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr ""
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr ""
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr ""
 
-#: src/actions.cpp:714 src/actions.cpp:861 src/display.cpp:917
+#: src/actions.cpp:716 src/actions.cpp:862 src/display.cpp:917
 #: src/reports.cpp:115
 msgid "poisoned"
 msgstr ""
 
-#: src/actions.cpp:719 src/actions.cpp:866 src/display.cpp:913
+#: src/actions.cpp:721 src/actions.cpp:867 src/display.cpp:913
 #: src/reports.cpp:110
 msgid "slowed"
 msgstr ""
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr ""
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Εθεάθη φιλική μονάδα"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Εθεάθη εχθρική μονάδα!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "Εθεάθησαν $friends φιλικές μονάδες"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "Εθεάθησαν $friends εχθρικές μονάδες"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Εθεάθησαν μονάδες! ($friends φιλικές, $enemies 
εχθρικές)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr ""
 
@@ -5591,7 +5853,7 @@
 msgid "replay"
 msgstr ""
 
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1384
+#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1385
 msgid "Turn"
 msgstr "Γύρος"
 
@@ -5651,23 +5913,23 @@
 msgid "Profile"
 msgstr ""
 
-#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:567
-#: src/playturn.cpp:1793
+#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:564
+#: src/playturn.cpp:1794
 msgid "level"
 msgstr "επίπεδο"
 
-#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:622
-#: src/playturn.cpp:1958 src/unit.cpp:1070
+#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:613
+#: src/playturn.cpp:1959 src/unit.cpp:1070
 msgid "Moves"
 msgstr "Κινήσεις"
 
-#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:230
+#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:230
 msgid "melee"
 msgstr "σώμα με σώμα"
 
-#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:231
+#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:231
 msgid "ranged"
 msgstr "εξ αποστάσεως"
 
@@ -5687,11 +5949,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Θέλετε να αποθηκεύσετε ένα replay αυτού 
του σεναρίου;"
 
-#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1393
+#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1394
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1410
+#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1411
 msgid "The game could not be saved"
 msgstr "Η αποθήκευση του παιχνιδιού ήταν 
αδύνατη"
 
@@ -5755,8 +6017,8 @@
 #: src/game.cpp:999 src/game.cpp:1014 src/game.cpp:1020 src/game.cpp:1053
 #: src/game.cpp:1082 src/game.cpp:1096 src/game.cpp:1098 src/game.cpp:1100
 #: src/game.cpp:1112 src/game.cpp:1115 src/game.cpp:1150 src/game.cpp:1152
-#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1396
-#: src/playturn.cpp:1410
+#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1397
+#: src/playturn.cpp:1411
 msgid "Error"
 msgstr ""
 
@@ -5818,7 +6080,7 @@
 msgstr ""
 
 #: src/game.cpp:1112 src/game.cpp:1150 src/game.cpp:1174
-#: src/multiplayer_client.cpp:42 src/multiplayer_client.cpp:314
+#: src/multiplayer_client.cpp:45 src/multiplayer_client.cpp:319
 msgid "Connection timed out"
 msgstr ""
 
@@ -5876,7 +6138,7 @@
 msgid "Play a game against AI opponents"
 msgstr ""
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr ""
 
@@ -5896,79 +6158,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr ""
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Προαγωγή σε"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Νοοτροπία"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Απαιτούμενη Εμπειρία"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "επιθέσεις"
 
-#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1955
+#: src/help.cpp:636 src/help.cpp:637 src/playturn.cpp:1956
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/help.cpp:649 src/help.cpp:650 src/playturn.cpp:1954
+#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1955
 msgid "Type"
 msgstr "Τύπος"
 
-#: src/help.cpp:653 src/help.cpp:654 src/unit_types.cpp:302
+#: src/help.cpp:644 src/help.cpp:645 src/unit_types.cpp:302
 msgid "Dmg"
 msgstr "Ζημιά"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr ""
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr ""
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr ""
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr ""
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr ""
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr ""
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Συντελεστές Μορφολογίας Εδάφους"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Μορφολογία Εδάφους"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Άμυνα"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Πίσω"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Επόμενο >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr ""
 
@@ -5980,7 +6242,7 @@
 msgid "End Unit Turn"
 msgstr ""
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Ηγέτης"
 
@@ -6016,11 +6278,11 @@
 msgid "Unit Description"
 msgstr "Περιγραφή Μονάδας"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr ""
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Στρατολόγηση"
 
@@ -6028,7 +6290,7 @@
 msgid "Repeat Recruit"
 msgstr "Επανάληψη Στρατολόγησης"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Ανάκληση"
 
@@ -6064,11 +6326,11 @@
 msgid "Scenario Objectives"
 msgstr "Στόχοι Σεναρίου"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Λίστα Μονάδων"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Στατιστικά"
 
@@ -6176,7 +6438,7 @@
 msgid "Speak to All"
 msgstr ""
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Βοήθεια"
 
@@ -6236,7 +6498,7 @@
 msgid "Bump Size"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Χωριά"
 
@@ -6284,15 +6546,11 @@
 msgid "Enemy units cannot be seen unless they are in range of your units"
 msgstr ""
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Καλυμμένος Χάρτης"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr ""
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Παρατηρητές"
 
@@ -6300,13 +6558,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr ""
 
-#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:145
-#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:460
-#: src/show_dialog.cpp:466
+#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:148
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:479
+#: src/show_dialog.cpp:485
 msgid "Cancel"
 msgstr "Ακύρωση"
 
-#: src/multiplayer.cpp:120 src/show_dialog.cpp:446 src/show_dialog.cpp:459
+#: src/multiplayer.cpp:120 src/show_dialog.cpp:465 src/show_dialog.cpp:478
 msgid "Ok"
 msgstr "Οκ"
 
@@ -6380,70 +6638,70 @@
 msgid "Warning"
 msgstr ""
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:121 src/multiplayer_connect.cpp:386
-#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1531
-#: src/playturn.cpp:1536 src/playturn.cpp:1623
+#: src/multiplayer_client.cpp:124 src/multiplayer_connect.cpp:386
+#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1532
+#: src/playturn.cpp:1537 src/playturn.cpp:1624
 msgid "Gold"
 msgstr "Χρυσά"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Περιμένοντας να ξεκινήσει το 
παχνίδι..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Συνδεθείτε με έναν Εξυπηρέτη"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr ""
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Δημιουργία σύνδεσης με απομακρυσμένο 
Η/Υ..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr ""
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr ""
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Επιλέξτε πλευρά:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Το παιχνίδι ακυρώθηκε"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Η πλευρά που επιλέξατε δεν είναι πλέον 
διαθέσιμη"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:683 src/multiplayer_client.cpp:686
+#: src/multiplayer_client.cpp:688 src/multiplayer_client.cpp:691
 msgid "?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:777
+#: src/multiplayer_client.cpp:782
 msgid "Leader: "
 msgstr ""
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr ""
 
@@ -6473,8 +6731,8 @@
 msgid "Local Player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:498
-#: src/multiplayer_connect.cpp:621 src/multiplayer_connect.cpp:727
+#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:496
+#: src/multiplayer_connect.cpp:610 src/multiplayer_connect.cpp:716
 msgid "Computer Player"
 msgstr ""
 
@@ -6539,7 +6797,7 @@
 msgid "Color"
 msgstr "Χρώμα"
 
-#: src/multiplayer_connect.cpp:570 src/multiplayer_connect.cpp:574
+#: src/multiplayer_connect.cpp:559 src/multiplayer_connect.cpp:563
 msgid "Waiting for network players to join"
 msgstr ""
 
@@ -6624,218 +6882,218 @@
 msgid "It is now your turn"
 msgstr "Είναι η σειρά σας να παίξετε"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Επιτιθέμενος"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Αμυνόμενος"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Υπολογισμοί Ζημιάς"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Σώμα με σώμα"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "εναντίων"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr ""
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Επιλέξτε όπλο"
 
-#: src/playturn.cpp:1125
+#: src/playturn.cpp:1126
 msgid ""
 "You have not started your turn yet.  Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1134 src/playturn.cpp:1139
+#: src/playturn.cpp:1135 src/playturn.cpp:1140
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr ""
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
 msgstr ""
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr ""
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Το παιχνίδι αποθηκεύτηκε"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Εισόδημα"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Συντήρηση"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr ""
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Επιλέξτε"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr ""
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1730
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1731
+#: src/playturn.cpp:1732
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr ""
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr ""
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr ""
 
-#: src/playturn.cpp:1779
+#: src/playturn.cpp:1780
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
 msgstr ""
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr ""
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr ""
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr ""
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Στρατολογήσατε"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Ανακαλέσατε"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Προάγατε"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Χάσατε"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Σκοτώσατε"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr ""
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr ""
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr ""
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr ""
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr ""
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr ""
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr ""
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr ""
 
-#: src/playturn.cpp:2421
+#: src/playturn.cpp:2422
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
 msgstr ""
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr ""
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr ""
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Ματαίωση παιχνιδιού"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr ""
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr ""
 
@@ -6887,93 +7145,93 @@
 msgid "Chaotic units"
 msgstr ""
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr ""
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr ""
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr ""
 
-#: src/show_dialog.cpp:934
+#: src/show_dialog.cpp:953
 msgid "KB"
 msgstr ""
 
-#: src/titlescreen.cpp:149
+#: src/titlescreen.cpp:155
 msgid "Version"
 msgstr "Έκδοση"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Εκμάθηση"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Εκστρατεία"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Δικτυακό Παιχνίδι"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Φόρτωση"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Γλώσσα"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Προτιμήσεις"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Έξοδος"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr ""
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr ""
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
 msgstr ""
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr ""
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr ""
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr ""
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr ""
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr ""
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr ""
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr ""
 
@@ -6981,15 +7239,15 @@
 msgid "strikes"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr ""
 
@@ -7001,5 +7259,11 @@
 msgid "Deletion of the file failed."
 msgstr ""
 
+#~ msgid "Swamp"
+#~ msgstr "Βάλτος"
+
+#~ msgid "Tundra"
+#~ msgstr "Τούνδρα"
+
 #~ msgid "TitleScreen button^About"
 #~ msgstr "Πληροφορίες"
Index: wesnoth/po/wesnoth/es.po
diff -u wesnoth/po/wesnoth/es.po:1.13 wesnoth/po/wesnoth/es.po:1.14
--- wesnoth/po/wesnoth/es.po:1.13       Wed Oct 20 12:08:31 2004
+++ wesnoth/po/wesnoth/es.po    Thu Oct 21 20:22:40 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.6-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-10-20 13:30+0200\n"
 "Last-Translator: David Martínez Moreno <address@hidden>\n"
 "Language-Team: David Martínez Moreno <address@hidden>\n"
@@ -16,7 +16,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "leal"
 
@@ -48,11 +48,11 @@
 msgid "Traits"
 msgstr "Rasgos"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Unidades"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Habilidades"
 
@@ -194,7 +194,7 @@
 "la sección <ref>dst=income_and_upkeep text='Recaudación y mantenimiento'</"
 "ref> para obtener más información."
 
-#: data/help.cfg:84 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:84 src/help.cpp:747 src/help.cpp:748
 msgid "Movement"
 msgstr "Movimiento"
 
@@ -622,7 +622,7 @@
 "text=habilidades</ref>, pero ahora ya sabe lo necesario para poder jugar en "
 "el escenario del «Heredero al trono». ¡Diviértase, y buena suerte!"
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr "Acerca de"
 
@@ -936,7 +936,7 @@
 msgstr "Predeterminado"
 
 #: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:196
-#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:658
+#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:663
 msgid "&random-enemy.png,Random"
 msgstr "&random-enemy.png,Aleatorio"
 
@@ -1053,6 +1053,24 @@
 msgid "Random map"
 msgstr "Mapa aleatorio"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Mapa aleatorio"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Mapa aleatorio"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Mapa aleatorio"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wésbol"
@@ -1098,7 +1116,7 @@
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/Basic_Training.cfg:276
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
-#: src/show_dialog.cpp:453
+#: src/show_dialog.cpp:472
 msgid "No"
 msgstr "No"
 
@@ -1680,7 +1698,7 @@
 
 #: data/scenarios/tutorial/Basic_Training.cfg:262
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
-#: src/show_dialog.cpp:452
+#: src/show_dialog.cpp:471
 msgid "Yes"
 msgstr "Sí"
 
@@ -2130,6 +2148,115 @@
 msgid "Underground"
 msgstr "Bajo tierra"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Oculto"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Aguas profundas"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Aguas someras"
+
+#: data/terrain.cfg:39 data/terrain.cfg:60 data/terrain.cfg:139
+#: data/terrain.cfg:148 data/terrain.cfg:166 data/terrain.cfg:229
+#: src/reports.cpp:309
+msgid "Village"
+msgstr "Aldea"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Aguas someras"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Hielo"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Puente"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Arena"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Camino"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Tierra"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Pradera"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Sombra"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Colinas"
+
+#: data/terrain.cfg:184
+#, fuzzy
+msgid "Snow hills"
+msgstr "Los Llanos nevados"
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Montañas"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Bosque"
+
+#: data/terrain.cfg:206
+#, fuzzy
+msgid "Snow forest"
+msgstr "Bosque del Silencio"
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Pared de cueva"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Cueva"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Castillo"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Campamento"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Páramo de los Enanos"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Torreón"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "ninguna"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menú"
@@ -2143,14 +2270,14 @@
 msgstr "Fin de turno"
 
 #: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:670
-#: src/display.cpp:941 src/help.cpp:621 src/playturn.cpp:1956
+#: src/display.cpp:941 src/help.cpp:612 src/playturn.cpp:1957
 #: src/unit.cpp:1034
 msgid "HP"
 msgstr "PV"
 
 #: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:674
 #: src/dialogs.cpp:682 src/display.cpp:945 src/display.cpp:953
-#: src/playturn.cpp:1795 src/playturn.cpp:1957 src/unit.cpp:1093
+#: src/playturn.cpp:1796 src/playturn.cpp:1958 src/unit.cpp:1093
 msgid "XP"
 msgstr "PX"
 
@@ -2226,33 +2353,30 @@
 "Día: -25% del Daño\n"
 "Noche: +25% del Daño"
 
-#: data/translations/english.cfg:23
+#: data/translations/english.cfg:21
 msgid ""
-"Heals:\n"
-"Allows the unit to heal adjacent friendly units at the beginning of the "
-"turn.\n"
+"Ambush:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"A unit cared for by a healer may heal up to 4 HP per turn.\n"
-"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
-"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
-"care of a village or a unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 msgstr ""
-"Sana:\n"
-"Permite a la unidad sanar a otras unidades amigas adyacentes al principio "
-"del turno.\n"
+"Emboscar:\n"
+"Esta unidad puede ocultarse en el bosque, y no ser detectada por sus "
+"enemigos.\n"
 "\n"
-"Una unidad sanada puede recuperar hasta 4 PV por turno.\n"
-"Es posible sanar un total de 8 PV por turno, para todas las unidades "
-"adyacentes.\n"
-"A una unidad envenenada no se la puede curar con esta habilidad, y debe "
-"buscar o una aldea o una unidad con la habilidad de sanar."
+"Las unidades enemigas no pueden ver o atacar esta unidad cuando se encuentra "
+"en un bosque, excepto en los turnos inmediatamente después de que haya "
+"atacado o si hay unidades enemigas junto a ella."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "sana"
+#: data/translations/english.cfg:23 data/units/Elvish_Avenger.cfg:18
+#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
+#: data/units/Elvish_Ranger.cfg:94
+msgid "ambush"
+msgstr "emboscar"
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 msgid ""
 "Cures:\n"
 "This unit combines herbal remedies with magic to heal units more quickly "
@@ -2277,26 +2401,59 @@
 "Es posible curar a una unidad envenenada, aunque esa unidad no recibirá "
 "curación adicional en ese turno."
 
-#: data/translations/english.cfg:35 data/units/Elvish_Druid.cfg:19
-#: data/units/Elvish_Shyde.cfg:19 data/units/White_Mage.cfg:12
-#: data/units/White_Mage.cfg:71
+#: data/translations/english.cfg:33 data/units/Elvish_Druid.cfg:19
+#: data/units/Elvish_Shyde.cfg:19 data/units/Mermaid_Priestess.cfg:7
+#: data/units/White_Mage.cfg:12 data/units/White_Mage.cfg:71
 msgid "cures"
 msgstr "cura"
 
-#: data/translations/english.cfg:38
+#: data/translations/english.cfg:40
 msgid ""
-"Teleport:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heals:\n"
+"Allows the unit to heal adjacent friendly units at the beginning of the "
+"turn.\n"
+"\n"
+"A unit cared for by a healer may heal up to 4 HP per turn.\n"
+"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
+"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
+"care of a village or a unit that can cure."
 msgstr ""
-"Teletransporte:\n"
-"Esta unidad puede teletransportarse entre dos aldeas amigas 
instantáneamente."
+"Sana:\n"
+"Permite a la unidad sanar a otras unidades amigas adyacentes al principio "
+"del turno.\n"
+"\n"
+"Una unidad sanada puede recuperar hasta 4 PV por turno.\n"
+"Es posible sanar un total de 8 PV por turno, para todas las unidades "
+"adyacentes.\n"
+"A una unidad envenenada no se la puede curar con esta habilidad, y debe "
+"buscar o una aldea o una unidad con la habilidad de sanar."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teletransporte"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "sana"
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:47
+msgid ""
+"Illuminates:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
+msgstr ""
+"Iluminar:\n"
+"Esta unidad ilumina el área que la rodea, haciendo que las unidades legales "
+"luchen mejor, y las caóticas peor.\n"
+"\n"
+"Cualquier unidad adyacente a ésta luchará como si estuviera anocheciendo "
+"cuando es de noche, y como si fuera de día cuando está anocheciendo."
+
+#: data/translations/english.cfg:49
+msgid "illuminates"
+msgstr "ilumina"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2310,7 +2467,7 @@
 "\n"
 "Las unidades adyacentes de nivel inferior haran más daño en combate."
 
-#: data/translations/english.cfg:47 data/units/Commander.cfg:11
+#: data/translations/english.cfg:56 data/units/Commander.cfg:11
 #: data/units/Commander.cfg:86 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
@@ -2319,56 +2476,45 @@
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
 #: data/units/Noble_Commander.cfg:10 data/units/Noble_Lord.cfg:10
 #: 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:353 src/actions.cpp:471
+#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
+#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:355 src/actions.cpp:474
 msgid "leadership"
 msgstr "liderazgo"
 
-#: data/translations/english.cfg:52
+#: data/translations/english.cfg:59
+#, fuzzy
 msgid ""
-"Ambush:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
+"Loyal:\n"
+"Never more than 1 upkeep."
+msgstr "Sólo requieren 1 moneda de mantenimiento"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Emboscar:\n"
-"Esta unidad puede ocultarse en el bosque, y no ser detectada por sus "
-"enemigos.\n"
-"\n"
-"Las unidades enemigas no pueden ver o atacar esta unidad cuando se encuentra "
-"en un bosque, excepto en los turnos inmediatamente después de que haya "
-"atacado o si hay unidades enemigas junto a ella."
 
-#: data/translations/english.cfg:54 data/units/Elvish_Avenger.cfg:18
-#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
-#: data/units/Elvish_Ranger.cfg:94
-msgid "ambush"
-msgstr "emboscar"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr ""
 
-#: data/translations/english.cfg:59
+#: data/translations/english.cfg:69
 msgid ""
-"Illuminates:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
+"Regenerates:\n"
+"The unit will heal itself 8 hp per turn. If it is poisoned, it will remove "
+"the poison instead of healing."
 msgstr ""
-"Iluminar:\n"
-"Esta unidad ilumina el área que la rodea, haciendo que las unidades legales "
-"luchen mejor, y las caóticas peor.\n"
-"\n"
-"Cualquier unidad adyacente a ésta luchará como si estuviera anocheciendo "
-"cuando es de noche, y como si fuera de día cuando está anocheciendo."
 
-#: data/translations/english.cfg:61
-msgid "illuminates"
-msgstr "ilumina"
+#: data/translations/english.cfg:71 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_Rocklobber.cfg:7
+#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+msgid "regenerates"
+msgstr "regenera"
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 msgid ""
 "Skirmisher:\n"
 "This unit is skilled in moving past enemies quickly, and ignores all Enemy "
@@ -2378,116 +2524,127 @@
 "Esta unidad es hábil para moverse entre los enemigos rápidamente, e ignora "
 "todas las zonas de control enemigo."
 
-#: data/translations/english.cfg:66 data/units/Assassin.cfg:16
+#: data/translations/english.cfg:76 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:19 data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr "hostigador"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Sólo requieren 1 moneda de mantenimiento"
-
-#: data/translations/english.cfg:72
-msgid "This unit takes half normal damage when it did not initiate the attack."
+#: data/translations/english.cfg:79
+msgid ""
+"Steadfast:\n"
+"This unit takes half normal damage when it did not initiate the attack."
 msgstr ""
 
-#: data/translations/english.cfg:74 data/units/Dwarvish_Guardsman.cfg:15
+#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
 #: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: src/actions.cpp:499
+#: data/units/Merman_Hoplite.cfg:13 src/actions.cpp:502
 msgid "steadfast"
 msgstr "firmeza"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teletransporte:\n"
+"Esta unidad puede teletransportarse entre dos aldeas amigas 
instantáneamente."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teletransporte"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "daño mínimo"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Partida"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Escenario"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Configurar bandos:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Preferencias de equipo:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "No ha sido posible conectar al servidor"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Esperando a que se conecten jugadores..."
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Lleno"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Disponible"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Observador"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Describir Unidad"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "¿En pantalla completa o ventana?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Ventana"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normal"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Configuración de sonido..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Opciones"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Escoger escenario"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr "Este terreno actúa como $terrains a efectos de movimiento y defensa."
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Se escoge automáticamente el terreno con el mejor modificador."
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Este terreno proporciona sanación."
 
-#: data/translations/english.cfg:107
+#: data/translations/english.cfg:119
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain"
@@ -2495,7 +2652,7 @@
 "Este terreno actúa como un torreón, es decir, puede reclutar unidades con 
un "
 "líder situado en él."
 
-#: data/translations/english.cfg:108
+#: data/translations/english.cfg:120
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain"
@@ -2503,19 +2660,19 @@
 "Este terreno actúa como un castillo, es decir, puede reclutar unidades y que 
"
 "aparezcan en este terreno."
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "o"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Tabla de resistencia de unidades"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Vea también..."
 
-#: data/translations/english.cfg:117
+#: data/translations/english.cfg:129
 msgid ""
 "Backstab:\n"
 "This attack deals double damage if a friendly unit is on the opposite side "
@@ -2525,13 +2682,18 @@
 "Este ataque causa el doble de daño si una unidad aliada está en el extremo "
 "opuesto del objetivo."
 
-#: data/translations/english.cfg:119 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:490
-msgid "backstab"
-msgstr "puñalada"
+#: data/translations/english.cfg:132
+msgid ""
+"Berserk:\n"
+"Whether used offensively or defensively, this attack presses the engagement "
+"until one of the combatants is slain."
+msgstr ""
+"Berserk:\n"
+"Usado tanto en ataque como en defensa. Este ataque alarga la lucha hasta "
+"la \n"
+"muerte de uno de los combatientes."
 
-#: data/translations/english.cfg:122
+#: data/translations/english.cfg:135
 msgid ""
 "Charge:\n"
 "This attack deals double damage to the target. It also causes this unit to "
@@ -2541,14 +2703,7 @@
 "Este ataque causa el doble de daño al enmigo. También hace que los \n"
 "contraataques enemigos sean el doble de fuertes."
 
-#: data/translations/english.cfg:124 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:363 src/actions.cpp:481
-msgid "charge"
-msgstr "carga"
-
-#: data/translations/english.cfg:127
+#: data/translations/english.cfg:138
 msgid ""
 "Drain:\n"
 "This unit drains health from living units, healing itself for half the "
@@ -2558,18 +2713,15 @@
 "Esta unidad drena la vitalidad de unidades vivas, curándose a sí misma la 
\n"
 "mitad del daño que ha infligido."
 
-#: data/translations/english.cfg:129 data/units/Ancient_Lich.cfg:24
-#: data/units/Blood_Bat.cfg:24 data/units/Dark_Spirit.cfg:24
-#: data/units/Demilich.cfg:23 data/units/Lich.cfg:24
-#: data/units/Orcish_Shaman.cfg:30 data/units/Orcish_Shaman.cfg:73
-#: data/units/Orcish_Shaman.cfg:116 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Spectre.cfg:24 data/units/Vampire_Bat.cfg:24
-#: data/units/Vampire_Lady.cfg:25 data/units/Vampire_Lady.cfg:38
-#: data/units/Wraith.cfg:24
-msgid "drain"
-msgstr "drena"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Ataca primero:\n"
+"Esta unidad siempre ataca primero, aun cuando defiende."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2577,32 +2729,7 @@
 "Mágico:\n"
 "Este ataque siempre tiene un 70% de posibilidades de impactar."
 
-#: data/translations/english.cfg:134 data/units/Ancient_Lich.cfg:34
-#: data/units/Arch_Mage.cfg:42 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/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:64 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 data/units/Mage.cfg:39
-#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
-#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
-#: data/units/Princess.cfg:79 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 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"
-
-#: data/translations/english.cfg:137
+#: data/translations/english.cfg:147
 msgid ""
 "Marksman:\n"
 "When used offensively, this attack always has at least a 60% chance to hit."
@@ -2611,13 +2738,7 @@
 "Cuando se usa, este ataque siempre tiene un 60% de posibilidades de \n"
 "impactar."
 
-#: data/translations/english.cfg:139 data/units/Elvish_Marksman.cfg:39
-#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
-msgid "marksman"
-msgstr "tirador"
-
-#: data/translations/english.cfg:142
+#: data/translations/english.cfg:150
 msgid ""
 "Plague:\n"
 "If this unit kills a living target and that unit was not stationed in a "
@@ -2627,12 +2748,7 @@
 "Si esta unidad mata a un enemigo vivo, y éste no estaba en una aldea, su \n"
 "cuerpo se levantará y luchará para ti."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "plaga"
-
-#: data/translations/english.cfg:147
+#: data/translations/english.cfg:153
 msgid ""
 "Poison:\n"
 "This attack poisons the target. Poisoned units lose 8 HP every turn until "
@@ -2642,16 +2758,7 @@
 "Este ataque envenena al objetivo. Las unidades envenenadas pierden 8 PV \n"
 "hasta que sean curadas o sólo les quede 1 PV."
 
-#: data/translations/english.cfg:149 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:38
-#: data/units/Necrophage.cfg:24 data/units/Orcish_Assassin.cfg:41
-#: data/units/Orcish_Slayer.cfg:46
-msgid "poison"
-msgstr "veneno"
-
-#: data/translations/english.cfg:152
+#: data/translations/english.cfg:156
 msgid ""
 "Slow:\n"
 "This attack slows the target. Slowed units move at half normal speed and "
@@ -2662,15 +2769,7 @@
 "mitad de su velocidad habitual y disponen de un ataque menos durante un "
 "turno."
 
-#: data/translations/english.cfg:154 data/units/Cave_Spider.cfg:38
-#: data/units/Elvish_Druid.cfg:44 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/translations/english.cfg:157
+#: data/translations/english.cfg:159
 msgid ""
 "Stone:\n"
 "This attack turns the target to stone. Units that have been turned to stone "
@@ -2681,197 +2780,88 @@
 "podrá \n"
 "mover ni atacar."
 
-#: data/translations/english.cfg:159 data/units/Cockatrice.cfg:26
-#: src/actions.cpp:728 src/actions.cpp:876 src/reports.cpp:122
-msgid "stone"
-msgstr "piedra"
-
 #: data/translations/english.cfg:162
-msgid ""
-"Berserk:\n"
-"Whether used offensively or defensively, this attack presses the engagement "
-"until one of the combatants is slain."
-msgstr ""
-"Berserk:\n"
-"Usado tanto en ataque como en defensa. Este ataque alarga la lucha hasta "
-"la \n"
-"muerte de uno de los combatientes."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "berserk"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Ataca primero:\n"
-"Esta unidad siempre ataca primero, aun cuando defiende."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "ataca primero"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfos"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orcos"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Humanos"
 
-#: data/translations/english.cfg:175
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orcos"
+
+#: data/translations/english.cfg:165
 msgid "Undead"
 msgstr "No muertos"
 
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Aguas profundas"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Aguas someras"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Arena"
-
-#: data/translations/english.cfg:182 data/translations/english.cfg:184
-#: data/translations/english.cfg:185 data/translations/english.cfg:186
-#: data/translations/english.cfg:187 data/translations/english.cfg:188
-#: src/reports.cpp:310
-msgid "Village"
-msgstr "Aldea"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Pantano"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Hielo"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Camino"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Tierra"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Pradera"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Colinas"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Montañas"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Bosque"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Puente"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Castillo"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Torreón"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Cueva"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Pared de cueva"
-
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Campamento"
-
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr ""
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr ""
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr ""
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr ""
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "Lago $name"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr ""
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+msgid "$name|harbor,$name|port"
+msgstr ""
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ""
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr ""
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr ""
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr ""
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr ""
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Siguiente consejo"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Consejo del día"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "No mostrar los consejos"
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
@@ -2881,7 +2871,7 @@
 "neutrales no sufren ninguna penalización ni bonificación sea de día o de "
 "noche."
 
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:186
 msgid ""
 "In a campaign, you can use veteran units from previous scenarios by using "
 "the 'recall' option."
@@ -2890,7 +2880,7 @@
 "En una campaña, puede usar tropas veteranas usando la opción de "
 "«Reincorporar»."
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
 "Different units have weaknesses against different types of attacks. Right-"
@@ -2903,7 +2893,7 @@
 "frío y sagrado. Cada unidad tiene sus debilidades respecto a algunos "
 "ataques, para saberlo, seleccione «Describir unidad» y luego 
«Resistencia»."
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
 "hitting them in battle. The defensive rating for the currently selected unit "
@@ -2916,7 +2906,7 @@
 "seleccionada en el terreno seleccionado se muestra en la esquina superior "
 "derecha de la pantalla."
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
 "poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -2929,7 +2919,7 @@
 "se curan en las aldeas o si están adyacentes a una unidad con la habilidad "
 "«curar»."
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
 "menu. By recalling the same units over and over, you can build up a powerful "
@@ -2940,7 +2930,7 @@
 "«Reincorporar», en el menú del juego. Llamando a las mismas unidades "
 "conseguiréis unas tropas altamente competentes y experimentadas."
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
 "unit moves into an enemy's Zone of Control, it may not move any further that "
@@ -2951,7 +2941,7 @@
 "que les rodean. Si una unidad entra en una zona de control enemiga, no se "
 "podrá mover más durante ese turno."
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
 "itself in the terrain it is standing in, however magical attacks always have "
@@ -2963,14 +2953,14 @@
 "como los ataques mágicos, que siempre tienen un 70% para acertar, o los "
 "tiradores, que tienen un 60% de posibilidades como mínimo."
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
 msgstr ""
 "La virtud de la hospitalidad:\n"
 "Una unidad situada en una aldea recuperará 8 puntos de vida cada turno."
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
 "hitpoints at the beginning of their next turn."
@@ -2979,7 +2969,7 @@
 "Las unidades que ni se muevan ni ataquen durante su turno, descansan, "
 "recuperando así 2 puntos de vida al principio del siguiente turno."
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
 "terrain, while most mounted units don't get any defensive advantage in "
@@ -2990,7 +2980,7 @@
 "en otros terrenos, mientras que las tropas montadas no suelen recibir "
 "ninguna bonificación defensiva ni en aldeas ni en castillos."
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
 "weapons, but are vulnerable to attacks with piercing weapons, including bows "
@@ -3001,7 +2991,7 @@
 "armas de filo o de impacto, pero son vulnerables a los ataques con armas que "
 "perforan como los arcos o las lanzas."
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
 "experience. Units killing an enemy will gain 8 experience for every level of "
@@ -3012,7 +3002,7 @@
 "Las unidades que matan a un enemigo reciben 8 puntos de experiencia por cada "
 "nivel del enemigo."
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
 "fight very well in hills and mountains."
@@ -3021,7 +3011,7 @@
 "Las tropas élficas luchan y se mueven muy bien en los bosques. Los enanos, "
 "por contra, destacan en las montañas y colinas."
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
 "troops, wait for better conditions and then attack."
@@ -3030,7 +3020,7 @@
 "En vez de lanzar el ataque en malas condiciones o con pocas tropas, es "
 "preferible esperar a mejores condiciones o refuerzos adicionales."
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
 "expendable units in some directions to delay enemy units."
@@ -3039,7 +3029,7 @@
 "Si el enemigo ataca por varios flancos, puede ser buena idea enviar tropas "
 "prescindibles para retrasar el ataque."
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
 msgstr ""
@@ -3047,7 +3037,7 @@
 "No hay que tener miedo a las retiradas, permiten reagruparse, lo que puede "
 "ser vital para la victoria."
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
 "depending on the number of villages on the map, and the number of turns you "
@@ -3059,7 +3049,7 @@
 "de aldeas y de turnos restantes, recibiréis oro. Siempre saldréis ganando "
 "más oro de este modo que capturando aldeas y esperando el fin de los turnos."
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
 "just the keep they start on. You can capture a keep from an enemy and "
@@ -3072,7 +3062,7 @@
 "reclutar allí, e incluso puede que un aliado se muestre dispuesto a cederos "
 "el castillo para que podáis reclutar desde allí."
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
 "impact, fire, and holy attacks."
@@ -3081,7 +3071,7 @@
 "Los esqueletos son resistentes a las armas de filo y que perforan, pero "
 "vulnerables a las de impacto, fuego y sagradas."
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
 "side fight better."
@@ -3090,7 +3080,7 @@
 "Las unidades con la habilidad «Liderazgo» hacen que las tropas del mismo "
 "bando adyacentes con niveles inferiores de experiencia luchen mejor."
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
 "onto the village and attack you, while enjoying the defense and healing of "
@@ -3100,7 +3090,7 @@
 "Intentad evitar moveros al lado de una aldea no ocupada. Algún enemigo "
 "podría tomarla y beneficiarse de su defensa y curación mientras os ataca."
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
 "ability or trait."
@@ -3109,20 +3099,20 @@
 "Si mantenéis el puntero encima de una habilidad o rasgo, se mostrará su "
 "descripción."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "La virtud de la cautela:\n"
 "Usad líneas de tropas para proteger a las unidades heridas mientras se "
 "recuperan."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr ""
 "La virtud de la preparación:\n"
 "Leed las listas de teclas de uso frecuente en el menú de preferencias."
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
 "you can undo your move by pressing 'u'."
@@ -3131,7 +3121,7 @@
 "Si movéis una unidad pero no atacáis ni descubrís ninguna información 
nueva, "
 "podéis deshacer ese movimiento pulsando «u»."
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
 "them."
@@ -3140,7 +3130,7 @@
 "Podéis conocer hasta donde pueden moverse las tropas enemigas situando el "
 "puntero encima de ellas."
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
 "needing to attack anything themselves."
@@ -3149,7 +3139,7 @@
 "Usad sanadores para respaldar vuestros ataques; ganarán batallas incluso sin 
"
 "atacar nada por sí mismos."
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
 "them one less attack than they would normally have. It is thus very "
@@ -3160,13 +3150,13 @@
 "lento, pero también les resta un ataque, convirtiéndolo en una poderosa 
arma "
 "contra enemigos con pocos ataques."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr ""
 "La maldición de la Oscuridad:\n"
 "Los ataques sagrados son muy poderosos contra los no muertos."
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
 "fight."
@@ -3175,7 +3165,7 @@
 "Las unidades se curan cuando suben de nivel. Usado astutamente, puede "
 "cambiar el signo de una batalla."
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
@@ -3210,7 +3200,7 @@
 
 #: data/units/Ancient_Lich.cfg:20 data/units/Ancient_Lich.cfg:33
 #: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
-#: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
+#: data/units/Dark_Queen.cfg:28 data/units/Dark_Queen.cfg:29
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
 #: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
@@ -3223,12 +3213,49 @@
 msgid "cold"
 msgstr "frío"
 
+#: data/units/Ancient_Lich.cfg:24 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:23
+#: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:30
+#: data/units/Orcish_Shaman.cfg:73 data/units/Orcish_Shaman.cfg:116
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
+#: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:24
+msgid "drain"
+msgstr "drena"
+
 #: data/units/Ancient_Lich.cfg:32 data/units/Deathmaster.cfg:35
 #: data/units/Demilich.cfg:31 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr "magia"
 
+#: data/units/Ancient_Lich.cfg:34 data/units/Arch_Mage.cfg:42
+#: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:30 data/units/Deathmaster.cfg:37
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:64
+#: 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
+#: data/units/Mage.cfg:39 data/units/Mage.cfg:106
+#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
+#: data/units/Mermaid_Diviner.cfg:37 data/units/Mermaid_Enchantress.cfg:35
+#: data/units/Mermaid_Initiate.cfg:35 data/units/Mermaid_Priestess.cfg:35
+#: data/units/Mermaid_Siren.cfg:26 data/units/Mermaid_Siren.cfg:37
+#: data/units/Necromancer.cfg:37 data/units/Princess.cfg:80
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: 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"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Wose Anciano"
@@ -3254,7 +3281,7 @@
 #: 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/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:22
 #: 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
@@ -3262,19 +3289,24 @@
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
 #: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:24
 #: data/units/Elvish_Druid.cfg:43 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:20
 #: 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/Footpad.cfg:38 data/units/Galleon.cfg:19 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: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/Mermaid_Diviner.cfg:27 data/units/Mermaid_Enchantress.cfg:24
+#: data/units/Mermaid_Enchantress.cfg:33 data/units/Mermaid_Initiate.cfg:24
+#: data/units/Mermaid_Initiate.cfg:33 data/units/Mermaid_Priestess.cfg:25
+#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
+#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
 #: data/units/Noble_Youth.cfg:22 data/units/Outlaw.cfg:21
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -3294,7 +3326,7 @@
 msgid "impact"
 msgstr "impacto"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Archimago"
 
@@ -3311,6 +3343,8 @@
 #: data/units/Elvish_Druid.cfg:23 data/units/Elvish_Enchantress.cfg:25
 #: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
+#: data/units/Mermaid_Diviner.cfg:26 data/units/Mermaid_Enchantress.cfg:23
+#: data/units/Mermaid_Initiate.cfg:23 data/units/Mermaid_Priestess.cfg:24
 #: 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
@@ -3326,7 +3360,7 @@
 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/Battle_Princess.cfg:78 data/units/Commander.cfg:121
 #: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
 #: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
@@ -3338,12 +3372,17 @@
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/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/Princess.cfg:78 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
 #: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr "fuego"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Archimago"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Asesino"
@@ -3371,7 +3410,7 @@
 msgstr "daga"
 
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
-#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
 #: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
@@ -3409,21 +3448,22 @@
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Lord.cfg:86
 #: data/units/Mage.cfg:21 data/units/Mage.cfg:88
-#: data/units/Master_Bowman.cfg:21 data/units/Necrophage.cfg:20
-#: data/units/Nightgaunt.cfg:21 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: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 data/units/Orcish_Shaman.cfg:105
-#: data/units/Orcish_Slayer.cfg:20 data/units/Orcish_Slayer.cfg:42
-#: data/units/Orcish_Sovereign.cfg:22 data/units/Orcish_Warlord.cfg:19
-#: data/units/Orcish_Warrior.cfg:20 data/units/Poacher.cfg:25
-#: data/units/Princess.cfg:23 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/Master_Bowman.cfg:21 data/units/Merman_Triton.cfg:34
+#: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
+#: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
+#: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:20
+#: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
+#: 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
+#: data/units/Orcish_Shaman.cfg:105 data/units/Orcish_Slayer.cfg:20
+#: data/units/Orcish_Slayer.cfg:42 data/units/Orcish_Sovereign.cfg:22
+#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:20
+#: data/units/Poacher.cfg:25 data/units/Princess.cfg:24
+#: data/units/Princess.cfg:62 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:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
@@ -3431,16 +3471,30 @@
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:20
 #: data/units/Swordsman.cfg:20 data/units/Thief.cfg:20
 #: data/units/Trapper.cfg:25 data/units/Vampire_Bat.cfg:20
-#: data/units/Vampire_Lady.cfg:20 data/units/White_Mage.cfg:29
+#: data/units/Vampire_Lady.cfg:21 data/units/White_Mage.cfg:29
 #: data/units/White_Mage.cfg:88 data/units/Wolf_Rider.cfg:21
 #: data/units/Wraith.cfg:20 data/units/Young_Ogre.cfg:19
 msgid "blade"
 msgstr "de filo"
 
+#: 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:493
+msgid "backstab"
+msgstr "puñalada"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "cuchillo"
 
+#: 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:38 data/units/Necrophage.cfg:24
+#: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
+msgid "poison"
+msgstr "veneno"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandido"
@@ -3463,16 +3517,16 @@
 msgid "mace"
 msgstr "maza"
 
-#: data/units/Battle_Princess.cfg:3 data/units/Battle_Princess.cfg:41
-#: data/units/Princess.cfg:3 data/units/Princess.cfg:41
-msgid "Princess"
+#: data/units/Battle_Princess.cfg:3 data/units/Princess.cfg:3
+#, fuzzy
+msgid "female^Princess"
 msgstr "Princesa"
 
-#: data/units/Battle_Princess.cfg:17 data/units/Battle_Princess.cfg:55
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr "liderazgo,hostigadora"
 
-#: data/units/Battle_Princess.cfg:19
+#: data/units/Battle_Princess.cfg:20
 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 "
@@ -3484,7 +3538,7 @@
 "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/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
 #: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
@@ -3508,18 +3562,22 @@
 #: data/units/Longbowman.cfg:21 data/units/Lord.cfg:22 data/units/Lord.cfg:85
 #: data/units/Master_Bowman.cfg:20 data/units/Noble_Commander.cfg:23
 #: data/units/Noble_Fighter.cfg:20 data/units/Noble_Lord.cfg:22
-#: data/units/Ogre.cfg:18 data/units/Orcish_Grunt.cfg:19
+#: data/units/Ogre.cfg:19 data/units/Orcish_Grunt.cfg:19
 #: data/units/Orcish_Leader.cfg:21 data/units/Orcish_Ruler.cfg:21
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
-#: data/units/Princess.cfg:22 data/units/Princess.cfg:60
+#: data/units/Princess.cfg:23 data/units/Princess.cfg:61
 #: 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
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Princesa"
+
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -3533,9 +3591,9 @@
 "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/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
-#: data/units/Princess.cfg:76
+#: data/units/Princess.cfg:77
 msgid "scepter of fire"
 msgstr "cetro de fuego"
 
@@ -3631,7 +3689,13 @@
 #: 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:22
+#: data/units/Merman.cfg:20 data/units/Merman_Entangler.cfg:19
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:23
+#: data/units/Merman_Hunter.cfg:19 data/units/Merman_Hunter.cfg:27
+#: data/units/Merman_Javelineer.cfg:19 data/units/Merman_Javelineer.cfg:27
+#: data/units/Merman_Lord.cfg:22 data/units/Merman_Netcaster.cfg:19
+#: data/units/Merman_Spearman.cfg:19 data/units/Merman_Spearman.cfg:27
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Warrior.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:41 data/units/Orcish_Crossbowman.cfg:39
@@ -3640,7 +3704,7 @@
 #: 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:16
+#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
 #: 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
@@ -3648,7 +3712,7 @@
 #: 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:17 data/units/Trapper.cfg:42
-#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:34
+#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:35
 #: data/units/Wall_Guard.cfg:36 data/units/Watch_Tower.cfg:18
 msgid "pierce"
 msgstr "perforante"
@@ -3716,6 +3780,14 @@
 msgid "web"
 msgstr "telaraña"
 
+#: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:44
+#: 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
+#: data/units/Merman_Entangler.cfg:29 data/units/Merman_Netcaster.cfg:29
+msgid "slow"
+msgstr "ralentiza"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Chocobo"
@@ -3737,13 +3809,24 @@
 #: 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/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
+#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
+#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
+#: data/units/Merman_Spearman.cfg:26 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:365
+#: src/actions.cpp:484
+msgid "charge"
+msgstr "carga"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Basilisco"
@@ -3763,6 +3846,11 @@
 msgid "gaze"
 msgstr "mirada"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "piedra"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Comandante"
@@ -3829,17 +3917,18 @@
 msgstr "ola de frío"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Reina oscura"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 msgid ""
 "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 ""
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "cetro"
 
@@ -4122,6 +4211,12 @@
 "weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
+#: data/units/Drake_Slasher.cfg:42 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/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Guerrero draco"
@@ -4171,6 +4266,10 @@
 msgid "berserker frenzy"
 msgstr "furia berserker"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "berserk"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Guardia del Dragón enano"
@@ -4351,6 +4450,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr ""
 
+#: data/units/Dwarvish_Ulfserker.cfg:16
+msgid ""
+"Dwarves are an ancient race of powerful fighters. Ulfserkers are the most "
+"ferocious of these in battle: they attack without stopping fighting until "
+"either their enemy or they are dead, no matter how many wounds they receive."
+msgstr ""
+
 #: data/units/Elder_Mage.cfg:3
 msgid "Elder Mage"
 msgstr "Mago Anciano"
@@ -4384,7 +4490,7 @@
 "can quickly heal themselves in the face of tremendous injuries."
 msgstr ""
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr "Arquero elfo"
 
@@ -4395,7 +4501,12 @@
 "make up a large portion of the Elvish military."
 msgstr ""
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Arquero elfo"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Vengador elfo"
 
@@ -4407,6 +4518,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Vengador elfo"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Capitán elfo"
@@ -4436,7 +4552,8 @@
 "lo que le hace capaz de dañar a sus enemigos en cortas y largas distancias."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Druida elfo"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4459,7 +4576,8 @@
 msgstr "espinas"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Encantadora elfa"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4525,10 +4643,18 @@
 "distancia, como con sus devastadoras bolas de fuego desde lejos."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Dama elfa"
 
 #: data/units/Elvish_Lady.cfg:17
+msgid ""
+"Elvish lady Parandra is one of the most respected elves ever. Her ability to "
+"see through the fogs of destiny has gained her a wisely used authority among "
+"her people, guiding them in times of uncertainty."
+msgstr ""
+
+#: data/units/Elvish_Lady.cfg:19
 msgid "shove"
 msgstr "empujón"
 
@@ -4544,7 +4670,7 @@
 "El Señor elfo es temible en combate, tanto con la espada a corta distancia, "
 "como con sus devastadoras bolas de fuego desde lejos."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Tirador elfo"
 
@@ -4562,6 +4688,17 @@
 msgid "longbow"
 msgstr "arco largo"
 
+#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
+#: data/units/Elvish_Sharpshooter.cfg:40
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+msgid "marksman"
+msgstr "tirador"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Tirador elfo"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Mariscal elfo"
@@ -4593,7 +4730,7 @@
 "el arco como en la espada, golpean duro antes de desaparecer en los bosques "
 "de nuevo, evitando toda réplica."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Montaraz elfo"
 
@@ -4605,6 +4742,11 @@
 "just made an attack, or there are enemies adjacent to them."
 msgstr ""
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Montaraz elfo"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Jinete elfo"
@@ -4631,7 +4773,8 @@
 "aunque carecen de fuerza en el combate"
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Chamán elfo"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4644,7 +4787,7 @@
 "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_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Saetero elfo"
 
@@ -4656,8 +4799,14 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Saetero elfo"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Shyde elfa"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4676,7 +4825,8 @@
 msgstr "toque faérico"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Conjuradora elfa"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4688,7 +4838,8 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Sílfide elfa"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4802,7 +4953,15 @@
 msgid "Galleon"
 msgstr "Galeón"
 
-#: data/units/Galleon.cfg:17
+#: data/units/Galleon.cfg:16
+msgid ""
+"Even people happily living in their home eventually need some kind of "
+"transport through the seas, even if they only go fishing or to trade goods. "
+"The galleon is perfect for this purpose: it's fast and resilient, but not "
+"prepared to fight, and is able to adapt to many different tasks."
+msgstr ""
+
+#: data/units/Galleon.cfg:18
 msgid "dummy"
 msgstr "ataque cualquiera"
 
@@ -4910,12 +5069,6 @@
 "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"
@@ -4946,7 +5099,8 @@
 msgid "torch"
 msgstr "antorcha"
 
-#: data/units/Goblin_Pillager.cfg:35
+#: data/units/Goblin_Pillager.cfg:35 data/units/Merman_Entangler.cfg:26
+#: data/units/Merman_Netcaster.cfg:26
 msgid "net"
 msgstr "red"
 
@@ -4994,7 +5148,7 @@
 "serving beneath them."
 msgstr ""
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 msgid "Great Mage"
 msgstr "Gran mago"
 
@@ -5006,17 +5160,15 @@
 "El Gran Mago es un impresionante y temible enemigo, superando incluso en "
 "poder a un archimago."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Gran mago"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Gran troll"
 
-#: 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_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
-#: data/units/Troll_Whelp.cfg:7
-msgid "regenerates"
-msgstr "regenera"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -5232,7 +5384,7 @@
 "arco. Como los comandantes, los señores tienen un buen liderazgo, y mejoran "
 "las habilidades de lucha de todas las unidades adyacentes de nivel inferior."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Mago"
 
@@ -5253,11 +5405,16 @@
 msgid "missile"
 msgstr "proyectil"
 
-#: data/units/Mage_of_Light.cfg:3 data/units/Mage_of_Light.cfg:66
+#: data/units/Mage.cfg:70
+msgid "female^Mage"
+msgstr ""
+
+#: data/units/Mage_of_Light.cfg:3
 msgid "Mage of Light"
 msgstr "Mago de la Luz"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "ilumina,cura"
 
@@ -5280,16 +5437,23 @@
 "aliados cercanos."
 
 #: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
+#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
 #: data/units/White_Mage.cfg:44 data/units/White_Mage.cfg:103
 msgid "lightbeam"
 msgstr "rayo de luz"
 
 #: data/units/Mage_of_Light.cfg:46 data/units/Mage_of_Light.cfg:106
+#: data/units/Mermaid_Diviner.cfg:35 data/units/Mermaid_Priestess.cfg:33
 #: data/units/Paladin.cfg:26 data/units/White_Mage.cfg:45
 #: data/units/White_Mage.cfg:104
 msgid "holy"
 msgstr "sagrado"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Mago de la Luz"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Maestro arquero"
@@ -5304,11 +5468,28 @@
 "arco que un humano puede soñar con alcanzar. Su poder con esta arma sólo es 
"
 "superado por los elfos."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Sirénido"
+#: data/units/Mermaid_Diviner.cfg:3
+msgid "female^Mermaid Diviner"
+msgstr ""
 
-#: data/units/Merman.cfg:16
+#: data/units/Mermaid_Diviner.cfg:23
+msgid ""
+"The most devout and pious amongst the mermaids gain the striking power of "
+"illumination, which prevents their surroundings from ever seeing true "
+"night.  Their power is a stalwart counter to the forces of darkness."
+msgstr ""
+
+#: data/units/Mermaid_Enchantress.cfg:3
+#, fuzzy
+msgid "female^Mermaid Enchantress"
+msgstr "Encantadora elfa"
+
+#: data/units/Mermaid_Enchantress.cfg:20 data/units/Mermaid_Siren.cfg:20
+#: data/units/Merman.cfg:16 data/units/Merman_Entangler.cfg:15
+#: data/units/Merman_Fighter.cfg:18 data/units/Merman_Hoplite.cfg:19
+#: data/units/Merman_Hunter.cfg:15 data/units/Merman_Javelineer.cfg:15
+#: data/units/Merman_Netcaster.cfg:15 data/units/Merman_Spearman.cfg:15
+#: data/units/Merman_Triton.cfg:18 data/units/Merman_Warrior.cfg:18
 msgid ""
 "Skilled creatures of the sea, Mermen are powerful and quick in any watery "
 "environment, but struggle greatly to move on land."
@@ -5316,11 +5497,98 @@
 "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:21
-#: data/units/Naga.cfg:20 data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
+#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:31
+#: data/units/Mermaid_Siren.cfg:33 data/units/Sea_Hag.cfg:27
+msgid "water spray"
+msgstr "chorro de agua"
+
+#: data/units/Mermaid_Initiate.cfg:3
+msgid "female^Mermaid Initiate"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:20
+msgid ""
+"Young Mermaids are often initiated in the water magics of their people.  "
+"Despite their frailty, this makes them formidable opponents, as they can "
+"call upon the very water about them to smite their enemies."
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:3
+msgid "female^Mermaid Priestess"
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:21
+msgid ""
+"The more learned among the mermaids often take a path of holy study.  This "
+"leaves them quite capable of ministering to the wounds of their comrades, as "
+"well as being a potent defense against the unworldly."
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:3
+msgid "female^Siren"
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:23
+#, fuzzy
+msgid "naia touch"
+msgstr "toque faérico"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Sirénido"
+
+#: data/units/Merman.cfg:19 data/units/Merman_Fighter.cfg:21
+#: data/units/Merman_Hoplite.cfg:22 data/units/Merman_Lord.cfg:21
+#: data/units/Merman_Triton.cfg:21 data/units/Merman_Triton.cfg:33
+#: data/units/Merman_Warrior.cfg:21 data/units/Naga.cfg:20
+#: data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr "tridente"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "enredar"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Luchador draco"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Sirénido"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Sirénido"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Saurio hechicero de hielo"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Lancero"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Traducción alemana"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Guerrero saurio"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr ""
@@ -5332,8 +5600,8 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5382,10 +5650,6 @@
 "Esconden sus caras tras máscaras para evitar que sus desdichados enemigos "
 "puedan ver la maldad pura de la que están hechas sus almas."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr ""
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Comandante noble"
@@ -5426,7 +5690,7 @@
 msgid "Ogre"
 msgstr "Ogro"
 
-#: data/units/Ogre.cfg:15
+#: data/units/Ogre.cfg:16
 msgid ""
 "Ogres are stupid giant humanoids that usually live alone in the wilderness. "
 "While they can be easily outrun or outsmarted, their strength is not to be "
@@ -5550,7 +5814,7 @@
 "vida."
 
 #: data/units/Orcish_Shaman.cfg:25 data/units/Orcish_Shaman.cfg:68
-#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:33
+#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:34
 msgid "curse"
 msgstr "maldición"
 
@@ -5659,7 +5923,7 @@
 "altamente respetado dentro de la tribu, y temido por sus enemigos. Su única "
 "debilidad es su incapacidad para usar un arco."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Forajido"
 
@@ -5667,6 +5931,11 @@
 msgid "Outlaws fight better at night."
 msgstr "Los forajidos luchan mejor de noche."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Forajido"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
@@ -5674,7 +5943,8 @@
 "estilo."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Princesa forajida"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5686,7 +5956,8 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Reina forajida"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5756,7 +6027,14 @@
 msgid "Pirate Galleon"
 msgstr "Galeón pirata"
 
-#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
+#: data/units/Pirate_Galleon.cfg:14
+msgid ""
+"Pirate galleons are to transport ships what wolves are to sheeps. Ships full "
+"of goods shouldn't be lonely, far away from any land, better to help them to "
+"avoid it being sunk from overloading..."
+msgstr ""
+
+#: data/units/Pirate_Galleon.cfg:16 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr "balista"
@@ -5773,7 +6051,7 @@
 "Los cazadores furtivos confían en su experiencia en la caza y son más "
 "valiosos en bosques y pantanos, y por la noche."
 
-#: data/units/Princess.cfg:19 data/units/Princess.cfg:57
+#: data/units/Princess.cfg:20 data/units/Princess.cfg:58
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@@ -5788,7 +6066,7 @@
 "presencia. La princesa es además ágil y diestra, teniendo habilidades casi "
 "de ladrón."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Mago Rojo"
 
@@ -5802,6 +6080,11 @@
 "Bueno tanto de día como de noche, y rápido en la marcha, el Mago Rojo es "
 "valioso en casi cualquier situación."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Mago Rojo"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Aparecido"
@@ -5919,10 +6202,11 @@
 msgstr "Guerrero saurio"
 
 #: data/units/Saurian_Warrior.cfg:17
+#, fuzzy
 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 "
+"valued as scouts as they can navigate through rough terrain and around "
 "opponents. Saurian Warriors posses the strength to take full advantage of "
 "this fact."
 msgstr ""
@@ -5934,7 +6218,8 @@
 "aprovecharse de ello."
 
 #: data/units/Sea_Hag.cfg:3
-msgid "Sea Hag"
+#, fuzzy
+msgid "female^Sea Hag"
 msgstr "Bruja marina"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5945,10 +6230,6 @@
 "Las brujas marinas son las nagas más viejas y más experimentadas, que han "
 "aprendido a controlar la magia del Agua."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "chorro de agua"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Orco marino"
@@ -6021,7 +6302,7 @@
 "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:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Mago de Plata"
 
@@ -6035,10 +6316,24 @@
 "Pueden teleportarse de una aldea amiga a otra en un instante. Asimismo, "
 "también son muy resistentes a la mayoría de formas de ataques mágicos."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Mago de Plata"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Dragón esquelético"
 
+#: data/units/Skeletal_Dragon.cfg:17
+msgid ""
+"Long ago one of the mightiest living creatures, the feared Dragon has become "
+"only bones and dark sinew. Long after its death, it was raised through the "
+"dark powers of necromancy, which it now serves. The Skeletal Dragon may look "
+"like nothing more than a pile of bones, but few people who thought that way "
+"lived long enough to change their minds."
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr "mordisco"
@@ -6107,6 +6402,10 @@
 "Estos muertos andantes se han hecho fuertes gracias a una larga experiencia "
 "luchando contra los vivos."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "plaga"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Lancero"
@@ -6315,17 +6614,18 @@
 "objetivos junto con su energía vital, dándole así su energía al 
murciélago."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Dama vampiro"
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
 "the blood of the living."
 msgstr ""
 "Fría y bella, mantiene su juventud eterna bebiendo la sangre de los vivos."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "beso de sangre"
 
@@ -6393,7 +6693,7 @@
 "Las Torres de guardia son buenos lugares para ver a los enemigos y luego "
 "lanzarles proyectiles con las balistas."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Mago Blanco"
 
@@ -6409,6 +6709,11 @@
 "en una aldea. El Mago Blanco es poderoso en las luchas con los no muertos, "
 "los cuales sufren muchos daños a causa de sus rayos de luz."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Mago Blanco"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Jinete de lobo"
@@ -6630,7 +6935,7 @@
 msgid "+ Bots"
 msgstr "+ Robots"
 
-#: src/about.cpp:276 src/help.cpp:2372 src/show_dialog.cpp:472
+#: src/about.cpp:276 src/help.cpp:2350 src/show_dialog.cpp:491
 msgid "Close"
 msgstr "Cerrar"
 
@@ -6651,73 +6956,73 @@
 msgid "none"
 msgstr "ninguna"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "daño básico"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "resistencia del atacante contra"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "debilidad del atacante contra"
 
-#: src/actions.cpp:363 src/actions.cpp:481 src/actions.cpp:490
+#: src/actions.cpp:365 src/actions.cpp:484 src/actions.cpp:493
 msgid "Doubled"
 msgstr "Doblado"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "daño neto"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "resistencia del defensor contra"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "debilidad del defensor contra"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "A la mitad"
 
-#: src/actions.cpp:714 src/actions.cpp:861 src/display.cpp:917
+#: src/actions.cpp:716 src/actions.cpp:862 src/display.cpp:917
 #: src/reports.cpp:115
 msgid "poisoned"
 msgstr "envenenado"
 
-#: src/actions.cpp:719 src/actions.cpp:866 src/display.cpp:913
+#: src/actions.cpp:721 src/actions.cpp:867 src/display.cpp:913
 #: src/reports.cpp:110
 msgid "slowed"
 msgstr "ralentizado"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "¡Emboscada!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "¡Aliado avistada!"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "¡Enemigo avistado!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends unidades aliadas avistadas"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "¡$enemies unidades enemigas avistadas!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Unidades avistadas ($friends aliadas, $enemies enemigas)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(pulse $hotkey para continuar)"
 
@@ -6777,7 +7082,7 @@
 msgid "replay"
 msgstr "repetición"
 
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1384
+#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1385
 msgid "Turn"
 msgstr "Turno"
 
@@ -6845,23 +7150,23 @@
 msgid "Profile"
 msgstr "Perfil"
 
-#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:567
-#: src/playturn.cpp:1793
+#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:564
+#: src/playturn.cpp:1794
 msgid "level"
 msgstr "nivel"
 
-#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:622
-#: src/playturn.cpp:1958 src/unit.cpp:1070
+#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:613
+#: src/playturn.cpp:1959 src/unit.cpp:1070
 msgid "Moves"
 msgstr "Movimientos"
 
-#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:230
+#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:230
 msgid "melee"
 msgstr "meleé"
 
-#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:231
+#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:231
 msgid "ranged"
 msgstr "distancia"
 
@@ -6881,11 +7186,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "¿Quiere guardar la repetición de este escenario?"
 
-#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1393
+#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1394
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1410
+#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1411
 msgid "The game could not be saved"
 msgstr "La partida no ha podido ser guardada"
 
@@ -6951,8 +7256,8 @@
 #: src/game.cpp:999 src/game.cpp:1014 src/game.cpp:1020 src/game.cpp:1053
 #: src/game.cpp:1082 src/game.cpp:1096 src/game.cpp:1098 src/game.cpp:1100
 #: src/game.cpp:1112 src/game.cpp:1115 src/game.cpp:1150 src/game.cpp:1152
-#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1396
-#: src/playturn.cpp:1410
+#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1397
+#: src/playturn.cpp:1411
 msgid "Error"
 msgstr "Error"
 
@@ -7015,7 +7320,7 @@
 "Hubo un problema al crear los ficheros necesarios para instalar esta 
campaña."
 
 #: src/game.cpp:1112 src/game.cpp:1150 src/game.cpp:1174
-#: src/multiplayer_client.cpp:42 src/multiplayer_client.cpp:314
+#: src/multiplayer_client.cpp:45 src/multiplayer_client.cpp:319
 msgid "Connection timed out"
 msgstr "Conexión terminada"
 
@@ -7071,7 +7376,7 @@
 msgid "Play a game against AI opponents"
 msgstr "Jugar una partida contra oponentes con IA"
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr "Entrar"
 
@@ -7091,79 +7396,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "No puedo iniciar tipografía. Saliendo.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Puede convertirse en"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Alineamiento"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "PX requeridos"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "ataques"
 
-#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1955
+#: src/help.cpp:636 src/help.cpp:637 src/playturn.cpp:1956
 msgid "Name"
 msgstr "Nombre"
 
-#: src/help.cpp:649 src/help.cpp:650 src/playturn.cpp:1954
+#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1955
 msgid "Type"
 msgstr "Tipo"
 
-#: src/help.cpp:653 src/help.cpp:654 src/unit_types.cpp:302
+#: src/help.cpp:644 src/help.cpp:645 src/unit_types.cpp:302
 msgid "Dmg"
 msgstr "Daño"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Ataques"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Alcance"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Especial"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Resistencias"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Tipo de ataque"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Resistencia"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Modificadores por terreno"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Terreno"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Defensa"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Atrás"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Adelante >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Sección de ayuda de La Batalla por Wesnoth"
 
@@ -7175,7 +7480,7 @@
 msgid "End Unit Turn"
 msgstr "Finalizar turno de unidad"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Líder"
 
@@ -7211,11 +7516,11 @@
 msgid "Unit Description"
 msgstr "Descripción de unidad"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Renombrar unidad"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Reclutar"
 
@@ -7223,7 +7528,7 @@
 msgid "Repeat Recruit"
 msgstr "Repetir reclutamiento"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Reincorporar"
 
@@ -7259,11 +7564,11 @@
 msgid "Scenario Objectives"
 msgstr "Objetivos del escenario"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Lista de unidades"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Estadísticas"
 
@@ -7371,7 +7676,7 @@
 msgid "Speak to All"
 msgstr "Hablar con todos"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Ayuda"
 
@@ -7431,7 +7736,7 @@
 msgid "Bump Size"
 msgstr "Elevación"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Aldeas"
 
@@ -7481,15 +7786,11 @@
 "No se verá al enemigo hasta que esté dentro del movimiento de las tropas "
 "propias"
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Oculto"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "El mapa será desconocido hasta que se explore"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Observadores"
 
@@ -7497,13 +7798,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Permite a usuarios que no juegan ver la partida"
 
-#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:145
-#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:460
-#: src/show_dialog.cpp:466
+#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:148
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:479
+#: src/show_dialog.cpp:485
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/multiplayer.cpp:120 src/show_dialog.cpp:446 src/show_dialog.cpp:459
+#: src/multiplayer.cpp:120 src/show_dialog.cpp:465 src/show_dialog.cpp:478
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -7580,69 +7881,69 @@
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Recibiendo lista de partidas..."
 
-#: src/multiplayer_client.cpp:121 src/multiplayer_connect.cpp:386
-#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1531
-#: src/playturn.cpp:1536 src/playturn.cpp:1623
+#: src/multiplayer_client.cpp:124 src/multiplayer_connect.cpp:386
+#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1532
+#: src/playturn.cpp:1537 src/playturn.cpp:1624
 msgid "Gold"
 msgstr "Oro"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Esperando a que la partida empiece..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 msgid "Connect to Host"
 msgstr "Conectar al servidor del juego"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Escoja servidor al que conectar"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Conectando al servidor remoto..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Debe entrar en el servidor"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Obteniendo datos de la partida..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "No hay más bandos disponibles en este juego."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Escoja su bando:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "La partida ha sido cancelada."
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "El bando que ha escogido ya no está disponible."
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 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:683 src/multiplayer_client.cpp:686
+#: src/multiplayer_client.cpp:688 src/multiplayer_client.cpp:691
 msgid "?"
 msgstr "?"
 
-#: src/multiplayer_client.cpp:777
+#: src/multiplayer_client.cpp:782
 msgid "Leader: "
 msgstr "Líder: "
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr "Reclutas: "
 
@@ -7674,8 +7975,8 @@
 msgid "Local Player"
 msgstr "Jugador local"
 
-#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:498
-#: src/multiplayer_connect.cpp:621 src/multiplayer_connect.cpp:727
+#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:496
+#: src/multiplayer_connect.cpp:610 src/multiplayer_connect.cpp:716
 msgid "Computer Player"
 msgstr "IA (computadora)"
 
@@ -7740,7 +8041,7 @@
 msgid "Color"
 msgstr "Color"
 
-#: src/multiplayer_connect.cpp:570 src/multiplayer_connect.cpp:574
+#: src/multiplayer_connect.cpp:559 src/multiplayer_connect.cpp:563
 msgid "Waiting for network players to join"
 msgstr "Esperando a que se unan jugadores..."
 
@@ -7825,56 +8126,56 @@
 msgid "It is now your turn"
 msgstr "Es su turno."
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Atacante"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Defensor"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Cálculos del daño"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Meleé"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "contra"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Atacar al enemigo"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Escoger arma"
 
-#: src/playturn.cpp:1125
+#: src/playturn.cpp:1126
 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:1134 src/playturn.cpp:1139
+#: src/playturn.cpp:1135 src/playturn.cpp:1140
 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:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Autoguardado"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 "El juego no se ha podido guardar automáticamente. Por favor, guárdelo "
 "manualmente."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -7882,35 +8183,35 @@
 "El nombre de la partida guardada no puede contener dos puntos, o barras "
 "inclinadas. Por favor, escoja un nombre diferente."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Guardado"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "El juego ha sido guardado."
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Ingresos"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Mantenimiento"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "No tiene unidades disponibles para reclutar."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Seleccionar unidad"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "No tiene suficiente oro para reclutar a esta unidad."
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1730
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
@@ -7918,7 +8219,7 @@
 "¡Mi señor, esta unidad es veterana y tiene experiencia! ¿Realmente 
queréis "
 "licenciar a $noun?"
 
-#: src/playturn.cpp:1731
+#: src/playturn.cpp:1732
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
@@ -7926,19 +8227,19 @@
 "¡Mi señor, está unidad está a punto de subir de nivel! ¿Realmente 
queréis "
 "licenciar a $noun?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "ella"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "él"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 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:1779
+#: src/playturn.cpp:1780
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
@@ -7946,88 +8247,88 @@
 "No hay tropas disponibles para reincorporar.\n"
 "(Debe tener veteranos supervivientes de escenarios previos.)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 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:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Licenciar unidad"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Mensaje"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Mandarlo sólo a aliados"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Lugar"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Reclutas"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Veteranos"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Avances"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Pérdidas"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Muertos"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Daño infligido"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Daño recibido"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Daño infligido (VE)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Daño recibido (VE)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Buscar"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Orden:"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Registro de conversaciones"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 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:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Poner etiqueta"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Etiqueta"
 
-#: src/playturn.cpp:2421
+#: src/playturn.cpp:2422
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
@@ -8035,23 +8336,23 @@
 "El juego no está sincronizado y tendrá que salir. ¿Quiere guardar un "
 "registro de error de su partida?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Reemplazar con IA"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Reemplazar con jugador local"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Terminar juego"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Reemplazar con "
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "ha dejado el juego. ¿Qué quiere hacer?"
 
@@ -8112,63 +8413,63 @@
 msgid "Chaotic units"
 msgstr "Unidades caóticas"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Aldea propia"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Aldea enemiga"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Aldea aliada"
 
-#: src/show_dialog.cpp:934
+#: src/show_dialog.cpp:953
 msgid "KB"
 msgstr "KB"
 
-#: src/titlescreen.cpp:149
+#: src/titlescreen.cpp:155
 msgid "Version"
 msgstr "Versión"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Tutorial"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Campaña"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Multijugador"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Cargar"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Idioma"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Preferencias"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Salir"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Jugar un tutorial para familiarizarse con el juego"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Empieza una nueva campaña para un solo jugador"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -8176,31 +8477,31 @@
 "Juega en modo multijugador (varios jugadores, LAN, o Internet), o solo en un "
 "escenario contra la IA"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Carga una partida grabada"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Cambia el idioma"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Configura los parámetros del juego"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Muestra a los colaboradores"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Salir del juego"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Más"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Compendio de Guerra y Virtud"
 
@@ -8208,15 +8509,15 @@
 msgid "strikes"
 msgstr "ataques"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "caótico"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "legal"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutral"
 
@@ -8228,6 +8529,18 @@
 msgid "Deletion of the file failed."
 msgstr "Ha habido algún fallo en el proceso de borrado."
 
+#~ msgid "first strike"
+#~ msgstr "ataca primero"
+
+#~ msgid "Swamp"
+#~ msgstr "Pantano"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Hospedar partida multijugador"
 
@@ -8383,9 +8696,6 @@
 #~ msgid "I think I know what I'm doing. Come, let us go!"
 #~ msgstr "Creo que sé lo que estoy haciendo. ¡Venga, vamos!"
 
-#~ msgid "Snow Plains"
-#~ msgstr "Los Llanos nevados"
-
 #~ msgid "Swamp Of Dread"
 #~ msgstr "El pantano del terror"
 
@@ -8528,9 +8838,6 @@
 #~ msgid "Really?  But my people..."
 #~ msgstr "¿De verdad?  Pero mi gente ..."
 
-#~ msgid "Silent Forest"
-#~ msgstr "Bosque del Silencio"
-
 #~ msgid "The Siege Of Barag Gór"
 #~ msgstr "El asedio de Barag Gór"
 
Index: wesnoth/po/wesnoth/eu.po
diff -u wesnoth/po/wesnoth/eu.po:1.9 wesnoth/po/wesnoth/eu.po:1.10
--- wesnoth/po/wesnoth/eu.po:1.9        Sun Oct 17 12:52:53 2004
+++ wesnoth/po/wesnoth/eu.po    Thu Oct 21 20:22:40 2004
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.4-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-09-19 16:07+0200\n"
 "Last-Translator:  Alfredo Beaumont Sainz <address@hidden>\n"
 "Language-Team: Basque\n"
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "leial"
 
@@ -48,11 +48,11 @@
 msgid "Traits"
 msgstr "Berezitasunak"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr ""
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr ""
 
@@ -138,7 +138,7 @@
 "Upkeep'</ref> for more information."
 msgstr ""
 
-#: data/help.cfg:84 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:84 src/help.cpp:747 src/help.cpp:748
 msgid "Movement"
 msgstr "Mugimendua"
 
@@ -372,7 +372,7 @@
 "fun, and good luck!"
 msgstr ""
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr ""
 
@@ -614,7 +614,7 @@
 msgstr ""
 
 #: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:196
-#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:658
+#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:663
 msgid "&random-enemy.png,Random"
 msgstr "&random-enemy.png,Ausazkoa"
 
@@ -739,6 +739,24 @@
 msgid "Random map"
 msgstr "Ausazko mapa"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Ausazko mapa"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Ausazko mapa"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Ausazko mapa"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr ""
@@ -778,7 +796,7 @@
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/Basic_Training.cfg:276
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
-#: src/show_dialog.cpp:453
+#: src/show_dialog.cpp:472
 msgid "No"
 msgstr "Ez"
 
@@ -1248,7 +1266,7 @@
 
 #: data/scenarios/tutorial/Basic_Training.cfg:262
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
-#: src/show_dialog.cpp:452
+#: src/show_dialog.cpp:471
 msgid "Yes"
 msgstr ""
 
@@ -1679,6 +1697,108 @@
 msgid "Underground"
 msgstr ""
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr ""
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr ""
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr ""
+
+#: data/terrain.cfg:39 data/terrain.cfg:60 data/terrain.cfg:139
+#: data/terrain.cfg:148 data/terrain.cfg:166 data/terrain.cfg:229
+#: src/reports.cpp:309
+msgid "Village"
+msgstr ""
+
+#: data/terrain.cfg:51
+msgid "Swamp Water"
+msgstr ""
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Izotza"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Zubia"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Hondarra"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Bidea"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr ""
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr ""
+
+#: data/terrain.cfg:158
+msgid "Snow"
+msgstr ""
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Medilerroak"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Mendiak"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Basoa"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+msgid "Cave wall"
+msgstr ""
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr ""
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Gaztelua"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Kanpamentua"
+
+#: data/terrain.cfg:258
+msgid "Dwarven castle"
+msgstr ""
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr ""
+
+#: data/terrain.cfg:288
+msgid "Canyon"
+msgstr ""
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr ""
@@ -1692,14 +1812,14 @@
 msgstr ""
 
 #: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:670
-#: src/display.cpp:941 src/help.cpp:621 src/playturn.cpp:1956
+#: src/display.cpp:941 src/help.cpp:612 src/playturn.cpp:1957
 #: src/unit.cpp:1034
 msgid "HP"
 msgstr ""
 
 #: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:674
 #: src/dialogs.cpp:682 src/display.cpp:945 src/display.cpp:953
-#: src/playturn.cpp:1795 src/playturn.cpp:1957 src/unit.cpp:1093
+#: src/playturn.cpp:1796 src/playturn.cpp:1958 src/unit.cpp:1093
 msgid "XP"
 msgstr ""
 
@@ -1767,24 +1887,23 @@
 "Night: +25% Damage"
 msgstr ""
 
-#: data/translations/english.cfg:23
+#: data/translations/english.cfg:21
 msgid ""
-"Heals:\n"
-"Allows the unit to heal adjacent friendly units at the beginning of the "
-"turn.\n"
+"Ambush:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"A unit cared for by a healer may heal up to 4 HP per turn.\n"
-"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
-"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
-"care of a village or a unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 msgstr ""
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "sendatzen du"
+#: data/translations/english.cfg:23 data/units/Elvish_Avenger.cfg:18
+#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
+#: data/units/Elvish_Ranger.cfg:94
+msgid "ambush"
+msgstr ""
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 msgid ""
 "Cures:\n"
 "This unit combines herbal remedies with magic to heal units more quickly "
@@ -1798,24 +1917,45 @@
 "additional healing on the turn it is cured of the poison."
 msgstr ""
 
-#: data/translations/english.cfg:35 data/units/Elvish_Druid.cfg:19
-#: data/units/Elvish_Shyde.cfg:19 data/units/White_Mage.cfg:12
-#: data/units/White_Mage.cfg:71
+#: data/translations/english.cfg:33 data/units/Elvish_Druid.cfg:19
+#: data/units/Elvish_Shyde.cfg:19 data/units/Mermaid_Priestess.cfg:7
+#: data/units/White_Mage.cfg:12 data/units/White_Mage.cfg:71
 msgid "cures"
 msgstr "osatzen du"
 
-#: data/translations/english.cfg:38
+#: data/translations/english.cfg:40
 msgid ""
-"Teleport:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heals:\n"
+"Allows the unit to heal adjacent friendly units at the beginning of the "
+"turn.\n"
+"\n"
+"A unit cared for by a healer may heal up to 4 HP per turn.\n"
+"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
+"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
+"care of a village or a unit that can cure."
 msgstr ""
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "sendatzen du"
+
+#: data/translations/english.cfg:47
+msgid ""
+"Illuminates:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
 msgstr ""
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "argitzen du, osatzen du"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -1824,7 +1964,7 @@
 "Adjacent friendly units of lower level will do more damage in battle."
 msgstr ""
 
-#: data/translations/english.cfg:47 data/units/Commander.cfg:11
+#: data/translations/english.cfg:56 data/units/Commander.cfg:11
 #: data/units/Commander.cfg:86 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
@@ -1833,229 +1973,227 @@
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
 #: data/units/Noble_Commander.cfg:10 data/units/Noble_Lord.cfg:10
 #: 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:353 src/actions.cpp:471
+#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
+#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:355 src/actions.cpp:474
 msgid "leadership"
 msgstr ""
 
-#: data/translations/english.cfg:52
+#: data/translations/english.cfg:59
+msgid ""
+"Loyal:\n"
+"Never more than 1 upkeep."
+msgstr ""
+
+#: data/translations/english.cfg:64
 msgid ""
-"Ambush:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
 
-#: data/translations/english.cfg:54 data/units/Elvish_Avenger.cfg:18
-#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
-#: data/units/Elvish_Ranger.cfg:94
-msgid "ambush"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
 msgstr ""
 
-#: data/translations/english.cfg:59
+#: data/translations/english.cfg:69
 msgid ""
-"Illuminates:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
+"Regenerates:\n"
+"The unit will heal itself 8 hp per turn. If it is poisoned, it will remove "
+"the poison instead of healing."
 msgstr ""
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "argitzen du, osatzen du"
+#: data/translations/english.cfg:71 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_Rocklobber.cfg:7
+#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+msgid "regenerates"
+msgstr "birsortzen du"
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 msgid ""
 "Skirmisher:\n"
 "This unit is skilled in moving past enemies quickly, and ignores all Enemy "
 "Zones of Control."
 msgstr ""
 
-#: data/translations/english.cfg:66 data/units/Assassin.cfg:16
+#: data/translations/english.cfg:76 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:19 data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr ""
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr ""
-
-#: data/translations/english.cfg:72
-msgid "This unit takes half normal damage when it did not initiate the attack."
+#: data/translations/english.cfg:79
+msgid ""
+"Steadfast:\n"
+"This unit takes half normal damage when it did not initiate the attack."
 msgstr ""
 
-#: data/translations/english.cfg:74 data/units/Dwarvish_Guardsman.cfg:15
+#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
 #: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: src/actions.cpp:499
+#: data/units/Merman_Hoplite.cfg:13 src/actions.cpp:502
 msgid "steadfast"
 msgstr ""
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr ""
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr ""
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Jokua"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr ""
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr ""
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr ""
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr ""
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr ""
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Erabilita"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Erabilgarria"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Behatzailea"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr ""
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr ""
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr ""
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr ""
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Abiadura:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr ""
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr ""
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Aukerar"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr ""
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr ""
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr ""
 
-#: data/translations/english.cfg:107
+#: data/translations/english.cfg:119
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain"
 msgstr ""
 
-#: data/translations/english.cfg:108
+#: data/translations/english.cfg:120
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain"
 msgstr ""
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "edo"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr ""
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr ""
 
-#: data/translations/english.cfg:117
+#: data/translations/english.cfg:129
 msgid ""
 "Backstab:\n"
 "This attack deals double damage if a friendly unit is on the opposite side "
 "of the target."
 msgstr ""
 
-#: data/translations/english.cfg:119 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:490
-msgid "backstab"
+#: data/translations/english.cfg:132
+msgid ""
+"Berserk:\n"
+"Whether used offensively or defensively, this attack presses the engagement "
+"until one of the combatants is slain."
 msgstr ""
 
-#: data/translations/english.cfg:122
+#: data/translations/english.cfg:135
 msgid ""
 "Charge:\n"
 "This attack deals double damage to the target. It also causes this unit to "
 "take double damage from the target's counterattack."
 msgstr ""
 
-#: data/translations/english.cfg:124 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:363 src/actions.cpp:481
-msgid "charge"
-msgstr ""
-
-#: data/translations/english.cfg:127
+#: data/translations/english.cfg:138
 msgid ""
 "Drain:\n"
 "This unit drains health from living units, healing itself for half the "
 "amount of damage it deals."
 msgstr ""
 
-#: data/translations/english.cfg:129 data/units/Ancient_Lich.cfg:24
-#: data/units/Blood_Bat.cfg:24 data/units/Dark_Spirit.cfg:24
-#: data/units/Demilich.cfg:23 data/units/Lich.cfg:24
-#: data/units/Orcish_Shaman.cfg:30 data/units/Orcish_Shaman.cfg:73
-#: data/units/Orcish_Shaman.cfg:116 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Spectre.cfg:24 data/units/Vampire_Bat.cfg:24
-#: data/units/Vampire_Lady.cfg:25 data/units/Vampire_Lady.cfg:38
-#: data/units/Wraith.cfg:24
-msgid "drain"
-msgstr "odolxurgapena"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2063,56 +2201,20 @@
 "Magikoa:\n"
 "Eraso honek beti jotzeko 70% aukera du."
 
-#: data/translations/english.cfg:134 data/units/Ancient_Lich.cfg:34
-#: data/units/Arch_Mage.cfg:42 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/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:64 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 data/units/Mage.cfg:39
-#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
-#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
-#: data/units/Princess.cfg:79 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 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 "magikoa"
-
-#: data/translations/english.cfg:137
+#: data/translations/english.cfg:147
 msgid ""
 "Marksman:\n"
 "When used offensively, this attack always has at least a 60% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:139 data/units/Elvish_Marksman.cfg:39
-#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
-msgid "marksman"
-msgstr ""
-
-#: data/translations/english.cfg:142
+#: data/translations/english.cfg:150
 msgid ""
 "Plague:\n"
 "If this unit kills a living target and that unit was not stationed in a "
 "village, the dead target's corpse will rise up and fight for you."
 msgstr ""
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr ""
-
-#: data/translations/english.cfg:147
+#: data/translations/english.cfg:153
 msgid ""
 "Poison:\n"
 "This attack poisons the target. Poisoned units lose 8 HP every turn until "
@@ -2122,234 +2224,115 @@
 "Eraso honek arerioa pozoitzen du. Pozoindutako unitateak 8 BP galtzen dute "
 "txanda bakoitzean osatuak izan arte edo BP 1 izan arte"
 
-#: data/translations/english.cfg:149 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:38
-#: data/units/Necrophage.cfg:24 data/units/Orcish_Assassin.cfg:41
-#: data/units/Orcish_Slayer.cfg:46
-msgid "poison"
-msgstr "pozoia"
-
-#: data/translations/english.cfg:152
+#: data/translations/english.cfg:156
 msgid ""
 "Slow:\n"
 "This attack slows the target. Slowed units move at half normal speed and "
 "receive one less attack than normal in combat for the duration of one turn."
 msgstr ""
 
-#: data/translations/english.cfg:154 data/units/Cave_Spider.cfg:38
-#: data/units/Elvish_Druid.cfg:44 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 ""
-
-#: data/translations/english.cfg:157
-msgid ""
-"Stone:\n"
-"This attack turns the target to stone. Units that have been turned to stone "
-"may not move or attack."
-msgstr ""
-
-#: data/translations/english.cfg:159 data/units/Cockatrice.cfg:26
-#: src/actions.cpp:728 src/actions.cpp:876 src/reports.cpp:122
-msgid "stone"
-msgstr ""
-
-#: data/translations/english.cfg:162
-msgid ""
-"Berserk:\n"
-"Whether used offensively or defensively, this attack presses the engagement "
-"until one of the combatants is slain."
-msgstr ""
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr ""
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr ""
-
-#: data/translations/english.cfg:172
-msgid "Elves"
-msgstr ""
-
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr ""
-
-#: data/translations/english.cfg:174
-msgid "Humans"
-msgstr "Gizakiak"
-
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr ""
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr ""
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr ""
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Hondarra"
-
-#: data/translations/english.cfg:182 data/translations/english.cfg:184
-#: data/translations/english.cfg:185 data/translations/english.cfg:186
-#: data/translations/english.cfg:187 data/translations/english.cfg:188
-#: src/reports.cpp:310
-msgid "Village"
-msgstr ""
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr ""
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Izotza"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Bidea"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr ""
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr ""
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Medilerroak"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Mendiak"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Basoa"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Zubia"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Gaztelua"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
+#: data/translations/english.cfg:159
+msgid ""
+"Stone:\n"
+"This attack turns the target to stone. Units that have been turned to stone "
+"may not move or attack."
 msgstr ""
 
-#: data/translations/english.cfg:202
-msgid "Cave"
+#: data/translations/english.cfg:162
+msgid "Elves"
 msgstr ""
 
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
+#: data/translations/english.cfg:163
+msgid "Humans"
+msgstr "Gizakiak"
+
+#: data/translations/english.cfg:164
+msgid "Orcs"
 msgstr ""
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Kanpamentua"
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr ""
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr ""
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr ""
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr ""
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "$name Basoa,$nameko Basoa"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "$name Lakua"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr ""
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "$name Basoa,$nameko Basoa"
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ""
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr ""
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr ""
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr ""
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr ""
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Hurrengo iradokizuna"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Iradokizunak"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Ez erakutsi iradokizunik"
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
 msgstr ""
 
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:186
 msgid ""
 "In a campaign, you can use veteran units from previous scenarios by using "
 "the 'recall' option."
 msgstr ""
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
 "Different units have weaknesses against different types of attacks. Right-"
@@ -2358,7 +2341,7 @@
 "types."
 msgstr ""
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
 "hitting them in battle. The defensive rating for the currently selected unit "
@@ -2366,7 +2349,7 @@
 "the screen."
 msgstr ""
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
 "poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -2374,83 +2357,83 @@
 "the 'cure' ability."
 msgstr ""
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
 "menu. By recalling the same units over and over, you can build up a powerful "
 "and experienced army."
 msgstr ""
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
 "unit moves into an enemy's Zone of Control, it may not move any further that "
 "turn."
 msgstr ""
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
 "itself in the terrain it is standing in, however magical attacks always have "
 "a 70% chance to hit, and marksman attacks have at least 60% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
 msgstr ""
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
 "hitpoints at the beginning of their next turn."
 msgstr ""
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
 "terrain, while most mounted units don't get any defensive advantage in "
 "villages and castles."
 msgstr ""
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
 "weapons, but are vulnerable to attacks with piercing weapons, including bows "
 "and spears."
 msgstr ""
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
 "experience. Units killing an enemy will gain 8 experience for every level of "
 "the unit they kill."
 msgstr ""
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
 "fight very well in hills and mountains."
 msgstr ""
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
 "troops, wait for better conditions and then attack."
 msgstr ""
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
 "expendable units in some directions to delay enemy units."
 msgstr ""
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
 msgstr ""
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
 "depending on the number of villages on the map, and the number of turns you "
@@ -2458,7 +2441,7 @@
 "villages and waiting for turns to run out."
 msgstr ""
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
 "just the keep they start on. You can capture a keep from an enemy and "
@@ -2466,75 +2449,75 @@
 "for you on their keep so you can recruit there."
 msgstr ""
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
 "impact, fire, and holy attacks."
 msgstr ""
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
 "side fight better."
 msgstr ""
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
 "onto the village and attack you, while enjoying the defense and healing of "
 "the village."
 msgstr ""
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
 "ability or trait."
 msgstr ""
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr ""
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
 "you can undo your move by pressing 'u'."
 msgstr ""
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
 "them."
 msgstr ""
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
 "needing to attack anything themselves."
 msgstr ""
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
 "them one less attack than they would normally have. It is thus very "
 "effective against units that have a few powerful attacks."
 msgstr ""
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr ""
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
 "fight."
 msgstr ""
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
@@ -2560,7 +2543,7 @@
 
 #: data/units/Ancient_Lich.cfg:20 data/units/Ancient_Lich.cfg:33
 #: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
-#: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
+#: data/units/Dark_Queen.cfg:28 data/units/Dark_Queen.cfg:29
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
 #: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
@@ -2573,12 +2556,49 @@
 msgid "cold"
 msgstr "hotz"
 
+#: data/units/Ancient_Lich.cfg:24 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:23
+#: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:30
+#: data/units/Orcish_Shaman.cfg:73 data/units/Orcish_Shaman.cfg:116
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
+#: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:24
+msgid "drain"
+msgstr "odolxurgapena"
+
 #: data/units/Ancient_Lich.cfg:32 data/units/Deathmaster.cfg:35
 #: data/units/Demilich.cfg:31 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr "magia"
 
+#: data/units/Ancient_Lich.cfg:34 data/units/Arch_Mage.cfg:42
+#: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:30 data/units/Deathmaster.cfg:37
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:64
+#: 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
+#: data/units/Mage.cfg:39 data/units/Mage.cfg:106
+#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
+#: data/units/Mermaid_Diviner.cfg:37 data/units/Mermaid_Enchantress.cfg:35
+#: data/units/Mermaid_Initiate.cfg:35 data/units/Mermaid_Priestess.cfg:35
+#: data/units/Mermaid_Siren.cfg:26 data/units/Mermaid_Siren.cfg:37
+#: data/units/Necromancer.cfg:37 data/units/Princess.cfg:80
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: 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 "magikoa"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr ""
@@ -2604,7 +2624,7 @@
 #: 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/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:22
 #: 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
@@ -2612,19 +2632,24 @@
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
 #: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:24
 #: data/units/Elvish_Druid.cfg:43 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:20
 #: 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/Footpad.cfg:38 data/units/Galleon.cfg:19 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: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/Mermaid_Diviner.cfg:27 data/units/Mermaid_Enchantress.cfg:24
+#: data/units/Mermaid_Enchantress.cfg:33 data/units/Mermaid_Initiate.cfg:24
+#: data/units/Mermaid_Initiate.cfg:33 data/units/Mermaid_Priestess.cfg:25
+#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
+#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
 #: data/units/Noble_Youth.cfg:22 data/units/Outlaw.cfg:21
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2644,7 +2669,7 @@
 msgid "impact"
 msgstr "kolpea"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr ""
 
@@ -2659,6 +2684,8 @@
 #: data/units/Elvish_Druid.cfg:23 data/units/Elvish_Enchantress.cfg:25
 #: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
+#: data/units/Mermaid_Diviner.cfg:26 data/units/Mermaid_Enchantress.cfg:23
+#: data/units/Mermaid_Initiate.cfg:23 data/units/Mermaid_Priestess.cfg:24
 #: 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
@@ -2674,7 +2701,7 @@
 msgstr "subola"
 
 #: 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/Battle_Princess.cfg:78 data/units/Commander.cfg:121
 #: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
 #: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
@@ -2686,12 +2713,16 @@
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/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/Princess.cfg:78 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
 #: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr "su"
 
+#: data/units/Arch_Mage.cfg:82
+msgid "female^Arch Mage"
+msgstr ""
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Hiltzailea"
@@ -2716,7 +2747,7 @@
 msgstr "daga"
 
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
-#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
 #: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
@@ -2754,21 +2785,22 @@
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Lord.cfg:86
 #: data/units/Mage.cfg:21 data/units/Mage.cfg:88
-#: data/units/Master_Bowman.cfg:21 data/units/Necrophage.cfg:20
-#: data/units/Nightgaunt.cfg:21 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: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 data/units/Orcish_Shaman.cfg:105
-#: data/units/Orcish_Slayer.cfg:20 data/units/Orcish_Slayer.cfg:42
-#: data/units/Orcish_Sovereign.cfg:22 data/units/Orcish_Warlord.cfg:19
-#: data/units/Orcish_Warrior.cfg:20 data/units/Poacher.cfg:25
-#: data/units/Princess.cfg:23 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/Master_Bowman.cfg:21 data/units/Merman_Triton.cfg:34
+#: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
+#: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
+#: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:20
+#: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
+#: 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
+#: data/units/Orcish_Shaman.cfg:105 data/units/Orcish_Slayer.cfg:20
+#: data/units/Orcish_Slayer.cfg:42 data/units/Orcish_Sovereign.cfg:22
+#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:20
+#: data/units/Poacher.cfg:25 data/units/Princess.cfg:24
+#: data/units/Princess.cfg:62 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:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
@@ -2776,16 +2808,30 @@
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:20
 #: data/units/Swordsman.cfg:20 data/units/Thief.cfg:20
 #: data/units/Trapper.cfg:25 data/units/Vampire_Bat.cfg:20
-#: data/units/Vampire_Lady.cfg:20 data/units/White_Mage.cfg:29
+#: data/units/Vampire_Lady.cfg:21 data/units/White_Mage.cfg:29
 #: data/units/White_Mage.cfg:88 data/units/Wolf_Rider.cfg:21
 #: data/units/Wraith.cfg:20 data/units/Young_Ogre.cfg:19
 msgid "blade"
 msgstr ""
 
+#: 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:493
+msgid "backstab"
+msgstr ""
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "aizto"
 
+#: 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:38 data/units/Necrophage.cfg:24
+#: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
+msgid "poison"
+msgstr "pozoia"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bidelapur"
@@ -2808,16 +2854,16 @@
 msgid "mace"
 msgstr "matrailu"
 
-#: data/units/Battle_Princess.cfg:3 data/units/Battle_Princess.cfg:41
-#: data/units/Princess.cfg:3 data/units/Princess.cfg:41
-msgid "Princess"
+#: data/units/Battle_Princess.cfg:3 data/units/Princess.cfg:3
+#, fuzzy
+msgid "female^Princess"
 msgstr "Printzesa"
 
-#: data/units/Battle_Princess.cfg:17 data/units/Battle_Princess.cfg:55
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:19
+#: data/units/Battle_Princess.cfg:20
 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 "
@@ -2825,7 +2871,7 @@
 "now aid those around them in the art of combat."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:22 data/units/Battle_Princess.cfg:60
+#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
 #: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
@@ -2849,18 +2895,22 @@
 #: data/units/Longbowman.cfg:21 data/units/Lord.cfg:22 data/units/Lord.cfg:85
 #: data/units/Master_Bowman.cfg:20 data/units/Noble_Commander.cfg:23
 #: data/units/Noble_Fighter.cfg:20 data/units/Noble_Lord.cfg:22
-#: data/units/Ogre.cfg:18 data/units/Orcish_Grunt.cfg:19
+#: data/units/Ogre.cfg:19 data/units/Orcish_Grunt.cfg:19
 #: data/units/Orcish_Leader.cfg:21 data/units/Orcish_Ruler.cfg:21
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
-#: data/units/Princess.cfg:22 data/units/Princess.cfg:60
+#: data/units/Princess.cfg:23 data/units/Princess.cfg:61
 #: 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 "ezpata"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Printzesa"
+
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -2869,9 +2919,9 @@
 "and ignores enemy zones of control."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:76 data/units/Commander.cfg:120
+#: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
-#: data/units/Princess.cfg:76
+#: data/units/Princess.cfg:77
 msgid "scepter of fire"
 msgstr ""
 
@@ -2959,7 +3009,13 @@
 #: 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:22
+#: data/units/Merman.cfg:20 data/units/Merman_Entangler.cfg:19
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:23
+#: data/units/Merman_Hunter.cfg:19 data/units/Merman_Hunter.cfg:27
+#: data/units/Merman_Javelineer.cfg:19 data/units/Merman_Javelineer.cfg:27
+#: data/units/Merman_Lord.cfg:22 data/units/Merman_Netcaster.cfg:19
+#: data/units/Merman_Spearman.cfg:19 data/units/Merman_Spearman.cfg:27
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Warrior.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:41 data/units/Orcish_Crossbowman.cfg:39
@@ -2968,7 +3024,7 @@
 #: 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:16
+#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
 #: 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
@@ -2976,7 +3032,7 @@
 #: 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:17 data/units/Trapper.cfg:42
-#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:34
+#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:35
 #: data/units/Wall_Guard.cfg:36 data/units/Watch_Tower.cfg:18
 msgid "pierce"
 msgstr ""
@@ -3035,6 +3091,14 @@
 msgid "web"
 msgstr ""
 
+#: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:44
+#: 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
+#: data/units/Merman_Entangler.cfg:29 data/units/Merman_Netcaster.cfg:29
+msgid "slow"
+msgstr ""
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr ""
@@ -3053,13 +3117,24 @@
 #: 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/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
+#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
+#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
+#: data/units/Merman_Spearman.cfg:26 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 ""
 
+#: 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:365
+#: src/actions.cpp:484
+msgid "charge"
+msgstr ""
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr ""
@@ -3075,6 +3150,11 @@
 msgid "gaze"
 msgstr ""
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr ""
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Komandantea"
@@ -3133,17 +3213,18 @@
 msgstr ""
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Itzaletako Erregina"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 msgid ""
 "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 ""
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr ""
 
@@ -3397,6 +3478,12 @@
 "weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
+#: data/units/Drake_Slasher.cfg:42 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 ""
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr ""
@@ -3438,6 +3525,10 @@
 msgid "berserker frenzy"
 msgstr ""
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr ""
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr ""
@@ -3590,6 +3681,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr ""
 
+#: data/units/Dwarvish_Ulfserker.cfg:16
+msgid ""
+"Dwarves are an ancient race of powerful fighters. Ulfserkers are the most "
+"ferocious of these in battle: they attack without stopping fighting until "
+"either their enemy or they are dead, no matter how many wounds they receive."
+msgstr ""
+
 #: data/units/Elder_Mage.cfg:3
 msgid "Elder Mage"
 msgstr ""
@@ -3619,7 +3717,7 @@
 "can quickly heal themselves in the face of tremendous injuries."
 msgstr ""
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr "Elfo Arkularia"
 
@@ -3630,7 +3728,12 @@
 "make up a large portion of the Elvish military."
 msgstr ""
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Elfo Arkularia"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr ""
 
@@ -3642,6 +3745,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Elfo Basajauna"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Elfo Kapitaina"
@@ -3665,7 +3773,8 @@
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Elfo Aztia"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -3685,7 +3794,7 @@
 
 #: data/units/Elvish_Enchantress.cfg:3
 #, fuzzy
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr "Elfo Basajauna"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -3738,10 +3847,18 @@
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
-msgstr ""
+#, fuzzy
+msgid "female^Elvish Lady"
+msgstr "Elfo Jauna"
 
 #: data/units/Elvish_Lady.cfg:17
+msgid ""
+"Elvish lady Parandra is one of the most respected elves ever. Her ability to "
+"see through the fogs of destiny has gained her a wisely used authority among "
+"her people, guiding them in times of uncertainty."
+msgstr ""
+
+#: data/units/Elvish_Lady.cfg:19
 #, fuzzy
 msgid "shove"
 msgstr "Mugimenduak"
@@ -3756,7 +3873,7 @@
 "devastating balls of fire at long range."
 msgstr ""
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr ""
 
@@ -3774,6 +3891,16 @@
 msgid "longbow"
 msgstr ""
 
+#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
+#: data/units/Elvish_Sharpshooter.cfg:40
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+msgid "marksman"
+msgstr ""
+
+#: data/units/Elvish_Marksman.cfg:80
+msgid "female^Elvish Marksman"
+msgstr ""
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr ""
@@ -3797,7 +3924,7 @@
 "they strike hard before melting into the woods again to evade response."
 msgstr ""
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Elfo Basajauna"
 
@@ -3809,6 +3936,11 @@
 "just made an attack, or there are enemies adjacent to them."
 msgstr ""
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Elfo Basajauna"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr ""
@@ -3830,8 +3962,9 @@
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
-msgstr ""
+#, fuzzy
+msgid "female^Elvish Shaman"
+msgstr "Elfo Txapelduna"
 
 #: data/units/Elvish_Shaman.cfg:20
 msgid ""
@@ -3840,7 +3973,7 @@
 "they may attack. Shamans also possess basic healing abilities."
 msgstr ""
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr ""
 
@@ -3852,8 +3985,12 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+msgid "female^Elvish Sharpshooter"
+msgstr ""
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+msgid "female^Elvish Shyde"
 msgstr ""
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -3869,7 +4006,7 @@
 
 #: data/units/Elvish_Sorceress.cfg:3
 #, fuzzy
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr "Elfo Arkularia"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -3882,7 +4019,7 @@
 
 #: data/units/Elvish_Sylph.cfg:3
 #, fuzzy
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr "Elfo Arkularia"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -3974,7 +4111,15 @@
 msgid "Galleon"
 msgstr "Ontzia"
 
-#: data/units/Galleon.cfg:17
+#: data/units/Galleon.cfg:16
+msgid ""
+"Even people happily living in their home eventually need some kind of "
+"transport through the seas, even if they only go fishing or to trade goods. "
+"The galleon is perfect for this purpose: it's fast and resilient, but not "
+"prepared to fight, and is able to adapt to many different tasks."
+msgstr ""
+
+#: data/units/Galleon.cfg:18
 msgid "dummy"
 msgstr ""
 
@@ -4066,12 +4211,6 @@
 "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 ""
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Goblin Gerlaria"
@@ -4096,7 +4235,8 @@
 msgid "torch"
 msgstr ""
 
-#: data/units/Goblin_Pillager.cfg:35
+#: data/units/Goblin_Pillager.cfg:35 data/units/Merman_Entangler.cfg:26
+#: data/units/Merman_Netcaster.cfg:26
 msgid "net"
 msgstr ""
 
@@ -4141,7 +4281,7 @@
 "serving beneath them."
 msgstr ""
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 msgid "Great Mage"
 msgstr "Mago Handia"
 
@@ -4151,17 +4291,15 @@
 "in power."
 msgstr ""
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Mago Handia"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Troll Handia"
 
-#: 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_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
-#: data/units/Troll_Whelp.cfg:7
-msgid "regenerates"
-msgstr "birsortzen du"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4330,7 +4468,7 @@
 "level units."
 msgstr ""
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Magoa"
 
@@ -4346,11 +4484,16 @@
 msgid "missile"
 msgstr ""
 
-#: data/units/Mage_of_Light.cfg:3 data/units/Mage_of_Light.cfg:66
+#: data/units/Mage.cfg:70
+msgid "female^Mage"
+msgstr ""
+
+#: data/units/Mage_of_Light.cfg:3
 msgid "Mage of Light"
 msgstr "Argiaren Magoa"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "argitzen du, osatzen du"
 
@@ -4366,16 +4509,23 @@
 msgstr ""
 
 #: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
+#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
 #: data/units/White_Mage.cfg:44 data/units/White_Mage.cfg:103
 msgid "lightbeam"
 msgstr "argi izpia"
 
 #: data/units/Mage_of_Light.cfg:46 data/units/Mage_of_Light.cfg:106
+#: data/units/Mermaid_Diviner.cfg:35 data/units/Mermaid_Priestess.cfg:33
 #: data/units/Paladin.cfg:26 data/units/White_Mage.cfg:45
 #: data/units/White_Mage.cfg:104
 msgid "holy"
 msgstr "sakratua"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Argiaren Magoa"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr ""
@@ -4387,21 +4537,121 @@
 "only by that of the Elves."
 msgstr ""
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
+#: data/units/Mermaid_Diviner.cfg:3
+msgid "female^Mermaid Diviner"
+msgstr ""
+
+#: data/units/Mermaid_Diviner.cfg:23
+msgid ""
+"The most devout and pious amongst the mermaids gain the striking power of "
+"illumination, which prevents their surroundings from ever seeing true "
+"night.  Their power is a stalwart counter to the forces of darkness."
 msgstr ""
 
-#: data/units/Merman.cfg:16
+#: data/units/Mermaid_Enchantress.cfg:3
+#, fuzzy
+msgid "female^Mermaid Enchantress"
+msgstr "Elfo Basajauna"
+
+#: data/units/Mermaid_Enchantress.cfg:20 data/units/Mermaid_Siren.cfg:20
+#: data/units/Merman.cfg:16 data/units/Merman_Entangler.cfg:15
+#: data/units/Merman_Fighter.cfg:18 data/units/Merman_Hoplite.cfg:19
+#: data/units/Merman_Hunter.cfg:15 data/units/Merman_Javelineer.cfg:15
+#: data/units/Merman_Netcaster.cfg:15 data/units/Merman_Spearman.cfg:15
+#: data/units/Merman_Triton.cfg:18 data/units/Merman_Warrior.cfg:18
 msgid ""
 "Skilled creatures of the sea, Mermen are powerful and quick in any watery "
 "environment, but struggle greatly to move on land."
 msgstr ""
 
-#: 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
+#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:31
+#: data/units/Mermaid_Siren.cfg:33 data/units/Sea_Hag.cfg:27
+msgid "water spray"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:3
+msgid "female^Mermaid Initiate"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:20
+msgid ""
+"Young Mermaids are often initiated in the water magics of their people.  "
+"Despite their frailty, this makes them formidable opponents, as they can "
+"call upon the very water about them to smite their enemies."
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:3
+msgid "female^Mermaid Priestess"
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:21
+msgid ""
+"The more learned among the mermaids often take a path of holy study.  This "
+"leaves them quite capable of ministering to the wounds of their comrades, as "
+"well as being a potent defense against the unworldly."
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:3
+msgid "female^Siren"
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:23
+#, fuzzy
+msgid "naia touch"
+msgstr "ukipen"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr ""
+
+#: data/units/Merman.cfg:19 data/units/Merman_Fighter.cfg:21
+#: data/units/Merman_Hoplite.cfg:22 data/units/Merman_Lord.cfg:21
+#: data/units/Merman_Triton.cfg:21 data/units/Merman_Triton.cfg:33
+#: data/units/Merman_Warrior.cfg:21 data/units/Naga.cfg:20
+#: data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr ""
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "nahaspilatu"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Borrokalaria"
+
+#: data/units/Merman_Hoplite.cfg:3
+msgid "Merman Hoplite"
+msgstr ""
+
+#: data/units/Merman_Hunter.cfg:3
+msgid "Merman Hunter"
+msgstr ""
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+msgid "Merman Netcaster"
+msgstr ""
+
+#: data/units/Merman_Spearman.cfg:3
+msgid "Merman Spearman"
+msgstr ""
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Aleman Itzulpena"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Orko Gudaria"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Loigizona"
@@ -4413,7 +4663,7 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
+msgid "female^Naga"
 msgstr ""
 
 #: data/units/Naga.cfg:17
@@ -4454,10 +4704,6 @@
 "to hide at night, leaving no trace of their presence."
 msgstr ""
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr ""
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr ""
@@ -4495,7 +4741,7 @@
 msgid "Ogre"
 msgstr ""
 
-#: data/units/Ogre.cfg:15
+#: data/units/Ogre.cfg:16
 msgid ""
 "Ogres are stupid giant humanoids that usually live alone in the wilderness. "
 "While they can be easily outrun or outsmarted, their strength is not to be "
@@ -4589,7 +4835,7 @@
 msgstr ""
 
 #: data/units/Orcish_Shaman.cfg:25 data/units/Orcish_Shaman.cfg:68
-#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:33
+#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:34
 msgid "curse"
 msgstr ""
 
@@ -4668,7 +4914,7 @@
 "weakness is their inability to wield the bow."
 msgstr ""
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr ""
 
@@ -4676,12 +4922,16 @@
 msgid "Outlaws fight better at night."
 msgstr ""
 
+#: data/units/Outlaw.cfg:75
+msgid "female^Outlaw"
+msgstr ""
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+msgid "female^Outlaw Princess"
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -4693,7 +4943,7 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+msgid "female^Outlaw Queen"
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -4756,7 +5006,14 @@
 msgid "Pirate Galleon"
 msgstr "Pirata Ontzia"
 
-#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
+#: data/units/Pirate_Galleon.cfg:14
+msgid ""
+"Pirate galleons are to transport ships what wolves are to sheeps. Ships full "
+"of goods shouldn't be lonely, far away from any land, better to help them to "
+"avoid it being sunk from overloading..."
+msgstr ""
+
+#: data/units/Pirate_Galleon.cfg:16 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr ""
@@ -4771,7 +5028,7 @@
 "in forests and swamps."
 msgstr ""
 
-#: data/units/Princess.cfg:19 data/units/Princess.cfg:57
+#: data/units/Princess.cfg:20 data/units/Princess.cfg:58
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@@ -4780,7 +5037,7 @@
 "having skills like that of a thief."
 msgstr ""
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Magu Gorria"
 
@@ -4791,6 +5048,11 @@
 "Red Mages are therefore valuable in almost all situations."
 msgstr ""
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Magu Gorria"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr ""
@@ -4894,13 +5156,13 @@
 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 "
+"valued as scouts as they 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"
+msgid "female^Sea Hag"
 msgstr ""
 
 #: data/units/Sea_Hag.cfg:17
@@ -4909,10 +5171,6 @@
 "the water magic."
 msgstr ""
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr ""
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Itsas Orkoa"
@@ -4968,7 +5226,7 @@
 "and even into the lands beyond."
 msgstr ""
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Zilarrezko Magoa"
 
@@ -4979,10 +5237,24 @@
 "instant. They are also highly resistant to most forms of magical attack."
 msgstr ""
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Zilarrezko Magoa"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr ""
 
+#: data/units/Skeletal_Dragon.cfg:17
+msgid ""
+"Long ago one of the mightiest living creatures, the feared Dragon has become "
+"only bones and dark sinew. Long after its death, it was raised through the "
+"dark powers of necromancy, which it now serves. The Skeletal Dragon may look "
+"like nothing more than a pile of bones, but few people who thought that way "
+"lived long enough to change their minds."
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr ""
@@ -5041,6 +5313,10 @@
 "fighting the living."
 msgstr ""
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr ""
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr ""
@@ -5202,16 +5478,16 @@
 msgstr ""
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+msgid "female^Vampire Lady"
 msgstr ""
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
 "the blood of the living."
 msgstr ""
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr ""
 
@@ -5264,7 +5540,7 @@
 "miscellaneous items at them with ballistas."
 msgstr ""
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr ""
 
@@ -5276,6 +5552,10 @@
 "high damage from their light beam"
 msgstr ""
 
+#: data/units/White_Mage.cfg:65
+msgid "female^White Mage"
+msgstr ""
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr ""
@@ -5473,7 +5753,7 @@
 msgid "+ Bots"
 msgstr ""
 
-#: src/about.cpp:276 src/help.cpp:2372 src/show_dialog.cpp:472
+#: src/about.cpp:276 src/help.cpp:2350 src/show_dialog.cpp:491
 msgid "Close"
 msgstr "Itxi"
 
@@ -5493,73 +5773,73 @@
 msgid "none"
 msgstr ""
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr ""
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr ""
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr ""
 
-#: src/actions.cpp:363 src/actions.cpp:481 src/actions.cpp:490
+#: src/actions.cpp:365 src/actions.cpp:484 src/actions.cpp:493
 msgid "Doubled"
 msgstr ""
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr ""
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr ""
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr ""
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr ""
 
-#: src/actions.cpp:714 src/actions.cpp:861 src/display.cpp:917
+#: src/actions.cpp:716 src/actions.cpp:862 src/display.cpp:917
 #: src/reports.cpp:115
 msgid "poisoned"
 msgstr ""
 
-#: src/actions.cpp:719 src/actions.cpp:866 src/display.cpp:913
+#: src/actions.cpp:721 src/actions.cpp:867 src/display.cpp:913
 #: src/reports.cpp:110
 msgid "slowed"
 msgstr ""
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr ""
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr ""
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr ""
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr ""
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr ""
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr ""
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr ""
 
@@ -5619,7 +5899,7 @@
 msgid "replay"
 msgstr "errepikatu"
 
-#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1384
+#: src/dialogs.cpp:382 src/multiplayer_lobby.cpp:142 src/playturn.cpp:1385
 msgid "Turn"
 msgstr "Txanda"
 
@@ -5679,23 +5959,23 @@
 msgid "Profile"
 msgstr ""
 
-#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:567
-#: src/playturn.cpp:1793
+#: src/dialogs.cpp:649 src/display.cpp:923 src/help.cpp:564
+#: src/playturn.cpp:1794
 msgid "level"
 msgstr "maila"
 
-#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:622
-#: src/playturn.cpp:1958 src/unit.cpp:1070
+#: src/dialogs.cpp:687 src/display.cpp:957 src/help.cpp:613
+#: src/playturn.cpp:1959 src/unit.cpp:1070
 msgid "Moves"
 msgstr "Mugimenduak"
 
-#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:230
+#: src/dialogs.cpp:700 src/display.cpp:974 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:230
 msgid "melee"
 msgstr ""
 
-#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:698
-#: src/playturn.cpp:597 src/reports.cpp:231
+#: src/dialogs.cpp:701 src/display.cpp:975 src/help.cpp:681
+#: src/playturn.cpp:598 src/reports.cpp:231
 msgid "ranged"
 msgstr ""
 
@@ -5715,11 +5995,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr ""
 
-#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1393
+#: src/game.cpp:139 src/game.cpp:201 src/playturn.cpp:1394
 msgid "Name:"
 msgstr "Izena:"
 
-#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1410
+#: src/game.cpp:147 src/game.cpp:208 src/playturn.cpp:1411
 msgid "The game could not be saved"
 msgstr "Ezin izan da jokua gorde"
 
@@ -5781,8 +6061,8 @@
 #: src/game.cpp:999 src/game.cpp:1014 src/game.cpp:1020 src/game.cpp:1053
 #: src/game.cpp:1082 src/game.cpp:1096 src/game.cpp:1098 src/game.cpp:1100
 #: src/game.cpp:1112 src/game.cpp:1115 src/game.cpp:1150 src/game.cpp:1152
-#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1396
-#: src/playturn.cpp:1410
+#: src/game.cpp:1174 src/game.cpp:1176 src/playturn.cpp:1397
+#: src/playturn.cpp:1411
 msgid "Error"
 msgstr ""
 
@@ -5848,7 +6128,7 @@
 msgstr ""
 
 #: src/game.cpp:1112 src/game.cpp:1150 src/game.cpp:1174
-#: src/multiplayer_client.cpp:42 src/multiplayer_client.cpp:314
+#: src/multiplayer_client.cpp:45 src/multiplayer_client.cpp:319
 msgid "Connection timed out"
 msgstr ""
 
@@ -5907,7 +6187,7 @@
 msgid "Play a game against AI opponents"
 msgstr ""
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr ""
 
@@ -5927,79 +6207,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Ezin izan da letra-tipoak hasieratu. Irtetzen.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr ""
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr ""
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr ""
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr ""
 
-#: src/help.cpp:645 src/help.cpp:646 src/playturn.cpp:1955
+#: src/help.cpp:636 src/help.cpp:637 src/playturn.cpp:1956
 msgid "Name"
 msgstr ""
 
-#: src/help.cpp:649 src/help.cpp:650 src/playturn.cpp:1954
+#: src/help.cpp:640 src/help.cpp:641 src/playturn.cpp:1955
 msgid "Type"
 msgstr ""
 
-#: src/help.cpp:653 src/help.cpp:654 src/unit_types.cpp:302
+#: src/help.cpp:644 src/help.cpp:645 src/unit_types.cpp:302
 msgid "Dmg"
 msgstr ""
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr ""
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr ""
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr ""
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr ""
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr ""
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr ""
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr ""
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr ""
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr ""
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr ""
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr ""
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr ""
 
@@ -6011,7 +6291,7 @@
 msgid "End Unit Turn"
 msgstr "Bukatu unitatearen txanda"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Burua"
 
@@ -6047,11 +6327,11 @@
 msgid "Unit Description"
 msgstr "Unitatearen deskribapena"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Unitatea berrizendatu"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr ""
 
@@ -6059,7 +6339,7 @@
 msgid "Repeat Recruit"
 msgstr ""
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr ""
 
@@ -6095,11 +6375,11 @@
 msgid "Scenario Objectives"
 msgstr ""
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr ""
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr ""
 
@@ -6207,7 +6487,7 @@
 msgid "Speak to All"
 msgstr ""
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr ""
 
@@ -6267,7 +6547,7 @@
 msgid "Bump Size"
 msgstr ""
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr ""
 
@@ -6315,15 +6595,11 @@
 msgid "Enemy units cannot be seen unless they are in range of your units"
 msgstr ""
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr ""
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr ""
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr ""
 
@@ -6331,13 +6607,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr ""
 
-#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:145
-#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:460
-#: src/show_dialog.cpp:466
+#: src/multiplayer.cpp:119 src/multiplayer_client.cpp:148
+#: src/multiplayer_connect.cpp:50 src/show_dialog.cpp:479
+#: src/show_dialog.cpp:485
 msgid "Cancel"
 msgstr "Utzi"
 
-#: src/multiplayer.cpp:120 src/show_dialog.cpp:446 src/show_dialog.cpp:459
+#: src/multiplayer.cpp:120 src/show_dialog.cpp:465 src/show_dialog.cpp:478
 msgid "Ok"
 msgstr "Ados"
 
@@ -6411,70 +6687,70 @@
 msgid "Warning"
 msgstr ""
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:121 src/multiplayer_connect.cpp:386
-#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1531
-#: src/playturn.cpp:1536 src/playturn.cpp:1623
+#: src/multiplayer_client.cpp:124 src/multiplayer_connect.cpp:386
+#: src/multiplayer_connect.cpp:388 src/playlevel.cpp:780 src/playturn.cpp:1532
+#: src/playturn.cpp:1537 src/playturn.cpp:1624
 msgid "Gold"
 msgstr "Urrea"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 msgid "Connect to Host"
 msgstr ""
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr ""
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr ""
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr ""
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr ""
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr ""
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr ""
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr ""
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:683 src/multiplayer_client.cpp:686
+#: src/multiplayer_client.cpp:688 src/multiplayer_client.cpp:691
 msgid "?"
 msgstr ""
 
-#: src/multiplayer_client.cpp:777
+#: src/multiplayer_client.cpp:782
 #, fuzzy
 msgid "Leader: "
 msgstr "Burua"
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 #, fuzzy
 msgid "Recruits: "
 msgstr "Hurrengo unitatea"
@@ -6505,8 +6781,8 @@
 msgid "Local Player"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:498
-#: src/multiplayer_connect.cpp:621 src/multiplayer_connect.cpp:727
+#: src/multiplayer_connect.cpp:265 src/multiplayer_connect.cpp:496
+#: src/multiplayer_connect.cpp:610 src/multiplayer_connect.cpp:716
 msgid "Computer Player"
 msgstr ""
 
@@ -6571,7 +6847,7 @@
 msgid "Color"
 msgstr ""
 
-#: src/multiplayer_connect.cpp:570 src/multiplayer_connect.cpp:574
+#: src/multiplayer_connect.cpp:559 src/multiplayer_connect.cpp:563
 msgid "Waiting for network players to join"
 msgstr ""
 
@@ -6654,218 +6930,218 @@
 msgid "It is now your turn"
 msgstr ""
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr ""
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr ""
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr ""
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr ""
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr ""
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr ""
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr ""
 
-#: src/playturn.cpp:1125
+#: src/playturn.cpp:1126
 msgid ""
 "You have not started your turn yet.  Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1134 src/playturn.cpp:1139
+#: src/playturn.cpp:1135 src/playturn.cpp:1140
 msgid "Some units have movement left. Do you really want to end your turn?"
 msgstr ""
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr ""
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
 msgstr ""
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr ""
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr ""
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr ""
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr ""
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr ""
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr ""
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr ""
 
-#: src/playturn.cpp:1729
+#: src/playturn.cpp:1730
 msgid ""
 "My lord, this unit is an experienced one, having advanced levels! Do you "
 "really want to dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1731
+#: src/playturn.cpp:1732
 msgid ""
 "My lord, this unit is close to advancing a level! Do you really want to "
 "dismiss $noun?"
 msgstr ""
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr ""
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr ""
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr ""
 
-#: src/playturn.cpp:1779
+#: src/playturn.cpp:1780
 msgid ""
 "There are no troops available to recall\n"
 "(You must have veteran survivors from a previous scenario)"
 msgstr ""
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr ""
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr ""
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr ""
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr ""
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr ""
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr ""
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr ""
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr ""
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr ""
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr ""
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr ""
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr ""
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr ""
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr ""
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr ""
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr ""
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr ""
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr ""
 
-#: src/playturn.cpp:2421
+#: src/playturn.cpp:2422
 msgid ""
 "The games are out of sync and will have to exit. Do you want to save an "
 "error log of your game?"
 msgstr ""
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr ""
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr ""
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr ""
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr ""
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr ""
 
@@ -6917,93 +7193,93 @@
 msgid "Chaotic units"
 msgstr ""
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr ""
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr ""
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr ""
 
-#: src/show_dialog.cpp:934
+#: src/show_dialog.cpp:953
 msgid "KB"
 msgstr ""
 
-#: src/titlescreen.cpp:149
+#: src/titlescreen.cpp:155
 msgid "Version"
 msgstr ""
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr ""
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr ""
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr ""
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr ""
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr ""
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr ""
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr ""
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr ""
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr ""
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
 msgstr ""
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr ""
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr ""
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr ""
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr ""
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr ""
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr ""
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr ""
 
@@ -7011,15 +7287,15 @@
 msgid "strikes"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr ""
 
@@ -7031,6 +7307,9 @@
 msgid "Deletion of the file failed."
 msgstr ""
 
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
 #~ msgid "+Brazilian Translation"
 #~ msgstr "+Brasildar Itzulpena"
 
Index: wesnoth/po/wesnoth/fi.po
diff -u wesnoth/po/wesnoth/fi.po:1.7 wesnoth/po/wesnoth/fi.po:1.8
--- wesnoth/po/wesnoth/fi.po:1.7        Sun Oct 17 12:52:53 2004
+++ wesnoth/po/wesnoth/fi.po    Thu Oct 21 20:22:40 2004
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Battle for Wesnoth 0.8.2-CVS\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n";
-"POT-Creation-Date: 2004-10-17 14:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-08-08 15:00+0200\n"
 "Last-Translator: Pasi Kallinen <address@hidden>\n"
 "Language-Team: none\n"
@@ -16,7 +16,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "uskollinen"
 
@@ -48,11 +48,11 @@
 msgid "Traits"
 msgstr "Kyvyt"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Yksiköt"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Kyvyt"
 
@@ -168,7 +168,7 @@
 "Upkeep'</ref> for more information."
 msgstr ""
 
-#: data/help.cfg:84 src/help.cpp:771 src/help.cpp:772
+#: data/help.cfg:84 src/help.cpp:747 src/help.cpp:748
 msgid "Movement"
 msgstr "Liikkuminen"
 
@@ -402,7 +402,7 @@
 "fun, and good luck!"
 msgstr ""
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr ""
 
@@ -642,7 +642,7 @@
 msgstr "Oletus"
 
 #: data/multiplayer.cfg:23 data/multiplayer.cfg:104 data/multiplayer.cfg:196
-#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:658
+#: data/multiplayer.cfg:278 src/multiplayer_client.cpp:663
 msgid "&random-enemy.png,Random"
 msgstr "&random-enemy.png,Satunnaisesti valittu"
 
@@ -769,6 +769,24 @@
 msgid "Random map"
 msgstr "Satunnaisesti luotu kartta"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Satunnaisesti luotu kartta"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Satunnaisesti luotu kartta"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Satunnaisesti luotu kartta"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr ""
@@ -808,7 +826,7 @@
 #: data/scenarios/multiplayer/Wesbowl.cfg:638
 #: data/scenarios/tutorial/Basic_Training.cfg:276
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:268
-#: src/show_dialog.cpp:453
+#: src/show_dialog.cpp:472
 msgid "No"
 msgstr "Ei"
 
@@ -1296,7 +1314,7 @@
 
 #: data/scenarios/tutorial/Basic_Training.cfg:262
 #: data/scenarios/tutorial/Traits_and_Specialties.cfg:252
-#: src/show_dialog.cpp:452
+#: src/show_dialog.cpp:471
 msgid "Yes"
 msgstr "Kyllä"
 
@@ -1734,6 +1752,111 @@
 msgid "Underground"
 msgstr "Maan alla"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr ""
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Syvä vesi"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Matala vesi"
+
+#: data/terrain.cfg:39 data/terrain.cfg:60 data/terrain.cfg:139
+#: data/terrain.cfg:148 data/terrain.cfg:166 data/terrain.cfg:229
+#: src/reports.cpp:309
+msgid "Village"
+msgstr "Kylä"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Matala vesi"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Jäätä"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Silta"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Hiekka"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Tie"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Soraa"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Ruohikko"
+
+#: data/terrain.cfg:158
+msgid "Snow"
+msgstr ""
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Kukkula"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Vuoristo"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Metsä"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Luolan seinämä"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Luola"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Linna"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Leiri"
+
+#: data/terrain.cfg:258
+msgid "Dwarven castle"
+msgstr ""
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Linnoitus"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "ei mitään"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Valikko"
@@ -1747,14 +1870,14 @@
 msgstr "Lopeta vuoro"
 
 #: data/themes/default.cfg:126 data/themes/default.cfg:462 src/dialogs.cpp:670
-#: src/display.cpp:941 src/help.cpp:621 src/playturn.cpp:1956
+#: src/display.cpp:941 src/help.cpp:612 src/playturn.cpp:1957
 #: src/unit.cpp:1034
 msgid "HP"
 msgstr "Kesto (HP)"
 
 #: data/themes/default.cfg:133 data/themes/default.cfg:469 src/dialogs.cpp:674
 #: src/dialogs.cpp:682 src/display.cpp:945 src/display.cpp:953
-#: src/playturn.cpp:1795 src/playturn.cpp:1957 src/unit.cpp:1093
+#: src/playturn.cpp:1796 src/playturn.cpp:1958 src/unit.cpp:1093
 msgid "XP"
 msgstr "Kokemus (XP)"
 
@@ -1830,31 +1953,28 @@
 "Päivä: -25% vahinkoon\n"
 "Yö: +25% vahinkoon"
 
-#: data/translations/english.cfg:23
+#: data/translations/english.cfg:21
 msgid ""
-"Heals:\n"
-"Allows the unit to heal adjacent friendly units at the beginning of the "
-"turn.\n"
+"Ambush:\n"
+"This unit can hide in forest, and remain undetected by its enemies.\n"
 "\n"
-"A unit cared for by a healer may heal up to 4 HP per turn.\n"
-"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
-"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
-"care of a village or a unit that can cure."
+"Enemy units cannot see or attack this unit when it is in forest, except for "
+"any turn immediately after this unit has attacked, or if there are enemy "
+"units next to this unit."
 msgstr ""
-"Parannus:\n"
-"Yksikkö voi parantaa viereiset ystävälliset yksiköt vuoron alussa.\n"
+"Väijytys:\n"
+"Tämä yksikkö voi piiloutua metsään jolloin viholliset eivät huomaa 
sitä.\n"
 "\n"
-"Parannettu yksikkö saa 4 HP vuorossa.\n"
-"Parantaja voi parantaa maksimissaan 8 HP vuorossa.\n"
-"Parantaja ei voi poistaa myrkkyä, vaan myrkytetty yksikkö täytyy 
lääkitä "
-"kylässä tai toisella yksiköllä joka osaa lääkintäkyvyn."
+"Vihollisyksiköt eivät näe eivätkä voi hyökätä tätä yksikköä 
kohti, jos tämä "
+"yksikkö on metsässä, eikä hyökännyt edellisellä vuorolla."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "parannus"
+#: data/translations/english.cfg:23 data/units/Elvish_Avenger.cfg:18
+#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
+#: data/units/Elvish_Ranger.cfg:94
+msgid "ambush"
+msgstr "väijytys"
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 msgid ""
 "Cures:\n"
 "This unit combines herbal remedies with magic to heal units more quickly "
@@ -1878,26 +1998,58 @@
 "Lääkitsijä voi poistaa myrkytetystä yksiköstä myrkyn, mutta se yksikkö 
ei "
 "sillä vuorolla saa muuta parannusta."
 
-#: data/translations/english.cfg:35 data/units/Elvish_Druid.cfg:19
-#: data/units/Elvish_Shyde.cfg:19 data/units/White_Mage.cfg:12
-#: data/units/White_Mage.cfg:71
+#: data/translations/english.cfg:33 data/units/Elvish_Druid.cfg:19
+#: data/units/Elvish_Shyde.cfg:19 data/units/Mermaid_Priestess.cfg:7
+#: data/units/White_Mage.cfg:12 data/units/White_Mage.cfg:71
 msgid "cures"
 msgstr "lääkintä"
 
-#: data/translations/english.cfg:38
+#: data/translations/english.cfg:40
 msgid ""
-"Teleport:\n"
-"This unit may teleport between any two friendly villages instantly."
+"Heals:\n"
+"Allows the unit to heal adjacent friendly units at the beginning of the "
+"turn.\n"
+"\n"
+"A unit cared for by a healer may heal up to 4 HP per turn.\n"
+"A healer may heal a total of 8 HP per turn, for all units it cares for.\n"
+"A poisoned unit cannot be cured of its poison by a healer, and must seek the "
+"care of a village or a unit that can cure."
 msgstr ""
-"Kaukosiirto:\n"
-"Tämä yksikkö voi kaukosiirtyä välittömästi kahden ystävällisen 
kylän välillä."
+"Parannus:\n"
+"Yksikkö voi parantaa viereiset ystävälliset yksiköt vuoron alussa.\n"
+"\n"
+"Parannettu yksikkö saa 4 HP vuorossa.\n"
+"Parantaja voi parantaa maksimissaan 8 HP vuorossa.\n"
+"Parantaja ei voi poistaa myrkkyä, vaan myrkytetty yksikkö täytyy 
lääkitä "
+"kylässä tai toisella yksiköllä joka osaa lääkintäkyvyn."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "kaukosiirto"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "parannus"
+
+#: data/translations/english.cfg:47
+msgid ""
+"Illuminates:\n"
+"This unit illuminates the surrounding area, making lawful units fight "
+"better, and chaotic units fight worse.\n"
+"\n"
+"Any units adjacent to this unit will fight as if it were dusk when it is "
+"night, and as if it were day when it is dusk."
+msgstr ""
+"Valaistus:\n"
+"Tämä yksikkö valaisee ympäröivän alueen, jolloin lainkuuliaiset 
yksiköt "
+"taistelevat paremmin, ja kaoottiset huonommin.\n"
+"\n"
+"Kaikki viereiset yksiköt taistelevat aivan kuin yö olisi iltahämärä, ja "
+"iltahämärä olisi päivä."
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "valaistus,lääkintä"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -1912,7 +2064,7 @@
 "Alempitasoiset viereiset ystävälliset yksiköt tekevät enemmän vahinkoa "
 "taistelussa."
 
-#: data/translations/english.cfg:47 data/units/Commander.cfg:11
+#: data/translations/english.cfg:56 data/units/Commander.cfg:11
 #: data/units/Commander.cfg:86 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
@@ -1921,55 +2073,45 @@
 #: data/units/Lord.cfg:10 data/units/Lord.cfg:73
 #: data/units/Noble_Commander.cfg:10 data/units/Noble_Lord.cfg:10
 #: 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:353 src/actions.cpp:471
+#: data/units/Orcish_Sovereign.cfg:9 data/units/Princess.cfg:18
+#: data/units/Princess.cfg:56 data/units/Sergeant.cfg:17
+#: data/units/Warrior_King.cfg:17 src/actions.cpp:355 src/actions.cpp:474
 msgid "leadership"
 msgstr "johtaminen"
 
-#: data/translations/english.cfg:52
+#: data/translations/english.cfg:59
+#, fuzzy
 msgid ""
-"Ambush:\n"
-"This unit can hide in forest, and remain undetected by its enemies.\n"
-"\n"
-"Enemy units cannot see or attack this unit when it is in forest, except for "
-"any turn immediately after this unit has attacked, or if there are enemy "
-"units next to this unit."
+"Loyal:\n"
+"Never more than 1 upkeep."
+msgstr "Ylläpito ei koskaan enemmän kuin 1"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Väijytys:\n"
-"Tämä yksikkö voi piiloutua metsään jolloin viholliset eivät huomaa 
sitä.\n"
-"\n"
-"Vihollisyksiköt eivät näe eivätkä voi hyökätä tätä yksikköä 
kohti, jos tämä "
-"yksikkö on metsässä, eikä hyökännyt edellisellä vuorolla."
 
-#: data/translations/english.cfg:54 data/units/Elvish_Avenger.cfg:18
-#: data/units/Elvish_Avenger.cfg:91 data/units/Elvish_Ranger.cfg:17
-#: data/units/Elvish_Ranger.cfg:94
-msgid "ambush"
-msgstr "väijytys"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "yöväijyntä"
 
-#: data/translations/english.cfg:59
+#: data/translations/english.cfg:69
 msgid ""
-"Illuminates:\n"
-"This unit illuminates the surrounding area, making lawful units fight "
-"better, and chaotic units fight worse.\n"
-"\n"
-"Any units adjacent to this unit will fight as if it were dusk when it is "
-"night, and as if it were day when it is dusk."
+"Regenerates:\n"
+"The unit will heal itself 8 hp per turn. If it is poisoned, it will remove "
+"the poison instead of healing."
 msgstr ""
-"Valaistus:\n"
-"Tämä yksikkö valaisee ympäröivän alueen, jolloin lainkuuliaiset 
yksiköt "
-"taistelevat paremmin, ja kaoottiset huonommin.\n"
-"\n"
-"Kaikki viereiset yksiköt taistelevat aivan kuin yö olisi iltahämärä, ja "
-"iltahämärä olisi päivä."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "valaistus,lääkintä"
+#: data/translations/english.cfg:71 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_Rocklobber.cfg:7
+#: data/units/Troll_Warrior.cfg:6 data/units/Troll_Whelp.cfg:7
+msgid "regenerates"
+msgstr "regeneroi"
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 msgid ""
 "Skirmisher:\n"
 "This unit is skilled in moving past enemies quickly, and ignores all Enemy "
@@ -1979,120 +2121,132 @@
 "Tämä yksikkö osaa liikkua nopeasti vihollisyksiköiden ohitse, eikä 
välitä "
 "vihollisen hallitsemista alueista."
 
-#: data/translations/english.cfg:66 data/units/Assassin.cfg:16
+#: data/translations/english.cfg:76 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:19 data/units/Saurian_Warrior.cfg:19
 msgid "skirmisher"
 msgstr "kahakointi"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Ylläpito ei koskaan enemmän kuin 1"
-
-#: data/translations/english.cfg:72
-msgid "This unit takes half normal damage when it did not initiate the attack."
+#: data/translations/english.cfg:79
+#, fuzzy
+msgid ""
+"Steadfast:\n"
+"This unit takes half normal damage when it did not initiate the attack."
 msgstr ""
 "Tämä yksikkö ottaa vain puolet vahingosta, mikäli se ei aloittanut "
 "hyökkäystä."
 
-#: data/translations/english.cfg:74 data/units/Dwarvish_Guardsman.cfg:15
+#: data/translations/english.cfg:81 data/units/Dwarvish_Guardsman.cfg:15
 #: data/units/Dwarvish_Sentinel.cfg:17 data/units/Dwarvish_Stalwart.cfg:17
-#: src/actions.cpp:499
+#: data/units/Merman_Hoplite.cfg:13 src/actions.cpp:502
 msgid "steadfast"
 msgstr "vankkumaton"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Kaukosiirto:\n"
+"Tämä yksikkö voi kaukosiirtyä välittömästi kahden ystävällisen 
kylän välillä."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "kaukosiirto"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "minimivahinko"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Peli"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Skenaario"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Muokkaa puolia:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Joukkueen asetukset:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Yhteyttä isäntäkoneeseen ei saatu"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Odotetaan pelaajien mukaantuloa"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Täytetty"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Vapaa"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Tarkkailija"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Kuvaile yksikköä"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Koko ruudun kokoinen vai ikkunoitu?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Näyttö:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Ikkunoitu"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Nopeus:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normaali"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Ääniasetukset..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Asetukset"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Valitse skenaario"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 "Tämä maasto käyttäytyy kuin $terrains, mitä tulee liikkumiseen ja "
 "puolustamiseen"
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Maasto jolla on paras vaikutus valitaan automaattisesti"
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Tämä maasto parantaa yksiköitä"
 
-#: data/translations/english.cfg:107
+#: data/translations/english.cfg:119
 msgid ""
 "This terrain acts as keep, i.e., you can recruit units when a leader is in a "
 "location with this terrain"
@@ -2100,26 +2254,26 @@
 "Tämä maasto käyttäytyy kuten linnoitus, ts. voit värvätä yksiköitä 
kun "
 "johtajasi on tässä maastossa"
 
-#: data/translations/english.cfg:108
+#: data/translations/english.cfg:120
 msgid ""
 "This terrain acts as castle, i.e., you can recruit units onto a location "
 "with this terrain"
 msgstr ""
 "Tämä maasto käyttäytyy kuten linna, ts. voit värvätä yksiköitä 
tähän maastoon"
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "tai"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Yksikön vastustustaulukko"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Katso myös..."
 
-#: data/translations/english.cfg:117
+#: data/translations/english.cfg:129
 msgid ""
 "Backstab:\n"
 "This attack deals double damage if a friendly unit is on the opposite side "
@@ -2129,13 +2283,17 @@
 "Tämä hyökkäys tekee kaksinkertaisen vahingon jos kohteen toisella 
puolella "
 "on ystävällinen yksikkö."
 
-#: data/translations/english.cfg:119 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:490
-msgid "backstab"
-msgstr "puukotus"
+#: data/translations/english.cfg:132
+msgid ""
+"Berserk:\n"
+"Whether used offensively or defensively, this attack presses the engagement "
+"until one of the combatants is slain."
+msgstr ""
+"Berserkki:\n"
+"Tämä hyökkäys pakottaa taistelemaan kunnes joko hyökkääjä tai 
puolustaja on "
+"kuollut."
 
-#: data/translations/english.cfg:122
+#: data/translations/english.cfg:135
 msgid ""
 "Charge:\n"
 "This attack deals double damage to the target. It also causes this unit to "
@@ -2145,14 +2303,7 @@
 "Tämä hyökkäys tekee kaksinkertaisen vahingon kohteelle, mutta tämä 
yksikkö "
 "ottaa kaksinkertaisen vahingon kohteen vastahyökkäyksestä."
 
-#: data/translations/english.cfg:124 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:363 src/actions.cpp:481
-msgid "charge"
-msgstr "rynnäkkö"
-
-#: data/translations/english.cfg:127
+#: data/translations/english.cfg:138
 msgid ""
 "Drain:\n"
 "This unit drains health from living units, healing itself for half the "
@@ -2162,18 +2313,15 @@
 "Tämä yksikkö imee voimia elävistä yksiköistä, parantaen itseään 
puolella "
 "siitä vahingosta jonka tämä tekee."
 
-#: data/translations/english.cfg:129 data/units/Ancient_Lich.cfg:24
-#: data/units/Blood_Bat.cfg:24 data/units/Dark_Spirit.cfg:24
-#: data/units/Demilich.cfg:23 data/units/Lich.cfg:24
-#: data/units/Orcish_Shaman.cfg:30 data/units/Orcish_Shaman.cfg:73
-#: data/units/Orcish_Shaman.cfg:116 data/units/Skeletal_Dragon.cfg:31
-#: data/units/Spectre.cfg:24 data/units/Vampire_Bat.cfg:24
-#: data/units/Vampire_Lady.cfg:25 data/units/Vampire_Lady.cfg:38
-#: data/units/Wraith.cfg:24
-msgid "drain"
-msgstr "energiaimu"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Ensi-Isku:\n"
+"Yksikkö iskee taistelussa aina ensin tällä hyökkäuksellä, myös 
puolustaessa."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2181,32 +2329,7 @@
 "Maaginen:\n"
 "Tällä hyökkäyksellä on aina 70% mahdollisuus osua."
 
-#: data/translations/english.cfg:134 data/units/Ancient_Lich.cfg:34
-#: data/units/Arch_Mage.cfg:42 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/Dwarvish_Runemaster.cfg:43 data/units/Elder_Mage.cfg:41
-#: data/units/Elvish_Druid.cfg:64 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 data/units/Mage.cfg:39
-#: data/units/Mage.cfg:106 data/units/Mage_of_Light.cfg:48
-#: data/units/Mage_of_Light.cfg:108 data/units/Necromancer.cfg:37
-#: data/units/Princess.cfg:79 data/units/Red_Mage.cfg:42
-#: data/units/Red_Mage.cfg:111 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 "maaginen"
-
-#: data/translations/english.cfg:137
+#: data/translations/english.cfg:147
 msgid ""
 "Marksman:\n"
 "When used offensively, this attack always has at least a 60% chance to hit."
@@ -2214,13 +2337,7 @@
 "Tarkka-ampuja:\n"
 "Hyökätessä, tällä hyökkäyksellä on vähintään 60% mahdollisuus 
osua."
 
-#: data/translations/english.cfg:139 data/units/Elvish_Marksman.cfg:39
-#: data/units/Elvish_Marksman.cfg:116 data/units/Elvish_Sharpshooter.cfg:40
-#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
-msgid "marksman"
-msgstr "tarkka-ampuja"
-
-#: data/translations/english.cfg:142
+#: data/translations/english.cfg:150
 msgid ""
 "Plague:\n"
 "If this unit kills a living target and that unit was not stationed in a "
@@ -2230,12 +2347,7 @@
 "Mikäli tämä yksikkö tappaa elävän yksikön ja se ei ollut kylässä, se 
nousee "
 "kuolleista ja taistelee puolellasi."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "rutto"
-
-#: data/translations/english.cfg:147
+#: data/translations/english.cfg:153
 msgid ""
 "Poison:\n"
 "This attack poisons the target. Poisoned units lose 8 HP every turn until "
@@ -2246,234 +2358,109 @@
 "osumapistettä (HP) joka vuoro, kunnes ne parannetaan tai niillä on 1 "
 "osumapiste jäljellä"
 
-#: data/translations/english.cfg:149 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:38
-#: data/units/Necrophage.cfg:24 data/units/Orcish_Assassin.cfg:41
-#: data/units/Orcish_Slayer.cfg:46
-msgid "poison"
-msgstr "myrkky"
-
-#: data/translations/english.cfg:152
-msgid ""
-"Slow:\n"
-"This attack slows the target. Slowed units move at half normal speed and "
-"receive one less attack than normal in combat for the duration of one turn."
-msgstr ""
-"Hidastus:\n"
-"Tämä hyökkäys hidastaa kohteen. Hidastetut yksiköt liikkuvat puolella "
-"normaali nopeudesta ja hyökkäävät taistelussa yhden kerran normaalia "
-"vähemmän."
-
-#: data/translations/english.cfg:154 data/units/Cave_Spider.cfg:38
-#: data/units/Elvish_Druid.cfg:44 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 "hidas"
-
-#: data/translations/english.cfg:157
-msgid ""
-"Stone:\n"
-"This attack turns the target to stone. Units that have been turned to stone "
-"may not move or attack."
-msgstr ""
-"Kivetys:\n"
-"Tämä hyökkäys kivettää kohteen. Kivetetyt yksiköt eivät voi liikkua 
tai "
-"hyökätä."
-
-#: data/translations/english.cfg:159 data/units/Cockatrice.cfg:26
-#: src/actions.cpp:728 src/actions.cpp:876 src/reports.cpp:122
-msgid "stone"
-msgstr "kivetys"
-
-#: data/translations/english.cfg:162
-msgid ""
-"Berserk:\n"
-"Whether used offensively or defensively, this attack presses the engagement "
-"until one of the combatants is slain."
-msgstr ""
-"Berserkki:\n"
-"Tämä hyökkäys pakottaa taistelemaan kunnes joko hyökkääjä tai 
puolustaja on "
-"kuollut."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "berserkki"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Ensi-Isku:\n"
-"Yksikkö iskee taistelussa aina ensin tällä hyökkäuksellä, myös 
puolustaessa."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "ensi-isku"
-
-#: data/translations/english.cfg:172
-msgid "Elves"
-msgstr "Haltiat"
-
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Örkit"
-
-#: data/translations/english.cfg:174
-msgid "Humans"
-msgstr "Ihmiset"
-
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Epäkuolleet"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Syvä vesi"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Matala vesi"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Hiekka"
-
-#: data/translations/english.cfg:182 data/translations/english.cfg:184
-#: data/translations/english.cfg:185 data/translations/english.cfg:186
-#: data/translations/english.cfg:187 data/translations/english.cfg:188
-#: src/reports.cpp:310
-msgid "Village"
-msgstr "Kylä"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Suo"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Jäätä"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Tie"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Soraa"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Ruohikko"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Kukkula"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Vuoristo"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Metsä"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Silta"
+#: data/translations/english.cfg:156
+msgid ""
+"Slow:\n"
+"This attack slows the target. Slowed units move at half normal speed and "
+"receive one less attack than normal in combat for the duration of one turn."
+msgstr ""
+"Hidastus:\n"
+"Tämä hyökkäys hidastaa kohteen. Hidastetut yksiköt liikkuvat puolella "
+"normaali nopeudesta ja hyökkäävät taistelussa yhden kerran normaalia "
+"vähemmän."
 
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Linna"
+#: data/translations/english.cfg:159
+msgid ""
+"Stone:\n"
+"This attack turns the target to stone. Units that have been turned to stone "
+"may not move or attack."
+msgstr ""
+"Kivetys:\n"
+"Tämä hyökkäys kivettää kohteen. Kivetetyt yksiköt eivät voi liikkua 
tai "
+"hyökätä."
 
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Linnoitus"
+#: data/translations/english.cfg:162
+msgid "Elves"
+msgstr "Haltiat"
 
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Luola"
+#: data/translations/english.cfg:163
+msgid "Humans"
+msgstr "Ihmiset"
 
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Luolan seinämä"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Örkit"
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Leiri"
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Epäkuolleet"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr ""
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr ""
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr ""
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr ""
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr ""
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr ""
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+msgid "$name|harbor,$name|port"
+msgstr ""
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ""
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr ""
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr ""
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr ""
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr ""
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Seuraava vinkki"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Päivän vinkki"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Älä näytä vinkkejä"
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
@@ -2481,13 +2468,13 @@
 "Lainkuuliaiset yksiköt taistelevat parhaiten päivisin, kaoottiset öisin, 
ja "
 "neutraaleihin yksiköihin ei päivän ja yön vaihtelut vaikuta."
 
-#: data/translations/english.cfg:224
+#: data/translations/english.cfg:186
 msgid ""
 "In a campaign, you can use veteran units from previous scenarios by using "
 "the 'recall' option."
 msgstr ""
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
 "Different units have weaknesses against different types of attacks. Right-"
@@ -2496,7 +2483,7 @@
 "types."
 msgstr ""
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
 "hitting them in battle. The defensive rating for the currently selected unit "
@@ -2504,7 +2491,7 @@
 "the screen."
 msgstr ""
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
 "poison: poison will never reduce them below 1 hitpoint. Poisoned units can "
@@ -2512,62 +2499,62 @@
 "the 'cure' ability."
 msgstr ""
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
 "menu. By recalling the same units over and over, you can build up a powerful "
 "and experienced army."
 msgstr ""
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
 "unit moves into an enemy's Zone of Control, it may not move any further that "
 "turn."
 msgstr ""
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
 "itself in the terrain it is standing in, however magical attacks always have "
 "a 70% chance to hit, and marksman attacks have at least 60% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
 msgstr ""
 "Kylässä oleva yksikkö parantuu, saaden takaisin 8 osumapistettä vuoronsa "
 "alussa. "
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
 "hitpoints at the beginning of their next turn."
 msgstr ""
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
 "terrain, while most mounted units don't get any defensive advantage in "
 "villages and castles."
 msgstr ""
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
 "weapons, but are vulnerable to attacks with piercing weapons, including bows "
 "and spears."
 msgstr ""
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
 "experience. Units killing an enemy will gain 8 experience for every level of "
 "the unit they kill."
 msgstr ""
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
 "fight very well in hills and mountains."
@@ -2575,24 +2562,24 @@
 "Haltiat liikkuvat ja taistelevat hyvin metsissä. Kääpiöt puolestaan "
 "kukkuloilla ja vuorilla."
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
 "troops, wait for better conditions and then attack."
 msgstr ""
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
 "expendable units in some directions to delay enemy units."
 msgstr ""
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
 msgstr ""
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
 "depending on the number of villages on the map, and the number of turns you "
@@ -2600,7 +2587,7 @@
 "villages and waiting for turns to run out."
 msgstr ""
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
 "just the keep they start on. You can capture a keep from an enemy and "
@@ -2608,7 +2595,7 @@
 "for you on their keep so you can recruit there."
 msgstr ""
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
 "impact, fire, and holy attacks."
@@ -2617,7 +2604,7 @@
 "iskuille, mutta herkkiä murjoville iskuille, tulelle ja pyhille "
 "hyökkäyksille."
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
 "side fight better."
@@ -2625,7 +2612,7 @@
 "Yksiköt joilla on johtamiskyky auttavat viereisiä alemman kokemustason "
 "yksiköitä taistelemaan paremmin."
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
 "onto the village and attack you, while enjoying the defense and healing of "
@@ -2635,23 +2622,23 @@
 "Vihollisyksikkö voi miehittää kylän ja hyökätä ja silti nauttia kylän 
"
 "antamasta suojasta ja parannuksesta."
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
 "ability or trait."
 msgstr ""
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Siirrä vahingoittuneet yksiköt turvaan voimakkaampien yksiköiden "
 "rintamalinjan taakse."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Lue pikanäppäinlista Asetukset-valikosta."
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
 "you can undo your move by pressing 'u'."
@@ -2659,7 +2646,7 @@
 "Voit peruuttaa yksikön liikkeen painamalla 'u', jos et hyökännyt tai "
 "löytänyt mitään lisäinformaatiota."
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
 "them."
@@ -2667,7 +2654,7 @@
 "Viedessäsi hiiren kursorin vihollisyksikön päälle, näet kuinka pitkälle 
se "
 "voi liikkua."
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
 "needing to attack anything themselves."
@@ -2675,18 +2662,18 @@
 "Parantajat tuovat sinulle voiton vaikka eivät itse taistelisikaan - käytä "
 "niitä hyökkäävien yksiköiden tukemiseen."
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
 "them one less attack than they would normally have. It is thus very "
 "effective against units that have a few powerful attacks."
 msgstr ""
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Pyhät hyökkäykset ovat erikoisen voimakkaita epäkuolleita vastaan."
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
 "fight."
@@ -2694,7 +2681,7 @@
 "Yksiköt paranevat kun ne nousevat kokemustason. Järkevästi käytettynä 
tämä "
 "voi johtaa voittoon."
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
 "blow."
@@ -2720,7 +2707,7 @@
 
 #: data/units/Ancient_Lich.cfg:20 data/units/Ancient_Lich.cfg:33
 #: data/units/Cockatrice.cfg:22 data/units/Dark_Adept.cfg:23
-#: data/units/Dark_Queen.cfg:27 data/units/Dark_Queen.cfg:28
+#: data/units/Dark_Queen.cfg:28 data/units/Dark_Queen.cfg:29
 #: data/units/Dark_Spirit.cfg:33 data/units/Deathmaster.cfg:36
 #: data/units/Demilich.cfg:19 data/units/Demilich.cfg:32
 #: data/units/Elvish_Enchantress.cfg:117 data/units/Elvish_Sorceress.cfg:117
@@ -2733,12 +2720,49 @@
 msgid "cold"
 msgstr "kylmä"
 
+#: data/units/Ancient_Lich.cfg:24 data/units/Blood_Bat.cfg:24
+#: data/units/Dark_Spirit.cfg:24 data/units/Demilich.cfg:23
+#: data/units/Lich.cfg:24 data/units/Orcish_Shaman.cfg:30
+#: data/units/Orcish_Shaman.cfg:73 data/units/Orcish_Shaman.cfg:116
+#: data/units/Skeletal_Dragon.cfg:31 data/units/Spectre.cfg:24
+#: data/units/Vampire_Bat.cfg:24 data/units/Vampire_Lady.cfg:26
+#: data/units/Vampire_Lady.cfg:39 data/units/Wraith.cfg:24
+msgid "drain"
+msgstr "energiaimu"
+
 #: data/units/Ancient_Lich.cfg:32 data/units/Deathmaster.cfg:35
 #: data/units/Demilich.cfg:31 data/units/Initiate.cfg:19
 #: data/units/Lich.cfg:32
 msgid "magic"
 msgstr "taikuus"
 
+#: data/units/Ancient_Lich.cfg:34 data/units/Arch_Mage.cfg:42
+#: data/units/Arch_Mage.cfg:121 data/units/Battle_Princess.cfg:80
+#: data/units/Commander.cfg:123 data/units/Dark_Adept.cfg:24
+#: data/units/Dark_Queen.cfg:30 data/units/Deathmaster.cfg:37
+#: data/units/Demilich.cfg:33 data/units/Dwarvish_Runemaster.cfg:43
+#: data/units/Elder_Mage.cfg:41 data/units/Elvish_Druid.cfg:64
+#: 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
+#: data/units/Mage.cfg:39 data/units/Mage.cfg:106
+#: data/units/Mage_of_Light.cfg:48 data/units/Mage_of_Light.cfg:108
+#: data/units/Mermaid_Diviner.cfg:37 data/units/Mermaid_Enchantress.cfg:35
+#: data/units/Mermaid_Initiate.cfg:35 data/units/Mermaid_Priestess.cfg:35
+#: data/units/Mermaid_Siren.cfg:26 data/units/Mermaid_Siren.cfg:37
+#: data/units/Necromancer.cfg:37 data/units/Princess.cfg:80
+#: data/units/Red_Mage.cfg:42 data/units/Red_Mage.cfg:111
+#: 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 "maaginen"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr ""
@@ -2764,7 +2788,7 @@
 #: 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/Cuttle_Fish.cfg:20 data/units/Dark_Queen.cfg:22
 #: 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
@@ -2772,19 +2796,24 @@
 #: data/units/Dwarvish_Steelclad.cfg:43 data/units/Elder_Mage.cfg:23
 #: data/units/Elder_Wose.cfg:20 data/units/Elvish_Druid.cfg:24
 #: data/units/Elvish_Druid.cfg:43 data/units/Elvish_Enchantress.cfg:26
-#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:18
+#: data/units/Elvish_Enchantress.cfg:66 data/units/Elvish_Lady.cfg:20
 #: 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/Footpad.cfg:38 data/units/Galleon.cfg:19 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: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/Mermaid_Diviner.cfg:27 data/units/Mermaid_Enchantress.cfg:24
+#: data/units/Mermaid_Enchantress.cfg:33 data/units/Mermaid_Initiate.cfg:24
+#: data/units/Mermaid_Initiate.cfg:33 data/units/Mermaid_Priestess.cfg:25
+#: data/units/Mermaid_Siren.cfg:24 data/units/Mermaid_Siren.cfg:35
+#: data/units/Merman_Entangler.cfg:27 data/units/Merman_Netcaster.cfg:27
 #: data/units/Mudcrawler.cfg:22 data/units/Necromancer.cfg:20
 #: data/units/Noble_Youth.cfg:22 data/units/Outlaw.cfg:21
 #: data/units/Outlaw.cfg:39 data/units/Outlaw.cfg:94 data/units/Outlaw.cfg:112
@@ -2804,7 +2833,7 @@
 msgid "impact"
 msgstr "murjova isku"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr ""
 
@@ -2819,6 +2848,8 @@
 #: data/units/Elvish_Druid.cfg:23 data/units/Elvish_Enchantress.cfg:25
 #: data/units/Elvish_Shaman.cfg:24 data/units/Elvish_Sorceress.cfg:25
 #: data/units/Great_Mage.cfg:23 data/units/Great_Mage.cfg:99
+#: data/units/Mermaid_Diviner.cfg:26 data/units/Mermaid_Enchantress.cfg:23
+#: data/units/Mermaid_Initiate.cfg:23 data/units/Mermaid_Priestess.cfg:24
 #: 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
@@ -2834,7 +2865,7 @@
 msgstr "tulipallo"
 
 #: 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/Battle_Princess.cfg:78 data/units/Commander.cfg:121
 #: data/units/Drake_Burner.cfg:42 data/units/Drake_Fighter.cfg:46
 #: data/units/Drake_Fire.cfg:44 data/units/Drake_Flameheart.cfg:49
 #: data/units/Drake_Flare.cfg:44 data/units/Drake_Glider.cfg:47
@@ -2846,12 +2877,16 @@
 #: data/units/Fireball.cfg:19 data/units/Goblin_Pillager.cfg:20
 #: data/units/Great_Mage.cfg:40 data/units/Great_Mage.cfg:116
 #: data/units/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/Princess.cfg:78 data/units/Red_Mage.cfg:40
 #: data/units/Red_Mage.cfg:109 data/units/Silver_Mage.cfg:94
 #: data/units/Silver_Mage.cfg:181
 msgid "fire"
 msgstr "tuli"
 
+#: data/units/Arch_Mage.cfg:82
+msgid "female^Arch Mage"
+msgstr ""
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr ""
@@ -2876,7 +2911,7 @@
 msgstr "tikari"
 
 #: data/units/Assassin.cfg:21 data/units/Assassin.cfg:48
-#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
+#: data/units/Battle_Princess.cfg:24 data/units/Battle_Princess.cfg:62
 #: data/units/Blood_Bat.cfg:20 data/units/Bowman.cfg:21
 #: data/units/Cavalier.cfg:28 data/units/Cavalry.cfg:32
 #: data/units/Cavalryman.cfg:29 data/units/Cave_Spider.cfg:20
@@ -2914,21 +2949,22 @@
 #: data/units/Knight.cfg:21 data/units/Lieutenant.cfg:22
 #: data/units/Longbowman.cfg:22 data/units/Lord.cfg:23 data/units/Lord.cfg:86
 #: data/units/Mage.cfg:21 data/units/Mage.cfg:88
-#: data/units/Master_Bowman.cfg:21 data/units/Necrophage.cfg:20
-#: data/units/Nightgaunt.cfg:21 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: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 data/units/Orcish_Shaman.cfg:105
-#: data/units/Orcish_Slayer.cfg:20 data/units/Orcish_Slayer.cfg:42
-#: data/units/Orcish_Sovereign.cfg:22 data/units/Orcish_Warlord.cfg:19
-#: data/units/Orcish_Warrior.cfg:20 data/units/Poacher.cfg:25
-#: data/units/Princess.cfg:23 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/Master_Bowman.cfg:21 data/units/Merman_Triton.cfg:34
+#: data/units/Necrophage.cfg:20 data/units/Nightgaunt.cfg:21
+#: data/units/Noble_Commander.cfg:24 data/units/Noble_Fighter.cfg:21
+#: data/units/Noble_Lord.cfg:23 data/units/Ogre.cfg:20
+#: data/units/Orcish_Archer.cfg:21 data/units/Orcish_Assassin.cfg:20
+#: 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
+#: data/units/Orcish_Shaman.cfg:105 data/units/Orcish_Slayer.cfg:20
+#: data/units/Orcish_Slayer.cfg:42 data/units/Orcish_Sovereign.cfg:22
+#: data/units/Orcish_Warlord.cfg:19 data/units/Orcish_Warrior.cfg:20
+#: data/units/Poacher.cfg:25 data/units/Princess.cfg:24
+#: data/units/Princess.cfg:62 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:22
 #: data/units/Sea_Orc.cfg:20 data/units/Sergeant.cfg:22
 #: data/units/Shadow.cfg:21 data/units/Skeletal_Dragon.cfg:29
@@ -2936,16 +2972,30 @@
 #: data/units/Sleeping_Gryphon.cfg:19 data/units/Spectre.cfg:20
 #: data/units/Swordsman.cfg:20 data/units/Thief.cfg:20
 #: data/units/Trapper.cfg:25 data/units/Vampire_Bat.cfg:20
-#: data/units/Vampire_Lady.cfg:20 data/units/White_Mage.cfg:29
+#: data/units/Vampire_Lady.cfg:21 data/units/White_Mage.cfg:29
 #: data/units/White_Mage.cfg:88 data/units/Wolf_Rider.cfg:21
 #: data/units/Wraith.cfg:20 data/units/Young_Ogre.cfg:19
 msgid "blade"
 msgstr "teräase"
 
+#: 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:493
+msgid "backstab"
+msgstr "puukotus"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "puukko"
 
+#: 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:38 data/units/Necrophage.cfg:24
+#: data/units/Orcish_Assassin.cfg:41 data/units/Orcish_Slayer.cfg:46
+msgid "poison"
+msgstr "myrkky"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr ""
@@ -2968,16 +3018,15 @@
 msgid "mace"
 msgstr "helanuija"
 
-#: data/units/Battle_Princess.cfg:3 data/units/Battle_Princess.cfg:41
-#: data/units/Princess.cfg:3 data/units/Princess.cfg:41
-msgid "Princess"
+#: data/units/Battle_Princess.cfg:3 data/units/Princess.cfg:3
+msgid "female^Princess"
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:17 data/units/Battle_Princess.cfg:55
+#: data/units/Battle_Princess.cfg:18 data/units/Battle_Princess.cfg:56
 msgid "leadership,skirmisher"
 msgstr "johtajuus,kahakointi"
 
-#: data/units/Battle_Princess.cfg:19
+#: data/units/Battle_Princess.cfg:20
 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 "
@@ -2985,7 +3034,7 @@
 "now aid those around them in the art of combat."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:22 data/units/Battle_Princess.cfg:60
+#: data/units/Battle_Princess.cfg:23 data/units/Battle_Princess.cfg:61
 #: data/units/Bowman.cfg:20 data/units/Cavalier.cfg:27
 #: data/units/Cavalry.cfg:31 data/units/Cavalryman.cfg:28
 #: data/units/Commander.cfg:23 data/units/Commander.cfg:98
@@ -3009,18 +3058,22 @@
 #: data/units/Longbowman.cfg:21 data/units/Lord.cfg:22 data/units/Lord.cfg:85
 #: data/units/Master_Bowman.cfg:20 data/units/Noble_Commander.cfg:23
 #: data/units/Noble_Fighter.cfg:20 data/units/Noble_Lord.cfg:22
-#: data/units/Ogre.cfg:18 data/units/Orcish_Grunt.cfg:19
+#: data/units/Ogre.cfg:19 data/units/Orcish_Grunt.cfg:19
 #: data/units/Orcish_Leader.cfg:21 data/units/Orcish_Ruler.cfg:21
 #: data/units/Orcish_Sovereign.cfg:21 data/units/Orcish_Warlord.cfg:18
 #: data/units/Orcish_Warrior.cfg:19 data/units/Paladin.cfg:24
-#: data/units/Princess.cfg:22 data/units/Princess.cfg:60
+#: data/units/Princess.cfg:23 data/units/Princess.cfg:61
 #: 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 "miekka"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr ""
+
+#: data/units/Battle_Princess.cfg:58
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
 "generals, and battle tactics with the greatest sages, making her both a "
@@ -3029,9 +3082,9 @@
 "and ignores enemy zones of control."
 msgstr ""
 
-#: data/units/Battle_Princess.cfg:76 data/units/Commander.cfg:120
+#: data/units/Battle_Princess.cfg:77 data/units/Commander.cfg:120
 #: data/units/Fighter.cfg:83 data/units/Lord.cfg:102
-#: data/units/Princess.cfg:76
+#: data/units/Princess.cfg:77
 #, fuzzy
 msgid "scepter of fire"
 msgstr "tulen valtikka"
@@ -3120,7 +3173,13 @@
 #: 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:22
+#: data/units/Merman.cfg:20 data/units/Merman_Entangler.cfg:19
+#: data/units/Merman_Fighter.cfg:22 data/units/Merman_Hoplite.cfg:23
+#: data/units/Merman_Hunter.cfg:19 data/units/Merman_Hunter.cfg:27
+#: data/units/Merman_Javelineer.cfg:19 data/units/Merman_Javelineer.cfg:27
+#: data/units/Merman_Lord.cfg:22 data/units/Merman_Netcaster.cfg:19
+#: data/units/Merman_Spearman.cfg:19 data/units/Merman_Spearman.cfg:27
+#: data/units/Merman_Triton.cfg:22 data/units/Merman_Warrior.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:41 data/units/Orcish_Crossbowman.cfg:39
@@ -3129,7 +3188,7 @@
 #: 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:16
+#: data/units/Pikeman.cfg:20 data/units/Pirate_Galleon.cfg:17
 #: 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
@@ -3137,7 +3196,7 @@
 #: 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:17 data/units/Trapper.cfg:42
-#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:34
+#: data/units/Triton.cfg:20 data/units/Vampire_Lady.cfg:35
 #: data/units/Wall_Guard.cfg:36 data/units/Watch_Tower.cfg:18
 msgid "pierce"
 msgstr "lävistys"
@@ -3196,6 +3255,14 @@
 msgid "web"
 msgstr "verkko"
 
+#: data/units/Cave_Spider.cfg:38 data/units/Elvish_Druid.cfg:44
+#: 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
+#: data/units/Merman_Entangler.cfg:29 data/units/Merman_Netcaster.cfg:29
+msgid "slow"
+msgstr "hidas"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr ""
@@ -3214,13 +3281,24 @@
 #: 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/Horseman.cfg:20 data/units/Merman_Entangler.cfg:18
+#: data/units/Merman_Hunter.cfg:18 data/units/Merman_Hunter.cfg:26
+#: data/units/Merman_Javelineer.cfg:18 data/units/Merman_Javelineer.cfg:26
+#: data/units/Merman_Netcaster.cfg:18 data/units/Merman_Spearman.cfg:18
+#: data/units/Merman_Spearman.cfg:26 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 "keihäs"
 
+#: 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:365
+#: src/actions.cpp:484
+msgid "charge"
+msgstr "rynnäkkö"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr ""
@@ -3236,6 +3314,11 @@
 msgid "gaze"
 msgstr "katse"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "kivetys"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr ""
@@ -3294,17 +3377,17 @@
 msgstr "kylmänaalto"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+msgid "female^Dark Queen"
 msgstr ""
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 msgid ""
 "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 ""
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr ""
 
@@ -3559,6 +3642,12 @@
 "weapon of choice is the halberd, which they use to great effect."
 msgstr ""
 
+#: data/units/Drake_Slasher.cfg:42 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 "ensi-isku"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr ""
@@ -3600,6 +3689,10 @@
 msgid "berserker frenzy"
 msgstr ""
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "berserkki"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr ""
@@ -3751,6 +3844,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr ""
 
+#: data/units/Dwarvish_Ulfserker.cfg:16
+msgid ""
+"Dwarves are an ancient race of powerful fighters. Ulfserkers are the most "
+"ferocious of these in battle: they attack without stopping fighting until "
+"either their enemy or they are dead, no matter how many wounds they receive."
+msgstr ""
+
 #: data/units/Elder_Mage.cfg:3
 msgid "Elder Mage"
 msgstr ""
@@ -3780,7 +3880,7 @@
 "can quickly heal themselves in the face of tremendous injuries."
 msgstr ""
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr ""
 
@@ -3791,7 +3891,11 @@
 "make up a large portion of the Elvish military."
 msgstr ""
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+msgid "female^Elvish Archer"
+msgstr ""
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr ""
 
@@ -3803,6 +3907,10 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+msgid "female^Elvish Avenger"
+msgstr ""
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr ""
@@ -3826,7 +3934,7 @@
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+msgid "female^Elvish Druid"
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:20
@@ -3845,7 +3953,7 @@
 msgstr "piikit"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -3898,10 +4006,17 @@
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+msgid "female^Elvish Lady"
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:17
+msgid ""
+"Elvish lady Parandra is one of the most respected elves ever. Her ability to "
+"see through the fogs of destiny has gained her a wisely used authority among "
+"her people, guiding them in times of uncertainty."
+msgstr ""
+
+#: data/units/Elvish_Lady.cfg:19
 #, fuzzy
 msgid "shove"
 msgstr "Liikkuminen"
@@ -3916,7 +4031,7 @@
 "devastating balls of fire at long range."
 msgstr ""
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr ""
 
@@ -3934,6 +4049,16 @@
 msgid "longbow"
 msgstr "pitkäjousi"
 
+#: data/units/Elvish_Marksman.cfg:39 data/units/Elvish_Marksman.cfg:116
+#: data/units/Elvish_Sharpshooter.cfg:40
+#: data/units/Elvish_Sharpshooter.cfg:119 data/units/Fire_Dragon.cfg:60
+msgid "marksman"
+msgstr "tarkka-ampuja"
+
+#: data/units/Elvish_Marksman.cfg:80
+msgid "female^Elvish Marksman"
+msgstr ""
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr ""
@@ -3957,7 +4082,7 @@
 "they strike hard before melting into the woods again to evade response."
 msgstr ""
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr ""
 
@@ -3969,6 +4094,10 @@
 "just made an attack, or there are enemies adjacent to them."
 msgstr ""
 
+#: data/units/Elvish_Ranger.cfg:79
+msgid "female^Elvish Ranger"
+msgstr ""
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr ""
@@ -3990,7 +4119,7 @@
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+msgid "female^Elvish Shaman"
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4000,7 +4129,7 @@
 "they may attack. Shamans also possess basic healing abilities."
 msgstr ""
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr ""
 
@@ -4012,8 +4141,12 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+msgid "female^Elvish Sharpshooter"
+msgstr ""
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+msgid "female^Elvish Shyde"
 msgstr ""
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4028,7 +4161,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4040,7 +4173,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4132,7 +4265,15 @@
 msgid "Galleon"
 msgstr ""
 
-#: data/units/Galleon.cfg:17
+#: data/units/Galleon.cfg:16
+msgid ""
+"Even people happily living in their home eventually need some kind of "
+"transport through the seas, even if they only go fishing or to trade goods. "
+"The galleon is perfect for this purpose: it's fast and resilient, but not "
+"prepared to fight, and is able to adapt to many different tasks."
+msgstr ""
+
+#: data/units/Galleon.cfg:18
 msgid "dummy"
 msgstr ""
 
@@ -4224,12 +4365,6 @@
 "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 "ensi-isku"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr ""
@@ -4254,7 +4389,8 @@
 msgid "torch"
 msgstr "soihtu"
 
-#: data/units/Goblin_Pillager.cfg:35
+#: data/units/Goblin_Pillager.cfg:35 data/units/Merman_Entangler.cfg:26
+#: data/units/Merman_Netcaster.cfg:26
 msgid "net"
 msgstr "verkko"
 
@@ -4299,7 +4435,7 @@
 "serving beneath them."
 msgstr ""
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 msgid "Great Mage"
 msgstr ""
 
@@ -4309,17 +4445,14 @@
 "in power."
 msgstr ""
 
+#: data/units/Great_Mage.cfg:79
+msgid "female^Great Mage"
+msgstr ""
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr ""
 
-#: 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_Rocklobber.cfg:7 data/units/Troll_Warrior.cfg:6
-#: data/units/Troll_Whelp.cfg:7
-msgid "regenerates"
-msgstr "regeneroi"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4488,7 +4621,7 @@
 "level units."
 msgstr ""
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr ""
 
@@ -4504,11 +4637,16 @@
 msgid "missile"
 msgstr ""
 
-#: data/units/Mage_of_Light.cfg:3 data/units/Mage_of_Light.cfg:66
+#: data/units/Mage.cfg:70
+msgid "female^Mage"
+msgstr ""
+
+#: data/units/Mage_of_Light.cfg:3
 msgid "Mage of Light"
 msgstr ""
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "valaistus,lääkintä"
 
@@ -4524,16 +4662,22 @@
 msgstr ""
 
 #: data/units/Mage_of_Light.cfg:45 data/units/Mage_of_Light.cfg:105
+#: data/units/Mermaid_Diviner.cfg:34 data/units/Mermaid_Priestess.cfg:32
 #: data/units/White_Mage.cfg:44 data/units/White_Mage.cfg:103
 msgid "lightbeam"
 msgstr "valonsäde"
 
 #: data/units/Mage_of_Light.cfg:46 data/units/Mage_of_Light.cfg:106
+#: data/units/Mermaid_Diviner.cfg:35 data/units/Mermaid_Priestess.cfg:33
 #: data/units/Paladin.cfg:26 data/units/White_Mage.cfg:45
 #: data/units/White_Mage.cfg:104
 msgid "holy"
 msgstr "pyhä"
 
+#: data/units/Mage_of_Light.cfg:66
+msgid "female^Mage of Light"
+msgstr ""
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr ""
@@ -4545,21 +4689,116 @@
 "only by that of the Elves."
 msgstr ""
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
+#: data/units/Mermaid_Diviner.cfg:3
+msgid "female^Mermaid Diviner"
+msgstr ""
+
+#: data/units/Mermaid_Diviner.cfg:23
+msgid ""
+"The most devout and pious amongst the mermaids gain the striking power of "
+"illumination, which prevents their surroundings from ever seeing true "
+"night.  Their power is a stalwart counter to the forces of darkness."
+msgstr ""
+
+#: data/units/Mermaid_Enchantress.cfg:3
+msgid "female^Mermaid Enchantress"
 msgstr ""
 
-#: data/units/Merman.cfg:16
+#: data/units/Mermaid_Enchantress.cfg:20 data/units/Mermaid_Siren.cfg:20
+#: data/units/Merman.cfg:16 data/units/Merman_Entangler.cfg:15
+#: data/units/Merman_Fighter.cfg:18 data/units/Merman_Hoplite.cfg:19
+#: data/units/Merman_Hunter.cfg:15 data/units/Merman_Javelineer.cfg:15
+#: data/units/Merman_Netcaster.cfg:15 data/units/Merman_Spearman.cfg:15
+#: data/units/Merman_Triton.cfg:18 data/units/Merman_Warrior.cfg:18
 msgid ""
 "Skilled creatures of the sea, Mermen are powerful and quick in any watery "
 "environment, but struggle greatly to move on land."
 msgstr ""
 
-#: 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
+#: data/units/Mermaid_Enchantress.cfg:31 data/units/Mermaid_Initiate.cfg:31
+#: data/units/Mermaid_Siren.cfg:33 data/units/Sea_Hag.cfg:27
+msgid "water spray"
+msgstr "vesiryöppy"
+
+#: data/units/Mermaid_Initiate.cfg:3
+msgid "female^Mermaid Initiate"
+msgstr ""
+
+#: data/units/Mermaid_Initiate.cfg:20
+msgid ""
+"Young Mermaids are often initiated in the water magics of their people.  "
+"Despite their frailty, this makes them formidable opponents, as they can "
+"call upon the very water about them to smite their enemies."
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:3
+msgid "female^Mermaid Priestess"
+msgstr ""
+
+#: data/units/Mermaid_Priestess.cfg:21
+msgid ""
+"The more learned among the mermaids often take a path of holy study.  This "
+"leaves them quite capable of ministering to the wounds of their comrades, as "
+"well as being a potent defense against the unworldly."
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:3
+msgid "female^Siren"
+msgstr ""
+
+#: data/units/Mermaid_Siren.cfg:23
+#, fuzzy
+msgid "naia touch"
+msgstr "kosketus"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr ""
+
+#: data/units/Merman.cfg:19 data/units/Merman_Fighter.cfg:21
+#: data/units/Merman_Hoplite.cfg:22 data/units/Merman_Lord.cfg:21
+#: data/units/Merman_Triton.cfg:21 data/units/Merman_Triton.cfg:33
+#: data/units/Merman_Warrior.cfg:21 data/units/Naga.cfg:20
+#: data/units/Sea_Hag.cfg:20 data/units/Triton.cfg:19
 msgid "trident"
 msgstr "kolmikärki"
 
+#: data/units/Merman_Entangler.cfg:3
+msgid "Merman Entangler"
+msgstr ""
+
+#: data/units/Merman_Fighter.cfg:3
+msgid "Merman Fighter"
+msgstr ""
+
+#: data/units/Merman_Hoplite.cfg:3
+msgid "Merman Hoplite"
+msgstr ""
+
+#: data/units/Merman_Hunter.cfg:3
+msgid "Merman Hunter"
+msgstr ""
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+msgid "Merman Netcaster"
+msgstr ""
+
+#: data/units/Merman_Spearman.cfg:3
+msgid "Merman Spearman"
+msgstr ""
+
+#: data/units/Merman_Triton.cfg:3
+msgid "Merman Triton"
+msgstr ""
+
+#: data/units/Merman_Warrior.cfg:3
+msgid "Merman Warrior"
+msgstr ""
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr ""
@@ -4571,7 +4810,7 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
+msgid "female^Naga"
 msgstr ""
 
 #: data/units/Naga.cfg:17
@@ -4612,10 +4851,6 @@
 "to hide at night, leaving no trace of their presence."
 msgstr ""
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "yöväijyntä"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr ""
@@ -4653,7 +4888,7 @@
 msgid "Ogre"
 msgstr ""
 
-#: data/units/Ogre.cfg:15
+#: data/units/Ogre.cfg:16
 msgid ""
 "Ogres are stupid giant humanoids that usually live alone in the wilderness. "
 "While they can be easily outrun or outsmarted, their strength is not to be "
@@ -4747,7 +4982,7 @@
 msgstr ""
 
 #: data/units/Orcish_Shaman.cfg:25 data/units/Orcish_Shaman.cfg:68
-#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:33
+#: data/units/Orcish_Shaman.cfg:111 data/units/Vampire_Lady.cfg:34
 msgid "curse"
 msgstr "kirous"
 
@@ -4826,7 +5061,7 @@
 "weakness is their inability to wield the bow."
 msgstr ""
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr ""
 
@@ -4834,12 +5069,16 @@
 msgid "Outlaws fight better at night."
 msgstr ""
 
+#: data/units/Outlaw.cfg:75
+msgid "female^Outlaw"
+msgstr ""
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+msgid "female^Outlaw Princess"
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -4851,7 +5090,7 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+msgid "female^Outlaw Queen"
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -4914,7 +5153,14 @@
 msgid "Pirate Galleon"
 msgstr ""
 
-#: data/units/Pirate_Galleon.cfg:15 data/units/Transport_Galleon.cfg:16
+#: data/units/Pirate_Galleon.cfg:14
+msgid ""
+"Pirate galleons are to transport ships what wolves are to sheeps. Ships full "
+"of goods shouldn't be lonely, far away from any land, better to help them to "
+"avoid it being sunk from overloading..."
+msgstr ""
+
+#: data/units/Pirate_Galleon.cfg:16 data/units/Transport_Galleon.cfg:16
 #: data/units/Watch_Tower.cfg:17
 msgid "ballista"
 msgstr ""
@@ -4929,7 +5175,7 @@
 "in forests and swamps."
 msgstr ""
 
-#: data/units/Princess.cfg:19 data/units/Princess.cfg:57
+#: data/units/Princess.cfg:20 data/units/Princess.cfg:58
 msgid ""
 "A noble by birth, the Princess has learnt swordplay with the greatest "
 "generals and battle tactics with the greatest sages, making her both a great "
@@ -4938,7 +5184,7 @@
 "having skills like that of a thief."
 msgstr ""
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr ""
 
@@ -4949,6 +5195,10 @@
 "Red Mages are therefore valuable in almost all situations."
 msgstr ""
 
+#: data/units/Red_Mage.cfg:72
+msgid "female^Red Mage"
+msgstr ""
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr ""
@@ -5054,13 +5304,13 @@
 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 "
+"valued as scouts as they 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"
+msgid "female^Sea Hag"
 msgstr ""
 
 #: data/units/Sea_Hag.cfg:17
@@ -5069,10 +5319,6 @@
 "the water magic."
 msgstr ""
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "vesiryöppy"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr ""
@@ -5128,7 +5374,7 @@
 "and even into the lands beyond."
 msgstr ""
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr ""
 
@@ -5139,10 +5385,23 @@
 "instant. They are also highly resistant to most forms of magical attack."
 msgstr ""
 
+#: data/units/Silver_Mage.cfg:142
+msgid "female^Silver Mage"
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr ""
 
+#: data/units/Skeletal_Dragon.cfg:17
+msgid ""
+"Long ago one of the mightiest living creatures, the feared Dragon has become "
+"only bones and dark sinew. Long after its death, it was raised through the "
+"dark powers of necromancy, which it now serves. The Skeletal Dragon may look "
+"like nothing more than a pile of bones, but few people who thought that way "
+"lived long enough to change their minds."
+msgstr ""
+
 #: data/units/Skeletal_Dragon.cfg:27
 msgid "jaw"
 msgstr "kita"
@@ -5201,6 +5460,10 @@
 "fighting the living."
 msgstr ""
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "rutto"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr ""
@@ -5362,16 +5625,16 @@
 msgstr ""
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+msgid "female^Vampire Lady"
 msgstr ""
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
 "the blood of the living."
 msgstr ""
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "verisuudelma"
 
@@ -5424,7 +5687,7 @@
 "miscellaneous items at them with ballistas."
 msgstr ""
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:6