Update to 1.5.7.

http://svn.gna.org/viewcvs/wesnoth/tags/1.5.7/changelog?rev=31829&view=download

5 files changed, 212 insertions, 134 deletions

diff --git a/games/wesnoth-devel/Makefile b/games/wesnoth-devel/Makefile
index dbb9308ada9c..574477aee9ba 100644
--- a/games/wesnoth-devel/Makefile
+++ b/games/wesnoth-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.5.6
+PORTVERSION=	1.5.7
 CATEGORIES=	games
 PKGNAMESUFFIX=	-devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
@@ -39,6 +39,8 @@ MAN6_CS=	wesnoth.6
 MAN6_DE=	wesnoth.6
 MAN6_EN=	wesnoth.6
 MAN6_ES=	wesnoth.6
+MAN6_GL=	wesnoth.6
+MAN6_IT=	wesnoth.6
 MAN6_LT=	wesnoth.6
 MAN6_TR=	wesnoth.6
 
diff --git a/games/wesnoth-devel/distinfo b/games/wesnoth-devel/distinfo
index 5d6946264c04..a46ea7178954 100644
--- a/games/wesnoth-devel/distinfo
+++ b/games/wesnoth-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.5.6.tar.bz2) = 3eefd2c0e0129677bf0da66044fe5d1d
-SHA256 (wesnoth-1.5.6.tar.bz2) = 69520bd92becde44b83d81e64d031079a9c39f740843a01820fb336fc06f5992
-SIZE (wesnoth-1.5.6.tar.bz2) = 189452845
+MD5 (wesnoth-1.5.7.tar.bz2) = 7572e8a8e63e2d5016d1b8bde85a31e8
+SHA256 (wesnoth-1.5.7.tar.bz2) = ff675e2c5fa716f40ae090e19169c257e11ce25d90855915313a70ce367b7ae5
+SIZE (wesnoth-1.5.7.tar.bz2) = 203544831
diff --git a/games/wesnoth-devel/files/patch-settings.cpp b/games/wesnoth-devel/files/patch-settings.cpp
deleted file mode 100644
index 56cc8f75e4be..000000000000
--- a/games/wesnoth-devel/files/patch-settings.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/gui/widgets/settings.cpp.orig	2008-09-07 18:11:27.000000000 -0700
-+++ src/gui/widgets/settings.cpp	2008-09-07 18:12:15.000000000 -0700
-@@ -1100,6 +1100,10 @@
- 	}
- 
- 	assert(false);
-+
-+	// Appease the compiler on FreeBSD
-+	// Unreachable
-+	return NULL;
- }
- 
- std::vector<twindow_builder::tresolution>::const_iterator get_window_builder(const std::string& type)
-@@ -1131,6 +1135,10 @@
- 	}
- 
- 	assert(false);
-+
-+	// Appease the compiler on FreeBSD
-+	// Unreachable
-+	return window->second.resolutions.begin();
- }
- 
- } // namespace gui2
diff --git a/games/wesnoth-devel/files/patch-unit_types.cpp b/games/wesnoth-devel/files/patch-unit_types.cpp
deleted file mode 100644
index fe9c32e4e2a5..000000000000
--- a/games/wesnoth-devel/files/patch-unit_types.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/unit_types.cpp.orig	2008-11-02 17:39:16.000000000 +0100
-+++ src/unit_types.cpp	2008-11-02 17:44:20.000000000 +0100
-@@ -1230,6 +1230,10 @@
-     ERR_CONFIG << *unit_cfg_ << "\n";
- 
-     assert(false && "unit type not found");
-+    // Appease the compiler on FreeBSD
-+    // Unreachable
-+    cfg = NULL;
-+    return *cfg;
- }
- 
- void unit_type_data::unit_type_map_wrapper::build_all(unit_type::BUILD_STATUS status) const
diff --git a/games/wesnoth-devel/pkg-plist b/games/wesnoth-devel/pkg-plist
index 24b34bb92e39..92ed3db171c3 100644
--- a/games/wesnoth-devel/pkg-plist
+++ b/games/wesnoth-devel/pkg-plist
@@ -763,6 +763,7 @@ bin/wesnoth_addon_manager
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-httt.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-l.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-lib.mo
+%%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-low.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-multiplayer.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-nr.mo
 %%NLS%%share/locale/racv/LC_MESSAGES/wesnoth-sof.mo
@@ -1148,6 +1149,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Descent_Into_Darkness/utils/terrain.cfg
 %%DATADIR%%/data/campaigns/Eastern_Invasion/_main.cfg
 %%DATADIR%%/data/campaigns/Eastern_Invasion/images/eastern-invasion-map.png
+%%DATADIR%%/data/campaigns/Eastern_Invasion/images/items/horse-cage.png
 %%DATADIR%%/data/campaigns/Eastern_Invasion/images/portraits/dacyn.png
 %%DATADIR%%/data/campaigns/Eastern_Invasion/images/portraits/gweddry.png
 %%DATADIR%%/data/campaigns/Eastern_Invasion/images/portraits/konrad_II.png
