diff --git a/changelog b/changelog
index f5e36501e723..a4aaa99ed50e 100644
--- a/changelog
+++ b/changelog
@@ -1,7 +1,7 @@
 Version 1.12.5+dev:
  * Language and i18n:
    * Updated translations: British English, Galician, Italian, Japanese,
-     Portuguese, RACV, Russian, Scottish Gaelic, Slovak, Swedish
+     Portuguese, RACV, Russian, Scottish Gaelic, Slovak, Spanish, Swedish
  * Terrains:
    * Fixed glitches of river ford transitions.
  * User interface:
diff --git a/players_changelog b/players_changelog
index 664f23ad4645..b62d502825a7 100644
--- a/players_changelog
+++ b/players_changelog
@@ -5,7 +5,7 @@ changelog: https://github.com/wesnoth/wesnoth/blob/1.12/changelog
 Version 1.12.5+dev:
  * Language and i18n:
    * Updated translations: British English, Galician, Italian, Japanese,
-     Portuguese, RACV, Russian, Scottish Gaelic, Slovak, Swedish.
+     Portuguese, RACV, Russian, Scottish Gaelic, Slovak, Spanish, Swedish.
 
 
 Version 1.12.5:
diff --git a/po/wesnoth-editor/es.po b/po/wesnoth-editor/es.po
index acf4d9f7ba37..bc4c6f820437 100644
--- a/po/wesnoth-editor/es.po
+++ b/po/wesnoth-editor/es.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2016-05-09 21:24-0300\n"
-"PO-Revision-Date: 2015-10-31 16:22+0100\n"
+"PO-Revision-Date: 2016-05-15 14:31+0100\n"
 "Last-Translator: Pepe <donpepe1963@gmail.com>\n"
 "Language-Team: Wesnoth\n"
 "Language: es\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #. [brush]: id=brush-1
 #: data/core/editor/brushes.cfg:6
@@ -45,10 +45,8 @@ msgstr "Línea de hexágonos NO–SE"
 
 #. [brush]: id=brush-sw-ne
 #: data/core/editor/brushes.cfg:63
-#, fuzzy
-#| msgid "Hex Line SE-NW"
 msgid "Hex Line SW-NE"
-msgstr "Línea de hexágonos SE–NO"
+msgstr "Línea de hexágonos SO–NE"
 
 #. [editor_group]: id=all
 #: data/core/editor/terrain-groups.cfg:11
diff --git a/po/wesnoth-low/es.po b/po/wesnoth-low/es.po
index 1dba7c4a20f0..3ad646389b22 100644
--- a/po/wesnoth-low/es.po
+++ b/po/wesnoth-low/es.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2016-05-09 21:24-0300\n"
-"PO-Revision-Date: 2014-10-19 21:36+0100\n"
+"PO-Revision-Date: 2016-05-15 14:55+0200\n"
 "Last-Translator: Pepe <donpepe1963@gmail.com>\n"
 "Language-Team: Wesnoth\n"
 "Language: es\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.9\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
 #. [campaign]: id=LOW, type=hybrid
 #: data/campaigns/Legend_of_Wesmere/_main.cfg:42
@@ -539,6 +539,12 @@ msgid ""
 "\n"
 "The current game will be aborted."
 msgstr ""
+"<i>La leyenda de Wesmere</i> no es compatible con la opción de <b>Sortear "
+"bandos</b>, que estaba activada para esta partida. Por favor, desactive "
+"<b>Sortear bandos</b> en la pantalla de configuración de la partida y cree "
+"una nueva partida.\n"
+"\n"
+"La partida actual será cancelada."
 
 #. [message]: id=Kalenz
 #: data/campaigns/Legend_of_Wesmere/scenarios/chapter1/01_The_Uprooting.cfg:398
diff --git a/po/wesnoth-units/es.po b/po/wesnoth-units/es.po
index ef73fb20ee5e..cbd9c22b5e29 100644
--- a/po/wesnoth-units/es.po
+++ b/po/wesnoth-units/es.po
@@ -4089,8 +4089,8 @@ msgid ""
 "soldiers to fight for their cause. Despite this, they are often found "
 "leading from the front, taking down their foes with sword and shield."
 msgstr ""
-"Distinguidos por su valentía y habilidad. Los Shuja son los lideres de "
-"entre las filas Khalif. Sus hazañas son bien conocidas entre sus compañeros, "
+"Distinguidos por su valentía y habilidad. Los Shuja son los lideres de entre "
+"las filas Khalif. Sus hazañas son bien conocidas entre sus compañeros, "
 "inspirando a los soldados para luchar por su causa. A pesar de esto, se "
 "encuentran a menudo liderando el frente, derribando a sus enemigos con "
 "espada y escudo."