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:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr ""
 
@@ -5436,6 +5699,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 ""
@@ -5630,7 +5897,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 "Sulje"
 
@@ -5652,73 +5919,73 @@
 msgid "none"
 msgstr "ei mitään"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "perusvahinko"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "hyökkääjä vastustaa"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "hyökkääjä on haavoittuva"
 
-#: 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 "Kaksinkertaistettu"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "kokonaisvahinko"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "puolustaja vastustaa"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "puolustaja on haavoittuva"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Puolitettu"
 
-#: 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 "myrkytetty"
 
-#: 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 "hidastettu"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Väijytys!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Ystävä nähty"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Vihollinen nähty!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends ystävää näköpiirissä"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies vihollista näköpiirissä!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Yksiköitä näköpiirissä! ($friends ystävällistä, $enemies 
vihollista)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(paina $hotkey jatkaaksesi)"
 
@@ -5778,7 +6045,7 @@
 msgid "replay"
 msgstr "uusinta"
 
-#: 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 "Vuoro"
 
@@ -5846,23 +6113,23 @@
 msgid "Profile"
 msgstr "Profiili"
 
-#: 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 "taso"
 
-#: 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 "Liikkuminen"
 
-#: 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 "lähitaistelu"
 
-#: 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 "etätaistelu"
 
@@ -5882,11 +6149,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Haluatko tallentaa uusinnan tästä skenaariosta?"
 
-#: 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 "Nimi:"
 
-#: 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 "Peliä ei voitu tallentaa"
 
@@ -5949,8 +6216,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 "Virhe"
 
@@ -6014,7 +6281,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 "Yhteys aikakatkaistiin"
 
@@ -6075,7 +6342,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 "Sisäänkirjautuminen"
 
@@ -6095,79 +6362,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr ""
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Kehittyy"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Ryhmitys"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Vaadittu kokemus (XP)"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "hyökkäykset"
 
-#: 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 "Nimi"
 
-#: 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 "Tyyppi"
 
-#: 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 "Vahinko"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Iskut"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Matka"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Erikois"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Vastustukset"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Hyökkäystyyppi"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Vastustus"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Maaston vaikutus"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Maasto"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Puolustus"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Taaksepäin"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Eteenpäin >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Apua Battle for Wesnothiin"
 
@@ -6179,7 +6446,7 @@
 msgid "End Unit Turn"
 msgstr "Lopeta yksikön vuoro"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Johtaja"
 
@@ -6215,11 +6482,11 @@
 msgid "Unit Description"
 msgstr "Yksikön kuvaus"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Nimeä yksikkö"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Värvää"
 
@@ -6227,7 +6494,7 @@
 msgid "Repeat Recruit"
 msgstr "Toista värväys"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Kutsu veteraaniyksikkö"
 
@@ -6263,11 +6530,11 @@
 msgid "Scenario Objectives"
 msgstr "Skenaarion tavoitteet"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Yksikkölista"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Tilastot"
 
@@ -6375,7 +6642,7 @@
 msgid "Speak to All"
 msgstr "Puhu kaikille"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Apua"
 
@@ -6435,7 +6702,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 "Kyliä"
 
@@ -6485,15 +6752,11 @@
 "Vihollisyksiköt ovat näkymättömissä kunnes jokin yksiköistäsi on 
tarpeeksi "
 "lähellä"
 
-#: 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 "Kartta on näkymättömissä kunnes yksikkösi tutkivat alueen"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Tarkkailijat"
 
@@ -6501,13 +6764,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Salli muiden käyttäjien tarkkailla pelin kulkua"
 
-#: 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 "Peruuta"
 
-#: 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 "Hyväksy"
 
@@ -6581,71 +6844,71 @@
 msgid "Warning"
 msgstr "Varoitus"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Vastaanotetaan pelilistaa..."
 
-#: 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 "Kultaa"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Odotetaan pelin alkua..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Yhdistä palvelimeen"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Valitse isäntäkone johon yhdistetään"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Otetaan yhteys isäntäkoneeseen..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Tälle palvelimelle vaaditaan kirjautumista"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Haetaan pelin tietoja..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Tässä pelissä ei ole vapaita puolia."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Valitse puolesi"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Peli on peruutettu"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Joukkue jonka valitsit ei ole enää käytettävissä"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Näytä pelin uusinta tallennuspisteeseen asti?"
 
-#: 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 "Johtaja"
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 #, fuzzy
 msgid "Recruits: "
 msgstr "Värväyksiä"
@@ -6678,8 +6941,8 @@
 msgid "Local Player"
 msgstr "Paikallinen pelaaja"
 
-#: 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 "Tietokonepelaaja"
 
@@ -6744,7 +7007,7 @@
 msgid "Color"
 msgstr "Väri"
 
-#: 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 "Odotetaan verkkopelaajien liittymistä"
 
@@ -6828,89 +7091,89 @@
 msgid "It is now your turn"
 msgstr "On sinun vuorosi"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Hyökkääjä"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Puolustaja"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Vahinkolaskelmat"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Lähitaistelu"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "vastaan"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Hyökkää vihollista"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Valitse ase"
 
-#: 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 ""
 "Et ole vielä aloittanut vuoroasi.  Haluatko todellakin lopettaa tämän 
vuoron?"
 
-#: 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 ""
 "Jokin yksiköistäsi voi vielä liikkua. Haluatko todellakin lopettaa 
vuorosi?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Automaattinen tallennus"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 "Automaattinen tallennus epäonnistui. Yritä tallentaa peli manuaalisesti."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
 msgstr "Tallenteen nimessä ei saa olla puolipistettä, kautta- tai 
kenoviivaa."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Tallennettu"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Peli on tallennettu"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Tulot"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Ylläpito"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Sinulla ei ole yksiköitä joita värvätä."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Valitse yksikkö"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Sinulla ei ole tarpeeksi kultaa sen yksikön värväämiseen"
 
-#: 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?"
@@ -6918,7 +7181,7 @@
 "Herrani, tämä yksikkö on veteraani! Haluatko todellakin vapauttaa $noun "
 "palveluksesta?"
 
-#: 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?"
@@ -6926,20 +7189,20 @@
 "Herrani, tämä yksikkö nousee kohta kokemustason! Haluatko todellakin "
 "vapauttaa $noun palveluksesta?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "hänet"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "hänet"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 #, fuzzy
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Olet erossa sotilaistasi etkä voi kutsua heitä"
 
-#: 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)"
@@ -6947,89 +7210,89 @@
 "Sinulla ei ole veteraaneja edellisestä skenaariosta\n"
 "jotka voisit kutsua palvelukseen"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 "Sinulla täytyy olla vähintään $cost kultapalaa voidaksesi kutsua yksikön 
"
 "takaisin"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Vapauta yksikkö palveluksesta"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Viesti"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Lähetä vain ystäville"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Kohde"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Värväyksiä"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Kutsuntoja"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Ylennyksiä"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Häviöitä"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Tappoja"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Tehty vahinko"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Otettu vahinko"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Tehty vahinko (Arvio)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Otettu vahinko (Arvio)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Etsi"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Komento:"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Keskustelun loki"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "Yksikköä tai muistilappua nimeltä '$search' ei löytynyt."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Aseta muistilappu"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Nimi"
 
-#: 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?"
@@ -7037,23 +7300,23 @@
 "Pelit eivät ole synkronoitu, ja ne lopetetaan. Haluatko tallentaa virhelokin 
"
 "pelistäsi?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Korvaa tietokoneella"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Korvaa paikallisella pelaajalla"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Keskeytä peli"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Korvaa pelaajalla "
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "on poistunut pelistä. Mitä haluat tehdä?"
 
@@ -7113,63 +7376,63 @@
 msgid "Chaotic units"
 msgstr "Kaoottiset yksiköt"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Omistamasi kylä"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Viholliskylä"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Ystävällinen kylä"
 
-#: 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 "versio"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Harjoittelu"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Kampanja"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Moninpeli"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Lataa"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Kieli"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Asetukset"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Lopeta"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Aloita harjoittelu tutustuaksesi peliin"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Aloita uusi yksinpelin kampanja"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -7177,31 +7440,31 @@
 "Pelaa moninpeli (hotseat, LAN, tai Internet), tai yksi skenaario "
 "tietokonetta vastaan"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Lataa tallennettu yksinpeli"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Vaihda käytettävää kieltä"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Muokkaa pelin asetuksia"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Kenelle kuuluu kunnia tästä pelistä"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Poistu pelistä"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Lisää"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr ""
 
@@ -7209,15 +7472,15 @@
 msgid "strikes"
 msgstr "iskua"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "kaoottinen"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "lainkuuliainen"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutraali"
 
@@ -7229,6 +7492,15 @@
 msgid "Deletion of the file failed."
 msgstr "Tiedoston tuhoaminen epäonnistui."
 
+#~ msgid "first strike"
+#~ msgstr "ensi-isku"
+
+#~ msgid "Swamp"
+#~ msgstr "Suo"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Isännöi moninpeliä"
 
Index: wesnoth/po/wesnoth/fr.po
diff -u wesnoth/po/wesnoth/fr.po:1.15 wesnoth/po/wesnoth/fr.po:1.16
--- wesnoth/po/wesnoth/fr.po:1.15       Tue Oct 19 18:56:50 2004
+++ wesnoth/po/wesnoth/fr.po    Thu Oct 21 20:22:40 2004
@@ -10,7 +10,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:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-10-19 20:55+0200\n"
 "Last-Translator: Wesnoth French Translation Team <address@hidden>\n"
 "Language-Team: Language fr\n"
@@ -18,7 +18,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 "loyal"
 
@@ -50,11 +50,11 @@
 msgid "Traits"
 msgstr "Traits"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Unités"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Capacités"
 
@@ -199,7 +199,7 @@
 "l'entretien. Voir <ref>dst=income_and_upkeep text='Revenu et Entretien'</"
 "ref> pour plus d'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 "Mouvement"
 
@@ -623,7 +623,7 @@
 "connaissez maintenant tout ce qu'il vous faut savoir pour jouer le scénario "
 "L'héritier du trône. Amusez-vous bien et bonne chance !"
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr "À propos"
 
@@ -939,7 +939,7 @@
 msgstr "Par défaut"
 
 #: 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,Aléatoire"
 
@@ -1056,6 +1056,24 @@
 msgid "Random map"
 msgstr "Carte aléatoire"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Carte aléatoire"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Carte aléatoire"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Carte aléatoire"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -1102,7 +1120,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 "Non"
 
@@ -1723,7 +1741,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 "Oui"
 
@@ -2326,6 +2344,115 @@
 msgid "Underground"
 msgstr "Sous terre"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Voile"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Eau profonde"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Eau peu profonde"
+
+#: 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 "Village"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Eau peu profonde"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Glace"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Pont"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Sable"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Route"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Terrain boueux"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Prairie"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Ombre"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Collines"
+
+#: data/terrain.cfg:184
+#, fuzzy
+msgid "Snow hills"
+msgstr "Les plaines enneigées"
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Montagnes"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Forêt"
+
+#: data/terrain.cfg:206
+#, fuzzy
+msgid "Snow forest"
+msgstr "La forêt silencieuse"
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Mur de caverne"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Caverne"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Château"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Campement"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "La terre désolée des nains"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Donjon"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "aucune"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menu"
@@ -2339,14 +2466,14 @@
 msgstr "Fin du tour"
 
 #: 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 "XP"
 
@@ -2422,32 +2549,30 @@
 "Jour: -25% de dégâts infligés\n"
 "Nuit: +25% de dégâts infligés"
 
-#: 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 ""
-"Guérison :\n"
-"Permet à cette unité de guérir les unités adjacentes en début de tour.\n"
+"Embuscade :\n"
+"Cette unité peut se cacher dans les forêts et rester invisible à ses "
+"ennemis.\n"
 "\n"
-"Une unité ainsi soignée pourra retrouver jusqu'à 4 points de vie par 
tour.\n"
-"Un soigneur pourra traiter jusqu'à 8 points de vie par tour, pour l'ensemble 
"
-"des unités soignées.\n"
-"Une unité empoisonnée ne pourra pas être traitée par ce soigneur et devra 
se "
-"rendre à un village ou chercher une unité avec la capacité de traitement."
+"Les unités ennemies ne peuvent voir ni attaquer cette unité tant qu'elle se 
"
+"trouve en forêt, sauf pour le tours suivant une attaque de cette unité ou "
+"s'il y a des unités ennemies adjacentes à cette unité."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "guérison"
+#: 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 "embuscade"
 
-#: 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 "
@@ -2474,26 +2599,59 @@
 "recevra pas de points de vie supplémentaires le tour où l'effet du poison "
 "aura été annulé."
 
-#: 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 "traitement"
 
-#: 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 ""
-"Téléportation :\n"
-"Cette unité peut se téléporter instantanément entre deux villages 
alliés."
+"Guérison :\n"
+"Permet à cette unité de guérir les unités adjacentes en début de tour.\n"
+"\n"
+"Une unité ainsi soignée pourra retrouver jusqu'à 4 points de vie par 
tour.\n"
+"Un soigneur pourra traiter jusqu'à 8 points de vie par tour, pour l'ensemble 
"
+"des unités soignées.\n"
+"Une unité empoisonnée ne pourra pas être traitée par ce soigneur et devra 
se "
+"rendre à un village ou chercher une unité avec la capacité de traitement."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "téléportation"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "guérison"
 
-#: 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 ""
+"Illumination :\n"
+"Cette unité illumine les cases environnantes, rendant les unités justes 
plus "
+"fortes, et les unités chaotiques plus faibles.\n"
+"\n"
+"Toutes les unités adjacentes à cette unité combattront la nuit comme si "
+"c'était le crépuscule et comme s'il faisait jour au moment du crépuscule."
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "illumination,traitement"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2507,7 +2665,7 @@
 "\n"
 "Les unités alliées de niveau inférieur feront plus de dégâts en combat."
 
-#: 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
@@ -2516,57 +2674,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 "commandement"
 
-#: 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 "Jamais plus de 1 d'entretien"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Embuscade :\n"
-"Cette unité peut se cacher dans les forêts et rester invisible à ses "
-"ennemis.\n"
-"\n"
-"Les unités ennemies ne peuvent voir ni attaquer cette unité tant qu'elle se 
"
-"trouve en forêt, sauf pour le tours suivant une attaque de cette unité ou "
-"s'il y a des unités ennemies adjacentes à cette 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 "embuscade"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "chasseur nocturne"
 
-#: 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 ""
-"Illumination :\n"
-"Cette unité illumine les cases environnantes, rendant les unités justes 
plus "
-"fortes, et les unités chaotiques plus faibles.\n"
-"\n"
-"Toutes les unités adjacentes à cette unité combattront la nuit comme si "
-"c'était le crépuscule et comme s'il faisait jour au moment du crépuscule."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "illumination,traitement"
+#: 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 "régénération"
 
-#: 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 "
@@ -2577,118 +2723,130 @@
 "ennemies et ignore les zones de contrôle ennemies."
 
 # FIXME: Skirmisher = tirailleur??
-#: 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 "tirailleur"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Jamais plus de 1 d'entretien"
-
-#: 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 ""
 "Cette unité subit la moitié des dégâts normaux quand elle ne commence pas 
le "
 "combat."
 
-#: 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 "innamovible"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Téléportation :\n"
+"Cette unité peut se téléporter instantanément entre deux villages 
alliés."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "téléportation"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "dégâts minimum"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Jeu"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scénario"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Configurer les équipes :"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Choisir les paramètres de l'équipe :"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Impossible de se connecter au serveur distant"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "En attente de connexion d'autres joueurs"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Occupé"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Libre"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Observateur"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Décrire l'unité"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Plein écran ou fenêtré ?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Affichage :"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Fenêtré"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Vitesse :"
 
-#: 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 "Paramètres de son..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Options"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Choisissez un scénario"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr "Ce terrain se comporte comme $terrains pour le mouvement et la 
défense"
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Le terrain avec le meilleur modificateur est choisi automatiquement."
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Ce terrain soigne."
 
-#: 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"
@@ -2696,7 +2854,7 @@
 "Ce terrain se comporte comme un donjon, c-à-d que vous pouvez recruter des "
 "unités quand un chef est dessus."
 
-#: 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"
@@ -2704,19 +2862,19 @@
 "Ce terrain se comporte comme un chateau, c-à-d que vous pouvez recruter des "
 "unités sur cette case."
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "ou"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Table de résistance des unités"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Voir aussi..."
 
-#: 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 "
@@ -2726,13 +2884,17 @@
 "Cette attaque occasionne le double de dommages si une unité alliée se 
trouve "
 "sur la case opposée à la cible."
 
-#: 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 "assassinat"
+#: 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 ""
+"Furie :\n"
+"Qu'elle soit utilisée de manière offensive ou défensive, cette attaque 
force "
+"l'engagement jusqu'à ce qu'un des deux combattants ne meure."
 
-#: 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 "
@@ -2742,14 +2904,7 @@
 "Cette attaque inflige le double de dégâts à la cible. Cependant cette 
unité "
 "recevra également le double de dégâts lors de la contre-attaque."
 
-#: 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 "charge"
-
-#: 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 "
@@ -2759,18 +2914,15 @@
 "Cette unité draine la vie des unités vivantes, se régénérant ainsi de la 
"
 "moitié des dégâts causés."
 
-#: 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 "drainage"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Initiative:\n"
+"Cette unité attaque toujours en premier, même lorsqu'elle se défend."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2778,32 +2930,7 @@
 "Enchantée :\n"
 "Cette attaque a toujours 70 % de chance d'atteindre sa cible."
 
-#: 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 "enchantée"
-
-#: 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."
@@ -2812,13 +2939,7 @@
 "Quand utilisée offensivement, cette attaque a toujours au moins 60% de "
 "chance d'atteindre sa cible."
 
-#: 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 "tir d'élite"
-
-#: 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 "
@@ -2828,12 +2949,7 @@
 "Si cette unité tue une unité vivante et que celle-ci n'était pas dans un "
 "village, le corps de la cible ressuscitera et se joindra à vos troupes."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "peste"
-
-#: 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 "
@@ -2844,16 +2960,7 @@
 "de vie à chaque tour jusqu'à ce qu'elles soient guéries, ou n'aient plus "
 "qu'un seul point de vie."
 
-#: 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 "empoisonnement"
-
-#: 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 "
@@ -2863,15 +2970,7 @@
 "Cette attaque ralentit la cible. Les unités ralenties voient leur vitesse de 
"
 "déplacement réduite de moitié et disposent d'une attaque de moins en 
combat."
 
-#: 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 "ralentissement"
-
-#: 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 "
@@ -2881,211 +2980,104 @@
 "Cette attaque transforme la cible en pierre. Les unités ainsi pétrifiées 
ne "
 "peuvent plus ni se déplacer, ni attaquer."
 
-#: 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 "pierre"
-
 #: 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 ""
-"Furie :\n"
-"Qu'elle soit utilisée de manière offensive ou défensive, cette attaque 
force "
-"l'engagement jusqu'à ce qu'un des deux combattants ne meure."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "furie"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Initiative:\n"
-"Cette unité attaque toujours en premier, même lorsqu'elle se défend."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "initiative"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfes"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orcs"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Humains"
 
-#: data/translations/english.cfg:175
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orcs"
+
+#: data/translations/english.cfg:165
 msgid "Undead"
 msgstr "Morts-vivants"
 
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Eau profonde"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Eau peu profonde"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Sable"
-
-#: 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 "Village"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Marais"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Toundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Glace"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Route"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Terrain boueux"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Prairie"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Collines"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Montagnes"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Forêt"
-
-#: 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 "Château"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Donjon"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Caverne"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Mur de caverne"
-
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Campement"
-
 # XXX Une note pour les traducteurs :
 # Ne pas chercher à traduire l'anglais exactement pour les noms de villages.
 # À la place, générer des noms de lieu qui sonnent français, sans aucune
 # limite. Plus il y a d'alternatives, mieux c'est. Éventuellement en 
répétant
 # des entrées pour contrôler la fréquence.
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "Pont de $name,Croisée de $name"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "Route $name,Passe de $name,Chemin de $name,Sente de $name"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "$name|-la-rivière,Rivière $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "Forêt $name,Bois de $name,$name|-la-forêt,$name|-sous-bois"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "Lac $name,Étang $name,La mare $name"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr "Saint-$name,Ker $name,$name le bas,$name le haut"
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "Forêt $name,Bois de $name,$name|-la-forêt,$name|-sous-bois"
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ""
 "Ker $name,Bord $name,La-croix-saint-$name,Font$river,Rive-de-$river,La-croix-"
 "sur-$river,$name|-le-port,Val-de-$river"
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr "Pont-de-$river,Bac-sur-$river,Ker$name,Saint-$name|-du-pont"
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr ""
 "Ker$name,$name le bas,$name le haut,$name| champs,Saint-$name|-des-champs,"
 "Plou$name,Loc$name"
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr ""
 "Ker$name,$name le bas,$name le haut,Saint-$name|-du-bois,Forêt de $name,"
 "Saint-|$name|-les-chênes"
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr ""
 "Ker$name,Saint-$name,$name le haut,$name|-du-mont,$name|-la-côte,Les hauts "
 "de $name,Les dessus de $name"
 
-#: 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 ""
 "Saint-$name|-du-mont,$name le haut,Le-mont-saint-$name,Haute$name,L'aiguille "
 "du $name,Le pic du $name"
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Astuce suivante"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Astuce du jour"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Ne pas afficher les astuces"
 
-#: 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."
@@ -3093,7 +3085,7 @@
 "Les unités justes se battent mieux le jour et les unités chaotiques mieux 
la "
 "nuit. Les unités neutres ne sont pas affectées par la période du jour."
 
-#: 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."
@@ -3101,7 +3093,7 @@
 "Dans une campagne, vous pouvez utiliser des vétérans de vos précédents "
 "scénarios en utilisant l'option « rappeler »."
 
-#: 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-"
@@ -3115,7 +3107,7 @@
 "'Résistance' pour voir la résistance d'une unité face aux différents 
types "
 "d'attaque."
 
-#: 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 "
@@ -3127,7 +3119,7 @@
 "unité sélectionnée sur le terrain sélectionné est affiché en haut à 
droite "
 "de l'écran."
 
-#: 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 "
@@ -3140,7 +3132,7 @@
 "plaçant dans un village ou à côté d'une unité ayant la compétence "
 "«traitement»."
 
-#: 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 "
@@ -3150,7 +3142,7 @@
 "«Rappeler» dans le menu de jeu. En rappelant toujours les mêmes unités 
vous "
 "pouvez former une armée expérimentée et puissante."
 
-#: 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 "
@@ -3160,7 +3152,7 @@
 "sont adjacents. Si une unité se déplace dans la zone de contrôle ennemie "
 "elle ne peut faire aucun autre mouvement pour ce tour."
 
-#: 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 "
@@ -3171,14 +3163,14 @@
 "attaques enchantées ont toujours 70% de chances de toucher, et les tireurs "
 "d'élite ont au minimum 60% de chances de toucher."
 
-#: 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 ""
 "Les unités stationnées dans un village regagnent 8 points de vie au début 
de "
 "leur tour."
 
-#: 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."
@@ -3186,7 +3178,7 @@
 "Les unités qui n'attaquent ni ne se déplacent durant leur tour se reposent "
 "et regagneront 2 points de vie au début de leur prochain tour."
 
-#: 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 "
@@ -3196,7 +3188,7 @@
 "châteaux que sur la plupart des autres terrains, mais les unités montées 
ne "
 "gagnent aucun avantage défensif à se trouver dans un village ou un 
château."
 
-#: 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 "
@@ -3206,7 +3198,7 @@
 "tranchantes ou contondantes, mais sont vulnérables aux attaques d'armes "
 "perçantes comme les arcs ou les lances."
 
-#: 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 "
@@ -3216,7 +3208,7 @@
 "de l'expérience. Les unités qui tuent un ennemi gagnent 8 points "
 "d'expérience pour chaque niveau de l'unité tuée."
 
-#: 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."
@@ -3224,7 +3216,7 @@
 "Les elfes se déplacent et combattent très bien dans les forêts. Les nains 
se "
 "déplacent et combattent très bien dans les collines et les montagnes."
 
-#: 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."
@@ -3233,7 +3225,7 @@
 "conditions ou avec peu de troupes, attendez que la situation s'améliore et "
 "alors seulement attaquez."
 
-#: 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."
@@ -3242,14 +3234,14 @@
 "d'envoyer quelques unités sacrifiables dans certaines des directions pour "
 "ralentir l'ennemi."
 
-#: 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 ""
 "N'ayez pas peur de battre en retraite pour vous regrouper, c'est souvent la "
 "clé de la victoire."
 
-#: 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 "
@@ -3262,7 +3254,7 @@
 "capturant tous les villages et en attendant jusqu'à ce que tous les tours se 
"
 "soient écoulés."
 
-#: 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 "
@@ -3275,7 +3267,7 @@
 "de vos alliés peuvent aussi vous faire de la place dans leur donjon afin que 
"
 "vous puissiez recruter de là."
 
-#: 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."
@@ -3283,7 +3275,7 @@
 "Les squelettes sont résistants aux attaques perçantes et tranchantes mais "
 "vulnérables aux attaques contondantes, au feu et aux attaques sacrées."
 
-#: 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."
@@ -3291,7 +3283,7 @@
 "Les unités avec la capacité de commandement aident les unités adjacentes 
de "
 "leur camp et de niveau inférieur au leur à mieux se battre."
 
-#: 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 "
@@ -3301,7 +3293,7 @@
 "unité ennemie pourrait se déplacer dans ce village et vous attaquer, en "
 "profitant de la défense et des capacités de guérison du village."
 
-#: 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."
@@ -3309,17 +3301,17 @@
 "Déplacez le curseur de la souris sur une capacité ou un trait de caractère 
"
 "affiche une description de celui-ci."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Utilisez des lignes d'unités pour protéger les unités blessées et leur "
 "laisser le temps de récupérer."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Lisez la liste des raccourcis claviers dans le menu des préférences."
 
-#: 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'."
@@ -3328,7 +3320,7 @@
 "découvrez aucune information supplémentaire, vous pouvez annuler votre "
 "mouvement en pressant la touche «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."
@@ -3336,7 +3328,7 @@
 "Vous pouvez voir jusqu'où une unité ennemie peut se déplacer en plaçant 
le "
 "curseur de la souris sur celle-ci."
 
-#: 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."
@@ -3344,7 +3336,7 @@
 "Utilisez des guérisseurs pour soutenir vos attaques, ils gagneront la "
 "bataille sans avoir à frapper par eux-mêmes."
 
-#: 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 "
@@ -3355,11 +3347,11 @@
 "efficace contre les unités qui ont des attaques très puissantes mais en "
 "petit nombre."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Les attaques sacrées sont très puissantes contre les morts-vivants."
 
-#: 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."
@@ -3367,7 +3359,7 @@
 "Une unité récupère la totalité de ses points de vie lorsqu'elle avance 
d'un "
 "niveau. Utilisé à bon escient cela peut changer le cours d'une bataille."
 
-#: 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."
@@ -3401,7 +3393,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
@@ -3414,12 +3406,49 @@
 msgid "cold"
 msgstr "froid"
 
+#: 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 "drainage"
+
 #: 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 "enchantée"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Vénérable wose"
@@ -3445,7 +3474,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
@@ -3453,19 +3482,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
@@ -3485,7 +3519,7 @@
 msgid "impact"
 msgstr "contondant"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Archimage"
 
@@ -3502,6 +3536,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
@@ -3517,7 +3553,7 @@
 msgstr "boule de feu"
 
 #: 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
@@ -3529,12 +3565,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 "brûlure"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Archimage"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Assassin"
@@ -3563,7 +3604,7 @@
 msgstr "dague"
 
 #: 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
@@ -3601,21 +3642,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
@@ -3623,16 +3665,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 "tranchant"
 
+#: 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 "assassinat"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "couteau"
 
+#: 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 "empoisonnement"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandit"
@@ -3655,16 +3711,16 @@
 msgid "mace"
 msgstr "massue"
 
-#: 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 "Princesse"
 
-#: 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 "commandement,escarmouche"
 
-#: 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 "
@@ -3677,7 +3733,7 @@
 "personne. Rompue à la bataille et d'esprit fort, elle peut aider dans l'art "
 "du combat ceux qui se battent autour d'elle."
 
-#: 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
@@ -3701,18 +3757,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 "épée"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Princesse"
+
+#: 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 "
@@ -3728,9 +3788,9 @@
 "particulièrement habile pour harceler l'ennemi, elle ignore donc les zones "
 "de contrôle de l'ennemi."
 
-#: 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 "sceptre de feu"
 
@@ -3825,7 +3885,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
@@ -3834,7 +3900,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
@@ -3842,7 +3908,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 "perforant"
@@ -3918,6 +3984,14 @@
 msgid "web"
 msgstr "toile"
 
+#: 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 "ralentissement"
+
 # Éventuellement je propose chocob'os comme traduction de chocobone
 # Revenir à chocobone si cela ne fait pas l'unanimité (Jean)
 #: data/units/Chocobone.cfg:3
@@ -3941,13 +4015,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 "lance"
 
+#: 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 "charge"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Cockatrice"
@@ -3969,6 +4054,11 @@
 msgid "gaze"
 msgstr "regard"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "pierre"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Commandant"
@@ -4047,10 +4137,11 @@
 msgstr "onde froide"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Reine sombre"
 
-#: 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 "
@@ -4061,7 +4152,7 @@
 "adversaire en combat bien que sa véritable puissance réside dans les 
troupes "
 "qu'elle commande."
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "sceptre"
 
@@ -4199,7 +4290,13 @@
 "would be well advised to keep their distance. The most skilled Burners will "
 "often go on to become Fire Drakes who seek to master their internal fire, or "
 "Drake Flares who aspire to be leaders of their kind."
-msgstr "Non seulement les drakes ardents manient leurs griffes de façon 
mortelle mais ils sont également capables de souffler le feu légendaire de 
leurs lointains ancêtres. Leurs adversaires seront bien avisés de garder 
leurs distances. Les plus doués deviennent souvent des drakes incendiaires, 
cherchant encore plus de maîtrise de leur feu intérieur, ou des drakes 
flamboyants, aspirant à mener les leurs."
+msgstr ""
+"Non seulement les drakes ardents manient leurs griffes de façon mortelle "
+"mais ils sont également capables de souffler le feu légendaire de leurs "
+"lointains ancêtres. Leurs adversaires seront bien avisés de garder leurs "
+"distances. Les plus doués deviennent souvent des drakes incendiaires, "
+"cherchant encore plus de maîtrise de leur feu intérieur, ou des drakes "
+"flamboyants, aspirant à mener les leurs."
 
 #: data/units/Drake_Burner.cfg:40 data/units/Drake_Fighter.cfg:44
 #: data/units/Drake_Fire.cfg:42 data/units/Drake_Flameheart.cfg:47
@@ -4342,6 +4439,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 "initiative"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Guerrier drake"
@@ -4361,7 +4464,11 @@
 "Duelists are masters of the art of swordplay. Their skill with the rapier "
 "allows them to attack and parry with only one hand, while they wield a "
 "crossbow in the other to shoot distant foes."
-msgstr "Les duellistes sont des maîtres dans l'art du maniement de l'épée. 
Leur habileté à manier la rapière leur permettent d'attaquer et de parer 
d'une seule main, tandis que de l'autre ils repoussent leurs assaillants à 
l'arbalète."
+msgstr ""
+"Les duellistes sont des maîtres dans l'art du maniement de l'épée. Leur "
+"habileté à manier la rapière leur permettent d'attaquer et de parer d'une "
+"seule main, tandis que de l'autre ils repoussent leurs assaillants à "
+"l'arbalète."
 
 #: data/units/Duelist.cfg:20 data/units/Fencer.cfg:20
 msgid "rapier"
@@ -4388,6 +4495,10 @@
 msgid "berserker frenzy"
 msgstr "frénésie berserk"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "furie"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Gardien de dragon nain"
@@ -4577,6 +4688,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Nain 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 "Mage vénérable"
@@ -4609,7 +4727,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 "Archer elfe"
 
@@ -4624,7 +4742,12 @@
 "rapidement et avec précision, l'Archer elfe compose une grande partie de "
 "l'armée elfe."
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Archer elfe"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Vengeur elfe"
 
@@ -4640,6 +4763,11 @@
 "Wesnoth. Dans les forêts il peut tendre des embuscades à ses ennemis, "
 "restant invisible jusqu'à ce qu'il attaque."
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Vengeur elfe"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Capitaine elfe"
@@ -4671,7 +4799,8 @@
 "ennemis aussi bien de près que de loin."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Druide elfe"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4694,7 +4823,8 @@
 msgstr "épines"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Enchanteresse elfe"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4758,10 +4888,18 @@
 "combat rapproché, qu'à distance avec leurs boules de feu dévastatrices."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Dame elfe"
 
 #: 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 "bousculade"
@@ -4778,7 +4916,7 @@
 "Les seigneurs elfes sont redoutables en combat, aussi bien à l'épée en "
 "combat rapproché, qu'à distance avec leurs boules de feu dévastatrices."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Tireur d'élite elfe"
 
@@ -4801,6 +4939,17 @@
 msgid "longbow"
 msgstr "arc long"
 
+#: 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 "tir d'élite"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Tireur d'élite elfe"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Maréchal elfe"
@@ -4832,7 +4981,7 @@
 "exposés. Aussi habiles à l'arc qu'à l'épée, ils frappent fort avant de "
 "disparaître à nouveau dans les bois pour éviter toute riposte."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Rôdeur elfe"
 
@@ -4849,6 +4998,11 @@
 "les ennemis tant qu'ils sont en forêt, sauf s'ils viennent juste d'attaquer, 
"
 "ou si des ennemis leur sont adjacents."
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Rôdeur elfe"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Monteur elfe"
@@ -4876,7 +5030,8 @@
 "combat."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Prêtresse elfe"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4890,7 +5045,7 @@
 "le nombre de fois qu'ils peuvent attaquer de un. Les prêtresses possèdent "
 "également des capacités curatives basiques."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Archer d'élite elfe"
 
@@ -4906,8 +5061,14 @@
 "toucher, même en tirant très rapidement. Les Archers d'élite elfes sont "
 "excellents pour éliminer des ennemis retranchés."
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Archer d'élite elfe"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Shyde elfe"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4926,7 +5087,8 @@
 msgstr "doigt de fée"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Sorcière elfe"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4938,7 +5100,8 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Sylphe elfe"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -5048,7 +5211,15 @@
 msgid "Galleon"
 msgstr "Galion"
 
-#: 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 "arme factice"
 
@@ -5159,12 +5330,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 "initiative"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Chevalier gobelin"
@@ -5195,7 +5360,8 @@
 msgid "torch"
 msgstr "torche"
 
-#: 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 "filet"
 
@@ -5242,7 +5408,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 "Grand mage"
 
@@ -5254,17 +5420,15 @@
 "Les grands mages sont de redoutables et terrifiants adversaires, surpassant "
 "même les archimages en puissance."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Grand mage"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Troll intrépide"
 
-#: 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 "régénération"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -5486,7 +5650,7 @@
 "Tout comme les commandants, les seigneurs possèdent des capacités de "
 "commandement et améliorent les capacités de combat de toutes les unités "
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Mage"
 
@@ -5507,11 +5671,16 @@
 msgid "missile"
 msgstr "projectile magique"
 
-#: 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 "Mage de lumière"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "illumination,traitement"
 
@@ -5535,16 +5704,23 @@
 "aussi les unités alliés adjacentes."
 
 #: 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 "rayon de lumière"
 
 #: 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 "sacré"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Mage de lumière"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Maître archer"
@@ -5558,11 +5734,28 @@
 "Les maîtres archers ont atteint le niveau le plus élevé de leur art. Leur "
 "dextérité avec cette arme mortelle n'est surpassée que par les elfes."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Ondin"
+#: 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 "Enchanteresse elfe"
 
-#: 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."
@@ -5570,11 +5763,98 @@
 "Habiles créatures des mers, les ondins sont forts et rapides dans tout "
 "milieu aquatique mais se meuvent difficilement sur la terre ferme."
 
-#: 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 "jet d'eau"
+
+#: 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 "doigt de fée"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Ondin"
+
+#: 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 "trident"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "enchevêtrement"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Combattant drake"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Ondin"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Ondin"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Guerrier saurien"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Lancier"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Traduction allemande"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Guerrier saurien"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Golem de boue"
@@ -5588,8 +5868,8 @@
 "et d'eau. Ils attaquent en projetant de l'eau bouillante sur leurs ennemis."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5641,10 +5921,6 @@
 "derrière des masques pour cacher leurs âmes noires. Ces créatures ignobles 
"
 "peuvent se cacher la nuit, ne laissant aucune trace de leur présence."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "chasseur nocturne"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Noble commandant"
@@ -5687,7 +5963,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 "
@@ -5813,7 +6089,7 @@
 "bons jeteurs de sorts et peuvent maudire leurs ennemis et drainer leur vie."
 
 #: 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 "malédiction"
 
@@ -5923,7 +6199,7 @@
 "respectés parmi les orcs et très craints par leurs ennemis. Leur seule "
 "faiblesse est leur incapacité à manier l'arc."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Hors-la-loi"
 
@@ -5931,6 +6207,11 @@
 msgid "Outlaws fight better at night."
 msgstr "Les hors-la-loi détroussent mieux le touriste la nuit tombée."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Hors-la-loi"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
@@ -5938,7 +6219,8 @@
 "le font avec charme."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Princesse des bandits"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5954,7 +6236,8 @@
 "fonder son propre royaume avec les pillards qu'elle rencontre sur les routes."
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Reine des bandits"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -6035,7 +6318,14 @@
 msgid "Pirate Galleon"
 msgstr "Galion pirate"
 
-#: 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 "baliste"
@@ -6052,7 +6342,7 @@
 "Les braconniers s'appuient sur leur expérience de la chasse de nuit dans les 
"
 "forêts et les marécages."
 
-#: 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 "
@@ -6067,7 +6357,7 @@
 "princesse est également agile puisque elle a la dextérité et des talents 
de "
 "voleur."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Mage rouge"
 
@@ -6082,6 +6372,11 @@
 "nuit et rapide marcheur, le mage rouge est précieux dans presque toutes les "
 "situations."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Mage rouge"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Revenant"
@@ -6202,13 +6497,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 "Harpie des mers"
 
 #: data/units/Sea_Hag.cfg:17
@@ -6219,10 +6515,6 @@
 "Les Harpies des mers sont de vieilles nagas expérimentées qui ont appris à 
"
 "contrôler les puissances magiques de l'eau."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "jet d'eau"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Orc marin"
@@ -6234,7 +6526,12 @@
 "environments. With their curved swords they are competent fighters, although "
 "their lack of a ranged attack and poor defence on land do represent "
 "strategic weaknesses."
-msgstr "Bien que souvent considérés comme inférieur à leur équivalent 
terrestre, les orcs marins représentent une avancée pour tous les 
gobelinoïdes de par leur adaptation au milieu aquatique. Grâce à leur épée 
courbée, ce sont des guerriers habiles, mais leur manque d'arme à distance et 
leur faible défense sur la terre ferme sont des faiblesses stratégiques."
+msgstr ""
+"Bien que souvent considérés comme inférieur à leur équivalent terrestre, 
les "
+"orcs marins représentent une avancée pour tous les gobelinoïdes de par 
leur "
+"adaptation au milieu aquatique. Grâce à leur épée courbée, ce sont des "
+"guerriers habiles, mais leur manque d'arme à distance et leur faible 
défense "
+"sur la terre ferme sont des faiblesses stratégiques."
 
 #: data/units/Sea_Serpent.cfg:3
 msgid "Sea Serpent"
@@ -6290,7 +6587,7 @@
 "déplacent lentement, ils sont extrêmement puissants et craints à travers "
 "Wesnoth et même au delà, dans les contrées éloignées."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Mage argent"
 
@@ -6305,10 +6602,24 @@
 "vers un autre village allié. Ils sont également très résistants à la 
plupart "
 "des attaques enchantées."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Mage argent"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Dragon squelettique"
 
+#: 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 "mâchoire"
@@ -6379,6 +6690,10 @@
 "Ces cadavres ensorcelés sont devenus puissants de par leur longue 
expérience "
 "du combat contre les vivants."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "peste"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Lancier"
@@ -6587,10 +6902,11 @@
 "créature de se ressourcer."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Dame vampire"
 
-#: 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 +6914,7 @@
 "Glaciale et belle, elle maintient son éternelle apparence de jeunesse en "
 "buvant le sang des vivants."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "baiser de la mort"
 
@@ -6670,7 +6986,7 @@
 "Les tours de garde sont de bons emplacement pour voir venir l'ennemi et lui "
 "lancer ensuite divers projectiles à l'aide de balistes."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Mage Blanc"
 
@@ -6687,6 +7003,11 @@
 "en combat contre les morts-vivants, qui subissent de lourds dommages avec le "
 "rayon de lumière."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Mage Blanc"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Monteur de loup"
@@ -6900,7 +7221,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 "Fermer"
 
@@ -6921,73 +7242,73 @@
 msgid "none"
 msgstr "aucune"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "dégâts de base"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "résistance de l'attaquant contre"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "vulnerabilité de l'attaquant contre"
 
-#: 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 "dégats doublés"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "dégâts totaux"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "résistance du défenseur contre"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "vulnérabilité du défenseur contre"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "dégats réduits de moitié"
 
-#: 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 "empoisonné"
 
-#: 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 "ralentie"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Embuscade !"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Unité alliée en vue"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Unité ennemie en vue !"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends unité(s) alliée(s) en vue"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies unité(s) ennemie(s) en vue !"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Unités en vue ! ($friends alliée(s), $enemies ennemie(s))"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(appuyez sur $hotkey pour continuer)"
 
@@ -7051,7 +7372,7 @@
 msgid "replay"
 msgstr "film"
 
-#: 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 "Tour"
 
@@ -7120,23 +7441,23 @@
 msgid "Profile"
 msgstr "Profile"
 
-#: 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 "Déplacements"
 
-#: 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 "corps-à-corps"
 
-#: 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 "distant"
 
@@ -7156,11 +7477,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Voulez-vous sauvegarder un replay de ce scénario ?"
 
-#: 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 "Nom :"
 
-#: 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 "Le jeu ne peut pas être sauvegardé"
 
@@ -7229,8 +7550,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 "Erreur"
 
@@ -7294,7 +7615,7 @@
 "l'installation de cette campagne."
 
 #: 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 "Tentative de connexion expirée"
 
@@ -7350,7 +7671,7 @@
 msgid "Play a game against AI opponents"
 msgstr "Jouer contre l'ordinateur"
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr "Connexion"
 
@@ -7370,79 +7691,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Impossible d'initialiser les polices. Arrêt du programme.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Avance en"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Alignement"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Expérience requise"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "attaques"
 
-#: 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 "Nom"
 
-#: 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 "Dmg"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Attaques"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Portée"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Spécial"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Résistances"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Type d'attaque"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Résistance"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Modificateurs de Terrain"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Terrain"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Défense"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Précédent"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Suivant >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Aide pour La bataille de Wesnoth"
 
@@ -7454,7 +7775,7 @@
 msgid "End Unit Turn"
 msgstr "Finir le tour de l'unité"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Chef"
 
@@ -7490,11 +7811,11 @@
 msgid "Unit Description"
 msgstr "Description de l'unité"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Renommer l'unité"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Recruter"
 
@@ -7502,7 +7823,7 @@
 msgid "Repeat Recruit"
 msgstr "Recruter encore"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Rappeler"
 
@@ -7538,11 +7859,11 @@
 msgid "Scenario Objectives"
 msgstr "Objectifs du scénario"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Liste des unités"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statistiques"
 
@@ -7650,7 +7971,7 @@
 msgid "Speak to All"
 msgstr "Parler à tous"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Aide"
 
@@ -7710,7 +8031,7 @@
 msgid "Bump Size"
 msgstr "Taille des collines"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Villages"
 
@@ -7760,15 +8081,11 @@
 "Les ennemis ne peuvent être vus à moins qu'ils ne soient à porté de vos "
 "unités"
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Voile"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "La carte est inconnue jusqu'a ce que vos unités l'explorent"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Observateurs"
 
@@ -7776,13 +8093,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Permettre aux personnes qui ne jouent pas d'observer la partie"
 
-#: 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 "Annuler"
 
-#: 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"
 
@@ -7858,69 +8175,69 @@
 msgid "Warning"
 msgstr "Avertissement"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Réception de la liste des jeux..."
 
-#: 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 "Or"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "En attente de démarrage du jeu..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 msgid "Connect to Host"
 msgstr "Connection au serveur"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Choisissez un serveur sur lequel vous connecter"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Connexion au serveur distant..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Vous devez vous connecter à ce serveur"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Réception des données du jeu..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Il n'y a aucun camp de disponible."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Choisissez votre camp :"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Le jeu a été annulé"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Le camp que vous avez choisi n'est plus disponible"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Montrer les actions déjà effectuées jusqu'au point de sauvegarde ?"
 
-#: 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 "Meneur : "
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr "Recrutements : "
 
@@ -7952,8 +8269,8 @@
 msgid "Local Player"
 msgstr "Humain"
 
-#: 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 "Ordinateur"
 
@@ -8018,7 +8335,7 @@
 msgid "Color"
 msgstr "Couleur"
 
-#: 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 "En attente d'autres joueurs"
 
@@ -8103,58 +8420,58 @@
 msgid "It is now your turn"
 msgstr "À vous de jouer"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Attaquant"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Défenseur"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Calcul des dégâts"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Corps-à-corps"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "contre"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Attaquer l'ennemi"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Choisissez une arme"
 
-#: 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 ""
 "Vous n'avez pas encore commencé votre tour. Voulez-vous vraiment finir votre 
"
 "tour ?"
 
-#: 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 ""
 "Certaines unités peuvent encore se déplacer. Voulez-vous vraiment finir "
 "votre tour ?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Sauvegarde automatique"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 "Impossible de sauver le jeu automatiquement. Vous devez le faire "
 "manuellement."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -8163,35 +8480,35 @@
 "barres obliques ni de barres obliques inverses. Veuillez choisir un autre "
 "nom."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Sauvé"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Le jeu a été sauvegardé"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Revenu"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Entretien"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Vous n'avez pas d'unité disponible pour recruter."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Sélectionner l'unité"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Vous n'avez pas assez d'or pour recruter cette unité"
 
-#: 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?"
@@ -8199,7 +8516,7 @@
 "Mon seigneur, cette unité a de l'expérience, et un niveau avancé ! 
Voulez-"
 "vous vraiment renvoyer $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?"
@@ -8207,19 +8524,19 @@
 "Mon seigneur, cette unité est proche de gagner un niveau ! Voulez-vous "
 "vraiment renvoyer $noun ?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "elle"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "lui"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Vous êtes séparés de vos soldats et ne pouvez les rappeler"
 
-#: 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)"
@@ -8227,88 +8544,88 @@
 "Il n'y a pas de troupe disponible à rappeler\n"
 "(Vous devez avoir des survivants vétérans d'un précédent scénario)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "Vous devez posséder au moins $cost pièces d'or pour rappeler une 
unité"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Renvoyer l'unité"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Message"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Parler aux alliés uniquement"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Localisation"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Recrutements"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Vétérans rappelés"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Avancements"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Pertes"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Ennemis tués"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Dégâts infligés"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Dégâts subis"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Dégâts infligés (attendus)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Dégâts subis (attendus)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Commande :"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Historique des discussions"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr ""
 "Impossible de trouver une étiquette ou une unité contenant : « $search 
»."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Placez l'étiquette"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Étiquette"
 
-#: 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?"
@@ -8316,23 +8633,23 @@
 "Le jeu est désynchronisé et doit se terminer. Voulez-vous sauvegarder les "
 "messages d'erreur dans un fichier ?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Remplacer par l'ordinateur"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Remplacer par un joueur local"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Annuler le jeu"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Remplacer par "
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "a quitté le jeu. Que voulez-vous faire ?"
 
@@ -8396,63 +8713,63 @@
 msgid "Chaotic units"
 msgstr "Unités chaotiques"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Village possédé"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Village ennemi"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Village allié"
 
-#: src/show_dialog.cpp:934
+#: src/show_dialog.cpp:953
 msgid "KB"
 msgstr "ko"
 
-#: 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 "Didacticiel"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Campagne"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Multi-joueurs"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Charger"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Langue"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Preferences"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Quitter"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Commencer un didacticiel pour vous familiariser avec le jeu"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Commencer une nouvelle campagne (jeu solo)"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -8460,31 +8777,31 @@
 "Jouer en multi-joueurs (hotseat, réseau local ou Internet) ou un simple "
 "scénario contre l'ordinateur"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Charger une partie sauvegardée (jeu solo)"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Changer la langue"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Configurer les paramètres du jeu"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Afficher les crédits"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Quitter le jeu"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Plus"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Le livre de Wesnoth"
 
@@ -8492,15 +8809,15 @@
 msgid "strikes"
 msgstr "attaques"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "chaotique"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "loyal"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutre"
 
@@ -8512,6 +8829,18 @@
 msgid "Deletion of the file failed."
 msgstr "La suppression du fichier a échoué."
 
+#~ msgid "first strike"
+#~ msgstr "initiative"
+
+#~ msgid "Swamp"
+#~ msgstr "Marais"
+
+#~ msgid "Tundra"
+#~ msgstr "Toundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Démarrer un serveur de jeu multi-joueurs"
 
@@ -12780,9 +13109,6 @@
 #~ msgid "I think I know what I'm doing. Come, let us go!"
 #~ msgstr "Je pense que je sais ce que je fais. En avant !"
 
-#~ msgid "Snow Plains"
-#~ msgstr "Les plaines enneigées"
-
 #~ msgid ""
 #~ "\n"
 #~ "Victory:\n"
@@ -13672,9 +13998,6 @@
 #~ "#Mort de Grüü\n"
 #~ "#Mort d'un chaman"
 
-#~ msgid "Silent Forest"
-#~ msgstr "La forêt silencieuse"
-
 #~ msgid ""
 #~ "\n"
 #~ "Victory:\n"
Index: wesnoth/po/wesnoth/hu.po
diff -u wesnoth/po/wesnoth/hu.po:1.8 wesnoth/po/wesnoth/hu.po:1.9
--- wesnoth/po/wesnoth/hu.po:1.8        Mon Oct 18 21:38:44 2004
+++ wesnoth/po/wesnoth/hu.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-18 22:01+0200\n"
 "Last-Translator: Automatically generated <address@hidden>\n"
 "Language-Team: none\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr ""
 
@@ -50,11 +50,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 ""
 
@@ -140,7 +140,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 "Mozgás"
 
@@ -374,7 +374,7 @@
 "fun, and good luck!"
 msgstr ""
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 #, fuzzy
 msgid "About"
 msgstr "Ifjú"
@@ -620,7 +620,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 ""
 
@@ -735,6 +735,24 @@
 msgid "Random map"
 msgstr "Véletlenszerű pályakialakítás"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Véletlenszerű pályakialakítás"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Véletlenszerű pályakialakítás"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Véletlenszerű pályakialakítás"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr ""
@@ -774,7 +792,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 ""
 
@@ -1236,7 +1254,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 ""
 
@@ -1667,6 +1685,114 @@
 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 "Falu"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Sekély víz"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Jég"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Híd"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Homok"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Országút"
+
+#: data/terrain.cfg:122
+#, fuzzy
+msgid "Dirt"
+msgstr "Sártenger"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Mezőség"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Árny"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Dombság"
+
+#: data/terrain.cfg:184
+#, fuzzy
+msgid "Snow hills"
+msgstr "Hófödte fennsíkok"
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Hegyvidék"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Erdőség"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Barlangfal"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Barlang"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Várkastély"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr ""
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Törp pusztaság"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Fellegvár"
+
+#: data/terrain.cfg:288
+msgid "Canyon"
+msgstr ""
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menü"
@@ -1680,14 +1806,14 @@
 msgstr "Kör vége"
 
 #: 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 ""
 
@@ -1766,33 +1892,28 @@
 "Nappal 25%-kal alacsonyabb, \n"
 "éjjel 25%-kal magasabb a sebzésük."
 
-#: 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 ""
-"Csillapítás: \n"
-"Az egység képes a szomszédos szövetséges egységeket gyógyítani a kör 
"
-"kezdetén. \n"
+"Rajtaütés:\n"
+"Az egység képes elrejtőzni az ellenség elől.\n"
 "\n"
-"A csillapító által kezelt egység legfeljebb 4 életerő-pontot 
gyógyulhat "
-"körönként, \n"
-"egy gyógyító egy körben legfeljebb 8 életerő-pontot gyógyíthat. \n"
-"Mérgezett egységet nem képes kigyógyítani a mérgezésből, annak egy 
falu vagy "
-"egy gyógyításra képes egység lehet a segítségére."
+"Erdős terepen az ellenség nem látja és nem is tudja megtámadni, kivéve 
a "
+"rejtőzködő egység támadása után közvetlenül következő körben."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "csillapítás"
+#: 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 "rajtaütés"
 
-#: 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 "
@@ -1817,27 +1938,61 @@
 "A gyógyító a mérgezést is képes elmulasztani, de a mérgezett egység a 
"
 "mérgezés meggyógyításának körében egyéb kezelésben nem 
részesülhet."
 
-#: 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 "gyógyítás"
 
-#: 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 ""
-"Teleportáció:\n"
-"Ez az egység képes bármely két szövetséges település közti azonnali "
-"térugrásos helyváltoztatásra."
+"Csillapítás: \n"
+"Az egység képes a szomszédos szövetséges egységeket gyógyítani a kör 
"
+"kezdetén. \n"
+"\n"
+"A csillapító által kezelt egység legfeljebb 4 életerő-pontot 
gyógyulhat "
+"körönként, \n"
+"egy gyógyító egy körben legfeljebb 8 életerő-pontot gyógyíthat. \n"
+"Mérgezett egységet nem képes kigyógyítani a mérgezésből, annak egy 
falu vagy "
+"egy gyógyításra képes egység lehet a segítségére."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleportáció"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "csillapítás"
 
-#: data/translations/english.cfg:45
+#: 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 ""
+"Megvilágítás: \n"
+"Az egység megvilágítja a körülötte lévő területet, így a törvény 
erői "
+"jobban, míg a káoszéi rosszabbul harcolnak. \n"
+"\n"
+"A szomszédos egységek éj idején szürkületi, míg szürkület idején 
nappali "
+"viszonyok között küzdenek."
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "megvilágítás, gyógyítás"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -1851,7 +2006,7 @@
 "\n"
 "Az alacsonyabb szintű szomszédos egységek sebzése ily módon növekszik."
 
-#: 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
@@ -1860,56 +2015,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 "hadvezetés"
 
-#: 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 ""
-"Rajtaütés:\n"
-"Az egység képes elrejtőzni az ellenség elől.\n"
-"\n"
-"Erdős terepen az ellenség nem látja és nem is tudja megtámadni, kivéve 
a "
-"rejtőzködő egység támadása után közvetlenül következő körben."
 
-#: 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 "rajtaütés"
+#: 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 "éjszakai lopakodás"
+
+#: 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 ""
-"Megvilágítás: \n"
-"Az egység megvilágítja a körülötte lévő területet, így a törvény 
erői "
-"jobban, míg a káoszéi rosszabbul harcolnak. \n"
-"\n"
-"A szomszédos egységek éj idején szürkületi, míg szürkület idején 
nappali "
-"viszonyok között küzdenek."
 
-#: data/translations/english.cfg:61
+#: 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
 #, fuzzy
-msgid "illuminates"
-msgstr "megvilágítás, gyógyítás"
+msgid "regenerates"
+msgstr "regeneráció"
 
-#: 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 "
@@ -1919,141 +2063,153 @@
 "Ez az egység képzetten és gyorsan tör az ellenséges vonalak mögé, az "
 "ellenség ellenőrizte terület határáról tudomást sem véve."
 
-#: 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 "portyázó"
 
-#: 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 ""
+"Teleportáció:\n"
+"Ez az egység képes bármely két szövetséges település közti azonnali "
+"térugrásos helyváltoztatásra."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleportáció"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "legkissebb sebzés"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Játék"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Küldetés"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 #, fuzzy
 msgid "Configure Sides:"
 msgstr "Csapatok beállításai:"
 
-#: 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 "Nem sikerült csatlakozni a távoli géphez"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Más játékosok csatlakozására várunk ..."
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Betöltve"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Elfoglalható"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Megfigyelő"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Egység leírása"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Teljes képernyőn vagy ablakban?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Megjelenítés: "
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Futtatás ablakban"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Sebesség:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normál"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Hang beállítások..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Opciók"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Válassz küldetést"
 
-#: 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 "vagy"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Az egység védőértékei"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Lásd még..."
 
-#: 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 "
@@ -2063,13 +2219,17 @@
 "Ez a támadás kétszeres sebzéssel jár, ha a célpont átellenes oldalán "
 "szövetséges egység áll."
 
-#: 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 "orvtámadás"
+#: 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 ""
+"Dühöngés:\n"
+"Ezzel a támadással - támadás és védekezés esetében is - az 
összecsapás addig "
+"tart, amíg az egyik fél el nem esik."
 
-#: 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 "
@@ -2079,14 +2239,7 @@
 "Ez a támadás a célpontnak dupla sebzést okoz, ugyanakkor az egység 
által a "
 "célponttól kapott sebzés is a kétszeresére nő."
 
-#: 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 "roham"
-
-#: 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 "
@@ -2096,18 +2249,16 @@
 "Ez az egység életerőt szív el egy élő célpontból, az okozott sebzés 
felével "
 "saját magát gyógyítva."
 
-#: 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 "megcsapolás"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Első ütés:\n"
+"Ez az egység ezzel a támadással mindig elsőnek üt, még akkor is, ha őt 
"
+"támadták meg."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2115,32 +2266,7 @@
 "Mágikus:\n"
 "Ez a támadás mindig 70% eséllyel sikeres."
 
-#: 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ágikus"
-
-#: 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."
@@ -2148,13 +2274,7 @@
 "Mesterlövész:\n"
 "Támadó hadműveleteknél 60% eséllyel szerez találatot."
 
-#: 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 "mesterlövész"
-
-#: 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 "
@@ -2165,12 +2285,7 @@
 "tartózkodik, a halott célpont teste feléled, és a támadó oldalán 
harcol "
 "tovább."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "dögvész"
-
-#: 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 "
@@ -2181,16 +2296,7 @@
 "t veszítenek mindaddig, amíg meg nem gyógyítják őket, vagy az 
Életerejük 1-"
 "re nem csökken."
 
-#: 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 "mérgezés"
-
-#: 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 "
@@ -2201,15 +2307,7 @@
 "sebességének a felével haladhat, ezenkívül az összecsapásokban 
körönként "
 "eggyel kevesebb támadásra képes, mint rendesen."
 
-#: 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 "lassítás"
-
-#: 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 "
@@ -2219,199 +2317,88 @@
 "Ez a támadás a célpont egységet kővé dermeszti. A kővé vált 
egységek nem "
 "mozoghatnak és nem harcolhatnak."
 
-#: 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 "kővéváltoztatás"
-
 #: 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 ""
-"Dühöngés:\n"
-"Ezzel a támadással - támadás és védekezés esetében is - az 
összecsapás addig "
-"tart, amíg az egyik fél el nem esik."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "dühöngés"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Első ütés:\n"
-"Ez az egység ezzel a támadással mindig elsőnek üt, még akkor is, ha őt 
"
-"támadták meg."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "első ütés"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Tündék"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orkok"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Emberek"
 
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Élőholtak"
-
-#: 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 "Homok"
-
-#: 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 "Falu"
-
-#: data/translations/english.cfg:183
-#, fuzzy
-msgid "Swamp"
-msgstr "Sekély víz"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Jég"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Országút"
-
-#: data/translations/english.cfg:192
-#, fuzzy
-msgid "Dirt"
-msgstr "Sártenger"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Mezőség"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Dombság"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Hegyvidék"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Erdőség"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Híd"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Várkastély"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Fellegvár"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Barlang"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Barlangfal"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orkok"
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr ""
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Élőholtak"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "$name hídja,$name gázlója"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "$name országútja, $name hágója,$name ösvénye"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "$name folyó,$name folyó"
 
-#: 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 "$name-tó"
 
-#: 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 "Következő tipp"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "A nap tippje"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Ne mutasson tippeket"
 
-#: data/translations/english.cfg:223
+#: data/translations/english.cfg:185
 #, fuzzy
 msgid ""
 "Lawful units fight better at day, and chaotic units fight better at night. "
@@ -2420,7 +2407,7 @@
 "Lawful units fight better at day, and chaotic units fight better at night. "
 "Neutral units are unaffected by day and night."
 
-#: 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."
@@ -2428,7 +2415,7 @@
 "Egy hadjárat során felhasználhatod veterán csapataid, akik az előző 
pályákon "
 "harcoltak, a 'Veteránok visszahívása' paranccsal."
 
-#: 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-"
@@ -2442,7 +2429,7 @@
 "az ellenállóképességre hogy megtudd, hogy az adott egység mennyire tud "
 "ellenállni a bizonyos támadás-fajtákkal szemben."
 
-#: 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 "
@@ -2454,7 +2441,7 @@
 "védekezési értéke a kurzor alatti területfajtán a képernyő 
jobb-felső "
 "sarkában jelenik meg."
 
-#: 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 "
@@ -2466,7 +2453,7 @@
 "életerőpontjuk. A megmérgezett egységeid meggyógyíthatod ha beviszed 
őket "
 "egy faluba, vagy egy 'gyógyító' képességű egységed mellé állítod."
 
-#: 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 "
@@ -2476,7 +2463,7 @@
 "parancsával. Visszhívva ugyanazokat az egységeket újra és újra, egy 
ütőképes "
 "és tapasztalt hadsereget tudsz felépíteni."
 
-#: 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 "
@@ -2486,7 +2473,7 @@
 "Ha egy egység az ellenség ellenőrzött területére lép, akkor abban a 
körben "
 "már nem mehet tovább."
 
-#: 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 "
@@ -2497,14 +2484,14 @@
 "mágikus támadások mindig 70% eséllyel találnak, és a 
mesterlövészeknek "
 "legalább 60% esélyük van a sikeres lövésre."
 
-#: 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 ""
 "A falvakban elhelyezett egységek minden kör elején 8 életerőpontot (HP) "
 "gyógyulnak."
 
-#: 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."
@@ -2512,7 +2499,7 @@
 "Azok az egységek amelyek nem támadnak és nem mozognak egy körben 
pihennek, "
 "és a következő kör elején 2 életerőpontot (HP) gyógyulnak."
 
-#: 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 "
@@ -2522,7 +2509,7 @@
 "mint bármely más terepen, míg a legtöbb lovas egység nem jut semmilyen "
 "előnyhöz ezekben."
 
-#: 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 "
@@ -2531,7 +2518,7 @@
 "A lovas egységek ellenállnak a pengés és ütő fegyvereknek, de 
sebezhetőek "
 "páncéltörő fegyverekkel, többek között nyilakkal és dárdákkal."
 
-#: 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 "
@@ -2541,7 +2528,7 @@
 "tapasztalatszerzésnek. Azok az egységek akik megölnek valakit 8 
tapasztalati "
 "pontot (XP) nyernek a megölt ellenség minden szintje után."
 
-#: 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."
@@ -2549,7 +2536,7 @@
 "A tünde egységek kíválóan harcolnak és mozognak erdőkben. A törpök 
legjobb "
 "tudásukat dombokon és hegységekben mutatják meg."
 
-#: 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."
@@ -2558,7 +2545,7 @@
 "lesznek a támadásra, minthogy rossz helyzetből, vagy kevés egységgel "
 "bocsátkozz csatába!"
 
-#: 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."
@@ -2566,12 +2553,12 @@
 "Ha több irányból támadnak rád, jó ötlet lehet néhány feláldozható 
egység "
 "előreküldése különböző irányokba, hogy feltartsák az ellenséget."
 
-#: 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 "Ne félj visszvonulni és rendezni soraid, gyakran ez a győzelem 
kulcsa."
 
-#: 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 "
@@ -2583,7 +2570,7 @@
 "aranyat nyersz ilyen módon, mintha falvakat foglalnál el és várnál hogy "
 "elfogyjanak hátralévő köreid."
 
-#: 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 "
@@ -2595,7 +2582,7 @@
 "várát és onnan is toborozni. Továbbá, néhány szövetségesed is 
tarthat fenn "
 "neked helyet a várában, hogy ott toborozz egységeket."
 
-#: 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."
@@ -2603,7 +2590,7 @@
 "A csontvázak ellenállnak a páncéltörő és a pengés támadásoknak, de "
 "sebezhetőek ütő, tüzes és szent támadásokkal."
 
-#: 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."
@@ -2611,7 +2598,7 @@
 "A vezető képességel rendelkező egységek a közelükben, velük harcoló "
 "alacsonyabb szintű egységeket erősebbé teszik."
 
-#: 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 "
@@ -2621,7 +2608,7 @@
 "elhelyezkedhet benne és megtámadhat, miközben az védelmet és 
gyógyulást ad "
 "számára."
 
-#: 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."
@@ -2630,17 +2617,17 @@
 "jobb oldalán, elolvashatod az adott képesség vagy jellemvonás részletes "
 "leírását."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Állítsd egyégeidet harcvonalba, hogy a mögöttük lévő egységeket 
fedezzék "
 "amíg felgyógyulnak."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Sokat segít a beállítások menüban a gyorsbillentyűk 
tanulmányozása."
 
-#: 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'."
@@ -2648,7 +2635,7 @@
 "Ha lépsz egy egységgel, de nem támadsz vagy társz fel új 
körülményeket, "
 "visszvonhatod lépésed az 'u' billentyű segítségével."
 
-#: 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."
@@ -2656,7 +2643,7 @@
 "Ha a kurzort egy egység fölé viszed, láthatod milyen messzire tud lépni 
egy "
 "kör alatt."
 
-#: 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."
@@ -2664,7 +2651,7 @@
 "Használj gyógyító egységeket támadásaid segítésére - eldönthetik a 
csatát "
 "anélkül hogy bárkit is maguk kellene megtámadniuk."
 
-#: 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 "
@@ -2675,11 +2662,11 @@
 "képesség nagyon hatásos azon egységek ellen akiknek néhány erős 
támadási "
 "lehetőségük van."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "A szent támadások kifejezetten hatékonyak élőholt egységek 
ellen."
 
-#: 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."
@@ -2687,7 +2674,7 @@
 "Amikor egy egség szintet lép teljesen felgyógyul. Ez, ha bölcsen 
használod, "
 "eldöntheti a csatát."
 
-#: 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 ""
 
+#: 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 "megcsapolás"
+
 #: 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ágikus"
+
 #: 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 "ütés"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Varázslómester"
 
@@ -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 "tűzgolyó"
 
 #: 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,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 ""
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Varázslómester"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Orgyilkos"
@@ -2879,7 +2915,7 @@
 msgstr "tőr"
 
 #: 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
@@ -2917,21 +2953,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
@@ -2939,16 +2976,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 "penge"
 
+#: 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 "orvtámadás"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "kés"
 
+#: 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 "mérgezés"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandita"
@@ -2971,16 +3022,16 @@
 msgid "mace"
 msgstr "buzogány"
 
-#: 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 "Hercegnő"
 
-#: 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 "
@@ -2995,7 +3046,7 @@
 "csatában. A Hercegnő jól képzett gyalogos, aki az ellenség által 
ellenőrzött "
 "zónákon is át tud hatolni."
 
-#: 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
@@ -3019,18 +3070,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 "kard"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Hercegnő"
+
+#: data/units/Battle_Princess.cfg:58
 #, fuzzy
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
@@ -3046,9 +3101,9 @@
 "csatában. A Hercegnő jól képzett gyalogos, aki az ellenség által 
ellenőrzött "
 "zónákon is át tud hatolni."
 
-#: 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 ""
 
@@ -3142,7 +3197,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
@@ -3151,7 +3212,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
@@ -3159,7 +3220,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 "páncéltörés"
@@ -3232,6 +3293,14 @@
 msgid "web"
 msgstr "háló"
 
+#: 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 "lassítás"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Csontharcos"
@@ -3253,13 +3322,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 "dárda"
 
+#: 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 "roham"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Gyíkfarkú kakas"
@@ -3278,6 +3358,11 @@
 msgid "gaze"
 msgstr "bénítás"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "kővéváltoztatás"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Fővezér"
@@ -3342,17 +3427,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 ""
 
@@ -3627,6 +3712,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
 #, fuzzy
 msgid "Drake Warrior"
@@ -3679,6 +3770,10 @@
 msgid "berserker frenzy"
 msgstr ""
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "dühöngés"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr ""
@@ -3853,6 +3948,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 "Vén Mágus"
@@ -3885,7 +3987,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 "Tünde íjász"
 
@@ -3899,7 +4001,12 @@
 "képzettek a távolsági harcban. Gyorsan és pontosan sok vesszőt lőnek 
ki, és "
 "a tünde seregekben mindig jelentős szerepük van"
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Tünde íjász"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Tünde fejvadász"
 
@@ -3916,6 +4023,11 @@
 "Éles szemével éjjel is kiválóan lát, így nem éri hátrány ha 
éjszaka veszi "
 "fel a harcot ellenségeivel"
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Tünde fejvadász"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Tünde kapitány"
@@ -3945,7 +4057,8 @@
 "ejt. Íjával egyaránt veszélyt jelent közelről és a távolból is"
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Tünde látó"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -3968,7 +4081,7 @@
 
 #: data/units/Elvish_Enchantress.cfg:3
 #, fuzzy
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr "Tünde sámán"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4028,10 +4141,18 @@
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
-msgstr ""
+#, fuzzy
+msgid "female^Elvish Lady"
+msgstr "Tünde-úr"
 
 #: 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 "kővéváltoztatás"
@@ -4048,7 +4169,7 @@
 "A tünde-urak vívótudásáról sokat regélnek, azonban távolra 
tűzlabdákat is "
 "képesek vetni."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr ""
 
@@ -4071,6 +4192,17 @@
 msgid "longbow"
 msgstr "hosszú íj"
 
+#: 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 "mesterlövész"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Tünde marsall"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Tünde marsall"
@@ -4101,7 +4233,7 @@
 "sem akadályozza. Képesek íjat is használni lóháton, így ellenségeikre 
"
 "nyílzáport zúdíthatnak"
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Tünde vadász"
 
@@ -4118,6 +4250,11 @@
 "így éjjel nem sújtják azok a büntetések, amelyek más igazságos 
egységeket "
 "egyébként érintenének."
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Tünde vadász"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Tünde lovas"
@@ -4142,7 +4279,8 @@
 "vesznek részt."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Tünde sámán"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4156,7 +4294,7 @@
 "Gyökerekkel fonja körbe áldozatát, így csökkenti a támadásainak a "
 "sebességét. A gyógyítás mesterségének alapjait is ismeri"
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 #, fuzzy
 msgid "Elvish Sharpshooter"
 msgstr "Tünde elit íjászok"
@@ -4173,9 +4311,14 @@
 "tévedhetetlenek. Bármilyen körülmények között 3 vesszőből 2 célba 
talál, így "
 "aztán a megerődített ellenséges csapatokat is gyorsan pusztítják"
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Tünde elit íjászok"
+
 #: data/units/Elvish_Shyde.cfg:3
 #, fuzzy
-msgid "Elvish Shyde"
+msgid "female^Elvish Shyde"
 msgstr "Jótündér"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4195,7 +4338,7 @@
 
 #: data/units/Elvish_Sorceress.cfg:3
 #, fuzzy
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr "Tünde íjász"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4208,7 +4351,7 @@
 
 #: data/units/Elvish_Sylph.cfg:3
 #, fuzzy
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr "Jótündér"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4313,7 +4456,15 @@
 msgid "Galleon"
 msgstr "Gálya"
 
-#: 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
 #, fuzzy
 msgid "dummy"
 msgstr "megtévesztés"
@@ -4423,12 +4574,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"
@@ -4462,7 +4607,8 @@
 msgid "torch"
 msgstr "fáklya"
 
-#: 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 "hálóvetés"
 
@@ -4512,7 +4658,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 "Udvari Mágus"
@@ -4527,18 +4673,15 @@
 "Varázslómesterén is. Akárcsak a Varázslómester, az Udvari Mágus is "
 "teleportálhat falvak között, hogy az egész csatatéren bevethesse 
varázslatait"
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Udvari Mágus"
+
 #: 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
-#, fuzzy
-msgid "regenerates"
-msgstr "regeneráció"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4752,7 +4895,7 @@
 "ért az íjászathoz is. Akárcsak a parancsnokok, rendelkeznek hadvezetési "
 "tehetséggel, és az összes közeli gyengébb csapat harcértékét növeli"
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Mágus"
 
@@ -4772,11 +4915,16 @@
 msgid "missile"
 msgstr "lövedék"
 
-#: 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 "Fény mágusa"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 #, fuzzy
 msgid "illuminates,cures"
 msgstr "megvilágítás, gyógyítás"
@@ -4799,16 +4947,23 @@
 "pedig szürkületi homályban harcolhatnak"
 
 #: 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 "fénycsóva"
 
 #: 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 "szentség"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Fény mágusa"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Mesteríjász"
@@ -4823,11 +4978,28 @@
 "minden ember remélni tud hogy elér. Ügyességüket eme halálos fegyver "
 "használatában csak a tündéké múlja felül."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Sellő"
+#: 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 "Tünde sámán"
 
-#: 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."
@@ -4835,11 +5007,97 @@
 "A tengerek ügyes teremtményei, a sellők gyorsak és erősek 
partraszálláskor, "
 "de ha beljebb merészkednek a szárazföldre, már kevés hasznukat venni."
 
-#: 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 "érintés"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Sellő"
+
+#: 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 "szigony"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "behálózás"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Perzsekény verekedő"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Sellő"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Sellő"
+
+#: 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 "Dárdás"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "Triton"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Gyík harcos"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr ""
@@ -4851,8 +5109,8 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -4902,10 +5160,6 @@
 "maszkok mögött tartva, hogy eltakarják ördögi lelküket. Ezek a 
megvetett "
 "lények képesek éjszaka elbújni, semmi nyomot nem hagyva ottjártukról."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "éjszakai lopakodás"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr ""
@@ -4943,7 +5197,7 @@
 msgid "Ogre"
 msgstr "Hegyi óriás"
 
-#: 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 "
@@ -5053,7 +5307,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 "átok"
 
@@ -5139,7 +5393,7 @@
 "között, de ugyanekkor félelem ellenségei részéről. Egyetlen gyenge 
pontja, "
 "hogy íjat nem használhat."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Törvényen kívüli"
 
@@ -5147,12 +5401,17 @@
 msgid "Outlaws fight better at night."
 msgstr "A törvényen kívüliek az éj leple alatt jobban harcolnak."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Törvényen kívüli"
+
 #: 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
@@ -5164,7 +5423,7 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+msgid "female^Outlaw Queen"
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5232,7 +5491,14 @@
 msgid "Pirate Galleon"
 msgstr "Kalózgálya"
 
-#: 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 "dárdavető"
@@ -5251,7 +5517,7 @@
 "ezért a legtöbb hasznukat éjszaka, erdőkben és ingoványos vidéken 
lehet "
 "venni."
 
-#: 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 "
@@ -5266,7 +5532,7 @@
 "Kecsességének és ügyességének köszönhetően a tolvajok 
legelőnyösebb "
 "tulajdonságaival is rendelkezik"
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Vörös mágus"
 
@@ -5280,6 +5546,11 @@
 "ellenséget. Mivel lépte fürge és egyaránt harcba vethető nappal és 
éjszaka, "
 "a vörös mágus szinte minden helyzetben hasznos."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Vörös mágus"
+
 #: data/units/Revenant.cfg:3
 #, fuzzy
 msgid "Revenant"
@@ -5394,13 +5665,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 "Tengerek véne"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5411,10 +5683,6 @@
 "A tengerek vénei öreg, tapasztalt nagák, akik ismerik a vízmágia minden "
 "fortélyát."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr ""
-
 #: data/units/Sea_Orc.cfg:3
 #, fuzzy
 msgid "Sea Orc"
@@ -5481,7 +5749,7 @@
 "félelmetesen harcolnak, okkal rettegnek tőlük Wesnoth földjén, de azon 
kívül "
 "is."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr ""
 
@@ -5492,10 +5760,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 ""
@@ -5560,6 +5841,10 @@
 "fighting the living."
 msgstr ""
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "dögvész"
+
 #: data/units/Spearman.cfg:3
 #, fuzzy
 msgid "Spearman"
@@ -5759,17 +6044,18 @@
 "denevér is."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
-msgstr ""
+#, fuzzy
+msgid "female^Vampire Lady"
+msgstr "Vérszívó denevér"
 
-#: 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 ""
 "Hideg és megkapó. Örökké fiatal megjelenését az élők vérének 
ivásával éri el."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr ""
 
@@ -5828,7 +6114,7 @@
 "Az őrtornyokból könnyű észrevenni és megfigyelni az ellenséget, 
továbbá "
 "innen rájuk lehet hajítani mindenfélét a dárdavetőkkel."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Fehér mágus"
 
@@ -5845,6 +6131,11 @@
 "sebeikből. A fehér mágus erős ellenfele az élőholtaknak: fehér fényű 
"
 "támadása különösen hatásos ellenük"
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Fehér mágus"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Farkaslovas"
@@ -6054,7 +6345,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 ""
 
@@ -6074,73 +6365,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 ""
 
@@ -6200,7 +6491,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 ""
 
@@ -6260,23 +6551,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 ""
 
@@ -6296,11 +6587,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 ""
 
@@ -6362,8 +6653,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 ""
 
@@ -6425,7 +6716,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 ""
 
@@ -6481,7 +6772,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 ""
 
@@ -6501,79 +6792,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 ""
 
@@ -6585,7 +6876,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 ""
 
@@ -6621,11 +6912,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 ""
 
@@ -6633,7 +6924,7 @@
 msgid "Repeat Recruit"
 msgstr ""
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr ""
 
@@ -6669,11 +6960,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 ""
 
@@ -6781,7 +7072,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 "Segítség"
 
@@ -6841,7 +7132,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 ""
 
@@ -6889,15 +7180,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 ""
 
@@ -6905,13 +7192,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 "Mégse"
 
-#: 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é"
 
@@ -6985,69 +7272,69 @@
 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
 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 ""
 
@@ -7077,8 +7364,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 ""
 
@@ -7143,7 +7430,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 ""
 
@@ -7226,218 +7513,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 ""
 
@@ -7489,93 +7776,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 "-- Wesnoth Nagykönyve "
 
@@ -7583,15 +7870,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 ""
 
@@ -7603,6 +7890,15 @@
 msgid "Deletion of the file failed."
 msgstr ""
 
+#~ msgid "first strike"
+#~ msgstr "első ütés"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #, fuzzy
 #~ msgid ""
 #~ "Armed with heavy mace, Bandits are adept at robbing and killing at night."
@@ -10713,10 +11009,6 @@
 #~ msgstr "Tudom, mit csinálok! Gyerünk hát, indulás!"
 
 #, fuzzy
-#~ msgid "Snow Plains"
-#~ msgstr "Hófödte fennsíkok"
-
-#, fuzzy
 #~ msgid ""
 #~ "\n"
 #~ "Victory:\n"
Index: wesnoth/po/wesnoth/it.po
diff -u wesnoth/po/wesnoth/it.po:1.7 wesnoth/po/wesnoth/it.po:1.8
--- wesnoth/po/wesnoth/it.po:1.7        Sun Oct 17 12:52:54 2004
+++ wesnoth/po/wesnoth/it.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-10-09 18:00+0100\n"
 "Last-Translator: RokStar <address@hidden>\n"
 "Language-Team: none\n"
@@ -15,7 +15,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 "leale"
 
@@ -47,11 +47,11 @@
 msgid "Traits"
 msgstr "Caratteristiche"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Unità"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Abilità"
 
@@ -196,7 +196,7 @@
 "<ref>dst=income_and_upkeep text='Entrate e Mantenimento'</ref> per ulteriori "
 "informazioni. "
 
-#: 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 "movimento"
 
@@ -615,7 +615,7 @@
 "ma sai già tutto ciò di cui hai bisogno per giocare la campagna L'erede al "
 "Trono. Buon divertimento e buona fortuna!"
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr "A proposito"
 
@@ -929,7 +929,7 @@
 msgstr "Default"
 
 #: 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,Casuale"
 
@@ -1045,6 +1045,24 @@
 msgid "Random map"
 msgstr "Mappa casuale"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Mappa casuale"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Mappa casuale"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Mappa casuale"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -1091,7 +1109,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"
 
@@ -1720,7 +1738,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ì"
 
@@ -2270,6 +2288,113 @@
 msgid "Underground"
 msgstr "Sottosuolo"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Oscurità"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Acque Profonde"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Acque Basse"
+
+#: 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 "Villaggio"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Acque Basse"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Ghiaccio"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Ponte"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Sabbia"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Strada"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Terreno arido"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Prato"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Ombra"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Colline"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Montagne"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Foresta"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Cave Wall"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Caverna"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Castello"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Accampamento"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Territori dei nani"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Keep"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "nessuno"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menù"
@@ -2283,14 +2408,14 @@
 msgstr "Fine 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 "PS"
 
 #: 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 "PE"
 
@@ -2366,35 +2491,31 @@
 "Giorno: -25% Danno\n"
 "Notte: +25% Danno"
 
-#: 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 ""
-"Guarigione:\n"
-"Questa unita' puo' guarire, all'inizio del turno, le truppe amiche vicine.\n"
+"Imboscata:\n"
+"Questa unita' puo' nascondersi nella foresta e non puo' essere percepita dai "
+"suoi nemici.\n"
 "\n"
-"L'unita' di cui si e' occupata il guaritore puo' recuperare fino a 4 PS per "
-"turno.\n"
-"Un guaritore puo' medicare fino ad 8 PS per turno, suddivisi tra tutte le "
-"unita' di cui si occupa.\n"
-"Un'unita' avvelenata non puo' essere curata dal veleno da un guaritore, e "
-"dovra' cercare l'assistenza di un villaggio o di un'unita' con abilita' "
-"'cura'."
+"Le unita' nemiche non possono ne' vedere ne' attaccare questa unita' quando "
+"e' nella foresta, tranne nel turno immediatamente successivo ad un attacco "
+"da parte dell'unita' nascosta."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "guarigione"
+#: 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 "imboscata"
 
-#: data/translations/english.cfg:33
+#: data/translations/english.cfg:31
 #, fuzzy
 msgid ""
 "Cures:\n"
@@ -2420,28 +2541,63 @@
 "Un curatore puo' curare un'unita' dal veleno, tuttavia questa unita' non "
 "ricevera' cure aggiuntive nel turno in cui e' curata dal veleno."
 
-#: 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
 #, 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 ""
-"Teletrasporto:\n"
-"Questa unita' puo' trasportarsi istantaneamente da un villaggio amico ad un "
-"altro."
+"Guarigione:\n"
+"Questa unita' puo' guarire, all'inizio del turno, le truppe amiche vicine.\n"
+"\n"
+"L'unita' di cui si e' occupata il guaritore puo' recuperare fino a 4 PS per "
+"turno.\n"
+"Un guaritore puo' medicare fino ad 8 PS per turno, suddivisi tra tutte le "
+"unita' di cui si occupa.\n"
+"Un'unita' avvelenata non puo' essere curata dal veleno da un guaritore, e "
+"dovra' cercare l'assistenza di un villaggio o di un'unita' con abilita' "
+"'cura'."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teletrasporto"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "guarigione"
+
+#: 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 ""
+"Illuminato:\n"
+"Questa unita' illumina l'area adiacente permettendo alle unita' legali di "
+"combattere meglio e penalizzando le truppe caotiche.\n"
+"\n"
+"Ciascuna unita' adiacente a colui che illumina combattera' come se fosse il "
+"tramonto quando e' notte e come se fosse giorno quando si e' al tramonto."
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "illumina,cura"
+
+#: data/translations/english.cfg:54
 #, fuzzy
 msgid ""
 "Leadership:\n"
@@ -2457,7 +2613,7 @@
 "Le unita' amiche di livello inferiore che gli stanno vicino infliggeranno "
 "piu' danni in battaglia."
 
-#: 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
@@ -2466,59 +2622,46 @@
 #: 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 "condottiero"
 
-#: 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."
-msgstr ""
-"Imboscata:\n"
-"Questa unita' puo' nascondersi nella foresta e non puo' essere percepita dai "
-"suoi nemici.\n"
-"\n"
-"Le unita' nemiche non possono ne' vedere ne' attaccare questa unita' quando "
-"e' nella foresta, tranne nel turno immediatamente successivo ad un attacco "
-"da parte dell'unita' nascosta."
+"Loyal:\n"
+"Never more than 1 upkeep."
+msgstr "Non richiedono mai piu' di 1 mantenimento"
 
-#: 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 "imboscata"
+#: 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
 #, fuzzy
+msgid "nightstalk"
+msgstr "nightstalk"
+
+#: 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 ""
-"Illuminato:\n"
-"Questa unita' illumina l'area adiacente permettendo alle unita' legali di "
-"combattere meglio e penalizzando le truppe caotiche.\n"
-"\n"
-"Ciascuna unita' adiacente a colui che illumina combattera' come se fosse il "
-"tramonto quando e' notte e come se fosse giorno quando si e' al tramonto."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "illumina,cura"
+#: 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 "rigenerazione"
 
-#: data/translations/english.cfg:64
+#: data/translations/english.cfg:74
 #, fuzzy
 msgid ""
 "Skirmisher:\n"
@@ -2529,120 +2672,134 @@
 "Questa unita' e' addestrata a muoversi rapidamente oltre i nemici ed ignora "
 "le zone di controllo nemico."
 
-#: 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 "provocatore"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Non richiedono mai piu' di 1 mantenimento"
-
-#: 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 ""
 "Questa unità subisce la metà dei danni quando non è lei ad iniziare "
 "l'attacco."
 
-#: 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 ""
+"Teletrasporto:\n"
+"Questa unita' puo' trasportarsi istantaneamente da un villaggio amico ad un "
+"altro."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teletrasporto"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "danno minimo"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Partita"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scenario"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Configura gli eserciti:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Scegli le impostazioni della squadra:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Impossibile connettersi all'host remoto"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Attendi che i giocatori si connettano"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Riempito"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Disponibile"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Osservatore"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Descrizione Unita'"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Schermo intero o Finestra?"
 
-#: 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 "Finestra"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Velocita':"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normale"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Impostazioni Audio..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Opzioni"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Scegli scenario"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 "Questo terreno funziona come $terrains per i modificatori del movimento e "
 "difesa"
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Il terreno con il migliore modificatore è scelto automaticamente"
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Questo terreno permette di recuperare PS"
 
-#: 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"
@@ -2650,7 +2807,7 @@
 "Questo terreno funziona come il keep. ad esempio, puoi reclutare unità "
 "quando il comandante è in questo terreno"
 
-#: 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"
@@ -2658,19 +2815,19 @@
 "Questo terreno funziona come i castelli, per esempio, puoi reclutre unità "
 "nei luoghi con questo 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 "Tabella resistenze unita'"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Vedi anche..."
 
-#: 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 "
@@ -2680,13 +2837,17 @@
 "Questo attacco procura il doppio dei danni se un'unita' amica si trova alle "
 "spalle del bersaglio."
 
-#: 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 "Attacco alle spalle"
+#: 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 ""
+"Furia:\n"
+"Usato in attacco o difesa consente di rimanere ingaggiati in combattimento "
+"fino alla morte di un combattente."
 
-#: 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 "
@@ -2696,14 +2857,7 @@
 "Questo attacco procura il doppio del danno al bersaglio, ma rende possibile "
 "subire il doppio dei danni al contrattacco del nemico."
 
-#: 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 "Carica"
-
-#: 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 "
@@ -2713,18 +2867,16 @@
 "Questa unita' assorbe energia vitale dalla unita' attaccate curando se "
 "stessa per la meta' del danno procurato in attacco."
 
-#: 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 "Assorbimento"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Attacco improvviso:\n"
+"Questa unità colpisce sempre per prima con questo attacco, anche se si sta "
+"difendendo."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2732,32 +2884,7 @@
 "Attacco magico:\n"
 "Questo attacco ha sempre il 70% di probabilità di andare a segno."
 
-#: 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 "Attaco magico"
-
-#: 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."
@@ -2766,13 +2893,7 @@
 "Usato in attacco questo attacco ha almeno il 60% di probabilità di andare a "
 "segno."
 
-#: 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 "Tiro di precisione"
-
-#: 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 "
@@ -2782,12 +2903,7 @@
 "Se questa unità ne uccide una limitrofa che non si trova in un villaggio, "
 "quest'ultima diverrà uno zombie al tuo servizio."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "contagio"
-
-#: 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 "
@@ -2797,16 +2913,7 @@
 "Questo attacco avvelena il bersaglio. Le unità avvelenate perdono 8 PS per "
 "turno fino alla cura o vengono ridotte ad un solo PS."
 
-#: 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 "Veleno"
-
-#: 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 "
@@ -2816,15 +2923,7 @@
 "Questo attacco rallenta il bersaglio. Le unità rallentate si muovono della "
 "metà del normale ed hanno a disposizione un attacco di meno in 
combattimento."
 
-#: 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 "Rallenta"
-
-#: 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 "
@@ -2834,206 +2933,97 @@
 "Questo attacco trasforma il bersaglio in pietra. Le unità trasformate in "
 "pietra non possono muoversi o attaccare."
 
-#: 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 "Pietrifica"
-
 #: 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 ""
-"Furia:\n"
-"Usato in attacco o difesa consente di rimanere ingaggiati in combattimento "
-"fino alla morte di un combattente."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "Furia"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Attacco improvviso:\n"
-"Questa unità colpisce sempre per prima con questo attacco, anche se si sta "
-"difendendo."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "attacco improvviso"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfi"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orchi"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Umani"
 
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Non-morti"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Acque Profonde"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Acque Basse"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Sabbia"
-
-#: 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 "Villaggio"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Palude"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Ghiaccio"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Strada"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Terreno arido"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Prato"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Colline"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Montagne"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Foresta"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Ponte"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Castello"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Keep"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Caverna"
-
-#: data/translations/english.cfg:203
-#, fuzzy
-msgid "Cave Wall"
-msgstr "Cave Wall"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orchi"
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Accampamento"
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Non-morti"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "Ponte di $name, Attraversamento di $name"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "Strada di $name, Passo di $name,Percorso di $name"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "$name Fiume,Fiume $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "Foresta $name, Foresta di $name"
 
-#: 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
 #, fuzzy
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr "$name|bury,$name|ham,$name|ton"
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "Foresta $name, Foresta di $name"
+
+#: data/translations/english.cfg:175
 #, fuzzy
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 #, fuzzy
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 #, fuzzy
 msgid "$name|ham,$name|ton,$name|field"
 msgstr "$name|ham,$name|ton,$name|field"
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 #, fuzzy
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr "$name|ham,$name|ton,$name|wood,$name Forest"
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 #, fuzzy
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 #, fuzzy
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Prossimo suggerimento"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Consiglio del giorno"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Non mostrare piu' questi consigli"
 
-#: 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."
@@ -3042,7 +3032,7 @@
 "combattono meglio di notte. Le unità neutrali, invece, non sono affette dai "
 "cambiamenti del giorno e della notte."
 
-#: 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."
@@ -3050,7 +3040,7 @@
 "In una campagna, puoi usare le unità veterane degli scenari precedenti "
 "utilizzando l'opzione 'richiama'."
 
-#: data/translations/english.cfg:225
+#: data/translations/english.cfg:187
 #, fuzzy
 msgid ""
 "There are six types of attacks: pierce, blade, impact, fire, cold, and holy. "
@@ -3064,7 +3054,7 @@
 "click destro su un'unita' e seleziona 'Descrivi Unita'', poi 'Resistenza' "
 "per vedere quanto e' resistente contro i differenti tipi di attacco."
 
-#: data/translations/english.cfg:226
+#: data/translations/english.cfg:188
 #, fuzzy
 msgid ""
 "The terrain your units are on determines the chance your opponents have of "
@@ -3077,7 +3067,7 @@
 "correntemente selezionata nel terreno su cui poggia è mostrato sul lato in "
 "alto a destra dello schermo."
 
-#: data/translations/english.cfg:227
+#: data/translations/english.cfg:189
 #, fuzzy
 msgid ""
 "Poisoned units lose 8 hitpoints every turn, but they will not die from "
@@ -3090,7 +3080,7 @@
 "valore di 1. Le unita' avvelenate possono essere curate muovendole in un "
 "villaggio o disponendele vicino ad un'unita' che possiede l'abilita' 'cura'."
 
-#: data/translations/english.cfg:228
+#: data/translations/english.cfg:190
 #, fuzzy
 msgid ""
 "You can use units from a previous scenario by selecting 'Recall' by the game "
@@ -3101,7 +3091,7 @@
 "menu del gioco. Richiamando le stesse unita' puoi mettere in piedi un'armata "
 "esperta e potente."
 
-#: data/translations/english.cfg:229
+#: data/translations/english.cfg:191
 #, fuzzy
 msgid ""
 "All units have a Zone of Control in each of the hexes next to them. If a "
@@ -3112,7 +3102,7 @@
 "adiacenti. Se un'unita' si muove all'interno di una Zona di Controllo di un "
 "nemico non potra' piu' muoversi per quel turno."
 
-#: data/translations/english.cfg:230
+#: data/translations/english.cfg:192
 #, fuzzy
 msgid ""
 "The chance to hit a unit usually depends on how well that unit can defend "
@@ -3124,7 +3114,7 @@
 "sempre il 70% di probabilita' di colpire, e i tiratori scelti hanno almeno "
 "il 60% di probabilita'."
 
-#: data/translations/english.cfg:231
+#: data/translations/english.cfg:193
 #, fuzzy
 msgid ""
 "Units stationed in villages heal 8 hitpoints at the beginning of their turn."
@@ -3132,7 +3122,7 @@
 "Le unita' che si trovano in un villaggio vengono curate di 8 punti salute "
 "all'inizio del loro turno."
 
-#: data/translations/english.cfg:232
+#: data/translations/english.cfg:194
 #, fuzzy
 msgid ""
 "Units that do not move or attack during their turn rest, and will recover 2 "
@@ -3141,7 +3131,7 @@
 "Le unita' che non si muovono o attaccono durante il loro turno riposano, e "
 "recuperano 2 punti salute all'inizio del loro turno successivo."
 
-#: data/translations/english.cfg:233
+#: data/translations/english.cfg:195
 #, fuzzy
 msgid ""
 "Most foot units defend better in villages and castles than in most other "
@@ -3153,7 +3143,7 @@
 "cavallo non hanno nessun vantaggio nella difesa quando sono nei villaggi o "
 "nei castelli."
 
-#: data/translations/english.cfg:234
+#: data/translations/english.cfg:196
 #, fuzzy
 msgid ""
 "Horse based units are generally resistant to attacks with bladed or impact "
@@ -3164,7 +3154,7 @@
 "impatto, ma sono vulnerabili alle armi a perforazione, inclusi archi ed "
 "arpioni."
 
-#: data/translations/english.cfg:235
+#: data/translations/english.cfg:197
 #, fuzzy
 msgid ""
 "Inflicting the killing blow on an enemy unit is the best way to gain "
@@ -3175,7 +3165,7 @@
 "esperienza. Le unita' che uccidono un nemico guadagnano 8 punti esperienza "
 "per ogni livello dell'unita' uccisa."
 
-#: data/translations/english.cfg:236
+#: data/translations/english.cfg:198
 #, fuzzy
 msgid ""
 "Elvish units move and fight very well in forest. Dwarvish units move and "
@@ -3185,7 +3175,7 @@
 "truppe dei Nani si muovo e combattono molto bene nelle colline e sulle "
 "montagne."
 
-#: data/translations/english.cfg:237
+#: data/translations/english.cfg:199
 #, fuzzy
 msgid ""
 "Patience is often key. Rather than attacking in bad conditions, or with few "
@@ -3195,7 +3185,7 @@
 "condizioni, o con poche truppe, meglio attendere una situazione migliore per "
 "attaccare."
 
-#: data/translations/english.cfg:238
+#: data/translations/english.cfg:200
 #, fuzzy
 msgid ""
 "If you are attacked from several directions, it may be a good idea to send "
@@ -3204,7 +3194,7 @@
 "Se sei attaccato da diverse direzioni, potrebbe essere una buona idea "
 "mandare le unita' sacrificabili per ritardare le unita' nemiche."
 
-#: data/translations/english.cfg:239
+#: data/translations/english.cfg:201
 #, fuzzy
 msgid ""
 "Do not be afraid to retreat and regroup, it is often the key to victory."
@@ -3212,7 +3202,7 @@
 "Non aver paura di ritirarti e di riformare il gruppo, è spesso la chiave "
 "della vittoria."
 
-#: data/translations/english.cfg:240
+#: data/translations/english.cfg:202
 #, fuzzy
 msgid ""
 "In most campaigns you will receive a gold bonus for finishing early, "
@@ -3225,7 +3215,7 @@
 "risparmiati. Guadagnarai sempre piu' oro in questo modo piuttosto che "
 "catturando i villaggi attendendo la fine dei turni."
 
-#: data/translations/english.cfg:241
+#: data/translations/english.cfg:203
 #, fuzzy
 msgid ""
 "Your leader can recruit or recall units from any keep inside a castle, not "
@@ -3238,7 +3228,7 @@
 "da un nemico e reclutare da li'. Inoltre, alcuni dei tuoi alleati potrebbero "
 "farti spazio nel loro keep per farti reclutare unita'."
 
-#: data/translations/english.cfg:242
+#: data/translations/english.cfg:204
 #, fuzzy
 msgid ""
 "Skeletons are resistant to piercing and bladed attacks, but vulnerable to "
@@ -3247,7 +3237,7 @@
 "Gli scheletri sono resistenti contro gli attacchi da perforazione e le "
 "spade, ma vulnerabili alle armi da impatto, fuoco e attacchi sacri."
 
-#: data/translations/english.cfg:243
+#: data/translations/english.cfg:205
 #, fuzzy
 msgid ""
 "Units with leadership ability make lower level adjacent units on the same "
@@ -3256,7 +3246,7 @@
 "Le unita' condottiere rendono piu' efficaci gli attacchi delle unita' amiche "
 "vicine di livello inferiore."
 
-#: data/translations/english.cfg:244
+#: data/translations/english.cfg:206
 #, fuzzy
 msgid ""
 "Generally avoid moving next to an unoccupied village. An enemy unit may move "
@@ -3267,7 +3257,7 @@
 "nemica potrebbe entrare nel villaggio ed attaccarti sfruttando il vantaggio "
 "difensivo e le cure del villaggio."
 
-#: data/translations/english.cfg:245
+#: data/translations/english.cfg:207
 #, fuzzy
 msgid ""
 "Holding the mouse cursor on an ability or trait shows a description of that "
@@ -3276,17 +3266,17 @@
 "Lasciando il puntatore del mouse su un'abilita' viene mostrata una "
 "descrizione di quell'abilita'."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 #, fuzzy
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr "Usa linee di unita' per difendere le unita' ferite e per farle curare."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 #, fuzzy
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Leggi la lista delle scorciatoie nel menu delle preferenze."
 
-#: data/translations/english.cfg:248
+#: data/translations/english.cfg:210
 #, fuzzy
 msgid ""
 "If you move a unit, but don't attack or discover any additional information, "
@@ -3295,7 +3285,7 @@
 "Se muovi un'unita', ma non attacchi o non scopri nessun'altra informazione "
 "aggiuntiva, puoi annullare la tua mossa premendo il tasto 'u'."
 
-#: data/translations/english.cfg:249
+#: data/translations/english.cfg:211
 #, fuzzy
 msgid ""
 "You can see how far enemy units can move by moving the mouse cursor over "
@@ -3304,7 +3294,7 @@
 "Puoi vedere fin dove puo' giungere un'unita' nemica spostando il puntatore "
 "del mouse sull'unita'."
 
-#: data/translations/english.cfg:250
+#: data/translations/english.cfg:212
 #, fuzzy
 msgid ""
 "Use healers to support your attacks - they will win you battles without "
@@ -3313,7 +3303,7 @@
 "Usa unita' in grado di guarire come supporto per i tuoi attacchi . "
 "vinceranno le tue battaglie senza bisogno di attaccare di persona."
 
-#: data/translations/english.cfg:251
+#: data/translations/english.cfg:213
 #, fuzzy
 msgid ""
 "The 'slow' attack ability makes enemy units move slower, but it also gives "
@@ -3324,12 +3314,12 @@
 "attacco che normalmente avrebbero a disposizione. E' percio' davvero "
 "efficace contro le unita' che hanno pochi ma potenti attacchi."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 #, fuzzy
 msgid "Holy attacks are very powerful against undead."
 msgstr "L'attacco Sacro e' molto potente contro i non-morti."
 
-#: data/translations/english.cfg:253
+#: data/translations/english.cfg:215
 #, fuzzy
 msgid ""
 "Units are healed when they advance a level. Used wisely, this can turn a "
@@ -3338,7 +3328,7 @@
 "Le unita' vengono guarite quando avanzano di livello. Utilizzato "
 "saggiamente, questo puo' trasformare una battaglia."
 
-#: data/translations/english.cfg:254
+#: data/translations/english.cfg:216
 #, fuzzy
 msgid ""
 "Charging units are best used against enemies they can kill with a single "
@@ -3372,7 +3362,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
@@ -3385,12 +3375,49 @@
 msgid "cold"
 msgstr "freddo"
 
+#: 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 "Assorbimento"
+
 #: 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 "Attaco magico"
+
 #: data/units/Ancient_Wose.cfg:3
 #, fuzzy
 msgid "Ancient Wose"
@@ -3417,7 +3444,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
@@ -3425,19 +3452,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
@@ -3457,7 +3489,7 @@
 msgid "impact"
 msgstr "impatto"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Arcimago"
 
@@ -3475,6 +3507,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 +3524,7 @@
 msgstr "Palla di fuoco"
 
 #: 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 +3536,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 "fuoco"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Arcimago"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Assassino"
@@ -3536,7 +3575,7 @@
 msgstr "Pugnale"
 
 #: 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 +3613,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 +3636,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 "lama"
 
+#: 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 "Attacco alle spalle"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "Coltello"
 
+#: 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 "Veleno"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandito"
@@ -3628,16 +3682,16 @@
 msgid "mace"
 msgstr "Mazza"
 
-#: 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 "Principessa"
 
-#: 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 "comando,scaramucciatore"
 
-#: 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 "
@@ -3651,7 +3705,7 @@
 "vicino alla principessa combatteranno meglio. La principessa e' esperta nei "
 "piccoli scontri e ignora le zone sotto controllo nemico."
 
-#: 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
@@ -3675,18 +3729,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 "Spada"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Principessa"
+
+#: data/units/Battle_Princess.cfg:58
 #, fuzzy
 msgid ""
 "A noble at birth, the Princess has learnt swordplay with the greatest "
@@ -3701,9 +3759,9 @@
 "vicino alla principessa combatteranno meglio. La principessa e' esperta nei "
 "piccoli scontri e ignora le zone sotto controllo nemico."
 
-#: 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 "scettro di fuoco"
 
@@ -3800,7 +3858,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
@@ -3809,7 +3873,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
@@ -3817,7 +3881,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 "perforazione"
@@ -3892,6 +3956,14 @@
 msgid "web"
 msgstr "Ragnatela"
 
+#: 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 "Rallenta"
+
 #: data/units/Chocobone.cfg:3
 #, fuzzy
 msgid "Chocobone"
@@ -3915,13 +3987,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 "Arpione"
 
+#: 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 "Carica"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Basilisco"
@@ -3941,6 +4024,11 @@
 msgid "gaze"
 msgstr "Bloccare"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "Pietrifica"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Comandante"
@@ -4019,17 +4107,18 @@
 msgstr "onda di terrore"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Regina 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 "scettro"
 
@@ -4323,6 +4412,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 "attacco improvviso"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Drago Guerriero"
@@ -4376,6 +4471,10 @@
 msgid "berserker frenzy"
 msgstr "furia berserker"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "Furia"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Nano guardia del Drago"
@@ -4568,6 +4667,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Nano 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 "Mago Anziano"
@@ -4601,7 +4707,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 "Arciere Elfico"
 
@@ -4612,7 +4718,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 "Arciere Elfico"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Vendicatore Elfico"
 
@@ -4624,6 +4735,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Vendicatore Elfico"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Capitano Elfico"
@@ -4657,7 +4773,8 @@
 "nemici nel combattimento corpo a copro e nel combattimento a distanza."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Druido Elfico"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4681,7 +4798,8 @@
 msgstr "Spine"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Incantatrice Elfica"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4748,10 +4866,18 @@
 "combattimento a distanza."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Signora Elfica"
 
 #: 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 "Mosse"
@@ -4769,7 +4895,7 @@
 "Il Signore Elfico e' spaventoso nel combattimento, sia la sua spada nel "
 "corpo a copro che le sue palle di fuoco nel combattimento a distanza."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Tiratore Scelto Elfico"
 
@@ -4787,6 +4913,17 @@
 msgid "longbow"
 msgstr "Arco lungo"
 
+#: 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 "Tiro di precisione"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Tiratore Scelto Elfico"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Maresciallo Elfico"
@@ -4819,7 +4956,7 @@
 "come all'aperto. Posso anche usare l'arco scoccando frecce contro i suoi "
 "nemici."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Ranger Elfico"
 
@@ -4831,6 +4968,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 "Ranger Elfico"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Cavalcatore Elfico"
@@ -4859,7 +5001,8 @@
 "scarso potere nei combattimenti."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Sciamano Elfico"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4874,7 +5017,7 @@
 "di attacchi a loro disposizione. Possiede anche una abilita' di base nel "
 "guarire con le erbe."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Magnifico tiratore Elfico"
 
@@ -4886,8 +5029,14 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Magnifico tiratore Elfico"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Elvish Shyde"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4907,7 +5056,8 @@
 msgstr "tocco fatato"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Incantatrice Elfica"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4920,7 +5070,7 @@
 
 #: data/units/Elvish_Sylph.cfg:3
 #, fuzzy
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr "Elvish Shyde"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -5034,7 +5184,15 @@
 msgid "Galleon"
 msgstr "Galeone"
 
-#: 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 "Fantoccio"
 
@@ -5150,12 +5308,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 "attacco improvviso"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Cavaliere Goblin"
@@ -5187,7 +5339,8 @@
 msgid "torch"
 msgstr "Torcia"
 
-#: 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 "rete"
 
@@ -5236,7 +5389,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 "Grande Mago"
 
@@ -5251,17 +5404,15 @@
 "villaggi amici apportanto il suo grande potere in ogni angolo del campo di "
 "battaglia."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Grande Mago"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Grande 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 "rigenerazione"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -5505,7 +5656,7 @@
 "forniscono un incremento negli attacchi di tutte le unita' di livello "
 "inferiore posizionate negli esagoni adiacenti."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Mago"
 
@@ -5527,11 +5678,16 @@
 msgid "missile"
 msgstr "Missile"
 
-#: 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 della Luce"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "illumina,cura"
 
@@ -5554,18 +5710,25 @@
 "Come il mago bianco il mago della luce cura le unita' amiche adiacenti."
 
 #: 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
 #, fuzzy
 msgid "lightbeam"
 msgstr "Raggio di luce"
 
 #: 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
 #, fuzzy
 msgid "holy"
 msgstr "sacro"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Mago della Luce"
+
 #: data/units/Master_Bowman.cfg:3
 #, fuzzy
 msgid "Master Bowman"
@@ -5582,12 +5745,28 @@
 "l'arco possibile per la razza umana. Il loro potere con quest'arma mortale "
 "e' superato solo dagli Elfi."
 
-#: data/units/Merman.cfg:3
+#: 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 "Merman"
-msgstr "Tritone"
+msgid "female^Mermaid Enchantress"
+msgstr "Incantatrice Elfica"
 
-#: 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 "
@@ -5596,12 +5775,100 @@
 "Una creatura del mare potente e veloce in ogni ambiente anfibio ma debole "
 "sulla terra."
 
-#: 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 "spruzzo d'acqua"
+
+#: 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 "tocco fatato"
+
+#: data/units/Merman.cfg:3
+#, fuzzy
+msgid "Merman"
+msgstr "Tritone"
+
+#: 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
 #, fuzzy
 msgid "trident"
 msgstr "Tridente"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "Intrappolare"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Drago Combattente"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Tritone"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Tritone"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Guerriero Sauro"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Lanciere"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Traduzione in Tedesco"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Guerriero Sauro"
+
 #: data/units/Mudcrawler.cfg:3
 #, fuzzy
 msgid "Mudcrawler"
@@ -5617,8 +5884,8 @@
 "spraying boiling water on their foes."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 #, fuzzy
@@ -5675,11 +5942,6 @@
 "creature sono abili a nascondersi nel buio, senza lasciare tracce della "
 "propria presenza."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-#, fuzzy
-msgid "nightstalk"
-msgstr "nightstalk"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Comandante Nobile"
@@ -5724,7 +5986,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. "
@@ -5853,7 +6115,7 @@
 "casters and can curse their enemies, draining their life."
 
 #: 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 "maledizione"
 
@@ -5968,7 +6230,7 @@
 "sono molto rispettati dagli altri orchi, e molto temuti dai loro nemici. La "
 "loro unica debolezza e' l'incapacita' di maneggiare archi."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Fuorilegge"
 
@@ -5977,6 +6239,11 @@
 msgid "Outlaws fight better at night."
 msgstr "I fuorilegge combattono meglio di notte."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Fuorilegge"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
@@ -5984,7 +6251,8 @@
 "quando lo fanno."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Principessa Fuorilegge"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -6001,7 +6269,8 @@
 "plunder she finds on the road."
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Regina Fuorilegge"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -6085,7 +6354,14 @@
 msgid "Pirate Galleon"
 msgstr "Galeone 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
 #, fuzzy
 msgid "ballista"
@@ -6104,7 +6380,7 @@
 "I bracconieri fanno affidamento alla lora esperienza nella caccia e sono "
 "molto utili di notte e nelle foreste e paludi."
 
-#: 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 "
@@ -6120,7 +6396,7 @@
 "leggiadra e dotata di grande destrezza, con abilita' simili a quelle dei "
 "ladri."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Mago Rosso"
 
@@ -6135,6 +6411,11 @@
 "probabilita' di colpire. Buono sia di notte che di giorno e veloci, il "
 "magorosso e' un'unita' di valore in quasi tutte le situazioni. "
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Mago Rosso"
+
 #: data/units/Revenant.cfg:3
 #, fuzzy
 msgid "Revenant"
@@ -6254,14 +6535,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 "Hag"
 
 #: data/units/Sea_Hag.cfg:17
@@ -6273,10 +6554,6 @@
 "Gli Hag sono dei naga anziani ed esperti che hanno imparato a controllare le "
 "forze magiche dell'acqua."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "spruzzo d'acqua"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Orco Marino"
@@ -6348,7 +6625,7 @@
 "muovendosi velocemente esse sono immensamente potenti e il timore che "
 "provocano e' conosciuto a Wesnoth e nelle lande limitrofe,"
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Mago Argentato"
 
@@ -6363,10 +6640,24 @@
 "teletrasportarsi in un istante. Sono anche molto resisti contro svariati "
 "attacchi magici."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Mago Argentato"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Drago Scheletrico"
 
+#: 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 "mascella"
@@ -6442,6 +6733,10 @@
 msgstr ""
 "I corpi animati diventano piu' forti se riescono ad ucciedere abbastanza."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "contagio"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Lanciere"
@@ -6664,10 +6959,11 @@
 "delle loro vittime recuperando la vitalita' asportata da costoro."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Dama Vampira"
 
-#: data/units/Vampire_Lady.cfg:16
+#: data/units/Vampire_Lady.cfg:17
 #, fuzzy
 msgid ""
 "Cold and beautiful, she maintains her eternal youthful appeareance drinking "
@@ -6676,7 +6972,7 @@
 "Fredda e bella, mantiene la sua apparente eterna giovinezza bevendo il "
 "sangue dei vivi."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "Bacio di Sangue"
 
@@ -6747,7 +7043,7 @@
 "Watch Towers are good places from which to spot enemies, and then shoot "
 "miscellaneous items at them with ballistas."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Mago Bianco"
 
@@ -6764,6 +7060,11 @@
 "un villaggio. Il mago bianco e' potente contro i non-morti che subiscono "
 "grossi danni dai raggi luminosi."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Mago Bianco"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Cavalcatori di Lupi"
@@ -6986,7 +7287,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 "Chiudi"
 
@@ -7007,74 +7308,74 @@
 msgid "none"
 msgstr "nessuno"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "danno base"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "resistenze dell'attaccante vs"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "vulnerabilità dell'attaccante 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 "Raddoppiato"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "danno totale"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "resistenze del difensore vs"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "vulnerabilità del difensore vs"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 #, fuzzy
 msgid "Halved"
 msgstr "alabarda"
 
-#: 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 "avvelenato"
 
-#: 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 "rallentato"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Imboscata!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Unità nemica avvistata"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Unità nemica avvistata!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends unità amiche avvistate"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies unità nemiche avvistate!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Unità avvistate! ($friends amiche, $enemies nemiche)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(premi $hotkey per continuare)"
 
@@ -7134,7 +7435,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 "Turno"
 
@@ -7202,23 +7503,23 @@
 msgid "Profile"
 msgstr "Profilo"
 
-#: 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 "Livello"
 
-#: 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 "Mosse"
 
-#: 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 "ravvicinato"
 
-#: 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 "a distanza"
 
@@ -7238,11 +7539,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Vuoi salvare un replay di questo scenario?"
 
-#: 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 "Nome:"
 
-#: 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 partita non può essere salvata"
 
@@ -7307,8 +7608,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 "Errore"
 
@@ -7379,7 +7680,7 @@
 "campagna."
 
 #: 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 "Connessione Scaduta"
 
@@ -7440,7 +7741,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"
 
@@ -7460,79 +7761,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Impossibile inizializzare i caratteri. Uscita.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Avanza come"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Allineamento"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "PE Richiesti"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "attacchi"
 
-#: 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 "Nome"
 
-#: 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 "Danno"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Colpi"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Raggio"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Speciali"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Resistenze"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Tipo di attacco"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Resistenza"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Modificatori del 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 "Difesa"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Indietro"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Avanti >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Aiuto per The Battle for Wesnoth"
 
@@ -7544,7 +7845,7 @@
 msgid "End Unit Turn"
 msgstr "Termina turno unità"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Comandante"
 
@@ -7580,11 +7881,11 @@
 msgid "Unit Description"
 msgstr "Descrizione Unità"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Rinomina Unità"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Recluta"
 
@@ -7592,7 +7893,7 @@
 msgid "Repeat Recruit"
 msgstr "Ripeti Reclutamento"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Richiama"
 
@@ -7628,11 +7929,11 @@
 msgid "Scenario Objectives"
 msgstr "Obbiettivi dello Scenario"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Lista delle Unità"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statistiche"
 
@@ -7740,7 +8041,7 @@
 msgid "Speak to All"
 msgstr "Parla con tutti"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Aiuto"
 
@@ -7800,7 +8101,7 @@
 msgid "Bump Size"
 msgstr "Forza d'Urto"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Villaggi"
 
@@ -7851,15 +8152,11 @@
 "Le unità nemiche non possono essere viste finché non sono nel raggio visivo 
"
 "delle tue unità"
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Oscurità"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "La mappa è oscurata finché le tue unità non la esplorano"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Osservatori"
 
@@ -7867,13 +8164,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Permette agli utenti che non giocano di osservare la partita"
 
-#: 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 "Annulla"
 
-#: 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"
 
@@ -7948,71 +8245,71 @@
 msgid "Warning"
 msgstr "Mattino"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Ricevo la lista delle partite..."
 
-#: 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 "Attendi che il gioco abbia inizio..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Continua"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Scegli l'host a cui connetterti"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Connessione all'host remoto..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Devi effettuare il login al server"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Acquisizione dati della partita..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Non ci sono posti liberi in questa partita"
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Scegli il tuo esercito:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "La partita è stata annullata"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "L'esercito che hai scelto non è più disponibile"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Mostro il replay della partita fino al momento del salvataggio?"
 
-#: 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 "Comandante"
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 #, fuzzy
 msgid "Recruits: "
 msgstr "Reclutamenti"
@@ -8045,8 +8342,8 @@
 msgid "Local Player"
 msgstr "Giocatore Locale"
 
-#: 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"
 
@@ -8112,7 +8409,7 @@
 msgid "Color"
 msgstr "Colore"
 
-#: 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 "Aspetta che i giocatori remoti si uniscano"
 
@@ -8197,58 +8494,58 @@
 msgid "It is now your turn"
 msgstr "Adesso è il tuo turno"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Attaccante"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Difensore"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Calcolo del Danno"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Ravvicinato"
 
-#: 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 "Attacca Nemico"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Scegli 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 ""
 "Non hai ancora iniziato il tuo turno. Sei sicuro di voler finire il tuo "
 "turno adesso?"
 
-#: 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 ""
 "Alcune unità hanno movimenti a disposizione. Vuoi davvero terminare il tuo "
 "turno?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Savlataggio Automatico"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 "Impossibile effettuare il salvataggio automatico. Salva manualmente la "
 "partita."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -8256,36 +8553,36 @@
 "I nomi dei salvataggi non possono contenere due punti, slashes o "
 "blackslashes. Per favore, scegli un nome differente."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 #, fuzzy
 msgid "Saved"
 msgstr "Salva come"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "La partita è stata salvata"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Entrate"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Mantenimento"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Non hai nessuna unità disponibile per il reclutamento."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Seleziona Unità"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Non hai abbastanza oro per reclutare questa unità"
 
-#: 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?"
@@ -8293,7 +8590,7 @@
 "Mio signore, questa è un'unità esperta, è già avanzata di livello! Volete 
"
 "davvero eliminare $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?"
@@ -8301,19 +8598,19 @@
 "Mio signore, questa unità sta per avanzare di livello! Volete davvero "
 "eliminare $noun?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "sua"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "suo"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Sei separato dal tuo esercito e non puoi richiamare nessuna unità"
 
-#: 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)"
@@ -8321,88 +8618,88 @@
 "Non ci sono truppe da richiamare.\n"
 "(Devi avere veterani sopravvissuti dai precedenti scenari)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 #, fuzzy
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "pezzi d'oro per richiamare un'unità"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Elimina Unità"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Messaggio"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Invia solo agli alleati"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Luogo"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Reclutamenti"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Richiami"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Avanzamenti"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Perdite"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Uccisioni"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Danni inflitti"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Danni subiti"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Danni Inflitti (EV)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Danni Subiti (EV)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Cerca"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Comando:"
 
-#: 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 "Non ho trovato nessuna etichetta contente '$search'."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Imposta Etichetta"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Etichetta"
 
-#: 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?"
@@ -8410,23 +8707,23 @@
 "La partita non è sincronizzata ed è necessario uscire. Vuoi salvare un file 
"
 "con gli errori occorsi nella partita?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Rimpiazza con AI"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Rimpiazza con un giocatore locale"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Annulla gioco"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Rimpiazza con"
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "ha abbandonato il gioco. Cosa vuoi fare?"
 
@@ -8487,63 +8784,63 @@
 msgid "Chaotic units"
 msgstr "Unità Caotiche"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Villaggio Controllato"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Villaggio Nemico"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Villaggio Alleato"
 
-#: 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 "Versione"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Introduzione"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Campagna"
 
-#: 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 "Carica"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Linguaggio"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Preferenze"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Esci"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Inizia un tutorial per familiarizzare con il gioco"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Inizia una campagna (giocatore singolo)"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -8551,31 +8848,31 @@
 "Gioca multiplayer (stessa postazione, LAN o Internet) o uno scenario singolo "
 "contro l'AI"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Carica una partita salvata (NO MULTIPLAYER)"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Cambia linguaggio"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Configura le impostazioni del gioco"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Guarda i Crediti"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Termina il gioco"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Altro"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Il Tomo di Wesnoth"
 
@@ -8583,15 +8880,15 @@
 msgid "strikes"
 msgstr "colpi"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "Caotico"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "Legale"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "Neutrale"
 
@@ -8603,6 +8900,18 @@
 msgid "Deletion of the file failed."
 msgstr "Eliminazione del file non riuscita."
 
+#~ msgid "first strike"
+#~ msgstr "attacco improvviso"
+
+#~ msgid "Swamp"
+#~ msgstr "Palude"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Ospita Partita Multiplayer"
 
Index: wesnoth/po/wesnoth/nl.po
diff -u wesnoth/po/wesnoth/nl.po:1.8 wesnoth/po/wesnoth/nl.po:1.9
--- wesnoth/po/wesnoth/nl.po:1.8        Tue Oct 19 21:40:14 2004
+++ wesnoth/po/wesnoth/nl.po    Thu Oct 21 20:22:40 2004
@@ -7,7 +7,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-10-19 20:28-0000\n"
 "Last-Translator: Pieter Vermeylen <address@hidden>\n"
 "Language-Team: none\n"
@@ -17,7 +17,7 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: Dutch\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "loyaal"
 
@@ -49,11 +49,11 @@
 msgid "Traits"
 msgstr "Trekken"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Troepen"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Vaardigheden"
 
@@ -190,7 +190,7 @@
 "<ref>dst=income_and_upkeep text='Inkomen en Onderhoudskost'</ref> voor meer "
 "info."
 
-#: 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 "Stap"
 
@@ -424,7 +424,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 "Over"
 
@@ -677,7 +677,7 @@
 msgstr "Standaard"
 
 #: 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,Willekeurig"
 
@@ -792,6 +792,24 @@
 msgid "Random map"
 msgstr "Willekeurige kaart"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Willekeurige kaart"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Willekeurige kaart"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Willekeurige kaart"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -838,7 +856,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 "Nee"
 
@@ -1323,7 +1341,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"
 
@@ -1762,6 +1780,113 @@
 msgid "Underground"
 msgstr "Ondegronds"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Sluier"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Diep Water"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Ondiep Water"
+
+#: 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 "Dorp"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Ondiep Water"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "IJs"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Brug"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Zand"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Weg"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Vuil"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Grasland"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Shaduw"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Heuvels"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Bergen"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Bos"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Grotwand"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Grot"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Kasteel"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Kamp"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Woestenij der Dwergen"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Donjon"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "geen"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menu"
@@ -1775,14 +1900,14 @@
 msgstr "Volgende"
 
 #: 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"
 
@@ -1858,32 +1983,29 @@
 "Dag: -25% Schade\n"
 "Nacht: +25% Schade"
 
-#: 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 ""
-"Heelt:\n"
-"Staat de eenheid toe om bevriende eenheden aan het begin van een beurt te "
-"helpen helen.\n"
+"Hinderlaag:\n"
+"Deze eenheid kan zich verstoppen in het bos.\n"
 "\n"
-"Een eenheid waar een heler zich om kommert kan tot 4HP per beurt helen.\n"
-"Een heler kan in het totaal 8HP per beurt helen.\n"
-"Een vergiftigde eenheid kan niet worden genezen door een heler en moet een "
-"dorp of een genezer opzoeken."
+"Vijandige eenheden kunnen deze eenheid niet zien of aanvallen tenzij "
+"onmiddellijk nadat de eenheid heeft aangevallen of wanneer de eenheid zich "
+"naast vijandige troepen bevindt."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "heelt"
+#: 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 "hinderlaag"
 
-#: 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 "
@@ -1906,26 +2028,58 @@
 "Een heler kan in het totaal 18HP per beurt helen.\n"
 "Vergiftigde troepen worden door deze eenheid genezen."
 
-#: 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 "geneest"
 
-#: 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 ""
-"Teleportatie:\n"
-"Deze eenheid kan teleporteren tussen twee bevriende dorpen."
+"Heelt:\n"
+"Staat de eenheid toe om bevriende eenheden aan het begin van een beurt te "
+"helpen helen.\n"
+"\n"
+"Een eenheid waar een heler zich om kommert kan tot 4HP per beurt helen.\n"
+"Een heler kan in het totaal 8HP per beurt helen.\n"
+"Een vergiftigde eenheid kan niet worden genezen door een heler en moet een "
+"dorp of een genezer opzoeken."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleportatie"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "heelt"
+
+#: 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 ""
+"Verlicht:\n"
+"Deze eenheid verlicht de omgeving, en doet rechtvaardige eenheden beter "
+"vechten en chaotische eenheden slechter.\n"
+"\n"
+"Eenheden die aan deze eenheid grenzen vechten 's nachts alsof het valavond "
+"is en bij valavond alsof het dag is."
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:49
+msgid "illuminates"
+msgstr "verlicht"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -1937,7 +2091,7 @@
 "Deze eenheid kan omringende bevriende troepen van lagere rang aanvoeren in "
 "de strijd en hun schade vehogen."
 
-#: 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
@@ -1946,55 +2100,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 "leiderschap"
 
-#: 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 "Nooit meer dan 1 onderhoudingskost"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Hinderlaag:\n"
-"Deze eenheid kan zich verstoppen in het bos.\n"
-"\n"
-"Vijandige eenheden kunnen deze eenheid niet zien of aanvallen tenzij "
-"onmiddellijk nadat de eenheid heeft aangevallen of wanneer de eenheid zich "
-"naast vijandige troepen bevindt."
 
-#: 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 "hinderlaag"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "nachtsluip"
 
-#: 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 ""
-"Verlicht:\n"
-"Deze eenheid verlicht de omgeving, en doet rechtvaardige eenheden beter "
-"vechten en chaotische eenheden slechter.\n"
-"\n"
-"Eenheden die aan deze eenheid grenzen vechten 's nachts alsof het valavond "
-"is en bij valavond alsof het dag is."
 
-#: data/translations/english.cfg:61
-msgid "illuminates"
-msgstr "verlicht"
+#: 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 "regenereert"
 
-#: 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 "
@@ -2004,119 +2148,131 @@
 "Deze eenheid is bedreven in het tussen de gelederen slippen van de vijand en "
 "negeert controlezones."
 
-#: 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 "warzaaier"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Nooit meer dan 1 onderhoudingskost"
-
-#: 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 ""
 "Deze eenheid ontvangt slecht de helft van de schade wanneer het de aanval "
 "niet inzette."
 
-#: 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 "standvastig"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teleportatie:\n"
+"Deze eenheid kan teleporteren tussen twee bevriende dorpen."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleportatie"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "minimum schade"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Spel"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scenario"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Configureer Kanten:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Teamkeuze configuratie:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Kon geen verbinding maken met 'remote host'"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Bezig met wachten op spelers"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Vol"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Beschikbaar"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "Toeschouwer"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Omschrijving"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Volledig scherm of in een venster?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Scherm:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "In een venster"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Snelheid:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normaal"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Geluidsinstellingen..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Opties"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Kies scenario"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 "Dit terrein gedraagt zich als $terrains voor verplaatsing en verdedeging."
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Het terrein met de beste verdediging wordt automatisch gekozen."
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Dit terrein geneest."
 
-#: 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"
@@ -2124,7 +2280,7 @@
 "Dit terrein werkt zoals een donjon, je kunt eenheden recruteren met je "
 "leider wanneer je je op dit terrein bevindt."
 
-#: 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"
@@ -2132,19 +2288,19 @@
 "Dit terrein doet dienst als kasteel, je kunt bijvoorbeeld eenheden op dit "
 "terrein recruteren."
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "of"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Resistentietabel"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Zie ook..."
 
-#: 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 "
@@ -2154,13 +2310,17 @@
 "Deze aanval verdubbelt de schade indien een bevriende eenheid zich aan de "
 "tegenovergestelde kant van het doelwit bevindt."
 
-#: 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 "ruggesteek"
+#: 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 ""
+"Roes:\n"
+"Zowel bij offensief of defensiev gebruik gaat het gevecht door totdat een "
+"van de strijders valt."
 
-#: 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 "
@@ -2170,14 +2330,7 @@
 "Deze aanval heeft twee keer de schade tot gevolg, zowel voor de aanvaller "
 "als voor de verdediger."
 
-#: 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 "stormloop"
-
-#: 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 "
@@ -2187,18 +2340,15 @@
 "Deze eenheid zuigt energie uit de levende eenheden en heelt zichzelf met de "
 "helft van de schade die het doet."
 
-#: 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 "uitzuiging"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Eerste contact:\n"
+"Deze eenheid valt altijd aan, ook wanneer het verdedigt."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2206,32 +2356,7 @@
 "Magisch:\n"
 "Deze aanval heeft altijd 70% kans om te raken."
 
-#: 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 "magisch"
-
-#: 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."
@@ -2239,13 +2364,7 @@
 "Precisieschutter:\n"
 "Bij een aanval heeft de unit altijd minstens 60% kans om te raken."
 
-#: 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 "precisieschutter"
-
-#: 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 "
@@ -2255,12 +2374,7 @@
 "Indien deze eenheid een levende vijand dood, en deze vijand bevond zich niet "
 "in een dorp, dan herrijst het lijk van de dode en vecht voor jou."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "plaag"
-
-#: 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 "
@@ -2270,16 +2384,7 @@
 "Deze aanval vergiftigt de vijand. Vergiftigde eenheden verlezen elke beurt 8 "
 "HP totdat ze worden genezen of totdat ze slechts 1 HP hebben."
 
-#: 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 "gif"
-
-#: 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 "
@@ -2289,15 +2394,7 @@
 "Deze aanval vertraagt de vijand. Vertraagde eenheden bewegen aan halve "
 "snelheid en hebben een aanval minder dan normaal in een gevecht."
 
-#: 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 "traag"
-
-#: 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 "
@@ -2307,197 +2404,90 @@
 "Deze aanval verandert de vijand in steen. Troepen die in steen zijn "
 "veranderd kunnen bewegen noch aanvallen."
 
-#: 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 "steen"
-
 #: 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 ""
-"Roes:\n"
-"Zowel bij offensief of defensiev gebruik gaat het gevecht door totdat een "
-"van de strijders valt."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "roes"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Eerste contact:\n"
-"Deze eenheid valt altijd aan, ook wanneer het verdedigt."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "eerste contact"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elven"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orks"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Mensen"
 
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Levende Doden"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Diep Water"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Ondiep Water"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Zand"
-
-#: 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 "Dorp"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Moeras"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Toendra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "IJs"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Weg"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Vuil"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Grasland"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Heuvels"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Bergen"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Bos"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Brug"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Kasteel"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Donjon"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Grot"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Grotwand"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orks"
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Kamp"
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Levende Doden"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "$name's Brug,$name's Oversteek"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "$name's Hogestraat,$name's Pas,Pad van $name"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "$name Rivier,Rivier $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "$name Bos,$name's Bos"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "$name Meer"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr "$name|gem,$name|dam,$name|ton"
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "$name Bos,$name's Bos"
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr "$name|dam,$name|fort,$name|dam,$river|fort,$river|wade"
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr "$river|brug,$river|brug,$river|brug,$name|dam,$name|brug"
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr "$name|velde,$name|ton,$name|Veld"
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr "$name|gem,$name|ton,$name|lo,$name Bos"
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr "$name|gem,$name|steen,$name|ton,$name|heuvel,$name|rug"
 
-#: 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|gem,$name|steen,$name|ton,$name|mont,$name|mont,$name|klip,$name|klip"
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Volgende tip"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Tip van de dag"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Toon geen tips meer"
 
-#: 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."
@@ -2505,14 +2495,14 @@
 "Rechtvaardige troepen vechten beter overdag, en chaotische beter 's nachts. "
 "Neutrale eenheden worden niet door het daglicht beïnvloed."
 
-#: 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 ""
 "In een veldtocht kun je veteranen gebruiken door ze opnieuw op te roepen."
 
-#: 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-"
@@ -2526,7 +2516,7 @@
 "'Troepenbeschrijving' en vervolgens 'Resistentie' om te zien wat de "
 "resistentie van de eenheid is tegen verschillende aanvallen."
 
-#: 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 "
@@ -2537,7 +2527,7 @@
 "heeft om hen te raken. Het verdedigingspercentage van de eenheid die "
 "geselecteerd is wordt getoond rechts-bovenaan."
 
-#: 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 "
@@ -2548,7 +2538,7 @@
 "sterven door vergif. Vergiftigde troepen kunnen een tegengif vinden bij "
 "eenheden die kunnen genezen of in een dorp."
 
-#: 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 "
@@ -2558,7 +2548,7 @@
 "selecteren in het spel menu. Door eenheden op te roepen kun je een sterk en "
 "ervaren leger opbouwen."
 
-#: 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 "
@@ -2568,7 +2558,7 @@
 "een eenheid in de controlezone van een vijand beweegt kan de eenheid niet "
 "verder bewegen die beurt."
 
-#: 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 "
@@ -2578,14 +2568,14 @@
 "waarop de vijandige eenheid zich bevind, maar magische aanvallen hebben "
 "altijd 70% kans om te raken en precisieschutters 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 ""
 "Troepen die in een dorp gestationeerd zijn helen 8HP aan het begin van hun "
 "beurt."
 
-#: 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."
@@ -2593,7 +2583,7 @@
 "Troepen die niet bewegen of aanvallen tijdens hun beurt rusten en "
 "recupereren 2HP aan het begin van hun volgende beurt."
 
-#: 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 "
@@ -2602,7 +2592,7 @@
 "De meeste infanterietroepen verdedigen zich beter in een dorp of in een "
 "kasteel, maar bereden troepen ontvangen hier geen bonus door."
 
-#: 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 "
@@ -2612,7 +2602,7 @@
 "schade aanrichten, maar ze zijn kwetsbaar voor puntige wapens zoals pijlen "
 "en speren. "
 
-#: 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 "
@@ -2621,7 +2611,7 @@
 "De genadeslag toebrengen is de beste manier om ervaring te winnen. Eenheden "
 "die een vijand doden ontvange 8XP."
 
-#: 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."
@@ -2629,7 +2619,7 @@
 "Elven vechten zeer effectief in bossen. Dwergen zijn zeer effectief op "
 "heuvels en bergen."
 
-#: 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."
@@ -2637,7 +2627,7 @@
 "Geduld is dikwijls de sleutel. Het is verstandiger om te wachten dan om aan "
 "te vallen met weinig eenheden in slechte omstandigheden."
 
-#: 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."
@@ -2646,14 +2636,14 @@
 "idee zijn om enkele (ten dode opgeschreven) eenheden naar de vijand toe te "
 "sturen om deze te vertragen."
 
-#: 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 ""
 "Wees niet bang om terug te trekken en te hergroeperen, het is dikwijls de "
 "sleutel tot de overwinning."
 
-#: 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 "
@@ -2664,7 +2654,7 @@
 "eerder afwerkt. Je krijgt altijd meer goud door vroeg te eindigen dan door "
 "alle dorpen op de map te controleren totdat de beurten om zijn."
 
-#: 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 "
@@ -2676,7 +2666,7 @@
 "van een vijand veroveren en van daaruit recruteren. Of je kunt recruteren "
 "vanaf de donjon van een bondgenoot."
 
-#: 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."
@@ -2684,7 +2674,7 @@
 "Skeletten zijn uitermate resistent tegen puntige en snij aanvallen maar "
 "kwetsbaar voor impact, vuur, en heilige aanvallen."
 
-#: 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."
@@ -2692,7 +2682,7 @@
 "Aanvoerders zorgen ervoor dat de hen omringende eenheden van lagere rang "
 "beter vechten."
 
-#: 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 "
@@ -2701,7 +2691,7 @@
 "Vermijd in het algemeen om troepen naast een verlaten dorp te plaatsen: een "
 "vijand kan het dorp innemen en jou vandaaruit aanvallen."
 
-#: 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."
@@ -2709,17 +2699,17 @@
 "Door de cursor over een vaardigheid of een karaktertrek te houden krijg je "
 "een beschrijving van de vaardigheid of karaktertrek."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Gebruik een lijn van troepen om je gewonde eenheden te beschermen terwijl ze "
 "recupereren."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Lees de sneltoetslijst in het instellingen menu."
 
-#: 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'."
@@ -2728,7 +2718,7 @@
 "geen extra informatie, dan kun je je zet ongedaan maken door op 'u' te "
 "drukken."
 
-#: 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."
@@ -2736,7 +2726,7 @@
 "Je kunt zien hoever vijandige eenheden kunnen bewegen door je cursor over "
 "hen heen te bewegen."
 
-#: 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."
@@ -2744,7 +2734,7 @@
 "Gebruik helers of genezers om je aanvallen te ondersteunen - ze winnen "
 "gevechten zonder te vechten!"
 
-#: 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 "
@@ -2754,18 +2744,18 @@
 "vijand een aanval minder heeft. Tegen eenheden met krachtige aanvallen is "
 "het zeer effectief."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Heilige aanvallen zijn zeer krachtig tegen ondoden."
 
-#: 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 ""
 "Eenheden genezen wanneer ze promoveren. Dit kan een gevecht doen keren."
 
-#: 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."
@@ -2797,7 +2787,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
@@ -2810,12 +2800,49 @@
 msgid "cold"
 msgstr "koud"
 
+#: 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 "uitzuiging"
+
 #: 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 "magisch"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Eeuwenoude Ent"
@@ -2841,7 +2868,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
@@ -2849,19 +2876,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
@@ -2881,7 +2913,7 @@
 msgid "impact"
 msgstr "impact"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Oppermagiër"
 
@@ -2900,6 +2932,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
@@ -2915,7 +2949,7 @@
 msgstr "vuurbal"
 
 #: 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
@@ -2927,12 +2961,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 "vuur"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Oppermagiër"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Sluipmoordenaar"
@@ -2961,7 +3000,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
@@ -2999,21 +3038,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
@@ -3021,16 +3061,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 "snij"
 
+#: 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 "ruggesteek"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "mes"
 
+#: 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 "gif"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandiet"
@@ -3053,16 +3107,16 @@
 msgid "mace"
 msgstr "goedendag"
 
-#: 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 "Prinses"
 
-#: 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 "aanvoerder,warzaaier"
 
-#: 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 "
@@ -3075,7 +3129,7 @@
 "niveau putten kracht en moed uit de aanwezigheid van de Prinses en bevechten "
 "haar vijanden met volle overgave."
 
-#: 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
@@ -3099,18 +3153,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 "zwaard"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Prinses"
+
+#: 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 "
@@ -3125,9 +3183,9 @@
 "haar vijanden met volle overgave. De Prinses is tevens een meester in "
 "verwarring zaaien en negeert controle-zones."
 
-#: 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 "scepter des vuur"
 
@@ -3221,7 +3279,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
@@ -3230,7 +3294,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
@@ -3238,7 +3302,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 "puntig"
@@ -3309,6 +3373,14 @@
 msgid "web"
 msgstr "web"
 
+#: 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 "traag"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Beenderruiter"
@@ -3330,13 +3402,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 "stormloop"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Cockatrice"
@@ -3354,6 +3437,11 @@
 msgid "gaze"
 msgstr "staar"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "steen"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Aanvoerder"
@@ -3418,10 +3506,11 @@
 msgstr "koudegolf"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Duistere Koningin"
 
-#: 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 "
@@ -3431,7 +3520,7 @@
 "Haar kennis van de magie maakt haar een te duchten tegenstander in een "
 "gevecht, ook al komt haar sterkte voornamelijk van hen die ze commandeert."
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "scepter"
 
@@ -3703,6 +3792,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 "eerste contact"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Drako Strijder"
@@ -3751,6 +3846,10 @@
 msgid "berserker frenzy"
 msgstr "geweldenaar roes"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "roes"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Draakwachter"
@@ -3922,6 +4021,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Ulfenaar"
 
+#: 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 "Oude Magiër"
@@ -3955,7 +4061,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 "Elvenschutter"
 
@@ -3966,7 +4072,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 "Elvenschutter"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Elvenwreker"
 
@@ -3978,6 +4089,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Elvenwreker"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Elvenkapitein"
@@ -4005,7 +4121,8 @@
 "zware klappen uit. Hij is tevens dodelijk met pijl en boog. "
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Elvendruïde"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4027,7 +4144,8 @@
 msgstr "doornen"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Tovenares"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4086,10 +4204,18 @@
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Elvendame"
 
 #: 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 ""
 
@@ -4105,7 +4231,7 @@
 "De Elvenheer is afschrikwekkend, zowel met zwaard als vuurbal gaat hij de "
 "vijand te lijf."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Precisieschutter"
 
@@ -4123,6 +4249,17 @@
 msgid "longbow"
 msgstr "longbow"
 
+#: 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 "precisieschutter"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Precisieschutter"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Maarschalk"
@@ -4153,7 +4290,7 @@
 "zwakkere vijandige eenhden aan te vallen of om op onbeschermde flanken in te "
 "hakken."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Elvenranger"
 
@@ -4165,6 +4302,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 "Elvenranger"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Elvenruiter"
@@ -4190,7 +4332,8 @@
 "staat te paard met boog en pijl doel te treffen."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Elvenshamaan"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4204,7 +4347,7 @@
 "aantal aanvallen de vijand kan opbrengen. Ze bezit eveneens de kennis om het "
 "helen van wonden te bevorderen."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Sherpschutter"
 
@@ -4216,8 +4359,14 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Sherpschutter"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Elvenfee"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4235,7 +4384,8 @@
 msgstr "feeënstreel"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Elvenmagiër"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4247,7 +4397,8 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Elvensylf"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4347,7 +4498,15 @@
 msgid "Galleon"
 msgstr "Galjoen"
 
-#: 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 "dummy"
 
@@ -4451,12 +4610,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 "eerste contact"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Goblin Ridder"
@@ -4485,7 +4638,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"
 
@@ -4532,7 +4686,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 "Meester Magiër"
 
@@ -4544,17 +4698,15 @@
 "De Meester Magiër is een te vrezen vijand. Hij is zelfs machtiger dan de "
 "Oppermagiër. "
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Meester Magiër"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Grote 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 "regenereert"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4767,7 +4919,7 @@
 "niveau in de onmiddellijke omgeving van de Heer genieten dan ook van zijn "
 "bevelen."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Magiër"
 
@@ -4787,11 +4939,16 @@
 msgid "missile"
 msgstr "projectiel"
 
-#: 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 "Magiër des Licht"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "verlicht,geneest"
 
@@ -4814,16 +4971,23 @@
 "Magiër des Licht geneest tevens bevriende eenheden."
 
 #: 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 "lichtstraal"
 
 #: 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 "Magiër des Licht"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Meester Schutter"
@@ -4837,11 +5001,28 @@
 "Meester schutters hebben het hoogste niveau van kunde bereikt dat voor een "
 "mens haalbaar is. Alleen de Elven kunnen beter met een boog overweg."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Meerman"
+#: 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 "Tovenares"
 
-#: 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."
@@ -4849,11 +5030,98 @@
 "De meermannen, die handige schepsels van de zee zijn snel en krachtig in "
 "elke aquatische omgeving maar kunnen amper bewegen op het 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 "waterstraal"
+
+#: 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 "feeënstreel"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Meerman"
+
+#: 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 "drietand"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "omwortel"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Drako Vechter"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Meerman"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Meerman"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Saurian Strijder"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Speerman"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Duitse Vertaling"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Saurian Strijder"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Modderkruiper"
@@ -4865,8 +5133,8 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -4917,10 +5185,6 @@
 "kwade te verbergen.  Deze verwerpelijke creaturen kunnen hun in de "
 "duisternis van de nacht verstoppen."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "nachtsluip"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Adelijke Aanvoerder"
@@ -4964,7 +5228,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 "
@@ -5078,7 +5342,7 @@
 "kennen krachtige spreuken om hun vijanden te vervloeken."
 
 #: 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 "vloek"
 
@@ -5178,7 +5442,7 @@
 "bij de orks en ten zeerste gevreesd bij hun vijanden. Hun enigste zwakte is "
 "hun onkunde een boog te hanteren."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Brigant"
 
@@ -5186,6 +5450,11 @@
 msgid "Outlaws fight better at night."
 msgstr "Briganten vechten beter 's nachts."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Brigant"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
@@ -5193,7 +5462,8 @@
 "terwijl ze dit doen."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Brigant Princess"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5212,7 +5482,8 @@
 "zal er nog in slagen ook."
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Brigant Koningin"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5289,7 +5560,14 @@
 msgid "Pirate Galleon"
 msgstr "Piratengaljoen"
 
-#: 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"
@@ -5306,7 +5584,7 @@
 "Stropers vertrouwen op hun jachtervaring en zijn het waardevolst 's nachts "
 "en in bossen of moerassen."
 
-#: 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 "
@@ -5321,7 +5599,7 @@
 "haar vijanden met volle overgave. De Prinses is tevens een meester in "
 "verwarring zaaien en negeert controle-zones."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Rode Magiër"
 
@@ -5335,6 +5613,11 @@
 "Ze zijn sterk zoveel overdag al 's nachts en zijn waardevol in bijna elke "
 "situatie."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Rode Magiër"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Wedergekomene"
@@ -5450,13 +5733,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 "Zee Haga"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5467,10 +5751,6 @@
 "Zee Hagas zijn oudere en meer ervaren nagas die geleerd hebben watermagie te "
 "gebruiken."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "waterstraal"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Zee Ork"
@@ -5541,7 +5821,7 @@
 "De schoktroepen behoren tot de elitesoldaten in Wesnoth. Ze zijn traag, maar "
 "ongelooflijk sterk, en worden gevreesd in Wesnoth en ver erbuiten."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Zilveren Magiër"
 
@@ -5555,10 +5835,24 @@
 "van een bevriend dorp naar een ander bevriend dorp teleporteren. Tevens zijn "
 "ze resistent tegen de meeste vormen van magie."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Zilveren Magiër"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Skeletdraak"
 
+#: 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 "kaak"
@@ -5627,6 +5921,10 @@
 "Deze herrezen wandelende lijken zijn sterker geworden door hun lange "
 "ervaring met het bevechten van de levenden."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "plaag"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Speerman"
@@ -5831,10 +6129,11 @@
 "maar ze zuigen bloed uit de vijand. Dit bloed maakt de vleermuis sterker."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Vampier-Jonkvrouw"
 
-#: 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."
@@ -5842,7 +6141,7 @@
 "Koud en mooi, ze behoud haar euwige jeugd door bloed van de levenden te "
 "drinken."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "bloedkus"
 
@@ -5908,7 +6207,7 @@
 "Wachttorens zijn uitstekende stellingen van waaruit men vijanden kan "
 "bespeuren.. om ze vervolgens met allerlei projectielen te bekogelen."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Witte Magiër"
 
@@ -5925,6 +6224,11 @@
 "uitermate dodelijk voor levende doden. De door hem opgeroepen lichtstraal "
 "betekent eeuwige rust voor de levende dode"
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Witte Magiër"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Wolfruiter"
@@ -6136,7 +6440,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 "Sluit"
 
@@ -6157,73 +6461,73 @@
 msgid "none"
 msgstr "geen"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "basisschade"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "resistentie van de aanvaller vs"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "kwetsbaarheid van de aanvaller 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 "Verdubbeld"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "totale schade"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "resistentie van de verdediger vs"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "kwetsbaarheid van de verdediger vs"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Gehalveerd"
 
-#: 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 "vergiftigd"
 
-#: 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 "vertraagd"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Hinderlaag!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Bevriende eenheid in zicht!"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Vijandige eenheid in zicht!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends Bevriende troepen gesignaleerd"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies Vijandige troepen gesignaleerd!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Troepen gesignaleerd! (($friends bevriende, $enemies vijandige)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(druk $hotkey om door te gaan)"
 
@@ -6283,7 +6587,7 @@
 msgid "replay"
 msgstr "herspeel"
 
-#: 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 "Beurt"
 
@@ -6349,23 +6653,23 @@
 msgid "Profile"
 msgstr "Profiel"
 
-#: 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 "rang"
 
-#: 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 "Stappen"
 
-#: 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 "dichtbij"
 
-#: 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 "veraf"
 
@@ -6385,11 +6689,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Will je een herhaling van dit scenario opnemen?"
 
-#: 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 "Naam:"
 
-#: 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 "Het spel kon niet worden opgeslagen"
 
@@ -6454,8 +6758,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"
 
@@ -6519,7 +6823,7 @@
 "veldtocht."
 
 #: 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 "Connectie timed out"
 
@@ -6575,7 +6879,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"
 
@@ -6595,79 +6899,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Kan de fonts niet initialiseren. Afsluiten.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Promoveert tot"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Alliantie"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Benodigde XP"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "aanvallen"
 
-#: 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 "Naam"
 
-#: 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 "Schade"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Slaat"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Afstand"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Speciaal"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Resistenties"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Soort Aanval"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Resistentie"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Terreinspecificaties"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Terrein"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Verdedeging"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Terug"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Volgende >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Strijd om Wesnoth Help"
 
@@ -6679,7 +6983,7 @@
 msgid "End Unit Turn"
 msgstr "Stop Beurt Eenheid"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Leider"
 
@@ -6715,11 +7019,11 @@
 msgid "Unit Description"
 msgstr "Troepenbeschrijving"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Hernoem Eenheid"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Recruteren"
 
@@ -6727,7 +7031,7 @@
 msgid "Repeat Recruit"
 msgstr "Herhaal Recrutering"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Oproepen"
 
@@ -6763,11 +7067,11 @@
 msgid "Scenario Objectives"
 msgstr "Scenario Doel"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Troepenlijst"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statistieken"
 
@@ -6875,7 +7179,7 @@
 msgid "Speak to All"
 msgstr "Spreek tegen Iedereen"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Help"
 
@@ -6935,7 +7239,7 @@
 msgid "Bump Size"
 msgstr "Landmassa Grootte"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Dorpen"
 
@@ -6985,15 +7289,11 @@
 "Vijandige eenheden kunnen niet worden gezien tenzij ze binnen het bereik "
 "zijn van je eenheden."
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Sluier"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "De map is onbekend totdat je eenheden ze verkennen."
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Observeerders"
 
@@ -7001,13 +7301,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Sta spelers die het spel niet spelen toe om het spel te bekijken."
 
-#: 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 "Annuleer"
 
-#: 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"
 
@@ -7083,69 +7383,69 @@
 msgid "Warning"
 msgstr "Opgelet"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Bezig spellijst op te halen..."
 
-#: 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 "Goud"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Aan het wachten op de start van het spel..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 msgid "Connect to Host"
 msgstr "Verbind met Server"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Kies host om mee te verbinden"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Bezig met verbinding maken met remote host..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Je moet op deze server inloggen"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Bezig met ophalen data..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Er zijn geen beschikbare kanten in dit spel."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Kies je kant:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Het spel werd geannuleerd"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "De kant die je gekozen hebt is niet langer beschikbaar"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Toon opgenomen spel tot het moment van opslaan?"
 
-#: 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 "Leider:"
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr "Rekruten:"
 
@@ -7177,8 +7477,8 @@
 msgid "Local Player"
 msgstr "Lokale Speler"
 
-#: 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 Speler"
 
@@ -7243,7 +7543,7 @@
 msgid "Color"
 msgstr "Kleur"
 
-#: 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 "Aan het wachten op netwerkspelers"
 
@@ -7328,53 +7628,53 @@
 msgid "It is now your turn"
 msgstr "Het is nu jouw beurt"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Aanvaller"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Verdediger"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Schadeberekeningen"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Dichtbij"
 
-#: 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 "Val Vijand Aan"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Kies wapen"
 
-#: 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 "Je bent je beurt nog niet begonnen. Wil je ze echt al beëindigen."
 
-#: 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 "Sommige eenheden kunnen nog bewegen. Wil je echt je beurt beëindigen"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Auto-Save"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 "Kon het spel niet automatisch opslaan. Gelieve het spel manueel op te slaan."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -7382,35 +7682,35 @@
 "Opgeslagen namen mogen geen dubbelpunten of shlashes bevatten. Kies een "
 "andere naam."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Opgeslagen"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Het spel werd opgeslagen"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Inkomen"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Onderhoudskost"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Je hebt geen eenheden beschikbaar om te recruteren."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Selecteer eenheid"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Je hebt niet genoeg goud om die eenheid te recruteren"
 
-#: 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?"
@@ -7418,26 +7718,26 @@
 "Mijnheer, deze eenheid is ervaren en is al gepromoveerd! Wil je $noun echt "
 "ontslaan?"
 
-#: 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 ""
 "Mijnheer, deze eenheid is bijna gepromoveerd! Wil je $noun echt ontslaan?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "haar"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "hem"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Je bent van je troepen gescheiden en dus kun je hen niet oproepen."
 
-#: 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)"
@@ -7445,87 +7745,87 @@
 "Er zijn geen troepen beschikbaar om op te roepen\n"
 "(Je moet veteranen uit vorige scenarios hebben)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "Je moet tenminste $cost goudstukken hebben om een eenheid op te roepen"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Ontsla Eenheid"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Bericht"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Stuur alleen naar bondgenoten"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Locatie"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Recruteringen"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Oproepingen"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Promoties"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Verliezen"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Gedoodden"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Toegebrachte Schade"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Ontvangen Schade"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Toegebrachte Schade (EV)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Ontvangen Schade (EV)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Zoek"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Commando:"
 
-#: 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 "Kon geen label of eenheid vinden met '$search'."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Plaats 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?"
@@ -7533,23 +7833,23 @@
 "De spellen verlopen niet meer synchroon en zullen moeten afsluiten. Wil je "
 "een error log opslaan van dit spel?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Vervang door AI"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Vervang door lokale speler"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Stop spel"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Vervang door"
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "heeft het spel verlaten. Wat wil je doen?"
 
@@ -7608,94 +7908,94 @@
 msgid "Chaotic units"
 msgstr "Chaotische eenheden"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Ingenomen Dorpen"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Vijandig Dorp"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Geallieerd Dorp"
 
-#: 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 "Versie"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Oefenen"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Veldtocht"
 
-#: 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 "Laad"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Taal"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Instellingen"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Afsluiten"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Begin een oefensessie om het spel te leren kennen"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Start een nieuwe single-player veldtocht"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
 msgstr ""
 "Speel multiplayer (hotseat, LAN, of Internet), of een scenario tegen AI"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Laad een single-player bewaard spel"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Verander de taal"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Configureer de instellingen van het spel"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Over de makers van Wesnoth"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Verlaat het spel"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Meer"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- De Geschriften van Wesnoth"
 
@@ -7703,15 +8003,15 @@
 msgid "strikes"
 msgstr "slaat"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "chaotisch"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "rechtvaardig"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutraal"
 
@@ -7722,3 +8022,15 @@
 #: src/widgets/file_chooser.cpp:173
 msgid "Deletion of the file failed."
 msgstr "Verwijderen van het bestand is mislukt."
+
+#~ msgid "first strike"
+#~ msgstr "eerste contact"
+
+#~ msgid "Swamp"
+#~ msgstr "Moeras"
+
+#~ msgid "Tundra"
+#~ msgstr "Toendra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
Index: wesnoth/po/wesnoth/no.po
diff -u wesnoth/po/wesnoth/no.po:1.7 wesnoth/po/wesnoth/no.po:1.8
--- wesnoth/po/wesnoth/no.po:1.7        Sun Oct 17 12:52:55 2004
+++ wesnoth/po/wesnoth/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:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-09-10 15:28+0100\n"
 "Last-Translator: Erik <address@hidden>\n"
 "Language-Team: none\n"
@@ -15,7 +15,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 "Lojal"
 
@@ -47,11 +47,11 @@
 msgid "Traits"
 msgstr "Trekk"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Enheter"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Egenskaper"
 
@@ -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 "Forflytning"
 
@@ -387,7 +387,7 @@
 "fun, and good luck!"
 msgstr ""
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 #, fuzzy
 msgid "About"
 msgstr "Ungdom"
@@ -638,7 +638,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,Tilfeldig"
 
@@ -765,6 +765,24 @@
 msgid "Random map"
 msgstr "Tilfeldig kart"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Tilfeldig kart"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Tilfeldig kart"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Tilfeldig kart"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr ""
@@ -804,7 +822,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 "Nei"
 
@@ -1297,7 +1315,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"
 
@@ -1728,6 +1746,113 @@
 msgid "Underground"
 msgstr "Under bakken"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Skygge"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Dypt vann"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Grunt vann"
+
+#: 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 "Grunt vann"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Is"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Bru"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Sand"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Vei"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Jord"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Gresslette"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Skygge"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Åser"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Fjell"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Skog"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Hulevegg"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Hule"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Borg"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr ""
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Dvergisk Ødeland"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Festning"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "ingenting"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Meny"
@@ -1741,14 +1866,14 @@
 msgstr "Avslutt runde"
 
 #: 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 "LP"
 
 #: 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"
 
@@ -1830,33 +1955,29 @@
 "Dag: -25% skade\n"
 "Natt: +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 ""
-"Helbreder:\n"
-"Setter enheten i stand til å helbrede vennligsinnede naboenheter i "
-"begynnelsen av en runde.\n"
+"Bakhold:\n"
+"Denne enheten kan gjemme seg i skog, og forbli uoppdaget av sine fiender.\n"
 "\n"
-"En enhet som blir hjulpet av en helbreder kan heles opp til 4 LP per runde.\n"
-"En helbreder kan hele opp til 8 LP per runde totalt for alle enhetene den "
-"hjelper.\n"
-"En forgiftet enhet kan ikke bli kurert for giften av en helbreder, og må "
-"søke hjelp i en landsby eller fra en enhet som kan kurere."
+"Fiendtlige enheter kan ikke se eller angripe denne enheten når den er i "
+"skog, med unntak av når den har utført et angrep forrige runde, eller hvis "
+"de står rett ved den."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "helbreder"
+#: 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 "bakhold"
 
-#: 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 "
@@ -1882,27 +2003,60 @@
 "En kurerende enhet kan kurere en som har blitt forgiftet, men den enheten "
 "vil ikke heles noe mer samme runde som den blir kurert for forgiftningen."
 
-#: 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 "kurerer"
 
-#: 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 ""
-"Teleporterer:\n"
-"Denne enheten kan teleportere seg selv mellom to hvilke som helst "
-"vennligsinnede landsbyer."
+"Helbreder:\n"
+"Setter enheten i stand til å helbrede vennligsinnede naboenheter i "
+"begynnelsen av en runde.\n"
+"\n"
+"En enhet som blir hjulpet av en helbreder kan heles opp til 4 LP per runde.\n"
+"En helbreder kan hele opp til 8 LP per runde totalt for alle enhetene den "
+"hjelper.\n"
+"En forgiftet enhet kan ikke bli kurert for giften av en helbreder, og må "
+"søke hjelp i en landsby eller fra en enhet som kan kurere."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleporterer"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "helbreder"
+
+#: 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 ""
+"Opplyser:\n"
+"Denne enheten lyser opp det omkringliggende området, og gjør at lovlydige "
+"enheter kjemper bedre og kaotiske tilsvarende dårligere.\n"
+"\n"
+"Enhver naboenhet til denne enheten vil kjempe som om det var skumring når "
+"det er natt, og som om det var dag når det er skumring."
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "opplyser, kurerer"
 
-#: 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 "
@@ -1916,7 +2070,7 @@
 "\n"
 "Vennligsinnede naboenheter av lavere rang vil gjøre mer 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
@@ -1925,56 +2079,47 @@
 #: 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 "lederskap"
 
-#: 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 ""
-"Bakhold:\n"
-"Denne enheten kan gjemme seg i skog, og forbli uoppdaget av sine fiender.\n"
-"\n"
-"Fiendtlige enheter kan ikke se eller angripe denne enheten når den er i "
-"skog, med unntak av når den har utført et angrep forrige runde, eller hvis "
-"de står rett ved den."
+"Denne enheten er spesielt lojal, og krever aldri mer enn 1 gullstykke i "
+"betaling, uavhengig av grad."
 
-#: 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 "bakhold"
+#: 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 "nattskygge"
+
+#: 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 ""
-"Opplyser:\n"
-"Denne enheten lyser opp det omkringliggende området, og gjør at lovlydige "
-"enheter kjemper bedre og kaotiske tilsvarende dårligere.\n"
-"\n"
-"Enhver naboenhet til denne enheten vil kjempe som om det var skumring når "
-"det er natt, og som om det var dag når det er skumring."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "opplyser, kurerer"
+#: 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 "regenererer"
 
-#: 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 "
@@ -1984,144 +2129,155 @@
 "Denne enheten er trent i å snike seg raskt forbi fiender, og ignorerer "
 "derfor alle fiendtlige Kontrollsoner."
 
-#: 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 "speider"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr ""
-"Denne enheten er spesielt lojal, og krever aldri mer enn 1 gullstykke i "
-"betaling, uavhengig av grad."
-
-#: 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 ENHETEN TAR BARE HALVPARTEN AV NORMAL SKADE HVIS EN ANNEN ENHET "
 "BEGYNTE KAMPEN."
 
-#: 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 ""
+"Teleporterer:\n"
+"Denne enheten kan teleportere seg selv mellom to hvilke som helst "
+"vennligsinnede landsbyer."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleporterer"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "minimumsskade"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Spill"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scenario"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Konfigurer Sider:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Velg laginstillinger:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Kunne ikke opprette forbindelse til ekstern vert"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Venter på at spillere skal opprette forbindelse"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Opptatt"
 
-#: 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 "Observatør"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Beskriv enhet"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Fullskjerm eller Vindu?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Visning:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "I vindu"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Vanlig"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Lydinstillinger..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Innstillinger"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Velg scenario"
 
-#: 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 "Denne terrengtypen helbreder"
 
-#: 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 "eller"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Motstandstabell"
 
-#: 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 "
@@ -2131,13 +2287,14 @@
 "Dette angrepet gjør dobbel skade hvis en vennlig enhet står på andre side 
av "
 "målet."
 
-#: 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 "ryggdolking"
+#: 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 "
@@ -2147,14 +2304,7 @@
 "Dette angrepet forårsaker dobbel skade på målet. Det gjør også at 
enheten "
 "tar dobbel skade fra motangrepet."
 
-#: 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 "stormangrep"
-
-#: 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 "
@@ -2164,18 +2314,15 @@
 "Dette angrepet tapper liv fra levende enheter og helbreder enheten for "
 "halvparten av den påførte skaden."
 
-#: 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 "tapper livskraft"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Første slag:\n"
+"Denne enheten slår alltid først, selv om den forsvarer seg."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2183,280 +2330,122 @@
 "Magisk:\n"
 "Dette angrepet har alltid 70% sjanse for å treffe."
 
-#: 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."
 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 "skarpskytter"
-
-#: 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 "pest"
-
-#: 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 "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 ""
 
-#: 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 "saktne"
-
-#: 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 "stein"
-
 #: 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 "berserk"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Første slag:\n"
-"Denne enheten slår alltid først, selv om den forsvarer seg."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "første slag"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Alver"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orker"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Mennesker"
 
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Vandøde"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Dypt vann"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Grunt vann"
-
-#: 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 "Vei"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Jord"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Gresslette"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Åser"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Fjell"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Skog"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Bru"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Borg"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Festning"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Hule"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Hulevegg"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orker"
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr ""
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Vandøde"
 
-#: 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 "Neste tips"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Dagens tips"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Ikke vis 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."
@@ -2464,7 +2453,7 @@
 "Lovlydige enheter kjemper bedre om dagen, og kaotiske enheter kjemper bedre "
 "om natten. Nøytrale enheter kjemper like godt til begge tider."
 
-#: 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."
@@ -2472,7 +2461,7 @@
 "I løpet av en kampanje kan du gjenbruke erfarne enheter fra tidligere "
 "scenarier ved å bruke kommandoen 'tilbakekall'."
 
-#: 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-"
@@ -2485,7 +2474,7 @@
 "en enhet og velg så 'Enhetsbeskrivelse' og deretter 'Motstand' for å se "
 "hvliken motstand en enhet har mot de forskjellige typer angrep."
 
-#: 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 "
@@ -2496,7 +2485,7 @@
 "i kamp. Forsvarsprosenten for en valgt enhet i terrenget du har musepekeren "
 "over vises øverst i høyre hjørne."
 
-#: 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 "
@@ -2504,83 +2493,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 "
@@ -2588,7 +2577,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 "
@@ -2596,76 +2585,76 @@
 "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 "Les listen over hurtigtaster på Preferanse-menyen."
 
-#: 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 ""
 "Enheter helbredes når de går opp et nivå. Brukt riktig kan dette snu 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."
@@ -2695,7 +2684,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
@@ -2708,12 +2697,49 @@
 msgid "cold"
 msgstr "frost"
 
+#: 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 "tapper livskraft"
+
 #: 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 ""
@@ -2739,7 +2765,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
@@ -2747,19 +2773,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
@@ -2779,7 +2810,7 @@
 msgid "impact"
 msgstr "slag"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Erketrollmann"
 
@@ -2796,6 +2827,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
@@ -2811,7 +2844,7 @@
 msgstr "ildkule"
 
 #: 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
@@ -2823,12 +2856,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 "Erketrollmann"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Snikmorder"
@@ -2857,7 +2895,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
@@ -2895,21 +2933,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
@@ -2917,16 +2956,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 "ryggdolking"
+
 #: 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 "Banditt"
@@ -2949,16 +3002,16 @@
 msgid "mace"
 msgstr "stridsklubbe"
 
-#: 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 "lederskap,speider"
 
-#: 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 "
@@ -2972,7 +3025,7 @@
 "bedre på grunn av hennes skinnende nærvær. Prinsessen er også lettbent og 
"
 "behendig, og har samme evner som en tyv."
 
-#: 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
@@ -2996,18 +3049,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 "sverd"
 
-#: 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 "
@@ -3016,9 +3073,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 "ildsepter"
 
@@ -3114,7 +3171,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
@@ -3123,7 +3186,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
@@ -3131,7 +3194,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 "spidde"
@@ -3196,6 +3259,14 @@
 msgid "web"
 msgstr "spindelvev"
 
+#: 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 "saktne"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Chocobone"
@@ -3218,13 +3289,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 "stormangrep"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Basilisk"
@@ -3244,6 +3326,11 @@
 msgid "gaze"
 msgstr "blikk"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "stein"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Kommandør"
@@ -3309,10 +3396,11 @@
 msgstr ""
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Mørkedronning"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 #, fuzzy
 msgid ""
 "The evil queen mother Asheviere has terrorized Wesnoth for many years. Her "
@@ -3323,7 +3411,7 @@
 "magiske viten gjør henne til en sterk fiende, selv om makten hennes bygger "
 "mest på de som står under hennes kommando."
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "septer"
 
@@ -3584,6 +3672,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 "førsteslag"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr ""
@@ -3633,6 +3727,10 @@
 msgid "berserker frenzy"
 msgstr "berserkergang"
 
+#: 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 "Dvergisk Dragevakt"
@@ -3809,6 +3907,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 "Eldre Trollmann"
@@ -3842,7 +3947,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 "Alvisk Bueskytter"
 
@@ -3853,7 +3958,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 "Alvisk Bueskytter"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Alvisk Hevner"
 
@@ -3865,6 +3975,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Alvisk Hevner"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Alvisk Kaptein"
@@ -3894,7 +4009,8 @@
 "ødelegge sine motstandere på avstand."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Alvisk Druide"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -3918,7 +4034,7 @@
 
 #: data/units/Elvish_Enchantress.cfg:3
 #, fuzzy
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr "Alvisk Sjaman"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -3982,10 +4098,17 @@
 
 #: data/units/Elvish_Lady.cfg:4
 #, fuzzy
-msgid "Elvish Lady"
+msgid "female^Elvish Lady"
 msgstr "Alvisk Herre"
 
 #: 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 "Flytt"
@@ -4002,7 +4125,7 @@
 "Den Alviske Herren er fryktelig i kamp, med både sverd i nærkamp og 
ildkuler "
 "over distanse som en del av sitt repertoar."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Alvisk Jeger"
 
@@ -4020,6 +4143,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 "skarpskytter"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Alvisk Jeger"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Alvisk Marskalk"
@@ -4050,7 +4184,7 @@
 "vel som i åpent lende. Han kan til og med bruke buen fra hesteryggen, og "
 "skyte piler etter fiender som måtte dukke opp."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Alvisk Skogvokter"
 
@@ -4062,6 +4196,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 "Alvisk Skogvokter"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Alvisk Rytter"
@@ -4087,7 +4226,8 @@
 "dyktighet på hesteryggen er makeløs, selv om de mangler kampstyrke."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Alvisk Sjaman"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4100,7 +4240,7 @@
 "Hennes innfiltrende angrep sinker fienden og reduserer antall angrep de kan "
 "gjøre. Hun besitter også enkle kunnskaper om helbredelse."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Alvisk Skarpskytter"
 
@@ -4112,8 +4252,14 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Alvisk Skarpskytter"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Alvisk Sidhe"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4133,7 +4279,7 @@
 
 #: data/units/Elvish_Sorceress.cfg:3
 #, fuzzy
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr "Alvisk Bueskytter"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4146,7 +4292,7 @@
 
 #: data/units/Elvish_Sylph.cfg:3
 #, fuzzy
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr "Alvisk Sidhe"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4245,7 +4391,15 @@
 msgid "Galleon"
 msgstr "Gallion"
 
-#: 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 "plassholder"
 
@@ -4353,12 +4507,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 "førsteslag"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Gnomeridder"
@@ -4388,7 +4536,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 "nett"
 
@@ -4436,7 +4585,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 "Mektig Trollmann"
 
@@ -4448,17 +4597,15 @@
 "Den Mektige Trollmannen er en fryktinngytende og forferdelig fiende, og "
 "overgår selv den Eldre Trollmannen i makt."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Mektig Trollmann"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Kjempetroll"
 
-#: 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 "regenererer"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4659,7 +4806,7 @@
 "en Herre lederegenskaper, slik at han gir inspirasjon til alle lavere "
 "rangerte enheter i nærliggende ruter."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Trollmann"
 
@@ -4681,11 +4828,16 @@
 msgid "missile"
 msgstr "prosjektil"
 
-#: 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 Trollmann"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "opplyser, kurerer"
 
@@ -4710,16 +4862,23 @@
 "vennligsinnede enheter på nærliggende ruter."
 
 #: 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 Trollmann"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr ""
@@ -4731,11 +4890,28 @@
 "only by that of the Elves."
 msgstr ""
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Havmann"
+#: 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 "Alvisk Sjaman"
 
-#: 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."
@@ -4743,11 +4919,98 @@
 "Havmannen er en veltrent skapning fra sjøen, sterk og rask i ethvert vått "
 "miljø, men nærmest hjelpeløs 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 "vannsprut"
+
+#: 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 "berøring"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Havmann"
+
+#: 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 "innfiltre"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Adelig Stridsmann"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Havmann"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Havmann"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Saurianerkriger"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Spydkaster"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Tysk oversettelse"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Saurianerkriger"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Sølekryp"
@@ -4761,8 +5024,8 @@
 "kokende vann på sine fiender."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -4808,10 +5071,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 "nattskygge"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Adelig Kommandør"
@@ -4849,7 +5108,7 @@
 msgid "Ogre"
 msgstr "Rise"
 
-#: 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 "
@@ -4970,7 +5229,7 @@
 "livskraften deres."
 
 #: 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 "bann"
 
@@ -5072,7 +5331,7 @@
 "høyt respektert blant orker, og svært fryktet blant fiender. Hans eneste "
 "svakhet er hans manglende evne til å kunne bruke en bue."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Fredløs"
 
@@ -5080,6 +5339,11 @@
 msgid "Outlaws fight better at night."
 msgstr "Fredløse kjemper bedre om natten."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Fredløs"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
@@ -5087,7 +5351,8 @@
 "de gjør det."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Fredløs Prinsesse"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5103,7 +5368,8 @@
 "med det hun har plyndret."
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Fredløs Dronning"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5181,7 +5447,14 @@
 msgid "Pirate Galleon"
 msgstr "Piratgallion"
 
-#: 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"
@@ -5198,7 +5471,7 @@
 "Krypskytteren har stor nytte av sin erfaring fra jakt om natten i skog og "
 "myrlendte områder."
 
-#: 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 "
@@ -5212,7 +5485,7 @@
 "bedre på grunn av hennes skinnende nærvær. Prinsessen er også lettbent og 
"
 "behendig, og har samme evner som en tyv."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Rød Trollmann"
 
@@ -5226,6 +5499,11 @@
 "sjanse for å treffe. God om både dagen og natten, lettbent, en Rød 
Trollmann "
 "er verdifull i så godt som alle situasjoner."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Rød Trollmann"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Oppreist"
@@ -5344,13 +5622,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 "Sjøheks"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5361,10 +5640,6 @@
 "Sjøhekser er eldre og mer erfarne nagaer som har lært å kontrollere 
vannets "
 "magi."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "vannsprut"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Sjøork"
@@ -5429,7 +5704,7 @@
 "sterke som få, og fryktet overalt i Wesnoth og til og med i landene "
 "bortenfor."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Sølvtrollmann"
 
@@ -5443,10 +5718,24 @@
 "teleportere fra en vennlig by til en annen på et øyeblikk! De er også 
høyt "
 "motstandsdyktige overfor de fleste former for magiske angrep."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Sølvtrollmann"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Skjelettdrage"
 
+#: 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 "kjeve"
@@ -5516,6 +5805,10 @@
 "Disse oppreiste vandrende lik har blitt sterke av lang erfaring i å kjempe "
 "mot de levende."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "pest"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Spydkaster"
@@ -5710,10 +6003,11 @@
 "blodet til offeret, noe som gir mer liv til monsteret."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Vampyrinne"
 
-#: 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."
@@ -5721,7 +6015,7 @@
 "Kald og vakker, hun har beholdt sitt ungdommelig utseende ved å drikke "
 "blodet fra de levende."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "Blodkyss"
 
@@ -5786,7 +6080,7 @@
 "Vakttårn er gode steder for å få øye på fiender og deretter skyte 
diverse "
 "ting på dem med en ballista."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Hvit Trollmann"
 
@@ -5804,6 +6098,11 @@
 "Den Hvite Trollmannen er effektiv i kamp mot vandøde, siden de tar mye skade 
"
 "fra lysstrålene hans."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Hvit Trollmann"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Ulverytter"
@@ -6015,7 +6314,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 "Lukk"
 
@@ -6036,73 +6335,73 @@
 msgid "none"
 msgstr "ingenting"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "Grunnskade"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "angripers motstand mot"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "angripers svakhet mot"
 
-#: 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 "Doblet"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "Totalskade"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "forsvarers motstand mot"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "forsvarers svakhet mot"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Halvert"
 
-#: 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 "saktnet"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Bakhold!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Vennlig enhet i sikte"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Fiendtlig enhet i sikte!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends vennlige enheter i sikte"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies fiendtlige enheter i sikte!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Enheter i sikte! ($friends vennlige, $enemies fiendtlige)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(tast $hotkey for å fortsette)"
 
@@ -6162,7 +6461,7 @@
 msgid "replay"
 msgstr "avspilling"
 
-#: 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"
 
@@ -6228,23 +6527,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 "nivå"
 
-#: 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 "Flytt"
 
-#: 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 "avstand"
 
@@ -6264,11 +6563,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Vil du lagre hendelsene som skjedde i dette scenariet?"
 
-#: 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 lagres"
 
@@ -6334,8 +6633,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 "Feil"
 
@@ -6405,7 +6704,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 "Forbindelse utgått på tid"
 
@@ -6466,7 +6765,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 "Logg inn"
 
@@ -6486,79 +6785,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Kunne ikke sette opp skrifttyper. Lukker. \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 "Nødvendige EP"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "angrep"
 
-#: 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 "Slag"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Rekkevidde"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Spesial"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Motstand"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Angrepstype"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Motstand"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Terrengmodifikasjoner"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Terreng"
 
-#: 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 "< Tilbake"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Videre >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Kampen om Wesnoth Hjelp"
 
@@ -6570,7 +6869,7 @@
 msgid "End Unit Turn"
 msgstr "Avslutt enhetens tur"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Leder"
 
@@ -6606,11 +6905,11 @@
 msgid "Unit Description"
 msgstr "Enhetsbeskrivelse"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Gi enheten nytt navn"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Rekrutter"
 
@@ -6618,7 +6917,7 @@
 msgid "Repeat Recruit"
 msgstr "Gjenta rekruttering"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Tilbakekall"
 
@@ -6654,11 +6953,11 @@
 msgid "Scenario Objectives"
 msgstr "Scenariets mål"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Liste over enheter"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statistikk"
 
@@ -6766,7 +7065,7 @@
 msgid "Speak to All"
 msgstr "Snakk med alle"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Hjelp"
 
@@ -6826,7 +7125,7 @@
 msgid "Bump Size"
 msgstr "Humpstørrelse"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Landsbyer"
 
@@ -6876,15 +7175,11 @@
 "Fiendtlige enheter kan ikke sees med mindre de er innen rekkevidde av dine "
 "enheter."
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Skygge"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "Terrenget er ukjent inntil dine enheter utforsker det."
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Observatører"
 
@@ -6892,13 +7187,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Tillat brukere som ikke spiller å følge med på spillet"
 
-#: 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 "Avbryt"
 
-#: 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"
 
@@ -6972,71 +7267,71 @@
 msgid "Warning"
 msgstr "Advarsel"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Mottar spilliste..."
 
-#: 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 "Gullstykker"
 
-#: 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
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Fortsett forflytning"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Velg vert å koble til"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Oppretter forbindelse til ekstern vert..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Du må logge inn på denne tjeneren"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Laster spilldata..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Det er ingen tilgjengelige sider i dette spillet."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Velg side:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Spillet er avlyst"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Siden du har valgt er ikke lenger tilgjengelig."
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Vis reprise av spill frem til lagringspunkt?"
 
-#: 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 "Leder"
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 #, fuzzy
 msgid "Recruits: "
 msgstr "Rekrutter"
@@ -7069,8 +7364,8 @@
 msgid "Local Player"
 msgstr "Menneske"
 
-#: 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 "Datastyrt spiller"
 
@@ -7135,7 +7430,7 @@
 msgid "Color"
 msgstr "Farge"
 
-#: 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 nettverksspillere skal koble til"
 
@@ -7220,54 +7515,54 @@
 msgid "It is now your turn"
 msgstr "Det er nå din tur"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Angriper"
 
-#: 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 "Skadeberegninger"
 
-#: 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 "mot"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Angrip fiende"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Velg våpen"
 
-#: 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 begynt turen din ennå. Er du sikker på at du vil avslutte turen 
"
 "din?"
 
-#: 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 "Noen enheter kan fremdeles flytte. Vil du likevel avslutte runden din?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Lagre automatisk"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr "Kunne ikke lagre spillet automatisk. Du bør lagre 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."
@@ -7275,35 +7570,35 @@
 "Filnavn kan ikke inneholde kolon eller skråstreker. Vennligst velg et annet "
 "navn."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Lagret"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Spillet har nå blitt lagret"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Inntekt"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Underhold"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Det finnes ingen enheter du kan rekruttere."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Velg enhet"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Du har ikke nok gullstykker til å rekruttere denne enheten."
 
-#: 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?"
@@ -7311,7 +7606,7 @@
 "Men herre, dette er en erfaren enhet av høy rang! Er du sikker på at du vil 
"
 "sende bort $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?"
@@ -7319,20 +7614,20 @@
 "Men herre, denne enheten er nær ved å gå opp et nivå! Er du sikker på at 
du "
 "vil sende bort $noun?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "henne"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "ham"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 #, fuzzy
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Du er blitt skilt fra soldatene dine og kan ikke kalle dem tilbake"
 
-#: 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)"
@@ -7340,88 +7635,88 @@
 "Det finnes ingen tropper å tilbakekalle\n"
 "(Du må ha veterantropper som har overlevd tidligere scenarier)."
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 #, fuzzy
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "gullstykker for å tilbakekalle en enhet."
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Send bort enhet"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Beskjed"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Send kun til allierte"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Sted"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Rekrutter"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Tilbakekallinger"
 
-#: 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 "Tap"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Drepte fiender"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Skade mottat"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Skade utdelt"
 
-#: 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 "Søk"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr ""
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Pratelogg"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "Kunne ikke finne merkelapp elelr enhet som inneholdt '$search'."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Sett merkelapp"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Merkelapp"
 
-#: 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?"
@@ -7429,23 +7724,23 @@
 "Spillene er ikke synkroniserte og må derfor avsluttes. Vil du lagre en "
 "feillogg?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Erstatt med datastyrt spiller"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Erstatt med lokal spiller"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Avbryt spill"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Erstatt med "
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "har forlatt spillet. Hva vil du gjøre?"
 
@@ -7509,66 +7804,66 @@
 msgid "Chaotic units"
 msgstr "Kaotiske enheter"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 #, fuzzy
 msgid "Owned village"
 msgstr "Landsby"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 #, fuzzy
 msgid "Enemy village"
 msgstr "Landsby"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 #, fuzzy
 msgid "Allied village"
 msgstr "Gnomisk Plyndrer"
 
-#: 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 "Versjon"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Opplæring"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Kampanje"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Flerspiller"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Last spill"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Språk"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Innstillinger"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Avslutt"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Begynn opplæring for å bli kjent med spillet"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Start en enspiller-kampanje"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -7576,31 +7871,31 @@
 "Spill med flere spillere- 'hotseat', LAN, over Internett eller et spill mot "
 "datamaskinen"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Last inn et lagret spill med en spiller"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Velg språk"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Rediger innstillingene"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Se liste over medvirkende"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Avslutt spillet"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Mer"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Boken om Wesnoth"
 
@@ -7608,15 +7903,15 @@
 msgid "strikes"
 msgstr "slag"
 
-#: 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 "Nøytral"
 
@@ -7628,6 +7923,18 @@
 msgid "Deletion of the file failed."
 msgstr "Filsletting slo feil."
 
+#~ msgid "first strike"
+#~ msgstr "første slag"
+
+#~ msgid "Swamp"
+#~ msgstr "Sump"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Vert for flerspiller"
 
Index: wesnoth/po/wesnoth/pl.po
diff -u wesnoth/po/wesnoth/pl.po:1.8 wesnoth/po/wesnoth/pl.po:1.9
--- wesnoth/po/wesnoth/pl.po:1.8        Sun Oct 17 12:52:55 2004
+++ wesnoth/po/wesnoth/pl.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:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-09-18 22:36-0000\n"
 "Last-Translator: Grzegorz Borek <address@hidden>\n"
 "Language-Team: none\n"
@@ -17,7 +17,7 @@
 "Plural-Forms: nplurals=3; plural=(n==1 ? 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 "lojalny"
 
@@ -49,11 +49,11 @@
 msgid "Traits"
 msgstr "Cechy"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Jednostki"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Zdolności"
 
@@ -195,7 +195,7 @@
 "utrzymania. Więcej na ten temat w <ref>dst=income_and_upkeep text='Dochód i 
"
 "Utrzymanie'<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 "Ruchy"
 
@@ -599,7 +599,7 @@
 "i <ref>dst=abilities text=Zdolnościami</ref>, lecz wszystko, co potrzebne do 
"
 "rozegrania kampanii Następca tronu już wiesz. Baw się dobrze i powodzenia!"
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 #, fuzzy
 msgid "About"
 msgstr "Młodzieniec"
@@ -908,7 +908,7 @@
 msgstr "Domyślna"
 
 #: 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,Losowa"
 
@@ -1035,6 +1035,24 @@
 msgid "Random map"
 msgstr "Losowa mapa"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Losowa mapa"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Losowa mapa"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Losowa mapa"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -1081,7 +1099,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 "Nie"
 
@@ -1640,7 +1658,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 ""
 
@@ -2071,6 +2089,113 @@
 msgid "Underground"
 msgstr "Podziemie"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Mgła"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Głęboka woda"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Płytka woda"
+
+#: 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 "Wioska"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Płytka woda"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Lód"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Most"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Piasek"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Droga"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Błoto"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Łąka"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Cień"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Wzgórza"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Góry"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Las"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Ściana jaskini"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Jaskinia"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Zamek"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Obóz"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Krasnoludzkie pustkowie"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Forteca"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "brak"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menu"
@@ -2084,14 +2209,14 @@
 msgstr "Zakończ 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 "PÅ»"
 
 #: 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 "PD"
 
@@ -2172,33 +2297,28 @@
 "Dzień: -25% obrażeń\n"
 "Noc: +25% obrażeń"
 
-#: 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 ""
-"Leczy:\n"
-"Ta jednostka pomaga sąsiednim jednostkom odzyskać trochę zdrowia na począ
tku "
-"tury.\n"
+"Zasadzki:\n"
+"Ta jednostka umie chować się w lesie i być niewidoczną dla swoich 
wrogów.\n"
 "\n"
-"Jednostka pod opieką leczącego może odzyskać do 4 PŻ na turę.\n"
-"Leczący może rozdzielić maksymalnie 8 PŻ na turę pomiędzy wszystkich 
pod "
-"jego opieką.\n"
-"Zatruta jednostka nie zostanie wyleczona przez leczącego, musi szukać 
wioski "
-"albo uzdrowiciela."
+"Jednostki nieprzyjaciela nie mogą zaatakować tej jednostki w lesie, chyba 
że "
+"atakowała w poprzedniej turze, albo sąsiaduje z nią jednostka wroga."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "leczy"
+#: 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 "zasadzki"
 
-#: 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 "
@@ -2223,27 +2343,60 @@
 "Uzdrowiciel może wyleczyć z trucizny, ale wyleczona jednostka nie otrzyma "
 "poza tym żadnych punktów życia w danej turze. "
 
-#: 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 "uzdrawia"
 
-#: 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 ""
-"Teleportacja:\n"
-"Ta jednostka może się natychmiastowo przenieść z jednej przyjaznej wioski 
do "
-"drugiej."
+"Leczy:\n"
+"Ta jednostka pomaga sąsiednim jednostkom odzyskać trochę zdrowia na począ
tku "
+"tury.\n"
+"\n"
+"Jednostka pod opieką leczącego może odzyskać do 4 PŻ na turę.\n"
+"Leczący może rozdzielić maksymalnie 8 PŻ na turę pomiędzy wszystkich 
pod "
+"jego opieką.\n"
+"Zatruta jednostka nie zostanie wyleczona przez leczącego, musi szukać 
wioski "
+"albo uzdrowiciela."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleportacja"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "leczy"
 
-#: 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 ""
+"Oświetla:\n"
+"Ta jednostka oświetla otaczający ją obszar, sprawiając, że praworząde "
+"jednostki walczą lepiej, a chaotyczne gorzej.\n"
+"\n"
+"Jednostki w sąsiedztwie tej jednostki będą nocą walczyły jakby był 
wieczór, "
+"a wieczorem jakby był dzień."
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "oświetla,uzdrawia"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2258,7 +2411,7 @@
 "Sąsiadujące przyjazne jednostki niższego poziomu będą powodowały 
większe "
 "obrażenia w walce."
 
-#: 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
@@ -2267,55 +2420,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 "dowodzenie"
 
-#: 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 "Nigdy nie kosztuje więcej niż 1 punkt utrzymania"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Zasadzki:\n"
-"Ta jednostka umie chować się w lesie i być niewidoczną dla swoich 
wrogów.\n"
-"\n"
-"Jednostki nieprzyjaciela nie mogą zaatakować tej jednostki w lesie, chyba 
że "
-"atakowała w poprzedniej turze, albo sąsiaduje z nią jednostka wroga."
 
-#: 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 "zasadzki"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "nocne ukrywanie"
 
-#: 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 ""
-"Oświetla:\n"
-"Ta jednostka oświetla otaczający ją obszar, sprawiając, że praworząde "
-"jednostki walczą lepiej, a chaotyczne gorzej.\n"
-"\n"
-"Jednostki w sąsiedztwie tej jednostki będą nocą walczyły jakby był 
wieczór, "
-"a wieczorem jakby był dzień."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "oświetla,uzdrawia"
+#: 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 się"
 
-#: 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 "
@@ -2324,116 +2467,129 @@
 "Harcownik:\n"
 "Ta jednostka umie szybko wymijać swoich wrogów - ignoruje Strefy kontroli"
 
-#: 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 "harcownik"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Nigdy nie kosztuje więcej niż 1 punkt utrzymania"
-
-#: 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 "Ta jednostka otrzymuje połowę obrażeń, jeśli to nie ona 
zaatakowała"
 
-#: 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 "niezłomny"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teleportacja:\n"
+"Ta jednostka może się natychmiastowo przenieść z jednej przyjaznej wioski 
do "
+"drugiej."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleportacja"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "minimalne zniszczenie"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Gra"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scenariusz"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Konfiguruj strony:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Ustawienia drużyn:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Nie mogę się podłączyć do hosta"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Czekam na podłączenie innych graczy"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "pełny"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "dostępny"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Obserwator"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Opisz jednostkę"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Pełny ekran czy w oknie?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Ekran:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "W oknie"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Szybkość:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "normalna"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Ustawienia dźwięku..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Opcje"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Wybierz scenariusz"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr "Ten teren zachowuje się jak $terrains przy rozważaniu ruchu i obrony"
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Teren z najlepszym współczynnikiem jest wybierany automatycznie"
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Ten teren leczy."
 
-#: 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"
@@ -2441,25 +2597,25 @@
 "Ten teren pełni rolę twierdzy, tzn. jeśli tu stoi dowódca, to można "
 "rekrutować jednostki"
 
-#: 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 "Ten teren pełni rolę zamku, tzn. można na niego rekrutować 
jednostki"
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "albo"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Tabela odporności jednostek"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Patrz również..."
 
-#: 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 "
@@ -2469,13 +2625,17 @@
 "Ten atak powoduje podwójne obrażenia, jeśli po drugiej stronie celu 
znajduje "
 "się przyjazna jednostka."
 
-#: 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 "cios w plecy"
+#: 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"
+"Użyty defensywnie czy ofensywnie, powoduje trwanie walki aż do śmierci "
+"jednego z uczestników."
 
-#: 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 "
@@ -2485,14 +2645,7 @@
 "Ten atak powoduje podwójne obrażenia u przeciwnika, ale również sprawia, 
że "
 "jego kontratak powoduje podwójne obrażenia u atakującego."
 
-#: 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 "szarża"
-
-#: 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 "
@@ -2502,18 +2655,15 @@
 "Ta jednostka wysysa zdrowie z żywych przeciwników, uzdrawiając się na 
połowę "
 "spowodowanych obrażeń."
 
-#: 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 "wysysająca"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Pierwszy cios:\n"
+"Ta jednostka zawsze pierwsza atakuje, nawet gdy się broni."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2521,32 +2671,7 @@
 "Magiczny:\n"
 "Ten atak ma zawsze 70% szansy na trafienie."
 
-#: 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 "magiczna"
-
-#: 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."
@@ -2554,13 +2679,7 @@
 "Strzelec wyborowy:\n"
 "Ten atak, jeśli użyty ofensywnie, ma zawsze 60% szansy na trafienie."
 
-#: 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 "strzelec wyborowy"
-
-#: 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 "
@@ -2570,12 +2689,7 @@
 "Jeśli ta jednostka zabije żywego wroga, który nie znajdował się w 
wiosce, "
 "jego zwłoki powstaną, aby walczyć dla ciebie."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "zaraza"
-
-#: 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 "
@@ -2585,16 +2699,7 @@
 "Ten atak zatruwa cel. Zatrute jednostki tracą 8 PŻ na turę, dopóki nie "
 "zostaną uzdrowione, albo nie zostanie im tylko 1 PŻ."
 
-#: 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 "trucizna"
-
-#: 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 "
@@ -2605,15 +2710,7 @@
 "poruszają się z połową normalnej prędkości i mają jeden atak mniej 
niż "
 "normalnie."
 
-#: 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 "zwolnienie"
-
-#: 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 "
@@ -2623,197 +2720,90 @@
 "Ten atak obraca przeciwnika w kamień. Takie jednostki nie mogą się ruszać 
"
 "ani atakować."
 
-#: 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 "zamiana w kamień"
-
 #: 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"
-"Użyty defensywnie czy ofensywnie, powoduje trwanie walki aż do śmierci "
-"jednego z uczestników."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "berserker"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Pierwszy cios:\n"
-"Ta jednostka zawsze pierwsza atakuje, nawet gdy się broni."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "pierwszy cios"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfy"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orki"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Ludzie"
 
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Nieumarli"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Głęboka woda"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Płytka woda"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Piasek"
-
-#: 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 "Wioska"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Bagno"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Lód"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Droga"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Błoto"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Łąka"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Wzgórza"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Góry"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Las"
-
-#: 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 "Zamek"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Forteca"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Jaskinia"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Ściana jaskini"
-
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Obóz"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orki"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Nieumarli"
+
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "Most $name,Przeprawa $name"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "Gościniec $name,Droga $name,Ścieżka $name"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "Rzeka $name,Potok $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "Las $namet,Puszcza $name"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "Jezioro $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 "Las $namet,Puszcza $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
 #, fuzzy
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr "$name|ham,$name|ton,Las $name,Puszcza $name"
 
-#: 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 "Następna rada"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Dobra rada"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Nie pokazuj porad"
 
-#: 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."
@@ -2821,7 +2811,7 @@
 "Praworządne jednostki walczą lepiej za dnia, chaotyczne - w nocy. Na "
 "neutralne jednostki pora dnia nie ma wpływu."
 
-#: 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."
@@ -2829,7 +2819,7 @@
 "W kampanii możesz używać weteranów z poprzednich bitew używając opcji "
 "\"przywołaj\"."
 
-#: 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-"
@@ -2842,7 +2832,7 @@
 "myszy na jednostkę i wybierz \"Opis jednostki\", a potem kliknij na "
 "\"Odporność\", żeby zobaczyć, jak reaguje ona na różne rodzaje ataków."
 
-#: 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 "
@@ -2853,7 +2843,7 @@
 "podczas bitwy. Współczynnik obrony dla wybranej jednostki w wybranym 
terenie "
 "jest wyświetlony w górnym prawym rogu ekranu."
 
-#: 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 "
@@ -2865,7 +2855,7 @@
 "uleczyć, wprowadzając ją do wioski, albo stawiając koło jednostki 
zdolnej do "
 "uleczania."
 
-#: 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 "
@@ -2875,7 +2865,7 @@
 "gry. Przywołując co misję te same jednostki masz szanse stworzyć 
potężną i "
 "doświadczoną armię."
 
-#: 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 "
@@ -2885,7 +2875,7 @@
 "heksach. Jeśli jakaś jednostka wejdzie w Strefę kontroli przeciwnika, nie "
 "może już się więcej poruszać w tej turze."
 
-#: 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 "
@@ -2895,14 +2885,14 @@
 "ona stoi. Jednakże ataki magiczne zawsze mają 70% szans na powodzenie, a "
 "ataki strzelców wyborowych 60% szans."
 
-#: 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 ""
 "Jednostki stojące w wioskach odzyskują 8 punktów życia na początku 
swojej "
 "tury."
 
-#: 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."
@@ -2910,7 +2900,7 @@
 "Jednostki, które nie poruszą się, ani nie zaatakują, na początku 
następnej "
 "tury odzyskają 2 punkty życia."
 
-#: 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 "
@@ -2920,7 +2910,7 @@
 "innym terenie, podczas gdy jednostki konne nie mają żadnej przewagi przy "
 "obronie wiosek i zamków."
 
-#: 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 "
@@ -2929,7 +2919,7 @@
 "Jednostki konne są zazwyczaj odporne na ataki bronią sieczną lub obuchową
, "
 "ale czułe na broń kłującą, czyli na przykład łuki i włócznie."
 
-#: 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 "
@@ -2939,7 +2929,7 @@
 "doświadczenia. Jednostka zadająca ostateczny cios zyska 8 punktów "
 "doświadczenia za każdy poziom zabitego wroga."
 
-#: 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."
@@ -2947,7 +2937,7 @@
 "Elfickie jednostki świetnie ruszają się i walczą w lesie. Krasnoludzkie "
 "jednostki świetnie ruszają się i walczą w górach."
 
-#: 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."
@@ -2956,7 +2946,7 @@
 "zbyt małą armią, lepiej jest poczekać na polepszenie i dopiero wtedy "
 "kontynuować natarcie."
 
-#: 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."
@@ -2964,14 +2954,14 @@
 "Jeśli jesteś atakowany(a) z kilku stron równocześnie, dobrze jest 
wysłać "
 "trochę zbędnych jednostek w kilka kierunków, aby opóźnić marsz wroga."
 
-#: 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 ""
 "Nie obawiaj się wycofać i przegrupować, często właśnie w tym tkwi klucz 
do "
 "zwycięstwa."
 
-#: 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 "
@@ -2982,7 +2972,7 @@
 "zależną od ilości wiosek na mapie i od oszczędzonych tur. Zawsze zarobisz 
w "
 "ten sposób więcej niż przejmując wszystkie wioski i czekając aż minie 
czas."
 
-#: 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 "
@@ -2995,7 +2985,7 @@
 "sprzymierzeńcy mogą Ci ustąpić miejsca w swojej twierdzy, skąd również 
"
 "będzie można rekrutować."
 
-#: 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."
@@ -3003,7 +2993,7 @@
 "Szkielety są odporne na ataki kłujące i sieczne, ale czułe na broń 
obuchową, "
 "świętą oraz na ogień."
 
-#: 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."
@@ -3011,7 +3001,7 @@
 "Jednostki umiejące dowodzić sprawiają, że sąsiednie przyjazne jednostki "
 "niższego poziomu walczą lepiej."
 
-#: 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 "
@@ -3021,23 +3011,23 @@
 "zająć tę wioskę i zaatakować Cię, podczas gdy sam będzie korzystał z "
 "leczenia."
 
-#: 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 "Najedź myszką na zdolność albo cechę, a uzyskasz podpowiedź."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Używaj linii jednostek, aby zasłaniać ranne jednostki przed atakującym "
 "wrogiem, dając im w ten sposób czas na leczenie."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Przeczytaj listę skrótów klawiszowych w menu ustawień."
 
-#: 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'."
@@ -3045,7 +3035,7 @@
 "Jeśli poruszysz jednostkę, ale ani nie zaatakujesz, ani nie odkryjesz nic "
 "nowego, będziesz mógł(a) cofnąć ruch naciskając \"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."
@@ -3053,7 +3043,7 @@
 "Możesz sprawdzić, jak daleko może się poruszyć jednostka wroga 
najeżdżając "
 "na nią myszą."
 
-#: 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."
@@ -3061,7 +3051,7 @@
 "Używaj uzdrowicieli jako wsparcia dla Twoich ataków - bez atakowania "
 "kogokolwiek pomogą Ci odnieść zwycięstwo."
 
-#: 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 "
@@ -3072,11 +3062,11 @@
 "ataków, co jest szczególnie korzystne gdy mają ich tylko parę, ale za to "
 "potężnych."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Święte ataki są wyjątkowo skuteczne przeciw nieumarłym."
 
-#: 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."
@@ -3084,7 +3074,7 @@
 "Jednostki są uzdrawiane podczas awansu. Używaj rozważnie tej możliwości 
- "
 "dzięki niej możesz wygrać o wiele łątwiej."
 
-#: 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."
@@ -3118,7 +3108,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
@@ -3131,12 +3121,49 @@
 msgid "cold"
 msgstr "chłód"
 
+#: 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 "wysysająca"
+
 #: 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 "magiczna"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Pradawny Drzewiec"
@@ -3162,7 +3189,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
@@ -3170,19 +3197,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
@@ -3202,7 +3234,7 @@
 msgid "impact"
 msgstr "obuchowa"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Arcymag"
 
@@ -3218,6 +3250,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
@@ -3233,7 +3267,7 @@
 msgstr "kula ognista"
 
 #: 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
@@ -3245,12 +3279,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 "ogień"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Arcymag"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Skrytobójca"
@@ -3279,7 +3318,7 @@
 msgstr "sztylet"
 
 #: 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
@@ -3317,21 +3356,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
@@ -3339,16 +3379,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 "sieczna"
 
+#: 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 "cios w plecy"
+
 #: 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 "trucizna"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandyta"
@@ -3371,16 +3425,16 @@
 msgid "mace"
 msgstr "buzdygan"
 
-#: 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 "Księżniczka"
 
-#: 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 "dowodzenie,harcownik"
 
-#: 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 "
@@ -3394,7 +3448,7 @@
 "księżniczki będą walczyć lepiej dzięki jej obecności. Księżniczka 
jest "
 "doświadczonym harcownikiem i ignoruje wraże strefy kontroli."
 
-#: 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
@@ -3418,18 +3472,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 "miecz"
 
-#: data/units/Battle_Princess.cfg:57
+#: data/units/Battle_Princess.cfg:42 data/units/Princess.cfg:42
+msgid "Princess"
+msgstr "Księżniczka"
+
+#: 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 "
@@ -3443,9 +3501,9 @@
 "księżniczki będą walczyć lepiej dzięki jej obecności. Księżniczka 
jest "
 "doświadczonym harcownikiem i ignoruje wraże strefy kontroli."
 
-#: 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 "ognista szabla"
 
@@ -3540,7 +3598,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
@@ -3549,7 +3613,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
@@ -3557,7 +3621,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 "kłująca"
@@ -3630,6 +3694,14 @@
 msgid "web"
 msgstr "pajęczyna"
 
+#: 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 "zwolnienie"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Kościostruś"
@@ -3651,13 +3723,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 "włócznia"
 
+#: 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 "szarża"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Bazyliszek"
@@ -3677,6 +3760,11 @@
 msgid "gaze"
 msgstr "spojrzenie"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "zamiana w kamień"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Dowódca"
@@ -3752,10 +3840,11 @@
 msgstr "fala chłodu"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Mroczna królowa"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 #, fuzzy
 msgid ""
 "The evil queen mother Asheviere has terrorized Wesnoth for many years. Her "
@@ -3766,7 +3855,7 @@
 "Jej znajomość magii sprawia, że jest godnym przeciwnikiem w walce, choć "
 "większość jej potęgi pochodzi od tych, którymi dowodzi."
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "szabla"
 
@@ -4046,6 +4135,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 "pierwszy cios"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Smoczy wojownik"
@@ -4096,6 +4191,10 @@
 msgid "berserker frenzy"
 msgstr "szał berserkera"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "berserker"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr ""
@@ -4276,6 +4375,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Krasnoludzki 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 "Starszy mag"
@@ -4307,7 +4413,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 "Elficki Łucznik"
 
@@ -4321,7 +4427,12 @@
 "walce na odległość. Szybko i celnie wypuszczający strzały łucznicy 
stanowią "
 "poważną część elfickich armii."
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Elficki Łucznik"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Elficki mściciel"
 
@@ -4333,6 +4444,11 @@
 "seen in the woods until just after they have attacked."
 msgstr "Elficcy mściciele"
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Elficki mściciel"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Elficki kapitan"
@@ -4362,7 +4478,8 @@
 "co sprawia, że już z daleka sieją zniszczenie."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Elficki Druid"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4385,7 +4502,7 @@
 
 #: data/units/Elvish_Enchantress.cfg:3
 #, fuzzy
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr "Elficki Szaman"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4447,10 +4564,18 @@
 "daleka strzelają kulami ognia."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Elficka pani"
 
 #: 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 "zamiana w kamień"
@@ -4467,7 +4592,7 @@
 "Elficcy władcy są potężni w walce: z bliska atakują mieczem, z daleka "
 "strzelają kulami ognia."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Elficki strzelec wyborowy"
 
@@ -4489,6 +4614,17 @@
 msgid "longbow"
 msgstr "długi łuk"
 
+#: 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 "strzelec wyborowy"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Elficki strzelec wyborowy"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Elficki marszałek"
@@ -4518,7 +4654,7 @@
 "Mknący na skrzydłach wiatru Elficcy forysie z łatwością przemykają 
przez "
 "lasy, by atakować słabsze jednostki i niebronione flanki."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Elf obieżyświat"
 
@@ -4534,6 +4670,11 @@
 "umie tak się zaszyć, że wrogowie widzą go tylko po tym, jak zaatakuje, 
lub "
 "gdy stoją tuż koło niego."
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Elf obieżyświat"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Elficki Jeździec"
@@ -4559,7 +4700,8 @@
 "umiejętności jeździeckie są niedoścignione, choć brak im siły w walce."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Elficki Szaman"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4572,7 +4714,7 @@
 "przeciwników. Ich oplątujące ataki spowalniają wrogów i zmniejszają o 
jeden "
 "ilość ich ataków. Szamani mogą też leczyć."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Elficki strzelec wyborowy"
 
@@ -4588,8 +4730,14 @@
 "trafienia. Strzelcy wyborowi świetnie nadają się do likwidowania 
umocnionych "
 "jednostek."
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Elficki strzelec wyborowy"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Elfia wróżka"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4608,7 +4756,7 @@
 
 #: data/units/Elvish_Sorceress.cfg:3
 #, fuzzy
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr "Elficki Łucznik"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4621,7 +4769,7 @@
 
 #: data/units/Elvish_Sylph.cfg:3
 #, fuzzy
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr "Elfia wróżka"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4727,7 +4875,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 "atrapa"
 
@@ -4836,12 +4992,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 "pierwszy cios"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Gobliński rycerz"
@@ -4871,7 +5021,8 @@
 msgid "torch"
 msgstr "pochodnia"
 
-#: 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 "sieć"
 
@@ -4919,7 +5070,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 "Wielki Mag"
 
@@ -4931,17 +5082,15 @@
 "Wielcy magowie są wspaniałymi i siejącymi strach przeciwnikami, o mocy "
 "większej nawet niż sami Arcymagowie."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Wielki Mag"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Wielki 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 się"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -5155,7 +5304,7 @@
 "wręcz, choć posiadają i łuk. Tak jak Dowódcy, Władcy mają zdolności "
 "przywódcze i zwiększają możliwości sąsiednich jednostek niższego 
poziomu."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Mag"
 
@@ -5174,11 +5323,16 @@
 msgid "missile"
 msgstr "pocisk"
 
-#: 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 "Mag Światła"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "oświetla,uzdrawia"
 
@@ -5200,16 +5354,23 @@
 "Biali magowie, Magowie światła również uzdrawiają sąsiednie jednostki."
 
 #: 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 "promień światła"
 
 #: 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 "święta"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Mag Światła"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Mistrz łuczników"
@@ -5224,11 +5385,28 @@
 "łukiem, o jakim człowiek może marzyć. Ich kunszt z tą morderczą bronią 
jest "
 "przewyższany tylko przez elfów."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Mermen"
+#: 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 "Elficki Szaman"
 
-#: 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."
@@ -5236,11 +5414,98 @@
 "Mermeni, umiejętne morskie stworzenia, są silni i szybcy w środowisku "
 "wodnym, ale ledwie sobie radzą na lądzie."
 
-#: 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 "pryśnięcie wodą"
+
+#: 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 "dotyk wróżki"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Mermen"
+
+#: 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 "trójząb"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "oplątanie"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Smoczy wojownik"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Mermen"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Mermen"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Sauryjski wojownik"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Włócznik"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Tłumaczenie niemieckie"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Sauryjski wojownik"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Błotniak"
@@ -5254,8 +5519,8 @@
 "przeciwników strumieniem wody."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5305,10 +5570,6 @@
 "czystego zła. Te horrendalne stwory chowają się w nocy nie pozostawiając "
 "nawet śladu po swej obecności"
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "nocne ukrywanie"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Szlachetny dowódca"
@@ -5351,7 +5612,7 @@
 msgid "Ogre"
 msgstr "Ogr"
 
-#: 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 "
@@ -5471,7 +5732,7 @@
 "dobrymi magami i mogą przekląć wrogów, wysączając ich życie."
 
 #: 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 "klątwa"
 
@@ -5576,7 +5837,7 @@
 "postrach wśród wrogów. Jedyną ich słabością jest nieumiejętność 
obchodzenia "
 "się z łukiem."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Bandyta"
 
@@ -5584,12 +5845,18 @@
 msgid "Outlaws fight better at night."
 msgstr "Wyrzutkowie lepiej walczą w nocy."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Bandyta"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr "Bandyci lepiej walczą nocą. Kobiety bandyci dobrze przy tym wyglą
dają."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Księżniczka bandytów"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5605,7 +5872,8 @@
 "królestwa na ziemi kupionej za swoje łupy."
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Królowa bandytów"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5682,7 +5950,14 @@
 msgid "Pirate Galleon"
 msgstr "Piracki 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 "balista"
@@ -5699,7 +5974,7 @@
 "Kłusownicy polegają na swoim doświadczeniu wyniesionym z polowań i są "
 "szczególnie użyteczni nocą, w lasach i na bagnach."
 
-#: 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 "
@@ -5713,7 +5988,7 @@
 "będą walczyły lepiej dzięki jej wsparciu. Księżniczka jest też zwinna 
i "
 "gibka, ze zdolnościami złodziejskimi."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Czerwony Mag"
 
@@ -5727,6 +6002,11 @@
 "celność. Są to zwinni i zdolni wojownicy zarówno w dzień jak i w nocy. "
 "Czerwoni magowie są przydatni we wszystkich sytuacjach."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Czerwony Mag"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Powracający"
@@ -5845,13 +6125,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 "Wiedźma morska"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5862,10 +6143,6 @@
 "Wiedźmy morskie to starsze i bardziej doświadczone istoty mórz, które "
 "opanowały magię wody."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "pryśnięcie wodą"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Morski ork"
@@ -5938,7 +6215,7 @@
 "jest niesłychanie potężna i z tego powodu sieje postrach we wszystkich "
 "częściach Wesnoth."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Srebrny mag"
 
@@ -5953,10 +6230,24 @@
 "natychmiastowo zmnieniając swoją pozycję. Są również bardzo odporni na 
ataki "
 "magiczne."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Srebrny mag"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Smoczy szkielet"
 
+#: 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 "szczęka"
@@ -6025,6 +6316,10 @@
 "Te ruszające się żywe trupy stały się silniejsze dzięki dużemu 
doświadczeniu "
 "w walce z żywymi."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "zaraza"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Włócznik"
@@ -6226,10 +6521,11 @@
 "wzmacnia nietoperze."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Wampirzyca"
 
-#: 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."
@@ -6237,7 +6533,7 @@
 "Zimna i piękna Wampirzyca zachowuje wiecznie młody wygląd dzięki wypitej "
 "krwi żywych istot."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "krwisty pocałunek"
 
@@ -6302,7 +6598,7 @@
 "Wieże strażnicze służą do wypatrywania wrogów i zarzucania ich 
kamieniami z "
 "balist."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Biały Mag"
 
@@ -6318,6 +6614,11 @@
 "magowie są nieocenioną pomocą w zwalczaniu nieumarłych - bardzo 
wrażliwych "
 "na ich promienie światła."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Biały Mag"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Jeździec Wilków"
@@ -6530,7 +6831,7 @@
 msgid "+ Bots"
 msgstr "+Boty"
 
-#: 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 "Zamknij"
 
@@ -6552,73 +6853,73 @@
 msgid "none"
 msgstr "brak"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "obrażenia podstawowe"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "odporność atakującego na"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "czułość atakującego na"
 
-#: 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 "Podwojone"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "suma obrażeń"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "odporność obrońcy na"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "czułość obrońcy na"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Zmniejszona o połowę"
 
-#: 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 "zatruty"
 
-#: 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 "spowolniony"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Złapany w zasadzkę!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Zauważono przyjazną jednostkę"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Zauważono jednostkę wroga!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "Zauważono $friends przyjaznych(e) jednostek(i)"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "Zauważono $enemies wrogich(ie) jednostek(i)."
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Zauważono jednostki! ($friends przyjaznych, $enemies wrogich)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(wciśnij $hotkey aby kontynuować)"
 
@@ -6678,7 +6979,7 @@
 msgid "replay"
 msgstr "powtórka"
 
-#: 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 "Tura"
 
@@ -6744,23 +7045,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 "poziom"
 
-#: 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 "wręcz"
 
-#: 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 odległość"
 
@@ -6780,11 +7081,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Czy zapisać przebieg tej misji?"
 
-#: 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 "Imię:"
 
-#: 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 "Gra nie może zostać zachowana"
 
@@ -6850,8 +7151,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 "Błąd"
 
@@ -6921,7 +7222,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 "Minął czas oczekiwania połączenia"
 
@@ -6983,7 +7284,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"
 
@@ -7007,79 +7308,79 @@
 "Nie można uruchomić fontów. Wychodzę. (Could not initialize fonts. "
 "Exiting.)\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Awansuje na"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Charakter"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Wymagane PD"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "ataki"
 
-#: 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 "Imię"
 
-#: 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 "Obr"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Ciosy"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Na odl"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Specjalna"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Odporności"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Rodzaj ataku"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Odporność"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Modyfikatory terenowe"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Teren"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Obrona"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Wróć"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Dalej >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "System pomoc Bitwy o Wesnoth"
 
@@ -7091,7 +7392,7 @@
 msgid "End Unit Turn"
 msgstr "Zakończ ruch jednostki"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Dowódca"
 
@@ -7127,11 +7428,11 @@
 msgid "Unit Description"
 msgstr "Opis jednostki"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Przemianuj jednostkę"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Rekrutuj"
 
@@ -7139,7 +7440,7 @@
 msgid "Repeat Recruit"
 msgstr "Powtórz rekrutację"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Przywołaj"
 
@@ -7175,11 +7476,11 @@
 msgid "Scenario Objectives"
 msgstr "Cele misji"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Lista jednostek"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statystyki"
 
@@ -7287,7 +7588,7 @@
 msgid "Speak to All"
 msgstr "Mów do wszystkich"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Pomoc"
 
@@ -7347,7 +7648,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 "Wioski"
 
@@ -7397,15 +7698,11 @@
 "Jednostki wroga są niewidoczne, jeśli nie są w zasięgu wzroku którejś z 
"
 "własnych jednostek"
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Mgła"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "Mapa jest nieznana, dopóki któraś z własnych jednostek jej nie 
zbada"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Obserwatorzy"
 
@@ -7413,13 +7710,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Pozwala ludziom którzy nie grają obserwować grę"
 
-#: 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 "Anuluj"
 
-#: 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"
 
@@ -7495,71 +7792,71 @@
 msgid "Warning"
 msgstr "Uwaga"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Odbieranie listy gier..."
 
-#: 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 "Złoto"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Oczekiwanie na początek gry..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Kontynuuj ruch"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Wybierz serwer do połączenia"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Łączenie z serwerem..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Musisz się zalogować na ten serwer"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Pobieranie danych gry..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Nie ma dostępnych stron w tej grze."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Wybierz swoją stronę"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Gra została odwołana"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Wybrana strona nie jest już dostępna"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Czy pokazać przebieg gry do momentu zachowania?"
 
-#: 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 "Dowódca"
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 #, fuzzy
 msgid "Recruits: "
 msgstr "Rekrutacji"
@@ -7592,8 +7889,8 @@
 msgid "Local Player"
 msgstr "Gracz lokalny"
 
-#: 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 "Komputer"
 
@@ -7658,7 +7955,7 @@
 msgid "Color"
 msgstr "Kolor"
 
-#: 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 "Oczekiwanie na graczy sieciowych"
 
@@ -7743,53 +8040,53 @@
 msgid "It is now your turn"
 msgstr "Nadeszła Twoja tura"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Atakujący"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Broniący się"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Wyliczenia obrażeń"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Wręcz"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "kontra"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Atakowanie nieprzyjaciela"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Wybór broni"
 
-#: 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 "Jeszcze nie rozpocząłeśaś(aś) tury. Czy chcesz ją już 
zakończyć?"
 
-#: 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 ""
 "Niektóre jednostki wciąż mogą się poruszyć. Czy na pewno zakończyć 
już turę?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Autozapis"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr "Nie da się automatycznie zapisać gry. Proszę zapisać grę 
ręcznie."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -7797,62 +8094,62 @@
 "Zapisane gry nie mogą zawierać dwukropków, slashy ani backslashy. Proszę "
 "wybrać inną nazwę."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Zapisano"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Gra została zapisana"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Dochód"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Utrzymanie"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Nie ma dostępnych jednostek do rekrutacji."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Wybierz jednostkę"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Niewystarczające złoto, żeby rekrutować tę jednostkę"
 
-#: 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 ""
 "Panie, to doświadczona jednostka, po awansach! Czy naprawdę $noun zwolnić?"
 
-#: 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 "Panie, ta jednostka wkrótce awansuje! Czy naprawdę $noun zwolnić?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "ją"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "go"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 #, fuzzy
 msgid "You are separated from your soldiers and may not recall them"
 msgstr ""
 "Zostałeś oddzielony(a) od swojej armii i nie możesz przywoływać 
jednostek"
 
-#: 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)"
@@ -7860,88 +8157,88 @@
 "Nie ma jednostek do przywołania\n"
 "(Musisz mieć jakieś jednostki pozostałe z poprzednich misji)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 #, fuzzy
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "sztuk złota, żeby przywołać jednostkę"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Oddal jednostkę"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Wiadomość"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Wyślij tylko do sprzymierzeńców"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Miejsce"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Rekrutacji"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Przywołań"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Awansów"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Strat"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Zabitych"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Zadane obrażenia"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Otrzymane obrażenia"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Zadane obrażenia (EV)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Zadane obrażenia (EV)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Szukaj"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "prompt^Polecenie:"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Zapis rozmów"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "Nie znaleziono opisu ani jednostki zawierającej '$search'."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Umieść opis"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Opis"
 
-#: 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?"
@@ -7949,23 +8246,23 @@
 "Gry przestały być skoordynowane i konieczne jest wyjście. Zapisać raport "
 "błędów tej gry?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Zastąp przez AI"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Zastąp lokalnym graczem"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Opuść grę"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Zastąp przez"
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "opuścił(a) grę. Co teraz?"
 
@@ -8027,66 +8324,66 @@
 msgid "Chaotic units"
 msgstr "Jednostki chaotyczne"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 #, fuzzy
 msgid "Owned village"
 msgstr "Wioska"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 #, fuzzy
 msgid "Enemy village"
 msgstr "Wioska"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 #, fuzzy
 msgid "Allied village"
 msgstr "Gobliński plądrownik"
 
-#: 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 "Wersja"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Główne menu^Ćwiczenia"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Główne menu^Kampania"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Główne menu^Gra z innymi"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Główne menu^Zapisane gry"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Główne menu^Język"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Główne menu^Ustawienia"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Główne menu^Wyjście"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Rozpoczyna grę instruktażową pozwalającą opanować zasady"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Rozpoczyna kampanię jednoosobową"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -8094,31 +8391,31 @@
 "Rozpoczyna grę wieloosobową (przy jednym komputerze, przez LAN albo "
 "Internet) albo pojedynczą bitwę przeciw AI"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Ładuje grę jednoosobową"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Pozwala wybrać język gry"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Pozwala na zmianę ustawień"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Wyświetla nazwiska twórców gry"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Wychodzi z gry"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Więcej"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Starożytna księga Wesnoth"
 
@@ -8126,15 +8423,15 @@
 msgid "strikes"
 msgstr "ciosy"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "chaotyczny"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "praworządny"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutralny"
 
@@ -8146,6 +8443,18 @@
 msgid "Deletion of the file failed."
 msgstr "Kasowanie pliku się nie powiodło."
 
+#~ msgid "first strike"
+#~ msgstr "pierwszy cios"
+
+#~ msgid "Swamp"
+#~ msgstr "Bagno"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Załóż własną grę"
 
Index: wesnoth/po/wesnoth/pt_BR.po
diff -u wesnoth/po/wesnoth/pt_BR.po:1.8 wesnoth/po/wesnoth/pt_BR.po:1.9
--- wesnoth/po/wesnoth/pt_BR.po:1.8     Sun Oct 17 12:52:55 2004
+++ wesnoth/po/wesnoth/pt_BR.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:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-09-11 21:11+0200\n"
 "Last-Translator: Automatically generated\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 "fiel"
 
@@ -48,11 +48,11 @@
 msgid "Traits"
 msgstr "Características"
 
-#: 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"
 
@@ -196,7 +196,7 @@
 "como tambem para mantêlas durante o combate. Veja <ref>dst=income_and_upkeep 
"
 "text='Receita e Gastos'</ref> para mais informação."
 
-#: 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 "Movimento"
 
@@ -617,7 +617,7 @@
 "sabe tudo o que precisa para jogar a campanha Herdeiro do Trono. Divirta-se, "
 "e boa sorte!"
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr "Sobre"
 
@@ -931,7 +931,7 @@
 msgstr "Padrão"
 
 #: 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,Aleatório"
 
@@ -1054,6 +1054,24 @@
 msgid "Random map"
 msgstr "Mapa aleatório"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Mapa aleatório"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Mapa aleatório"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Mapa aleatório"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -1100,7 +1118,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 "Não"
 
@@ -1712,7 +1730,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 "Sim"
 
@@ -2303,6 +2321,113 @@
 msgid "Underground"
 msgstr "Subsolo"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Escuridão"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Águas profundas"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Águas rasas"
+
+#: 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 "Águas rasas"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Gelo"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Ponte"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Areia"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Estrada"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Terra Batida"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Pradaria"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Sombra"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Colinas"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Montanhas"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Floresta"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Parede de Caverna"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Caverna"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Castelo"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Acampamento"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Desolados dos Anões"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Forte"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "nada"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menu"
@@ -2316,14 +2441,14 @@
 msgstr "Termina o 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 "XP"
 
@@ -2399,32 +2524,30 @@
 "Dia: -25% do dano\n"
 "Noite: +25% do dano"
 
-#: 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 ""
-"Tratar:\n"
-"Permite a unidade tratar as feridas de unidades amigas adjacentes no começo "
-"do turno.\n"
-"Uma unidade tratada pode curar 4 PV por turno.\n"
-"Um unidade com tratar pode curar um total de 8 PV por turno, para todas as "
-"unidades das quais esta cuidando.\n"
-"Uma unidade envenenada não pode ser curada de seu veneno por uma unidade com 
"
-"tratar, e deve procurar o cuidade de uma vila, ou de uma unidade curandeira."
+"Cilada:\n"
+"Esta unidade pode se esconder na floresta, e se manter desconhecida por seus "
+"inimigos.\n"
+"\n"
+"Unidades inimigas não podem ver ou atacar esta unidade quando ela está na "
+"floresta, exceto por qualquer turno imediatamente após esta unidade ter "
+"atacado, ou se houverem unidades inimigas próximas à esta unidade."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "tratamento"
+#: 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 "emboscada"
 
-#: 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 "
@@ -2449,27 +2572,60 @@
 "Um curandeiro também pode curar o veneno de uma outra unidade, embora essa "
 "unidade não recuperará pontos de vida no turno em que é curada do veneno."
 
-#: 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 ""
-"Teleporte:\n"
-"Esta unidade pode teleportar entre quaisquer duas vilas aliadas "
-"instantaneamente."
+"Tratar:\n"
+"Permite a unidade tratar as feridas de unidades amigas adjacentes no começo "
+"do turno.\n"
+"Uma unidade tratada pode curar 4 PV por turno.\n"
+"Um unidade com tratar pode curar um total de 8 PV por turno, para todas as "
+"unidades das quais esta cuidando.\n"
+"Uma unidade envenenada não pode ser curada de seu veneno por uma unidade com 
"
+"tratar, e deve procurar o cuidade de uma vila, ou de uma unidade curandeira."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleporte"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "tratamento"
 
-#: 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 ""
+"Ilumina:\n"
+"Esta unidade ilumina a área ao seu redor, fazendo unidades ordeiras lutarem "
+"melhor, e unidades caóticas lutarem pior.\n"
+"\n"
+"Quaisquer unidades adjacentes a este unidade lutarão como se fosse "
+"entardecer caso seja noite, e como se fosse dia caso seja o amanhecer ou "
+"entardecer."
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "ilumina, cura"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2483,7 +2639,7 @@
 "Unidades aliadas adjacentes de nívei menor que a unidade líder causarão 
mais "
 "dano em batalha."
 
-#: 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
@@ -2492,58 +2648,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 "liderança"
 
-#: 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 "Nunca mais que 1 de manutenção"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Cilada:\n"
-"Esta unidade pode se esconder na floresta, e se manter desconhecida por seus "
-"inimigos.\n"
-"\n"
-"Unidades inimigas não podem ver ou atacar esta unidade quando ela está na "
-"floresta, exceto por qualquer turno imediatamente após esta unidade ter "
-"atacado, ou se houverem unidades inimigas próximas à esta unidade."
 
-#: 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 "emboscada"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "Caçador noturno"
 
-#: 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"
-"Esta unidade ilumina a área ao seu redor, fazendo unidades ordeiras lutarem "
-"melhor, e unidades caóticas lutarem pior.\n"
-"\n"
-"Quaisquer unidades adjacentes a este unidade lutarão como se fosse "
-"entardecer caso seja noite, e como se fosse dia caso seja o amanhecer ou "
-"entardecer."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "ilumina, cura"
+#: 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 "
@@ -2553,118 +2696,131 @@
 "Esta unidade é capaz de passar pelos inimigos rapidamente, e ignora todas as 
"
 "Zonas de Controle inimigas "
 
-#: 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 "combatente"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Nunca mais que 1 de manutenção"
-
-#: 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 ""
 "Esta unidade toma metade do dano normal quando ela não começou o ataque."
 
-#: 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 "posição defensiva"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teleporte:\n"
+"Esta unidade pode teleportar entre quaisquer duas vilas aliadas "
+"instantaneamente."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleporte"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "dano mínimo"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Jogo"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Cenário"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Configure os lados:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Escolha a configuração dos times:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Não foi possível se conectar ao host remoto"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Esperando outros jogadores conectarem"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Cheio"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Disponível"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Espectador"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Descrever Unidade"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Tela Inteira ou em janela?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Aparência:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Em janela"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: 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 "Configuração de Som..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Opções"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Escolha o Cenário"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 "Este terreno funciona como $terreno para propósitos de movimento e defesa"
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "O terreno com o melhor modificador é escolhido automaticamente"
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Este terreno cura"
 
-#: 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"
@@ -2672,7 +2828,7 @@
 "Este terreno funciona como um forte, ou seja, um lado pode recrutar unidades "
 "quando seu líder estiver neste terreno"
 
-#: 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"
@@ -2680,19 +2836,19 @@
 "Este terreno funciona como um castelo, ou seja, unidades recrutadas aparecem "
 "nos locais com este terreno"
 
-#: data/translations/english.cfg:109 src/help.cpp:874
+#: data/translations/english.cfg:121 src/help.cpp:852
 msgid "or"
 msgstr "ou"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Tabela de resistência da unidade"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Veja também..."
 
-#: 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 "
@@ -2702,13 +2858,17 @@
 "Este ataque causa o dobro de dano se uma unidade aliada estiver do lado "
 "oposto do alvo."
 
-#: 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 "golpe por trás"
+#: 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 ""
+"Fúria:\n"
+"Sempre que usada ofensivamente ou defensivamente, este ataque mantém o "
+"combate até que um dos combatentes morra."
 
-#: 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 "
@@ -2718,14 +2878,7 @@
 "Este ataque causa o dobro de dano ao alvo. Ele também faz com que esta "
 "unidade tome o dobro de dano do contra ataque do alvo."
 
-#: 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 "
@@ -2735,18 +2888,16 @@
 "Esta unidade drena a energia de unidades vivas, recuperando um número de "
 "pontos de vida igual a metade do dano que ela causar."
 
-#: 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 "dreno"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Iniciativa:\n"
+"Esta unidade sempre ataca primeiro com este ataque, mesmo que ela esteja se "
+"defendendo."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2754,32 +2905,7 @@
 "Mágico:\n"
 "Este ataque sempre tem 70% de chance de acertar."
 
-#: 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."
@@ -2788,13 +2914,7 @@
 "Quando usado ofensivamente, este ataque sempre tem pelo menos 60% de chance "
 "de acertar."
 
-#: 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 "atirador"
-
-#: 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 "
@@ -2804,12 +2924,7 @@
 "Se esta unidade mata uma unidade viva, e essa não estava em uma vila, o "
 "corpo da unidade morta retornará para lutar pelo lado da unidade que a 
matou."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "peste"
-
-#: 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 "
@@ -2819,16 +2934,7 @@
 "Este ataque envenena o alvo. Unidades envenenadas perem 8 PV todo turno até "
 "que elas sejam curadas ou fiquem só com 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 "
@@ -2839,15 +2945,7 @@
 "velocidade normal, e fazem um golpe a menos que o normal em combate até o "
 "próximo 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 "lentidão"
-
-#: 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 "
@@ -2857,199 +2955,91 @@
 "Este ataque transforma o alvo em pedra. Unidades petreficadas não podem se "
 "mover ou 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 "petrefica"
-
 #: 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 ""
-"Fúria:\n"
-"Sempre que usada ofensivamente ou defensivamente, este ataque mantém o "
-"combate até que um dos combatentes morra."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "fúria"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Iniciativa:\n"
-"Esta unidade sempre ataca primeiro com este ataque, mesmo que ela esteja se "
-"defendendo."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "iniciativa"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfos"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orcs"
-
-#: 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 "Orcs"
+
+#: data/translations/english.cfg:165
 msgid "Undead"
 msgstr "Mortos Vivos"
 
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Águas profundas"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Águas rasas"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Areia"
-
-#: 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 "Pântano"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Gelo"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Estrada"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Terra Batida"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Pradaria"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Colinas"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Montanhas"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Floresta"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Ponte"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Castelo"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Forte"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Caverna"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Parede de Caverna"
-
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Acampamento"
-
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "Ponte de $name, Encruzilhada de $name"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "Estrada de $name, "
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "Rio de $name, Rio $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "Floresta $name, Floresta de $name"
 
-#: 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 "$name|burgo,$name|ópolis,$name|lândia"
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "Floresta $name, Floresta de $name"
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr ",$name|ópolis,$name|lândia,$name|í,$river|íuna,$river|í"
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr "$river|bridge,$river|bridge,$river|bridge,$name|ópolis,$name|bridge"
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr "$name|ópolis,$name|lândia,$name|ville"
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr "$name|ópolis,$name|lândia,$name|na,$name da Floresta"
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr "$name|ópolis, $name|burgo,$name|lândia,$name|lina,Monte $name"
 
-#: 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|ópolis,$name|burgo,$name|lândia,$name|monte,Quedas de $name,Quedas de 
"
 "$name"
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Próxima dica"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Dica de hoje"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Não mostrar dicas"
 
-#: 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."
@@ -3057,7 +3047,7 @@
 "Unidades ordeiras lutam melhor de dia, e unidades caóticas lutam melhor à "
 "noite. Unidades neutras não são afetadas pelo dia ou pela noite."
 
-#: 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."
@@ -3065,7 +3055,7 @@
 "Em uma campanha, você pode usar unidades veteranas de cenários anteriores "
 "através do comando 'convocar'."
 
-#: 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-"
@@ -3079,7 +3069,7 @@
 "Unidade', e clique em 'Resistência' para ver quanta resistência uma unidade 
"
 "tem contra diferentes tipos de ataques."
 
-#: 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 "
@@ -3090,7 +3080,7 @@
 "tem de acertá-las em batalha. A taxa de defesa para a unidade selecionada no 
"
 "terreno selecionado é exibida no canto superior direito da tela."
 
-#: 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 "
@@ -3102,7 +3092,7 @@
 "para menos de 1. Unidades envenenadas podem se curar ficando em uma vila, ou "
 "próximas a uma unidade com a habilidade de 'cura'."
 
-#: 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 "
@@ -3112,7 +3102,7 @@
 "do jogo. Convocando as mesmas unidades toda batalha, você construirá um "
 "poderoso e experiente exército."
 
-#: 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 "
@@ -3122,7 +3112,7 @@
 "uma unidade se move para a Zona de Controle de um inimigo, ela não pode mais 
"
 "se mover naquele 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 "
@@ -3133,13 +3123,13 @@
 "sempre tem 70% de chance de acertar, e atiradores de elite têm pelo menos "
 "60% de chance de acertar."
 
-#: 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 ""
 "Unidades paradas em vilas curam 8 pontos de vida no início de seu 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."
@@ -3147,7 +3137,7 @@
 "Unidades que não se movam ou ataquem durante seu turno curam 2 pontos de "
 "vida no início do próximo turno devido ao descanso."
 
-#: 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 "
@@ -3157,7 +3147,7 @@
 "outros terrenos, enquanto a maioria das unidades montadas não tem nenhuma "
 "vantagem defensiva em vilas e castelos."
 
-#: 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 "
@@ -3167,7 +3157,7 @@
 "ou de impacto, mas são vulneráveis a ataques com armas perfurantes, como "
 "arcos e lanças."
 
-#: 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 "
@@ -3177,7 +3167,7 @@
 "experiência. Unidades que matem um inimigo ganham 8 pontos de experiência "
 "para casa nível da unidade que derrotarem."
 
-#: 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."
@@ -3185,7 +3175,7 @@
 "Unidades élficas se movem e lutam bem na floresta. Unidades anãs se movem e 
"
 "lutam bem nas colinas e montanhas."
 
-#: 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."
@@ -3193,7 +3183,7 @@
 "Em geral, paciência é a chave. Ao invés de atacar em condições ruins, ou 
com "
 "poucas tropas, espere por melhores condições antes de atacar."
 
-#: 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."
@@ -3202,14 +3192,14 @@
 "mandar 'buchas de canhão' em algumas das frontes para atrasar as forças "
 "inimigas "
 
-#: 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 ""
 "Não tenha medo de recuar para se recuperar, isso é em geral a chave da "
 "vitória."
 
-#: 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 "
@@ -3221,7 +3211,7 @@
 "mais cedo. Você sempre ganhará mais ouro por esse bônus do que se 
capturasse "
 "todas as vilas e ficasse esperanto até o último turno."
 
-#: 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 "
@@ -3233,7 +3223,7 @@
 "castelo de um oponente, e recrutar de lá. Além disso, alguns de seus 
aliados "
 "podem dar-lhe espaço para que você recrute a partir do forte deles."
 
-#: 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."
@@ -3241,7 +3231,7 @@
 "Esqueletos são resistentes a ataques perfurantes e cortantes, mas "
 "vulneráveis a ataques de impacto, fogo e sagrados."
 
-#: 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."
@@ -3249,7 +3239,7 @@
 "Unidades com a habilidade de liderança fazem com que unidades próximas de "
 "nível mais baixo lutem melhor."
 
-#: 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 "
@@ -3259,7 +3249,7 @@
 "pode entrar nessa vila e te atacar, enquanto se beneficia da defesa e cura "
 "que a vila proporciona."
 
-#: 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."
@@ -3267,17 +3257,17 @@
 "Deixando o cursor do mouse em uma habilidade ou característica mostra uma "
 "descrição da habilidade ou característica."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Use linhas de unidades para defender unidades feridas e deixá-las se "
 "recuperar"
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Aprenda a lista de teclas de atalho no menu de preferências."
 
-#: 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'."
@@ -3285,7 +3275,7 @@
 "Se você mover uma unidade, mas não atacar ou descobrir alguma informacão "
 "extra, você pode desfazer seu movimento apertando '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."
@@ -3293,7 +3283,7 @@
 "Você pode ver a distância que unidades inimigas podem alcançar movendo o "
 "cursor do mouse sobre elas."
 
-#: 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."
@@ -3301,7 +3291,7 @@
 "Use unidades com poder de cura para ajudar seus avanços - elas vão garantir 
"
 "sua vitória sem precisar atacar ninguém."
 
-#: 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 "
@@ -3311,11 +3301,11 @@
 "diminui o número de golpes que ele normalmente faria. Logo ele é muito "
 "efetivo contra unidades com poucos ataques poderosos."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Ataques sagrados são poderosos contra mortos vivos."
 
-#: 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."
@@ -3323,7 +3313,7 @@
 "Unidades se curam completamente quando passam de nível. Se usada "
 "corretamente, esta característica pode virar uma batalha."
 
-#: 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."
@@ -3356,7 +3346,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
@@ -3369,12 +3359,49 @@
 msgid "cold"
 msgstr "frio"
 
+#: 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 "dreno"
+
 #: 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 Ancestral"
@@ -3404,7 +3431,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
@@ -3412,19 +3439,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
@@ -3444,7 +3476,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 "Arquimago"
 
@@ -3462,6 +3494,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
@@ -3477,7 +3511,7 @@
 msgstr "bola de fogo"
 
 #: 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
@@ -3489,12 +3523,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 "fogo"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Arquimago"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Assassino"
@@ -3522,7 +3561,7 @@
 msgstr "adaga"
 
 #: 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
@@ -3560,21 +3599,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
@@ -3582,16 +3622,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 "cortante"
 
+#: 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 "golpe por trás"
+
 #: data/units/Assassin.cfg:47 data/units/Rogue.cfg:38
 msgid "knife"
 msgstr "faca"
 
+#: 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"
@@ -3617,16 +3671,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 "liderança,combatente"
 
-#: 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 "
@@ -3638,7 +3692,7 @@
 "uma grande combatente quanto líder. Experiente em combate e forte de "
 "espírito, ela pode ajudar aqueles ao redor dela na arte do combate."
 
-#: 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
@@ -3662,18 +3716,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 "
@@ -3687,9 +3745,9 @@
 "princesa lutarão melhor devido à sua presença. A princessa é uma exímia "
 "combatente, e ignora zonas de controle inimigas."
 
-#: 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 fogo"
 
@@ -3783,7 +3841,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
@@ -3792,7 +3856,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
@@ -3800,7 +3864,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 "perfurante"
@@ -3874,6 +3938,14 @@
 msgid "web"
 msgstr "teia"
 
+#: 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 "lentidão"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Chocobone"
@@ -3895,13 +3967,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 "lanç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 "carga"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Cocatriz"
@@ -3921,6 +4004,11 @@
 msgid "gaze"
 msgstr "olhar"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "petrefica"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Comandante"
@@ -3996,10 +4084,11 @@
 msgstr "onda gelada"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Rainha da Escuridão"
 
-#: 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 "
@@ -4009,7 +4098,7 @@
 "conhecimento de magia faz dela um forte oponente em combate, embora a maior "
 "parte de sua força venha de seus vassalos."
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "cetro"
 
@@ -4334,6 +4423,12 @@
 "esmeralda, e usar armadura pesada. A arma favorita dos fatiadores é a "
 "alabarda, que eles usam com extrema precisão."
 
+#: 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 "iniciativa"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Guerreiro Draconiano"
@@ -4385,6 +4480,10 @@
 msgid "berserker frenzy"
 msgstr "fúria"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "fúria"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Guarda Dragão Anã"
@@ -4568,6 +4667,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "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 "Mago Ancião"
@@ -4600,7 +4706,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 "Arqueiro élfico"
 
@@ -4615,7 +4721,12 @@
 "rapida e precisamente, estes arqueiros fazem uma grande parte do exército "
 "élfico."
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Arqueiro élfico"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Vingador Elfo"
 
@@ -4631,6 +4742,11 @@
 "de wesnoth e, sendo invisíveis na floresta até o momento do ataque, podem "
 "emboscar seus inimigos."
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Vingador Elfo"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Capitão élfico"
@@ -4660,7 +4776,8 @@
 "arco, o que os torna capazes de atacar seus inimigos de perto ou de longe."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Druida Elfo"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4682,7 +4799,8 @@
 msgstr "espinhos"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Feiticeira Elfo"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4747,10 +4865,18 @@
 "perto, e devastadoras bolas de fogo à distância."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Dama élfica"
 
 #: 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 "golpe"
 
@@ -4766,7 +4892,7 @@
 "Senhores élficos são temíveis em combate, usando a espada de perto, e "
 "devastadoras bolas de fogo à distância."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Atirador Elfo"
 
@@ -4788,6 +4914,17 @@
 msgid "longbow"
 msgstr "arco longo"
 
+#: 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 "atirador"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Atirador Elfo"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Marechal Elfo"
@@ -4819,7 +4956,7 @@
 "habilidosos no arco e na espada, eles causam sérios danos antes de "
 "desaparecerem em meio às matas."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Mateiro Elfo"
 
@@ -4836,6 +4973,11 @@
 "enquanto estiverem nas matas, a não ser que tenham acabado de atacar, ou se "
 "houverem inimigos adjacentes a eles."
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Mateiro Elfo"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Elfo Montado"
@@ -4862,7 +5004,8 @@
 "combate."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Xamã Elfo"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4876,7 +5019,7 @@
 "numero de golpes que eles podem desferir. Xamãs tambem possuem habilidades "
 "médicas básicas."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Atirador de elite Elfo"
 
@@ -4892,8 +5035,14 @@
 "acertar quando atacando, mesmo que atirem muito rapidamente. Atiradores de "
 "elite são excelentes para atacar inimigos bem entocados."
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Atirador de elite Elfo"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Shyde Élfico"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4911,7 +5060,8 @@
 msgstr "toque de fada"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Bruxa élfica"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4927,7 +5077,8 @@
 "um vento etéreo gelado para derrubar aqueles que se opõe a elas."
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Sílfide Élfica"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -5036,7 +5187,15 @@
 msgid "Galleon"
 msgstr "Galeão"
 
-#: 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 "falso"
 
@@ -5149,12 +5308,6 @@
 "de armas decentes através da superioridade numérica. Estes são os maiores 
e "
 "mais capazes 'irmãos mais velhos' dos lanceiros goblins."
 
-#: 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 "iniciativa"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Cavaleiro Goblin"
@@ -5185,7 +5338,8 @@
 msgid "torch"
 msgstr "tocha"
 
-#: 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 "rede"
 
@@ -5237,7 +5391,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 "Grande Mago"
 
@@ -5249,17 +5403,15 @@
 "Grandes Magos são inimigos incríveis e temíveis, com poder maior até do 
que "
 "os do arquimagos."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Grande Mago"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Grande 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 "
@@ -5477,7 +5629,7 @@
 "possuem habilidades de liderança, e melhoram a capacidade de combate de "
 "unidades de baixo nível adjacentes."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Mago"
 
@@ -5497,11 +5649,16 @@
 msgid "missile"
 msgstr "míssil"
 
-#: 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 da 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"
 
@@ -5524,16 +5681,23 @@
 "luz tambem curam unidades aliadas próximas."
 
 #: 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 "feixe 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 da Luz"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Mestre Arqueiro"
@@ -5548,11 +5712,28 @@
 "humanos são capazes de alcançar. Seu poder com esta arma mortal só é "
 "superado pelo dos elfos."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Povo do mar"
+#: 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 "Feiticeira Elfo"
 
-#: 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."
@@ -5560,11 +5741,98 @@
 "Estas hábeis criaturas do mar são poderosas e rápidas em qualquer ambiente 
"
 "aquático, mas tem grandes problemas de se moverem em terra."
 
-#: 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 "jato d'água"
+
+#: 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 de fada"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Povo do mar"
+
+#: 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 "amarrar"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Lutador Draconiano"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Povo do mar"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Povo do mar"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Lagarto Congelante"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Lanceiro"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Tradução para o Alemão"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Lagarto Guerreiro"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Monstro de lama"
@@ -5578,8 +5846,8 @@
 "espirrando água fervente em seus inimigos."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5630,10 +5898,6 @@
 "desprezíveis são capazes de se esconder na noite, sem deixar traços de 
suas "
 "presença."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "Caçador noturno"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Comandante Nobre"
@@ -5676,7 +5940,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 "
@@ -5799,7 +6063,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 "maldição"
 
@@ -5905,7 +6169,7 @@
 "altamente respeitados entre seus pares, e temidos pelos seus inimigos. Sua "
 "única fraqueza é sua incapacidade de utilizar um arco."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Fora da Lei"
 
@@ -5913,6 +6177,11 @@
 msgid "Outlaws fight better at night."
 msgstr "Foras da lei lutam melhor à noite"
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Fora da Lei"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
@@ -5920,7 +6189,8 @@
 "lutam!"
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Princesa fora da lei"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5936,7 +6206,8 @@
 "roubos."
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Rainha fora da lei"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -6015,7 +6286,14 @@
 msgid "Pirate Galleon"
 msgstr "Galeão 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 "ballista"
@@ -6032,7 +6310,7 @@
 "Invasores confiam em sua experiência como caçadores e são mais valiosos à 
"
 "noite, em florestas e pântanos."
 
-#: 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 "
@@ -6046,7 +6324,7 @@
 "princesa lutarão melhor devido à sua presença. A princesa é também 
hábil, "
 "tendo habilidades como as de um ladrão."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Mago Vermelho"
 
@@ -6060,6 +6338,11 @@
 "boa chance de acertar. Bons lutadores de dia e de noite, magos vermelhos são 
"
 "úteis em qualquer situação."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Mago Vermelho"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Revenante"
@@ -6187,10 +6470,11 @@
 msgstr "Lagarto Guerreiro"
 
 #: 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 ""
@@ -6200,7 +6484,8 @@
 "através das linhas inimigas."
 
 #: data/units/Sea_Hag.cfg:3
-msgid "Sea Hag"
+#, fuzzy
+msgid "female^Sea Hag"
 msgstr "Bruxa do mar"
 
 #: data/units/Sea_Hag.cfg:17
@@ -6211,10 +6496,6 @@
 "Bruxas do mar são nagas mais velhas e experientes que aprenderam a controlar 
"
 "a magia da água."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "jato d'água"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Orc Marinho"
@@ -6287,7 +6568,7 @@
 "lentamente, eles são imensamente poderosos e temidos em Wesnoth e mesmo em "
 "outras terras."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Mago prateado"
 
@@ -6302,10 +6583,24 @@
 "instante. Eles também são altamente resistentes à maior parte das formas 
de "
 "ataques mágicos."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Mago prateado"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Dragão esqueleto"
 
+#: 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 "mordida"
@@ -6375,6 +6670,10 @@
 "Estes corpos animados se tornaram fortes pelas suas longas experiências em "
 "combater os vivos."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "peste"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Lanceiro"
@@ -6581,10 +6880,11 @@
 "suas vítimas é drenado junto com seu sangue, e dado aos morcegos."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Dama Vampira"
 
-#: 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."
@@ -6592,7 +6892,7 @@
 "Bela e fria, ela mantém sua eterna aparencia jovem bebendo o sangue dos "
 "vivos."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "beijo sangrento"
 
@@ -6658,7 +6958,7 @@
 "Torres da guarda são bons locais dos quais se observar inimigos e atirar "
 "diversas coisas neles com balistas."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Mago Branco"
 
@@ -6674,6 +6974,11 @@
 "vila. Magos brancos são potentes em batalhas contra os mortos vivos, que "
 "sofrem contra seu feixe luminoso."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Mago Branco"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Montador de Lobos"
@@ -6887,7 +7192,7 @@
 msgid "+ Bots"
 msgstr "+ Robôs"
 
-#: 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 "Fechar"
 
@@ -6908,73 +7213,73 @@
 msgid "none"
 msgstr "nada"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "dano básico"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "resistência do atacante contra"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "vulnerabilidade do 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 "Dobrado"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "dano total"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "resistência do defensor contra"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "vulnerabilidade do defensor contra"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Metade"
 
-#: 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 "lento"
 
-#: 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 "Unidade aliada em vista"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Unidade inimiga em vista!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends unidades aliadas vistas"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies unidades inimigas vistas!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Unidades vistas! ($friends aliadas, $enemies inimigas)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(aperte $hotkey para continuar)"
 
@@ -7034,7 +7339,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 "Turno"
 
@@ -7102,23 +7407,23 @@
 msgid "Profile"
 msgstr "Descrição"
 
-#: 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 "nível"
 
-#: 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 "Movimento"
 
-#: 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 "corpo a corpo"
 
-#: 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 "longa distância"
 
@@ -7138,11 +7443,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Você quer salvar um replay deste cenário?"
 
-#: 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 "Nome:"
 
-#: 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 "O jogo não pôde ser salvo"
 
@@ -7206,8 +7511,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 "Erro"
 
@@ -7270,7 +7575,7 @@
 "Houve um problema criando os arquivos necessários para instalar a campanha."
 
 #: 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 "Time out na conexão"
 
@@ -7329,7 +7634,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 "Entrar"
 
@@ -7349,79 +7654,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Não pôde inicializar as fontes. Saindo.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Avança para"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Alinhamento"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "XP necessário"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "ataca"
 
-#: 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 "Nome"
 
-#: 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 "Dano"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Golpes"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Distância"
 
-#: 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 "Resistências"
 
-#: 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 "Resistência"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Modificadores de 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 "Defesa"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Voltar"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Em frente >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Ajuda para Battle for Wesnoth"
 
@@ -7433,7 +7738,7 @@
 msgid "End Unit Turn"
 msgstr "Terminar o turno da unidade"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Líder"
 
@@ -7469,11 +7774,11 @@
 msgid "Unit Description"
 msgstr "Descrição da unidade"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Renomear a unidade"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Recrutar"
 
@@ -7481,7 +7786,7 @@
 msgid "Repeat Recruit"
 msgstr "Repetir o recrutamento"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Convocar"
 
@@ -7517,11 +7822,11 @@
 msgid "Scenario Objectives"
 msgstr "Objetivos do cenário"
 
-#: 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 "Estatísticas"
 
@@ -7629,7 +7934,7 @@
 msgid "Speak to All"
 msgstr "Falar com todos"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Ajuda"
 
@@ -7689,7 +7994,7 @@
 msgid "Bump Size"
 msgstr "Rugosidade"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Vilas"
 
@@ -7739,15 +8044,11 @@
 "Unidades inimigas não podem ser vistas se não estiverem no alcancede suas "
 "unidades."
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Escuridão"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "O mapa é desconhecido até que suas unidades o explorem"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Observadores"
 
@@ -7755,13 +8056,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Permite que pessoas que não estão jogando olhem o jogo"
 
-#: 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 "Ok"
 
@@ -7838,70 +8139,70 @@
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Recebendo a lista de jogos"
 
-#: 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 "Ouro"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Esperando o jogo começar"
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Connectar-se ao servidor"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Escolha aonde se conectar"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Conectando-se a um jogo remoto..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Voce deve entrar neste servidor"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Pegando dados do jogo..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Não tem times disponíveis neste jogo."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Escolha o seu time:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "O jogo foi cancelado"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "O time que você escolheu não está mais disponível"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Mostrar o replay do jogo até o ponto salvo?"
 
-#: 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 "Recruta: "
 
@@ -7933,8 +8234,8 @@
 msgid "Local Player"
 msgstr "Jogador 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 "Computador"
 
@@ -7999,7 +8300,7 @@
 msgid "Color"
 msgstr "Cor"
 
-#: 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 jogadores remotos entrarem"
 
@@ -8084,54 +8385,54 @@
 msgid "It is now your turn"
 msgstr "É o seu 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álculo de dano"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Corpo a Corpo"
 
-#: 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 Inimigo"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Escolha a 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 "Você ainda não começou o seu turno. Você realmente quer 
terminá-lo?"
 
-#: 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 ""
 "Algumas unidades ainda podem se mover. Quer realmente terminar o turno?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "auto-salvo"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr ""
 "Não pude salvar o jogo automaticamente. Por favor salve o jogo manualmente."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -8139,35 +8440,35 @@
 "Nomes de jogos salvos não podem ter vírgulas, barras ou barras invertidas. "
 "Por favor escolha outro nome."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Salvo"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "O jogo foi salvo"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Receita"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Gasto"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Você não tem unidades disponíveis para recrutar."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Selecionar unidade"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Você não tem ouro o suficiente para recrutar essa unidade"
 
-#: 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?"
@@ -8175,7 +8476,7 @@
 "Senhor, esta unidade é experiente, e já passou alguns níveis! Você 
realmente "
 "quer mandar $noun embora?"
 
-#: 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?"
@@ -8183,19 +8484,19 @@
 "Senhor, esta unidade está bem perto de passar de nível! Você realmente 
quer "
 "mandar $noum embora?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "ela"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "ele"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Você está afastado de seus soldados e não pode convocá-los"
 
-#: 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)"
@@ -8203,88 +8504,88 @@
 "Você não tem tropas para convocar\n"
 "(É necessário tropas sobreviventes de um cenário anterior)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "Você deve ter pelo menos $cost peças de ouro para convocar uma 
unidade"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Desbandar unidade"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Mensagem"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Enviar apenas para aliados"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Local"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Recrutamentos"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Convocações"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Avanços"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Perdas"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Mortes"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Dano infligido"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Dano tomado"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Dano infligido (EV)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Dano tomado (EV)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Procurar"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 #, fuzzy
 msgid "prompt^Command:"
 msgstr "Comando:"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Histórico da conversa"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "Não pude encontrar nome ou unidade contendo '$search'."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Colocar nome"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Nome"
 
-#: 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?"
@@ -8292,23 +8593,23 @@
 "Os jogos estão fora de sincronica e terão de terminar. Você quer salvar um 
"
 "histórico de erros do seu jogo?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Trocar por uma IA"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Trocar por um jogador local"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Aborat o jogo"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Trocar com "
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "saiu do jogo. O que você quer fazer?"
 
@@ -8370,63 +8671,63 @@
 msgid "Chaotic units"
 msgstr "Unidades caóticas"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Vila Dominada"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Vila Inimiga"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Vila 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 "Versão"
 
-#: 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 "Campanha"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Multijogador"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Carregar"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Língua"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Preferências"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Sair"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Começar um tutorial para se familiarizar com o jogo"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Começar uma nova campanha"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -8434,31 +8735,31 @@
 "Jogo multijogador (hotseat, LAN ou internet), ou um único cenário contra o "
 "computador"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Carregar um jogo de um jogador"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Mudar a língua"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Configurar o jogo"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Ver os créditos"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Sair do jogo"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Mais"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- O Livro de Wesnoth"
 
@@ -8466,15 +8767,15 @@
 msgid "strikes"
 msgstr "golpeia"
 
-#: 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 "ordeiro"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutro"
 
@@ -8486,6 +8787,18 @@
 msgid "Deletion of the file failed."
 msgstr "Não foi possível apagar o arquivo."
 
+#~ msgid "first strike"
+#~ msgstr "iniciativa"
+
+#~ msgid "Swamp"
+#~ msgstr "Pântano"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Hospedar um jogo multijogador"
 
Index: wesnoth/po/wesnoth/ru.po
diff -u wesnoth/po/wesnoth/ru.po:1.8 wesnoth/po/wesnoth/ru.po:1.9
--- wesnoth/po/wesnoth/ru.po:1.8        Wed Oct 20 15:59:38 2004
+++ wesnoth/po/wesnoth/ru.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:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-10-20 18:25+0300\n"
 "Last-Translator: Alexandr Menovchicov <address@hidden>\n"
 "Language-Team: none\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 "лояльный"
 
@@ -50,11 +50,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 "Способности"
 
@@ -141,7 +141,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 "Ходы"
 
@@ -375,7 +375,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 "О игре"
 
@@ -615,7 +615,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,Случайные"
 
@@ -730,6 +730,24 @@
 msgid "Random map"
 msgstr "Случайная карта"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Случайная карта"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Случайная карта"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Случайная карта"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr ""
@@ -769,7 +787,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 "Нет"
 
@@ -1231,7 +1249,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 "Да"
 
@@ -1662,6 +1680,113 @@
 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
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Пустыня карликов"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr ""
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "нет"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Меню"
@@ -1675,14 +1800,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 "ОП"
 
@@ -1757,24 +1882,23 @@
 "День: -25% ущерба\n"
 "Ночь: +25% ущебра"
 
-#: 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 "исцелять"
+#: 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 "
@@ -1788,24 +1912,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: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 ""
+
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "Деревни"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -1814,7 +1959,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
@@ -1823,518 +1968,361 @@
 #: 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
+#, 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 "Не больше 1 единицы содержания"
+
+#: data/translations/english.cfg:64
+msgid ""
+"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"
-msgstr "засада"
+#: 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 "Деревни"
+#: 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 "Не больше 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
+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 "Наблюдатель"
 
-#: 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"
-msgstr "осушать"
+#: 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
+#: 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 "яд"
-
-#: 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
+#: 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 "камень"
-
 #: 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
+#: data/translations/english.cfg:163
 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:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Мост"
-
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Замок"
-
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr ""
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Пещера"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Орки"
 
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
+#: data/translations/english.cfg:165
+msgid "Undead"
 msgstr ""
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-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 "$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 "Следующий совет"
 
-#: 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-"
@@ -2343,7 +2331,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 "
@@ -2351,7 +2339,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 "
@@ -2359,83 +2347,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 "
@@ -2443,7 +2431,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 "
@@ -2451,75 +2439,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."
@@ -2545,7 +2533,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
@@ -2558,12 +2546,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 ""
@@ -2589,7 +2614,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
@@ -2597,19 +2622,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
@@ -2629,7 +2659,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 "Радужный маг"
 
@@ -2644,6 +2674,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
@@ -2659,7 +2691,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
@@ -2671,12 +2703,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 "огонь"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Радужный маг"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Убийца"
@@ -2701,7 +2738,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
@@ -2739,21 +2776,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
@@ -2761,16 +2799,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 "Бандит"
@@ -2793,16 +2845,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 "
@@ -2810,7 +2862,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
@@ -2834,18 +2886,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 "
@@ -2854,9 +2910,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 "огненный скипетр"
 
@@ -2944,7 +3000,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
@@ -2953,7 +3015,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
@@ -2961,7 +3023,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 "пронзать"
@@ -3020,6 +3082,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 ""
@@ -3038,13 +3108,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 ""
@@ -3060,6 +3141,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 "Командир"
@@ -3118,17 +3204,18 @@
 msgstr "волна холода"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+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 "скипетр"
 
@@ -3382,6 +3469,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 "Дракон воин"
@@ -3423,6 +3516,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 "Карлик драконий страж"
@@ -3574,6 +3671,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 "Старший маг"
@@ -3603,7 +3707,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 "Эльф лучник"
 
@@ -3614,7 +3718,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 "Эльф лучник"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Эльф мститель"
 
@@ -3626,6 +3735,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Эльф мститель"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Эльф капитан"
@@ -3649,7 +3763,8 @@
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Эльф друид"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -3668,7 +3783,8 @@
 msgstr "колючка"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Эльф колдун"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -3721,10 +3837,18 @@
 msgstr ""
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+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 "толчок"
 
@@ -3738,7 +3862,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 "Эльф стрелок"
 
@@ -3756,6 +3880,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 "Эльф стрелок"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Эльф маршал"
@@ -3779,7 +3914,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 "Эльф странник"
 
@@ -3791,6 +3926,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 "Эльф странник"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Эльф всадник"
@@ -3812,7 +3952,8 @@
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Эльф шаман"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -3822,7 +3963,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 "Эльф снайпер"
 
@@ -3834,8 +3975,13 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+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
@@ -3850,7 +3996,8 @@
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Эльф колдунья"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -3862,7 +4009,8 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Эльф сильф"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -3954,7 +4102,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 "ложный"
 
@@ -4046,12 +4202,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 "Гоблин рыцарь"
@@ -4076,7 +4226,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 "сеть"
 
@@ -4121,7 +4272,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 "Великий маг"
 
@@ -4131,17 +4282,15 @@
 "in power."
 msgstr ""
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+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 "
@@ -4310,7 +4459,7 @@
 "level units."
 msgstr ""
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Маг"
 
@@ -4326,11 +4475,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 ""
 
@@ -4346,16 +4500,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 ""
 
 #: 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 "Мастер света"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Мастер лучник"
@@ -4367,21 +4528,124 @@
 "only by that of the Elves."
 msgstr ""
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Водяной"
+#: 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 "Эльф колдун"
 
-#: 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 "брызги воды"
+
+#: 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 "прикосновение"
+
+#: 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 "запутывать"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Дракон боец"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Водяной"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+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
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Копьеносец"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Немецкий перевод"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Ящер воин"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Грязевое чудище"
@@ -4393,8 +4657,8 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Нага"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -4434,10 +4698,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 "Благородный командир"
@@ -4475,7 +4735,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 "
@@ -4569,7 +4829,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 "проклятие"
 
@@ -4648,7 +4908,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 "Изгой"
 
@@ -4656,12 +4916,18 @@
 msgid "Outlaws fight better at night."
 msgstr ""
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+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"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Изгнанная принцесса"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -4673,7 +4939,8 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Изгнанная королева"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -4736,7 +5003,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 ""
@@ -4751,7 +5025,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 "
@@ -4760,7 +5034,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 "Красный маг"
 
@@ -4771,6 +5045,11 @@
 "Red Mages are therefore valuable in almost all situations."
 msgstr ""
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Красный маг"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr ""
@@ -4873,13 +5152,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 "Морская ведьма"
 
 #: data/units/Sea_Hag.cfg:17
@@ -4888,10 +5168,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 "Морской орк"
@@ -4947,7 +5223,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 "Серебряный маг"
 
@@ -4958,10 +5234,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 "Серебряный маг"
+
 #: 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 "челюсть"
@@ -5020,6 +5310,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 "Копьеносец"
@@ -5182,16 +5476,17 @@
 msgstr ""
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+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 "кровавый поцелуй"
 
@@ -5244,7 +5539,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 "Белый маг"
 
@@ -5256,6 +5551,11 @@
 "high damage from their light beam"
 msgstr ""
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Белый маг"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Наездник волка"
@@ -5451,7 +5751,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 "Закрыть"
 
@@ -5475,73 +5775,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 "$enemies видим соединения противника!"
 
-#: 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 "(нажмите $hotkey для продолжения)"
 
@@ -5601,7 +5901,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 "Шаг"
 
@@ -5663,23 +5963,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 "колебание"
 
@@ -5699,11 +5999,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 "Игра не может быть сохранена"
 
@@ -5767,8 +6067,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 "Ошибка"
 
@@ -5832,7 +6132,7 @@
 "кампании."
 
 #: 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 "Превышен лимит времени подключения"
 
@@ -5891,7 +6191,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 "Логин"
 
@@ -5911,79 +6211,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Не могу определить шрифт. Выходим.\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 "Помощь по игре Бой за Веснот"
 
@@ -5995,7 +6295,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 "Лидер"
 
@@ -6031,11 +6331,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 "Призвать новобранца"
 
@@ -6043,7 +6343,7 @@
 msgid "Repeat Recruit"
 msgstr "Повторить покупку"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Воскресить"
 
@@ -6079,11 +6379,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 "Статистика"
 
@@ -6191,7 +6491,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 "Помощь"
 
@@ -6251,7 +6551,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 "Деревни"
 
@@ -6301,15 +6601,11 @@
 "Вы не можете видеть соединения противника 
пока они не окажутся в поле зрения "
 "Ваших соединений"
 
-#: 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 "Наблюдатели"
 
@@ -6317,13 +6613,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 "Ok"
 
@@ -6397,70 +6693,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 "Новобранцы:"
 
@@ -6492,8 +6788,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 "Компьютер"
 
@@ -6558,7 +6854,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 "Ждём подключения сетевых игроков"
 
@@ -6642,55 +6938,55 @@
 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."
@@ -6698,59 +6994,59 @@
 "Сохранение не должно содержать двоеточий, 
слэшей и обратных слэшей. Выберите "
 "другое имя."
 
-#: 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)"
@@ -6758,88 +7054,88 @@
 "Нет соединений для воскрешения\n"
 "(У Вас должны быть уцелевшие с прошлого 
сценария соединения)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 "У Вас должно быть по крайней мере $cost 
единиц золота для покупки соединения"
 
-#: 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 "Не могу найти метку или соединение, 
содержащую текст '$search'."
 
-#: 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?"
@@ -6847,23 +7143,23 @@
 "Игра не может быть синхронизирована, вых
одим. Вы хотите сохранить лог ошибок "
 "Вашей игры?"
 
-#: 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 "вышел из игры. Что Вы будете делать?"
 
@@ -6928,94 +7224,94 @@
 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 "-- Великая книга Веснота"
 
@@ -7023,15 +7319,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 "нейтральный"
 
@@ -7043,6 +7339,18 @@
 msgid "Deletion of the file failed."
 msgstr "Ошибка удаления файла."
 
+#~ msgid "first strike"
+#~ msgstr "первый удар"
+
+#~ msgid "Swamp"
+#~ msgstr "Болото"
+
+#~ msgid "Tundra"
+#~ msgstr "Тундра"
+
+#~ msgid "Naga"
+#~ msgstr "Нага"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Создать игру"
 
Index: wesnoth/po/wesnoth/sk.po
diff -u wesnoth/po/wesnoth/sk.po:1.7 wesnoth/po/wesnoth/sk.po:1.8
--- wesnoth/po/wesnoth/sk.po:1.7        Sun Oct 17 12:52:55 2004
+++ wesnoth/po/wesnoth/sk.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:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-09-14 01:27+0100\n"
 "Last-Translator: Viliam Búr <address@hidden>\n"
 "Language-Team: none\n"
@@ -18,7 +18,7 @@
 "X-Poedit-Language: Slovak\n"
 "X-Poedit-Country: SLOVAKIA\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "verný"
 
@@ -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"
 
@@ -193,7 +193,7 @@
 "vyžadujú aj žold. Prečítaj si <ref>dst=income_and_upkeep text='Príjmy a 
"
 "výdavky'</ref> pre ďalšie informácie."
 
-#: 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 "Ťahy"
 
@@ -490,7 +490,7 @@
 "fun, and good luck!"
 msgstr ""
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 #, fuzzy
 msgid "About"
 msgstr "Mladík"
@@ -736,7 +736,7 @@
 msgstr "Štandardná"
 
 #: 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ý"
 
@@ -863,6 +863,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"
@@ -907,7 +925,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 "Nie"
 
@@ -1407,7 +1425,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 "Áno"
 
@@ -1839,6 +1857,113 @@
 msgid "Underground"
 msgstr "Podzemie"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Odkrývanie mapy"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Hlboká voda"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Plytká 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 "Dedina"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Plytká voda"
+
+#: data/terrain.cfg:70
+msgid "Ice"
+msgstr "Ľad"
+
+#: data/terrain.cfg:81 data/terrain.cfg:89 data/terrain.cfg:97
+msgid "Bridge"
+msgstr "Most"
+
+#: data/terrain.cfg:105
+msgid "Sand"
+msgstr "Piesok"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Cesta"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Prach"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Lúka"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Tieň"
+
+#: 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 "Stena jaskyne"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Jaskyňa"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Hrad"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Táborisko"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Trpasličia pustatina"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Pevnosť"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "nič"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Menu"
@@ -1852,14 +1977,14 @@
 msgstr "Koniec kola"
 
 #: 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 "Životy"
 
 #: 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 "Skúsenosti"
 
@@ -1939,34 +2064,29 @@
 "Deň: -25% Zranenie\n"
 "Noc: +25% Zranenie"
 
-#: 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 ""
-"Uzdravuje:\n"
-"Jednotka dokáže uzdravovať spriatelené jednotky na vedľajších 
políčkach "
-"začiatkom ťahu.\n"
+"Prepad:\n"
+"Jednotka sa dokáže ukryť v lese, kde ju nepriateľ neuvidí.\n"
 "\n"
-"Jednotka v opatere uzdravovateľa sa môže za jeden ťah uzdraviť až o 4 "
-"životy.\n"
-"Uzdravovateľ môže v jednom ťahu obnoviť všetkým opatrovaným 
jednotkám spolu "
-"8 životov.\n"
-"Uzdravovateľ nedokáže vyliečiť otrávenú jednotku; taká jednotka musí 
"
-"vyhľadať pomoc v dedine, alebo u jednotky, ktorá dokáže liečiť."
+"Nepriateľské jednotky nemôžu vidieť ani napadnúť túto jednotku v 
lese, iba v "
+"ťahu bezprostredne nasledujúcom po jej útoku, alebo ak sú na vedľajšom "
+"políčku."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "uzdravuje"
+#: 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 "prepad"
 
-#: 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 "
@@ -1991,27 +2111,61 @@
 "Liečiteľ dokáže aj vyliečiť otrávenú jednotku, ale táto jednotka už 
v danom "
 "ťahu nezíska žiadne ďalšie životy."
 
-#: 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 "lieči"
 
-#: 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 ""
-"Teleport:\n"
-"Táto jednotka sa dokáže v okamihu premiestniť z jednej spriatelenej 
dediny "
-"do druhej."
+"Uzdravuje:\n"
+"Jednotka dokáže uzdravovať spriatelené jednotky na vedľajších 
políčkach "
+"začiatkom ťahu.\n"
+"\n"
+"Jednotka v opatere uzdravovateľa sa môže za jeden ťah uzdraviť až o 4 "
+"životy.\n"
+"Uzdravovateľ môže v jednom ťahu obnoviť všetkým opatrovaným 
jednotkám spolu "
+"8 životov.\n"
+"Uzdravovateľ nedokáže vyliečiť otrávenú jednotku; taká jednotka musí 
"
+"vyhľadať pomoc v dedine, alebo u jednotky, ktorá dokáže liečiť."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleport"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "uzdravuje"
+
+#: 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 ""
+"Osvetľuje:\n"
+"Táto jednotka osvetľuje okolitý priestor, takže jednotky poriadku budú "
+"bojovať lepšie a jednotky chaosu horšie.\n"
+"\n"
+"Jednotka na vedľajšom políčku bude bojovať v noci ako za súmraku, a za "
+"súmraku ako cez deň."
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:49
+#, fuzzy
+msgid "illuminates"
+msgstr "osvetlenie,lieči"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2025,7 +2179,7 @@
 "Jednotky nižšej úrovne na vedľajších políčkach spôsobia v boji 
väčšie "
 "zranenie."
 
-#: 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
@@ -2034,56 +2188,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 "velenie"
 
-#: 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 "Nevyžaduje žold vyšší ako 1"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Prepad:\n"
-"Jednotka sa dokáže ukryť v lese, kde ju nepriateľ neuvidí.\n"
-"\n"
-"Nepriateľské jednotky nemôžu vidieť ani napadnúť túto jednotku v 
lese, iba v "
-"ťahu bezprostredne nasledujúcom po jej útoku, alebo ak sú na vedľajšom "
-"políčku."
 
-#: 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 "prepad"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "zakrádanie sa"
 
-#: 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 ""
-"Osvetľuje:\n"
-"Táto jednotka osvetľuje okolitý priestor, takže jednotky poriadku budú "
-"bojovať lepšie a jednotky chaosu horšie.\n"
-"\n"
-"Jednotka na vedľajšom políčku bude bojovať v noci ako za súmraku, a za "
-"súmraku ako cez deň."
 
-#: data/translations/english.cfg:61
-#, fuzzy
-msgid "illuminates"
-msgstr "osvetlenie,lieči"
+#: 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 "
@@ -2093,140 +2236,152 @@
 "Táto jednotka je zvyknutá pohybovať sa medzi nepriateľmi a nenechá sa 
nimi "
 "zablokovať."
 
-#: 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 "priebojný"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Nevyžaduje žold vyšší ako 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
+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 ""
+"Teleport:\n"
+"Táto jednotka sa dokáže v okamihu premiestniť z jednej spriatelenej 
dediny "
+"do druhej."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleport"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "minimálne zranenie"
 
-#: 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 "Mapa"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Nastav strany:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Vyber si tím:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Neviem sa pripojiť na server hry"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Čakám, kým sa hráči pripoja"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Obsadené"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Voľné"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr "&misc/observer.png,Divák"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Opíš jednotku"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Celá obrazovka alebo okno?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Displej:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Okno"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Rýchlosť:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Normálna"
 
-#: data/translations/english.cfg:99
+#: data/translations/english.cfg:111
 msgid "Sound Settings..."
 msgstr "Nastavenie zvuku..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Možnosti"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Vyber si scenár"
 
-#: 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 "alebo"
 
-#: data/translations/english.cfg:110
+#: data/translations/english.cfg:122
 msgid "Unit resistance table"
 msgstr "Tabuľka odolnosti jednotky"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Pozri..."
 
-#: 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 "
@@ -2236,13 +2391,17 @@
 "Zákerný útok dá dvojnásobné zranenie, ak sa na opačnej strane od 
nepriateľa "
 "nachádza spojenec."
 
-#: 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 "zákerný"
+#: 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"
+"Či pri útoku alebo pri obrane, tento druh útoku trvá až do smrti 
jedného z "
+"protivníkov."
 
-#: 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 "
@@ -2252,14 +2411,7 @@
 "Tento útok dá dvojnásobné zranenie súperovi. Takisto spôsobí, že 
jednotka "
 "utrpí dvojnásobné zranenie v prípade protiútoku."
 
-#: 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 "
@@ -2269,18 +2421,15 @@
 "Táto jednotka vysáva zdravie zo živých jednotiek a lieči sama seba za "
 "polovicu spôsobeného zranenia."
 
-#: 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 "vysatie"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Prvý útok:\n"
+"Týmto útokom útočí jednotka vždy prvá, aj keď bola napadnutá."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2288,32 +2437,7 @@
 "Magický:\n"
 "Tento útok má vždy šancu 70% na zásah."
 
-#: 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."
@@ -2321,13 +2445,7 @@
 "Presný:\n"
 "Pri útoku má jednotka vždy šancu aspoň 60% na zásah."
 
-#: 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 "presný"
-
-#: 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 "
@@ -2337,12 +2455,7 @@
 "Ak táto jednotka zabije živú jednotku mimo dediny, telo zabitej jednotky "
 "vstane a bude bojovať na strane svojho premožiteľa."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "choroba"
-
-#: 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 "
@@ -2352,16 +2465,7 @@
 "Tento útok otrávi obeť. Otváraná jednotka stráca 8 životov každý 
ťah, až kým "
 "nie je vyliečená alebo nezoslabne na 1 život."
 
-#: 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 "jed"
-
-#: 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 "
@@ -2371,15 +2475,7 @@
 "Tento útok spomalí obeť. Spomalená jednotka sa jedno kolo pohybuje "
 "polovičnou rýchlosťou a má pri boji o jeden útok menej."
 
-#: 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 "spomaľujúci"
-
-#: 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 "
@@ -2389,209 +2485,102 @@
 "Tento útok premení obeť na kameň. Jednotky premenené na kameň sa 
nemôžu "
 "hýbať ani útočiť."
 
-#: 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 "kameň"
-
 #: 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"
-"Či pri útoku alebo pri obrane, tento druh útoku trvá až do smrti 
jedného z "
-"protivníkov."
-
-#: 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 ""
-"Prvý útok:\n"
-"Týmto útokom útočí jednotka vždy prvá, aj keď bola napadnutá."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "prvý útok"
-
-#: data/translations/english.cfg:172
 msgid "Elves"
 msgstr "Elfovia"
 
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orkovia"
-
-#: data/translations/english.cfg:174
+#: data/translations/english.cfg:163
 msgid "Humans"
 msgstr "Ľudia"
 
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Nemŕtvi"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Hlboká voda"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Plytká voda"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Piesok"
-
-#: 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 "Dedina"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Močiar"
-
-#: data/translations/english.cfg:189
-msgid "Tundra"
-msgstr "Tundra"
-
-#: data/translations/english.cfg:190
-msgid "Ice"
-msgstr "Ľad"
-
-#: data/translations/english.cfg:191
-msgid "Road"
-msgstr "Cesta"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Prach"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Lúka"
-
-#: 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 "Pevnosť"
-
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Jaskyňa"
-
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Stena jaskyne"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orkovia"
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Táborisko"
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Nemŕtvi"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 #, fuzzy
 msgid "$name's Bridge,$name's Crossing"
 msgstr "$name's Bridge,$name's Crossing"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 #, fuzzy
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "$name's Highway,$name's Pass,Path of $name"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 #, fuzzy
 msgid "$name River,River $name"
 msgstr "$name River,River $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 #, fuzzy
 msgid "$name Forest,$name's Forest"
 msgstr "$name Forest,$name's Forest"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 #, fuzzy
 msgid "$name Lake"
 msgstr "$name Lake"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 #, fuzzy
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr "$name|bury,$name|ham,$name|ton"
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "$name Forest,$name's Forest"
+
+#: data/translations/english.cfg:175
 #, fuzzy
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 #, fuzzy
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 #, fuzzy
 msgid "$name|ham,$name|ton,$name|field"
 msgstr "$name|ham,$name|ton,$name|field"
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 #, fuzzy
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr "$name|ham,$name|ton,$name|wood,$name Forest"
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 #, fuzzy
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 
-#: data/translations/english.cfg:218
+#: data/translations/english.cfg:180
 #, fuzzy
 msgid ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 msgstr ""
 "$name|ham,$name|bury,$name|ton,$name|mont,$name|mont,$name|cliff,$name|cliff"
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Ďalší tip"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Tip dňa"
 
-#: 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."
@@ -2599,7 +2588,7 @@
 "Jednotky poriadku bojujú lepšie vo dne, jednotky chaosu zase v noci. Na "
 "neutrálne jednotka nemá noc a deň vplyv."
 
-#: 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."
@@ -2607,7 +2596,7 @@
 "Počas výpravy môžeš použiť skúsenejšie jednotky z predchádzajúcich 
máp "
 "pomocou voľby 'Privolaj'."
 
-#: 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-"
@@ -2620,7 +2609,7 @@
 "tlačidlom myši na jednotku, vyber si 'Popis jednotky' a potom 'Odolnosť', "
 "aby si videl nakoľko dokáže jednotka odolávať jednotlivým druhom 
ú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 "
@@ -2631,7 +2620,7 @@
 "zasiahne ju v boji. Miera obrany momentálne označenej jednotky na 
momentálne "
 "označenom teréne sa zobrazuje v pravom hornom 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 "
@@ -2642,7 +2631,7 @@
 "jed nikdy nezníži životy pod 1. Otrávené jednotky možno uzdraviť v 
dedine, "
 "alebo umiestnením vedľa jednotky so schopnosťou 'liečiť'."
 
-#: 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 "
@@ -2652,7 +2641,7 @@
 "máp. Opakovaným privolávaním vybraných jednotiek si môžeš vytvoriť 
mocnú a "
 "skúsenú 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 "
@@ -2661,7 +2650,7 @@
 "Každá jednotka má 'pod kontrolou' vedľajšie políčka mapy. Ak sa 
jednotka "
 "pohne do oblasti pod kontrolou súpera, nemôže sa v tom kole ďalej 
pohybovať."
 
-#: 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 "
@@ -2672,12 +2661,12 @@
 "pravdepodobnosť zásahu vždy 70%, a útok ostrostrelca má pravdepodobnosť 
"
 "zásahu aspoň 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 "Jednotky umiestnené v dedine sa na začiatku kola vyliečia o 8 
životov."
 
-#: 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."
@@ -2685,7 +2674,7 @@
 "Jednotky, ktoré sa počas kola nepohli ani neútočili, oddychujú a na 
začiatku "
 "nasledujúceho kola si doplnia 2 životy."
 
-#: 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 "
@@ -2695,7 +2684,7 @@
 "teréne. Väčšina jazdeckých jednotiek nemá pri obrane v dedinách a 
hradoch "
 "žiadnu 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 "
@@ -2704,7 +2693,7 @@
 "Jazdecké jednotky sú zvyčajne odolné voči sečným a tupým zbraniam, 
ale sú "
 "zraniteľné pri útoku strelnými a vrhacími zbraňami ako šípy a 
oštepy."
 
-#: 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 "
@@ -2714,7 +2703,7 @@
 "skúsenosti. Jednotka, ktorá zabije nepriateľa, získa 8 skúseností za 
každú "
 "úroveň zabitej jednotky."
 
-#: 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."
@@ -2722,7 +2711,7 @@
 "Elfie jednotky sa výborne pohybujú a bojujú v lese. Trpaslíčie jednotky 
sa "
 "výborne pohybujú a bojujú v kopcoch a v 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."
@@ -2730,7 +2719,7 @@
 "Trpezlivosť ruže prináša. Než útočiť v nevhodných podmienkach alebo 
s málo "
 "jednotkami, počkaj na lepšie podmienky a potom zaútoč."
 
-#: 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."
@@ -2738,13 +2727,13 @@
 "Ak si napadnutý z viacerých strán, možno sa oplatí poslať niektorým 
smerom "
 "menej potrebné jednotky, aby spomalili nepriateľov postup."
 
-#: 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 sa cúvnuť a zostaviť novú formáciu, často je to kľúčom k 
víťazstvu."
 
-#: 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 "
@@ -2755,7 +2744,7 @@
 "závisí na počte dedín na mape a počte ušetrených kôl. Takto vždy 
získaš viac "
 "zlata, než keby si obsadil všetky dediny a vyčkával, až vyprší čas."
 
-#: 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 "
@@ -2767,7 +2756,7 @@
 "odtiaľ. Možno ti aj niektorý spojenec poskytne miesto na verbovanie vo "
 "vlastnom hrade."
 
-#: 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."
@@ -2775,7 +2764,7 @@
 "Kostlivci sú odolní voči strelným a sečným útokom, ale zraniteľní 
tupými, "
 "ohnivými a svätými útokmi."
 
-#: 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."
@@ -2783,7 +2772,7 @@
 "Jednotky so schopnosťou veliť zlepšujú bojové schopnosti tvojich 
jednotiek "
 "nižšej úrovne na vedľajších poliach."
 
-#: 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 "
@@ -2793,7 +2782,7 @@
 "jednotka môže vojsť do dediny a zaútočiť, pričom využije obranu a 
liečenie, "
 "ktoré jej dedina poskytuje."
 
-#: 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."
@@ -2801,16 +2790,16 @@
 "Ak držíš kurzor myši nad schopnosťou alebo vlastnosťou, zobrazí sa 
popis "
 "tejto schopnosti či vlastnosti."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Zoraďuj jednotky do línie, aby kryli zranené jednotky, kým sa 
zregenerujú."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Pozri si nastavenie kláves v menu 'Nastavenia'."
 
-#: 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'."
@@ -2818,7 +2807,7 @@
 "Ak pohneš jednotku, ale pritom nezaútočíš ani nezistíš žiadnu novú "
 "informáciu, môžeš vrátiť pohyb klávesom '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."
@@ -2826,7 +2815,7 @@
 "Ak pohneš kurzor myši nad nepriateľskú jednotku, uvidíš, ako ďaleko sa 
môže "
 "hýbať."
 
-#: 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."
@@ -2834,7 +2823,7 @@
 "Pri útoku použi ako pomocné jednotky liečiteľov - pomôžu ti vyhrať 
boj, aj "
 "keď sami nebudú útočiť."
 
-#: 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 "
@@ -2844,11 +2833,11 @@
 "pohybovať a bude mať o jeden útok menej ako zvyčajne. Oplatí sa to 
najmä "
 "proti jednotkám, ktoré majú málo silných útokov."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Sväté útoky sú zvlášť účinné proti nemŕtvym."
 
-#: 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."
@@ -2856,7 +2845,7 @@
 "Keď je jednotka povýšená na ďalšiu úroveň, vylieči sa. Ak to múdro 
využiješ, "
 "môžeš zvrátiť výsledok boja."
 
-#: 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."
@@ -2889,7 +2878,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
@@ -2902,12 +2891,49 @@
 msgid "cold"
 msgstr "mráz"
 
+#: 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 "vysatie"
+
 #: 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 "magický"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr "Prastarý lesný muž"
@@ -2933,7 +2959,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
@@ -2941,19 +2967,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
@@ -2973,7 +3004,7 @@
 msgid "impact"
 msgstr "tupý"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Archmág"
 
@@ -2988,6 +3019,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
@@ -3003,7 +3036,7 @@
 msgstr "ohnivá guľa"
 
 #: 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
@@ -3015,12 +3048,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 "Archmág"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Zabijak"
@@ -3048,7 +3086,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
@@ -3086,21 +3124,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
@@ -3108,16 +3147,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 "sečný"
 
+#: 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 "zákerný"
+
 #: 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 "jed"
+
 #: data/units/Bandit.cfg:3
 msgid "Bandit"
 msgstr "Bandita"
@@ -3140,16 +3193,16 @@
 msgid "mace"
 msgstr "palcát"
 
-#: 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 "Princezná"
 
-#: 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 "velenie,priebojný"
 
-#: 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 "
@@ -3162,7 +3215,7 @@
 "veliteľa. Jednotky nižšej úrovne v prítomnosti princeznej bojujú 
lepšie. "
 "Princezná je priebojná a dokáže sa prešmyknúť povedľa súpera."
 
-#: 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
@@ -3186,18 +3239,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 "Princezná"
+
+#: 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 "
@@ -3210,9 +3267,9 @@
 "veliteľa. Jednotky nižšej úrovne v prítomnosti princeznej bojujú 
lepšie. "
 "Princezná je priebojná a dokáže sa prešmyknúť povedľa súpera."
 
-#: 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"
 
@@ -3306,7 +3363,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
@@ -3315,7 +3378,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
@@ -3323,7 +3386,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 "strelný"
@@ -3396,6 +3459,14 @@
 msgid "web"
 msgstr "sieť"
 
+#: 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 "spomaľujúci"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Čokobon"
@@ -3418,13 +3489,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 "kopija"
 
+#: 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 "Chiméra"
@@ -3443,6 +3525,11 @@
 msgid "gaze"
 msgstr "pohľad"
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "kameň"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Veliteľ"
@@ -3516,10 +3603,11 @@
 msgstr "vlna mrazu"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Temná kráľovná"
 
-#: data/units/Dark_Queen.cfg:15
+#: data/units/Dark_Queen.cfg:16
 #, fuzzy
 msgid ""
 "The evil queen mother Asheviere has terrorized Wesnoth for many years. Her "
@@ -3530,7 +3618,7 @@
 "nej robia ťažkého protivníka, no jej moc pochádza najmä z tých, 
ktorých "
 "ovláda."
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "žezlo"
 
@@ -3817,6 +3905,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 "prvý úder"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Jašter bojovník"
@@ -3866,6 +3960,10 @@
 msgid "berserker frenzy"
 msgstr "zúrivý útok"
 
+#: 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 "Trpaslík dračí strážca"
@@ -4038,6 +4136,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Trpaslík zurvalec"
 
+#: 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"
@@ -4070,7 +4175,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 strelec"
 
@@ -4081,7 +4186,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 "Elf strelec"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Elf pomstiteľ"
 
@@ -4093,6 +4203,11 @@
 "seen in the woods until just after they have attacked."
 msgstr ""
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Elf pomstiteľ"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Elf kapitán"
@@ -4122,7 +4237,8 @@
 "dokáže rozsievať skazu medzi nepriateľmi zblízka i zďaleka."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Elf druid"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4145,7 +4261,7 @@
 
 #: data/units/Elvish_Enchantress.cfg:3
 #, fuzzy
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr "Elf Å¡aman"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4205,10 +4321,17 @@
 
 #: data/units/Elvish_Lady.cfg:4
 #, fuzzy
-msgid "Elvish Lady"
+msgid "female^Elvish Lady"
 msgstr "Elf šľachtic"
 
 #: 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 "Ťahy"
@@ -4225,7 +4348,7 @@
 "Elfí šľachtic je obávaný v boji, vďaka meču nablízko a ohnivým 
strelám "
 "zdiaľky."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Elf ostrostrelec"
 
@@ -4243,6 +4366,17 @@
 msgid "longbow"
 msgstr "dlhý 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 "presný"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Elf ostrostrelec"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Elf maršal"
@@ -4272,7 +4406,7 @@
 "nekryté boky. Je rovnako zručný s mečom i lukom, mocne zaútočí a 
opäť zmizne "
 "v lese, aby sa vyhol odvete."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Elf hraničiar"
 
@@ -4284,6 +4418,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 "Elf hraničiar"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Elf jazdec"
@@ -4308,7 +4447,8 @@
 "nemajú páru, ale chýba im bojová sila"
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Elf Å¡aman"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4321,7 +4461,7 @@
 "Jej zväzujúci útok spomaľuje nepriateľov a zmenšuje počet ich útokov 
o "
 "jeden. Šamanka dokáže aj jednoducho uzdravovať."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Elf ostreľovač"
 
@@ -4333,8 +4473,14 @@
 "entrenched enemies."
 msgstr ""
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Elf ostreľovač"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Elf víla"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4353,7 +4499,7 @@
 
 #: data/units/Elvish_Sorceress.cfg:3
 #, fuzzy
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr "Elf strelec"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4366,7 +4512,7 @@
 
 #: data/units/Elvish_Sylph.cfg:3
 #, fuzzy
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr "Elf víla"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4467,7 +4613,15 @@
 msgid "Galleon"
 msgstr "Galeóna"
 
-#: 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 "---"
 
@@ -4573,12 +4727,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 "prvý úder"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Goblin rytier"
@@ -4607,7 +4755,8 @@
 msgid "torch"
 msgstr "fakľa"
 
-#: 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 "sieť"
 
@@ -4655,7 +4804,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 "Veľký mág"
 
@@ -4667,17 +4816,15 @@
 "Veľký mág je obdivovaným a obávaným nepriateľom, pretože v moci 
prevyšuje aj "
 "archmágov."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Veľký mág"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Veľký 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 "regeneruje"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -4888,7 +5035,7 @@
 "šikovný aj s lukom. Podobne ako veliteľ, aj šľachtic má vodcovské 
schopnosti "
 "a pomáha jednotkám nižšej úrovne na susedných políčkach."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Mág"
 
@@ -4908,11 +5055,16 @@
 msgid "missile"
 msgstr "strela"
 
-#: 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 svetla"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "osvetlenie,lieči"
 
@@ -4934,16 +5086,23 @@
 "na vedľajších políčkach."
 
 #: 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 "lúč"
 
 #: 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 "svätý"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Mág svetla"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Majster lukostrelec"
@@ -4958,11 +5117,28 @@
 "ľudských schopnostiach. Jeho smrtiacu silu v ovládaní tejto zbrane 
prevyšujú "
 "iba elfovia."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Morský 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 Å¡aman"
+
+#: 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."
@@ -4970,11 +5146,98 @@
 "Morský muž je mocným obyvateľom morí, je síce obojživelník, ale na 
zemi má "
 "ťažkosti."
 
-#: 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 "spŕška vody"
+
+#: 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 "dotyk víly"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Morský 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 "zamotanie"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Jašter vojak"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Morský muž"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Morský muž"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Saur bojovník"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Oštepník"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Nemecký preklad"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Saur bojovník"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr ""
@@ -4986,8 +5249,8 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5037,10 +5300,6 @@
 "číre zlo vo svojej duši. Tieto odporné stvorenia sa dokážu v noci 
ukryť bez "
 "jedinej stopy ich prítomnosti."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "zakrádanie sa"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr ""
@@ -5078,7 +5337,7 @@
 msgid "Ogre"
 msgstr "Ohyzd"
 
-#: 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 "
@@ -5195,7 +5454,7 @@
 "a môžu svojich nepriateľov prekliať a ubrať im životnú silu."
 
 #: 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 "kliatba"
 
@@ -5292,7 +5551,7 @@
 "Ork bojovník zvládol umenia boja dvoma mečmi, je medzi orkmi vysoko 
vážený a "
 "obávaný medzi nepriateľmi. Jeho jedinou slabinou je neschopnosť 
používať luk."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Zbojník"
 
@@ -5300,12 +5559,17 @@
 msgid "Outlaws fight better at night."
 msgstr "Zbojník lepšie bojuje 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 ""
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+msgid "female^Outlaw Princess"
 msgstr ""
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5317,7 +5581,7 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+msgid "female^Outlaw Queen"
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5386,7 +5650,14 @@
 msgid "Pirate Galleon"
 msgstr "Pirátska loď"
 
-#: 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"
@@ -5403,7 +5674,7 @@
 "Pytliaci sa spolehajú na svoje lovecké skúsenosti a sú najcennejší v 
noci, "
 "alebo v lesoch a močiaroch."
 
-#: 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 "
@@ -5416,7 +5687,7 @@
 "veliteľa. Jednotky nižšej úrovne v prítomnosti princeznej bojujú 
lepšie. "
 "Princezná je hybká a obratná, čo jej dáva schopnosti podobné 
zlodejským."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Červený mág"
 
@@ -5430,6 +5701,11 @@
 "Červený mág je dobrý vo dne i v noci, má rýchle nohy a je cenný v 
takmer "
 "každej situácii."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Červený mág"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Umrlec"
@@ -5547,13 +5823,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 "Morský strigôň"
 
 #: data/units/Sea_Hag.cfg:17
@@ -5564,10 +5841,6 @@
 "Morskí strigôni sú starí a skúsení nagovia, ktorí sa naučili 
ovládať vodnú "
 "mágiu."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "spŕška vody"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Morský ork"
@@ -5636,7 +5909,7 @@
 "Špeciálna pechota je elitou wesnothskej armády. Pohybujú sa pomaly, ale 
sú "
 "nesmierne silní, takže sú obávaní vo Wesnothe i v okolitých krajinách."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Strieborný mág"
 
@@ -5650,10 +5923,24 @@
 "sa premiestniť z jednej spriatelenej dediny do druhej v jedinom okamihu. Sú 
"
 "vysoko odolní voči väčšine magických útokov."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Strieborný mág"
+
 #: 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 "čeľusť"
@@ -5718,6 +6005,10 @@
 "fighting the living."
 msgstr "Tieto pohyblivé chodiace mŕtvoly zosilneli po dlhých bojoch so 
živými."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "choroba"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Oštepník"
@@ -5912,10 +6203,11 @@
 "netopiera upíra nie sú silné, vyciciava nimi krv a zdravie obete pre seba."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Kráľovná upírov"
 
-#: 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."
@@ -5923,7 +6215,7 @@
 "Chladná a nádherná kráľovná si udržiava svoj večne mladý výzor 
pitím krvi "
 "živých."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "krvavý bozk"
 
@@ -5981,7 +6273,7 @@
 "Strážne veže sú miesta, z ktorých možno zbadať nepriateľa a 
strieľať po ňom "
 "balistami."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Biely mág"
 
@@ -5997,6 +6289,11 @@
 "odpočívali v dedine. Biely mág je mocný v boji s nemŕtvymi, ktorým jeho 
"
 "svetelný lúč spôsobuje ťažké zranenia."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Biely mág"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Vlčí jazdec"
@@ -6208,7 +6505,7 @@
 msgid "+ Bots"
 msgstr "+ Roboti"
 
-#: 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 "Zavri"
 
@@ -6230,73 +6527,73 @@
 msgid "none"
 msgstr "nič"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "základné zranenie"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "útočníkova odolnosť voči"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "zraniteľnosť útočníka voči"
 
-#: 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 "Dvojnásobné"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "celkové zranenie"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "obrancova odolnosť voči"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "zraniteľnosť obrancu voči"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Polovičné"
 
-#: 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 "spomalený"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Prepad!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Vidím priateľskú jednotku"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Vidím nepriateľskú jednotku!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "Vidím $friends priateľských jednotiek"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "Vidím $enemies nepriateľských jednotiek!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr "Vidím jednotky! (priatelia: $friends, nepriatelia: $enemies)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(stlač $hotkey a pokračujeme)"
 
@@ -6356,7 +6653,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"
 
@@ -6423,23 +6720,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 "Ťahy"
 
-#: 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 diaľku"
 
@@ -6459,11 +6756,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Chceš uložiť záznam prejdenia tejto mapy?"
 
-#: 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 "Názov:"
 
-#: 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 "Nepodarilo sa uložiť hru"
 
@@ -6527,8 +6824,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"
 
@@ -6598,7 +6895,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 "Čas na pripojenie vypršal"
 
@@ -6659,7 +6956,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 "Prihlásenie"
 
@@ -6679,79 +6976,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Neviem naštartovať písmo. Končím.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Povýši sa 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 "Potrebné skúsenosti"
 
-#: 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 "Meno"
 
-#: 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 "Zranenie"
 
-#: 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 "Z diaľky"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Špeciálne"
 
-#: 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 "Typ útoku"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Odolnosť"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Vplyv terénu"
 
-#: 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 "< Naspäť"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Ďalej >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Návod k Bitke o Wesnoth"
 
@@ -6763,7 +7060,7 @@
 msgid "End Unit Turn"
 msgstr "Ukonči ťah jednotky"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Veliteľ"
 
@@ -6799,11 +7096,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 "Premenuj jednotku"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Verbuj"
 
@@ -6811,7 +7108,7 @@
 msgid "Repeat Recruit"
 msgstr "Verbuj znova"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Privolaj"
 
@@ -6847,11 +7144,11 @@
 msgid "Scenario Objectives"
 msgstr "Cieľ mapy"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Zoznam jednotiek"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Å tatistika"
 
@@ -6959,7 +7256,7 @@
 msgid "Speak to All"
 msgstr "Povezd všetkým"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Návod"
 
@@ -7019,7 +7316,7 @@
 msgid "Bump Size"
 msgstr "Hrúbka"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Dediny"
 
@@ -7067,15 +7364,11 @@
 msgid "Enemy units cannot be seen unless they are in range of your units"
 msgstr "Nepriateľské jednotky vidíš iba v dosahu svojich jednotiek"
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Odkrývanie mapy"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "Mapa je zakrytá, dokiaľ ju tvoje jednotky nezmapujú"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Diváci"
 
@@ -7083,13 +7376,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Umožni divákom sledovať 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 "Storno"
 
-#: 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"
 
@@ -7165,71 +7458,71 @@
 msgid "Warning"
 msgstr "Upozornenie"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Zisťujem zoznam hier..."
 
-#: 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 "Zlato"
 
-#: src/multiplayer_client.cpp:139
+#: src/multiplayer_client.cpp:142
 msgid "Waiting for game to start..."
 msgstr "Čakám, kým začne hra..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 #, fuzzy
 msgid "Connect to Host"
 msgstr "Pokračuj v pohybe"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Vyber si herný server, na ktorý sa pripojíš"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Pripájam sa na server hry..."
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Na tento server sa musíš prihlásiť"
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Zisťujem herné údaje..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "V tejto hre už žiadna strana nie je voľná."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Vyber si stranu:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Hra bola zrušená"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Zvolená strana už nie je voľná"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Zobraziť záznam hry až do okamihu uloženia?"
 
-#: 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 "Veliteľ"
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 #, fuzzy
 msgid "Recruits: "
 msgstr "Naverbovaných"
@@ -7262,8 +7555,8 @@
 msgid "Local Player"
 msgstr "Človek"
 
-#: 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č"
 
@@ -7328,7 +7621,7 @@
 msgid "Color"
 msgstr "Farba"
 
-#: 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 "Čakám, kým sa pripoja sieťoví hráči"
 
@@ -7411,52 +7704,52 @@
 msgid "It is now your turn"
 msgstr "Si na ťahu"
 
-#: 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 "Obranca"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Výpočet zranenia"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Na blízko"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "proti"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Zaútoč na súpera"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Vyber si 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 "Ešte si nezačal ťahať. Chceš naozaj ukončiť ťah?"
 
-#: 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 "Niektoré jednotky ešte môžu ťahať. Chceš naozaj ukončiť ťah?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Automatické uloženie"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr "Nepodarilo sa automaticky uložiť hru. Prosím uložte hru pomocou 
menu."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -7464,35 +7757,35 @@
 "Názvy uložených hier nesmú obsahovať bodkočiarky, lomky, ani opačné 
lomky. "
 "Prosím zadajte iný názov."
 
-#: 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 "Hra bola uložená"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Príjem"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Žold"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Nemôžeš verbovať žiadne jednotky"
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Vyber si jednotku"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Nemáš dosť zlata, aby si naverboval túto jednotku"
 
-#: 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?"
@@ -7500,7 +7793,7 @@
 "Môj pane, táto jednotka je skúsená a bola povýšená! Chcete $noun 
naozaj "
 "rozpustiť?"
 
-#: 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?"
@@ -7508,20 +7801,20 @@
 "Môj pane, táto jednotka má byť čoskoro povýšená! Chcete $noun naozaj "
 "rozpustiť?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "ju"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "ho"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 #, fuzzy
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Si ďaleko od svojich vojakov a nemôžeš ich privolať."
 
-#: 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)"
@@ -7529,110 +7822,110 @@
 "Nemáš koho privolať\n"
 "(Z predchádzajúcej mapy neprežil žiaden veterán)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 #, fuzzy
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "zlatých, aby si privolal jednotku"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Prepusti jednotku"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Správa"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Pošli iba spojencom"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Poloha"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Naverbovaných"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Privolaných"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Povýšených"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Padlých"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Zabitých"
 
-#: 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 "Hľadaj"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Prí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 "Neviem nájsť značku ani jednotku, ktorá má v názve '$search'."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Umiestni značku"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Značka"
 
-#: 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 "Hry sa rozladili a treba ich ukončiť. Mám uložiť chybovú správu 
z hry?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Nahraď počítačom"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Nahraď iným hráčom"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Zruš hru"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Nahradiť "
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "opustil hru. Čo chceš urobiť?"
 
@@ -7692,66 +7985,66 @@
 msgid "Chaotic units"
 msgstr "Jednotky chaosu"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 #, fuzzy
 msgid "Owned village"
 msgstr "Dedina"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 #, fuzzy
 msgid "Enemy village"
 msgstr "Dedina"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 #, fuzzy
 msgid "Allied village"
 msgstr "Goblin rabovač"
 
-#: 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 "Verzia"
 
-#: 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 "Výprava"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Zápas"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Načítaj hru"
 
-#: 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 "Nastavenia"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Koniec"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Spusti úvodný výcvik, v ktorom sa zoznámiš s touto hrou"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Spusti novú výpravu pre jedného hráča"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -7759,31 +8052,31 @@
 "Zápas medzi viacerými hráčmi (striedavo, na lokálnej sieti, na 
Internete), "
 "alebo proti počítaču"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Pokračuj v uloženej hre pre jedného hráča"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Zmeň jazyk"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Nastav rôzne možnosti hry"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Zobraz informácie o autoroch hry"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Ukonči hru"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Ďalej"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Kniha o Wesnothe"
 
@@ -7791,15 +8084,15 @@
 msgid "strikes"
 msgstr ""
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "chaos"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "poriadok"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutrál"
 
@@ -7811,6 +8104,18 @@
 msgid "Deletion of the file failed."
 msgstr "Nepodarilo sa vymazať súbor."
 
+#~ msgid "first strike"
+#~ msgstr "prvý útok"
+
+#~ msgid "Swamp"
+#~ msgstr "Močiar"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
+
 #~ msgid "Host Multiplayer Game"
 #~ msgstr "Založ novú hru"
 
Index: wesnoth/po/wesnoth/sl.po
diff -u wesnoth/po/wesnoth/sl.po:1.3 wesnoth/po/wesnoth/sl.po:1.4
--- wesnoth/po/wesnoth/sl.po:1.3        Sun Oct 17 18:55:43 2004
+++ wesnoth/po/wesnoth/sl.po    Thu Oct 21 20:22:41 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: smart-sl\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-17 20:24+0200\n"
 "Last-Translator: \n"
 "Language-Team:  <address@hidden>\n"
@@ -20,7 +20,7 @@
 "%100==4 ? 2 : 3);\n"
 "X-Generator: KBabel 1.9\n"
 
-#: data/game.cfg:321 data/translations/english.cfg:70
+#: data/game.cfg:321 data/translations/english.cfg:61
 msgid "loyal"
 msgstr "zvest"
 
@@ -52,11 +52,11 @@
 msgid "Traits"
 msgstr "Lastnosti"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Enote"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Sposobnosti"
 
@@ -142,7 +142,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 "Premikanje"
 
@@ -376,7 +376,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 "O programu"
 
@@ -616,7 +616,7 @@
 msgstr "Privzeto"
 
 #: 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 ""
 
@@ -731,6 +731,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 ""
@@ -770,7 +785,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"
 
@@ -1232,7 +1247,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 "Da"
 
@@ -1663,6 +1678,112 @@
 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 "Globoka voda"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Plitva 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 "Vas"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Plitva 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 "Pesek"
+
+#: data/terrain.cfg:114
+msgid "Road"
+msgstr "Cesta"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Blato"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Stepa"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Senca"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Griči"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Gore"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Gozd"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Zid jame"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Jama"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Grad"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Tabor"
+
+#: data/terrain.cfg:258
+msgid "Dwarven castle"
+msgstr ""
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Trdnjava"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "brez"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Meni"
@@ -1676,14 +1797,14 @@
 msgstr "Končaj potezo"
 
 #: 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"
 
@@ -1749,24 +1870,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"
+#: 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 "
@@ -1780,24 +1900,44 @@
 "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 "teleportira"
+#: 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
+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 "
@@ -1806,7 +1946,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
@@ -1815,517 +1955,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 ""
 
-#: 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: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
-msgid "illuminates"
+#: 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 "teleportira"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr ""
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Igra"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scenarij"
 
-#: 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 "Zapolnjeno"
 
-#: data/translations/english.cfg:87
+#: data/translations/english.cfg:99
 msgid "Available"
 msgstr "Na voljo"
 
-#: data/translations/english.cfg:88
+#: data/translations/english.cfg:100
 msgid "&misc/observer.png,Observer"
 msgstr ""
 
-#: 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 "Prikaz:"
 
-#: 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 "Hitrost:"
 
-#: data/translations/english.cfg:97
+#: data/translations/english.cfg:109
 msgid "Normal"
 msgstr "Običajno"
 
-#: 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 "Možnosti"
 
-#: 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 "ali"
 
-#: 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 "Glej tudi..."
 
-#: 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 "čaroben"
-
-#: 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 "upočasni"
-
-#: 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 "kamen"
-
-#: 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 "Globoka voda"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Plitva voda"
-
-#: data/translations/english.cfg:181
-msgid "Sand"
-msgstr "Pesek"
-
-#: 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 "Vas"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Močvirje"
-
-#: 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 "Blato"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Stepa"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Griči"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Gore"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Gozd"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Most"
+#: 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:200
-msgid "Castle"
-msgstr "Grad"
+#: 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:201
-msgid "Keep"
-msgstr "Trdnjava"
+#: 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"
-msgstr "Jama"
+#: data/translations/english.cfg:162
+msgid "Elves"
+msgstr ""
 
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Zid jame"
+#: data/translations/english.cfg:163
+msgid "Humans"
+msgstr ""
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Tabor"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr ""
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr ""
+
+#: 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 "Naslednji nasvet"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Nasvet dneva"
 
-#: 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-"
@@ -2334,7 +2317,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 "
@@ -2342,7 +2325,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 "
@@ -2350,83 +2333,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 "
@@ -2434,7 +2417,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 "
@@ -2442,75 +2425,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."
@@ -2536,7 +2519,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
@@ -2549,12 +2532,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 "čaroben"
+
 #: data/units/Ancient_Wose.cfg:3
 msgid "Ancient Wose"
 msgstr ""
@@ -2580,7 +2600,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
@@ -2588,19 +2608,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
@@ -2620,7 +2645,7 @@
 msgid "impact"
 msgstr "top"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr ""
 
@@ -2635,6 +2660,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
@@ -2650,7 +2677,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
@@ -2662,12 +2689,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 "ognjen"
 
+#: data/units/Arch_Mage.cfg:82
+msgid "female^Arch Mage"
+msgstr ""
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr ""
@@ -2692,7 +2723,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
@@ -2730,21 +2761,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
@@ -2752,16 +2784,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 "oster"
 
+#: 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 ""
@@ -2784,16 +2830,15 @@
 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
+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 "
@@ -2801,7 +2846,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
@@ -2825,18 +2870,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 ""
+
+#: 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 "
@@ -2845,9 +2894,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 ""
 
@@ -2935,7 +2984,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
@@ -2944,7 +2999,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
@@ -2952,7 +3007,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 "špičast"
@@ -3011,6 +3066,14 @@
 msgid "web"
 msgstr "mrež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 "upočasni"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr ""
@@ -3029,13 +3092,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 ""
@@ -3051,6 +3125,11 @@
 msgid "gaze"
 msgstr ""
 
+#: data/units/Cockatrice.cfg:26 src/actions.cpp:730 src/actions.cpp:877
+#: src/reports.cpp:122
+msgid "stone"
+msgstr "kamen"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr ""
@@ -3109,17 +3188,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 ""
 
@@ -3373,6 +3452,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 ""
@@ -3414,6 +3499,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 ""
@@ -3565,6 +3654,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 ""
@@ -3594,7 +3690,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 ""
 
@@ -3605,7 +3701,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 ""
 
@@ -3617,6 +3717,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 ""
@@ -3640,7 +3744,7 @@
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+msgid "female^Elvish Druid"
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:20
@@ -3659,7 +3763,7 @@
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -3712,10 +3816,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 ""
 
@@ -3729,7 +3840,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 ""
 
@@ -3747,6 +3858,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 ""
@@ -3770,7 +3891,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 ""
 
@@ -3782,6 +3903,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 ""
@@ -3803,7 +3928,7 @@
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+msgid "female^Elvish Shaman"
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -3813,7 +3938,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 ""
 
@@ -3825,8 +3950,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
@@ -3841,7 +3970,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -3853,7 +3982,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -3945,7 +4074,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 "lažen"
 
@@ -4037,12 +4174,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 ""
@@ -4067,7 +4198,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 "mreža"
 
@@ -4112,7 +4244,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 ""
 
@@ -4122,15 +4254,12 @@
 "in power."
 msgstr ""
 
-#: data/units/Great_Troll.cfg:3
-msgid "Great Troll"
+#: data/units/Great_Mage.cfg:79
+msgid "female^Great Mage"
 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"
+#: data/units/Great_Troll.cfg:3
+msgid "Great Troll"
 msgstr ""
 
 #: data/units/Great_Troll.cfg:16
@@ -4301,7 +4430,7 @@
 "level units."
 msgstr ""
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr ""
 
@@ -4317,11 +4446,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 ""
 
@@ -4337,16 +4471,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 ""
@@ -4358,21 +4498,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 ""
@@ -4384,7 +4618,7 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
+msgid "female^Naga"
 msgstr ""
 
 #: data/units/Naga.cfg:17
@@ -4425,10 +4659,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 ""
@@ -4466,7 +4696,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 "
@@ -4560,7 +4790,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 ""
 
@@ -4639,7 +4869,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 ""
 
@@ -4647,12 +4877,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
@@ -4664,7 +4898,7 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+msgid "female^Outlaw Queen"
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -4727,7 +4961,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 ""
@@ -4742,7 +4983,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 "
@@ -4751,7 +4992,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 ""
 
@@ -4762,6 +5003,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 ""
@@ -4864,13 +5109,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
@@ -4879,10 +5124,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 ""
@@ -4938,7 +5179,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 ""
 
@@ -4949,10 +5190,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 ""
@@ -5011,6 +5265,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 ""
@@ -5172,16 +5430,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 ""
 
@@ -5234,7 +5492,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 ""
 
@@ -5246,6 +5504,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 ""
@@ -5440,7 +5702,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 "Zapri"
 
@@ -5460,73 +5722,73 @@
 msgid "none"
 msgstr "brez"
 
-#: 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 ""
 
@@ -5586,7 +5848,7 @@
 msgid "replay"
 msgstr "vnovično predvajanje"
 
-#: 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 "Poteza"
 
@@ -5646,23 +5908,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 "stopnja"
 
-#: 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 "Premiki"
 
-#: 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 ""
 
@@ -5682,11 +5944,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 "Ime:"
 
-#: 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 ""
 
@@ -5748,8 +6010,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 "Napaka"
 
@@ -5811,7 +6073,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 "Povezava je potekla"
 
@@ -5867,7 +6129,7 @@
 msgid "Play a game against AI opponents"
 msgstr "Igra proti UI"
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr "Prijava"
 
@@ -5887,79 +6149,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Nisem mogel inicializirati pisav. Končujem. \n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Napreduje v"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Poravnava"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "Potrebni XP"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "napade"
 
-#: 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 "Ime"
 
-#: 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 "Vrsta"
 
-#: 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 "Å kode"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Udari"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Doseg"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Poseben"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Odpornosti"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Tip napada"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Odpornost"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Terenski prikrojevalci"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Teren"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Obramba"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Nazaj"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Naprej >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Pomoč za The Battle for Wesnoth "
 
@@ -5971,7 +6233,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 "Vodja"
 
@@ -6007,11 +6269,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 ""
 
@@ -6019,7 +6281,7 @@
 msgid "Repeat Recruit"
 msgstr ""
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr ""
 
@@ -6055,11 +6317,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 "Statistika"
 
@@ -6167,7 +6429,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 "Pomoč"
 
@@ -6227,7 +6489,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 ""
 
@@ -6275,15 +6537,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 ""
 
@@ -6291,13 +6549,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 "Prekliči"
 
-#: 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 "V redu"
 
@@ -6371,69 +6629,69 @@
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: 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 "Zlato"
 
-#: 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
 msgid "Leader: "
 msgstr "Vodja: "
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr ""
 
@@ -6463,8 +6721,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 "Računalniški igralec"
 
@@ -6529,7 +6787,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 ""
 
@@ -6612,86 +6870,86 @@
 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 "proti"
 
-#: 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 "Samodejno shranjena pozicija"
 
-#: 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 "Shranjeno"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Igra je bila shranjena"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Prihodki"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Plače"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Nikogar ne morete rekrutirati."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Izberite enoto"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Za rekrutiranje te enote nimate dovolj zlata"
 
-#: 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?"
@@ -6699,7 +6957,7 @@
 "Moj gospod, ta enota je izkušena, na višji izkustveni stopnji! Ali res "
 "hočete odpraviti $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?"
@@ -6707,19 +6965,19 @@
 "Moj gospod, ta enota je blizu višji izkustveni stopnji! Ali res hočete "
 "odpraviti $noun?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "njo"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "njega"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr "Od svojih enot ste ločeni in jih ne morete priklicati"
 
-#: 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)"
@@ -6727,87 +6985,87 @@
 "Nobenih enot ne morete priklicati\n"
 " (imeti morate preživele veterane iz prejšnjih misij)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr "Za priklic enote potrebujete vsaj $cost zlata"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Odpravi enoto"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Sporočilo"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Pošlji samo zaveznikom"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Lega"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Rekruti"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Priklicane enote"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Napredovanja"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Izgube"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Sovražnikove izgube"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Storjena Å¡koda"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Utrpela Å¡koda"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Storjena škoda (pričakovana)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Utrpela škoda (pričakovana)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Iskanje"
 
-#: src/playturn.cpp:2143
+#: src/playturn.cpp:2144
 msgid "prompt^Command:"
 msgstr "Ukaz:"
 
-#: src/playturn.cpp:2154
+#: src/playturn.cpp:2155
 msgid "Chat Log"
 msgstr "Dnevnik pogovorov"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "Nisem našel oznake ali enote z '$search' v imenu."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Postavi oznako"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Oznaka"
 
-#: 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?"
@@ -6815,23 +7073,23 @@
 "Igre niso več sinhronizirane in se bodo morale končati. Ali naj shranim "
 "dnevnik napak iz igre?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Zamenjaj z UI"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Zamenjaj z lokalnim igralcem"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Prekini igro"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Zamenjaj z "
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "je zapustil igro. Kaj boste storili?"
 
@@ -6890,63 +7148,63 @@
 msgid "Chaotic units"
 msgstr "Kaotične enote"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Naša vas"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Sovražnikova vas"
 
-#: 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 "KB"
 
-#: src/titlescreen.cpp:149
+#: src/titlescreen.cpp:155
 msgid "Version"
 msgstr "Različica"
 
-#: src/titlescreen.cpp:166
+#: src/titlescreen.cpp:172
 msgid "TitleScreen button^Tutorial"
 msgstr "Vodnik"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Kampanje"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Večigralstvo"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Naloži"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Jezik"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Nastavitve"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Izhod"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Začni vodnik da se navadiš na igro"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Začni novo enoigralsko kampanjo"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -6954,31 +7212,31 @@
 "Večigralstvo (vroči stol, LAN ali preko interneta) ali enoigralski spopad z 
"
 "umetno inteligenco"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Naloži enoigralsko shranjeno pozicijo"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Spremeni jezik (prevod)"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Uredi nastavitve igre"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Poglej zasluge"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Izhod iz igre"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Več"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Knjiga modrosti Wesnoth-a"
 
@@ -6986,15 +7244,15 @@
 msgid "strikes"
 msgstr "udari"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "chaotic"
 msgstr "kaotičen"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "lawful"
 msgstr "zakonit"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "nevtralen"
 
@@ -7005,3 +7263,9 @@
 #: src/widgets/file_chooser.cpp:173
 msgid "Deletion of the file failed."
 msgstr "Izbris datoteke je bil neuspešen."
+
+#~ msgid "Swamp"
+#~ msgstr "Močvirje"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
Index: wesnoth/po/wesnoth/sv.po
diff -u wesnoth/po/wesnoth/sv.po:1.15 wesnoth/po/wesnoth/sv.po:1.16
--- wesnoth/po/wesnoth/sv.po:1.15       Sun Oct 17 15:13:44 2004
+++ wesnoth/po/wesnoth/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:42+0200\n"
+"POT-Creation-Date: 2004-10-21 21:58+0200\n"
 "PO-Revision-Date: 2004-10-17 17:12+0200\n"
 "Last-Translator: tephlon\n"
 "Language-Team: Swedish\n"
@@ -12,7 +12,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 "lojal"
 
@@ -44,11 +44,11 @@
 msgid "Traits"
 msgstr "Karaktärsdrag"
 
-#: data/help.cfg:28 src/playturn.cpp:1532
+#: data/help.cfg:28 src/playturn.cpp:1533
 msgid "Units"
 msgstr "Trupper"
 
-#: data/help.cfg:34 src/help.cpp:600
+#: data/help.cfg:34 src/help.cpp:591
 msgid "Abilities"
 msgstr "Förmågor"
 
@@ -190,7 +190,7 @@
 "det ger också en kostnad i underhåll. Läs <ref>dst=income_and_upkeep "
 "text='Inkomst och underhåll'</ref> för mer information om detta. "
 
-#: 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 "Förflyttning"
 
@@ -602,7 +602,7 @@
 "vet du allt du behöver veta för att spela Tronarvingen. Ha så roligt, och "
 "lycka till! "
 
-#: data/help.cfg:194 src/titlescreen.cpp:172
+#: data/help.cfg:194 src/titlescreen.cpp:178
 msgid "About"
 msgstr "Om"
 
@@ -906,7 +906,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,Slumpval"
 
@@ -1021,6 +1021,24 @@
 msgid "Random map"
 msgstr "Slumpkarta"
 
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Desert.cfg:16
+#, fuzzy
+msgid "Random map (Desert)"
+msgstr "Slumpkarta"
+
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Marsh.cfg:16
+#, fuzzy
+msgid "Random map (Marsh)"
+msgstr "Slumpkarta"
+
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:3
+#: data/scenarios/multiplayer/Random_Scenario_Winter.cfg:16
+#, fuzzy
+msgid "Random map (Winter)"
+msgstr "Slumpkarta"
+
 #: data/scenarios/multiplayer/Wesbowl.cfg:3
 msgid "Wesbowl"
 msgstr "Wesbowl"
@@ -1067,7 +1085,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"
 
@@ -1672,7 +1690,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"
 
@@ -2256,6 +2274,113 @@
 msgid "Underground"
 msgstr "Underjorden"
 
+#: data/terrain.cfg:7 src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
+msgid "Shroud"
+msgstr "Slöja"
+
+#: data/terrain.cfg:14
+msgid "Fog"
+msgstr ""
+
+#: data/terrain.cfg:21
+msgid "Deep Water"
+msgstr "Djupt vatten"
+
+#: data/terrain.cfg:30
+msgid "Shallow Water"
+msgstr "Grunt vatten"
+
+#: 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 "By"
+
+#: data/terrain.cfg:51
+#, fuzzy
+msgid "Swamp Water"
+msgstr "Grunt vatten"
+
+#: 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 "Väg"
+
+#: data/terrain.cfg:122
+msgid "Dirt"
+msgstr "Jord"
+
+#: data/terrain.cfg:132
+msgid "Grassland"
+msgstr "Slätt"
+
+#: data/terrain.cfg:158
+#, fuzzy
+msgid "Snow"
+msgstr "Skugga"
+
+#: data/terrain.cfg:177
+msgid "Hills"
+msgstr "Kullar"
+
+#: data/terrain.cfg:184
+msgid "Snow hills"
+msgstr ""
+
+#: data/terrain.cfg:192
+msgid "Mountains"
+msgstr "Berg"
+
+#: data/terrain.cfg:199
+msgid "Forest"
+msgstr "Skog"
+
+#: data/terrain.cfg:206
+msgid "Snow forest"
+msgstr ""
+
+#: data/terrain.cfg:214
+#, fuzzy
+msgid "Cave wall"
+msgstr "Grottvägg"
+
+#: data/terrain.cfg:222
+msgid "Cave"
+msgstr "Grotta"
+
+#: data/terrain.cfg:239 data/terrain.cfg:299
+msgid "Castle"
+msgstr "Borg"
+
+#: data/terrain.cfg:248
+msgid "Encampment"
+msgstr "Läger"
+
+#: data/terrain.cfg:258
+#, fuzzy
+msgid "Dwarven castle"
+msgstr "Dvärgarnas ödemark"
+
+#: data/terrain.cfg:268
+msgid "Keep"
+msgstr "Kärntorn"
+
+#: data/terrain.cfg:288
+#, fuzzy
+msgid "Canyon"
+msgstr "inget"
+
 #: data/themes/default.cfg:23 data/themes/default.cfg:359
 msgid "Menu"
 msgstr "Meny"
@@ -2269,14 +2394,14 @@
 msgstr "Avsluta draget"
 
 #: 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 "EP"
 
@@ -2350,31 +2475,30 @@
 "Dagtid: -25% skada\n"
 "Nattetid:+25% skada"
 
-#: 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 ""
-"VÃ¥rdar:\n"
-"Truppen vårdar närliggande trupper i början av varje drag.\n"
+"Bakhåll:\n"
+"Den här truppen kan gömma sig i skog, och blir inte upptäckt av sina "
+"fiender.\n"
 "\n"
-"Truppen återställer upp till 4 HP per drag.\n"
-"Truppen kan sammanlagt återställa högst 8 HP per drag.\n"
-"En förgiftad trupp kan inte återställas helt av vård, utan måste söka "
-"tillflykt till en by eller bli få hjälp av en trupp som kan bota."
+"Fiendetrupper kan inte se eller attackera den här truppen i skogen, förutom 
"
+"underdragen precis efter den har attackerat, eller om det finns "
+"fiendetrupper alldeles bredvid."
 
-#: data/translations/english.cfg:25 data/units/Elvish_Shaman.cfg:11
-#: data/units/Paladin.cfg:20
-msgid "heals"
-msgstr "vårdar"
+#: 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 "bakhåll"
 
-#: 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 "
@@ -2399,27 +2523,57 @@
 "En trupp som kan bota kan också häva en förgiftning, till priset av att 
den "
 "förgiftade truppen inte återfår några HP under samma drag."
 
-#: 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 "botar"
 
-#: 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 ""
-"Teleportera:\n"
-"Den här truppen kan förflytta sig mellan två kontrollerade byar "
-"ögonblickligen."
+"VÃ¥rdar:\n"
+"Truppen vårdar närliggande trupper i början av varje drag.\n"
+"\n"
+"Truppen återställer upp till 4 HP per drag.\n"
+"Truppen kan sammanlagt återställa högst 8 HP per drag.\n"
+"En förgiftad trupp kan inte återställas helt av vård, utan måste söka "
+"tillflykt till en by eller bli få hjälp av en trupp som kan bota."
 
-#: data/translations/english.cfg:40 data/units/Silver_Mage.cfg:21
-#: data/units/Silver_Mage.cfg:160
-msgid "teleport"
-msgstr "teleportera"
+#: data/translations/english.cfg:42 data/units/Elvish_Shaman.cfg:11
+#: data/units/Paladin.cfg:20
+msgid "heals"
+msgstr "vårdar"
+
+#: 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 ""
+"Lyser upp:\n"
+"Den här truppen lyser upp närområdet, så att lagenliga trupper slåss 
bättre "
+"och kaotiska sämre.\n"
+"\n"
+"Trupper på rutorna bredvid slåss som det vore skymning när det är natt 
och "
+"som vid dag när det är skymning."
 
-#: data/translations/english.cfg:45
+#: data/translations/english.cfg:49
+msgid "illuminates"
+msgstr "lyser upp"
+
+#: data/translations/english.cfg:54
 msgid ""
 "Leadership:\n"
 "This unit can lead friendly units that are next to it, making them fight "
@@ -2434,7 +2588,7 @@
 "Närliggande allierade trupper av lägre nivå kommer att utdela mer skada i "
 "strid."
 
-#: 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
@@ -2443,56 +2597,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 "ledarskap"
 
-#: 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 mer än 1 i underhåll"
+
+#: data/translations/english.cfg:64
+msgid ""
+"Nightstalk:\n"
+"The unit becomes invisible during night."
 msgstr ""
-"Bakhåll:\n"
-"Den här truppen kan gömma sig i skog, och blir inte upptäckt av sina "
-"fiender.\n"
-"\n"
-"Fiendetrupper kan inte se eller attackera den här truppen i skogen, förutom 
"
-"underdragen precis efter den har attackerat, eller om det finns "
-"fiendetrupper alldeles bredvid."
 
-#: 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 "bakhåll"
+#: data/translations/english.cfg:66 data/units/Nightgaunt.cfg:18
+#: data/units/Shadow.cfg:16
+msgid "nightstalk"
+msgstr "skuggsteg"
 
-#: 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 ""
-"Lyser upp:\n"
-"Den här truppen lyser upp närområdet, så att lagenliga trupper slåss 
bättre "
-"och kaotiska sämre.\n"
-"\n"
-"Trupper på rutorna bredvid slåss som det vore skymning när det är natt 
och "
-"som vid dag när det är skymning."
 
-#: data/translations/english.cfg:61
-msgid "illuminates"
-msgstr "lyser upp"
+#: 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 "regenererar"
 
-#: 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 "
@@ -2502,118 +2645,131 @@
 "Denna trupp finner vägar förbi fienden, och hindras därmed inte av 
fiendens "
 "kontrollzoner."
 
-#: 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 "stigfinnare"
 
-#: data/translations/english.cfg:68
-msgid "Never more than 1 upkeep"
-msgstr "Aldrig mer än 1 i underhåll"
-
-#: 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 "Den här truppen tar halva nominella skadan om den inte anföll 
först."
 
-#: 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 "ståndaktig"
 
-#: data/translations/english.cfg:76
+#: data/translations/english.cfg:84
+msgid ""
+"Teleport:\n"
+"This unit may teleport between any two friendly villages instantly."
+msgstr ""
+"Teleportera:\n"
+"Den här truppen kan förflytta sig mellan två kontrollerade byar "
+"ögonblickligen."
+
+#: data/translations/english.cfg:86 data/units/Silver_Mage.cfg:21
+#: data/units/Silver_Mage.cfg:160
+msgid "teleport"
+msgstr "teleportera"
+
+#: data/translations/english.cfg:88
 msgid "minimum damage"
 msgstr "minsta möjliga skada"
 
-#: data/translations/english.cfg:78
+#: data/translations/english.cfg:90
 msgid "Game"
 msgstr "Spel"
 
-#: data/translations/english.cfg:80
+#: data/translations/english.cfg:92
 msgid "Scenario"
 msgstr "Scenario"
 
-#: data/translations/english.cfg:82
+#: data/translations/english.cfg:94
 msgid "Configure Sides:"
 msgstr "Konfigurera sidor:"
 
-#: data/translations/english.cfg:83
+#: data/translations/english.cfg:95
 msgid "Choose Team Settings:"
 msgstr "Välj laginställningar:"
 
-#: data/translations/english.cfg:84
+#: data/translations/english.cfg:96
 msgid "Could not connect to the remote host"
 msgstr "Kunde inte ansluta till servern"
 
-#: data/translations/english.cfg:85
+#: data/translations/english.cfg:97
 msgid "Waiting for players to connect"
 msgstr "Väntar på att spelare skall ansluta"
 
-#: data/translations/english.cfg:86
+#: data/translations/english.cfg:98
 msgid "Filled"
 msgstr "Upptagen"
 
-#: 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,Åskådare"
 
-#: data/translations/english.cfg:90
+#: data/translations/english.cfg:102
 msgid "Describe Unit"
 msgstr "Beskriv truppen"
 
-#: data/translations/english.cfg:92
+#: data/translations/english.cfg:104
 msgid "Full Screen or Windowed?"
 msgstr "Fullskärm eller fönsterläge?"
 
-#: data/translations/english.cfg:93
+#: data/translations/english.cfg:105
 msgid "Display:"
 msgstr "Skärm:"
 
-#: data/translations/english.cfg:94
+#: data/translations/english.cfg:106
 msgid "Windowed"
 msgstr "Fönster"
 
-#: data/translations/english.cfg:96
+#: data/translations/english.cfg:108
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: 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 "Ljudinställningar..."
 
-#: data/translations/english.cfg:100
+#: data/translations/english.cfg:112
 msgid "Options"
 msgstr "Alternativ"
 
-#: data/translations/english.cfg:102
+#: data/translations/english.cfg:114
 msgid "Choose Scenario"
 msgstr "Välj scenario"
 
-#: data/translations/english.cfg:104
+#: data/translations/english.cfg:116
 msgid "This terrain acts as $terrains for movement and defense purposes"
 msgstr ""
 "Den här terrängen betraktas som $terrains ur förflyttnings- och "
 "försvarssynpunkt"
 
-#: data/translations/english.cfg:105
+#: data/translations/english.cfg:117
 msgid "The terrain with the best modifier is chosen automatically"
 msgstr "Den för truppen mest fördelaktiga terrängen används automatiskt"
 
-#: data/translations/english.cfg:106
+#: data/translations/english.cfg:118
 msgid "This terrain gives healing"
 msgstr "Den här terrängen läker trupper"
 
-#: 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"
@@ -2621,7 +2777,7 @@
 "Den här terrängen är som ett kärntorn. Du kan alltså rekrytera trupper 
när "
 "din ledare befinner på den här sortens terräng"
 
-#: 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"
@@ -2629,19 +2785,19 @@
 "Den här terrängen är som en borg. Rekryterade trupper kan alltså placeras 
på "
 "den här sortens terräng"
 
-#: 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 "Motståndskraftstabell för trupper"
 
-#: data/translations/english.cfg:112
+#: data/translations/english.cfg:124
 msgid "See Also..."
 msgstr "Se även..."
 
-#: 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 "
@@ -2651,13 +2807,17 @@
 "Denna typ av attack orsakar dubbel skada om en vänligt sinnad trupp befinner 
"
 "sig på motsatt sida av målet."
 
-#: 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 "rygghugg"
+#: 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 ""
+"Bärsärkagång:\n"
+"Oavsett om det gäller anfall eller försvar, så innebär denna typ av 
attack "
+"att striden fortsätter tills en av parterna ligger död på marken."
 
-#: 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 "
@@ -2667,14 +2827,7 @@
 "Denna typ av attack vållar dubbel skada hos målet, men den anfallande "
 "truppen mottar också dubbel skada från målets motattack."
 
-#: 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 "storma"
-
-#: 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 "
@@ -2684,18 +2837,15 @@
 "Denna typ av attack suger livskraften ur levande trupper, och förbättrar 
den "
 "anfallande truppens hälsa med hälften av den skada den orsakar."
 
-#: 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 "suga livskraft"
+#: data/translations/english.cfg:141
+msgid ""
+"First Strike:\n"
+"This unit always strikes first with this attack, even if they are defending."
+msgstr ""
+"Första slaget:\n"
+"Denna trupp slår alltid först, även om den försvarar sig."
 
-#: data/translations/english.cfg:132
+#: data/translations/english.cfg:144
 msgid ""
 "Magical:\n"
 "This attack always has a 70% chance to hit."
@@ -2703,32 +2853,7 @@
 "Magisk:\n"
 "Denna attack har alltid 70% chans att träffa."
 
-#: 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."
@@ -2736,13 +2861,7 @@
 "Prickskytt:\n"
 "Vid anfall har denna typ av attack alltid åtminstone 60% chans att träffa."
 
-#: 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 "prickskytt"
-
-#: 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 "
@@ -2752,12 +2871,7 @@
 "Om denna typ av attack dödar ett levande mål som inte befinner sig i en by, 
"
 "kommer den döda truppens lik att reanimeras och slåss på anfallarens sida."
 
-#: data/translations/english.cfg:144 data/units/Soulless.cfg:24
-#: data/units/Walking_Corpse.cfg:24
-msgid "plague"
-msgstr "pest"
-
-#: 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 "
@@ -2767,235 +2881,111 @@
 "Denna attack förgiftar målet. Förgiftade trupper förlorar 8 HP varje drag 
"
 "tills de botas eller har försvagats till 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 ""
-"Sakta ner:\n"
-"Denna typ av attack får målet att saktas ner. Trupper som är nersaktade 
rör "
-"sig med halva sin normala hastighet, och har ett slag mindre under sitt drag."
-
-#: 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 "sakta ner"
-
-#: 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 ""
-"Förstena:\n"
-"Denna attack förstenar målet. Förstenade trupper kan inte röra sig och 
inte "
-"attackera."
-
-#: 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 ""
-"Bärsärkagång:\n"
-"Oavsett om det gäller anfall eller försvar, så innebär denna typ av 
attack "
-"att striden fortsätter tills en av parterna ligger död på marken."
-
-#: data/translations/english.cfg:164 data/units/Dwarvish_Berserker.cfg:29
-#: data/units/Dwarvish_Ulfserker.cfg:29
-msgid "berserk"
-msgstr "bärsärk"
-
-#: data/translations/english.cfg:167
-msgid ""
-"First Strike:\n"
-"This unit always strikes first with this attack, even if they are defending."
-msgstr ""
-"Första slaget:\n"
-"Denna trupp slår alltid först, även om den försvarar sig."
-
-#: data/translations/english.cfg:169 data/units/Drake_Slasher.cfg:42
-msgid "first strike"
-msgstr "första slaget"
-
-#: data/translations/english.cfg:172
-msgid "Elves"
-msgstr "Alver"
-
-#: data/translations/english.cfg:173
-msgid "Orcs"
-msgstr "Orcher"
-
-#: data/translations/english.cfg:174
-msgid "Humans"
-msgstr "Människor"
-
-#: data/translations/english.cfg:175
-msgid "Undead"
-msgstr "Vandöda"
-
-#: data/translations/english.cfg:179
-msgid "Deep Water"
-msgstr "Djupt vatten"
-
-#: data/translations/english.cfg:180
-msgid "Shallow Water"
-msgstr "Grunt vatten"
-
-#: 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 "By"
-
-#: data/translations/english.cfg:183
-msgid "Swamp"
-msgstr "Träsk"
-
-#: 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 "Väg"
-
-#: data/translations/english.cfg:192
-msgid "Dirt"
-msgstr "Jord"
-
-#: data/translations/english.cfg:193
-msgid "Grassland"
-msgstr "Slätt"
-
-#: data/translations/english.cfg:194
-msgid "Hills"
-msgstr "Kullar"
-
-#: data/translations/english.cfg:195
-msgid "Mountains"
-msgstr "Berg"
-
-#: data/translations/english.cfg:196
-msgid "Forest"
-msgstr "Skog"
-
-#: data/translations/english.cfg:197 data/translations/english.cfg:198
-#: data/translations/english.cfg:199
-msgid "Bridge"
-msgstr "Bro"
+"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 ""
+"Sakta ner:\n"
+"Denna typ av attack får målet att saktas ner. Trupper som är nersaktade 
rör "
+"sig med halva sin normala hastighet, och har ett slag mindre under sitt drag."
 
-#: data/translations/english.cfg:200
-msgid "Castle"
-msgstr "Borg"
+#: 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 ""
+"Förstena:\n"
+"Denna attack förstenar målet. Förstenade trupper kan inte röra sig och 
inte "
+"attackera."
 
-#: data/translations/english.cfg:201
-msgid "Keep"
-msgstr "Kärntorn"
+#: data/translations/english.cfg:162
+msgid "Elves"
+msgstr "Alver"
 
-#: data/translations/english.cfg:202
-msgid "Cave"
-msgstr "Grotta"
+#: data/translations/english.cfg:163
+msgid "Humans"
+msgstr "Människor"
 
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
-msgstr "Grottvägg"
+#: data/translations/english.cfg:164
+msgid "Orcs"
+msgstr "Orcher"
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
-msgstr "Läger"
+#: data/translations/english.cfg:165
+msgid "Undead"
+msgstr "Vandöda"
 
-#: data/translations/english.cfg:207
+#: data/translations/english.cfg:168
 msgid "$name's Bridge,$name's Crossing"
 msgstr "$name|s bro,$name|s överfart"
 
-#: data/translations/english.cfg:208
+#: data/translations/english.cfg:169
 msgid "$name's Highway,$name's Pass,Path of $name"
 msgstr "$name|s väg,$name|s pass,$name|s stig"
 
-#: data/translations/english.cfg:209
+#: data/translations/english.cfg:170
 msgid "$name River,River $name"
 msgstr "$name|floden,Floden $name"
 
-#: data/translations/english.cfg:210
+#: data/translations/english.cfg:171
 msgid "$name Forest,$name's Forest"
 msgstr "$name|skogen,$name|s skog"
 
-#: data/translations/english.cfg:211
+#: data/translations/english.cfg:172
 msgid "$name Lake"
 msgstr "$name|sjön"
 
-#: data/translations/english.cfg:212
+#: data/translations/english.cfg:173
 msgid "$name|bury,$name|ham,$name|ton"
 msgstr "$name|hult,$name|torp,$name|by"
 
-#: data/translations/english.cfg:213
+#: data/translations/english.cfg:174
+#, fuzzy
+msgid "$name|harbor,$name|port"
+msgstr "$name|skogen,$name|s skog"
+
+#: data/translations/english.cfg:175
 msgid "$name|ham,$name|ford,$name|cross,$river|ford,$river|cross"
 msgstr 
"$name|torp,$name|vadet,$name|överfarten,$river|vadet,$river|överfarten"
 
-#: data/translations/english.cfg:214
+#: data/translations/english.cfg:176
 msgid "$river|bridge,$river|bridge,$river|bridge,$name|ham,$name|bridge"
 msgstr "$river|bron,$river|bron,$river|bron,$name|torp,$name|bron"
 
-#: data/translations/english.cfg:215
+#: data/translations/english.cfg:177
 msgid "$name|ham,$name|ton,$name|field"
 msgstr "$name|torp,$name|by,$name|vall"
 
-#: data/translations/english.cfg:216
+#: data/translations/english.cfg:178
 msgid "$name|ham,$name|ton,$name|wood,$name Forest"
 msgstr "$name|torp,$name|by,$name|lund,$name|skogen"
 
-#: data/translations/english.cfg:217
+#: data/translations/english.cfg:179
 msgid "$name|ham,$name|bury,$name|ton,$name|hill,$name|crest"
 msgstr "$name|torp,$name|hult,$name|by,$name|kullen,$name|krönet"
 
-#: 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|torp,$name|hult,$name|by,$name|berget,$name|berget,$name|klippan,$name|"
 "klippan"
 
-#: data/translations/english.cfg:220
+#: data/translations/english.cfg:182
 msgid "Next tip"
 msgstr "Nästa tips"
 
-#: data/translations/english.cfg:221
+#: data/translations/english.cfg:183
 msgid "Tip of the Day"
 msgstr "Dagens tips"
 
-#: data/translations/english.cfg:222
+#: data/translations/english.cfg:184
 msgid "Do not show tips"
 msgstr "Visa inte 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."
@@ -3003,7 +2993,7 @@
 "Lagenliga trupper slåss bättre på dagen, och kaotiska trupper slåss 
bättre "
 "på natten. Neutrala trupper påverkas inte av tid på dygnet."
 
-#: 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."
@@ -3011,7 +3001,7 @@
 "I en kampanj kan du använda veteraner från tidigare scenarier genom att "
 "välja 'Återkalla'."
 
-#: 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-"
@@ -3025,7 +3015,7 @@
 "därefter 'Motståndskraft' så kan du se hur mycket motståndskraft truppen 
har "
 "mot de olika vapenslagen."
 
-#: 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 "
@@ -3036,7 +3026,7 @@
 "typ av terräng din trupp står på. Vilken försvarsprocent den valda 
truppen "
 "har på sin terräng visas längst upp till höger på skärmen."
 
-#: 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 "
@@ -3048,7 +3038,7 @@
 "trupper kan botas genom att ställas i en by eller alldeles bredvid en trupp "
 "som har förmågan att 'bota'."
 
-#: 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 "
@@ -3058,7 +3048,7 @@
 "menyn. Genom att återkalla samma trupper om och om igen, så kan du bygga 
upp "
 "en kraftfull och erfaren armé."
 
-#: 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 "
@@ -3068,7 +3058,7 @@
 "förflyttas in i en fiendes kontrollzon, så kan den inte förflyttas något 
mer "
 "det draget."
 
-#: 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 "
@@ -3078,12 +3068,12 @@
 "trupp befinner sig i. Dock har magiska attacker alltid 70% chans att träffa, 
"
 "och prickskyttar har alltid åtminstone 60% chans att träffa."
 
-#: 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 "Trupper som befinner sig i byar återfår 8 HP i början på sitt 
drag."
 
-#: 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."
@@ -3091,7 +3081,7 @@
 "Trupper som inte flyttar eller attackerar under ett drag vilar, och återfår 
"
 "två HP i början av nästa drag."
 
-#: 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 "
@@ -3101,7 +3091,7 @@
 "naturen. De flesta beridna trupper har dock inte någon försvarsfördel av "
 "byar eller borgar."
 
-#: 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 "
@@ -3110,7 +3100,7 @@
 "Hästburna trupper är i allmänhet motståndskraftiga mot hugg- och 
krossvapen, "
 "men är sårbara mot stickvapen, såsom bågar och spjut."
 
-#: 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 "
@@ -3120,7 +3110,7 @@
 "dödsstöten för en fiendetrupp. Trupper som dödar en fiendetrupp får 8 EP 
för "
 "varje nivå som den dödade truppen har."
 
-#: 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."
@@ -3128,7 +3118,7 @@
 "Alver rör sig och slåss mycket bra i skogen. Dvärgar rör sig och slåss "
 "mycket bra i kullar och berg."
 
-#: 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."
@@ -3137,7 +3127,7 @@
 "dålig terräng eller med ett litet antal trupper, vänta tills situationen 
är "
 "mer fördelaktig för dig, och attackera då."
 
-#: 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."
@@ -3145,14 +3135,14 @@
 "Om du blir attackerad på flera flanker, så kan det vara en god idé att 
sända "
 "iväg trupper som du kan avvara och låta dessa sinka fienden."
 
-#: 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 ""
 "Dra dig inte för att omgruppera eller slå till reträtt - detta är ofta "
 "nyckeln till den slutliga segern."
 
-#: 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 "
@@ -3164,7 +3154,7 @@
 "kvar när du slutar. Du tjänar alltid mer guld på detta sätt än genom att 
"
 "erövra byar och vänta på att dragen tar slut."
 
-#: 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 "
@@ -3176,7 +3166,7 @@
 "fiende, och använda det för att återkalla och rekrytera, eller så kan en "
 "allierad ledare låta dig använda sin."
 
-#: 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."
@@ -3184,7 +3174,7 @@
 "Skelett är motståndskraftiga mot hugg- och stickvapen, men sårbara för "
 "trubbiga och heliga vapen samt eldvapen."
 
-#: 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."
@@ -3192,7 +3182,7 @@
 "Trupper med ledarskapsförmåga får lägre rankade trupper på deras sida 
att "
 "slåss bättre."
 
-#: 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 "
@@ -3202,7 +3192,7 @@
 "fiendetrupp kan ställa sig i byn och attackera dig. Fiendetruppen får då "
 "tillgång till byns försvarsfördelar och läkande egenskaper."
 
-#: 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."
@@ -3210,17 +3200,17 @@
 "Om du håller muspekaren över en förmåga eller ett karaktärsdrag så 
visas en "
 "förklaring av den förmågan eller det karaktärsdraget."
 
-#: data/translations/english.cfg:246
+#: data/translations/english.cfg:208
 msgid "Use lines of units to screen injured units to let them recover."
 msgstr ""
 "Använd dig av trupplinjer för att skydda skadade trupper så att de kan "
 "återhämta sig."
 
-#: data/translations/english.cfg:247
+#: data/translations/english.cfg:209
 msgid "Read the hotkeys list in the preferences menu."
 msgstr "Läs listan över snabbtangenter i 'Inställningar'."
 
-#: 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'."
@@ -3228,7 +3218,7 @@
 "Om du flyttar en trupp utan att anfalla eller upptäcka något nytt genom "
 "förflyttningen så kan du ångra förflyttningen genom att trycka på '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."
@@ -3236,7 +3226,7 @@
 "Du kan se hur långt en fiendetrupp kan förflytta sig genom att placera "
 "muspekaren över truppen."
 
-#: 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."
@@ -3244,7 +3234,7 @@
 "Använd helande trupper för att understödja dina anfall - de kommer att 
vinna "
 "dina slag för dig utan att själva attackera."
 
-#: 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 "
@@ -3255,11 +3245,11 @@
 "därför en mycket effektiv metod mot fiender som har ett litet antal mycket "
 "kraftfulla attacker."
 
-#: data/translations/english.cfg:252
+#: data/translations/english.cfg:214
 msgid "Holy attacks are very powerful against undead."
 msgstr "Heliga vapen är mycket kraftfulla mot vandöda trupper."
 
-#: 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."
@@ -3267,7 +3257,7 @@
 "Trupper återfår sin hälsa när de befordras. Om man utnyttjar detta klokt, 
så "
 "kan det vända ett strid."
 
-#: 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."
@@ -3299,7 +3289,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
@@ -3312,12 +3302,49 @@
 msgid "cold"
 msgstr "frost"
 
+#: 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 "suga livskraft"
+
 #: 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 "Uråldrig wose"
@@ -3347,7 +3374,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
@@ -3355,19 +3382,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
@@ -3387,7 +3419,7 @@
 msgid "impact"
 msgstr "kross"
 
-#: data/units/Arch_Mage.cfg:3 data/units/Arch_Mage.cfg:82
+#: data/units/Arch_Mage.cfg:3
 msgid "Arch Mage"
 msgstr "Ärkemagiker"
 
@@ -3404,6 +3436,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
@@ -3419,7 +3453,7 @@
 msgstr "eldklot"
 
 #: 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
@@ -3431,12 +3465,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 "eld"
 
+#: data/units/Arch_Mage.cfg:82
+#, fuzzy
+msgid "female^Arch Mage"
+msgstr "Ärkemagiker"
+
 #: data/units/Assassin.cfg:3
 msgid "Assassin"
 msgstr "Lönnmördare"
@@ -3464,7 +3503,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
@@ -3502,21 +3541,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
@@ -3524,16 +3564,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 "hugg"
 
+#: 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 "rygghugg"
+
 #: 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 "Bandit"
@@ -3559,16 +3613,16 @@
 msgid "mace"
 msgstr "spikklubba"
 
-#: 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 "Prinsessa"
 
-#: 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 "ledarskap, stigfinnare"
 
-#: 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 "
@@ -3580,7 +3634,7 @@
 "har hon blivit en utsökt och viljestark krigare och ledare. Härdad av "
 "strider leder hon trupperna omkring henne i stridens hetta."
 
-#: 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
@@ -3604,18 +3658,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 "Prinsessa"
+
+#: 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 "
@@ -3629,9 +3687,9 @@
 "prinsessan inspireras av hennes närvaro och kämpar bättre. Prinsessan är 
en "
 "skicklig stigfinnare och ignorerar fiendens kontrollzoner."
 
-#: 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 "Eldspiran"
 
@@ -3726,7 +3784,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
@@ -3735,7 +3799,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
@@ -3743,7 +3807,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 "stick"
@@ -3815,6 +3879,14 @@
 msgid "web"
 msgstr "spindelnät"
 
+#: 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 "sakta ner"
+
 #: data/units/Chocobone.cfg:3
 msgid "Chocobone"
 msgstr "Benryttare"
@@ -3836,13 +3908,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 "spjut"
 
+#: 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 "storma"
+
 #: data/units/Cockatrice.cfg:3
 msgid "Cockatrice"
 msgstr "Basilisk"
@@ -3861,6 +3944,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 "sten"
+
 #: data/units/Commander.cfg:3 data/units/Commander.cfg:78
 msgid "Commander"
 msgstr "Befälhavare"
@@ -3935,10 +4023,11 @@
 msgstr "köldvåg"
 
 #: data/units/Dark_Queen.cfg:3
-msgid "Dark Queen"
+#, fuzzy
+msgid "female^Dark Queen"
 msgstr "Svartdrottning"
 
-#: 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 "
@@ -3948,7 +4037,7 @@
 "Hennes kunskaper i magi gör henne till en värdig motståndare, även om 
hennes "
 "makt mestadels härstammar ur dem hon härskar över."
 
-#: data/units/Dark_Queen.cfg:20
+#: data/units/Dark_Queen.cfg:21
 msgid "scepter"
 msgstr "spira"
 
@@ -4268,6 +4357,12 @@
 "duktiga hantverkare och kan smida vapen med smaragdkanter, och de bär tunga "
 "rustningar. Veteranerna bär hillebarder som de använder med stor bravur."
 
+#: 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 "första slaget"
+
 #: data/units/Drake_Warrior.cfg:4
 msgid "Drake Warrior"
 msgstr "Drakkrigare"
@@ -4318,6 +4413,10 @@
 msgid "berserker frenzy"
 msgstr "bärsärkagång"
 
+#: data/units/Dwarvish_Berserker.cfg:29 data/units/Dwarvish_Ulfserker.cfg:29
+msgid "berserk"
+msgstr "bärsärk"
+
 #: data/units/Dwarvish_Dragonguard.cfg:3
 msgid "Dwarvish Dragonguard"
 msgstr "Dvärgarnas drakvakt"
@@ -4500,6 +4599,13 @@
 msgid "Dwarvish Ulfserker"
 msgstr "Dvärgarnas ulvhedin"
 
+#: 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 "Åldrad magiker"
@@ -4538,7 +4644,7 @@
 "pilar men sårbara för eld. Genom att dra energi ur den omgivande naturen "
 "läker de sig snabbt."
 
-#: data/units/Elvish_Archer.cfg:3 data/units/Elvish_Archer.cfg:82
+#: data/units/Elvish_Archer.cfg:3
 msgid "Elvish Archer"
 msgstr "Alvbågskytt"
 
@@ -4552,7 +4658,12 @@
 "skicklighet i distansstrid. Dessa träffsäkra och snabba bågskyttar utgör 
en "
 "stor del av alvernas militär."
 
-#: data/units/Elvish_Avenger.cfg:3 data/units/Elvish_Avenger.cfg:76
+#: data/units/Elvish_Archer.cfg:82
+#, fuzzy
+msgid "female^Elvish Archer"
+msgstr "Alvbågskytt"
+
+#: data/units/Elvish_Avenger.cfg:3
 msgid "Elvish Avenger"
 msgstr "Alvjägare"
 
@@ -4567,6 +4678,11 @@
 "de absolut bästa skogsmännen i Wesnoth. De kan enkelt ligga i bakhåll för 
"
 "sina fiender i skogen, då de inte kan upptäckas förrän efter de anfallit."
 
+#: data/units/Elvish_Avenger.cfg:76
+#, fuzzy
+msgid "female^Elvish Avenger"
+msgstr "Alvjägare"
+
 #: data/units/Elvish_Captain.cfg:3
 msgid "Elvish Captain"
 msgstr "Alvkapten"
@@ -4597,7 +4713,8 @@
 "på distans."
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+#, fuzzy
+msgid "female^Elvish Druid"
 msgstr "Alvdruid"
 
 #: data/units/Elvish_Druid.cfg:20
@@ -4619,7 +4736,8 @@
 msgstr "törnen"
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+#, fuzzy
+msgid "female^Elvish Enchantress"
 msgstr "Huldra"
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -4682,10 +4800,18 @@
 "förödande eldklot."
 
 #: data/units/Elvish_Lady.cfg:4
-msgid "Elvish Lady"
+#, fuzzy
+msgid "female^Elvish Lady"
 msgstr "Alvfurstinna"
 
 #: 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 "knuffa"
 
@@ -4701,7 +4827,7 @@
 "Alvfurstarna är skräckinjagande i strid; där de i närstrid använder 
svärd "
 "och på håll förödande eldklot."
 
-#: data/units/Elvish_Marksman.cfg:3 data/units/Elvish_Marksman.cfg:80
+#: data/units/Elvish_Marksman.cfg:3
 msgid "Elvish Marksman"
 msgstr "Alvprickskytt"
 
@@ -4723,6 +4849,17 @@
 msgid "longbow"
 msgstr "långbåge"
 
+#: 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 "prickskytt"
+
+#: data/units/Elvish_Marksman.cfg:80
+#, fuzzy
+msgid "female^Elvish Marksman"
+msgstr "Alvprickskytt"
+
 #: data/units/Elvish_Marshal.cfg:3
 msgid "Elvish Marshal"
 msgstr "Alvöverste"
@@ -4752,7 +4889,7 @@
 "och utsatta flanker. De är lika skickliga med svärd som med båge, och 
slår "
 "till hårt innan de åter försvinner in i skogen."
 
-#: data/units/Elvish_Ranger.cfg:2 data/units/Elvish_Ranger.cfg:79
+#: data/units/Elvish_Ranger.cfg:2
 msgid "Elvish Ranger"
 msgstr "Skogsvaktaralv"
 
@@ -4768,6 +4905,11 @@
 "de inte upptäckas av fienden medan de är i skogen förrän de har gått 
till "
 "attack, eller då fienden står alldeles inpå dem."
 
+#: data/units/Elvish_Ranger.cfg:79
+#, fuzzy
+msgid "female^Elvish Ranger"
+msgstr "Skogsvaktaralv"
+
 #: data/units/Elvish_Rider.cfg:3
 msgid "Elvish Rider"
 msgstr "Alvryttare"
@@ -4793,7 +4935,8 @@
 "skicklighet på hästryggen är utan motstycke, men de saknar styrka i strid."
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+#, fuzzy
+msgid "female^Elvish Shaman"
 msgstr "Alvschaman"
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -4806,7 +4949,7 @@
 "fienden, som att snärja dem så att de anfaller en gång mindre. 
Alvschamaner "
 "kan också vårda trupper i sin närhet."
 
-#: data/units/Elvish_Sharpshooter.cfg:3 data/units/Elvish_Sharpshooter.cfg:82
+#: data/units/Elvish_Sharpshooter.cfg:3
 msgid "Elvish Sharpshooter"
 msgstr "Alvernas skarpskytt"
 
@@ -4821,8 +4964,14 @@
 "otroligt träffsäkra, och träffar i 60% av fallen även då de skjuter 
mycket "
 "snabbt. Skarpskyttarna är utmärkta till att rensa ut svåråtkomliga 
fiender."
 
+#: data/units/Elvish_Sharpshooter.cfg:82
+#, fuzzy
+msgid "female^Elvish Sharpshooter"
+msgstr "Alvernas skarpskytt"
+
 #: data/units/Elvish_Shyde.cfg:3
-msgid "Elvish Shyde"
+#, fuzzy
+msgid "female^Elvish Shyde"
 msgstr "Älva"
 
 #: data/units/Elvish_Shyde.cfg:20
@@ -4840,7 +4989,8 @@
 msgstr "älvaberöring"
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+#, fuzzy
+msgid "female^Elvish Sorceress"
 msgstr "Alvernas besvärjerska"
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -4856,7 +5006,8 @@
 "andevärlden som slår ner på deras fiender."
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+#, fuzzy
+msgid "female^Elvish Sylph"
 msgstr "Sylfid"
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -4965,7 +5116,15 @@
 msgid "Galleon"
 msgstr "Galjon"
 
-#: 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 "inget"
 
@@ -5075,12 +5234,6 @@
 "brist på sofistikerade vapen genom att överväldiga sina fiender med sitt "
 "antal. Spetsarvättarna är spjutvättarnas större och kunnigare 
släktingar."
 
-#: 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 "första slaget"
-
 #: data/units/Goblin_Knight.cfg:3
 msgid "Goblin Knight"
 msgstr "Riddarvätte"
@@ -5110,7 +5263,8 @@
 msgid "torch"
 msgstr "fackla"
 
-#: 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 "nät"
 
@@ -5166,7 +5320,7 @@
 "personliga styrka både i strid man-mot-man och i taktiska bedömningar. 
Deras "
 "närvaro på slagfältet är till stor hjälp för de som tjänar under dem."
 
-#: data/units/Great_Mage.cfg:3 data/units/Great_Mage.cfg:79
+#: data/units/Great_Mage.cfg:3
 msgid "Great Mage"
 msgstr "Stormagiker"
 
@@ -5178,17 +5332,15 @@
 "Stormagikerna är vördnadsbjudande och skräckinjagande fiender, starkare 
än "
 "till och med ärkemagikern."
 
+#: data/units/Great_Mage.cfg:79
+#, fuzzy
+msgid "female^Great Mage"
+msgstr "Stormagiker"
+
 #: data/units/Great_Troll.cfg:3
 msgid "Great Troll"
 msgstr "Stort 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 "regenererar"
-
 #: data/units/Great_Troll.cfg:16
 msgid ""
 "Great Trolls are strong and brutal humanoid monsters with the amazing "
@@ -5407,7 +5559,7 @@
 "furstar ledarskapsförmåga, och förbättrar stridsförmågan hos alla 
lägre "
 "rankade trupper i närheten."
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr "Magiker"
 
@@ -5427,11 +5579,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 "Ljusets magiker"
 
 #: data/units/Mage_of_Light.cfg:13 data/units/Mage_of_Light.cfg:73
+#: data/units/Mermaid_Diviner.cfg:8
 msgid "illuminates,cures"
 msgstr "lyser upp, botar"
 
@@ -5453,16 +5610,23 @@
 "magiker så botar han närliggande trupper."
 
 #: 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 "ljusbåge"
 
 #: 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 "helig"
 
+#: data/units/Mage_of_Light.cfg:66
+#, fuzzy
+msgid "female^Mage of Light"
+msgstr "Ljusets magiker"
+
 #: data/units/Master_Bowman.cfg:3
 msgid "Master Bowman"
 msgstr "Mästerbågskytt"
@@ -5477,11 +5641,28 @@
 "kan nå. Deras skicklighet med detta dödliga vapen överträffas endast av "
 "alverna."
 
-#: data/units/Merman.cfg:3
-msgid "Merman"
-msgstr "Sjöfolk"
+#: 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 "Huldra"
+
+#: 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."
@@ -5489,11 +5670,98 @@
 "Sjöfolket är skickliga varelser i havet. De är snabba och kraftfulla i "
 "vatten men har problem att röra 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 "vattenstråle"
+
+#: 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 "älvaberöring"
+
+#: data/units/Merman.cfg:3
+msgid "Merman"
+msgstr "Sjöfolk"
+
+#: 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 "treudd"
 
+#: data/units/Merman_Entangler.cfg:3
+#, fuzzy
+msgid "Merman Entangler"
+msgstr "snärja"
+
+#: data/units/Merman_Fighter.cfg:3
+#, fuzzy
+msgid "Merman Fighter"
+msgstr "Drakkämpe"
+
+#: data/units/Merman_Hoplite.cfg:3
+#, fuzzy
+msgid "Merman Hoplite"
+msgstr "Sjöfolk"
+
+#: data/units/Merman_Hunter.cfg:3
+#, fuzzy
+msgid "Merman Hunter"
+msgstr "Sjöfolk"
+
+#: data/units/Merman_Javelineer.cfg:3
+msgid "Merman Javelineer"
+msgstr ""
+
+#: data/units/Merman_Netcaster.cfg:3
+#, fuzzy
+msgid "Merman Netcaster"
+msgstr "Ödlefolkets ismanare"
+
+#: data/units/Merman_Spearman.cfg:3
+#, fuzzy
+msgid "Merman Spearman"
+msgstr "Spjutbärare"
+
+#: data/units/Merman_Triton.cfg:3
+#, fuzzy
+msgid "Merman Triton"
+msgstr "+Tysk översättning"
+
+#: data/units/Merman_Warrior.cfg:3
+#, fuzzy
+msgid "Merman Warrior"
+msgstr "Ödlekrigare"
+
 #: data/units/Mudcrawler.cfg:3
 msgid "Mudcrawler"
 msgstr "Slamkrypare"
@@ -5507,8 +5775,8 @@
 "attackerar genom att spruta kokande vatten på sina fiender."
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
-msgstr "Naga"
+msgid "female^Naga"
+msgstr ""
 
 #: data/units/Naga.cfg:17
 msgid ""
@@ -5559,10 +5827,6 @@
 "masker för att försöka dölja sina genomonda själar. Dessa föraktliga "
 "varelser kan gömma sig i natten utan att lämna ett enda spår av sin 
närvaro."
 
-#: data/units/Nightgaunt.cfg:18 data/units/Shadow.cfg:16
-msgid "nightstalk"
-msgstr "skuggsteg"
-
 #: data/units/Noble_Commander.cfg:3
 msgid "Noble Commander"
 msgstr "Adlig befälhavare"
@@ -5605,7 +5869,7 @@
 msgid "Ogre"
 msgstr "Jätte"
 
-#: 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 "
@@ -5726,7 +5990,7 @@
 "deras livskraft sinar."
 
 #: 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 "förbannelse"
 
@@ -5833,7 +6097,7 @@
 "och mycket fruktade av sina fiender. Deras enda svaghet är deras oförmåga "
 "att hantera en båge."
 
-#: data/units/Outlaw.cfg:3 data/units/Outlaw.cfg:75
+#: data/units/Outlaw.cfg:3
 msgid "Outlaw"
 msgstr "Fredlös"
 
@@ -5841,13 +6105,19 @@
 msgid "Outlaws fight better at night."
 msgstr "Fredlösa slåss bättre nattetid."
 
+#: data/units/Outlaw.cfg:75
+#, fuzzy
+msgid "female^Outlaw"
+msgstr "Fredlös"
+
 #: data/units/Outlaw.cfg:89
 msgid "Outlaws fight better at night. Female Outlaws look good while doing it."
 msgstr ""
 "Fredlösa slåss bättre nattetid. De kvinnliga fredlösa ser bra ut under 
tiden."
 
 #: data/units/Outlaw_Princess.cfg:4
-msgid "Outlaw Princess"
+#, fuzzy
+msgid "female^Outlaw Princess"
 msgstr "Fredlös prinsessa"
 
 #: data/units/Outlaw_Princess.cfg:19
@@ -5863,7 +6133,8 @@
 "drottningdöme med vad hon plundrar på vägarna."
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+#, fuzzy
+msgid "female^Outlaw Queen"
 msgstr "Fredlös drottning"
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -5941,7 +6212,14 @@
 msgid "Pirate Galleon"
 msgstr "Piratgaljon"
 
-#: 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"
@@ -5958,7 +6236,7 @@
 "Tjuvskyttar förlitar sig på sina jakterfarenheter, och är som mest "
 "värdefulla på natten och i skogar och träsk."
 
-#: 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 "
@@ -5972,7 +6250,7 @@
 "Prinsessan inspireras av hennes närvaro och kämpar bättre. Prinsessan är "
 "både smidig och fingerfärdig, och har tjuvliknande färdigheter."
 
-#: data/units/Red_Mage.cfg:3 data/units/Red_Mage.cfg:72
+#: data/units/Red_Mage.cfg:3
 msgid "Red Mage"
 msgstr "Röd magiker"
 
@@ -5986,6 +6264,11 @@
 "träffsäkerhet. Då de är både snabba och inte påverkas av tiden på 
dygnet är "
 "de värdefulla i nästan alla lägen."
 
+#: data/units/Red_Mage.cfg:72
+#, fuzzy
+msgid "female^Red Mage"
+msgstr "Röd magiker"
+
 #: data/units/Revenant.cfg:3
 msgid "Revenant"
 msgstr "Draug"
@@ -6110,10 +6393,11 @@
 msgstr "Ödlekrigare"
 
 #: 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 ""
@@ -6123,7 +6407,8 @@
 "krigare har styrkan att dra full nytta av detta faktum."
 
 #: data/units/Sea_Hag.cfg:3
-msgid "Sea Hag"
+#, fuzzy
+msgid "female^Sea Hag"
 msgstr "Sjöhagga"
 
 #: data/units/Sea_Hag.cfg:17
@@ -6134,10 +6419,6 @@
 "Sjöhaggor är äldre och mer erfarna bland nagafolket som har lärt sig att "
 "använda vattenmagi."
 
-#: data/units/Sea_Hag.cfg:27
-msgid "water spray"
-msgstr "vattenstråle"
-
 #: data/units/Sea_Orc.cfg:3
 msgid "Sea Orc"
 msgstr "Sjöorch"
@@ -6208,7 +6489,7 @@
 "Stormtrupperna är eliten i Wesnoths armé. Även om de rör sig långsamt 
är de "
 "väldigt kraftfulla och fruktade i hela Wesnoth och i landen bortom."
 
-#: data/units/Silver_Mage.cfg:3 data/units/Silver_Mage.cfg:142
+#: data/units/Silver_Mage.cfg:3
 msgid "Silver Mage"
 msgstr "Silvermagiker"
 
@@ -6222,10 +6503,24 @@
 "teleportera sig från en vänligt sinnad by till en annan. De är också 
mycket "
 "motståndskraftiga mot alla sorters magiska attacker."
 
+#: data/units/Silver_Mage.cfg:142
+#, fuzzy
+msgid "female^Silver Mage"
+msgstr "Silvermagiker"
+
 #: data/units/Skeletal_Dragon.cfg:3
 msgid "Skeletal Dragon"
 msgstr "Skelettdrake"
 
+#: 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äke"
@@ -6294,6 +6589,10 @@
 "Dessa gående lik har blivit starka genom sin långa erfarenhet av att slåss 
"
 "mot de levande."
 
+#: data/units/Soulless.cfg:24 data/units/Walking_Corpse.cfg:24
+msgid "plague"
+msgstr "pest"
+
 #: data/units/Spearman.cfg:3
 msgid "Spearman"
 msgstr "Spjutbärare"
@@ -6494,10 +6793,11 @@
 "ur sina offer och utvinner styrka ur detta."
 
 #: data/units/Vampire_Lady.cfg:3
-msgid "Vampire Lady"
+#, fuzzy
+msgid "female^Vampire Lady"
 msgstr "Vampyrdrottning"
 
-#: 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."
@@ -6505,7 +6805,7 @@
 "Sval och vacker, så bibehåller hon sitt ungdomliga utseende genom att 
dricka "
 "de levandes blod."
 
-#: data/units/Vampire_Lady.cfg:19
+#: data/units/Vampire_Lady.cfg:20
 msgid "blood kiss"
 msgstr "blodskyss"
 
@@ -6570,7 +6870,7 @@
 "Vakttorn är utmärkta för att se fiender på långt håll, och för att 
använda "
 "kastmaskiner för att beskjuta dem."
 
-#: data/units/White_Mage.cfg:3 data/units/White_Mage.cfg:65
+#: data/units/White_Mage.cfg:3
 msgid "White Mage"
 msgstr "Vit magiker"
 
@@ -6586,6 +6886,11 @@
 "magiker är kraftfulla i strid med vandöda, vilka lider stor skada av deras "
 "ljusbåge."
 
+#: data/units/White_Mage.cfg:65
+#, fuzzy
+msgid "female^White Mage"
+msgstr "Vit magiker"
+
 #: data/units/Wolf_Rider.cfg:3
 msgid "Wolf Rider"
 msgstr "Vargryttare"
@@ -6802,7 +7107,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 "Stäng"
 
@@ -6824,75 +7129,75 @@
 msgid "none"
 msgstr "inget"
 
-#: src/actions.cpp:321 src/actions.cpp:438
+#: src/actions.cpp:323 src/actions.cpp:441
 msgid "base damage"
 msgstr "basskada"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker resistance vs"
 msgstr "anfallarens motståndskraft mot"
 
-#: src/actions.cpp:331
+#: src/actions.cpp:333
 msgid "attacker vulnerability vs"
 msgstr "anfallarens sårbarhet för"
 
-#: 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 "fördubblad"
 
-#: src/actions.cpp:391 src/actions.cpp:526
+#: src/actions.cpp:393 src/actions.cpp:529
 msgid "total damage"
 msgstr "Total skada"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender resistance vs"
 msgstr "försvararens motståndskraft mot"
 
-#: src/actions.cpp:448
+#: src/actions.cpp:451
 msgid "defender vulnerability vs"
 msgstr "försvararens sårbarhet för"
 
-#: src/actions.cpp:499
+#: src/actions.cpp:502
 msgid "Halved"
 msgstr "Halverad"
 
-#: 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 "förgiftad"
 
-#: 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 "långsam"
 
-#: src/actions.cpp:1738
+#: src/actions.cpp:1739
 msgid "Ambushed!"
 msgstr "Bakhåll!"
 
-#: src/actions.cpp:1766
+#: src/actions.cpp:1767
 msgid "Friendly unit sighted"
 msgstr "Vänligt sinnad trupp inom synhåll"
 
-#: src/actions.cpp:1768
+#: src/actions.cpp:1769
 msgid "Enemy unit sighted!"
 msgstr "Fiendetrupp inom synhåll!"
 
-#: src/actions.cpp:1773
+#: src/actions.cpp:1774
 msgid "$friends Friendly units sighted"
 msgstr "$friends vänligt sinnade trupper inom synhåll"
 
-#: src/actions.cpp:1775
+#: src/actions.cpp:1776
 msgid "$enemies Enemy units sighted!"
 msgstr "$enemies fiendetrupper inom synhåll!"
 
-#: src/actions.cpp:1779
+#: src/actions.cpp:1780
 msgid "Units sighted! ($friends friendly, $enemies enemy)"
 msgstr ""
 "Trupper inom synhåll! ($friends vänligt sinnade trupper, $enemies "
 "fiendetrupper)"
 
-#: src/actions.cpp:1800
+#: src/actions.cpp:1801
 msgid "(press $hotkey to continue)"
 msgstr "(Tryck på $hotkey för att fortsätta)"
 
@@ -6952,7 +7257,7 @@
 msgid "replay"
 msgstr "repris"
 
-#: 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 "Drag"
 
@@ -7020,23 +7325,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 "nivå"
 
-#: 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 "Förflyttning"
 
-#: 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ärstrid"
 
-#: 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 "distans"
 
@@ -7056,11 +7361,11 @@
 msgid "Do you want to save a replay of this scenario?"
 msgstr "Vill du spara en repris av detta scenario?"
 
-#: 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 "Namn:"
 
-#: 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 "Spelet kunde inte sparas"
 
@@ -7125,8 +7430,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 "Fel"
 
@@ -7190,7 +7495,7 @@
 "kampanj."
 
 #: 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 "Anslutningstiden tog slut"
 
@@ -7246,7 +7551,7 @@
 msgid "Play a game against AI opponents"
 msgstr "Spela mot datorn"
 
-#: src/game.cpp:1197 src/multiplayer_client.cpp:298
+#: src/game.cpp:1197 src/multiplayer_client.cpp:303
 msgid "Login"
 msgstr "Logga in"
 
@@ -7266,79 +7571,79 @@
 msgid "Could not initialize fonts. Exiting.\n"
 msgstr "Typsnittsfel. Avbryter.\n"
 
-#: src/help.cpp:574
+#: src/help.cpp:571
 msgid "Advances to"
 msgstr "Kan befordras till"
 
-#: src/help.cpp:623
+#: src/help.cpp:614
 msgid "Alignment"
 msgstr "Livsåskådning"
 
-#: src/help.cpp:627
+#: src/help.cpp:618
 msgid "Required XP"
 msgstr "EP för nästa nivå"
 
-#: src/help.cpp:637 src/reports.cpp:233
+#: src/help.cpp:628 src/reports.cpp:233
 msgid "attacks"
 msgstr "attacker"
 
-#: 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 "Namn"
 
-#: 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 "Skada"
 
-#: src/help.cpp:657 src/help.cpp:658
+#: src/help.cpp:648 src/help.cpp:649
 msgid "Strikes"
 msgstr "Slag"
 
-#: src/help.cpp:661 src/help.cpp:662
+#: src/help.cpp:652 src/help.cpp:653
 msgid "Range"
 msgstr "Räckvidd"
 
-#: src/help.cpp:665 src/help.cpp:666
+#: src/help.cpp:656 src/help.cpp:657
 msgid "Special"
 msgstr "Specialitet"
 
-#: src/help.cpp:723
+#: src/help.cpp:702
 msgid "Resistances"
 msgstr "Motståndskraft mot olika attacker"
 
-#: src/help.cpp:727 src/help.cpp:728
+#: src/help.cpp:706 src/help.cpp:707
 msgid "Attack Type"
 msgstr "Attacktyp"
 
-#: src/help.cpp:731 src/help.cpp:732
+#: src/help.cpp:710 src/help.cpp:711
 msgid "Resistance"
 msgstr "Motståndskraft"
 
-#: src/help.cpp:763
+#: src/help.cpp:739
 msgid "Terrain Modifiers"
 msgstr "Terrängavdrag"
 
-#: src/help.cpp:767 src/help.cpp:768
+#: src/help.cpp:743 src/help.cpp:744
 msgid "Terrain"
 msgstr "Terräng"
 
-#: src/help.cpp:775 src/help.cpp:776
+#: src/help.cpp:751 src/help.cpp:752
 msgid "Defense"
 msgstr "Försvar"
 
-#: src/help.cpp:1876
+#: src/help.cpp:1854
 msgid "< Back"
 msgstr "< Bakåt"
 
-#: src/help.cpp:1877
+#: src/help.cpp:1855
 msgid "Forward >"
 msgstr "Framåt >"
 
-#: src/help.cpp:2375
+#: src/help.cpp:2353
 msgid "The Battle for Wesnoth Help"
 msgstr "Hjälp om Kampen om Wesnoth"
 
@@ -7350,7 +7655,7 @@
 msgid "End Unit Turn"
 msgstr "Avsluta truppens drag"
 
-#: src/hotkeys.cpp:122 src/playturn.cpp:1531
+#: src/hotkeys.cpp:122 src/playturn.cpp:1532
 msgid "Leader"
 msgstr "Ledare"
 
@@ -7386,11 +7691,11 @@
 msgid "Unit Description"
 msgstr "Truppbeskrivning"
 
-#: src/hotkeys.cpp:131 src/playturn.cpp:1351
+#: src/hotkeys.cpp:131 src/playturn.cpp:1352
 msgid "Rename Unit"
 msgstr "Döp om truppen"
 
-#: src/hotkeys.cpp:134 src/playturn.cpp:1641
+#: src/hotkeys.cpp:134 src/playturn.cpp:1642
 msgid "Recruit"
 msgstr "Rekrytera"
 
@@ -7398,7 +7703,7 @@
 msgid "Repeat Recruit"
 msgstr "Upprepa rekrytering"
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr "Återkalla"
 
@@ -7434,11 +7739,11 @@
 msgid "Scenario Objectives"
 msgstr "Scenariomål"
 
-#: src/hotkeys.cpp:146 src/playturn.cpp:2007
+#: src/hotkeys.cpp:146 src/playturn.cpp:2008
 msgid "Unit List"
 msgstr "Trupplista"
 
-#: src/hotkeys.cpp:147 src/playturn.cpp:2096
+#: src/hotkeys.cpp:147 src/playturn.cpp:2097
 msgid "Statistics"
 msgstr "Statistik"
 
@@ -7546,7 +7851,7 @@
 msgid "Speak to All"
 msgstr "Tala med alla"
 
-#: src/hotkeys.cpp:174 src/show_dialog.cpp:609
+#: src/hotkeys.cpp:174 src/show_dialog.cpp:628
 msgid "Help"
 msgstr "Hjälp"
 
@@ -7606,7 +7911,7 @@
 msgid "Bump Size"
 msgstr "Kullstorlek"
 
-#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1532
+#: src/mapgen_dialog.cpp:85 src/playturn.cpp:1533
 msgid "Villages"
 msgstr "Byar"
 
@@ -7655,15 +7960,11 @@
 msgstr ""
 "Fiendetrupper kan ses endast om de befinner sig inom dina truppers räckvidd"
 
-#: src/multiplayer.cpp:111 src/multiplayer_lobby.cpp:130
-msgid "Shroud"
-msgstr "Slöja"
-
 #: src/multiplayer.cpp:113
 msgid "The map is unknown until your units explore it"
 msgstr "Kartan är okänd tills dina trupper utforskar den"
 
-#: src/multiplayer.cpp:115 src/reports.cpp:376
+#: src/multiplayer.cpp:115 src/reports.cpp:375
 msgid "Observers"
 msgstr "Åskådare"
 
@@ -7671,13 +7972,13 @@
 msgid "Allow users who are not playing to watch the game"
 msgstr "Tillåt användare som inte spelar att beskåda spelet"
 
-#: 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 "Avbryt"
 
-#: 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"
 
@@ -7754,69 +8055,69 @@
 msgid "Warning"
 msgstr "Varning"
 
-#: src/multiplayer_client.cpp:59
+#: src/multiplayer_client.cpp:62
 msgid "Receiving game list..."
 msgstr "Hämtar spellista..."
 
-#: 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 "Väntar på att spelet skall starta..."
 
-#: src/multiplayer_client.cpp:248
+#: src/multiplayer_client.cpp:253
 msgid "Connect to Host"
 msgstr "Anslut till server"
 
-#: src/multiplayer_client.cpp:250
+#: src/multiplayer_client.cpp:255
 msgid "Choose host to connect to"
 msgstr "Välj server att ansluta dig till"
 
-#: src/multiplayer_client.cpp:268
+#: src/multiplayer_client.cpp:273
 msgid "Connecting to remote host..."
 msgstr "Ansluter till server"
 
-#: src/multiplayer_client.cpp:297
+#: src/multiplayer_client.cpp:302
 msgid "You must log in to this server"
 msgstr "Du måste logga in på den här servern."
 
-#: src/multiplayer_client.cpp:377
+#: src/multiplayer_client.cpp:382
 msgid "Getting game data..."
 msgstr "Hämtar spelinformation..."
 
-#: src/multiplayer_client.cpp:429
+#: src/multiplayer_client.cpp:434
 msgid "There are no available sides in this game."
 msgstr "Det finns inga tillgängliga sidor."
 
-#: src/multiplayer_client.cpp:477
+#: src/multiplayer_client.cpp:482
 msgid "Choose your side:"
 msgstr "Välj sida:"
 
-#: src/multiplayer_client.cpp:508
+#: src/multiplayer_client.cpp:513
 msgid "The game has been cancelled"
 msgstr "Spelet har blivit avbrutet"
 
-#: src/multiplayer_client.cpp:512
+#: src/multiplayer_client.cpp:517
 msgid "The side you have chosen is no longer available"
 msgstr "Den sida som du har valt är inte längre tillgänglig"
 
-#: src/multiplayer_client.cpp:548
+#: src/multiplayer_client.cpp:553
 msgid "Show replay of game up to save point?"
 msgstr "Visa repris av spelet fram till senaste gången du sparade?"
 
-#: 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 "Ledare: "
 
-#: src/multiplayer_client.cpp:779
+#: src/multiplayer_client.cpp:784
 msgid "Recruits: "
 msgstr "Rekryterade: "
 
@@ -7848,8 +8149,8 @@
 msgid "Local Player"
 msgstr "Lokal spelare"
 
-#: 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 "Datorspelare"
 
@@ -7914,7 +8215,7 @@
 msgid "Color"
 msgstr "Färg"
 
-#: 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 "Väntar på att nätverksspelare skall ansluta sig"
 
@@ -7999,54 +8300,54 @@
 msgid "It is now your turn"
 msgstr "Nu är det din tur"
 
-#: src/playturn.cpp:486
+#: src/playturn.cpp:487
 msgid "Attacker"
 msgstr "Anfallare"
 
-#: src/playturn.cpp:488
+#: src/playturn.cpp:489
 msgid "Defender"
 msgstr "Försvarare"
 
-#: src/playturn.cpp:512 src/playturn.cpp:631
+#: src/playturn.cpp:513 src/playturn.cpp:632
 msgid "Damage Calculations"
 msgstr "Skadeberäkning"
 
-#: src/playturn.cpp:597
+#: src/playturn.cpp:598
 msgid "Melee"
 msgstr "Närstrid"
 
-#: src/playturn.cpp:610 src/reports.cpp:210
+#: src/playturn.cpp:611 src/reports.cpp:208
 msgid "vs"
 msgstr "mot"
 
-#: src/playturn.cpp:643
+#: src/playturn.cpp:644
 msgid "Attack Enemy"
 msgstr "Anfall fiende"
 
-#: src/playturn.cpp:644
+#: src/playturn.cpp:645
 msgid "Choose weapon"
 msgstr "Välj vapen:"
 
-#: 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 ännu inte påbörjat ditt drag. Vill du verkligen avsluta ditt drag?"
 
-#: 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Ã¥gra trupper kan fortfarande flytta. Vill du verkligen avsluta ditt drag?"
 
-#: src/playturn.cpp:1155
+#: src/playturn.cpp:1156
 msgid "Auto-Save"
 msgstr "Automatsparat"
 
-#: src/playturn.cpp:1157
+#: src/playturn.cpp:1158
 msgid "Could not auto save the game. Please save the game manually."
 msgstr "Kunde inte automatspara spelet. Var vänlig och spara spelet manuellt."
 
-#: src/playturn.cpp:1396
+#: src/playturn.cpp:1397
 msgid ""
 "Save names may not contain colons, slashes, or backslashes. Please choose a "
 "different name."
@@ -8054,35 +8355,35 @@
 "Du får inte använda kolon eller någon form av snedstreck när du sparar 
ett "
 "spel. Var vänlig välj ett annat namn."
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "Saved"
 msgstr "Sparat"
 
-#: src/playturn.cpp:1407
+#: src/playturn.cpp:1408
 msgid "The game has been saved"
 msgstr "Spelet har sparats"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Income"
 msgstr "Inkomst"
 
-#: src/playturn.cpp:1533
+#: src/playturn.cpp:1534
 msgid "Upkeep"
 msgstr "Underhåll"
 
-#: src/playturn.cpp:1629
+#: src/playturn.cpp:1630
 msgid "You have no units available to recruit."
 msgstr "Det finns inte några trupper tillgängliga att värva till armén."
 
-#: src/playturn.cpp:1642 src/playturn.cpp:1821
+#: src/playturn.cpp:1643 src/playturn.cpp:1822
 msgid "Select unit"
 msgstr "Välj trupp"
 
-#: src/playturn.cpp:1671
+#: src/playturn.cpp:1672
 msgid "You don't have enough gold to recruit that unit"
 msgstr "Du har inte tillräckligt med guld för att rekrytera den truppen"
 
-#: 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?"
@@ -8090,7 +8391,7 @@
 "Ers nåd, denna trupp är erfaren och har befordrats. Vill ni verkligen "
 "avskeda $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?"
@@ -8098,20 +8399,20 @@
 "Ers nåd, denna trupp kommer snart att avancera till en högre nivå. Vill ni 
"
 "verkligen avskeda $noun?"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "her"
 msgstr "henne"
 
-#: src/playturn.cpp:1736
+#: src/playturn.cpp:1737
 msgid "him"
 msgstr "honom"
 
-#: src/playturn.cpp:1777
+#: src/playturn.cpp:1778
 msgid "You are separated from your soldiers and may not recall them"
 msgstr ""
 "Du är inte tillsammans med dina soldater och kan därför inte återkalla 
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)"
@@ -8119,88 +8420,88 @@
 "Det finns inga trupper att återkalla.\n"
 "(Du måste ha överlevande veteraner från ett tidigare scenario)"
 
-#: src/playturn.cpp:1785
+#: src/playturn.cpp:1786
 msgid "You must have at least $cost gold pieces to recall a unit"
 msgstr ""
 "Du måste ha åtminstone $cost guldstycken för att kunna återkalla en trupp"
 
-#: src/playturn.cpp:1808
+#: src/playturn.cpp:1809
 msgid "Dismiss Unit"
 msgstr "Avskeda trupp"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Message"
 msgstr "Meddelande"
 
-#: src/playturn.cpp:1865
+#: src/playturn.cpp:1866
 msgid "Send to allies only"
 msgstr "Skicka enbart till allierade"
 
-#: src/playturn.cpp:1959
+#: src/playturn.cpp:1960
 msgid "Location"
 msgstr "Position"
 
-#: src/playturn.cpp:2041 src/playturn.cpp:2103
+#: src/playturn.cpp:2042 src/playturn.cpp:2104
 msgid "Recruits"
 msgstr "Rekryterade"
 
-#: src/playturn.cpp:2047 src/playturn.cpp:2107
+#: src/playturn.cpp:2048 src/playturn.cpp:2108
 msgid "Recalls"
 msgstr "Återkallade"
 
-#: src/playturn.cpp:2053 src/playturn.cpp:2111
+#: src/playturn.cpp:2054 src/playturn.cpp:2112
 msgid "Advancements"
 msgstr "Befordringar"
 
-#: src/playturn.cpp:2059 src/playturn.cpp:2115
+#: src/playturn.cpp:2060 src/playturn.cpp:2116
 msgid "Losses"
 msgstr "Förluster"
 
-#: src/playturn.cpp:2065 src/playturn.cpp:2119
+#: src/playturn.cpp:2066 src/playturn.cpp:2120
 msgid "Kills"
 msgstr "Dödsfall"
 
-#: src/playturn.cpp:2071
+#: src/playturn.cpp:2072
 msgid "Damage Inflicted"
 msgstr "Åsamkad skada"
 
-#: src/playturn.cpp:2077
+#: src/playturn.cpp:2078
 msgid "Damage Taken"
 msgstr "Mottagen skada"
 
-#: src/playturn.cpp:2083
+#: src/playturn.cpp:2084
 msgid "Damage Inflicted (EV)"
 msgstr "Åsamkad skada (VV)"
 
-#: src/playturn.cpp:2090
+#: src/playturn.cpp:2091
 msgid "Damage Taken (EV)"
 msgstr "Mottagen skada (VV)"
 
-#: src/playturn.cpp:2133
+#: src/playturn.cpp:2134
 msgid "Search"
 msgstr "Sök"
 
-#: 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 "Chattlogg"
 
-#: src/playturn.cpp:2219
+#: src/playturn.cpp:2220
 msgid "Couldn't find label or unit containing the string '$search'."
 msgstr "Kunde inte finna namn eller trupp som innehöll textsträngen 
'$search'."
 
-#: src/playturn.cpp:2296
+#: src/playturn.cpp:2297
 msgid "Place Label"
 msgstr "Sätt ut namn"
 
-#: src/playturn.cpp:2297
+#: src/playturn.cpp:2298
 msgid "Label"
 msgstr "Namn"
 
-#: 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?"
@@ -8208,23 +8509,23 @@
 "Spelen är osynkroniserade och måste avslutas. Vill du spara en fellogg 
över "
 "ditt spel?"
 
-#: src/playturn.cpp:2473
+#: src/playturn.cpp:2474
 msgid "Replace with AI"
 msgstr "Ersätt spelare med datorn"
 
-#: src/playturn.cpp:2474
+#: src/playturn.cpp:2475
 msgid "Replace with local player"
 msgstr "Ersätt med lokal spelare"
 
-#: src/playturn.cpp:2475
+#: src/playturn.cpp:2476
 msgid "Abort game"
 msgstr "Avbryt spelet"
 
-#: src/playturn.cpp:2478
+#: src/playturn.cpp:2479
 msgid "Replace with "
 msgstr "Ersätt med"
 
-#: src/playturn.cpp:2482
+#: src/playturn.cpp:2483
 msgid "has left the game. What do you want to do?"
 msgstr "har lämnat spelet. Vad vill du göra?"
 
@@ -8287,63 +8588,63 @@
 msgid "Chaotic units"
 msgstr "Kaotiska trupper"
 
-#: src/reports.cpp:312
+#: src/reports.cpp:311
 msgid "Owned village"
 msgstr "Kontrollerad by"
 
-#: src/reports.cpp:314
+#: src/reports.cpp:313
 msgid "Enemy village"
 msgstr "Fientlig by"
 
-#: src/reports.cpp:316
+#: src/reports.cpp:315
 msgid "Allied village"
 msgstr "Allierad by"
 
-#: 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 "Träningsspel"
 
-#: src/titlescreen.cpp:167
+#: src/titlescreen.cpp:173
 msgid "TitleScreen button^Campaign"
 msgstr "Kampanj"
 
-#: src/titlescreen.cpp:168
+#: src/titlescreen.cpp:174
 msgid "TitleScreen button^Multiplayer"
 msgstr "Gruppspel"
 
-#: src/titlescreen.cpp:169
+#: src/titlescreen.cpp:175
 msgid "TitleScreen button^Load"
 msgstr "Öppna"
 
-#: src/titlescreen.cpp:170
+#: src/titlescreen.cpp:176
 msgid "TitleScreen button^Language"
 msgstr "Språk"
 
-#: src/titlescreen.cpp:171
+#: src/titlescreen.cpp:177
 msgid "TitleScreen button^Preferences"
 msgstr "Inställningar"
 
-#: src/titlescreen.cpp:173
+#: src/titlescreen.cpp:179
 msgid "TitleScreen button^Quit"
 msgstr "Avsluta"
 
-#: src/titlescreen.cpp:174
+#: src/titlescreen.cpp:180
 msgid "Start a tutorial to familiarize yourself with the game"
 msgstr "Starta ett träningsspel för att bekanta dig med spelet"
 
-#: src/titlescreen.cpp:175
+#: src/titlescreen.cpp:181
 msgid "Start a new single player campaign"
 msgstr "Starta en ny kampanj för en spelare"
 
-#: src/titlescreen.cpp:176
+#: src/titlescreen.cpp:182
 msgid ""
 "Play multiplayer (hotseat, LAN, or Internet), or a single scenario against "
 "the AI"
@@ -8351,31 +8652,31 @@
 "Starta ett gruppspel (hotseat, LAN eller internet), eller ett separat "
 "scenario mot datorn"
 
-#: src/titlescreen.cpp:177
+#: src/titlescreen.cpp:183
 msgid "Load a single player saved game"
 msgstr "Öppna ett sparat privat spel"
 
-#: src/titlescreen.cpp:178
+#: src/titlescreen.cpp:184
 msgid "Change the language"
 msgstr "Byt språk"
 
-#: src/titlescreen.cpp:179
+#: src/titlescreen.cpp:185
 msgid "Configure the game's settings"
 msgstr "Konfigurera spelet"
 
-#: src/titlescreen.cpp:180
+#: src/titlescreen.cpp:186
 msgid "View the credits"
 msgstr "Medverkande"
 
-#: src/titlescreen.cpp:181
+#: src/titlescreen.cpp:187
 msgid "Quit the game"
 msgstr "Avsluta spelet"
 
-#: src/titlescreen.cpp:205
+#: src/titlescreen.cpp:211
 msgid "More"
 msgstr "Läs mer"
 
-#: src/titlescreen.cpp:212
+#: src/titlescreen.cpp:218
 msgid "-- The Tome of Wesnoth"
 msgstr "-- Wesnoths krönika"
 
@@ -8383,15 +8684,15 @@
 msgid "strikes"
 msgstr "slag"
 
-#: 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 "lagenlig"
 
-#: src/unit_types.cpp:891
+#: src/unit_types.cpp:889
 msgid "neutral"
 msgstr "neutral"
 
@@ -8402,3 +8703,15 @@
 #: src/widgets/file_chooser.cpp:173
 msgid "Deletion of the file failed."
 msgstr "Kunde ej radera fil."
+
+#~ msgid "first strike"
+#~ msgstr "första slaget"
+
+#~ msgid "Swamp"
+#~ msgstr "Träsk"
+
+#~ msgid "Tundra"
+#~ msgstr "Tundra"
+
+#~ msgid "Naga"
+#~ msgstr "Naga"
Index: wesnoth/po/wesnoth/wesnoth.pot
diff -u wesnoth/po/wesnoth/wesnoth.pot:1.4 wesnoth/po/wesnoth/wesnoth.pot:1.5
--- wesnoth/po/wesnoth/wesnoth.pot:1.4  Sun Oct 17 12:47:50 2004
+++ wesnoth/po/wesnoth/wesnoth.pot      Thu Oct 21 20:22:41 2004
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -17,7 +17,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 ""
 
@@ -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,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 ""
+
+#: 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
+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
+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 +1790,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 +1863,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"
+#: 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 +1893,44 @@
 "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"
+#: 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
+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 +1939,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,517 +1948,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 ""
 
-#: 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: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
-msgid "illuminates"
+#: 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 ""
 
-#: 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"
-msgstr ""
-
-#: data/translations/english.cfg:132
-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
-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
-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
+#: 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: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"
+#: data/translations/english.cfg:144
+msgid ""
+"Magical:\n"
+"This attack always has a 70% chance to hit."
 msgstr ""
 
-#: data/translations/english.cfg:194
-msgid "Hills"
+#: 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:195
-msgid "Mountains"
+#: 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:196
-msgid "Forest"
+#: 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"
+#: 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"
+#: 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"
+#: data/translations/english.cfg:162
+msgid "Elves"
 msgstr ""
 
-#: data/translations/english.cfg:202
-msgid "Cave"
+#: data/translations/english.cfg:163
+msgid "Humans"
 msgstr ""
 
-#: data/translations/english.cfg:203
-msgid "Cave Wall"
+#: data/translations/english.cfg:164
+msgid "Orcs"
 msgstr ""
 
-#: data/translations/english.cfg:204
-msgid "Encampment"
+#: 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-"
@@ -2331,7 +2310,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 "
@@ -2339,7 +2318,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 "
@@ -2347,83 +2326,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 "
@@ -2431,7 +2410,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 "
@@ -2439,75 +2418,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."
@@ -2533,7 +2512,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
@@ -2546,12 +2525,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 ""
@@ -2577,7 +2593,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
@@ -2585,19 +2601,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
@@ -2617,7 +2638,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 ""
 
@@ -2632,6 +2653,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
@@ -2647,7 +2670,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
@@ -2659,12 +2682,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 ""
@@ -2689,7 +2716,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
@@ -2727,21 +2754,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
@@ -2749,16 +2777,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 ""
@@ -2781,16 +2823,15 @@
 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
+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 "
@@ -2798,7 +2839,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
@@ -2822,18 +2863,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 "
@@ -2842,9 +2887,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 ""
 
@@ -2932,7 +2977,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
@@ -2941,7 +2992,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
@@ -2949,7 +3000,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 ""
@@ -3008,6 +3059,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 ""
@@ -3026,13 +3085,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 ""
@@ -3048,6 +3118,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 ""
@@ -3106,17 +3181,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 ""
 
@@ -3370,6 +3445,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 ""
@@ -3411,6 +3492,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 ""
@@ -3562,6 +3647,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 ""
@@ -3591,7 +3683,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 ""
 
@@ -3602,7 +3694,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 ""
 
@@ -3614,6 +3710,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 ""
@@ -3637,7 +3737,7 @@
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:3
-msgid "Elvish Druid"
+msgid "female^Elvish Druid"
 msgstr ""
 
 #: data/units/Elvish_Druid.cfg:20
@@ -3656,7 +3756,7 @@
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:3
-msgid "Elvish Enchantress"
+msgid "female^Elvish Enchantress"
 msgstr ""
 
 #: data/units/Elvish_Enchantress.cfg:21
@@ -3709,10 +3809,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 ""
 
@@ -3726,7 +3833,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 ""
 
@@ -3744,6 +3851,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 ""
@@ -3767,7 +3884,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 ""
 
@@ -3779,6 +3896,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 ""
@@ -3800,7 +3921,7 @@
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:3
-msgid "Elvish Shaman"
+msgid "female^Elvish Shaman"
 msgstr ""
 
 #: data/units/Elvish_Shaman.cfg:20
@@ -3810,7 +3931,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 ""
 
@@ -3822,8 +3943,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
@@ -3838,7 +3963,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:3
-msgid "Elvish Sorceress"
+msgid "female^Elvish Sorceress"
 msgstr ""
 
 #: data/units/Elvish_Sorceress.cfg:21
@@ -3850,7 +3975,7 @@
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:3
-msgid "Elvish Sylph"
+msgid "female^Elvish Sylph"
 msgstr ""
 
 #: data/units/Elvish_Sylph.cfg:20
@@ -3942,7 +4067,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 ""
 
@@ -4034,12 +4167,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 ""
@@ -4064,7 +4191,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 ""
 
@@ -4109,7 +4237,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 ""
 
@@ -4119,15 +4247,12 @@
 "in power."
 msgstr ""
 
-#: data/units/Great_Troll.cfg:3
-msgid "Great Troll"
+#: data/units/Great_Mage.cfg:79
+msgid "female^Great Mage"
 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"
+#: data/units/Great_Troll.cfg:3
+msgid "Great Troll"
 msgstr ""
 
 #: data/units/Great_Troll.cfg:16
@@ -4298,7 +4423,7 @@
 "level units."
 msgstr ""
 
-#: data/units/Mage.cfg:3 data/units/Mage.cfg:70
+#: data/units/Mage.cfg:3
 msgid "Mage"
 msgstr ""
 
@@ -4314,11 +4439,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 ""
 
@@ -4334,16 +4464,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 ""
@@ -4355,21 +4491,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/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 ""
+
+#: 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 ""
@@ -4381,7 +4611,7 @@
 msgstr ""
 
 #: data/units/Naga.cfg:3
-msgid "Naga"
+msgid "female^Naga"
 msgstr ""
 
 #: data/units/Naga.cfg:17
@@ -4422,10 +4652,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 ""
@@ -4463,7 +4689,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 "
@@ -4557,7 +4783,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 ""
 
@@ -4636,7 +4862,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 ""
 
@@ -4644,12 +4870,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
@@ -4661,7 +4891,7 @@
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:3
-msgid "Outlaw Queen"
+msgid "female^Outlaw Queen"
 msgstr ""
 
 #: data/units/Outlaw_Queen.cfg:17
@@ -4724,7 +4954,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 ""
@@ -4739,7 +4976,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 "
@@ -4748,7 +4985,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 ""
 
@@ -4759,6 +4996,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 ""
@@ -4861,13 +5102,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
@@ -4876,10 +5117,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 ""
@@ -4935,7 +5172,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 ""
 
@@ -4946,10 +5183,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 ""
@@ -5008,6 +5258,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 ""
@@ -5169,16 +5423,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 ""
 
@@ -5231,7 +5485,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 ""
 
@@ -5243,6 +5497,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 ""
@@ -5437,7 +5695,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 ""
 
@@ -5457,73 +5715,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 ""
 
@@ -5583,7 +5841,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 ""
 
@@ -5643,23 +5901,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 ""
 
@@ -5679,11 +5937,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 ""
 
@@ -5745,8 +6003,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 ""
 
@@ -5808,7 +6066,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 ""
 
@@ -5864,7 +6122,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 ""
 
@@ -5884,79 +6142,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 ""
 
@@ -5968,7 +6226,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 ""
 
@@ -6004,11 +6262,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 ""
 
@@ -6016,7 +6274,7 @@
 msgid "Repeat Recruit"
 msgstr ""
 
-#: src/hotkeys.cpp:136 src/playturn.cpp:1820
+#: src/hotkeys.cpp:136 src/playturn.cpp:1821
 msgid "Recall"
 msgstr ""
 
@@ -6052,11 +6310,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 ""
 
@@ -6164,7 +6422,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 ""
 
@@ -6224,7 +6482,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 ""
 
@@ -6272,15 +6530,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 ""
 
@@ -6288,13 +6542,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 ""
 
@@ -6368,69 +6622,69 @@
 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
 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 ""
 
@@ -6460,8 +6714,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 ""
 
@@ -6526,7 +6780,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 ""
 
@@ -6609,218 +6863,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 ""
 
@@ -6872,93 +7126,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 ""
 
@@ -6966,15 +7220,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 ""
 




reply via email to

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