@@ -1257,6 +1259,12 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-attack-3.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-attack-4.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-defend.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-1.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-2.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-3.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-4.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-5.png
+%%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-idle-6.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-leading.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-scepter-defend.png
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/images/units/human-princess-scepter-leading.png
@@ -1384,9 +1392,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
 %%DATADIR%%/data/campaigns/Heir_To_The_Throne/utils/intro.cfg
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/HISTORY
-%%DATADIR%%/data/campaigns/Legend_of_Wesmere/TODO
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/_main.cfg
-%%DATADIR%%/data/campaigns/Legend_of_Wesmere/about.cfg
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/legend-of-wesmere-map.png
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/aldar.png
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/cleodil.png
@@ -1394,7 +1400,6 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/galtrid.png
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/kalenz.png
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/landar.png
-%%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/legmir.png
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/olurf.png
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/uradredia.png
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/images/portraits/velon.png
@@ -1465,8 +1470,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/scenarios/24_Epilogue.cfg
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/scenarios/North_elves_utils.cfg
-%%DATADIR%%/data/campaigns/Legend_of_Wesmere/timeline.txt
-%%DATADIR%%/data/campaigns/Legend_of_Wesmere/utils/ai_controller.cfg
+%%DATADIR%%/data/campaigns/Legend_of_Wesmere/utils/ai_controller.deprecated
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/utils/characters.cfg
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/utils/deaths.cfg
 %%DATADIR%%/data/campaigns/Legend_of_Wesmere/utils/debug.cfg
@@ -1973,6 +1977,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/The_Hammer_of_Thursagan/utils/macros.cfg
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/campaign_image.png
+%%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/misc/leader-crown.png
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/addroran.png
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/aethyr.png
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/portraits/archmage.png
@@ -2061,6 +2066,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-leader-masked-defend-1-1.png
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-leader-masked-defend-1-2.png
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-leader-masked-defend.png
+%%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-leader-masked-leading.png
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-leader-masked-sling-1.png
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-leader-masked-sling-2.png
 %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/units/wesfolk-leader-masked-staff-1.png
@@ -2200,16 +2206,16 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/The_South_Guard/images/story/fall.jpg
 %%DATADIR%%/data/campaigns/The_South_Guard/images/story/summer.jpg
 %%DATADIR%%/data/campaigns/The_South_Guard/images/story/winter.jpg
+%%DATADIR%%/data/campaigns/The_South_Guard/images/units/commander-attack-shield.png
+%%DATADIR%%/data/campaigns/The_South_Guard/images/units/commander-attack.png
+%%DATADIR%%/data/campaigns/The_South_Guard/images/units/commander-defend-1.png
+%%DATADIR%%/data/campaigns/The_South_Guard/images/units/commander-defend-2.png
+%%DATADIR%%/data/campaigns/The_South_Guard/images/units/commander-defend-3.png
+%%DATADIR%%/data/campaigns/The_South_Guard/images/units/commander-leading.png
+%%DATADIR%%/data/campaigns/The_South_Guard/images/units/commander.png
 %%DATADIR%%/data/campaigns/The_South_Guard/images/units/eyestalk-attack-1.png
 %%DATADIR%%/data/campaigns/The_South_Guard/images/units/eyestalk-attack-2.png
 %%DATADIR%%/data/campaigns/The_South_Guard/images/units/eyestalk.png
-%%DATADIR%%/data/campaigns/The_South_Guard/images/units/gerrick-attack-shield.png
-%%DATADIR%%/data/campaigns/The_South_Guard/images/units/gerrick-attack.png
-%%DATADIR%%/data/campaigns/The_South_Guard/images/units/gerrick-defend-1.png
-%%DATADIR%%/data/campaigns/The_South_Guard/images/units/gerrick-defend-2.png
-%%DATADIR%%/data/campaigns/The_South_Guard/images/units/gerrick-defend.png
-%%DATADIR%%/data/campaigns/The_South_Guard/images/units/gerrick-leading.png
-%%DATADIR%%/data/campaigns/The_South_Guard/images/units/gerrick.png
 %%DATADIR%%/data/campaigns/The_South_Guard/maps/1_Born_To_The_Banner.map
 %%DATADIR%%/data/campaigns/The_South_Guard/maps/2_Proven_By_The_Sword.map
 %%DATADIR%%/data/campaigns/The_South_Guard/maps/3_A_Desperate_Errand.map
@@ -2268,7 +2274,6 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/TODO
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/_main.cfg
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/attacks/fist-golem.png
-%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/attacks/glowing-fist.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/attacks/sand-storm.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/items/dragonstatue-old.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/items/kaleh-dead.png
@@ -2286,6 +2291,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/items/rune3-burning.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/items/rune4-burning.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/misc/UtBS_title.jpg
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/misc/dehydration-icon.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/misc/kaleh_story.jpg
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/misc/night_of_fallen_stars.jpg
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/misc/time/10afternoon2.png
@@ -2338,17 +2344,14 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/terrain/summoning-circle4.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/terrain/summoning-circle5.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/terrain/summoning-circle6.png
-%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/blank.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/core-compact.png
-%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/core-compact2.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-defend.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-melee1.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-melee2.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-ranged1.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small-ranged2.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/orb-small.png
-%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/spire-bottom.png
-%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/spire-top.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/alien/spire.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-attack1.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-attack2.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/dwarves/explorer-attack3.png
@@ -2507,11 +2510,27 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-ranged-1.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman-ranged-2.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/horseman.png
-%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-defend.png
-%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-melee.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-1.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-2.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-3.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-4.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-ranged-defend.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-1.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-2.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-3.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-4.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female-sword-defend.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter+female.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-1.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-2.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-3.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-4.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-ranged-defend.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-1.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-2.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-3.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-4.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter-sword-defend.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/hunter.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-defend.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/kaleh-leading.png
@@ -2690,6 +2709,18 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack1.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack2.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-ftouch-attack3.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing1.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing10.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing11.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing12.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing2.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing3.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing4.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing5.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing6.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing7.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing8.png
+%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde-healing9.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/elves-desert/shyde.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/humans/human-commander-attack1.png
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/images/units/humans/human-commander-attack2.png
@@ -2797,7 +2828,6 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/scenarios/13_Epilogue.cfg
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/units/Alien_Body.cfg
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/units/Alien_Body2.cfg
-%%DATADIR%%/data/campaigns/Under_the_Burning_Suns/units/Alien_Body3.cfg
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/units/Alien_Minion.cfg
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/units/Alien_Spire.cfg
 %%DATADIR%%/data/campaigns/Under_the_Burning_Suns/units/Ant.cfg
@@ -2874,6 +2904,12 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-attack-3.png
 %%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-attack-4.png
 %%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-defend.png
+%%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-idle-1.png
+%%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-idle-2.png
+%%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-idle-3.png
+%%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-idle-4.png
+%%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-idle-5.png
+%%DATADIR%%/data/campaigns/tutorial/images/units/human-princess-idle-6.png
 %%DATADIR%%/data/campaigns/tutorial/images/units/human-princess.png
 %%DATADIR%%/data/campaigns/tutorial/images/units/konrad-fighter-attack-1.png
 %%DATADIR%%/data/campaigns/tutorial/images/units/konrad-fighter-attack-2.png
@@ -2893,11 +2929,13 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/README
 %%DATADIR%%/data/core/_main.cfg
 %%DATADIR%%/data/core/about.cfg
-%%DATADIR%%/data/core/editor-groups.cfg
-%%DATADIR%%/data/core/editor2-brushes.cfg
-%%DATADIR%%/data/core/editor2-hotkeys.cfg
-%%DATADIR%%/data/core/editor2-tods.cfg
-%%DATADIR%%/data/core/editor2-tool-hints.cfg
+%%DATADIR%%/data/core/editor/_main.cfg
+%%DATADIR%%/data/core/editor/brushes.cfg
+%%DATADIR%%/data/core/editor/hotkeys.cfg
+%%DATADIR%%/data/core/editor/music.cfg
+%%DATADIR%%/data/core/editor/terrain-groups.cfg
+%%DATADIR%%/data/core/editor/time-of-day.cfg
+%%DATADIR%%/data/core/editor/tool-hints.cfg
 %%DATADIR%%/data/core/fonts.cfg
 %%DATADIR%%/data/core/help.cfg
 %%DATADIR%%/data/core/hotkeys.cfg
@@ -2972,6 +3010,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/attacks/lightbeam.png
 %%DATADIR%%/data/core/images/attacks/lightning.png
 %%DATADIR%%/data/core/images/attacks/mace-and-chain.png
+%%DATADIR%%/data/core/images/attacks/mace-spiked.png
 %%DATADIR%%/data/core/images/attacks/mace.png
 %%DATADIR%%/data/core/images/attacks/magic-missile.png
 %%DATADIR%%/data/core/images/attacks/morning-star.png
@@ -3299,7 +3338,6 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/drake-clasher.png
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/drake-fighter.png
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/drake-glider.png
-%%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/elvish-shaman.png
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/ghoul.png
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/mermaid-initiate.png
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/merman-fighter.png
@@ -3309,6 +3347,9 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/orcish-assassin.png
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/saurian-augur.png
 %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst/saurian-skirmisher.png
+%%DATADIR%%/data/core/images/portraits/Emilien_Rotival/transparent/human-peasant.png
+%%DATADIR%%/data/core/images/portraits/Emilien_Rotival/transparent/human-spearman.png
+%%DATADIR%%/data/core/images/portraits/Emilien_Rotival/transparent/human-swordsman.png
 %%DATADIR%%/data/core/images/portraits/James_Woo/assassin.png
 %%DATADIR%%/data/core/images/portraits/James_Woo/dwarf-guard.png
 %%DATADIR%%/data/core/images/portraits/James_Woo/orc-warlord.png
@@ -3365,14 +3406,40 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/portraits/Kitty/human-mage.png
 %%DATADIR%%/data/core/images/portraits/Kitty/human-necromancer+female.png
 %%DATADIR%%/data/core/images/portraits/Kitty/human-necromancer.png
-%%DATADIR%%/data/core/images/portraits/Kitty/transparent/arch-mage-large200.png
-%%DATADIR%%/data/core/images/portraits/Kitty/transparent/arch-mage-large400.png
-%%DATADIR%%/data/core/images/portraits/Kitty/transparent/druid-large200.png
-%%DATADIR%%/data/core/images/portraits/Kitty/transparent/druid-large400.png
-%%DATADIR%%/data/core/images/portraits/Kitty/transparent/lich-large200.png
-%%DATADIR%%/data/core/images/portraits/Kitty/transparent/lich-large400.png
-%%DATADIR%%/data/core/images/portraits/Kitty/transparent/shyde-large200.png
-%%DATADIR%%/data/core/images/portraits/Kitty/transparent/shyde-large400.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-archer+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-archer.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-captain.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-druid.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-fighter.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-hero.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-high-lord.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-lady.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-lord.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-marksman+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-marksman.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-ranger+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-ranger.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-scout.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-shaman.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-shyde.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/elvish-sorceress.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-dark-adept+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-dark-adept.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-arch+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-arch.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-light+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-light.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-red+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-red.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-silver+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-silver.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-white+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage-white.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-mage.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-necromancer+female.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/human-necromancer.png
+%%DATADIR%%/data/core/images/portraits/Kitty/transparent/undead-lich.png
 %%DATADIR%%/data/core/images/portraits/Kitty/undead-lich.png
 %%DATADIR%%/data/core/images/portraits/Nicholas_Kerpan/human-poacher.png
 %%DATADIR%%/data/core/images/portraits/Nicholas_Kerpan/human-thief.png
@@ -3474,9 +3541,6 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/projectiles/icemissile-ne-6.png
 %%DATADIR%%/data/core/images/projectiles/icemissile-ne-7.png
 %%DATADIR%%/data/core/images/projectiles/ink.png
-%%DATADIR%%/data/core/images/projectiles/lightning-bolt.png
-%%DATADIR%%/data/core/images/projectiles/lightning-n.png
-%%DATADIR%%/data/core/images/projectiles/lightning-ne.png
 %%DATADIR%%/data/core/images/projectiles/misfire-spark-1.png
 %%DATADIR%%/data/core/images/projectiles/misfire-spark-2.png
 %%DATADIR%%/data/core/images/projectiles/misfire-spark-3.png
@@ -3513,6 +3577,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/projectiles/pitchfork-ne.png
 %%DATADIR%%/data/core/images/projectiles/spear-n.png
 %%DATADIR%%/data/core/images/projectiles/spear-ne.png
+%%DATADIR%%/data/core/images/projectiles/stone-large.png
 %%DATADIR%%/data/core/images/projectiles/stone.png
 %%DATADIR%%/data/core/images/projectiles/thorns-ne.png
 %%DATADIR%%/data/core/images/projectiles/thorns.png
@@ -4598,6 +4663,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/terrain/ice4.png
 %%DATADIR%%/data/core/images/terrain/ice5.png
 %%DATADIR%%/data/core/images/terrain/ice6.png
+%%DATADIR%%/data/core/images/terrain/impassable-editor.png
 %%DATADIR%%/data/core/images/terrain/lava-chasm-ccw-bl.png
 %%DATADIR%%/data/core/images/terrain/lava-chasm-ccw-br.png
 %%DATADIR%%/data/core/images/terrain/lava-chasm-ccw-l.png
@@ -4912,6 +4978,10 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/terrain/village/coast2.png
 %%DATADIR%%/data/core/images/terrain/village/desert-camp-tile.png
 %%DATADIR%%/data/core/images/terrain/village/desert-camp.png
+%%DATADIR%%/data/core/images/terrain/village/desert-oasis-1.png
+%%DATADIR%%/data/core/images/terrain/village/desert-oasis-2.png
+%%DATADIR%%/data/core/images/terrain/village/desert-oasis-3.png
+%%DATADIR%%/data/core/images/terrain/village/desert-oasis-tile.png
 %%DATADIR%%/data/core/images/terrain/village/desert-tile.png
 %%DATADIR%%/data/core/images/terrain/village/desert.png
 %%DATADIR%%/data/core/images/terrain/village/desert2.png
@@ -5380,20 +5450,22 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/units/dwarves/fighter-idle-7.png
 %%DATADIR%%/data/core/images/units/dwarves/fighter-idle-8.png
 %%DATADIR%%/data/core/images/units/dwarves/fighter.png
-%%DATADIR%%/data/core/images/units/dwarves/gryphon-master-attack.png
-%%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-1and3.png
+%%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-1.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-2.png
+%%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-3.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-4.png
-%%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-5and7.png
+%%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-5.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-6.png
+%%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-7.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-master-flying-8.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-master.png
-%%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-attack.png
-%%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-1and3.png
+%%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-1.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-2.png
+%%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-3.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-4.png
-%%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-5and7.png
+%%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-5.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-6.png
+%%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-7.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-rider-flying-8.png
 %%DATADIR%%/data/core/images/units/dwarves/gryphon-rider.png
 %%DATADIR%%/data/core/images/units/dwarves/guard-attack.png
@@ -6369,6 +6441,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage+female-teleport-5.png
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage+female-teleport-6.png
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage+female-teleport-7.png
+%%DATADIR%%/data/core/images/units/human-magi/silver-mage+female-teleport-8.png
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage+female.png
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage-attack-magic1.png
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage-attack-magic2.png
@@ -6382,6 +6455,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage-teleport-5.png
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage-teleport-6.png
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage-teleport-7.png
+%%DATADIR%%/data/core/images/units/human-magi/silver-mage-teleport-8.png
 %%DATADIR%%/data/core/images/units/human-magi/silver-mage.png
 %%DATADIR%%/data/core/images/units/human-magi/white-cleric+female-defend.png
 %%DATADIR%%/data/core/images/units/human-magi/white-cleric+female-mace-1.png
@@ -6871,11 +6945,14 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/units/nagas/myrmidon-attack.png
 %%DATADIR%%/data/core/images/units/nagas/myrmidon-defend.png
 %%DATADIR%%/data/core/images/units/nagas/myrmidon.png
-%%DATADIR%%/data/core/images/units/nagas/warrior+female-attack.png
-%%DATADIR%%/data/core/images/units/nagas/warrior+female-defend.png
-%%DATADIR%%/data/core/images/units/nagas/warrior+female.png
-%%DATADIR%%/data/core/images/units/nagas/warrior-attack.png
-%%DATADIR%%/data/core/images/units/nagas/warrior-defend.png
+%%DATADIR%%/data/core/images/units/nagas/warrior-defend-1.png
+%%DATADIR%%/data/core/images/units/nagas/warrior-defend-2.png
+%%DATADIR%%/data/core/images/units/nagas/warrior-melee-1.png
+%%DATADIR%%/data/core/images/units/nagas/warrior-melee-2.png
+%%DATADIR%%/data/core/images/units/nagas/warrior-melee-3.png
+%%DATADIR%%/data/core/images/units/nagas/warrior-melee-4.png
+%%DATADIR%%/data/core/images/units/nagas/warrior-melee-5.png
+%%DATADIR%%/data/core/images/units/nagas/warrior-melee-6.png
 %%DATADIR%%/data/core/images/units/nagas/warrior.png
 %%DATADIR%%/data/core/images/units/ogres/ogre-attack1.png
 %%DATADIR%%/data/core/images/units/ogres/ogre-attack2.png
@@ -7341,8 +7418,18 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/units/undead-skeletal/draug-defend-1.png
 %%DATADIR%%/data/core/images/units/undead-skeletal/draug-defend-2.png
 %%DATADIR%%/data/core/images/units/undead-skeletal/draug.png
-%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack.png
-%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-defend.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-1.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-10.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-2.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-3.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-4.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-5.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-6.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-7.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-8.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-attack-9.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-defend-1.png
+%%DATADIR%%/data/core/images/units/undead-skeletal/revenant-defend-2.png
 %%DATADIR%%/data/core/images/units/undead-skeletal/revenant-dying-1.png
 %%DATADIR%%/data/core/images/units/undead-skeletal/revenant-dying-2.png
 %%DATADIR%%/data/core/images/units/undead-skeletal/revenant-dying-3.png
@@ -7696,6 +7783,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/images/units/woses/wose.png
 %%DATADIR%%/data/core/images/wesnoth-icon.png
 %%DATADIR%%/data/core/macros/abilities.cfg
+%%DATADIR%%/data/core/macros/ai_controller.cfg
 %%DATADIR%%/data/core/macros/amla.cfg
 %%DATADIR%%/data/core/macros/animation-utils.cfg
 %%DATADIR%%/data/core/macros/carryover-utils.cfg
@@ -7708,7 +7796,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/macros/names.cfg
 %%DATADIR%%/data/core/macros/scenario-utils.cfg
 %%DATADIR%%/data/core/macros/schedules.cfg
-%%DATADIR%%/data/core/macros/sidelimit-utils.cfg
+%%DATADIR%%/data/core/macros/side-utils.cfg
 %%DATADIR%%/data/core/macros/sound-utils.cfg
 %%DATADIR%%/data/core/macros/special-notes.cfg
 %%DATADIR%%/data/core/macros/teleport-utils.cfg
@@ -7735,6 +7823,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/music/revelation.ogg
 %%DATADIR%%/data/core/music/sad.ogg
 %%DATADIR%%/data/core/music/silence.ogg
+%%DATADIR%%/data/core/music/suspense.ogg
 %%DATADIR%%/data/core/music/the_city_falls.ogg
 %%DATADIR%%/data/core/music/the_dangerous_symphony.ogg
 %%DATADIR%%/data/core/music/the_deep_path.ogg
@@ -7764,6 +7853,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/sounds/bow-puny-miss.ogg
 %%DATADIR%%/data/core/sounds/bow-puny.ogg
 %%DATADIR%%/data/core/sounds/bow.ogg
+%%DATADIR%%/data/core/sounds/cave-in.ogg
 %%DATADIR%%/data/core/sounds/claws.ogg
 %%DATADIR%%/data/core/sounds/club.ogg
 %%DATADIR%%/data/core/sounds/crossbow-fire-miss.ogg
@@ -8205,9 +8295,12 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/core/units/wose/Wose.cfg
 %%DATADIR%%/data/game_config.cfg
 %%DATADIR%%/data/gui/default.cfg
-%%DATADIR%%/data/gui/default/macros.cfg
+%%DATADIR%%/data/gui/default/macros/_initial.cfg
+%%DATADIR%%/data/gui/default/macros/horizontal_scrollbar.cfg
+%%DATADIR%%/data/gui/default/macros/vertical_scrollbar.cfg
 %%DATADIR%%/data/gui/default/widget/button_25x25.cfg
 %%DATADIR%%/data/gui/default/widget/button_default.cfg
+%%DATADIR%%/data/gui/default/widget/horizontal_scrollbar_default.cfg
 %%DATADIR%%/data/gui/default/widget/image_default.cfg
 %%DATADIR%%/data/gui/default/widget/label_default.cfg
 %%DATADIR%%/data/gui/default/widget/listbox_default.cfg
@@ -8235,6 +8328,7 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/gui/default/window/message.cfg
 %%DATADIR%%/data/gui/default/window/mp_connect.cfg
 %%DATADIR%%/data/gui/default/window/mp_create_game.cfg
+%%DATADIR%%/data/gui/default/window/mp_login.cfg
 %%DATADIR%%/data/gui/default/window/mp_method_selection.cfg
 %%DATADIR%%/data/gui/default/window/mp_server_list.cfg
 %%DATADIR%%/data/gui/default/window/title_screen.cfg
@@ -8309,12 +8403,14 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/multiplayer/maps/2p_Cynsaun_Battlefield.map
 %%DATADIR%%/data/multiplayer/maps/2p_Den_of_Onis.map
 %%DATADIR%%/data/multiplayer/maps/2p_Fallenstar_Lake.map
+%%DATADIR%%/data/multiplayer/maps/2p_Fast_to_Madness.map
 %%DATADIR%%/data/multiplayer/maps/2p_Hamlets.map
 %%DATADIR%%/data/multiplayer/maps/2p_Hornshark_Island.map
 %%DATADIR%%/data/multiplayer/maps/2p_Howling_Ghost_Badlands.map
 %%DATADIR%%/data/multiplayer/maps/2p_Sablestone_Delta.map
 %%DATADIR%%/data/multiplayer/maps/2p_Silverhead_Crossing.map
 %%DATADIR%%/data/multiplayer/maps/2p_Sullas_Ruins.map
+%%DATADIR%%/data/multiplayer/maps/2p_Thalins_Stronghold.map
 %%DATADIR%%/data/multiplayer/maps/2p_The_Freelands.map
 %%DATADIR%%/data/multiplayer/maps/2p_Weldyn_Channel.map
 %%DATADIR%%/data/multiplayer/maps/3p_Alirok_Marsh.map
@@ -8324,11 +8420,13 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/multiplayer/maps/4p_Blue_Water_Province.map
 %%DATADIR%%/data/multiplayer/maps/4p_Castle_Hopping_Isle.map
 %%DATADIR%%/data/multiplayer/maps/4p_Clash.map
+%%DATADIR%%/data/multiplayer/maps/4p_Eryn_Chethu.map
 %%DATADIR%%/data/multiplayer/maps/4p_Hamlets.map
 %%DATADIR%%/data/multiplayer/maps/4p_Isars_Cross.map
 %%DATADIR%%/data/multiplayer/maps/4p_King_of_the_Hill.map
 %%DATADIR%%/data/multiplayer/maps/4p_Lagoon.map
 %%DATADIR%%/data/multiplayer/maps/4p_Loris_River.map
+%%DATADIR%%/data/multiplayer/maps/4p_Mines_of_Mallorod.map
 %%DATADIR%%/data/multiplayer/maps/4p_Morituri.map
 %%DATADIR%%/data/multiplayer/maps/4p_Paths_of_Daggers.map
 %%DATADIR%%/data/multiplayer/maps/4p_Siege_Castles.map
@@ -8355,12 +8453,14 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/multiplayer/scenarios/2p_Dark_Forecast.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Den_of_Onis.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Fallenstar_Lake.cfg
+%%DATADIR%%/data/multiplayer/scenarios/2p_Fast_To_Madness.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Hamlets.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Hornshark_Island.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Howling_Ghost_Badlands.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Sablestone_Delta.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Silverhead_Crossing.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Sullas_Ruins.cfg
+%%DATADIR%%/data/multiplayer/scenarios/2p_Thalins_Stronghold.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_The_Freelands.cfg
 %%DATADIR%%/data/multiplayer/scenarios/2p_Weldyn_Channel.cfg
 %%DATADIR%%/data/multiplayer/scenarios/3p_Alirok_Marsh.cfg
@@ -8370,11 +8470,13 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/data/multiplayer/scenarios/4p_Blue_Water_Province.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Castle_Hopping_Isle.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Clash.cfg
+%%DATADIR%%/data/multiplayer/scenarios/4p_Eryn_Chethu.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Hamlets.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Isars_Cross.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_King_of_the_Hill.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Lagoon.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Loris_River.cfg
+%%DATADIR%%/data/multiplayer/scenarios/4p_Mines_of_Mallorod.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Morituri.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Paths_of_Daggers.cfg
 %%DATADIR%%/data/multiplayer/scenarios/4p_Siege_Castles.cfg
@@ -8587,6 +8689,10 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/images/buttons/large-button-active.png
 %%DATADIR%%/images/buttons/large-button-pressed.png
 %%DATADIR%%/images/buttons/large-button.png
+%%DATADIR%%/images/buttons/left_arrow-button-active.png
+%%DATADIR%%/images/buttons/left_arrow-button-disabled.png
+%%DATADIR%%/images/buttons/left_arrow-button-pressed.png
+%%DATADIR%%/images/buttons/left_arrow-button.png
 %%DATADIR%%/images/buttons/lite-active.png
 %%DATADIR%%/images/buttons/lite-pressed.png
 %%DATADIR%%/images/buttons/lite.png
@@ -8627,20 +8733,42 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/images/buttons/resize_button_editor-active.png
 %%DATADIR%%/images/buttons/resize_button_editor-pressed.png
 %%DATADIR%%/images/buttons/resize_button_editor.png
+%%DATADIR%%/images/buttons/right_arrow-button-active.png
+%%DATADIR%%/images/buttons/right_arrow-button-disabled.png
+%%DATADIR%%/images/buttons/right_arrow-button-pressed.png
+%%DATADIR%%/images/buttons/right_arrow-button.png
 %%DATADIR%%/images/buttons/scrollbottom-active.png
 %%DATADIR%%/images/buttons/scrollbottom-disabled.png
 %%DATADIR%%/images/buttons/scrollbottom-pressed.png
 %%DATADIR%%/images/buttons/scrollbottom.png
 %%DATADIR%%/images/buttons/scrollgroove-bottom.png
 %%DATADIR%%/images/buttons/scrollgroove-disabled-bottom.png
+%%DATADIR%%/images/buttons/scrollgroove-disabled-horizontal.png
+%%DATADIR%%/images/buttons/scrollgroove-disabled-left.png
 %%DATADIR%%/images/buttons/scrollgroove-disabled-mid.png
+%%DATADIR%%/images/buttons/scrollgroove-disabled-right.png
 %%DATADIR%%/images/buttons/scrollgroove-disabled-top.png
+%%DATADIR%%/images/buttons/scrollgroove-horizontal.png
+%%DATADIR%%/images/buttons/scrollgroove-left.png
 %%DATADIR%%/images/buttons/scrollgroove-mid.png
+%%DATADIR%%/images/buttons/scrollgroove-right.png
 %%DATADIR%%/images/buttons/scrollgroove-top.png
+%%DATADIR%%/images/buttons/scrollhorizontal-active.png
+%%DATADIR%%/images/buttons/scrollhorizontal-disabled.png
+%%DATADIR%%/images/buttons/scrollhorizontal-pressed.png
+%%DATADIR%%/images/buttons/scrollhorizontal.png
+%%DATADIR%%/images/buttons/scrollleft-active.png
+%%DATADIR%%/images/buttons/scrollleft-disabled.png
+%%DATADIR%%/images/buttons/scrollleft-pressed.png
+%%DATADIR%%/images/buttons/scrollleft.png
 %%DATADIR%%/images/buttons/scrollmid-active.png
 %%DATADIR%%/images/buttons/scrollmid-disabled.png
 %%DATADIR%%/images/buttons/scrollmid-pressed.png
 %%DATADIR%%/images/buttons/scrollmid.png
+%%DATADIR%%/images/buttons/scrollright-active.png
+%%DATADIR%%/images/buttons/scrollright-disabled.png
+%%DATADIR%%/images/buttons/scrollright-pressed.png
+%%DATADIR%%/images/buttons/scrollright.png
 %%DATADIR%%/images/buttons/scrolltop-active.png
 %%DATADIR%%/images/buttons/scrolltop-disabled.png
 %%DATADIR%%/images/buttons/scrolltop-pressed.png
@@ -8898,8 +9026,8 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/locales/af_ZA@wesnoth
 %%DATADIR%%/locales/ar_AR@wesnoth
 %%DATADIR%%/locales/bg_BG@wesnoth
-%%DATADIR%%/locales/ca_ES@valencia@wesnoth
 %%DATADIR%%/locales/ca_ES@wesnoth
+%%DATADIR%%/locales/ca_ES@valencia@wesnoth
 %%DATADIR%%/locales/cs_CZ@wesnoth
 %%DATADIR%%/locales/da_DK@wesnoth
 %%DATADIR%%/locales/de_DE@wesnoth
@@ -8934,8 +9062,8 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/locales/ru_RU@wesnoth
 %%DATADIR%%/locales/sk_SK@wesnoth
 %%DATADIR%%/locales/sl_SI@wesnoth
-%%DATADIR%%/locales/sr_RS@latin@wesnoth
 %%DATADIR%%/locales/sr_RS@wesnoth
+%%DATADIR%%/locales/sr_RS@latin@wesnoth
 %%DATADIR%%/locales/sv_SE@wesnoth
 %%DATADIR%%/locales/tl_PH@wesnoth
 %%DATADIR%%/locales/tr_TR@wesnoth
@@ -8961,48 +9089,29 @@ bin/wesnoth_addon_manager
 %%DATADIR%%/sounds/slider.wav
 %%DATADIR%%/sounds/timer.wav
 %%DOCSDIR%%/manual/CMakeLists.txt
-%%DOCSDIR%%/manual/images/de/game-screen.jpg
-%%DOCSDIR%%/manual/images/de/main-menu.jpg
-%%DOCSDIR%%/manual/images/de/multiplayer.jpg
-%%DOCSDIR%%/manual/images/de/recruit.jpg
-%%DOCSDIR%%/manual/images/de/right_pane.jpg
-%%DOCSDIR%%/manual/images/de/top_pane.jpg
-%%DOCSDIR%%/manual/images/fr/game-screen.jpg
-%%DOCSDIR%%/manual/images/fr/main-menu.jpg
-%%DOCSDIR%%/manual/images/fr/multiplayer.jpg
-%%DOCSDIR%%/manual/images/fr/recruit.jpg
-%%DOCSDIR%%/manual/images/fr/right_pane.jpg
-%%DOCSDIR%%/manual/images/fr/top_pane.jpg
-%%DOCSDIR%%/manual/images/game-screen.jpg
-%%DOCSDIR%%/manual/images/gl/game-screen.jpg
-%%DOCSDIR%%/manual/images/gl/main-menu.jpg
-%%DOCSDIR%%/manual/images/gl/multiplayer.jpg
-%%DOCSDIR%%/manual/images/gl/recruit.jpg
-%%DOCSDIR%%/manual/images/gl/right_pane.jpg
-%%DOCSDIR%%/manual/images/gl/top_pane.jpg
-%%DOCSDIR%%/manual/images/main-menu.jpg
-%%DOCSDIR%%/manual/images/multiplayer.jpg
+%%DOCSDIR%%/manual/images/de/game-screen-1.5.7.jpg
+%%DOCSDIR%%/manual/images/de/main-menu-1.5.7.jpg
+%%DOCSDIR%%/manual/images/de/multiplayer-1.5.7.jpg
+%%DOCSDIR%%/manual/images/de/recruit-1.5.7.jpg
+%%DOCSDIR%%/manual/images/de/right_pane-1.5.7.jpg
+%%DOCSDIR%%/manual/images/de/top_pane-1.5.7.jpg
+%%DOCSDIR%%/manual/images/game-screen-1.5.7.jpg
+%%DOCSDIR%%/manual/images/main-menu-1.5.7.jpg
+%%DOCSDIR%%/manual/images/multiplayer-1.5.7.jpg
 %%DOCSDIR%%/manual/images/orb-blue.jpg
 %%DOCSDIR%%/manual/images/orb-green.jpg
 %%DOCSDIR%%/manual/images/orb-none.jpg
 %%DOCSDIR%%/manual/images/orb-red.jpg
 %%DOCSDIR%%/manual/images/orb-yellow.jpg
-%%DOCSDIR%%/manual/images/recruit.jpg
-%%DOCSDIR%%/manual/images/right_pane.jpg
-%%DOCSDIR%%/manual/images/schedule-afternoon.jpg
-%%DOCSDIR%%/manual/images/schedule-dawn.jpg
-%%DOCSDIR%%/manual/images/schedule-dusk.jpg
-%%DOCSDIR%%/manual/images/schedule-firstwatch.jpg
-%%DOCSDIR%%/manual/images/schedule-morning.jpg
-%%DOCSDIR%%/manual/images/schedule-secondwatch.jpg
-%%DOCSDIR%%/manual/images/schedule-underground.jpg
-%%DOCSDIR%%/manual/images/top_pane.jpg
-%%DOCSDIR%%/manual/images/tr/game-screen.jpg
-%%DOCSDIR%%/manual/images/tr/main-menu.jpg
-%%DOCSDIR%%/manual/images/tr/multiplayer.jpg
-%%DOCSDIR%%/manual/images/tr/recruit.jpg
-%%DOCSDIR%%/manual/images/tr/right_pane.jpg
-%%DOCSDIR%%/manual/images/tr/top_pane.jpg
+%%DOCSDIR%%/manual/images/recruit-1.5.7.jpg
+%%DOCSDIR%%/manual/images/right_pane-1.5.7.jpg
+%%DOCSDIR%%/manual/images/top_pane-1.5.7.jpg
+%%DOCSDIR%%/manual/images/tr/game-screen-1.5.7.jpg
+%%DOCSDIR%%/manual/images/tr/main-menu-1.5.7.jpg
+%%DOCSDIR%%/manual/images/tr/multiplayer-1.5.7.jpg
+%%DOCSDIR%%/manual/images/tr/recruit-1.5.7.jpg
+%%DOCSDIR%%/manual/images/tr/right_pane-1.5.7.jpg
+%%DOCSDIR%%/manual/images/tr/top_pane-1.5.7.jpg
 %%DOCSDIR%%/manual/manual.cs.html
 %%DOCSDIR%%/manual/manual.da.html
 %%DOCSDIR%%/manual/manual.de.html
@@ -9043,6 +9152,7 @@ bin/wesnoth_addon_manager
 @dirrm %%DATADIR%%/data/campaigns/Descent_Into_Darkness/units
 @dirrm %%DATADIR%%/data/campaigns/Descent_Into_Darkness/utils
 @dirrm %%DATADIR%%/data/campaigns/Descent_Into_Darkness
+@dirrm %%DATADIR%%/data/campaigns/Eastern_Invasion/images/items
 @dirrm %%DATADIR%%/data/campaigns/Eastern_Invasion/images/portraits
 @dirrm %%DATADIR%%/data/campaigns/Eastern_Invasion/images/units
 @dirrm %%DATADIR%%/data/campaigns/Eastern_Invasion/images
@@ -9121,6 +9231,7 @@ bin/wesnoth_addon_manager
 @dirrm %%DATADIR%%/data/campaigns/The_Hammer_of_Thursagan/utils
 @dirrm %%DATADIR%%/data/campaigns/The_Hammer_of_Thursagan/images
 @dirrm %%DATADIR%%/data/campaigns/The_Hammer_of_Thursagan
+@dirrm %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/misc
 @dirrm %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/portraits
 @dirrm %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/story
 @dirrm %%DATADIR%%/data/campaigns/The_Rise_Of_Wesnoth/images/units
@@ -9177,6 +9288,7 @@ bin/wesnoth_addon_manager
 @dirrm %%DATADIR%%/data/campaigns/tutorial/units
 @dirrm %%DATADIR%%/data/campaigns/tutorial
 @dirrm %%DATADIR%%/data/campaigns
+@dirrm %%DATADIR%%/data/core/editor
 @dirrm %%DATADIR%%/data/core/images/attacks
 @dirrm %%DATADIR%%/data/core/images/editor
 @dirrm %%DATADIR%%/data/core/images/halo/elven
@@ -9189,6 +9301,8 @@ bin/wesnoth_addon_manager
 @dirrm %%DATADIR%%/data/core/images/maps
 @dirrm %%DATADIR%%/data/core/images/misc
 @dirrm %%DATADIR%%/data/core/images/portraits/Alex_Jarocha-Ernst
+@dirrm %%DATADIR%%/data/core/images/portraits/Emilien_Rotival/transparent
+@dirrm %%DATADIR%%/data/core/images/portraits/Emilien_Rotival
 @dirrm %%DATADIR%%/data/core/images/portraits/James_Woo
 @dirrm %%DATADIR%%/data/core/images/portraits/Jason_Lutes
 @dirrm %%DATADIR%%/data/core/images/portraits/Kitty/transparent
@@ -9261,6 +9375,7 @@ bin/wesnoth_addon_manager
 @dirrm %%DATADIR%%/data/core/units/wose
 @dirrm %%DATADIR%%/data/core/units
 @dirrm %%DATADIR%%/data/core
+@dirrm %%DATADIR%%/data/gui/default/macros
 @dirrm %%DATADIR%%/data/gui/default/widget
 @dirrm %%DATADIR%%/data/gui/default/window
 @dirrm %%DATADIR%%/data/gui/default
@@ -9300,8 +9415,6 @@ bin/wesnoth_addon_manager
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/manual/images/de
-@dirrm %%DOCSDIR%%/manual/images/fr
-@dirrm %%DOCSDIR%%/manual/images/gl
 @dirrm %%DOCSDIR%%/manual/images/tr
 @dirrm %%DOCSDIR%%/manual/images
 @dirrm %%DOCSDIR%%/manual/styles