Update to 0.8.7. Take maintainership (manu@ agrees).

New in 0.8.7:

0.8.6 was never released due bugs found late in the release process.
This release, 0.8.7, will most likely have it's fair share of bugs
and we need your help to get them hunted down. May the force be
with you when you are playtesting.

Highlights for the release: Scenario balancing for 'Heir to the
Throne' and 'The Eastern Invasion' campaigns. User interface
improvements: shadows for labels to make them visible on each type
of terrain and in-game help system improvements. Graphics improvements:
terrains and transitions, unit images and animations, portraits,
The Green Isle map. Unit balancing: ghosts are now more vulnerable
to holy and less vulnerable to "physical" attacks. 18 new units
added. Slovenian as new translation, 17 updated translations.
Multiplayer improvements: renewed lobby, leader indicator, random
map generator improvements and variations (Desert, Winter, Marsh),
map descriptions, Broken Bridge map. Various improvements for
logging system, wesnothd network threading, Out of Sync detection
and reporting. Preparations for 320x240 resolution support. Image,
data and code cleanups. Lots of bug fixes - see all details at
http://changelog.wesnoth.org (don't forget to check the never
released 0.8.6 changes).

New in 0.8.5:

Translation teams have continued working hard, more translations
have been converted to gettext, lots of updates for existing
translations, work for Greek and Russian translations has begun -
check translation statuses at http://gettext.wesnoth.org

We now have campaign server where unofficial campaigns can be
uploaded and easily fetched through campaign selection interface.
Multiplayer improvements including some new maps and choosing your
leader. Scenario balancing for most campaigns and tutorial updates.
14 new units. Remade Drakes. User interface, graphics and AI
improvements. English language polishing. Code cleanups and
improvements. Many bug fixes - check details at
http://changelog.wesnoth.org

New in 0.8.4

We have some rule/engine changes worth of mentioning: Vision range
is now based on potential movement. Charge, backstab and steadfast
abilities use true doubling and halving rather than additive
percentage calculations. Ghosts have been changed to use new 'spirit'
movetype which has high resistance values against all "physical"
attacks and their movement is now slowed by water. Undeadfoot units
have been granted 'deep walking' - that is marching through deep
water.

And then some less detailed changes: new scenarios for 'Heir to
the Throne' and 'The Rise of Wesnoth' campaigns, scenario balancing
for all included campaigns. Graphics improvements, some new sound
effects, balanced units and added new units, multiplayer improvements,
code optimizations and bunch of bug fixes - see all details at
http://changelog.wesnoth.org

New in 0.8.3

Wesnoth has switched using gettext for translations, we have received
gettextized translations for catalan, french, norwegian and spanish.
Magic place to visit is http://wesnoth.slack.it/?GetText

We have also been working on other fronts: new scenarios for 'The
Eastern Invasion' and 'The Rise of Wesnoth' campaigns. Scenario
balancing for 'The Dark Hordes', 'The Eastern Invasion' and 'The
Rise of Wesnoth' campaigns. User interface improvements, graphics
improvements, updated tutorial, balanced units and added some new
units, multiplayer improvements, code optimizations and bunch of
bug fixes - see all details at http://changelog.wesnoth.org

New in 0.8.2

New tutorial, new era for multiplayer, new units, user interface
improvements, graphics improvements, multiplayer improvements and
unit balancing. Scenario balancing for 'Son of the Black Eye', 'The
Eastern Invasion' and 'The Rise of Wesnoth' campaigns. Many bug
fixes - see all details at http://changelog.wesnoth.org

New in 0.8.1

This release features The Rise of Wesnoth, a new campaign with 17
scenarios. There are 6 new scenarios for The Eastern Invasion
campaign and 1 new scenario for The Dark Hordes campaign. There
are also 13 new units, user interface improvements, graphics
improvements, a new song, scenario balancing for The Eastern Invasion
campaign, and multiplayer improvements. Translations were updated
for Catalan, Czech, French, German, Slovak, Spanish, and Swedish.
There were some code cleanups and optimizations, and a lot of
bugfixes.

7 files changed, 1226 insertions, 2084 deletions

diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index ee19edf320b..778ae1140c3 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2004/10/03 00:14:47 tv Exp $
+# $NetBSD: Makefile,v 1.3 2004/12/01 22:32:24 wiz Exp $
 #
 
-DISTNAME=	wesnoth-0.8
-PKGREVISION=	1
+DISTNAME=	wesnoth-0.8.7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wesnoth/}
 
-MAINTAINER=	manu@NetBSD.org
+MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.wesnoth.org/
 COMMENT=	Fantasy turn-based strategy game
 
@@ -14,12 +13,13 @@ HAS_CONFIGURE=	YES
 USE_BUILDLINK3=	YES
 UNLIMIT_RESOURCES+=	datasize
 
-CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 BUILDLINK_DEPENDS.SDL=	SDL>=1.2.7
 BUILDLINK_DEPENDS.SDL_mixer=	SDL_mixer>=1.2.5nb3
 
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../net/SDL_net/buildlink3.mk"
diff --git a/games/wesnoth/PLIST b/games/wesnoth/PLIST
index 74653660f4c..7e90fca87c2 100644
--- a/games/wesnoth/PLIST
+++ b/games/wesnoth/PLIST
@@ -1,33 +1,43 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/14 13:20:24 manu Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/12/01 22:32:24 wiz Exp $
 bin/wesnoth
 man/man6/wesnoth.6
 man/man6/wesnoth_editor.6
 man/man6/wesnothd.6
-share/wesnoth/data/battleworld.cfg
+share/wesnoth/data/campaigns/Eastern_Invasion.cfg
+share/wesnoth/data/campaigns/Heir_To_The_Throne.cfg
 share/wesnoth/data/campaigns/README
+share/wesnoth/data/campaigns/Son_Of_The_Black_Eye.cfg
+share/wesnoth/data/campaigns/The_Dark_Hordes.cfg
+share/wesnoth/data/campaigns/The_Rise_of_Wesnoth.cfg
 share/wesnoth/data/convert.pl
-share/wesnoth/data/deaths.cfg
 share/wesnoth/data/game.cfg
 share/wesnoth/data/help.cfg
-share/wesnoth/data/intro.cfg
 share/wesnoth/data/items.cfg
 share/wesnoth/data/maps/Eastern_Invasion/An_Elven_Alliance
 share/wesnoth/data/maps/Eastern_Invasion/An_Unexpected_Appearance
+share/wesnoth/data/maps/Eastern_Invasion/Approaching_Weldyn
 share/wesnoth/data/maps/Eastern_Invasion/Captured
+share/wesnoth/data/maps/Eastern_Invasion/Drowned_Plains
+share/wesnoth/data/maps/Eastern_Invasion/Evacuation
 share/wesnoth/data/maps/Eastern_Invasion/Lake_Vrug
 share/wesnoth/data/maps/Eastern_Invasion/Mal-Ravanals_Capital
 share/wesnoth/data/maps/Eastern_Invasion/Northern_Outpost
+share/wesnoth/data/maps/Eastern_Invasion/Peasant_Revolt
+share/wesnoth/data/maps/Eastern_Invasion/The_Arena
 share/wesnoth/data/maps/Eastern_Invasion/The_Crossing
 share/wesnoth/data/maps/Eastern_Invasion/The_Escape_Tunnel
 share/wesnoth/data/maps/Eastern_Invasion/The_Outpost
 share/wesnoth/data/maps/Eastern_Invasion/The_Undead_Border_Patrol
+share/wesnoth/data/maps/Eastern_Invasion/Throne_Room
 share/wesnoth/data/maps/Eastern_Invasion/Training_the_Ogres
 share/wesnoth/data/maps/Eastern_Invasion/Tribal_Warfare
 share/wesnoth/data/maps/Eastern_Invasion/Two_Paths
 share/wesnoth/data/maps/Eastern_Invasion/Undead_Crossing
+share/wesnoth/data/maps/Eastern_Invasion/Weldyn_Besieged
 share/wesnoth/data/maps/Eastern_Invasion/Weldyn_under_Attack
 share/wesnoth/data/maps/Eastern_Invasion/loyalistmap11
 share/wesnoth/data/maps/Heir_To_The_Throne/A_Choice_Must_Be_Made
+share/wesnoth/data/maps/Heir_To_The_Throne/Battle_for_Wesnoth
 share/wesnoth/data/maps/Heir_To_The_Throne/Bay_of_Pearls
 share/wesnoth/data/maps/Heir_To_The_Throne/Blackwater_Port
 share/wesnoth/data/maps/Heir_To_The_Throne/Crossroads
@@ -53,14 +63,8 @@ share/wesnoth/data/maps/Heir_To_The_Throne/Swamp_Of_Dread
 share/wesnoth/data/maps/Heir_To_The_Throne/The_Lost_General
 share/wesnoth/data/maps/Heir_To_The_Throne/The_Siege_of_Elensefar
 share/wesnoth/data/maps/Heir_To_The_Throne/Valley_of_Death
-share/wesnoth/data/maps/Multiplayer/BattleWorld
-share/wesnoth/data/maps/Multiplayer/Castles
-share/wesnoth/data/maps/Multiplayer/ForestofFear
-share/wesnoth/data/maps/Multiplayer/King_of_the_Hill
-share/wesnoth/data/maps/Multiplayer/Three_Rivers
-share/wesnoth/data/maps/Multiplayer/Wesbowl
-share/wesnoth/data/maps/Multiplayer/Weslin
 share/wesnoth/data/maps/Son_Of_The_Black_Eye/Black_Flag
+share/wesnoth/data/maps/Son_Of_The_Black_Eye/Clash_Of_Armies
 share/wesnoth/data/maps/Son_Of_The_Black_Eye/Desert_Of_Death
 share/wesnoth/data/maps/Son_Of_The_Black_Eye/End_Of_Peace
 share/wesnoth/data/maps/Son_Of_The_Black_Eye/Saving_Inarix
@@ -76,21 +80,61 @@ share/wesnoth/data/maps/The_Dark_Hordes/Crelanus_Book
 share/wesnoth/data/maps/The_Dark_Hordes/Inside_The_Tower
 share/wesnoth/data/maps/The_Dark_Hordes/Mages_And_Elves
 share/wesnoth/data/maps/The_Dark_Hordes/The_Skull_of_Agarash
-share/wesnoth/data/maps/Tutorial/Tutorial1
-share/wesnoth/data/maps/Tutorial/Tutorial2
+share/wesnoth/data/maps/The_Dark_Hordes/Underground_Pool
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/A_Beach
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/A_Final_Spring
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/A_Harrowing_Escape
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/A_New_Land
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/A_Summer_of_Storms
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Clearwater_Port
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Cursed_Isle
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Elf_Lords
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Fallen_Lich_Point
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Peoples_in_Decline
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Return_of_the_Fleet
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Rise_of_Wesnoth
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Rough_Landing
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Sewer
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Southbay_in_Winter
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Temple_in_the_Deep
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/The_Dragon
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/The_Fall
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/The_Midlands
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/The_Oldwood
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/The_Plan
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/The_River_Road
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/The_Vanguard
+share/wesnoth/data/maps/The_Rise_of_Wesnoth/Troll_Hole
+share/wesnoth/data/maps/Tutorial/Basic_Training
+share/wesnoth/data/maps/Tutorial/Traits_and_Specialties
+share/wesnoth/data/maps/multiplayer/BattleWorld
+share/wesnoth/data/maps/multiplayer/Blitz
+share/wesnoth/data/maps/multiplayer/Broken_Bridge
+share/wesnoth/data/maps/multiplayer/CastleHoppingIsle
+share/wesnoth/data/maps/multiplayer/Castles
+share/wesnoth/data/maps/multiplayer/ForestofFear
+share/wesnoth/data/maps/multiplayer/King_of_the_Hill
+share/wesnoth/data/maps/multiplayer/Three_Rivers
+share/wesnoth/data/maps/multiplayer/Wesbowl
+share/wesnoth/data/maps/multiplayer/Weslin
 share/wesnoth/data/multiplayer.cfg
 share/wesnoth/data/names.cfg
-share/wesnoth/data/sample_translation.cfg
 share/wesnoth/data/scenario-test.cfg
+share/wesnoth/data/scenarios/Eastern_Invasion/Approaching_Weldyn.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Captured.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Crossing.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Elven_Alliance.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg
+share/wesnoth/data/scenarios/Eastern_Invasion/Evacuation.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Lake_Vrug.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Northern_Outpost.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Ogre_Training.cfg
+share/wesnoth/data/scenarios/Eastern_Invasion/Reject.cfg
+share/wesnoth/data/scenarios/Eastern_Invasion/The_Drowned_Plains.cfg
+share/wesnoth/data/scenarios/Eastern_Invasion/The_Duel.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/The_Outpost.cfg
+share/wesnoth/data/scenarios/Eastern_Invasion/Throne_Room.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Two_Paths.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg
@@ -100,12 +144,14 @@ share/wesnoth/data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/deaths.cfg
 share/wesnoth/data/scenarios/Eastern_Invasion/intro.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg
+share/wesnoth/data/scenarios/Heir_To_The_Throne/Battle_for_Wesnoth.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Crossroads.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Elven_Council.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg
+share/wesnoth/data/scenarios/Heir_To_The_Throne/Epilogue.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg
@@ -127,6 +173,9 @@ share/wesnoth/data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg
 share/wesnoth/data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg
+share/wesnoth/data/scenarios/Heir_To_The_Throne/bigmap.cfg
+share/wesnoth/data/scenarios/Heir_To_The_Throne/deaths.cfg
+share/wesnoth/data/scenarios/Heir_To_The_Throne/intro.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg
 share/wesnoth/data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg
@@ -147,49 +196,93 @@ share/wesnoth/data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg
 share/wesnoth/data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg
+share/wesnoth/data/scenarios/The_Dark_Hordes/Underground_Pool.cfg
+share/wesnoth/data/scenarios/The_Dark_Hordes/intro.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Beach.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Final_Spring.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Harrowing_Escape.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_New_Land.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Spy_in_the_Woods.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/A_Summer_of_Storms.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Clearwater_Port.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Cursed_Isle.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Elf_Lords.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Epilogue.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Fallen_Lich_Point.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Peoples_in_Decline.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_of_the_Fleet.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Return_to_Oldwood.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rise_of_Wesnoth.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Rough_Landing.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Sewer.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Southbay_in_Winter.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Temple_of_the_Deep.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Dragon.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Fall.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Midlands.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Oldwood.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Plan.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_River_Road.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/The_Vanguard.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/Troll_Hole.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-deaths.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-intro.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-macros.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nlmsg.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-nohome.cfg
+share/wesnoth/data/scenarios/The_Rise_of_Wesnoth/trow-noisle.cfg
+share/wesnoth/data/scenarios/multiplayer/An_Island.cfg
+share/wesnoth/data/scenarios/multiplayer/Blitz.cfg
+share/wesnoth/data/scenarios/multiplayer/BrokenBridge.cfg
+share/wesnoth/data/scenarios/multiplayer/CastleHoppingIsle.cfg
 share/wesnoth/data/scenarios/multiplayer/ForestOfFear.cfg
 share/wesnoth/data/scenarios/multiplayer/Random_Scenario.cfg
+share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Desert.cfg
+share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Marsh.cfg
+share/wesnoth/data/scenarios/multiplayer/Random_Scenario_Winter.cfg
 share/wesnoth/data/scenarios/multiplayer/Wesbowl.cfg
 share/wesnoth/data/scenarios/multiplayer/WeslinBridge.cfg
 share/wesnoth/data/scenarios/multiplayer/battleworld.cfg
 share/wesnoth/data/scenarios/multiplayer/castles.cfg
 share/wesnoth/data/scenarios/multiplayer/scenarios.cfg
+share/wesnoth/data/scenarios/tutorial/Basic_Training.cfg
+share/wesnoth/data/scenarios/tutorial/Traits_and_Specialties.cfg
+share/wesnoth/data/scenarios/tutorial/utils.cfg
 share/wesnoth/data/schedules.cfg
 share/wesnoth/data/terrain-graphics.cfg
-share/wesnoth/data/terrain-graphics/adjacent-north.cfg
 share/wesnoth/data/terrain-graphics/adjacent.cfg
 share/wesnoth/data/terrain-graphics/base.cfg
+share/wesnoth/data/terrain-graphics/bridges.cfg
 share/wesnoth/data/terrain-graphics/buildings.cfg
+share/wesnoth/data/terrain-graphics/canyon.cfg
 share/wesnoth/data/terrain-graphics/castle-transitions.cfg
 share/wesnoth/data/terrain-graphics/castles.cfg
+share/wesnoth/data/terrain-graphics/forests.cfg
 share/wesnoth/data/terrain-graphics/util.cfg
 share/wesnoth/data/terrain.cfg
 share/wesnoth/data/themes/default.cfg
 share/wesnoth/data/themes/editor.cfg
+share/wesnoth/data/tips.cfg
 share/wesnoth/data/tools/exploder/castle-concave.cfg
 share/wesnoth/data/tools/exploder/castle-convex.cfg
 share/wesnoth/data/tools/exploder/castle-exploded-concave.cfg
 share/wesnoth/data/tools/exploder/castle-exploded-convex.cfg
+share/wesnoth/data/tools/exploder/castle-wall-concave.cfg
+share/wesnoth/data/tools/exploder/castle-wall-convex.cfg
+share/wesnoth/data/tools/exploder/castle-wall-exploded-concave.cfg
+share/wesnoth/data/tools/exploder/castle-wall-exploded-convex.cfg
+share/wesnoth/data/tools/exploder/castle-wall-trans-n-s.cfg
+share/wesnoth/data/tools/exploder/castle-wall-trans-ne-sw.cfg
+share/wesnoth/data/tools/exploder/castle-wall-trans-nw-se.cfg
+share/wesnoth/data/tools/exploder/castle-wall-trans-s-n.cfg
+share/wesnoth/data/tools/exploder/castle-wall-trans-se-nw.cfg
+share/wesnoth/data/tools/exploder/castle-wall-trans-sw-ne.cfg
 share/wesnoth/data/tools/exploder/models/castle.cfg
-share/wesnoth/data/translations/brazilian.cfg
-share/wesnoth/data/translations/catalan.cfg
-share/wesnoth/data/translations/czech.cfg
-share/wesnoth/data/translations/danish.cfg
-share/wesnoth/data/translations/dutch.cfg
+share/wesnoth/data/tools/exploder/wall-concave.cfg
+share/wesnoth/data/tools/exploder/wall-convex.cfg
+share/wesnoth/data/tools/exploder/wall-exploded-concave.cfg
+share/wesnoth/data/tools/exploder/wall-exploded-convex.cfg
 share/wesnoth/data/translations/english.cfg
-share/wesnoth/data/translations/finnish.cfg
-share/wesnoth/data/translations/french.cfg
-share/wesnoth/data/translations/german.cfg
-share/wesnoth/data/translations/hungarian.cfg
-share/wesnoth/data/translations/italian.cfg
-share/wesnoth/data/translations/norwegian.cfg
-share/wesnoth/data/translations/polish.cfg
-share/wesnoth/data/translations/portuguesebr.cfg
-share/wesnoth/data/translations/slovak.cfg
-share/wesnoth/data/translations/spanish.cfg
-share/wesnoth/data/translations/swedish.cfg
-share/wesnoth/data/tutorial.cfg
-share/wesnoth/data/tutorial2.cfg
 share/wesnoth/data/units/Ancient_Lich.cfg
 share/wesnoth/data/units/Ancient_Wose.cfg
 share/wesnoth/data/units/Arch_Mage.cfg
@@ -208,30 +301,34 @@ share/wesnoth/data/units/Cockatrice.cfg
 share/wesnoth/data/units/Commander.cfg
 share/wesnoth/data/units/Cuttle_Fish.cfg
 share/wesnoth/data/units/Dark_Adept.cfg
+share/wesnoth/data/units/Dark_Queen.cfg
 share/wesnoth/data/units/Dark_Spirit.cfg
 share/wesnoth/data/units/Death_Knight.cfg
 share/wesnoth/data/units/Deathmaster.cfg
 share/wesnoth/data/units/Demilich.cfg
 share/wesnoth/data/units/Direwolf_Rider.cfg
 share/wesnoth/data/units/Dragoon.cfg
-share/wesnoth/data/units/Drake_Beak.cfg
 share/wesnoth/data/units/Drake_Burner.cfg
 share/wesnoth/data/units/Drake_Clasher.cfg
 share/wesnoth/data/units/Drake_Fighter.cfg
 share/wesnoth/data/units/Drake_Fire.cfg
-share/wesnoth/data/units/Drake_Guard.cfg
-share/wesnoth/data/units/Drake_Mage.cfg
-share/wesnoth/data/units/Drake_Petit.cfg
+share/wesnoth/data/units/Drake_Flameheart.cfg
+share/wesnoth/data/units/Drake_Flare.cfg
+share/wesnoth/data/units/Drake_Gladiator.cfg
+share/wesnoth/data/units/Drake_Glider.cfg
+share/wesnoth/data/units/Drake_Inferno.cfg
+share/wesnoth/data/units/Drake_Sky.cfg
 share/wesnoth/data/units/Drake_Slasher.cfg
-share/wesnoth/data/units/Drake_Slave.cfg
 share/wesnoth/data/units/Drake_Warrior.cfg
-share/wesnoth/data/units/Drake_Worker.cfg
 share/wesnoth/data/units/Duelist.cfg
 share/wesnoth/data/units/Dwarvish_Berserker.cfg
 share/wesnoth/data/units/Dwarvish_Dragonguard.cfg
 share/wesnoth/data/units/Dwarvish_Fighter.cfg
+share/wesnoth/data/units/Dwarvish_Guardsman.cfg
 share/wesnoth/data/units/Dwarvish_Lord.cfg
 share/wesnoth/data/units/Dwarvish_Runemaster.cfg
+share/wesnoth/data/units/Dwarvish_Sentinel.cfg
+share/wesnoth/data/units/Dwarvish_Stalwart.cfg
 share/wesnoth/data/units/Dwarvish_Steelclad.cfg
 share/wesnoth/data/units/Dwarvish_Thunderer.cfg
 share/wesnoth/data/units/Dwarvish_Thunderguard.cfg
@@ -243,8 +340,11 @@ share/wesnoth/data/units/Elvish_Avenger.cfg
 share/wesnoth/data/units/Elvish_Captain.cfg
 share/wesnoth/data/units/Elvish_Champion.cfg
 share/wesnoth/data/units/Elvish_Druid.cfg
+share/wesnoth/data/units/Elvish_Enchantress.cfg
 share/wesnoth/data/units/Elvish_Fighter.cfg
 share/wesnoth/data/units/Elvish_Hero.cfg
+share/wesnoth/data/units/Elvish_High_Lord.cfg
+share/wesnoth/data/units/Elvish_Lady.cfg
 share/wesnoth/data/units/Elvish_Lord.cfg
 share/wesnoth/data/units/Elvish_Marksman.cfg
 share/wesnoth/data/units/Elvish_Marshal.cfg
@@ -255,26 +355,36 @@ share/wesnoth/data/units/Elvish_Scout.cfg
 share/wesnoth/data/units/Elvish_Shaman.cfg
 share/wesnoth/data/units/Elvish_Sharpshooter.cfg
 share/wesnoth/data/units/Elvish_Shyde.cfg
+share/wesnoth/data/units/Elvish_Sorceress.cfg
+share/wesnoth/data/units/Elvish_Sylph.cfg
 share/wesnoth/data/units/Fencer.cfg
 share/wesnoth/data/units/Fighter.cfg
+share/wesnoth/data/units/Fire_Dragon.cfg
+share/wesnoth/data/units/Fireball.cfg
 share/wesnoth/data/units/Footpad.cfg
 share/wesnoth/data/units/Galleon.cfg
 share/wesnoth/data/units/Gate.cfg
 share/wesnoth/data/units/General.cfg
 share/wesnoth/data/units/Ghost.cfg
 share/wesnoth/data/units/Ghoul.cfg
+share/wesnoth/data/units/Giant_Mudcrawler.cfg
 share/wesnoth/data/units/Giant_Scorpion.cfg
 share/wesnoth/data/units/Goblin_Direwolver.cfg
+share/wesnoth/data/units/Goblin_Impaler.cfg
 share/wesnoth/data/units/Goblin_Knight.cfg
 share/wesnoth/data/units/Goblin_Pillager.cfg
+share/wesnoth/data/units/Goblin_Spearman.cfg
 share/wesnoth/data/units/Grand_Knight.cfg
+share/wesnoth/data/units/Grand_Marshal.cfg
 share/wesnoth/data/units/Great_Mage.cfg
+share/wesnoth/data/units/Great_Troll.cfg
 share/wesnoth/data/units/Gryphon.cfg
 share/wesnoth/data/units/Gryphon_Master.cfg
 share/wesnoth/data/units/Gryphon_Rider.cfg
 share/wesnoth/data/units/Halbardier.cfg
 share/wesnoth/data/units/Heavy_Infantry.cfg
 share/wesnoth/data/units/Heavy_Infantryman.cfg
+share/wesnoth/data/units/Horse_Lord.cfg
 share/wesnoth/data/units/Horseman.cfg
 share/wesnoth/data/units/Initiate.cfg
 share/wesnoth/data/units/Iron_Mauler.cfg
@@ -287,25 +397,51 @@ share/wesnoth/data/units/Lord.cfg
 share/wesnoth/data/units/Mage.cfg
 share/wesnoth/data/units/Mage_of_Light.cfg
 share/wesnoth/data/units/Master_Bowman.cfg
+share/wesnoth/data/units/Mermaid_Diviner.cfg
+share/wesnoth/data/units/Mermaid_Enchantress.cfg
+share/wesnoth/data/units/Mermaid_Initiate.cfg
+share/wesnoth/data/units/Mermaid_Priestess.cfg
+share/wesnoth/data/units/Mermaid_Siren.cfg
 share/wesnoth/data/units/Merman.cfg
+share/wesnoth/data/units/Merman_Entangler.cfg
+share/wesnoth/data/units/Merman_Fighter.cfg
+share/wesnoth/data/units/Merman_Hoplite.cfg
+share/wesnoth/data/units/Merman_Hunter.cfg
+share/wesnoth/data/units/Merman_Javelineer.cfg
 share/wesnoth/data/units/Merman_Lord.cfg
+share/wesnoth/data/units/Merman_Netcaster.cfg
+share/wesnoth/data/units/Merman_Spearman.cfg
+share/wesnoth/data/units/Merman_Triton.cfg
+share/wesnoth/data/units/Merman_Warrior.cfg
+share/wesnoth/data/units/Mounted_Captain.cfg
+share/wesnoth/data/units/Mounted_Commander.cfg
+share/wesnoth/data/units/Mudcrawler.cfg
 share/wesnoth/data/units/Naga.cfg
 share/wesnoth/data/units/Necromancer.cfg
 share/wesnoth/data/units/Necrophage.cfg
 share/wesnoth/data/units/Nightgaunt.cfg
+share/wesnoth/data/units/Noble_Commander.cfg
+share/wesnoth/data/units/Noble_Fighter.cfg
+share/wesnoth/data/units/Noble_Lord.cfg
+share/wesnoth/data/units/Noble_Youth.cfg
 share/wesnoth/data/units/Ogre.cfg
 share/wesnoth/data/units/Orcish_Archer.cfg
 share/wesnoth/data/units/Orcish_Assassin.cfg
 share/wesnoth/data/units/Orcish_Crossbow.cfg
 share/wesnoth/data/units/Orcish_Crossbowman.cfg
 share/wesnoth/data/units/Orcish_Grunt.cfg
+share/wesnoth/data/units/Orcish_Leader.cfg
 share/wesnoth/data/units/Orcish_Ruler.cfg
 share/wesnoth/data/units/Orcish_Shaman.cfg
 share/wesnoth/data/units/Orcish_Slayer.cfg
+share/wesnoth/data/units/Orcish_Sovereign.cfg
 share/wesnoth/data/units/Orcish_Warlord.cfg
 share/wesnoth/data/units/Orcish_Warrior.cfg
 share/wesnoth/data/units/Outlaw.cfg
+share/wesnoth/data/units/Outlaw_Princess.cfg
+share/wesnoth/data/units/Outlaw_Queen.cfg
 share/wesnoth/data/units/Paladin.cfg
+share/wesnoth/data/units/Peasant.cfg
 share/wesnoth/data/units/Pikeman.cfg
 share/wesnoth/data/units/Pirate_Galleon.cfg
 share/wesnoth/data/units/Poacher.cfg
@@ -315,7 +451,11 @@ share/wesnoth/data/units/Revenant.cfg
 share/wesnoth/data/units/Rogue.cfg
 share/wesnoth/data/units/Royal_Guard.cfg
 share/wesnoth/data/units/Saurian.cfg
+share/wesnoth/data/units/Saurian_Icecaster.cfg
+share/wesnoth/data/units/Saurian_Soothsayer.cfg
+share/wesnoth/data/units/Saurian_Tribalist.cfg
 share/wesnoth/data/units/Saurian_Warrior.cfg
+share/wesnoth/data/units/Scout.cfg
 share/wesnoth/data/units/Sea_Hag.cfg
 share/wesnoth/data/units/Sea_Orc.cfg
 share/wesnoth/data/units/Sea_Serpent.cfg
@@ -323,24 +463,31 @@ share/wesnoth/data/units/Sergeant.cfg
 share/wesnoth/data/units/Shadow.cfg
 share/wesnoth/data/units/Shock_Trooper.cfg
 share/wesnoth/data/units/Silver_Mage.cfg
+share/wesnoth/data/units/Skeletal_Dragon.cfg
 share/wesnoth/data/units/Skeleton.cfg
 share/wesnoth/data/units/Skeleton_Archer.cfg
 share/wesnoth/data/units/Sleeping_Gryphon.cfg
+share/wesnoth/data/units/Soul_Shooter.cfg
 share/wesnoth/data/units/Soulless.cfg
 share/wesnoth/data/units/Spearman.cfg
 share/wesnoth/data/units/Spectre.cfg
 share/wesnoth/data/units/Swordsman.cfg
+share/wesnoth/data/units/Tentacle.cfg
 share/wesnoth/data/units/Thief.cfg
 share/wesnoth/data/units/Thug.cfg
 share/wesnoth/data/units/Transport_Galleon.cfg
 share/wesnoth/data/units/Trapper.cfg
 share/wesnoth/data/units/Triton.cfg
 share/wesnoth/data/units/Troll.cfg
+share/wesnoth/data/units/Troll_Hero.cfg
+share/wesnoth/data/units/Troll_Rocklobber.cfg
 share/wesnoth/data/units/Troll_Warrior.cfg
 share/wesnoth/data/units/Troll_Whelp.cfg
 share/wesnoth/data/units/Vampire_Bat.cfg
 share/wesnoth/data/units/Vampire_Lady.cfg
 share/wesnoth/data/units/Walking_Corpse.cfg
+share/wesnoth/data/units/Wall_Guard.cfg
+share/wesnoth/data/units/Warrior_King.cfg
 share/wesnoth/data/units/Watch_Tower.cfg
 share/wesnoth/data/units/White_Mage.cfg
 share/wesnoth/data/units/Wolf_Rider.cfg
@@ -351,18 +498,13 @@ share/wesnoth/data/units/Young_Ogre.cfg
 share/wesnoth/data/units/Youth.cfg
 share/wesnoth/data/utils.cfg
 share/wesnoth/fonts/Bepa-Roman.ttf
+share/wesnoth/fonts/FreeSans.ttf
 share/wesnoth/fonts/Vera.ttf
-share/wesnoth/images/Afternoon.png
-share/wesnoth/images/Dawn.png
-share/wesnoth/images/Day.png
-share/wesnoth/images/Dusk.png
-share/wesnoth/images/FirstWatch.png
-share/wesnoth/images/Morning.png
-share/wesnoth/images/Night.png
-share/wesnoth/images/SecondWatch.png
-share/wesnoth/images/Underground.png
-share/wesnoth/images/UndergroundIllum.png
-share/wesnoth/images/ally-energy.png
+share/wesnoth/images/arch-mage+female-attack.png
+share/wesnoth/images/arch-mage+female-attack1.png
+share/wesnoth/images/arch-mage+female-attack2.png
+share/wesnoth/images/arch-mage+female-defend.png
+share/wesnoth/images/arch-mage+female.png
 share/wesnoth/images/arch-mage-attack.png
 share/wesnoth/images/arch-mage-attack1.png
 share/wesnoth/images/arch-mage-attack2.png
@@ -393,12 +535,14 @@ share/wesnoth/images/attacks/entangle.png
 share/wesnoth/images/attacks/faerie_touch.png
 share/wesnoth/images/attacks/fangs.png
 share/wesnoth/images/attacks/fireball.png
+share/wesnoth/images/attacks/fireclaws.png
 share/wesnoth/images/attacks/fist.png
 share/wesnoth/images/attacks/frenzy.png
 share/wesnoth/images/attacks/gaze.png
 share/wesnoth/images/attacks/halberd.png
 share/wesnoth/images/attacks/hammer.png
 share/wesnoth/images/attacks/hatchet.png
+share/wesnoth/images/attacks/iceball.png
 share/wesnoth/images/attacks/ink.png
 share/wesnoth/images/attacks/knife.png
 share/wesnoth/images/attacks/lance.png
@@ -409,12 +553,15 @@ share/wesnoth/images/attacks/mace.png
 share/wesnoth/images/attacks/missile.png
 share/wesnoth/images/attacks/paladinsword.png
 share/wesnoth/images/attacks/pike.png
+share/wesnoth/images/attacks/pincers.png
 share/wesnoth/images/attacks/pistol.png
+share/wesnoth/images/attacks/pitchfork.png
 share/wesnoth/images/attacks/rapier.png
 share/wesnoth/images/attacks/short-sword.png
 share/wesnoth/images/attacks/sling.png
 share/wesnoth/images/attacks/spear.png
 share/wesnoth/images/attacks/staff.png
+share/wesnoth/images/attacks/sting.png
 share/wesnoth/images/attacks/sword.png
 share/wesnoth/images/attacks/tentacle.png
 share/wesnoth/images/attacks/thorns.png
@@ -456,6 +603,25 @@ share/wesnoth/images/buttons/slider.png
 share/wesnoth/images/buttons/uparrow-button-active.png
 share/wesnoth/images/buttons/uparrow-button-pressed.png
 share/wesnoth/images/buttons/uparrow-button.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story0a.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story0b.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story1.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story2.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story3.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story4.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story5.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story6.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story7.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story8.png
+share/wesnoth/images/campaigns/Heir_To_The_Throne/story9.png
+share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/sotbe.png
+share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/sotbe1.png
+share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/sotbe2.png
+share/wesnoth/images/campaigns/Son_Of_The_Black_Eye/sotbe3.png
+share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/east.png
+share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/trow-logo.png
+share/wesnoth/images/campaigns/The_Rise_of_Wesnoth/west.png
+share/wesnoth/images/cavespider-defend.png
 share/wesnoth/images/cavespider.png
 share/wesnoth/images/cockatrice-attack1.png
 share/wesnoth/images/cockatrice-attack2.png
@@ -473,23 +639,29 @@ share/wesnoth/images/cursors/select.png
 share/wesnoth/images/cursors/wait.png
 share/wesnoth/images/cuttlefish-defend.png
 share/wesnoth/images/cuttlefish.png
+share/wesnoth/images/deep-tentacle-attack.png
+share/wesnoth/images/deep-tentacle-defend.png
+share/wesnoth/images/deep-tentacle.png
 share/wesnoth/images/direwolf_rider.png
-share/wesnoth/images/drake-beak-attack.png
-share/wesnoth/images/drake-beak-defend.png
-share/wesnoth/images/drake-beak.png
+share/wesnoth/images/drake-burner-attack-close.png
 share/wesnoth/images/drake-burner-attack-close1.png
 share/wesnoth/images/drake-burner-attack-close2.png
 share/wesnoth/images/drake-burner-attack-ranged.png
+share/wesnoth/images/drake-burner-attack-ranged1.png
+share/wesnoth/images/drake-burner-attack-ranged2.png
 share/wesnoth/images/drake-burner-defend.png
 share/wesnoth/images/drake-burner-flying.png
 share/wesnoth/images/drake-burner.png
+share/wesnoth/images/drake-clasher-attack-spear.png
 share/wesnoth/images/drake-clasher-attack-spear1.png
 share/wesnoth/images/drake-clasher-attack-spear2.png
+share/wesnoth/images/drake-clasher-attack-sword.png
 share/wesnoth/images/drake-clasher-attack-sword1.png
 share/wesnoth/images/drake-clasher-attack-sword2.png
 share/wesnoth/images/drake-clasher-attack-sword3.png
 share/wesnoth/images/drake-clasher-attack-sword4.png
 share/wesnoth/images/drake-clasher-defend.png
+share/wesnoth/images/drake-clasher-flying.png
 share/wesnoth/images/drake-clasher.png
 share/wesnoth/images/drake-fighter-attack-close1.png
 share/wesnoth/images/drake-fighter-attack-close2.png
@@ -498,25 +670,52 @@ share/wesnoth/images/drake-fighter-attack-fire2.png
 share/wesnoth/images/drake-fighter-defend.png
 share/wesnoth/images/drake-fighter-flying.png
 share/wesnoth/images/drake-fighter.png
+share/wesnoth/images/drake-fire-attack-close.png
 share/wesnoth/images/drake-fire-attack-close1.png
 share/wesnoth/images/drake-fire-attack-close2.png
 share/wesnoth/images/drake-fire-attack-ranged.png
 share/wesnoth/images/drake-fire-defend.png
+share/wesnoth/images/drake-fire-flying.png
 share/wesnoth/images/drake-fire.png
-share/wesnoth/images/drake-guard-attack-close1.png
-share/wesnoth/images/drake-guard-attack-close2.png
-share/wesnoth/images/drake-guard-attack-ranged.png
-share/wesnoth/images/drake-guard-defend.png
-share/wesnoth/images/drake-guard.png
-share/wesnoth/images/drake-mage-attack-close.png
-share/wesnoth/images/drake-mage-attack-ranged-breath.png
-share/wesnoth/images/drake-mage-attack-ranged-staff1.png
-share/wesnoth/images/drake-mage-attack-ranged-staff2.png
-share/wesnoth/images/drake-mage-defend.png
-share/wesnoth/images/drake-mage.png
-share/wesnoth/images/drake-petit-attack.png
-share/wesnoth/images/drake-petit-defend.png
-share/wesnoth/images/drake-petit.png
+share/wesnoth/images/drake-flameheart-attack-close0.png
+share/wesnoth/images/drake-flameheart-attack-close1.png
+share/wesnoth/images/drake-flameheart-attack-close2.png
+share/wesnoth/images/drake-flameheart-attack-close3.png
+share/wesnoth/images/drake-flameheart-attack-close4.png
+share/wesnoth/images/drake-flameheart-attack-ranged.png
+share/wesnoth/images/drake-flameheart-defend.png
+share/wesnoth/images/drake-flameheart-flying.png
+share/wesnoth/images/drake-flameheart-lead.png
+share/wesnoth/images/drake-flameheart.png
+share/wesnoth/images/drake-flare-attack-close.png
+share/wesnoth/images/drake-flare-attack-ranged.png
+share/wesnoth/images/drake-flare-defend.png
+share/wesnoth/images/drake-flare-flying.png
+share/wesnoth/images/drake-flare-lead.png
+share/wesnoth/images/drake-flare.png
+share/wesnoth/images/drake-gladiator-attack-mace.png
+share/wesnoth/images/drake-gladiator-attack-spear.png
+share/wesnoth/images/drake-gladiator-attack-sword.png
+share/wesnoth/images/drake-gladiator-defend.png
+share/wesnoth/images/drake-gladiator-flying.png
+share/wesnoth/images/drake-gladiator.png
+share/wesnoth/images/drake-glider-attack-close1.png
+share/wesnoth/images/drake-glider-attack-close2.png
+share/wesnoth/images/drake-glider-defend.png
+share/wesnoth/images/drake-glider-flying.png
+share/wesnoth/images/drake-glider-ranged-attack.png
+share/wesnoth/images/drake-glider.png
+share/wesnoth/images/drake-inferno-attack-close.png
+share/wesnoth/images/drake-inferno-attack-ranged.png
+share/wesnoth/images/drake-inferno-defend.png
+share/wesnoth/images/drake-inferno-flying.png
+share/wesnoth/images/drake-inferno.png
+share/wesnoth/images/drake-sky-attack-melee1.png
+share/wesnoth/images/drake-sky-attack-melee2.png
+share/wesnoth/images/drake-sky-attack-ranged-fire.png
+share/wesnoth/images/drake-sky-attack-ranged-impact.png
+share/wesnoth/images/drake-sky-defend.png
+share/wesnoth/images/drake-sky.png
 share/wesnoth/images/drake-slasher-attack-blade1.png
 share/wesnoth/images/drake-slasher-attack-blade2.png
 share/wesnoth/images/drake-slasher-attack-blade3.png
@@ -527,21 +726,16 @@ share/wesnoth/images/drake-slasher-attack-spear1.png
 share/wesnoth/images/drake-slasher-attack-spear2.png
 share/wesnoth/images/drake-slasher-attack-spear3.png
 share/wesnoth/images/drake-slasher-defend.png
+share/wesnoth/images/drake-slasher-flying.png
+share/wesnoth/images/drake-slasher-pierce.png
+share/wesnoth/images/drake-slasher-slash.png
 share/wesnoth/images/drake-slasher.png
-share/wesnoth/images/drake-slave-attack1.png
-share/wesnoth/images/drake-slave-attack2.png
-share/wesnoth/images/drake-slave-defend.png
-share/wesnoth/images/drake-slave.png
 share/wesnoth/images/drake-warrior-attack-close1.png
 share/wesnoth/images/drake-warrior-attack-close2.png
 share/wesnoth/images/drake-warrior-attack-ranged.png
 share/wesnoth/images/drake-warrior-defend.png
 share/wesnoth/images/drake-warrior-flying.png
 share/wesnoth/images/drake-warrior.png
-share/wesnoth/images/drake-worker-attack1.png
-share/wesnoth/images/drake-worker-attack2.png
-share/wesnoth/images/drake-worker-defend.png
-share/wesnoth/images/drake-worker.png
 share/wesnoth/images/dwarf-berserker-attack.png
 share/wesnoth/images/dwarf-berserker-defend.png
 share/wesnoth/images/dwarf-berserker.png
@@ -549,9 +743,14 @@ share/wesnoth/images/dwarf-dragonguard-attack-close.png
 share/wesnoth/images/dwarf-dragonguard-attack-ranged.png
 share/wesnoth/images/dwarf-dragonguard-defend.png
 share/wesnoth/images/dwarf-dragonguard.png
+share/wesnoth/images/dwarf-fighter-attack-mace.png
 share/wesnoth/images/dwarf-fighter-attack.png
 share/wesnoth/images/dwarf-fighter-defend.png
 share/wesnoth/images/dwarf-fighter.png
+share/wesnoth/images/dwarf-guard-attack.png
+share/wesnoth/images/dwarf-guard-defend.png
+share/wesnoth/images/dwarf-guard.png
+share/wesnoth/images/dwarf-lord-attack-mace.png
 share/wesnoth/images/dwarf-lord-attack.png
 share/wesnoth/images/dwarf-lord-defend.png
 share/wesnoth/images/dwarf-lord-ranged.png
@@ -559,6 +758,12 @@ share/wesnoth/images/dwarf-lord.png
 share/wesnoth/images/dwarf-runemaster-attack.png
 share/wesnoth/images/dwarf-runemaster-defend.png
 share/wesnoth/images/dwarf-runemaster.png
+share/wesnoth/images/dwarf-sentinel-attack.png
+share/wesnoth/images/dwarf-sentinel-defend.png
+share/wesnoth/images/dwarf-sentinel.png
+share/wesnoth/images/dwarf-stalwart-attack.png
+share/wesnoth/images/dwarf-stalwart-defend.png
+share/wesnoth/images/dwarf-stalwart.png
 share/wesnoth/images/dwarf-thunderer-attack.png
 share/wesnoth/images/dwarf-thunderer-attack1.png
 share/wesnoth/images/dwarf-thunderer-defend.png
@@ -571,6 +776,7 @@ share/wesnoth/images/dwarf-thunderguard.png
 share/wesnoth/images/dwarf-ulfserker-attack.png
 share/wesnoth/images/dwarf-ulfserker-defend.png
 share/wesnoth/images/dwarf-ulfserker.png
+share/wesnoth/images/dwarf-warrior-attack-mace.png
 share/wesnoth/images/dwarf-warrior-attack.png
 share/wesnoth/images/dwarf-warrior-defend.png
 share/wesnoth/images/dwarf-warrior.png
@@ -581,13 +787,29 @@ share/wesnoth/images/elder-mage-attack.png
 share/wesnoth/images/elder-mage-defend.png
 share/wesnoth/images/elder-mage-ranged.png
 share/wesnoth/images/elder-mage.png
+share/wesnoth/images/elvish-archer+female-attack.png
+share/wesnoth/images/elvish-archer+female-attack1.png
+share/wesnoth/images/elvish-archer+female-attack2.png
+share/wesnoth/images/elvish-archer+female-attack3.png
+share/wesnoth/images/elvish-archer+female-bow-defend.png
+share/wesnoth/images/elvish-archer+female-bow.png
+share/wesnoth/images/elvish-archer+female-defend.png
+share/wesnoth/images/elvish-archer+female.png
 share/wesnoth/images/elvish-archer-attack.png
 share/wesnoth/images/elvish-archer-attack1.png
 share/wesnoth/images/elvish-archer-attack2.png
 share/wesnoth/images/elvish-archer-attack3.png
 share/wesnoth/images/elvish-archer-bow-defend.png
+share/wesnoth/images/elvish-archer-bow.png
 share/wesnoth/images/elvish-archer-defend.png
 share/wesnoth/images/elvish-archer.png
+share/wesnoth/images/elvish-avenger+female-attack.png
+share/wesnoth/images/elvish-avenger+female-attack1.png
+share/wesnoth/images/elvish-avenger+female-attack2.png
+share/wesnoth/images/elvish-avenger+female-bow-defend.png
+share/wesnoth/images/elvish-avenger+female-bow.png
+share/wesnoth/images/elvish-avenger+female-defend.png
+share/wesnoth/images/elvish-avenger+female.png
 share/wesnoth/images/elvish-avenger-attack.png
 share/wesnoth/images/elvish-avenger-attack1.png
 share/wesnoth/images/elvish-avenger-attack2.png
@@ -619,8 +841,33 @@ share/wesnoth/images/elvish-druid-healing2.png
 share/wesnoth/images/elvish-druid-healing3.png
 share/wesnoth/images/elvish-druid-healing4.png
 share/wesnoth/images/elvish-druid-healing5.png
+share/wesnoth/images/elvish-druid-healing6.png
+share/wesnoth/images/elvish-druid-healing7.png
+share/wesnoth/images/elvish-druid-healing8.png
 share/wesnoth/images/elvish-druid-ranged.png
 share/wesnoth/images/elvish-druid.png
+share/wesnoth/images/elvish-enchantress-attack1.png
+share/wesnoth/images/elvish-enchantress-attack2.png
+share/wesnoth/images/elvish-enchantress-attack3.png
+share/wesnoth/images/elvish-enchantress-attack4.png
+share/wesnoth/images/elvish-enchantress-attack5.png
+share/wesnoth/images/elvish-enchantress-attack6.png
+share/wesnoth/images/elvish-enchantress-attack7.png
+share/wesnoth/images/elvish-enchantress-defend.png
+share/wesnoth/images/elvish-enchantress-entangle1.png
+share/wesnoth/images/elvish-enchantress-entangle2.png
+share/wesnoth/images/elvish-enchantress-entangle3.png
+share/wesnoth/images/elvish-enchantress-entangle4.png
+share/wesnoth/images/elvish-enchantress-entangle5.png
+share/wesnoth/images/elvish-enchantress-entangle6.png
+share/wesnoth/images/elvish-enchantress-entangle7.png
+share/wesnoth/images/elvish-enchantress-melee1.png
+share/wesnoth/images/elvish-enchantress-melee2.png
+share/wesnoth/images/elvish-enchantress-melee3.png
+share/wesnoth/images/elvish-enchantress-melee4.png
+share/wesnoth/images/elvish-enchantress-melee5.png
+share/wesnoth/images/elvish-enchantress-ranged-defend.png
+share/wesnoth/images/elvish-enchantress.png
 share/wesnoth/images/elvish-fighter-attack.png
 share/wesnoth/images/elvish-fighter-bow-attack1.png
 share/wesnoth/images/elvish-fighter-bow-attack2.png
@@ -635,11 +882,24 @@ share/wesnoth/images/elvish-hero-bow-defend.png
 share/wesnoth/images/elvish-hero-bow.png
 share/wesnoth/images/elvish-hero-defend.png
 share/wesnoth/images/elvish-hero.png
+share/wesnoth/images/elvish-high-lord-defend.png
+share/wesnoth/images/elvish-high-lord-melee.png
+share/wesnoth/images/elvish-high-lord-ranged1.png
+share/wesnoth/images/elvish-high-lord-ranged2.png
+share/wesnoth/images/elvish-high-lord-ranged3.png
+share/wesnoth/images/elvish-high-lord.png
 share/wesnoth/images/elvish-lord-defend.png
 share/wesnoth/images/elvish-lord-melee.png
 share/wesnoth/images/elvish-lord-ranged1.png
 share/wesnoth/images/elvish-lord-ranged2.png
 share/wesnoth/images/elvish-lord.png
+share/wesnoth/images/elvish-marksman+female-attack.png
+share/wesnoth/images/elvish-marksman+female-attack1.png
+share/wesnoth/images/elvish-marksman+female-attack2.png
+share/wesnoth/images/elvish-marksman+female-attack3.png
+share/wesnoth/images/elvish-marksman+female-bow-defend.png
+share/wesnoth/images/elvish-marksman+female-defend.png
+share/wesnoth/images/elvish-marksman+female.png
 share/wesnoth/images/elvish-marksman-attack.png
 share/wesnoth/images/elvish-marksman-attack1.png
 share/wesnoth/images/elvish-marksman-attack2.png
@@ -658,6 +918,13 @@ share/wesnoth/images/elvish-outrider-attack1.png
 share/wesnoth/images/elvish-outrider-attack2.png
 share/wesnoth/images/elvish-outrider-defend.png
 share/wesnoth/images/elvish-outrider.png
+share/wesnoth/images/elvish-ranger+female-attack.png
+share/wesnoth/images/elvish-ranger+female-attack1.png
+share/wesnoth/images/elvish-ranger+female-attack2.png
+share/wesnoth/images/elvish-ranger+female-attack3.png
+share/wesnoth/images/elvish-ranger+female-bow-defend.png
+share/wesnoth/images/elvish-ranger+female-defend.png
+share/wesnoth/images/elvish-ranger+female.png
 share/wesnoth/images/elvish-ranger-attack.png
 share/wesnoth/images/elvish-ranger-attack1.png
 share/wesnoth/images/elvish-ranger-attack2.png
@@ -685,12 +952,23 @@ share/wesnoth/images/elvish-shaman-heal2.png
 share/wesnoth/images/elvish-shaman-heal3.png
 share/wesnoth/images/elvish-shaman-heal4.png
 share/wesnoth/images/elvish-shaman-heal5.png
-share/wesnoth/images/elvish-shaman-healing.png
+share/wesnoth/images/elvish-shaman-heal6.png
+share/wesnoth/images/elvish-shaman-heal7.png
+share/wesnoth/images/elvish-shaman-heal8.png
+share/wesnoth/images/elvish-shaman-heal9.png
 share/wesnoth/images/elvish-shaman.png
+share/wesnoth/images/elvish-sharpshooter+female-attack.png
+share/wesnoth/images/elvish-sharpshooter+female-attack1.png
+share/wesnoth/images/elvish-sharpshooter+female-attack2.png
+share/wesnoth/images/elvish-sharpshooter+female-attack3.png
+share/wesnoth/images/elvish-sharpshooter+female-bow-defend.png
+share/wesnoth/images/elvish-sharpshooter+female-defend.png
+share/wesnoth/images/elvish-sharpshooter+female.png
 share/wesnoth/images/elvish-sharpshooter-attack.png
 share/wesnoth/images/elvish-sharpshooter-attack1.png
 share/wesnoth/images/elvish-sharpshooter-attack2.png
 share/wesnoth/images/elvish-sharpshooter-attack3.png
+share/wesnoth/images/elvish-sharpshooter-bow-defend.png
 share/wesnoth/images/elvish-sharpshooter-defend.png
 share/wesnoth/images/elvish-sharpshooter.png
 share/wesnoth/images/elvish-shyde-defend.png
@@ -711,25 +989,85 @@ share/wesnoth/images/elvish-shyde-healing8.png
 share/wesnoth/images/elvish-shyde-healing9.png
 share/wesnoth/images/elvish-shyde-ranged.png
 share/wesnoth/images/elvish-shyde.png
-share/wesnoth/images/enemy-energy.png
-share/wesnoth/images/entangle.png
-share/wesnoth/images/fireball-halo.png
+share/wesnoth/images/elvish-sorceress-attack1.png
+share/wesnoth/images/elvish-sorceress-attack2.png
+share/wesnoth/images/elvish-sorceress-attack3.png
+share/wesnoth/images/elvish-sorceress-attack4.png
+share/wesnoth/images/elvish-sorceress-attack5.png
+share/wesnoth/images/elvish-sorceress-attack6.png
+share/wesnoth/images/elvish-sorceress-attack7.png
+share/wesnoth/images/elvish-sorceress-defend.png
+share/wesnoth/images/elvish-sorceress-entangle1.png
+share/wesnoth/images/elvish-sorceress-entangle2.png
+share/wesnoth/images/elvish-sorceress-entangle3.png
+share/wesnoth/images/elvish-sorceress-entangle4.png
+share/wesnoth/images/elvish-sorceress-entangle5.png
+share/wesnoth/images/elvish-sorceress-entangle6.png
+share/wesnoth/images/elvish-sorceress-entangle7.png
+share/wesnoth/images/elvish-sorceress-melee1.png
+share/wesnoth/images/elvish-sorceress-melee2.png
+share/wesnoth/images/elvish-sorceress-melee3.png
+share/wesnoth/images/elvish-sorceress-melee4.png
+share/wesnoth/images/elvish-sorceress-melee5.png
+share/wesnoth/images/elvish-sorceress-ranged-defend.png
+share/wesnoth/images/elvish-sorceress.png
+share/wesnoth/images/elvish-sylph-attack1.png
+share/wesnoth/images/elvish-sylph-attack2.png
+share/wesnoth/images/elvish-sylph-attack3.png
+share/wesnoth/images/elvish-sylph-attack4.png
+share/wesnoth/images/elvish-sylph-attack5.png
+share/wesnoth/images/elvish-sylph-defend.png
+share/wesnoth/images/elvish-sylph-ftouch-attack1.png
+share/wesnoth/images/elvish-sylph-ftouch-attack2.png
+share/wesnoth/images/elvish-sylph-ftouch-attack3.png
+share/wesnoth/images/elvish-sylph-gossamer-attack1.png
+share/wesnoth/images/elvish-sylph-gossamer-attack2.png
+share/wesnoth/images/elvish-sylph-gossamer-attack3.png
+share/wesnoth/images/elvish-sylph.png
+share/wesnoth/images/fire-dragon-attack-bite.png
+share/wesnoth/images/fire-dragon-attack-breath.png
+share/wesnoth/images/fire-dragon-attack-tail.png
+share/wesnoth/images/fire-dragon-defend.png
+share/wesnoth/images/fire-dragon.png
 share/wesnoth/images/galleon.png
+share/wesnoth/images/giant-mudcrawler-attack1.png
+share/wesnoth/images/giant-mudcrawler-attack2.png
+share/wesnoth/images/giant-mudcrawler-defend.png
+share/wesnoth/images/giant-mudcrawler.png
 share/wesnoth/images/goblin-direwolver-attack.png
 share/wesnoth/images/goblin-direwolver.png
+share/wesnoth/images/goblin-impaler-attack-ranged1.png
+share/wesnoth/images/goblin-impaler-attack-ranged2.png
+share/wesnoth/images/goblin-impaler-attack1.png
+share/wesnoth/images/goblin-impaler-attack2.png
+share/wesnoth/images/goblin-impaler-defend.png
+share/wesnoth/images/goblin-impaler.png
 share/wesnoth/images/goblin-knight-attack.png
 share/wesnoth/images/goblin-knight.png
 share/wesnoth/images/goblin-pillager-attack.png
 share/wesnoth/images/goblin-pillager-attack2.png
 share/wesnoth/images/goblin-pillager-defend.png
 share/wesnoth/images/goblin-pillager.png
+share/wesnoth/images/goblin-spearman-attack.png
+share/wesnoth/images/goblin-spearman-defend.png
+share/wesnoth/images/goblin-spearman-melee.png
+share/wesnoth/images/goblin-spearman-ranged.png
+share/wesnoth/images/goblin-spearman.png
 share/wesnoth/images/grand-knight-moving.png
 share/wesnoth/images/grand-knight.png
+share/wesnoth/images/great-mage+female-attack.png
+share/wesnoth/images/great-mage+female-attack1.png
+share/wesnoth/images/great-mage+female-attack2.png
+share/wesnoth/images/great-mage+female-defend.png
+share/wesnoth/images/great-mage+female.png
 share/wesnoth/images/great-mage-attack.png
 share/wesnoth/images/great-mage-attack1.png
 share/wesnoth/images/great-mage-attack2.png
 share/wesnoth/images/great-mage-defend.png
 share/wesnoth/images/great-mage.png
+share/wesnoth/images/great-troll-attack.png
+share/wesnoth/images/great-troll-defend.png
+share/wesnoth/images/great-troll.png
 share/wesnoth/images/gryphon-master-attack1.png
 share/wesnoth/images/gryphon-master-attack2.png
 share/wesnoth/images/gryphon-master-defend.png
@@ -768,6 +1106,12 @@ share/wesnoth/images/halo/fireball4.png
 share/wesnoth/images/halo/fireball5.png
 share/wesnoth/images/halo/fireball6.png
 share/wesnoth/images/halo/fireball7.png
+share/wesnoth/images/halo/ice-halo1.png
+share/wesnoth/images/halo/ice-halo2.png
+share/wesnoth/images/halo/ice-halo3.png
+share/wesnoth/images/halo/ice-halo4.png
+share/wesnoth/images/halo/ice-halo5.png
+share/wesnoth/images/halo/lighthouse-aura.png
 share/wesnoth/images/halo/mage-halo1.png
 share/wesnoth/images/halo/mage-halo10.png
 share/wesnoth/images/halo/mage-halo11.png
@@ -825,18 +1169,27 @@ share/wesnoth/images/human-dragoon-moving.png
 share/wesnoth/images/human-dragoon-range1.png
 share/wesnoth/images/human-dragoon-range2.png
 share/wesnoth/images/human-dragoon.png
+share/wesnoth/images/human-duelist-attack.png
 share/wesnoth/images/human-duelist-defend.png
+share/wesnoth/images/human-duelist-ranged.png
 share/wesnoth/images/human-duelist.png
 share/wesnoth/images/human-fencer-attack.png
 share/wesnoth/images/human-fencer-defend.png
 share/wesnoth/images/human-fencer.png
+share/wesnoth/images/human-general-attack-crossbow.png
+share/wesnoth/images/human-general-attack-sword1.png
+share/wesnoth/images/human-general-attack-sword2.png
 share/wesnoth/images/human-general-defend.png
 share/wesnoth/images/human-general-leading.png
 share/wesnoth/images/human-general.png
 share/wesnoth/images/human-halbardier.png
+share/wesnoth/images/human-halberdier-pierce-1.png
+share/wesnoth/images/human-halberdier-pierce-2.png
 share/wesnoth/images/human-heavyinfantry-attack.png
 share/wesnoth/images/human-heavyinfantry-defend.png
 share/wesnoth/images/human-heavyinfantry.png
+share/wesnoth/images/human-lieutenant-attack-crossbow.png
+share/wesnoth/images/human-lieutenant-attack-sword.png
 share/wesnoth/images/human-lieutenant-defend.png
 share/wesnoth/images/human-lieutenant-leading.png
 share/wesnoth/images/human-lieutenant.png
@@ -846,8 +1199,16 @@ share/wesnoth/images/human-longbowman-attack2.png
 share/wesnoth/images/human-longbowman-defend-close.png
 share/wesnoth/images/human-longbowman-defend.png
 share/wesnoth/images/human-longbowman.png
+share/wesnoth/images/human-marshal-attack-crossbow.png
+share/wesnoth/images/human-marshal-attack-sword1.png
+share/wesnoth/images/human-marshal-attack-sword2.png
+share/wesnoth/images/human-marshal-defense.png
+share/wesnoth/images/human-marshal-leading.png
+share/wesnoth/images/human-marshal.png
 share/wesnoth/images/human-masterbowman-defend.png
 share/wesnoth/images/human-masterbowman.png
+share/wesnoth/images/human-pikeman-attack-1.png
+share/wesnoth/images/human-pikeman-attack-2.png
 share/wesnoth/images/human-pikeman-defend.png
 share/wesnoth/images/human-pikeman.png
 share/wesnoth/images/human-princess-attack.png
@@ -855,14 +1216,17 @@ share/wesnoth/images/human-princess-defend.png
 share/wesnoth/images/human-princess-leading.png
 share/wesnoth/images/human-princess.png
 share/wesnoth/images/human-queen.png
+share/wesnoth/images/human-royalguard-attack.png
 share/wesnoth/images/human-royalguard-defend.png
 share/wesnoth/images/human-royalguard.png
 share/wesnoth/images/human-scout-attack.png
 share/wesnoth/images/human-scout-defend.png
 share/wesnoth/images/human-scout-moving.png
 share/wesnoth/images/human-scout.png
-share/wesnoth/images/human-sergeant-attack.png
+share/wesnoth/images/human-sergeant-attack-crossbow.png
+share/wesnoth/images/human-sergeant-attack-sword.png
 share/wesnoth/images/human-sergeant-defend.png
+share/wesnoth/images/human-sergeant-leading.png
 share/wesnoth/images/human-sergeant.png
 share/wesnoth/images/human-shocktrooper-attack.png
 share/wesnoth/images/human-shocktrooper-defend.png
@@ -877,47 +1241,57 @@ share/wesnoth/images/human-spearman.png
 share/wesnoth/images/human-swordman-attack.png
 share/wesnoth/images/human-swordman-defend.png
 share/wesnoth/images/human-swordman.png
+share/wesnoth/images/human-wallguard-attack.png
+share/wesnoth/images/human-wallguard-defense.png
+share/wesnoth/images/human-wallguard.png
 share/wesnoth/images/icons/icon-display.png
 share/wesnoth/images/icons/icon-general.png
 share/wesnoth/images/icons/icon-hostgame.png
 share/wesnoth/images/icons/icon-music.png
 share/wesnoth/images/icons/icon-server.png
 share/wesnoth/images/icons/icon-serverother.png
-share/wesnoth/images/item-ball1.png
-share/wesnoth/images/item-ball2.png
-share/wesnoth/images/item-barrel.png
-share/wesnoth/images/item-book1.png
-share/wesnoth/images/item-book2.png
-share/wesnoth/images/item-book3.png
-share/wesnoth/images/item-book4.png
-share/wesnoth/images/item-box.png
-share/wesnoth/images/item-dragonstatue.png
-share/wesnoth/images/item-flower1.png
-share/wesnoth/images/item-flower2.png
-share/wesnoth/images/item-flower3.png
-share/wesnoth/images/item-flower4.png
-share/wesnoth/images/item-leanto.png
-share/wesnoth/images/item-monolith.png
-share/wesnoth/images/item-monolith1.png
-share/wesnoth/images/item-monolith2.png
-share/wesnoth/images/item-monolith3.png
-share/wesnoth/images/item-monolith4.png
-share/wesnoth/images/item-ornate1.png
-share/wesnoth/images/item-ornate2.png
-share/wesnoth/images/item-pine1.png
-share/wesnoth/images/item-pine2.png
-share/wesnoth/images/item-potion1.png
-share/wesnoth/images/item-potion2.png
-share/wesnoth/images/item-potion3.png
-share/wesnoth/images/item-potion4.png
-share/wesnoth/images/item-ring1.png
-share/wesnoth/images/item-ring2.png
-share/wesnoth/images/item-rock1.png
-share/wesnoth/images/item-rock2.png
-share/wesnoth/images/item-rock3.png
-share/wesnoth/images/item-rock4.png
-share/wesnoth/images/item-slab.png
-share/wesnoth/images/item-well.png
+share/wesnoth/images/items/ball-blue.png
+share/wesnoth/images/items/ball-green.png
+share/wesnoth/images/items/barrel.png
+share/wesnoth/images/items/book1.png
+share/wesnoth/images/items/book2.png
+share/wesnoth/images/items/book3.png
+share/wesnoth/images/items/book4.png
+share/wesnoth/images/items/box.png
+share/wesnoth/images/items/castle-ruins.png
+share/wesnoth/images/items/chest-plain-closed.png
+share/wesnoth/images/items/chest-plain-open.png
+share/wesnoth/images/items/dragonstatue.png
+share/wesnoth/images/items/fire.png
+share/wesnoth/images/items/flower1.png
+share/wesnoth/images/items/flower2.png
+share/wesnoth/images/items/flower3.png
+share/wesnoth/images/items/flower4.png
+share/wesnoth/images/items/gohere.png
+share/wesnoth/images/items/leanto.png
+share/wesnoth/images/items/lighthouse.png
+share/wesnoth/images/items/monolith1.png
+share/wesnoth/images/items/monolith2.png
+share/wesnoth/images/items/monolith3.png
+share/wesnoth/images/items/monolith4.png
+share/wesnoth/images/items/orcish-flag.png
+share/wesnoth/images/items/ornate1.png
+share/wesnoth/images/items/ornate2.png
+share/wesnoth/images/items/pine1.png
+share/wesnoth/images/items/pine2.png
+share/wesnoth/images/items/potion-blue.png
+share/wesnoth/images/items/potion-grey.png
+share/wesnoth/images/items/potion-red.png
+share/wesnoth/images/items/potion-yellow.png
+share/wesnoth/images/items/ring1.png
+share/wesnoth/images/items/ring2.png
+share/wesnoth/images/items/rock1.png
+share/wesnoth/images/items/rock2.png
+share/wesnoth/images/items/rock3.png
+share/wesnoth/images/items/rock4.png
+share/wesnoth/images/items/signpost.png
+share/wesnoth/images/items/slab.png
+share/wesnoth/images/items/well.png
 share/wesnoth/images/knight-attack.png
 share/wesnoth/images/knight-defend.png
 share/wesnoth/images/knight-moving.png
@@ -941,22 +1315,57 @@ share/wesnoth/images/konrad-young.png
 share/wesnoth/images/lancer-attack.png
 share/wesnoth/images/lancer-defend.png
 share/wesnoth/images/lancer.png
-share/wesnoth/images/lightning-bolt.png
-share/wesnoth/images/lightning-n.png
-share/wesnoth/images/lightning-ne.png
+share/wesnoth/images/mage+female-attack.png
+share/wesnoth/images/mage+female-attack1.png
+share/wesnoth/images/mage+female-attack2.png
+share/wesnoth/images/mage+female-attack3.png
+share/wesnoth/images/mage+female-defend.png
+share/wesnoth/images/mage+female.png
 share/wesnoth/images/mage-attack.png
 share/wesnoth/images/mage-attack1.png
 share/wesnoth/images/mage-attack2.png
 share/wesnoth/images/mage-attack3.png
 share/wesnoth/images/mage-defend.png
 share/wesnoth/images/mage.png
+share/wesnoth/images/maps/eastern_invasion.png
+share/wesnoth/images/maps/the_great_continent.png
+share/wesnoth/images/maps/the_green_isle.png
+share/wesnoth/images/maps/wesnoth.png
+share/wesnoth/images/mermaid-diviner.png
+share/wesnoth/images/mermaid-enchantress.png
+share/wesnoth/images/mermaid-initiate.png
+share/wesnoth/images/mermaid-priestess.png
+share/wesnoth/images/mermaid-siren.png
 share/wesnoth/images/merman-attack.png
 share/wesnoth/images/merman-defend.png
+share/wesnoth/images/merman-entangler.png
+share/wesnoth/images/merman-fighter-attack.png
+share/wesnoth/images/merman-fighter-defend.png
+share/wesnoth/images/merman-fighter.png
+share/wesnoth/images/merman-hoplite-attack.png
+share/wesnoth/images/merman-hoplite-defend.png
+share/wesnoth/images/merman-hoplite.png
+share/wesnoth/images/merman-hunter.png
+share/wesnoth/images/merman-javelineer.png
 share/wesnoth/images/merman-king-attack.png
 share/wesnoth/images/merman-king-defend.png
 share/wesnoth/images/merman-king.png
+share/wesnoth/images/merman-netcaster.png
+share/wesnoth/images/merman-spearman.png
+share/wesnoth/images/merman-triton-attack-blade.png
+share/wesnoth/images/merman-triton-attack-pierce.png
+share/wesnoth/images/merman-triton-defend.png
+share/wesnoth/images/merman-triton.png
+share/wesnoth/images/merman-warrior-attack.png
+share/wesnoth/images/merman-warrior-defend.png
+share/wesnoth/images/merman-warrior.png
 share/wesnoth/images/merman.png
 share/wesnoth/images/misc/ball.png
+share/wesnoth/images/misc/bar-energy-ally.png
+share/wesnoth/images/misc/bar-energy-enemy.png
+share/wesnoth/images/misc/bar-energy-moved.png
+share/wesnoth/images/misc/bar-energy-partmoved.png
+share/wesnoth/images/misc/bar-energy-unmoved.png
 share/wesnoth/images/misc/blank.png
 share/wesnoth/images/misc/botleft-corner.png
 share/wesnoth/images/misc/botright-corner.png
@@ -966,7 +1375,6 @@ share/wesnoth/images/misc/chest.png
 share/wesnoth/images/misc/compass-north.png
 share/wesnoth/images/misc/compass-south.png
 share/wesnoth/images/misc/cross.png
-share/wesnoth/images/misc/delfador.png
 share/wesnoth/images/misc/disk.png
 share/wesnoth/images/misc/dot.png
 share/wesnoth/images/misc/ellipse-1-bottom.png
@@ -1016,10 +1424,7 @@ share/wesnoth/images/misc/item-holywater.png
 share/wesnoth/images/misc/item-sceptreoffire.png
 share/wesnoth/images/misc/item-staff.png
 share/wesnoth/images/misc/item-stormtrident.png
-share/wesnoth/images/misc/kalenz.png
-share/wesnoth/images/misc/konrad.png
-share/wesnoth/images/misc/lisar.png
-share/wesnoth/images/misc/lisar_b.png
+share/wesnoth/images/misc/leader-crown.png
 share/wesnoth/images/misc/lobby.png
 share/wesnoth/images/misc/logo.png
 share/wesnoth/images/misc/mainmenu-background.png
@@ -1031,7 +1436,6 @@ share/wesnoth/images/misc/mainmenu-border-right.png
 share/wesnoth/images/misc/mainmenu-border-top.png
 share/wesnoth/images/misc/mainmenu-border-topleft.png
 share/wesnoth/images/misc/mainmenu-border-topright.png
-share/wesnoth/images/misc/map.png
 share/wesnoth/images/misc/menu-background.png
 share/wesnoth/images/misc/menu-border-botleft.png
 share/wesnoth/images/misc/menu-border-botright.png
@@ -1055,19 +1459,38 @@ share/wesnoth/images/misc/rightside-bg.png
 share/wesnoth/images/misc/rightside-bottom.png
 share/wesnoth/images/misc/rightside-editor.png
 share/wesnoth/images/misc/rightside.png
+share/wesnoth/images/misc/schedule-afternoon.png
+share/wesnoth/images/misc/schedule-dawn.png
+share/wesnoth/images/misc/schedule-day.png
+share/wesnoth/images/misc/schedule-dusk.png
+share/wesnoth/images/misc/schedule-firstwatch.png
+share/wesnoth/images/misc/schedule-morning.png
+share/wesnoth/images/misc/schedule-night.png
+share/wesnoth/images/misc/schedule-secondwatch.png
+share/wesnoth/images/misc/schedule-underground-illum.png
+share/wesnoth/images/misc/schedule-underground.png
+share/wesnoth/images/misc/selected-ellipse-1-bottom.png
+share/wesnoth/images/misc/selected-ellipse-1-top.png
+share/wesnoth/images/misc/selected-ellipse-10-bottom.png
+share/wesnoth/images/misc/selected-ellipse-10-top.png
+share/wesnoth/images/misc/selected-ellipse-2-bottom.png
+share/wesnoth/images/misc/selected-ellipse-2-top.png
+share/wesnoth/images/misc/selected-ellipse-3-bottom.png
+share/wesnoth/images/misc/selected-ellipse-3-top.png
+share/wesnoth/images/misc/selected-ellipse-4-bottom.png
+share/wesnoth/images/misc/selected-ellipse-4-top.png
+share/wesnoth/images/misc/selected-ellipse-5-bottom.png
+share/wesnoth/images/misc/selected-ellipse-5-top.png
+share/wesnoth/images/misc/selected-ellipse-6-bottom.png
+share/wesnoth/images/misc/selected-ellipse-6-top.png
+share/wesnoth/images/misc/selected-ellipse-7-bottom.png
+share/wesnoth/images/misc/selected-ellipse-7-top.png
+share/wesnoth/images/misc/selected-ellipse-8-bottom.png
+share/wesnoth/images/misc/selected-ellipse-8-top.png
+share/wesnoth/images/misc/selected-ellipse-9-bottom.png
+share/wesnoth/images/misc/selected-ellipse-9-top.png
 share/wesnoth/images/misc/slowed.png
 share/wesnoth/images/misc/status-bg.png
-share/wesnoth/images/misc/story0a.png
-share/wesnoth/images/misc/story0b.png
-share/wesnoth/images/misc/story1.png
-share/wesnoth/images/misc/story2.png
-share/wesnoth/images/misc/story3.png
-share/wesnoth/images/misc/story4.png
-share/wesnoth/images/misc/story5.png
-share/wesnoth/images/misc/story6.png
-share/wesnoth/images/misc/story7.png
-share/wesnoth/images/misc/story8.png
-share/wesnoth/images/misc/story9.png
 share/wesnoth/images/misc/title.png
 share/wesnoth/images/misc/top-bg.png
 share/wesnoth/images/misc/topleft-corner.png
@@ -1084,7 +1507,9 @@ share/wesnoth/images/misc/tutorial7.png
 share/wesnoth/images/misc/units.png
 share/wesnoth/images/misc/upkeep.png
 share/wesnoth/images/misc/villages.png
-share/wesnoth/images/moved-energy.png
+share/wesnoth/images/mudcrawler-attack.png
+share/wesnoth/images/mudcrawler-defend.png
+share/wesnoth/images/mudcrawler.png
 share/wesnoth/images/naga-attack.png
 share/wesnoth/images/naga-defend.png
 share/wesnoth/images/naga.png
@@ -1096,11 +1521,30 @@ share/wesnoth/images/neutral-footpad-attack1.png
 share/wesnoth/images/neutral-footpad-attack2.png
 share/wesnoth/images/neutral-footpad-defend.png
 share/wesnoth/images/neutral-footpad.png
+share/wesnoth/images/neutral-outlaw+female-attack.png
+share/wesnoth/images/neutral-outlaw+female-attack1.png
+share/wesnoth/images/neutral-outlaw+female-attack2.png
+share/wesnoth/images/neutral-outlaw+female-defend.png
+share/wesnoth/images/neutral-outlaw+female.png
 share/wesnoth/images/neutral-outlaw-attack.png
 share/wesnoth/images/neutral-outlaw-attack1.png
 share/wesnoth/images/neutral-outlaw-attack2.png
 share/wesnoth/images/neutral-outlaw-defend.png
+share/wesnoth/images/neutral-outlaw-princess-attack-mace.png
+share/wesnoth/images/neutral-outlaw-princess-attack-sling1.png
+share/wesnoth/images/neutral-outlaw-princess-attack-sling2.png
+share/wesnoth/images/neutral-outlaw-princess-defend.png
+share/wesnoth/images/neutral-outlaw-princess.png
+share/wesnoth/images/neutral-outlaw-queen-attack-mace.png
+share/wesnoth/images/neutral-outlaw-queen-attack-sling1.png
+share/wesnoth/images/neutral-outlaw-queen-attack-sling2.png
+share/wesnoth/images/neutral-outlaw-queen-defend.png
+share/wesnoth/images/neutral-outlaw-queen-leading.png
+share/wesnoth/images/neutral-outlaw-queen.png
 share/wesnoth/images/neutral-outlaw.png
+share/wesnoth/images/neutral-peasant-attack.png
+share/wesnoth/images/neutral-peasant-defend.png
+share/wesnoth/images/neutral-peasant.png
 share/wesnoth/images/neutral-poacher-attack.png
 share/wesnoth/images/neutral-poacher-attack1.png
 share/wesnoth/images/neutral-poacher-attack2.png
@@ -1114,6 +1558,27 @@ share/wesnoth/images/neutral-trapper-attack1.png
 share/wesnoth/images/neutral-trapper-attack2.png
 share/wesnoth/images/neutral-trapper-defend.png
 share/wesnoth/images/neutral-trapper.png
+share/wesnoth/images/noble-commander-attack-ranged1.png
+share/wesnoth/images/noble-commander-attack-ranged2.png
+share/wesnoth/images/noble-commander-attack-sword.png
+share/wesnoth/images/noble-commander-defend.png
+share/wesnoth/images/noble-commander-leading.png
+share/wesnoth/images/noble-commander.png
+share/wesnoth/images/noble-fighter-attack.png
+share/wesnoth/images/noble-fighter-defend.png
+share/wesnoth/images/noble-fighter.png
+share/wesnoth/images/noble-lord-attack-ranged1.png
+share/wesnoth/images/noble-lord-attack-ranged2.png
+share/wesnoth/images/noble-lord-attack-sword.png
+share/wesnoth/images/noble-lord-defend.png
+share/wesnoth/images/noble-lord-leading.png
+share/wesnoth/images/noble-lord.png
+share/wesnoth/images/noble-youth-attack.png
+share/wesnoth/images/noble-youth-defend.png
+share/wesnoth/images/noble-youth.png
+share/wesnoth/images/ogre-attack1.png
+share/wesnoth/images/ogre-attack2.png
+share/wesnoth/images/ogre-defend.png
 share/wesnoth/images/ogre.png
 share/wesnoth/images/orc-archer-attack.png
 share/wesnoth/images/orc-archer-attack2.png
@@ -1135,19 +1600,53 @@ share/wesnoth/images/orc-xbowman.png
 share/wesnoth/images/orcish-grunt-attack.png
 share/wesnoth/images/orcish-grunt-defend.png
 share/wesnoth/images/orcish-grunt.png
+share/wesnoth/images/orcish-leader-attack.png
+share/wesnoth/images/orcish-leader-defend.png
+share/wesnoth/images/orcish-leader.png
+share/wesnoth/images/orcish-ruler-attack.png
+share/wesnoth/images/orcish-ruler-defend.png
 share/wesnoth/images/orcish-ruler.png
 share/wesnoth/images/orcish-shaman.png
 share/wesnoth/images/orcish-shaman1.png
 share/wesnoth/images/orcish-shaman2.png
+share/wesnoth/images/orcish-sovereign-attack1.png
+share/wesnoth/images/orcish-sovereign-attack2.png
+share/wesnoth/images/orcish-sovereign-defend.png
+share/wesnoth/images/orcish-sovereign.png
 share/wesnoth/images/orcish-warlord.png
 share/wesnoth/images/orcish-warrior-defend.png
 share/wesnoth/images/orcish-warrior-melee1.png
 share/wesnoth/images/orcish-warrior.png
+share/wesnoth/images/owaec-captain-attack-morningstar.png
+share/wesnoth/images/owaec-captain-attack-sword.png
+share/wesnoth/images/owaec-captain-defend.png
+share/wesnoth/images/owaec-captain-moving.png
+share/wesnoth/images/owaec-captain.png
+share/wesnoth/images/owaec-commander-attack-morningstar.png
+share/wesnoth/images/owaec-commander-attack-sword.png
+share/wesnoth/images/owaec-commander-defend.png
+share/wesnoth/images/owaec-commander-moving.png
+share/wesnoth/images/owaec-commander.png
+share/wesnoth/images/owaec-lord-attack-morningstar.png
+share/wesnoth/images/owaec-lord-attack-sword.png
+share/wesnoth/images/owaec-lord-defend.png
+share/wesnoth/images/owaec-lord-moving.png
+share/wesnoth/images/owaec-lord.png
+share/wesnoth/images/paladin-attack-sword.png
 share/wesnoth/images/paladin-healing.png
 share/wesnoth/images/paladin-moving.png
 share/wesnoth/images/paladin.png
-share/wesnoth/images/partmoved-energy.png
+share/wesnoth/images/parandra.png
 share/wesnoth/images/pirate-galleon.png
+share/wesnoth/images/portraits/Eastern_Invasion/dacyn.png
+share/wesnoth/images/portraits/Heir_To_The_Throne/delfador.png
+share/wesnoth/images/portraits/Heir_To_The_Throne/kalenz.png
+share/wesnoth/images/portraits/Heir_To_The_Throne/konrad.png
+share/wesnoth/images/portraits/Heir_To_The_Throne/lisar.png
+share/wesnoth/images/portraits/Heir_To_The_Throne/lisar_angry.png
+share/wesnoth/images/portraits/The_Rise_of_Wesnoth/burin.png
+share/wesnoth/images/portraits/The_Rise_of_Wesnoth/edmond.png
+share/wesnoth/images/portraits/The_Rise_of_Wesnoth/haldric.png
 share/wesnoth/images/projectiles/bone-n.png
 share/wesnoth/images/projectiles/bone-ne.png
 share/wesnoth/images/projectiles/bullet.png
@@ -1155,10 +1654,16 @@ share/wesnoth/images/projectiles/dagger-n.png
 share/wesnoth/images/projectiles/dagger-ne.png
 share/wesnoth/images/projectiles/darkmissile-n.png
 share/wesnoth/images/projectiles/darkmissile-ne.png
+share/wesnoth/images/projectiles/entangle.png
 share/wesnoth/images/projectiles/fireball.png
 share/wesnoth/images/projectiles/gaze.png
 share/wesnoth/images/projectiles/hatchet.png
+share/wesnoth/images/projectiles/icemissile-n.png
+share/wesnoth/images/projectiles/icemissile-ne.png
 share/wesnoth/images/projectiles/ink.png
+share/wesnoth/images/projectiles/lightning-bolt.png
+share/wesnoth/images/projectiles/lightning-n.png
+share/wesnoth/images/projectiles/lightning-ne.png
 share/wesnoth/images/projectiles/magicmissile-n.png
 share/wesnoth/images/projectiles/magicmissile-ne.png
 share/wesnoth/images/projectiles/missile-n.png
@@ -1168,17 +1673,24 @@ share/wesnoth/images/projectiles/missile-s.png
 share/wesnoth/images/projectiles/missile-se.png
 share/wesnoth/images/projectiles/missile-sw.png
 share/wesnoth/images/projectiles/missile.png
+share/wesnoth/images/projectiles/pitchfork-n.png
+share/wesnoth/images/projectiles/pitchfork-ne.png
 share/wesnoth/images/projectiles/spear-n.png
 share/wesnoth/images/projectiles/spear-ne.png
 share/wesnoth/images/projectiles/stone.png
 share/wesnoth/images/projectiles/thorns.png
+share/wesnoth/images/projectiles/water-spray.png
 share/wesnoth/images/projectiles/water_spay.png
 share/wesnoth/images/projectiles/web.png
 share/wesnoth/images/projectiles/whitemissile-n.png
 share/wesnoth/images/projectiles/whitemissile-ne.png
 share/wesnoth/images/random-enemy.png
-share/wesnoth/images/red-mage-attack.png
-share/wesnoth/images/red-mage-attack1.png
+share/wesnoth/images/red-mage+female-attack-melee.png
+share/wesnoth/images/red-mage+female-attack-ranged.png
+share/wesnoth/images/red-mage+female-defend.png
+share/wesnoth/images/red-mage+female.png
+share/wesnoth/images/red-mage-attack-melee.png
+share/wesnoth/images/red-mage-attack-ranged.png
 share/wesnoth/images/red-mage-defend.png
 share/wesnoth/images/red-mage.png
 share/wesnoth/images/rogue-attack.png
@@ -1189,63 +1701,164 @@ share/wesnoth/images/saurian-attack1.png
 share/wesnoth/images/saurian-attack2.png
 share/wesnoth/images/saurian-attack3.png
 share/wesnoth/images/saurian-defend.png
+share/wesnoth/images/saurian-icecaster-attack.png
+share/wesnoth/images/saurian-icecaster-defend.png
+share/wesnoth/images/saurian-icecaster-ranged1.png
+share/wesnoth/images/saurian-icecaster-ranged2.png
+share/wesnoth/images/saurian-icecaster-ranged3.png
+share/wesnoth/images/saurian-icecaster.png
+share/wesnoth/images/saurian-soothsayer-attack.png
+share/wesnoth/images/saurian-soothsayer-defend.png
+share/wesnoth/images/saurian-soothsayer-healing.png
+share/wesnoth/images/saurian-soothsayer-ranged.png
+share/wesnoth/images/saurian-soothsayer.png
+share/wesnoth/images/saurian-tribalist-attack.png
+share/wesnoth/images/saurian-tribalist-defend.png
+share/wesnoth/images/saurian-tribalist-heal.png
+share/wesnoth/images/saurian-tribalist-ranged1.png
+share/wesnoth/images/saurian-tribalist.png
 share/wesnoth/images/saurian-warrior-attack1.png
 share/wesnoth/images/saurian-warrior-attack2.png
 share/wesnoth/images/saurian-warrior-defend.png
 share/wesnoth/images/saurian-warrior-ranged.png
 share/wesnoth/images/saurian-warrior.png
 share/wesnoth/images/saurian.png
+share/wesnoth/images/scepter-princess-attack-scepter-1.png
+share/wesnoth/images/scepter-princess-attack-scepter-2.png
+share/wesnoth/images/scepter-princess-attack-scepter-3.png
+share/wesnoth/images/scepter-princess-attack-scepter.png
+share/wesnoth/images/scepter-princess-attack-sword.png
+share/wesnoth/images/scepter-princess-defend.png
+share/wesnoth/images/scepter-princess-leading.png
+share/wesnoth/images/scepter-princess.png
+share/wesnoth/images/scorpion-defend.png
 share/wesnoth/images/scorpion-pincers-attack.png
+share/wesnoth/images/scorpion-sting-attack.png
 share/wesnoth/images/scorpion.png
 share/wesnoth/images/sea-hag-defend.png
 share/wesnoth/images/sea-hag.png
 share/wesnoth/images/sea-orc-attack.png
 share/wesnoth/images/sea-orc-defend.png
 share/wesnoth/images/sea-orc.png
+share/wesnoth/images/seaserpent-attack.png
+share/wesnoth/images/seaserpent-defend.png
 share/wesnoth/images/seaserpent.png
+share/wesnoth/images/silver-mage+female-attack1.png
+share/wesnoth/images/silver-mage+female-attack2.png
+share/wesnoth/images/silver-mage+female-attack3.png
+share/wesnoth/images/silver-mage+female-defend.png
+share/wesnoth/images/silver-mage+female-melee.png
+share/wesnoth/images/silver-mage+female.png
 share/wesnoth/images/silver-mage-attack1.png
 share/wesnoth/images/silver-mage-attack2.png
 share/wesnoth/images/silver-mage-attack3.png
 share/wesnoth/images/silver-mage-defend.png
 share/wesnoth/images/silver-mage-melee.png
+share/wesnoth/images/silver-mage-teleport1.png
+share/wesnoth/images/silver-mage-teleport10.png
+share/wesnoth/images/silver-mage-teleport2.png
+share/wesnoth/images/silver-mage-teleport3.png
+share/wesnoth/images/silver-mage-teleport4.png
+share/wesnoth/images/silver-mage-teleport5.png
+share/wesnoth/images/silver-mage-teleport6.png
+share/wesnoth/images/silver-mage-teleport7.png
+share/wesnoth/images/silver-mage-teleport8.png
+share/wesnoth/images/silver-mage-teleport9.png
 share/wesnoth/images/silver-mage.png
-share/wesnoth/images/sotbe/bigmap.png
-share/wesnoth/images/sotbe/fire.png
-share/wesnoth/images/sotbe/flag.png
-share/wesnoth/images/sotbe/map1.png
-share/wesnoth/images/sotbe/map2.png
-share/wesnoth/images/sotbe/map3.png
+share/wesnoth/images/skeletal-dragon-attack-claws1.png
+share/wesnoth/images/skeletal-dragon-attack-claws2.png
+share/wesnoth/images/skeletal-dragon-attack-claws3.png
+share/wesnoth/images/skeletal-dragon-attack-jaw1.png
+share/wesnoth/images/skeletal-dragon-attack-jaw2.png
+share/wesnoth/images/skeletal-dragon-defend.png
+share/wesnoth/images/skeletal-dragon.png
 share/wesnoth/images/terrain/alpha.png
 share/wesnoth/images/terrain/alphamask.png
+share/wesnoth/images/terrain/bridge-n-end.png
 share/wesnoth/images/terrain/bridge-n-s.png
+share/wesnoth/images/terrain/bridge-n.png
+share/wesnoth/images/terrain/bridge-ne-end.png
 share/wesnoth/images/terrain/bridge-ne-sw.png
+share/wesnoth/images/terrain/bridge-ne.png
+share/wesnoth/images/terrain/bridge-nw-end.png
+share/wesnoth/images/terrain/bridge-nw.png
+share/wesnoth/images/terrain/bridge-s-end.png
+share/wesnoth/images/terrain/bridge-s.png
+share/wesnoth/images/terrain/bridge-se-end.png
 share/wesnoth/images/terrain/bridge-se-nw.png
+share/wesnoth/images/terrain/bridge-se.png
+share/wesnoth/images/terrain/bridge-sw-end.png
+share/wesnoth/images/terrain/bridge-sw.png
 share/wesnoth/images/terrain/bridge.png
-share/wesnoth/images/terrain/castle-bg-concave-e.png
-share/wesnoth/images/terrain/castle-bg-concave-ne.png
-share/wesnoth/images/terrain/castle-bg-concave-nw.png
-share/wesnoth/images/terrain/castle-bg-concave-se.png
-share/wesnoth/images/terrain/castle-bg-concave-sw.png
-share/wesnoth/images/terrain/castle-bg-concave-w.png
-share/wesnoth/images/terrain/castle-bg-convex-e.png
-share/wesnoth/images/terrain/castle-bg-convex-ne.png
-share/wesnoth/images/terrain/castle-bg-convex-nw.png
-share/wesnoth/images/terrain/castle-bg-convex-se.png
-share/wesnoth/images/terrain/castle-bg-convex-sw.png
-share/wesnoth/images/terrain/castle-bg-convex-w.png
-share/wesnoth/images/terrain/castle-fg-concave-e.png
-share/wesnoth/images/terrain/castle-fg-concave-ne.png
-share/wesnoth/images/terrain/castle-fg-concave-nw.png
-share/wesnoth/images/terrain/castle-fg-concave-se.png
-share/wesnoth/images/terrain/castle-fg-concave-sw.png
-share/wesnoth/images/terrain/castle-fg-concave-w.png
-share/wesnoth/images/terrain/castle-fg-convex-e.png
-share/wesnoth/images/terrain/castle-fg-convex-ne.png
-share/wesnoth/images/terrain/castle-fg-convex-nw.png
-share/wesnoth/images/terrain/castle-fg-convex-se.png
-share/wesnoth/images/terrain/castle-fg-convex-sw.png
-share/wesnoth/images/terrain/castle-fg-convex-w.png
+share/wesnoth/images/terrain/canyon-all.png
+share/wesnoth/images/terrain/canyon-n-ne-s.png
+share/wesnoth/images/terrain/canyon-n-ne.png
+share/wesnoth/images/terrain/canyon-n-s.png
+share/wesnoth/images/terrain/canyon-n-se.png
+share/wesnoth/images/terrain/canyon-n.png
+share/wesnoth/images/terrain/canyon-ne-s.png
+share/wesnoth/images/terrain/canyon-ne-se.png
+share/wesnoth/images/terrain/canyon-ne-sw.png
+share/wesnoth/images/terrain/canyon-ne.png
+share/wesnoth/images/terrain/canyon-nw-n-ne.png
+share/wesnoth/images/terrain/canyon-nw-n-s.png
+share/wesnoth/images/terrain/canyon-nw-n.png
+share/wesnoth/images/terrain/canyon-nw-ne.png
+share/wesnoth/images/terrain/canyon-nw.png
+share/wesnoth/images/terrain/canyon-s-nw.png
+share/wesnoth/images/terrain/canyon-s-sw-n.png
+share/wesnoth/images/terrain/canyon-s-sw.png
+share/wesnoth/images/terrain/canyon-s.png
+share/wesnoth/images/terrain/canyon-se-nw.png
+share/wesnoth/images/terrain/canyon-se-s-n.png
+share/wesnoth/images/terrain/canyon-se-s-sw-n.png
+share/wesnoth/images/terrain/canyon-se-s-sw.png
+share/wesnoth/images/terrain/canyon-se-s.png
+share/wesnoth/images/terrain/canyon-se-sw.png
+share/wesnoth/images/terrain/canyon-se.png
+share/wesnoth/images/terrain/canyon-sw-n.png
+share/wesnoth/images/terrain/canyon-sw-nw.png
+share/wesnoth/images/terrain/canyon-sw.png
+share/wesnoth/images/terrain/canyon.png
+share/wesnoth/images/terrain/castle-concave-e.png
+share/wesnoth/images/terrain/castle-concave-ne.png
+share/wesnoth/images/terrain/castle-concave-nw.png
+share/wesnoth/images/terrain/castle-concave-se.png
+share/wesnoth/images/terrain/castle-concave-sw.png
+share/wesnoth/images/terrain/castle-concave-w.png
+share/wesnoth/images/terrain/castle-convex-e.png
+share/wesnoth/images/terrain/castle-convex-ne.png
+share/wesnoth/images/terrain/castle-convex-nw.png
+share/wesnoth/images/terrain/castle-convex-se.png
+share/wesnoth/images/terrain/castle-convex-sw.png
+share/wesnoth/images/terrain/castle-convex-w.png
+share/wesnoth/images/terrain/castle-walls.tmpl
 share/wesnoth/images/terrain/castle.png
+share/wesnoth/images/terrain/cave-floor-n-ne-se-s.png
+share/wesnoth/images/terrain/cave-floor-n-ne-se.png
+share/wesnoth/images/terrain/cave-floor-n-ne.png
+share/wesnoth/images/terrain/cave-floor-n.png
+share/wesnoth/images/terrain/cave-floor-ne-se-s.png
+share/wesnoth/images/terrain/cave-floor-ne-se.png
+share/wesnoth/images/terrain/cave-floor-ne.png
+share/wesnoth/images/terrain/cave-floor-nw-n-ne.png
+share/wesnoth/images/terrain/cave-floor-nw-n.png
+share/wesnoth/images/terrain/cave-floor-nw.png
+share/wesnoth/images/terrain/cave-floor-s-sw-nw-n.png
+share/wesnoth/images/terrain/cave-floor-s-sw-nw.png
+share/wesnoth/images/terrain/cave-floor-s-sw.png
+share/wesnoth/images/terrain/cave-floor-s.png
+share/wesnoth/images/terrain/cave-floor-se-s-sw.png
+share/wesnoth/images/terrain/cave-floor-se-s.png
+share/wesnoth/images/terrain/cave-floor-se.png
+share/wesnoth/images/terrain/cave-floor-sw-nw-n.png
+share/wesnoth/images/terrain/cave-floor-sw-nw.png
+share/wesnoth/images/terrain/cave-floor-sw.png
+share/wesnoth/images/terrain/cave-floor.png
+share/wesnoth/images/terrain/cave-floor1.png
+share/wesnoth/images/terrain/cave-floor2.png
+share/wesnoth/images/terrain/cave-floor3.png
+share/wesnoth/images/terrain/cave-floor4.png
 share/wesnoth/images/terrain/cave-n-ne-se-s.png
 share/wesnoth/images/terrain/cave-n-ne-se.png
 share/wesnoth/images/terrain/cave-n-ne.png
@@ -1266,6 +1879,18 @@ share/wesnoth/images/terrain/cave-sw-nw-n.png
 share/wesnoth/images/terrain/cave-sw-nw.png
 share/wesnoth/images/terrain/cave-sw.png
 share/wesnoth/images/terrain/cave.png
+share/wesnoth/images/terrain/cavewall-concave-e.png
+share/wesnoth/images/terrain/cavewall-concave-ne.png
+share/wesnoth/images/terrain/cavewall-concave-nw.png
+share/wesnoth/images/terrain/cavewall-concave-se.png
+share/wesnoth/images/terrain/cavewall-concave-sw.png
+share/wesnoth/images/terrain/cavewall-concave-w.png
+share/wesnoth/images/terrain/cavewall-convex-e.png
+share/wesnoth/images/terrain/cavewall-convex-ne.png
+share/wesnoth/images/terrain/cavewall-convex-nw.png
+share/wesnoth/images/terrain/cavewall-convex-se.png
+share/wesnoth/images/terrain/cavewall-convex-sw.png
+share/wesnoth/images/terrain/cavewall-convex-w.png
 share/wesnoth/images/terrain/cavewall.png
 share/wesnoth/images/terrain/coast-n.png
 share/wesnoth/images/terrain/coast-ne.png
@@ -1274,6 +1899,8 @@ share/wesnoth/images/terrain/coast-s.png
 share/wesnoth/images/terrain/coast-se.png
 share/wesnoth/images/terrain/coast-sw.png
 share/wesnoth/images/terrain/coast.png
+share/wesnoth/images/terrain/coast2.png
+share/wesnoth/images/terrain/coast3.png
 share/wesnoth/images/terrain/dark_grass.png
 share/wesnoth/images/terrain/dawn.png
 share/wesnoth/images/terrain/desert-n.png
@@ -1291,41 +1918,82 @@ share/wesnoth/images/terrain/dirt-s.png
 share/wesnoth/images/terrain/dirt-se.png
 share/wesnoth/images/terrain/dirt-sw.png
 share/wesnoth/images/terrain/dirt.png
+share/wesnoth/images/terrain/dwarven-castle-concave-e.png
+share/wesnoth/images/terrain/dwarven-castle-concave-ne.png
+share/wesnoth/images/terrain/dwarven-castle-concave-nw.png
+share/wesnoth/images/terrain/dwarven-castle-concave-se.png
+share/wesnoth/images/terrain/dwarven-castle-concave-sw.png
+share/wesnoth/images/terrain/dwarven-castle-concave-w.png
+share/wesnoth/images/terrain/dwarven-castle-convex-e.png
+share/wesnoth/images/terrain/dwarven-castle-convex-ne.png
+share/wesnoth/images/terrain/dwarven-castle-convex-nw.png
+share/wesnoth/images/terrain/dwarven-castle-convex-se.png
+share/wesnoth/images/terrain/dwarven-castle-convex-sw.png
+share/wesnoth/images/terrain/dwarven-castle-convex-w.png
+share/wesnoth/images/terrain/dwarven-castle-floor.png
+share/wesnoth/images/terrain/dwarven-castle-wall-ccw-e.png
+share/wesnoth/images/terrain/dwarven-castle-wall-ccw-ne.png
+share/wesnoth/images/terrain/dwarven-castle-wall-ccw-nw.png
+share/wesnoth/images/terrain/dwarven-castle-wall-ccw-se.png
+share/wesnoth/images/terrain/dwarven-castle-wall-ccw-sw.png
+share/wesnoth/images/terrain/dwarven-castle-wall-ccw-w.png
+share/wesnoth/images/terrain/dwarven-castle-wall-concave-e.png
+share/wesnoth/images/terrain/dwarven-castle-wall-concave-ne.png
+share/wesnoth/images/terrain/dwarven-castle-wall-concave-nw.png
+share/wesnoth/images/terrain/dwarven-castle-wall-concave-se.png
+share/wesnoth/images/terrain/dwarven-castle-wall-concave-sw.png
+share/wesnoth/images/terrain/dwarven-castle-wall-concave-w.png
+share/wesnoth/images/terrain/dwarven-castle-wall-convex-e.png
+share/wesnoth/images/terrain/dwarven-castle-wall-convex-ne.png
+share/wesnoth/images/terrain/dwarven-castle-wall-convex-nw.png
+share/wesnoth/images/terrain/dwarven-castle-wall-convex-se.png
+share/wesnoth/images/terrain/dwarven-castle-wall-convex-sw.png
+share/wesnoth/images/terrain/dwarven-castle-wall-convex-w.png
+share/wesnoth/images/terrain/dwarven-castle-wall-cw-e.png
+share/wesnoth/images/terrain/dwarven-castle-wall-cw-ne.png
+share/wesnoth/images/terrain/dwarven-castle-wall-cw-nw.png
+share/wesnoth/images/terrain/dwarven-castle-wall-cw-se.png
+share/wesnoth/images/terrain/dwarven-castle-wall-cw-sw.png
+share/wesnoth/images/terrain/dwarven-castle-wall-cw-w.png
 share/wesnoth/images/terrain/dwarven-doors.png
-share/wesnoth/images/terrain/encampment-bg-concave-e.png
-share/wesnoth/images/terrain/encampment-bg-concave-ne.png
-share/wesnoth/images/terrain/encampment-bg-concave-nw.png
-share/wesnoth/images/terrain/encampment-bg-concave-se.png
-share/wesnoth/images/terrain/encampment-bg-concave-sw.png
-share/wesnoth/images/terrain/encampment-bg-concave-w.png
-share/wesnoth/images/terrain/encampment-bg-convex-e.png
-share/wesnoth/images/terrain/encampment-bg-convex-ne.png
-share/wesnoth/images/terrain/encampment-bg-convex-nw.png
-share/wesnoth/images/terrain/encampment-bg-convex-se.png
-share/wesnoth/images/terrain/encampment-bg-convex-sw.png
-share/wesnoth/images/terrain/encampment-bg-convex-w.png
-share/wesnoth/images/terrain/encampment-fg-concave-e.png
-share/wesnoth/images/terrain/encampment-fg-concave-ne.png
-share/wesnoth/images/terrain/encampment-fg-concave-nw.png
-share/wesnoth/images/terrain/encampment-fg-concave-se.png
-share/wesnoth/images/terrain/encampment-fg-concave-sw.png
-share/wesnoth/images/terrain/encampment-fg-concave-w.png
-share/wesnoth/images/terrain/encampment-fg-convex-e.png
-share/wesnoth/images/terrain/encampment-fg-convex-ne.png
-share/wesnoth/images/terrain/encampment-fg-convex-nw.png
-share/wesnoth/images/terrain/encampment-fg-convex-se.png
-share/wesnoth/images/terrain/encampment-fg-convex-sw.png
-share/wesnoth/images/terrain/encampment-fg-convex-w.png
-share/wesnoth/images/terrain/flag-team1.png
-share/wesnoth/images/terrain/flag-team10.png
-share/wesnoth/images/terrain/flag-team2.png
-share/wesnoth/images/terrain/flag-team3.png
-share/wesnoth/images/terrain/flag-team4.png
-share/wesnoth/images/terrain/flag-team5.png
-share/wesnoth/images/terrain/flag-team6.png
-share/wesnoth/images/terrain/flag-team7.png
-share/wesnoth/images/terrain/flag-team8.png
-share/wesnoth/images/terrain/flag-team9.png
+share/wesnoth/images/terrain/dwarven-keep-floor.png
+share/wesnoth/images/terrain/dwarven-keep.png
+share/wesnoth/images/terrain/dwarven-village.png
+share/wesnoth/images/terrain/encampment-concave-e.png
+share/wesnoth/images/terrain/encampment-concave-ne.png
+share/wesnoth/images/terrain/encampment-concave-nw.png
+share/wesnoth/images/terrain/encampment-concave-se.png
+share/wesnoth/images/terrain/encampment-concave-sw.png
+share/wesnoth/images/terrain/encampment-concave-w.png
+share/wesnoth/images/terrain/encampment-convex-e.png
+share/wesnoth/images/terrain/encampment-convex-ne.png
+share/wesnoth/images/terrain/encampment-convex-nw.png
+share/wesnoth/images/terrain/encampment-convex-se.png
+share/wesnoth/images/terrain/encampment-convex-sw.png
+share/wesnoth/images/terrain/encampment-convex-w.png
+share/wesnoth/images/terrain/flag-sotbe-1.png
+share/wesnoth/images/terrain/flag-sotbe-2.png
+share/wesnoth/images/terrain/flag-sotbe-3.png
+share/wesnoth/images/terrain/flag-team1-1.png
+share/wesnoth/images/terrain/flag-team1-2.png
+share/wesnoth/images/terrain/flag-team10-1.png
+share/wesnoth/images/terrain/flag-team10-2.png
+share/wesnoth/images/terrain/flag-team2-1.png
+share/wesnoth/images/terrain/flag-team2-2.png
+share/wesnoth/images/terrain/flag-team3-1.png
+share/wesnoth/images/terrain/flag-team3-2.png
+share/wesnoth/images/terrain/flag-team4-1.png
+share/wesnoth/images/terrain/flag-team4-2.png
+share/wesnoth/images/terrain/flag-team5-1.png
+share/wesnoth/images/terrain/flag-team5-2.png
+share/wesnoth/images/terrain/flag-team6-1.png
+share/wesnoth/images/terrain/flag-team6-2.png
+share/wesnoth/images/terrain/flag-team7-1.png
+share/wesnoth/images/terrain/flag-team7-2.png
+share/wesnoth/images/terrain/flag-team8-1.png
+share/wesnoth/images/terrain/flag-team8-2.png
+share/wesnoth/images/terrain/flag-team9-1.png
+share/wesnoth/images/terrain/flag-team9-2.png
 share/wesnoth/images/terrain/fog-n-ne-se-s.png
 share/wesnoth/images/terrain/fog-n-ne-se.png
 share/wesnoth/images/terrain/fog-n-ne.png
@@ -1352,9 +2020,14 @@ share/wesnoth/images/terrain/forest-ctrans-n.png
 share/wesnoth/images/terrain/forest-ctrans-ne.png
 share/wesnoth/images/terrain/forest-ctrans-nw-n-ne.png
 share/wesnoth/images/terrain/forest-ctrans-nw-n.png
+share/wesnoth/images/terrain/forest-ctrans-nw-ne.png
 share/wesnoth/images/terrain/forest-ctrans-nw.png
+share/wesnoth/images/terrain/forest-etrans-n-ne.png
+share/wesnoth/images/terrain/forest-etrans-n.png
 share/wesnoth/images/terrain/forest-etrans-ne.png
 share/wesnoth/images/terrain/forest-etrans-nw-n-ne.png
+share/wesnoth/images/terrain/forest-etrans-nw-n.png
+share/wesnoth/images/terrain/forest-etrans-nw-ne.png
 share/wesnoth/images/terrain/forest-etrans-nw.png
 share/wesnoth/images/terrain/forest-n-ne-se.png
 share/wesnoth/images/terrain/forest-n-ne.png
@@ -1400,27 +2073,56 @@ share/wesnoth/images/terrain/forest5.png
 share/wesnoth/images/terrain/forest6.png
 share/wesnoth/images/terrain/forest7.png
 share/wesnoth/images/terrain/forest8.png
+share/wesnoth/images/terrain/grassland-a.png
 share/wesnoth/images/terrain/grassland-flowers.png
-share/wesnoth/images/terrain/grassland-n-ne-se-s.png
+share/wesnoth/images/terrain/grassland-flowers1.png
+share/wesnoth/images/terrain/grassland-flowers2.png
 share/wesnoth/images/terrain/grassland-n-ne-se.png
 share/wesnoth/images/terrain/grassland-n-ne.png
 share/wesnoth/images/terrain/grassland-n.png
 share/wesnoth/images/terrain/grassland-ne-se-s.png
 share/wesnoth/images/terrain/grassland-ne-se.png
 share/wesnoth/images/terrain/grassland-ne.png
+share/wesnoth/images/terrain/grassland-nw-n-ne.png
 share/wesnoth/images/terrain/grassland-nw-n.png
 share/wesnoth/images/terrain/grassland-nw.png
+share/wesnoth/images/terrain/grassland-r.png
+share/wesnoth/images/terrain/grassland-r1.png
+share/wesnoth/images/terrain/grassland-r2.png
+share/wesnoth/images/terrain/grassland-r3.png
+share/wesnoth/images/terrain/grassland-r4.png
 share/wesnoth/images/terrain/grassland-rocks.png
-share/wesnoth/images/terrain/grassland-s-sw-nw-n.png
+share/wesnoth/images/terrain/grassland-rocks1.png
+share/wesnoth/images/terrain/grassland-rocks2.png
 share/wesnoth/images/terrain/grassland-s-sw-nw.png
 share/wesnoth/images/terrain/grassland-s-sw.png
 share/wesnoth/images/terrain/grassland-s.png
+share/wesnoth/images/terrain/grassland-se-s-sw.png
 share/wesnoth/images/terrain/grassland-se-s.png
 share/wesnoth/images/terrain/grassland-se-sw-nw.png
 share/wesnoth/images/terrain/grassland-se.png
 share/wesnoth/images/terrain/grassland-sw-nw-n.png
 share/wesnoth/images/terrain/grassland-sw-nw.png
 share/wesnoth/images/terrain/grassland-sw.png
+share/wesnoth/images/terrain/grassland-test.png
+share/wesnoth/images/terrain/grassland-to-water-n-ne-se.png
+share/wesnoth/images/terrain/grassland-to-water-n-ne.png
+share/wesnoth/images/terrain/grassland-to-water-n.png
+share/wesnoth/images/terrain/grassland-to-water-ne-se-s.png
+share/wesnoth/images/terrain/grassland-to-water-ne-se.png
+share/wesnoth/images/terrain/grassland-to-water-ne.png
+share/wesnoth/images/terrain/grassland-to-water-nw-n-ne.png
+share/wesnoth/images/terrain/grassland-to-water-nw-n.png
+share/wesnoth/images/terrain/grassland-to-water-nw.png
+share/wesnoth/images/terrain/grassland-to-water-s-sw-nw.png
+share/wesnoth/images/terrain/grassland-to-water-s-sw.png
+share/wesnoth/images/terrain/grassland-to-water-s.png
+share/wesnoth/images/terrain/grassland-to-water-se-s-sw.png
+share/wesnoth/images/terrain/grassland-to-water-se-s.png
+share/wesnoth/images/terrain/grassland-to-water-se.png
+share/wesnoth/images/terrain/grassland-to-water-sw-nw-n.png
+share/wesnoth/images/terrain/grassland-to-water-sw-nw.png
+share/wesnoth/images/terrain/grassland-to-water-sw.png
 share/wesnoth/images/terrain/grassland.png
 share/wesnoth/images/terrain/grid.png
 share/wesnoth/images/terrain/hills-n-ne.png
@@ -1436,70 +2138,64 @@ share/wesnoth/images/terrain/hills-variation2.png
 share/wesnoth/images/terrain/hills-variation3.png
 share/wesnoth/images/terrain/hills.png
 share/wesnoth/images/terrain/ice-bridge-ne-sw.png
+share/wesnoth/images/terrain/ice-n-ne-se-s.png
+share/wesnoth/images/terrain/ice-n-ne.png
 share/wesnoth/images/terrain/ice-n.png
+share/wesnoth/images/terrain/ice-ne-se.png
 share/wesnoth/images/terrain/ice-ne.png
+share/wesnoth/images/terrain/ice-nw-n-ne.png
+share/wesnoth/images/terrain/ice-nw-n.png
 share/wesnoth/images/terrain/ice-nw.png
 share/wesnoth/images/terrain/ice-pier.png
+share/wesnoth/images/terrain/ice-s-sw-nw-n.png
+share/wesnoth/images/terrain/ice-s-sw.png
 share/wesnoth/images/terrain/ice-s.png
+share/wesnoth/images/terrain/ice-se-s-sw.png
+share/wesnoth/images/terrain/ice-se-s.png
 share/wesnoth/images/terrain/ice-se.png
+share/wesnoth/images/terrain/ice-sw-nw.png
 share/wesnoth/images/terrain/ice-sw.png
 share/wesnoth/images/terrain/ice.png
 share/wesnoth/images/terrain/icebridge-se-nw.png
-share/wesnoth/images/terrain/keep-bg-inside-e.png
-share/wesnoth/images/terrain/keep-bg-inside-ne.png
-share/wesnoth/images/terrain/keep-bg-inside-nw.png
-share/wesnoth/images/terrain/keep-bg-inside-se.png
-share/wesnoth/images/terrain/keep-bg-inside-sw.png
-share/wesnoth/images/terrain/keep-bg-inside-w.png
-share/wesnoth/images/terrain/keep-bg-wall-0-e.png
-share/wesnoth/images/terrain/keep-bg-wall-0-ne.png
-share/wesnoth/images/terrain/keep-bg-wall-0-nw.png
-share/wesnoth/images/terrain/keep-bg-wall-0-se.png
-share/wesnoth/images/terrain/keep-bg-wall-0-sw.png
-share/wesnoth/images/terrain/keep-bg-wall-0-w.png
-share/wesnoth/images/terrain/keep-bg-wall-1-e.png
-share/wesnoth/images/terrain/keep-bg-wall-1-ne.png
-share/wesnoth/images/terrain/keep-bg-wall-1-nw.png
-share/wesnoth/images/terrain/keep-bg-wall-1-se.png
-share/wesnoth/images/terrain/keep-bg-wall-1-sw.png
-share/wesnoth/images/terrain/keep-bg-wall-1-w.png
-share/wesnoth/images/terrain/keep-bg-wall-e.png
-share/wesnoth/images/terrain/keep-bg-wall-ne.png
-share/wesnoth/images/terrain/keep-bg-wall-nw.png
-share/wesnoth/images/terrain/keep-bg-wall-se.png
-share/wesnoth/images/terrain/keep-bg-wall-sw.png
-share/wesnoth/images/terrain/keep-bg-wall-w.png
-share/wesnoth/images/terrain/keep-fg-inside-e.png
-share/wesnoth/images/terrain/keep-fg-inside-ne.png
-share/wesnoth/images/terrain/keep-fg-inside-nw.png
-share/wesnoth/images/terrain/keep-fg-inside-se.png
-share/wesnoth/images/terrain/keep-fg-inside-sw.png
-share/wesnoth/images/terrain/keep-fg-inside-w.png
-share/wesnoth/images/terrain/keep-fg-wall-0-e.png
-share/wesnoth/images/terrain/keep-fg-wall-0-ne.png
-share/wesnoth/images/terrain/keep-fg-wall-0-nw.png
-share/wesnoth/images/terrain/keep-fg-wall-0-se.png
-share/wesnoth/images/terrain/keep-fg-wall-0-sw.png
-share/wesnoth/images/terrain/keep-fg-wall-0-w.png
-share/wesnoth/images/terrain/keep-fg-wall-1-e.png
-share/wesnoth/images/terrain/keep-fg-wall-1-ne.png
-share/wesnoth/images/terrain/keep-fg-wall-1-nw.png
-share/wesnoth/images/terrain/keep-fg-wall-1-se.png
-share/wesnoth/images/terrain/keep-fg-wall-1-sw.png
-share/wesnoth/images/terrain/keep-fg-wall-1-w.png
-share/wesnoth/images/terrain/keep-fg-wall-e.png
-share/wesnoth/images/terrain/keep-fg-wall-ne.png
-share/wesnoth/images/terrain/keep-fg-wall-nw.png
-share/wesnoth/images/terrain/keep-fg-wall-se.png
-share/wesnoth/images/terrain/keep-fg-wall-sw.png
-share/wesnoth/images/terrain/keep-fg-wall-w.png
+share/wesnoth/images/terrain/keep-inside-e.png
+share/wesnoth/images/terrain/keep-inside-ne.png
+share/wesnoth/images/terrain/keep-inside-nw.png
+share/wesnoth/images/terrain/keep-inside-se.png
+share/wesnoth/images/terrain/keep-inside-sw.png
+share/wesnoth/images/terrain/keep-inside-w.png
+share/wesnoth/images/terrain/keep-wall-0-e.png
+share/wesnoth/images/terrain/keep-wall-0-ne.png
+share/wesnoth/images/terrain/keep-wall-0-nw.png
+share/wesnoth/images/terrain/keep-wall-0-se.png
+share/wesnoth/images/terrain/keep-wall-0-sw.png
+share/wesnoth/images/terrain/keep-wall-0-w.png
+share/wesnoth/images/terrain/keep-wall-1-e.png
+share/wesnoth/images/terrain/keep-wall-1-ne.png
+share/wesnoth/images/terrain/keep-wall-1-nw.png
+share/wesnoth/images/terrain/keep-wall-1-se.png
+share/wesnoth/images/terrain/keep-wall-1-sw.png
+share/wesnoth/images/terrain/keep-wall-1-w.png
+share/wesnoth/images/terrain/keep-wall-e.png
+share/wesnoth/images/terrain/keep-wall-ne.png
+share/wesnoth/images/terrain/keep-wall-nw.png
+share/wesnoth/images/terrain/keep-wall-se.png
+share/wesnoth/images/terrain/keep-wall-sw.png
+share/wesnoth/images/terrain/keep-wall-w.png
 share/wesnoth/images/terrain/keep.png
+share/wesnoth/images/terrain/lava-n.png
+share/wesnoth/images/terrain/lava-ne.png
+share/wesnoth/images/terrain/lava-nw.png
+share/wesnoth/images/terrain/lava-s.png
+share/wesnoth/images/terrain/lava-se.png
+share/wesnoth/images/terrain/lava-sw.png
 share/wesnoth/images/terrain/lava.png
 share/wesnoth/images/terrain/mask.png
 share/wesnoth/images/terrain/mine.png
 share/wesnoth/images/terrain/mountains-n.png
 share/wesnoth/images/terrain/mountains-ne.png
 share/wesnoth/images/terrain/mountains-nw.png
+share/wesnoth/images/terrain/mountains-peak1.png
+share/wesnoth/images/terrain/mountains-peak2.png
 share/wesnoth/images/terrain/mountains-s.png
 share/wesnoth/images/terrain/mountains-se.png
 share/wesnoth/images/terrain/mountains-sw.png
@@ -1513,18 +2209,31 @@ share/wesnoth/images/terrain/ocean-s.png
 share/wesnoth/images/terrain/ocean-se.png
 share/wesnoth/images/terrain/ocean-sw.png
 share/wesnoth/images/terrain/ocean.png
+share/wesnoth/images/terrain/ocean2.png
+share/wesnoth/images/terrain/ocean3.png
 share/wesnoth/images/terrain/out.png
-share/wesnoth/images/terrain/pier.png
+share/wesnoth/images/terrain/road-n.png
+share/wesnoth/images/terrain/road-ne.png
+share/wesnoth/images/terrain/road-nw.png
+share/wesnoth/images/terrain/road-s.png
+share/wesnoth/images/terrain/road-se.png
+share/wesnoth/images/terrain/road-sw.png
 share/wesnoth/images/terrain/road.png
 share/wesnoth/images/terrain/rocks.png
-share/wesnoth/images/terrain/signpost.png
+share/wesnoth/images/terrain/snow-forest-n-ne.png
 share/wesnoth/images/terrain/snow-forest-n.png
 share/wesnoth/images/terrain/snow-forest-ne.png
+share/wesnoth/images/terrain/snow-forest-nw-n-ne.png
 share/wesnoth/images/terrain/snow-forest-nw.png
+share/wesnoth/images/terrain/snow-forest-s-sw.png
 share/wesnoth/images/terrain/snow-forest-s.png
+share/wesnoth/images/terrain/snow-forest-se-s-sw.png
+share/wesnoth/images/terrain/snow-forest-se-s.png
 share/wesnoth/images/terrain/snow-forest-se.png
 share/wesnoth/images/terrain/snow-forest-sw.png
 share/wesnoth/images/terrain/snow-forest.png
+share/wesnoth/images/terrain/snow-forest2.png
+share/wesnoth/images/terrain/snow-forest3.png
 share/wesnoth/images/terrain/snow-hills-n-ne.png
 share/wesnoth/images/terrain/snow-hills-n.png
 share/wesnoth/images/terrain/snow-hills-ne.png
@@ -1534,22 +2243,30 @@ share/wesnoth/images/terrain/snow-hills-s.png
 share/wesnoth/images/terrain/snow-hills-se.png
 share/wesnoth/images/terrain/snow-hills-sw.png
 share/wesnoth/images/terrain/snow-hills.png
+share/wesnoth/images/terrain/snow-hills2.png
+share/wesnoth/images/terrain/snow-hills3.png
 share/wesnoth/images/terrain/snow-n-ne-se-s.png
 share/wesnoth/images/terrain/snow-n-ne-se.png
 share/wesnoth/images/terrain/snow-n-ne.png
 share/wesnoth/images/terrain/snow-n.png
+share/wesnoth/images/terrain/snow-ne-se-s-sw.png
 share/wesnoth/images/terrain/snow-ne-se-s.png
 share/wesnoth/images/terrain/snow-ne-se.png
 share/wesnoth/images/terrain/snow-ne.png
+share/wesnoth/images/terrain/snow-nw-n-ne-se.png
+share/wesnoth/images/terrain/snow-nw-n-ne.png
 share/wesnoth/images/terrain/snow-nw-n.png
 share/wesnoth/images/terrain/snow-nw.png
 share/wesnoth/images/terrain/snow-s-sw-nw-n.png
 share/wesnoth/images/terrain/snow-s-sw-nw.png
 share/wesnoth/images/terrain/snow-s-sw.png
 share/wesnoth/images/terrain/snow-s.png
+share/wesnoth/images/terrain/snow-se-s-sw-nw.png
+share/wesnoth/images/terrain/snow-se-s-sw.png
 share/wesnoth/images/terrain/snow-se-s.png
 share/wesnoth/images/terrain/snow-se-sw-nw.png
 share/wesnoth/images/terrain/snow-se.png
+share/wesnoth/images/terrain/snow-sw-nw-n-ne.png
 share/wesnoth/images/terrain/snow-sw-nw-n.png
 share/wesnoth/images/terrain/snow-sw-nw.png
 share/wesnoth/images/terrain/snow-sw.png
@@ -1572,6 +2289,9 @@ share/wesnoth/images/terrain/trash.png
 share/wesnoth/images/terrain/village-cave.png
 share/wesnoth/images/terrain/village-coast.png
 share/wesnoth/images/terrain/village-dusk.png
+share/wesnoth/images/terrain/village-dusk2.png
+share/wesnoth/images/terrain/village-dusk3.png
+share/wesnoth/images/terrain/village-dusk4.png
 share/wesnoth/images/terrain/village-first_watch.png
 share/wesnoth/images/terrain/village-human.png
 share/wesnoth/images/terrain/village-n.png
@@ -1618,6 +2338,14 @@ share/wesnoth/images/tower.png
 share/wesnoth/images/troll-grunt-attack.png
 share/wesnoth/images/troll-grunt-defend.png
 share/wesnoth/images/troll-grunt.png
+share/wesnoth/images/troll-hero-attack.png
+share/wesnoth/images/troll-hero-defend.png
+share/wesnoth/images/troll-hero.png
+share/wesnoth/images/troll-lobber-attack-melee.png
+share/wesnoth/images/troll-lobber-attack-ranged1.png
+share/wesnoth/images/troll-lobber-attack-ranged2.png
+share/wesnoth/images/troll-lobber-defend.png
+share/wesnoth/images/troll-lobber.png
 share/wesnoth/images/troll-warrior-attack.png
 share/wesnoth/images/troll-warrior.png
 share/wesnoth/images/troll-whelp-attack.png
@@ -1653,6 +2381,7 @@ share/wesnoth/images/undead-darkspirit-attack.png
 share/wesnoth/images/undead-darkspirit-attack1.png
 share/wesnoth/images/undead-darkspirit-defend.png
 share/wesnoth/images/undead-darkspirit.png
+share/wesnoth/images/undead-deathknight-attack.png
 share/wesnoth/images/undead-deathknight.png
 share/wesnoth/images/undead-deathmaster-attack1.png
 share/wesnoth/images/undead-deathmaster-attack2.png
@@ -1705,6 +2434,11 @@ share/wesnoth/images/undead-skeleton.png
 share/wesnoth/images/undead-soulless-defend.png
 share/wesnoth/images/undead-soulless-melee.png
 share/wesnoth/images/undead-soulless.png
+share/wesnoth/images/undead-soulshooter-attack.png
+share/wesnoth/images/undead-soulshooter-defend.png
+share/wesnoth/images/undead-soulshooter-ranged.png
+share/wesnoth/images/undead-soulshooter-ranged2.png
+share/wesnoth/images/undead-soulshooter.png
 share/wesnoth/images/undead-spectre-attack.png
 share/wesnoth/images/undead-spectre-attack1.png
 share/wesnoth/images/undead-spectre-defend.png
@@ -1719,12 +2453,24 @@ share/wesnoth/images/undead-wraith-defend.png
 share/wesnoth/images/undead-wraith.png
 share/wesnoth/images/undead-zombie-attack.png
 share/wesnoth/images/undead-zombie.png
-share/wesnoth/images/unmoved-energy.png
+share/wesnoth/images/warrior-king-attack1.png
+share/wesnoth/images/warrior-king-attack2.png
+share/wesnoth/images/warrior-king-defend.png
+share/wesnoth/images/warrior-king-leading.png
+share/wesnoth/images/warrior-king.png
 share/wesnoth/images/wesnoth-icon.png
+share/wesnoth/images/white-cleric+female-attack.png
+share/wesnoth/images/white-cleric+female-attack1.png
+share/wesnoth/images/white-cleric+female-defend.png
+share/wesnoth/images/white-cleric+female.png
 share/wesnoth/images/white-cleric-attack.png
 share/wesnoth/images/white-cleric-attack1.png
 share/wesnoth/images/white-cleric-defend.png
 share/wesnoth/images/white-cleric.png
+share/wesnoth/images/white-mage+female-attack.png
+share/wesnoth/images/white-mage+female-attack1.png
+share/wesnoth/images/white-mage+female-defend.png
+share/wesnoth/images/white-mage+female.png
 share/wesnoth/images/white-mage-attack.png
 share/wesnoth/images/white-mage-attack1.png
 share/wesnoth/images/white-mage-defend.png
@@ -1753,6 +2499,7 @@ share/wesnoth/images/young-ogre-attack.png
 share/wesnoth/images/young-ogre.png
 share/wesnoth/music/elf-land.ogg
 share/wesnoth/music/frantic.ogg
+share/wesnoth/music/main_menu.ogg
 share/wesnoth/music/underground.ogg
 share/wesnoth/music/wesnoth-1.ogg
 share/wesnoth/music/wesnoth-2.ogg
@@ -1768,16 +2515,22 @@ share/wesnoth/sounds/arrow-miss.wav
 share/wesnoth/sounds/bell.wav
 share/wesnoth/sounds/dagger-swish.wav
 share/wesnoth/sounds/dart.wav
+share/wesnoth/sounds/eagle.wav
 share/wesnoth/sounds/female-hit.wav
+share/wesnoth/sounds/female-strong-hit.wav
 share/wesnoth/sounds/fire.wav
 share/wesnoth/sounds/firearrow.wav
 share/wesnoth/sounds/fist-swish.wav
 share/wesnoth/sounds/ghoul-hit.wav
 share/wesnoth/sounds/ghoul-swish.wav
+share/wesnoth/sounds/groan-strong.wav
 share/wesnoth/sounds/groan.wav
 share/wesnoth/sounds/gunshot.wav
 share/wesnoth/sounds/heal.wav
+share/wesnoth/sounds/hiss-big.wav
+share/wesnoth/sounds/hiss.wav
 share/wesnoth/sounds/horse-canter.wav
+share/wesnoth/sounds/horse-elf-canter.wav
 share/wesnoth/sounds/knife.wav
 share/wesnoth/sounds/leave.wav
 share/wesnoth/sounds/lightning.wav
@@ -1787,10 +2540,14 @@ share/wesnoth/sounds/mermen-hit.wav
 share/wesnoth/sounds/net.wav
 share/wesnoth/sounds/open-chest.wav
 share/wesnoth/sounds/orc-hit.wav
+share/wesnoth/sounds/orc-small-hit.wav
 share/wesnoth/sounds/pistol.wav
 share/wesnoth/sounds/receive.wav
 share/wesnoth/sounds/skeleton-hit.wav
 share/wesnoth/sounds/spear.wav
+share/wesnoth/sounds/squishy-hit.wav
+share/wesnoth/sounds/squishy-miss.wav
+share/wesnoth/sounds/squishy-strike.wav
 share/wesnoth/sounds/staff.wav
 share/wesnoth/sounds/sword-clang.wav
 share/wesnoth/sounds/sword-swish.wav
@@ -1800,20 +2557,220 @@ share/wesnoth/sounds/wolf-attack.wav
 share/wesnoth/sounds/wolf-cry.wav
 share/wesnoth/sounds/zombie-attack.wav
 share/wesnoth/sounds/zombie-hit.wav
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/ca/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/cs/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/da/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/de/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/el_GR/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/es/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/eu/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/fi/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/fr/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/hu/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/it/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/nl/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/no/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/no/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/no/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/no/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/no/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/no/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/no/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/no/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/pl/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/pt_BR/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/ru/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/sk/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/sl/LC_MESSAGES/wesnoth.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-editor.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-ei.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-httt.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-lib.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-sotbe.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-tdh.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth-trow.mo
+share/wesnoth/translations/sv/LC_MESSAGES/wesnoth.mo
+@dirrm share/wesnoth/translations/sv/LC_MESSAGES
+@dirrm share/wesnoth/translations/sv
+@dirrm share/wesnoth/translations/sl/LC_MESSAGES
+@dirrm share/wesnoth/translations/sl
+@dirrm share/wesnoth/translations/sk/LC_MESSAGES
+@dirrm share/wesnoth/translations/sk
+@dirrm share/wesnoth/translations/ru/LC_MESSAGES
+@dirrm share/wesnoth/translations/ru
+@dirrm share/wesnoth/translations/pt_BR/LC_MESSAGES
+@dirrm share/wesnoth/translations/pt_BR
+@dirrm share/wesnoth/translations/pl/LC_MESSAGES
+@dirrm share/wesnoth/translations/pl
+@dirrm share/wesnoth/translations/no/LC_MESSAGES
+@dirrm share/wesnoth/translations/no
+@dirrm share/wesnoth/translations/nl/LC_MESSAGES
+@dirrm share/wesnoth/translations/nl
+@dirrm share/wesnoth/translations/it/LC_MESSAGES
+@dirrm share/wesnoth/translations/it
+@dirrm share/wesnoth/translations/hu/LC_MESSAGES
+@dirrm share/wesnoth/translations/hu
+@dirrm share/wesnoth/translations/fr/LC_MESSAGES
+@dirrm share/wesnoth/translations/fr
+@dirrm share/wesnoth/translations/fi/LC_MESSAGES
+@dirrm share/wesnoth/translations/fi
+@dirrm share/wesnoth/translations/eu/LC_MESSAGES
+@dirrm share/wesnoth/translations/eu
+@dirrm share/wesnoth/translations/es/LC_MESSAGES
+@dirrm share/wesnoth/translations/es
+@dirrm share/wesnoth/translations/el_GR/LC_MESSAGES
+@dirrm share/wesnoth/translations/el_GR
+@dirrm share/wesnoth/translations/de/LC_MESSAGES
+@dirrm share/wesnoth/translations/de
+@dirrm share/wesnoth/translations/da/LC_MESSAGES
+@dirrm share/wesnoth/translations/da
+@dirrm share/wesnoth/translations/cs/LC_MESSAGES
+@dirrm share/wesnoth/translations/cs
+@dirrm share/wesnoth/translations/ca/LC_MESSAGES
+@dirrm share/wesnoth/translations/ca
+@dirrm share/wesnoth/translations
 @dirrm share/wesnoth/sounds
 @dirrm share/wesnoth/music
 @dirrm share/wesnoth/images/tools/exploder
 @dirrm share/wesnoth/images/tools
 @dirrm share/wesnoth/images/terrain
-@dirrm share/wesnoth/images/sotbe
 @dirrm share/wesnoth/images/projectiles
+@dirrm share/wesnoth/images/portraits/The_Rise_of_Wesnoth
+@dirrm share/wesnoth/images/portraits/Heir_To_The_Throne
+@dirrm share/wesnoth/images/portraits/Eastern_Invasion
+@dirrm share/wesnoth/images/portraits
 @dirrm share/wesnoth/images/misc
+@dirrm share/wesnoth/images/maps
+@dirrm share/wesnoth/images/items
 @dirrm share/wesnoth/images/icons
 @dirrm share/wesnoth/images/help
 @dirrm share/wesnoth/images/halo
 @dirrm share/wesnoth/images/editor
 @dirrm share/wesnoth/images/cursors-bw
 @dirrm share/wesnoth/images/cursors
+@dirrm share/wesnoth/images/campaigns/The_Rise_of_Wesnoth
+@dirrm share/wesnoth/images/campaigns/Son_Of_The_Black_Eye
+@dirrm share/wesnoth/images/campaigns/Heir_To_The_Throne
+@dirrm share/wesnoth/images/campaigns
 @dirrm share/wesnoth/images/buttons
 @dirrm share/wesnoth/images/attacks
 @dirrm share/wesnoth/images
@@ -1825,16 +2782,19 @@ share/wesnoth/sounds/zombie-hit.wav
 @dirrm share/wesnoth/data/tools
 @dirrm share/wesnoth/data/themes
 @dirrm share/wesnoth/data/terrain-graphics
+@dirrm share/wesnoth/data/scenarios/tutorial
 @dirrm share/wesnoth/data/scenarios/multiplayer
+@dirrm share/wesnoth/data/scenarios/The_Rise_of_Wesnoth
 @dirrm share/wesnoth/data/scenarios/The_Dark_Hordes
 @dirrm share/wesnoth/data/scenarios/Son_Of_The_Black_Eye
 @dirrm share/wesnoth/data/scenarios/Heir_To_The_Throne
 @dirrm share/wesnoth/data/scenarios/Eastern_Invasion
 @dirrm share/wesnoth/data/scenarios
+@dirrm share/wesnoth/data/maps/multiplayer
 @dirrm share/wesnoth/data/maps/Tutorial
+@dirrm share/wesnoth/data/maps/The_Rise_of_Wesnoth
 @dirrm share/wesnoth/data/maps/The_Dark_Hordes
 @dirrm share/wesnoth/data/maps/Son_Of_The_Black_Eye
-@dirrm share/wesnoth/data/maps/Multiplayer
 @dirrm share/wesnoth/data/maps/Heir_To_The_Throne
 @dirrm share/wesnoth/data/maps/Eastern_Invasion
 @dirrm share/wesnoth/data/maps
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo
index 04639553bf7..ff6c259ad5f 100644
--- a/games/wesnoth/distinfo
+++ b/games/wesnoth/distinfo
@@ -1,8 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/14 13:20:24 manu Exp $
+$NetBSD: distinfo,v 1.2 2004/12/01 22:32:24 wiz Exp $
 
-SHA1 (wesnoth-0.8.tar.gz) = 10431c51b371c5fcf549408f18676abe09afcdca
-Size (wesnoth-0.8.tar.gz) = 22171378 bytes
-SHA1 (patch-aa) = f129f4788ad123fab9a6c6afbe2fdf173846eda9
-SHA1 (patch-ab) = b1baffa9aac28441adbf6ecd0334d0c090b5ebd8
-SHA1 (patch-ac) = 25e08321be9e4b542db1a904c136792b2c1488cd
-SHA1 (patch-ae) = 92a1831ebbc4300b0f03a221d45852d6164ab867
+SHA1 (wesnoth-0.8.7.tar.gz) = 2c6288167a17e8b22b7894fb5afefcc1cbc5e7ae
+Size (wesnoth-0.8.7.tar.gz) = 33383831 bytes
diff --git a/games/wesnoth/patches/patch-aa b/games/wesnoth/patches/patch-aa
deleted file mode 100644
index 2e321e72043..00000000000
--- a/games/wesnoth/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/14 13:20:24 manu Exp $
---- src/scoped_resource.hpp.orig	Mon Jul 12 23:29:10 2004
-+++ src/scoped_resource.hpp	Mon Jul 12 23:30:47 2004
-@@ -12,8 +12,10 @@
- */
- #ifndef SCOPED_RESOURCE_H_INCLUDED
- #define SCOPED_RESOURCE_H_INCLUDED
- 
-+#include <stdio.h>
-+
- /**
- * The util namespace should take all classes which are of a generic type,
- * used to perform common tasks which are not BibleTime-specific. See
- * @ref scoped_resource for an example.
diff --git a/games/wesnoth/patches/patch-ab b/games/wesnoth/patches/patch-ab
deleted file mode 100644
index 1fe706fac9a..00000000000
--- a/games/wesnoth/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/14 13:20:24 manu Exp $
---- src/help.cpp.orig	Mon Jul 12 23:32:00 2004
-+++ src/help.cpp	Mon Jul 12 23:33:58 2004
-@@ -26,9 +26,11 @@
- 
- #include <cassert>
- #include <algorithm>
- #include <iostream>
-+#ifndef __NetBSD__
- #include <locale>
-+#endif
- #include <queue>
- #include <set>
- #include <stack>
- #include <sstream>
diff --git a/games/wesnoth/patches/patch-ac b/games/wesnoth/patches/patch-ac
deleted file mode 100644
index fa6b14ee8e9..00000000000
--- a/games/wesnoth/patches/patch-ac
+++ /dev/null
@@ -1,1771 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/07/14 13:20:28 manu Exp $
---- Makefile.in.orig	Tue Jul 13 00:11:11 2004
-+++ Makefile.in	Tue Jul 13 00:27:57 2004
-@@ -52,9 +52,356 @@
- CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
- CYGPATH_W = @CYGPATH_W@
- DATADIR = @DATADIR@
--DATA_FILES = @DATA_FILES@
-+DATA_FILES = \
-+	data/maps/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag \
-+	data/maps/Son_Of_The_Black_Eye/Silent_Forest \
-+	data/maps/Son_Of_The_Black_Eye/Black_Flag \
-+	data/maps/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz \
-+	data/maps/Son_Of_The_Black_Eye/Desert_Of_Death \
-+	data/maps/Son_Of_The_Black_Eye/End_Of_Peace \
-+	data/maps/Son_Of_The_Black_Eye/Saving_Inarix \
-+	data/maps/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor \
-+	data/maps/Son_Of_The_Black_Eye/Shan_Taum_The_Smug \
-+	data/maps/Tutorial/Tutorial1 \
-+	data/maps/Tutorial/Tutorial2 \
-+	data/maps/Multiplayer/Wesbowl \
-+	data/maps/Multiplayer/Castles \
-+	data/maps/Multiplayer/Weslin \
-+	data/maps/Multiplayer/BattleWorld \
-+	data/maps/Multiplayer/Three_Rivers \
-+	data/maps/Multiplayer/ForestofFear \
-+	data/maps/Multiplayer/King_of_the_Hill \
-+	data/maps/The_Dark_Hordes/Mages_And_Elves \
-+	data/maps/The_Dark_Hordes/The_Skull_of_Agarash \
-+	data/maps/The_Dark_Hordes/Confrontation \
-+	data/maps/The_Dark_Hordes/Inside_The_Tower \
-+	data/maps/The_Dark_Hordes/A_New_Chance \
-+	data/maps/The_Dark_Hordes/Crelanus_Book \
-+	data/maps/The_Dark_Hordes/Brother_Against_Brother \
-+	data/maps/Heir_To_The_Throne/A_Choice_Must_Be_Made \
-+	data/maps/Heir_To_The_Throne/Gryphon_Mountain \
-+	data/maps/Heir_To_The_Throne/Blackwater_Port \
-+	data/maps/Heir_To_The_Throne/Mountain_Pass \
-+	data/maps/Heir_To_The_Throne/Bay_of_Pearls \
-+	data/maps/Heir_To_The_Throne/Princess_of_Wesnoth \
-+	data/maps/Heir_To_The_Throne/Home_North_Elves \
-+	data/maps/Heir_To_The_Throne/Valley_of_Death \
-+	data/maps/Heir_To_The_Throne/Swamp_Of_Dread \
-+	data/maps/Heir_To_The_Throne/High_King_at_Sea \
-+	data/maps/Heir_To_The_Throne/Isle_of_the_Damned \
-+	data/maps/Heir_To_The_Throne/Return_to_Wesnoth \
-+	data/maps/Heir_To_The_Throne/The_Lost_General \
-+	data/maps/Heir_To_The_Throne/Hasty_Alliance \
-+	data/maps/Heir_To_The_Throne/Muff_Malal_Peninsula \
-+	data/maps/Heir_To_The_Throne/Home_Clan \
-+	data/maps/Heir_To_The_Throne/Sceptre \
-+	data/maps/Heir_To_The_Throne/Elves_Besieged \
-+	data/maps/Heir_To_The_Throne/Crossroads \
-+	data/maps/Heir_To_The_Throne/Dwarven_Doors \
-+	data/maps/Heir_To_The_Throne/Snow_Plains \
-+	data/maps/Heir_To_The_Throne/Isle_of_Anduin \
-+	data/maps/Heir_To_The_Throne/Northern_Winter \
-+	data/maps/Heir_To_The_Throne/Plunging_Into_the_Darkness \
-+	data/maps/Heir_To_The_Throne/Ford_of_Abez \
-+	data/maps/Heir_To_The_Throne/The_Siege_of_Elensefar \
-+	data/maps/Eastern_Invasion/Training_the_Ogres \
-+	data/maps/Eastern_Invasion/loyalistmap11 \
-+	data/maps/Eastern_Invasion/Lake_Vrug \
-+	data/maps/Eastern_Invasion/Captured \
-+	data/maps/Eastern_Invasion/Undead_Crossing \
-+	data/maps/Eastern_Invasion/Weldyn_under_Attack \
-+	data/maps/Eastern_Invasion/The_Crossing \
-+	data/maps/Eastern_Invasion/The_Undead_Border_Patrol \
-+	data/maps/Eastern_Invasion/Northern_Outpost \
-+	data/maps/Eastern_Invasion/Two_Paths \
-+	data/maps/Eastern_Invasion/Mal-Ravanals_Capital \
-+	data/maps/Eastern_Invasion/An_Unexpected_Appearance \
-+	data/maps/Eastern_Invasion/The_Escape_Tunnel \
-+	data/maps/Eastern_Invasion/An_Elven_Alliance \
-+	data/maps/Eastern_Invasion/Tribal_Warfare \
-+	data/maps/Eastern_Invasion/The_Outpost \
-+	data/scenarios/multiplayer/Wesbowl.cfg \
-+	data/scenarios/multiplayer/battleworld.cfg \
-+	data/scenarios/multiplayer/Random_Scenario.cfg \
-+	data/scenarios/multiplayer/scenarios.cfg \
-+	data/scenarios/multiplayer/WeslinBridge.cfg \
-+	data/scenarios/multiplayer/ForestOfFear.cfg \
-+	data/scenarios/multiplayer/castles.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/Black_Flag.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/deaths.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/End_Of_Peace.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/Silent_Forest.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/Clash_Of_Armies.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/Saving_Inarix.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/The_Siege_Of_Barag_Gor.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/Towards_Mountains_of_Haag.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/To_The_Harbour_Of_Tirigaz.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/Shan_Taum_The_Smug.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/story.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/Desert_Of_Death.cfg \
-+	data/scenarios/Son_Of_The_Black_Eye/utils.cfg \
-+	data/scenarios/The_Dark_Hordes/Mages_And_Elves.cfg \
-+	data/scenarios/The_Dark_Hordes/Brother_Against_Brother.cfg \
-+	data/scenarios/The_Dark_Hordes/Inside_The_Tower.cfg \
-+	data/scenarios/The_Dark_Hordes/Confrontation.cfg \
-+	data/scenarios/The_Dark_Hordes/A_New_Chance.cfg \
-+	data/scenarios/The_Dark_Hordes/The_Skull_of_Agarash.cfg \
-+	data/scenarios/The_Dark_Hordes/Crelanus_Book.cfg \
-+	data/scenarios/Heir_To_The_Throne/Isle_of_Anduin.cfg \
-+	data/scenarios/Heir_To_The_Throne/Blackwater_Port.cfg \
-+	data/scenarios/Heir_To_The_Throne/Valley_of_Death.cfg \
-+	data/scenarios/Heir_To_The_Throne/Snow_Plains.cfg \
-+	data/scenarios/Heir_To_The_Throne/Swamp_Of_Dread.cfg \
-+	data/scenarios/Heir_To_The_Throne/Gryphon_Mountain.cfg \
-+	data/scenarios/Heir_To_The_Throne/The_Siege_of_Elensefar.cfg \
-+	data/scenarios/Heir_To_The_Throne/A_Choice_Must_Be_Made.cfg \
-+	data/scenarios/Heir_To_The_Throne/Home_North_Elves.cfg \
-+	data/scenarios/Heir_To_The_Throne/Dwarven_Doors.cfg \
-+	data/scenarios/Heir_To_The_Throne/Muff_Malal_Peninsula.cfg \
-+	data/scenarios/Heir_To_The_Throne/Ford_of_Abez.cfg \
-+	data/scenarios/Heir_To_The_Throne/Hasty_Alliance.cfg \
-+	data/scenarios/Heir_To_The_Throne/High_King_at_Sea.cfg \
-+	data/scenarios/Heir_To_The_Throne/Elves_Besieged.cfg \
-+	data/scenarios/Heir_To_The_Throne/Bay_of_Pearls.cfg \
-+	data/scenarios/Heir_To_The_Throne/Return_to_Wesnoth.cfg \
-+	data/scenarios/Heir_To_The_Throne/Isle_of_the_Damned.cfg \
-+	data/scenarios/Heir_To_The_Throne/The_Lost_General.cfg \
-+	data/scenarios/Heir_To_The_Throne/Princess_of_Wesnoth.cfg \
-+	data/scenarios/Heir_To_The_Throne/Sceptre.cfg \
-+	data/scenarios/Heir_To_The_Throne/Crossroads.cfg \
-+	data/scenarios/Heir_To_The_Throne/Mountain_Pass.cfg \
-+	data/scenarios/Heir_To_The_Throne/Northern_Winter.cfg \
-+	data/scenarios/Heir_To_The_Throne/Elven_Council.cfg \
-+	data/scenarios/Heir_To_The_Throne/Plunging_Into_the_Darkness.cfg \
-+	data/scenarios/Heir_To_The_Throne/Home_Clan.cfg \
-+	data/scenarios/Heir_To_The_Throne/Valley_of_Statues.cfg \
-+	data/scenarios/Eastern_Invasion/The_Outpost.cfg \
-+	data/scenarios/Eastern_Invasion/intro.cfg \
-+	data/scenarios/Eastern_Invasion/Mal-Ravanals_Capital.cfg \
-+	data/scenarios/Eastern_Invasion/Tribal_Warfare.cfg \
-+	data/scenarios/Eastern_Invasion/deaths.cfg \
-+	data/scenarios/Eastern_Invasion/Unexpected_Appearance.cfg \
-+	data/scenarios/Eastern_Invasion/Weldyn_Attack.cfg \
-+	data/scenarios/Eastern_Invasion/Ogre_Training.cfg \
-+	data/scenarios/Eastern_Invasion/Lake_Vrug.cfg \
-+	data/scenarios/Eastern_Invasion/Undead_Crossing.cfg \
-+	data/scenarios/Eastern_Invasion/Escape_Tunnel.cfg \
-+	data/scenarios/Eastern_Invasion/Northern_Outpost.cfg \
-+	data/scenarios/Eastern_Invasion/Undead_Border_Patrol.cfg \
-+	data/scenarios/Eastern_Invasion/Elven_Alliance.cfg \
-+	data/scenarios/Eastern_Invasion/Captured.cfg \
-+	data/scenarios/Eastern_Invasion/Crossing.cfg \
-+	data/scenarios/Eastern_Invasion/Two_Paths.cfg \
-+	data/terrain.cfg \
-+	data/intro.cfg \
-+	data/battleworld.cfg \
-+	data/tutorial.cfg \
-+	data/tools/exploder/castle-exploded-convex.cfg \
-+	data/tools/exploder/castle-convex.cfg \
-+	data/tools/exploder/models/castle.cfg \
-+	data/tools/exploder/castle-concave.cfg \
-+	data/tools/exploder/castle-exploded-concave.cfg \
-+	data/units/Red_Mage.cfg \
-+	data/units/Mage.cfg \
-+	data/units/Orcish_Warlord.cfg \
-+	data/units/Gryphon_Rider.cfg \
-+	data/units/Dwarvish_Fighter.cfg \
-+	data/units/White_Mage.cfg \
-+	data/units/Mage_of_Light.cfg \
-+	data/units/Yeti.cfg \
-+	data/units/Elvish_Shaman.cfg \
-+	data/units/Troll_Whelp.cfg \
-+	data/units/Battle_Princess.cfg \
-+	data/units/Drake_Beak.cfg \
-+	data/units/Elvish_Outrider.cfg \
-+	data/units/Elvish_Sharpshooter.cfg \
-+	data/units/Troll_Warrior.cfg \
-+	data/units/Orcish_Assassin.cfg \
-+	data/units/Dragoon.cfg \
-+	data/units/Revenant.cfg \
-+	data/units/Cavalry.cfg \
-+	data/units/Dwarvish_Runemaster.cfg \
-+	data/units/Drake_Fighter.cfg \
-+	data/units/Death_Knight.cfg \
-+	data/units/Drake_Worker.cfg \
-+	data/units/Drake_Mage.cfg \
-+	data/units/Lancer.cfg \
-+	data/units/Drake_Guard.cfg \
-+	data/units/Horseman.cfg \
-+	data/units/Skeleton_Archer.cfg \
-+	data/units/Drake_Clasher.cfg \
-+	data/units/Orcish_Crossbowman.cfg \
-+	data/units/Heavy_Infantry.cfg \
-+	data/units/Dwarvish_Thunderer.cfg \
-+	data/units/Spectre.cfg \
-+	data/units/Sea_Orc.cfg \
-+	data/units/Princess.cfg \
-+	data/units/Ancient_Lich.cfg \
-+	data/units/Dwarvish_Steelclad.cfg \
-+	data/units/Great_Mage.cfg \
-+	data/units/Ogre.cfg \
-+	data/units/Shock_Trooper.cfg \
-+	data/units/Orcish_Shaman.cfg \
-+	data/units/Drake_Fire.cfg \
-+	data/units/Trapper.cfg \
-+	data/units/Bone_Shooter.cfg \
-+	data/units/Outlaw.cfg \
-+	data/units/Dark_Spirit.cfg \
-+	data/units/Ghost.cfg \
-+	data/units/Elvish_Scout.cfg \
-+	data/units/Wose.cfg \
-+	data/units/Duelist.cfg \
-+	data/units/Orcish_Ruler.cfg \
-+	data/units/Watch_Tower.cfg \
-+	data/units/Ghoul.cfg \
-+	data/units/Elvish_Fighter.cfg \
-+	data/units/Dark_Adept.cfg \
-+	data/units/Deathmaster.cfg \
-+	data/units/Necrophage.cfg \
-+	data/units/Wolf_Rider.cfg \
-+	data/units/Iron_Mauler.cfg \
-+	data/units/Merman_Lord.cfg \
-+	data/units/Orcish_Slayer.cfg \
-+	data/units/Cave_Spider.cfg \
-+	data/units/Giant_Scorpion.cfg \
-+	data/units/Drake_Petit.cfg \
-+	data/units/Goblin_Pillager.cfg \
-+	data/units/Grand_Knight.cfg \
-+	data/units/Vampire_Bat.cfg \
-+	data/units/Chocobone.cfg \
-+	data/units/Transport_Galleon.cfg \
-+	data/units/Elvish_Druid.cfg \
-+	data/units/Elvish_Lord.cfg \
-+	data/units/Longbowman.cfg \
-+	data/units/Shadow.cfg \
-+	data/units/Gryphon_Master.cfg \
-+	data/units/General.cfg \
-+	data/units/Orcish_Crossbow.cfg \
-+	data/units/Poacher.cfg \
-+	data/units/Drake_Warrior.cfg \
-+	data/units/Bowman.cfg \
-+	data/units/Elvish_Avenger.cfg \
-+	data/units/Elvish_Rider.cfg \
-+	data/units/Elvish_Shyde.cfg \
-+	data/units/Paladin.cfg \
-+	data/units/Nightgaunt.cfg \
-+	data/units/Young_Ogre.cfg \
-+	data/units/Gryphon.cfg \
-+	data/units/Pikeman.cfg \
-+	data/units/Thug.cfg \
-+	data/units/Footpad.cfg \
-+	data/units/Assassin.cfg \
-+	data/units/Merman.cfg \
-+	data/units/Silver_Mage.cfg \
-+	data/units/Lich.cfg \
-+	data/units/Triton.cfg \
-+	data/units/Cuttle_Fish.cfg \
-+	data/units/Cavalier.cfg \
-+	data/units/Goblin_Direwolver.cfg \
-+	data/units/Heavy_Infantryman.cfg \
-+	data/units/Orcish_Grunt.cfg \
-+	data/units/Cockatrice.cfg \
-+	data/units/Elvish_Hero.cfg \
-+	data/units/Dwarvish_Dragonguard.cfg \
-+	data/units/Lord.cfg \
-+	data/units/Gate.cfg \
-+	data/units/Dwarvish_Thunderguard.cfg \
-+	data/units/Naga.cfg \
-+	data/units/Drake_Slave.cfg \
-+	data/units/Elvish_Champion.cfg \
-+	data/units/Halbardier.cfg \
-+	data/units/Initiate.cfg \
-+	data/units/Rogue.cfg \
-+	data/units/Spearman.cfg \
-+	data/units/Walking_Corpse.cfg \
-+	data/units/Youth.cfg \
-+	data/units/Dwarvish_Ulfserker.cfg \
-+	data/units/Elvish_Marshal.cfg \
-+	data/units/Cavalryman.cfg \
-+	data/units/Thief.cfg \
-+	data/units/Elder_Mage.cfg \
-+	data/units/Sleeping_Gryphon.cfg \
-+	data/units/Skeleton.cfg \
-+	data/units/Commander.cfg \
-+	data/units/Troll.cfg \
-+	data/units/Vampire_Lady.cfg \
-+	data/units/Drake_Burner.cfg \
-+	data/units/Blood_Bat.cfg \
-+	data/units/Sea_Serpent.cfg \
-+	data/units/Soulless.cfg \
-+	data/units/Elvish_Ranger.cfg \
-+	data/units/Saurian.cfg \
-+	data/units/Necromancer.cfg \
-+	data/units/Galleon.cfg \
-+	data/units/Saurian_Warrior.cfg \
-+	data/units/Swordsman.cfg \
-+	data/units/Elvish_Archer.cfg \
-+	data/units/Master_Bowman.cfg \
-+	data/units/Drake_Slasher.cfg \
-+	data/units/Orcish_Warrior.cfg \
-+	data/units/Demilich.cfg \
-+	data/units/Arch_Mage.cfg \
-+	data/units/Bandit.cfg \
-+	data/units/Goblin_Knight.cfg \
-+	data/units/Elvish_Captain.cfg \
-+	data/units/Fighter.cfg \
-+	data/units/Knight.cfg \
-+	data/units/Fencer.cfg \
-+	data/units/Direwolf_Rider.cfg \
-+	data/units/Lieutenant.cfg \
-+	data/units/Sea_Hag.cfg \
-+	data/units/Dwarvish_Lord.cfg \
-+	data/units/Dwarvish_Berserker.cfg \
-+	data/units/Elder_Wose.cfg \
-+	data/units/Ancient_Wose.cfg \
-+	data/units/Elvish_Marksman.cfg \
-+	data/units/Pirate_Galleon.cfg \
-+	data/units/Sergeant.cfg \
-+	data/units/Orcish_Archer.cfg \
-+	data/units/Wraith.cfg \
-+	data/units/Royal_Guard.cfg \
-+	data/sample_translation.cfg \
-+	data/deaths.cfg \
-+	data/terrain-graphics.cfg \
-+	data/schedules.cfg \
-+	data/multiplayer.cfg \
-+	data/items.cfg \
-+	data/tutorial2.cfg \
-+	data/translations/catalan.cfg \
-+	data/translations/norwegian.cfg \
-+	data/translations/polish.cfg \
-+	data/translations/german.cfg \
-+	data/translations/spanish.cfg \
-+	data/translations/swedish.cfg \
-+	data/translations/hungarian.cfg \
-+	data/translations/danish.cfg \
-+	data/translations/finnish.cfg \
-+	data/translations/dutch.cfg \
-+	data/translations/portuguesebr.cfg \
-+	data/translations/brazilian.cfg \
-+	data/translations/italian.cfg \
-+	data/translations/czech.cfg \
-+	data/translations/slovak.cfg \
-+	data/translations/english.cfg \
-+	data/translations/french.cfg \
-+	data/terrain-graphics/adjacent.cfg \
-+	data/terrain-graphics/buildings.cfg \
-+	data/terrain-graphics/adjacent-north.cfg \
-+	data/terrain-graphics/base.cfg \
-+	data/terrain-graphics/castle-transitions.cfg \
-+	data/terrain-graphics/castles.cfg \
-+	data/terrain-graphics/util.cfg \
-+	data/themes/default.cfg \
-+	data/themes/editor.cfg \
-+	data/scenario-test.cfg \
-+	data/convert.pl \
-+	data/game.cfg \
-+	data/campaigns/README \
-+	data/names.cfg \
-+	data/help.cfg \
-+	data/utils.cfg
- DEFS = @DEFS@
- DEPDIR = @DEPDIR@
- ECHO_C = @ECHO_C@
- ECHO_N = @ECHO_N@
-@@ -71,9 +418,1408 @@
- GNOME1_TRUE = @GNOME1_TRUE@
- GNOME2_FALSE = @GNOME2_FALSE@
- GNOME2_TRUE = @GNOME2_TRUE@
- GNOME_CONFIG = @GNOME_CONFIG@
--IMAGE_FILES = @IMAGE_FILES@
-+IMAGE_FILES = \
-+	images/knight.png \
-+	images/sea-orc.png \
-+	images/elvish-avenger-attack1.png \
-+	images/elvish-avenger-attack2.png \
-+	images/elvish-marshal-bow.png \
-+	images/undead-archer-attack.png \
-+	images/neutral-bandit.png \
-+	images/rogue.png \
-+	images/dwarf-thunderguard-attack1.png \
-+	images/halo/fireball1.png \
-+	images/halo/fireball2.png \
-+	images/halo/fireball3.png \
-+	images/halo/fireball4.png \
-+	images/halo/fireball5.png \
-+	images/halo/fireball6.png \
-+	images/halo/fireball7.png \
-+	images/halo/blood-halo1.png \
-+	images/halo/blood-halo2.png \
-+	images/halo/fireball-big1.png \
-+	images/halo/fireball-big2.png \
-+	images/halo/fireball-big3.png \
-+	images/halo/fireball-big4.png \
-+	images/halo/fireball-big5.png \
-+	images/halo/fireball-big6.png \
-+	images/halo/fireball-big7.png \
-+	images/halo/white-cleric-aura.png \
-+	images/halo/elder-mage-halo1.png \
-+	images/halo/elder-mage-halo2.png \
-+	images/halo/elder-mage-halo3.png \
-+	images/halo/elder-mage-halo4.png \
-+	images/halo/elder-mage-halo5.png \
-+	images/halo/elder-mage-halo6.png \
-+	images/halo/silver-mage-halo10.png \
-+	images/halo/silver-mage-halo11.png \
-+	images/halo/silver-mage-halo12.png \
-+	images/halo/elder-mage-halo.png \
-+	images/halo/fireball-halo1.png \
-+	images/halo/fireball-halo2.png \
-+	images/halo/fireball-halo3.png \
-+	images/halo/fireball-halo4.png \
-+	images/halo/fireball-halo7.png \
-+	images/halo/mage-halo10.png \
-+	images/halo/mage-halo11.png \
-+	images/halo/mage-halo12.png \
-+	images/halo/mage-halo13.png \
-+	images/halo/silver-mage-halo1.png \
-+	images/halo/silver-mage-halo2.png \
-+	images/halo/silver-mage-halo3.png \
-+	images/halo/silver-mage-halo4.png \
-+	images/halo/silver-mage-halo5.png \
-+	images/halo/silver-mage-halo6.png \
-+	images/halo/silver-mage-halo7.png \
-+	images/halo/silver-mage-halo8.png \
-+	images/halo/silver-mage-halo9.png \
-+	images/halo/fireball-halo.png \
-+	images/halo/mage-halo1.png \
-+	images/halo/mage-halo2.png \
-+	images/halo/mage-halo3.png \
-+	images/halo/mage-halo4.png \
-+	images/halo/mage-halo5.png \
-+	images/halo/mage-halo6.png \
-+	images/halo/mage-halo7.png \
-+	images/halo/mage-halo8.png \
-+	images/halo/mage-halo9.png \
-+	images/help/topic.png \
-+	images/help/closed_section.png \
-+	images/help/open_section.png \
-+	images/help/tooltip.png \
-+	images/help/recruit.png \
-+	images/dwarf-thunderguard-attack2.png \
-+	images/misc/menu2-border-botright.png \
-+	images/misc/menu2-border-bottom.png \
-+	images/misc/konrad.png \
-+	images/misc/menu2-border-topleft.png \
-+	images/misc/story0a.png \
-+	images/misc/story0b.png \
-+	images/misc/ellipse-4-bottom.png \
-+	images/misc/blank.png \
-+	images/misc/menu-border-botright.png \
-+	images/misc/menu-border-left.png \
-+	images/misc/ellipse-10.png \
-+	images/misc/ellipse-6-top.png \
-+	images/misc/item-stormtrident.png \
-+	images/misc/income.png \
-+	images/misc/compass-north.png \
-+	images/misc/item-healingpotion.png \
-+	images/misc/mainmenu-border-botright.png \
-+	images/misc/menu-background.png \
-+	images/misc/ellipse-5-bottom.png \
-+	images/misc/menu2-border-botleft.png \
-+	images/misc/dot.png \
-+	images/misc/kalenz.png \
-+	images/misc/menu-border-top.png \
-+	images/misc/ellipse-8-top.png \
-+	images/misc/delfador.png \
-+	images/misc/ellipse-1-top.png \
-+	images/misc/disk.png \
-+	images/misc/ellipse-6-bottom.png \
-+	images/misc/map.png \
-+	images/misc/character-box.png \
-+	images/misc/mainmenu-border-topleft.png \
-+	images/misc/menu2-background.png \
-+	images/misc/font8x8.png \
-+	images/misc/title.png \
-+	images/misc/cage.png \
-+	images/misc/mainmenu-border-left.png \
-+	images/misc/menu2-border-top.png \
-+	images/misc/trapdoor.png \
-+	images/misc/ellipse-3-top.png \
-+	images/misc/rightside-bg.png \
-+	images/misc/ellipse-7-bottom.png \
-+	images/misc/villages.png \
-+	images/misc/units.png \
-+	images/misc/rightside.png \
-+	images/misc/menu-border-topleft.png \
-+	images/misc/lisar.png \
-+	images/misc/item-darktome.png \
-+	images/misc/cross.png \
-+	images/misc/eye.png \
-+	images/misc/item-staff.png \
-+	images/misc/invisible.png \
-+	images/misc/mainmenu-border-botleft.png \
-+	images/misc/topleft-corner.png \
-+	images/misc/compass-south.png \
-+	images/misc/ellipse-8-bottom.png \
-+	images/misc/menu2-border-topright.png \
-+	images/misc/ellipse-5-top.png \
-+	images/misc/tutorial3b.png \
-+	images/misc/lobby.png \
-+	images/misc/menu-border-botleft.png \
-+	images/misc/menu-border-topright.png \
-+	images/misc/item-sceptreoffire.png \
-+	images/misc/ellipse-10-top.png \
-+	images/misc/tutorial1.png \
-+	images/misc/tutorial2.png \
-+	images/misc/tutorial3.png \
-+	images/misc/tutorial4.png \
-+	images/misc/tutorial5.png \
-+	images/misc/tutorial6.png \
-+	images/misc/tutorial7.png \
-+	images/misc/foot-left-n.png \
-+	images/misc/top-bg.png \
-+	images/misc/mainmenu-border-bottom.png \
-+	images/misc/upkeep.png \
-+	images/misc/ellipse-9-bottom.png \
-+	images/misc/rightside-editor.png \
-+	images/misc/mainmenu-border-topright.png \
-+	images/misc/ellipse-7-top.png \
-+	images/misc/botleft-corner.png \
-+	images/misc/menu-border-bottom.png \
-+	images/misc/ellipse-1-bottom.png \
-+	images/misc/mainmenu-background.png \
-+	images/misc/logo.png \
-+	images/misc/foot-right-nw.png \
-+	images/misc/slowed.png \
-+	images/misc/mainmenu-border-top.png \
-+	images/misc/status-bg.png \
-+	images/misc/menu-border-right.png \
-+	images/misc/ellipse-9-top.png \
-+	images/misc/item-flamesword.png \
-+	images/misc/rightside-bottom.png \
-+	images/misc/foot-left-nw.png \
-+	images/misc/ball.png \
-+	images/misc/menu2-border-right.png \
-+	images/misc/gold.png \
-+	images/misc/ellipse-2-top.png \
-+	images/misc/topright-corner.png \
-+	images/misc/poisoned.png \
-+	images/misc/ellipse-2-bottom.png \
-+	images/misc/mainmenu-border-right.png \
-+	images/misc/foot-right-n.png \
-+	images/misc/botright-corner.png \
-+	images/misc/menu2-border-left.png \
-+	images/misc/folder-icon.png \
-+	images/misc/ellipse-10-bottom.png \
-+	images/misc/story1.png \
-+	images/misc/story2.png \
-+	images/misc/story3.png \
-+	images/misc/chest.png \
-+	images/misc/story4.png \
-+	images/misc/story5.png \
-+	images/misc/story6.png \
-+	images/misc/story7.png \
-+	images/misc/ellipse-1.png \
-+	images/misc/story8.png \
-+	images/misc/ellipse-2.png \
-+	images/misc/story9.png \
-+	images/misc/ellipse-3.png \
-+	images/misc/ellipse-4.png \
-+	images/misc/ellipse-5.png \
-+	images/misc/ellipse-6.png \
-+	images/misc/ellipse-7.png \
-+	images/misc/ellipse-8.png \
-+	images/misc/ellipse-9.png \
-+	images/misc/lisar_b.png \
-+	images/misc/ellipse-3-bottom.png \
-+	images/misc/ellipse-4-top.png \
-+	images/misc/item-holywater.png \
-+	images/dwarf-fighter-defend.png \
-+	images/elvish-marshal.png \
-+	images/wesnoth-icon.png \
-+	images/konrad-commander-leading.png \
-+	images/merman-king.png \
-+	images/horseman-moving.png \
-+	images/elvish-fighter-bow-attack1.png \
-+	images/elvish-fighter-bow-attack2.png \
-+	images/elvish-fighter-bow-attack3.png \
-+	images/wose-ancient-attack-1.png \
-+	images/assassin.png \
-+	images/wose-ancient-attack-2.png \
-+	images/undead-bat-attack.png \
-+	images/undead-adept-defend.png \
-+	images/unmoved-energy.png \
-+	images/drake-mage.png \
-+	images/human-general.png \
-+	images/drake-burner-flying.png \
-+	images/dwarf-dragonguard-attack-ranged.png \
-+	images/thief.png \
-+	images/elvish-marshal-attack.png \
-+	images/elvish-captain-defend.png \
-+	images/moved-energy.png \
-+	images/elvish-scout-moving.png \
-+	images/item-ring1.png \
-+	images/elvish-sharpshooter-attack.png \
-+	images/item-ring2.png \
-+	images/random-enemy.png \
-+	images/konrad-young-attack.png \
-+	images/elvish-rider.png \
-+	images/elvish-shyde.png \
-+	images/undead-deathknight.png \
-+	images/konrad-fighter-attack.png \
-+	images/neutral-footpad-defend.png \
-+	images/wose-ancient.png \
-+	images/elvish-druid-attack.png \
-+	images/elvish-champion-bow-defend.png \
-+	images/undead-initiate-attack1.png \
-+	images/undead-initiate-attack2.png \
-+	images/orc-assassin-attack.png \
-+	images/undead-ghost.png \
-+	images/drake-fighter-attack-fire1.png \
-+	images/drake-fighter-attack-fire2.png \
-+	images/troll-whelp-defend.png \
-+	images/saurian.png \
-+	images/galleon.png \
-+	images/elvish-avenger-bow.png \
-+	images/item-rock1.png \
-+	images/item-rock2.png \
-+	images/dwarf-thunderguard-attack.png \
-+	images/item-rock3.png \
-+	images/item-rock4.png \
-+	images/cursors/select.png \
-+	images/cursors/wait.png \
-+	images/cursors/move.png \
-+	images/cursors/normal.png \
-+	images/cursors/attack.png \
-+	images/merman-king-attack.png \
-+	images/undead-ghoul.png \
-+	images/human-pikeman.png \
-+	images/drake-mage-defend.png \
-+	images/undead-boneshooter-defend.png \
-+	images/undead-archer-attack1.png \
-+	images/undead-deathmaster.png \
-+	images/undead-archer-attack2.png \
-+	images/yeti-defend.png \
-+	images/wose-elder-attack.png \
-+	images/neutral-thug.png \
-+	images/human-swordman-defend.png \
-+	images/item-dragonstatue.png \
-+	images/human-longbowman-defend.png \
-+	images/undead-skeleton-attackb.png \
-+	images/wose-attack.png \
-+	images/drake-beak-attack.png \
-+	images/arch-mage-defend.png \
-+	images/silver-mage-attack1.png \
-+	images/human-sergeant-defend.png \
-+	images/silver-mage-attack2.png \
-+	images/silver-mage-attack3.png \
-+	images/human-battleprincess.png \
-+	images/undead-initiate-defend.png \
-+	images/human-duelist-defend.png \
-+	images/red-mage-defend.png \
-+	images/undead-ghoul-attack.png \
-+	images/gryphon-master.png \
-+	images/red-mage.png \
-+	images/elvish-ranger-bow-defend.png \
-+	images/dwarf-lord.png \
-+	images/orc-xbowman-ranged.png \
-+	images/wose-elder.png \
-+	images/icons/icon-server.png \
-+	images/icons/icon-general.png \
-+	images/icons/icon-serverother.png \
-+	images/icons/icon-hostgame.png \
-+	images/icons/icon-music.png \
-+	images/icons/icon-display.png \
-+	images/drake-mage-attack-ranged-staff1.png \
-+	images/dwarf-runemaster-defend.png \
-+	images/drake-mage-attack-ranged-staff2.png \
-+	images/dwarf-warrior-attack.png \
-+	images/human-cavalier-attack.png \
-+	images/human-shocktrooper-attack.png \
-+	images/elvish-outrider-attack.png \
-+	images/undead-necrophage-defend.png \
-+	images/elder-mage-defend.png \
-+	images/saurian-warrior-defend.png \
-+	images/orcish-warrior.png \
-+	images/sotbe/map1.png \
-+	images/sotbe/map2.png \
-+	images/sotbe/map3.png \
-+	images/sotbe/fire.png \
-+	images/sotbe/bigmap.png \
-+	images/sotbe/flag.png \
-+	images/tools/exploder/mask-castle-ne.png \
-+	images/tools/exploder/mask-castle-nw.png \
-+	images/tools/exploder/mask-castle-se.png \
-+	images/tools/exploder/mask-castle-sw.png \
-+	images/tools/exploder/mask-castle-e.png \
-+	images/tools/exploder/mask-castle-w.png \
-+	images/great-mage.png \
-+	images/undead-chocobone-defend.png \
-+	images/neutral-outlaw-attack1.png \
-+	images/neutral-outlaw-attack2.png \
-+	images/undead-darkspirit-attack.png \
-+	images/goblin-knight-attack.png \
-+	images/wolf-rider-attack.png \
-+	images/orcish-grunt.png \
-+	images/elvish-sharpshooter.png \
-+	images/undead-lich-defend.png \
-+	images/drake-fire.png \
-+	images/lancer-attack.png \
-+	images/undead-ancient-lich-attack.png \
-+	images/konrad-young.png \
-+	images/arch-mage.png \
-+	images/saurian-attack1.png \
-+	images/saurian-attack2.png \
-+	images/neutral-bandit-defend.png \
-+	images/saurian-attack3.png \
-+	images/human-masterbowman-defend.png \
-+	images/elvish-captain.png \
-+	images/naga-attack.png \
-+	images/drake-slave-defend.png \
-+	images/dwarf-lord-defend.png \
-+	images/gryphon-rider-attack.png \
-+	images/drake-fire-attack-close1.png \
-+	images/drake-burner-attack-ranged.png \
-+	images/drake-fire-attack-close2.png \
-+	images/troll-warrior.png \
-+	images/human-royalguard.png \
-+	images/elvish-fighter-bow-defend.png \
-+	images/undead-demilich-ranged1.png \
-+	images/undead-demilich-ranged2.png \
-+	images/undead-initiate.png \
-+	images/knight-defend.png \
-+	images/dwarf-berserker-defend.png \
-+	images/human-scout-attack.png \
-+	images/drake-fighter.png \
-+	images/red-mage-attack1.png \
-+	images/dwarf-ulfserker-defend.png \
-+	images/troll-grunt-attack.png \
-+	images/undead-bloodbat-defend.png \
-+	images/elvish-champion-bow.png \
-+	images/lancer.png \
-+	images/goblin-pillager.png \
-+	images/dwarf-fighter.png \
-+	images/sea-orc-defend.png \
-+	images/cuttlefish.png \
-+	images/elvish-ranger.png \
-+	images/drake-warrior-attack-ranged.png \
-+	images/item-box.png \
-+	images/undead-wraith-attack.png \
-+	images/dwarf-dragonguard-defend.png \
-+	images/dwarf-dragonguard-attack-close.png \
-+	images/undead-vampirelady-attack.png \
-+	images/undead-archer.png \
-+	images/undead-lich-melee.png \
-+	images/cockatrice-defend.png \
-+	images/drake-mage-attack-close.png \
-+	images/projectiles/dagger-ne.png \
-+	images/projectiles/spear-n.png \
-+	images/projectiles/thorns.png \
-+	images/projectiles/dagger-n.png \
-+	images/projectiles/whitemissile-ne.png \
-+	images/projectiles/bone-n.png \
-+	images/projectiles/magicmissile-ne.png \
-+	images/projectiles/bullet.png \
-+	images/projectiles/missile.png \
-+	images/projectiles/hatchet.png \
-+	images/projectiles/darkmissile-ne.png \
-+	images/projectiles/fireball.png \
-+	images/projectiles/magicmissile-n.png \
-+	images/projectiles/bone-ne.png \
-+	images/projectiles/darkmissile-n.png \
-+	images/projectiles/stone.png \
-+	images/projectiles/missile-ne.png \
-+	images/projectiles/missile-nw.png \
-+	images/projectiles/missile-se.png \
-+	images/projectiles/web.png \
-+	images/projectiles/water_spay.png \
-+	images/projectiles/missile-sw.png \
-+	images/projectiles/whitemissile-n.png \
-+	images/projectiles/missile-n.png \
-+	images/projectiles/missile-s.png \
-+	images/projectiles/ink.png \
-+	images/projectiles/gaze.png \
-+	images/projectiles/spear-ne.png \
-+	images/drake-clasher.png \
-+	images/white-mage-attack.png \
-+	images/enemy-energy.png \
-+	images/undead-skeleton.png \
-+	images/konrad-lord.png \
-+	images/drake-fighter-flying.png \
-+	images/elvish-archer.png \
-+	images/dwarf-ulfserker.png \
-+	images/elvish-avenger-attack.png \
-+	images/drake-warrior-defend.png \
-+	images/rogue-attack.png \
-+	images/tower.png \
-+	images/undead-necromancer-defend.png \
-+	images/neutral-outlaw-attack.png \
-+	images/drake-burner.png \
-+	images/konrad-lord-attack.png \
-+	images/human-cavalier.png \
-+	images/Underground.png \
-+	images/undead-zombie-attack.png \
-+	images/human-bowman-attack-sword.png \
-+	images/human-spearman-attack2.png \
-+	images/undead-chocobone-moving.png \
-+	images/elvish-marksman-bow-defend.png \
-+	images/mage.png \
-+	images/pirate-galleon.png \
-+	images/item-slab.png \
-+	images/elvish-fighter-attack.png \
-+	images/goblin-knight.png \
-+	images/item-monolith.png \
-+	images/orc-slayer.png \
-+	images/neutral-thug-defend.png \
-+	images/undead-soulless.png \
-+	images/wolf-rider.png \
-+	images/assassin-throwknife1.png \
-+	images/elvish-champion-defend.png \
-+	images/assassin-throwknife2.png \
-+	images/elvish-archer-attack.png \
-+	images/yeti.png \
-+	images/human-swordman.png \
-+	images/drake-petit-attack.png \
-+	images/direwolf_rider.png \
-+	images/neutral-trapper.png \
-+	images/assassin-defend.png \
-+	images/human-shocktrooper.png \
-+	images/undead-nightgaunt-attack.png \
-+	images/human-general-leading.png \
-+	images/dwarf-thunderer-attack.png \
-+	images/human-princess-attack.png \
-+	images/Day.png \
-+	images/human-bowman-attack1.png \
-+	images/human-bowman-attack2.png \
-+	images/human-bowman-attack3.png \
-+	images/UndergroundIllum.png \
-+	images/troll-whelp.png \
-+	images/undead-deathmaster-defend.png \
-+	images/elvish-ranger-attack.png \
-+	images/mage-attack1.png \
-+	images/orcish-warlord.png \
-+	images/item-ornate1.png \
-+	images/mage-attack2.png \
-+	images/item-ornate2.png \
-+	images/mage-attack3.png \
-+	images/scorpion.png \
-+	images/knight-moving.png \
-+	images/sea-hag-defend.png \
-+	images/lightning-bolt.png \
-+	images/konrad-commander-defend.png \
-+	images/undead-ghost-defend.png \
-+	images/human-masterbowman.png \
-+	images/entangle.png \
-+	images/human-spearman.png \
-+	images/undead-demilich.png \
-+	images/thief-attack.png \
-+	images/elder-mage-ranged.png \
-+	images/saurian-warrior-ranged.png \
-+	images/goblin-pillager-attack2.png \
-+	images/terrain/flag-team1.png \
-+	images/terrain/flag-team2.png \
-+	images/terrain/flag-team3.png \
-+	images/terrain/flag-team4.png \
-+	images/terrain/dirt-s.png \
-+	images/terrain/flag-team5.png \
-+	images/terrain/encampment-fg-concave-se.png \
-+	images/terrain/flag-team6.png \
-+	images/terrain/swampwater-n.png \
-+	images/terrain/flag-team7.png \
-+	images/terrain/snow.png \
-+	images/terrain/flag-team8.png \
-+	images/terrain/flag-team9.png \
-+	images/terrain/forest-etrans-nw.png \
-+	images/terrain/flag-team10.png \
-+	images/terrain/swampwater-s.png \
-+	images/terrain/castle-bg-concave-se.png \
-+	images/terrain/forest-nw-n-ne-se.png \
-+	images/terrain/encampment-fg-concave-sw.png \
-+	images/terrain/nest-full.png \
-+	images/terrain/keep-fg-inside-e.png \
-+	images/terrain/castle-bg-concave-sw.png \
-+	images/terrain/void-n-ne.png \
-+	images/terrain/dirt-ne.png \
-+	images/terrain/keep-fg-inside-w.png \
-+	images/terrain/desert.png \
-+	images/terrain/mountains-ne.png \
-+	images/terrain/dirt-nw.png \
-+	images/terrain/fog-sw-nw-n.png \
-+	images/terrain/mountains-nw.png \
-+	images/terrain/cave-ne-se-s.png \
-+	images/terrain/bridge-se-nw.png \
-+	images/terrain/fog-s-sw-nw.png \
-+	images/terrain/forest-ctrans-nw-n.png \
-+	images/terrain/forest-to-water-sw-nw.png \
-+	images/terrain/forest-nw-n.png \
-+	images/terrain/snow2.png \
-+	images/terrain/village-ne.png \
-+	images/terrain/dirt-se.png \
-+	images/terrain/mountains-se.png \
-+	images/terrain/forest-ctrans-n.png \
-+	images/terrain/grassland-se-s.png \
-+	images/terrain/forest-sw-nw-n.png \
-+	images/terrain/village-nw.png \
-+	images/terrain/forest-s-sw-nw.png \
-+	images/terrain/forest-etrans-nw-n-ne.png \
-+	images/terrain/trash.png \
-+	images/terrain/dirt-sw.png \
-+	images/terrain/icebridge-se-nw.png \
-+	images/terrain/mountains-sw.png \
-+	images/terrain/swampwater-ne.png \
-+	images/terrain/fog-n.png \
-+	images/terrain/fog-s.png \
-+	images/terrain/ocean-ne.png \
-+	images/terrain/void-ne-se.png \
-+	images/terrain/void-n.png \
-+	images/terrain/fog.png \
-+	images/terrain/forest-ctrans-n-ne.png \
-+	images/terrain/dawn.png \
-+	images/terrain/forest-n.png \
-+	images/terrain/forest-n-ne.png \
-+	images/terrain/void-s.png \
-+	images/terrain/forest-sw-nw.png \
-+	images/terrain/forest-s.png \
-+	images/terrain/swampwater-nw.png \
-+	images/terrain/village-first_watch.png \
-+	images/terrain/cave-sw-nw.png \
-+	images/terrain/ocean-nw.png \
-+	images/terrain/village-se.png \
-+	images/terrain/forest-to-water-nw-n.png \
-+	images/terrain/castle-fg-concave-ne.png \
-+	images/terrain/snow-n.png \
-+	images/terrain/forest2.png \
-+	images/terrain/forest3.png \
-+	images/terrain/forest4.png \
-+	images/terrain/forest5.png \
-+	images/terrain/forest6.png \
-+	images/terrain/ice.png \
-+	images/terrain/snow-s.png \
-+	images/terrain/forest7.png \
-+	images/terrain/forest8.png \
-+	images/terrain/keep-bg-wall-1-ne.png \
-+	images/terrain/village-sw.png \
-+	images/terrain/castle-bg-convex-e.png \
-+	images/terrain/castle-fg-concave-nw.png \
-+	images/terrain/desert-n.png \
-+	images/terrain/bridge-ne-sw.png \
-+	images/terrain/snow-ne.png \
-+	images/terrain/desert-s.png \
-+	images/terrain/swampwater-se.png \
-+	images/terrain/grassland-ne.png \
-+	images/terrain/void-s-sw.png \
-+	images/terrain/encampment-bg-convex-e.png \
-+	images/terrain/keep-bg-wall-1-nw.png \
-+	images/terrain/keep-fg-wall-1-ne.png \
-+	images/terrain/ocean-se.png \
-+	images/terrain/grid.png \
-+	images/terrain/castle-bg-convex-w.png \
-+	images/terrain/snow-nw.png \
-+	images/terrain/grassland-se-sw-nw.png \
-+	images/terrain/snow-ne-se.png \
-+	images/terrain/swampwater-sw.png \
-+	images/terrain/grassland-nw.png \
-+	images/terrain/encampment-bg-convex-w.png \
-+	images/terrain/snow-forest.png \
-+	images/terrain/keep-fg-wall-1-nw.png \
-+	images/terrain/ocean-sw.png \
-+	images/terrain/forest-to-water-n-ne.png \
-+	images/terrain/castle-fg-concave-se.png \
-+	images/terrain/dirt.png \
-+	images/terrain/keep-bg-wall-1-se.png \
-+	images/terrain/hills.png \
-+	images/terrain/castle-fg-concave-sw.png \
-+	images/terrain/snow-se.png \
-+	images/terrain/tent.png \
-+	images/terrain/grassland-n.png \
-+	images/terrain/grassland-se.png \
-+	images/terrain/keep-bg-wall-1-sw.png \
-+	images/terrain/keep-fg-wall-1-se.png \
-+	images/terrain/grassland-s.png \
-+	images/terrain/grassland-n-ne-se.png \
-+	images/terrain/snow-sw.png \
-+	images/terrain/village.png \
-+	images/terrain/village-snow.png \
-+	images/terrain/grassland-sw.png \
-+	images/terrain/fog-s-sw-nw-n.png \
-+	images/terrain/rocks.png \
-+	images/terrain/keep-fg-wall-1-sw.png \
-+	images/terrain/village-dusk.png \
-+	images/terrain/dark_grass.png \
-+	images/terrain/snow-hills.png \
-+	images/terrain/snow-forest-ne.png \
-+	images/terrain/forest-ctrans-nw-n-ne.png \
-+	images/terrain/forest-s-sw.png \
-+	images/terrain/grassland-sw-nw.png \
-+	images/terrain/void-ne-se-s.png \
-+	images/terrain/snow-n-ne-se.png \
-+	images/terrain/snow-forest-nw.png \
-+	images/terrain/test.png \
-+	images/terrain/road.png \
-+	images/terrain/pier.png \
-+	images/terrain/forest-to-water-ne-se.png \
-+	images/terrain/snow-nw-n.png \
-+	images/terrain/signpost.png \
-+	images/terrain/ocean-n.png \
-+	images/terrain/ocean-s.png \
-+	images/terrain/desert-ne.png \
-+	images/terrain/snow-forest-se.png \
-+	images/terrain/keep-bg-inside-e.png \
-+	images/terrain/ice-n.png \
-+	images/terrain/keep-fg-wall-0-e.png \
-+	images/terrain/ice-s.png \
-+	images/terrain/cave-n.png \
-+	images/terrain/desert-nw.png \
-+	images/terrain/out.png \
-+	images/terrain/cave-s.png \
-+	images/terrain/snow-forest-sw.png \
-+	images/terrain/keep-bg-inside-w.png \
-+	images/terrain/snow-n-ne.png \
-+	images/terrain/forest-ne-se.png \
-+	images/terrain/keep-fg-wall-0-w.png \
-+	images/terrain/cave-n-ne-se.png \
-+	images/terrain/cave-ne-se.png \
-+	images/terrain/fog-ne-se-s.png \
-+	images/terrain/village-swampwater.png \
-+	images/terrain/fog-sw-nw.png \
-+	images/terrain/cave-s-sw-nw-n.png \
-+	images/terrain/desert-se.png \
-+	images/terrain/void-se-s.png \
-+	images/terrain/cave-nw-n.png \
-+	images/terrain/ice-ne.png \
-+	images/terrain/desert-sw.png \
-+	images/terrain/mask.png \
-+	images/terrain/snow-s-sw-nw-n.png \
-+	images/terrain/ice-pier.png \
-+	images/terrain/grassland-s-sw-nw-n.png \
-+	images/terrain/void-nw-n-ne.png \
-+	images/terrain/forest-ctrans-ne.png \
-+	images/terrain/ice-nw.png \
-+	images/terrain/castle-bg-convex-ne.png \
-+	images/terrain/fog-nw-n.png \
-+	images/terrain/snow-hills-n.png \
-+	images/terrain/ocean.png \
-+	images/terrain/forest-ne-se-s.png \
-+	images/terrain/snow-hills-s.png \
-+	images/terrain/forest-stones1.png \
-+	images/terrain/forest-stones2.png \
-+	images/terrain/forest-stones3.png \
-+	images/terrain/forest-stones4.png \
-+	images/terrain/coast.png \
-+	images/terrain/forest-ctrans-nw.png \
-+	images/terrain/castle-bg-convex-nw.png \
-+	images/terrain/castle-fg-convex-ne.png \
-+	images/terrain/castle-bg-concave-e.png \
-+	images/terrain/hills-n-ne.png \
-+	images/terrain/bridge-n-s.png \
-+	images/terrain/cave-n-ne.png \
-+	images/terrain/castle-fg-convex-nw.png \
-+	images/terrain/ice-se.png \
-+	images/terrain/cave.png \
-+	images/terrain/fog-n-ne-se-s.png \
-+	images/terrain/cave-ne.png \
-+	images/terrain/snow-hills-ne.png \
-+	images/terrain/castle-bg-concave-w.png \
-+	images/terrain/castle-fg-concave-e.png \
-+	images/terrain/keep-fg-wall-1-e.png \
-+	images/terrain/fog-n-ne.png \
-+	images/terrain/ice-sw.png \
-+	images/terrain/castle-bg-convex-se.png \
-+	images/terrain/keep-bg-inside-ne.png \
-+	images/terrain/cave-nw.png \
-+	images/terrain/mine.png \
-+	images/terrain/snow-hills-nw.png \
-+	images/terrain/castle-fg-concave-w.png \
-+	images/terrain/keep-fg-wall-1-w.png \
-+	images/terrain/forest-se-s.png \
-+	images/terrain/grassland-sw-nw-n.png \
-+	images/terrain/castle-bg-convex-sw.png \
-+	images/terrain/castle-fg-convex-se.png \
-+	images/terrain/keep-bg-inside-nw.png \
-+	images/terrain/keep-fg-inside-ne.png \
-+	images/terrain/grassland-s-sw-nw.png \
-+	images/terrain/grassland-ne-se.png \
-+	images/terrain/fog-nw-n-ne.png \
-+	images/terrain/snow-s-sw.png \
-+	images/terrain/alphamask.png \
-+	images/terrain/castle-fg-convex-sw.png \
-+	images/terrain/alpha.png \
-+	images/terrain/keep-fg-inside-nw.png \
-+	images/terrain/cave-se.png \
-+	images/terrain/keep-bg-wall-0-ne.png \
-+	images/terrain/snow-hills-se.png \
-+	images/terrain/swampwater.png \
-+	images/terrain/village-second_watch.png \
-+	images/terrain/snow-sw-nw-n.png \
-+	images/terrain/castle.png \
-+	images/terrain/keep-bg-inside-se.png \
-+	images/terrain/keep-bg-wall-0-nw.png \
-+	images/terrain/keep-fg-wall-0-ne.png \
-+	images/terrain/snow-s-sw-nw.png \
-+	images/terrain/cave-sw.png \
-+	images/terrain/snow-hills-sw.png \
-+	images/terrain/village-n.png \
-+	images/terrain/keep-fg-wall-ne.png \
-+	images/terrain/village-s.png \
-+	images/terrain/keep-bg-inside-sw.png \
-+	images/terrain/forest-nw-n-ne.png \
-+	images/terrain/keep-fg-inside-se.png \
-+	images/terrain/keep-fg-wall-0-nw.png \
-+	images/terrain/encampment-bg-convex-ne.png \
-+	images/terrain/nest-empty.png \
-+	images/terrain/void-se-s-sw.png \
-+	images/terrain/forest.png \
-+	images/terrain/forest-to-water-se-s.png \
-+	images/terrain/coast-ne.png \
-+	images/terrain/bridge.png \
-+	images/terrain/grassland-nw-n.png \
-+	images/terrain/keep-fg-wall-nw.png \
-+	images/terrain/keep-fg-inside-sw.png \
-+	images/terrain/encampment-bg-convex-nw.png \
-+	images/terrain/encampment-fg-convex-ne.png \
-+	images/terrain/keep-bg-wall-0-se.png \
-+	images/terrain/cave-n-ne-se-s.png \
-+	images/terrain/hills-s-se.png \
-+	images/terrain/keep-fg-wall-e.png \
-+	images/terrain/keep.png \
-+	images/terrain/keep-bg-wall-ne.png \
-+	images/terrain/coast-nw.png \
-+	images/terrain/keep-bg-wall-e.png \
-+	images/terrain/void-s-sw-nw-n.png \
-+	images/terrain/encampment-bg-concave-e.png \
-+	images/terrain/forest-to-water-nw-n-ne.png \
-+	images/terrain/void-n-ne-se.png \
-+	images/terrain/encampment-fg-convex-nw.png \
-+	images/terrain/keep-bg-wall-0-sw.png \
-+	images/terrain/keep-fg-wall-0-se.png \
-+	images/terrain/keep-fg-wall-w.png \
-+	images/terrain/keep-bg-wall-nw.png \
-+	images/terrain/encampment-bg-concave-ne.png \
-+	images/terrain/keep-bg-wall-w.png \
-+	images/terrain/cave-s-sw.png \
-+	images/terrain/encampment-bg-concave-w.png \
-+	images/terrain/fog-ne.png \
-+	images/terrain/encampment-fg-concave-e.png \
-+	images/terrain/fog-ne-se.png \
-+	images/terrain/snow-n-ne-se-s.png \
-+	images/terrain/keep-fg-wall-se.png \
-+	images/terrain/snow-hills-n-ne.png \
-+	images/terrain/grassland-n-ne-se-s.png \
-+	images/terrain/keep-fg-wall-0-sw.png \
-+	images/terrain/cave-sw-nw-n.png \
-+	images/terrain/encampment-bg-convex-se.png \
-+	images/terrain/cave-s-sw-nw.png \
-+	images/terrain/grassland-rocks.png \
-+	images/terrain/encampment-bg-concave-nw.png \
-+	images/terrain/coast-se.png \
-+	images/terrain/grassland-n-ne.png \
-+	images/terrain/encampment-fg-concave-w.png \
-+	images/terrain/fog-s-sw.png \
-+	images/terrain/keep-fg-wall-sw.png \
-+	images/terrain/encampment-bg-convex-sw.png \
-+	images/terrain/encampment-fg-convex-se.png \
-+	images/terrain/keep-bg-wall-se.png \
-+	images/terrain/coast-sw.png \
-+	images/terrain/ice-bridge-ne-sw.png \
-+	images/terrain/fog-nw.png \
-+	images/terrain/fog-se-s-sw.png \
-+	images/terrain/encampment-fg-convex-sw.png \
-+	images/terrain/grassland.png \
-+	images/terrain/keep-bg-wall-0-e.png \
-+	images/terrain/keep-bg-wall-sw.png \
-+	images/terrain/encampment-bg-concave-se.png \
-+	images/terrain/forest-to-water-ne.png \
-+	images/terrain/cave-se-sw-nw.png \
-+	images/terrain/snow-se-sw-nw.png \
-+	images/terrain/keep-bg-wall-0-w.png \
-+	images/terrain/forest-to-water-n.png \
-+	images/terrain/encampment-bg-concave-sw.png \
-+	images/terrain/forest-to-water-nw.png \
-+	images/terrain/fog-n-ne-se.png \
-+	images/terrain/forest-to-water-s.png \
-+	images/terrain/fog-se.png \
-+	images/terrain/village-coast.png \
-+	images/terrain/forest-se-s-sw.png \
-+	images/terrain/mountains-n.png \
-+	images/terrain/swampwater2.png \
-+	images/terrain/swampwater3.png \
-+	images/terrain/dwarven-doors.png \
-+	images/terrain/village-human.png \
-+	images/terrain/void-ne.png \
-+	images/terrain/fog-sw.png \
-+	images/terrain/mountains-s.png \
-+	images/terrain/snow-se-s.png \
-+	images/terrain/village-cave.png \
-+	images/terrain/forest-to-water-se.png \
-+	images/terrain/snow-forest-n.png \
-+	images/terrain/void-nw.png \
-+	images/terrain/void.png \
-+	images/terrain/snow-forest-s.png \
-+	images/terrain/castle-fg-convex-e.png \
-+	images/terrain/forest-n-ne-se.png \
-+	images/terrain/forest-ne.png \
-+	images/terrain/forest-to-water-sw.png \
-+	images/terrain/encampment-fg-convex-e.png \
-+	images/terrain/hills-ne.png \
-+	images/terrain/castle-fg-convex-w.png \
-+	images/terrain/forest-nw.png \
-+	images/terrain/encampment-fg-convex-w.png \
-+	images/terrain/snow-hills-s-sw.png \
-+	images/terrain/void-se.png \
-+	images/terrain/hills-nw.png \
-+	images/terrain/desert-plant.png \
-+	images/terrain/grassland-s-sw.png \
-+	images/terrain/void-sw-nw.png \
-+	images/terrain/lava.png \
-+	images/terrain/void-sw.png \
-+	images/terrain/void-n-ne-se-s.png \
-+	images/terrain/forest-s-sw-nw-n.png \
-+	images/terrain/keep-bg-wall-1-e.png \
-+	images/terrain/forest-se.png \
-+	images/terrain/keep-bg-wall-1-w.png \
-+	images/terrain/hills-se.png \
-+	images/terrain/snowbits.png \
-+	images/terrain/hills-variation1.png \
-+	images/terrain/cave-se-s.png \
-+	images/terrain/hills-variation2.png \
-+	images/terrain/hills-variation3.png \
-+	images/terrain/encampment-fg-concave-ne.png \
-+	images/terrain/mountains.png \
-+	images/terrain/grassland-ne-se-s.png \
-+	images/terrain/forest-sw.png \
-+	images/terrain/cavewall.png \
-+	images/terrain/temple.png \
-+	images/terrain/castle-bg-concave-ne.png \
-+	images/terrain/hills-sw.png \
-+	images/terrain/encampment-fg-concave-nw.png \
-+	images/terrain/fog-se-s.png \
-+	images/terrain/coast-n.png \
-+	images/terrain/coast-s.png \
-+	images/terrain/grassland-flowers.png \
-+	images/terrain/castle-bg-concave-nw.png \
-+	images/terrain/void-sw-nw-n.png \
-+	images/terrain/snow-sw-nw.png \
-+	images/terrain/void-s-sw-nw.png \
-+	images/terrain/hills-n.png \
-+	images/terrain/hills-s.png \
-+	images/terrain/void-nw-n.png \
-+	images/terrain/forest-etrans-ne.png \
-+	images/terrain/snow-ne-se-s.png \
-+	images/terrain/dirt-n.png \
-+	images/human-siegetrooper.png \
-+	images/undead-shadow.png \
-+	images/undead-shadow-attack.png \
-+	images/human-battleprincess-attack.png \
-+	images/saurian-warrior-attack1.png \
-+	images/saurian-warrior-attack2.png \
-+	images/elvish-shyde-healing1.png \
-+	images/elvish-shyde-healing2.png \
-+	images/elvish-shyde-healing3.png \
-+	images/cursors-bw/select.png \
-+	images/cursors-bw/wait.png \
-+	images/cursors-bw/move.png \
-+	images/cursors-bw/normal.png \
-+	images/cursors-bw/attack.png \
-+	images/elvish-shyde-healing4.png \
-+	images/elvish-shyde-healing5.png \
-+	images/elvish-shyde-healing6.png \
-+	images/elvish-shyde-healing7.png \
-+	images/elvish-shyde-healing8.png \
-+	images/young-ogre.png \
-+	images/undead-lich.png \
-+	images/elvish-shyde-healing9.png \
-+	images/human-heavyinfantry.png \
-+	images/undead-bat-defend.png \
-+	images/undead-bloodbat.png \
-+	images/merman-attack.png \
-+	images/dwarf-dragonguard.png \
-+	images/great-mage-attack1.png \
-+	images/great-mage-attack2.png \
-+	images/dwarf-lord-ranged.png \
-+	images/human-dragoon-attack.png \
-+	images/elvish-marshal-defend.png \
-+	images/drake-guard.png \
-+	images/drake-worker-attack1.png \
-+	images/elvish-marksman-attack.png \
-+	images/drake-worker-attack2.png \
-+	images/elvish-sharpshooter-defend.png \
-+	images/undead-vampirelady-range.png \
-+	images/orcish-grunt-attack.png \
-+	images/elvish-shaman-attack.png \
-+	images/orc-archer-attack.png \
-+	images/konrad-young-defend.png \
-+	images/elvish-captain-leading.png \
-+	images/elvish-shyde-healing10.png \
-+	images/SecondWatch.png \
-+	images/elvish-rider-attack.png \
-+	images/elvish-shyde-healing11.png \
-+	images/elvish-shyde-healing12.png \
-+	images/neutral-outlaw.png \
-+	images/undead-lich-ranged1.png \
-+	images/konrad-lord-leading.png \
-+	images/undead-lich-ranged2.png \
-+	images/konrad-fighter-defend.png \
-+	images/elvish-captain-bow-attack1.png \
-+	images/drake-guard-attack-close1.png \
-+	images/elvish-captain-bow-attack2.png \
-+	images/drake-guard-attack-close2.png \
-+	images/elvish-captain-bow-attack3.png \
-+	images/elvish-druid-defend.png \
-+	images/editor/brush-1.png \
-+	images/editor/brush-2.png \
-+	images/editor/brush-3.png \
-+	images/undead-skeleton-attack.png \
-+	images/assassin-attack2.png \
-+	images/orc-assassin-knife.png \
-+	images/orc-assassin-defend.png \
-+	images/human-longbowman.png \
-+	images/drake-fire-attack-ranged.png \
-+	images/undead-soulless-defend.png \
-+	images/dwarf-thunderguard-defend.png \
-+	images/merman-king-defend.png \
-+	images/horseman-attack.png \
-+	images/undead-boneshooter.png \
-+	images/elvish-marshal-attack3.png \
-+	images/wose-elder-defend.png \
-+	images/mage-attack.png \
-+	images/human-heavyinfantry-attack.png \
-+	images/goblin-pillager-attack.png \
-+	images/drake-beak-defend.png \
-+	images/human-bowman.png \
-+	images/wose-defend.png \
-+	images/elvish-scout-attack.png \
-+	images/elvish-champion-range1.png \
-+	images/elvish-champion-range2.png \
-+	images/white-cleric-attack.png \
-+	images/orc-xbowman.png \
-+	images/elvish-champion.png \
-+	images/orc-xbowman-attack.png \
-+	images/white-cleric.png \
-+	images/elvish-shaman.png \
-+	images/neutral-footpad-attack1.png \
-+	images/undead-ghoul-defend.png \
-+	images/neutral-footpad-attack2.png \
-+	images/neutral-poacher-attack.png \
-+	images/ogre.png \
-+	images/gryphon-master-defend.png \
-+	images/dwarf-warrior-defend.png \
-+	images/human-cavalier-defend.png \
-+	images/neutral-poacher.png \
-+	images/Night.png \
-+	images/gryphon-master-attack1.png \
-+	images/orcish-warrior-melee1.png \
-+	images/gryphon-master-attack2.png \
-+	images/gryphon-rider.png \
-+	images/human-shocktrooper-defend.png \
-+	images/elvish-outrider-defend.png \
-+	images/drake-burner-defend.png \
-+	images/item-monolith1.png \
-+	images/item-monolith2.png \
-+	images/paladin-moving.png \
-+	images/item-monolith3.png \
-+	images/item-monolith4.png \
-+	images/human-fencer-attack.png \
-+	images/elvish-hero-attack.png \
-+	images/undead-darkspirit-defend.png \
-+	images/drake-fire-defend.png \
-+	images/wolf-rider-defend.png \
-+	images/human-lieutenant-defend.png \
-+	images/orc-slayer-defend.png \
-+	images/lancer-defend.png \
-+	images/undead-soulless-melee.png \
-+	images/dwarf-berserker.png \
-+	images/undead-ancient-lich-defend.png \
-+	images/undead-deathmaster-ranged1.png \
-+	images/wose.png \
-+	images/undead-deathmaster-ranged2.png \
-+	images/undead-deathmaster-ranged3.png \
-+	images/undead-deathmaster-ranged4.png \
-+	images/undead-necromancer.png \
-+	images/cockatrice-attack1.png \
-+	images/neutral-trapper-attack1.png \
-+	images/drake-warrior.png \
-+	images/cockatrice-attack2.png \
-+	images/elvish-sharpshooter-attack1.png \
-+	images/neutral-trapper-attack2.png \
-+	images/elvish-sharpshooter-attack2.png \
-+	images/elvish-sharpshooter-attack3.png \
-+	images/elvish-scout-attack1.png \
-+	images/elvish-scout-attack2.png \
-+	images/wose-sapling-attack.png \
-+	images/human-spearman-attack.png \
-+	images/elvish-hero-bow-attack.png \
-+	images/saurian-warrior.png \
-+	images/drake-clasher-attack-spear1.png \
-+	images/human-battleprincess-leading.png \
-+	images/drake-clasher-attack-spear2.png \
-+	images/silver-mage-defend.png \
-+	images/naga-defend.png \
-+	images/undead-vampirelady.png \
-+	images/gryphon-rider-defend.png \
-+	images/human-siegetrooper-melee.png \
-+	images/dwarf-warrior.png \
-+	images/great-mage-attack.png \
-+	images/undead-bat.png \
-+	images/neutral-footpad.png \
-+	images/neutral-trapper-attack.png \
-+	images/human-scout-defend.png \
-+	images/troll-grunt.png \
-+	images/konrad-commander.png \
-+	images/gryphon-sleeping.png \
-+	images/drake-mage-attack-ranged-breath.png \
-+	images/konrad-commander-ranged.png \
-+	images/undead-spectre-attack.png \
-+	images/troll-grunt-defend.png \
-+	images/grand-knight-moving.png \
-+	images/human-royalguard-defend.png \
-+	images/undead-ancient-lich.png \
-+	images/elder-mage.png \
-+	images/young-ogre-attack.png \
-+	images/lightning-n.png \
-+	images/elvish-outrider-attack1.png \
-+	images/troll-warrior-attack.png \
-+	images/dwarf-fighter-attack.png \
-+	images/elvish-outrider-attack2.png \
-+	images/elvish-shyde-defend.png \
-+	images/white-cleric-attack1.png \
-+	images/merman.png \
-+	images/elvish-archer-attack1.png \
-+	images/elvish-archer-attack2.png \
-+	images/elvish-archer-attack3.png \
-+	images/elvish-shaman-heal1.png \
-+	images/undead-wraith-defend.png \
-+	images/goblin-direwolver-attack.png \
-+	images/elvish-shaman-heal2.png \
-+	images/elvish-shaman-heal3.png \
-+	images/elvish-fighter.png \
-+	images/elvish-shaman-heal4.png \
-+	images/elvish-shaman-heal5.png \
-+	images/undead-vampirelady-defend.png \
-+	images/undead-darkspirit.png \
-+	images/elvish-lord.png \
-+	images/item-book1.png \
-+	images/white-mage-defend.png \
-+	images/item-book2.png \
-+	images/horseman.png \
-+	images/item-book3.png \
-+	images/item-book4.png \
-+	images/drake-worker.png \
-+	images/konrad-fighter.png \
-+	images/undead-adept-attack.png \
-+	images/undead-revenant.png \
-+	images/elvish-avenger-defend.png \
-+	images/Dusk.png \
-+	images/drake-petit.png \
-+	images/rogue-defend.png \
-+	images/elvish-marshal-leading.png \
-+	images/elvish-captain-attack.png \
-+	images/drake-fighter-attack-close1.png \
-+	images/drake-fighter-attack-close2.png \
-+	images/undead-blackspell.png \
-+	images/neutral-outlaw-defend.png \
-+	images/ally-energy.png \
-+	images/human-halbardier.png \
-+	images/konrad-lord-defend.png \
-+	images/neutral-footpad-attack.png \
-+	images/human-cavalier-moving.png \
-+	images/human-dragoon.png \
-+	images/undead-deathmaster-attack1.png \
-+	images/undead-deathmaster-attack2.png \
-+	images/elvish-archer-bow-defend.png \
-+	images/Afternoon.png \
-+	images/elvish-druid-ranged.png \
-+	images/troll-whelp-attack.png \
-+	images/undead-chocobone.png \
-+	images/elvish-fighter-defend.png \
-+	images/human-cavalier-range1.png \
-+	images/human-cavalier-range2.png \
-+	images/elvish-avenger-bow-defend.png \
-+	images/wolf-rider-moving.png \
-+	images/human-sergeant.png \
-+	images/undead-spectre-attack1.png \
-+	images/elvish-fighter-bow.png \
-+	images/FirstWatch.png \
-+	images/undead-boneshooter-attack.png \
-+	images/orcish-shaman.png \
-+	images/elvish-archer-defend.png \
-+	images/drake-petit-defend.png \
-+	images/human-swordman-attack.png \
-+	images/arch-mage-attack.png \
-+	images/elvish-lord-ranged1.png \
-+	images/cavespider.png \
-+	images/undead-nightgaunt-defend.png \
-+	images/elvish-lord-ranged2.png \
-+	images/human-sergeant-attack.png \
-+	images/human-pikeman-defend.png \
-+	images/undead-nightgaunt-attack2.png \
-+	images/drake-guard-attack-ranged.png \
-+	images/red-mage-attack.png \
-+	images/dwarf-thunderer-defend.png \
-+	images/human-princess-defend.png \
-+	images/elvish-lord-defend.png \
-+	images/undead-necrophage.png \
-+	images/neutral-poacher-attack1.png \
-+	images/neutral-poacher-attack2.png \
-+	images/partmoved-energy.png \
-+	images/drake-slasher-attack-spear1.png \
-+	images/drake-slasher-attack-spear2.png \
-+	images/undead-wraith-attack1.png \
-+	images/drake-slasher-attack-spear3.png \
-+	images/elvish-ranger-defend.png \
-+	images/silver-mage.png \
-+	images/dwarf-runemaster-attack.png \
-+	images/sea-hag.png \
-+	images/drake-clasher-defend.png \
-+	images/human-scout-moving.png \
-+	images/drake-fighter-defend.png \
-+	images/dwarf-thunderer.png \
-+	images/human-siegetrooper-defend.png \
-+	images/undead-necrophage-attack.png \
-+	images/undead-darkspirit-attack1.png \
-+	images/elder-mage-attack.png \
-+	images/orc-assassin.png \
-+	images/undead-chocobone-attack.png \
-+	images/thief-defend.png \
-+	images/drake-warrior-flying.png \
-+	images/drake-slasher-defend.png \
-+	images/undead-shadow-defend.png \
-+	images/undead-adept.png \
-+	images/human-battleprincess-defend.png \
-+	images/fireball-halo.png \
-+	images/paladin.png \
-+	images/orc-slayer-ranged.png \
-+	images/cuttlefish-defend.png \
-+	images/neutral-bandit-attack.png \
-+	images/dwarf-runemaster.png \
-+	images/elvish-marksman-attack1.png \
-+	images/elvish-shyde-ftouch-attack1.png \
-+	images/elvish-marksman-attack2.png \
-+	images/elvish-shyde-ftouch-attack2.png \
-+	images/elvish-marksman-attack3.png \
-+	images/elvish-shyde-ftouch-attack3.png \
-+	images/gryphon.png \
-+	images/item-potion1.png \
-+	images/attacks/dragonstaff.png \
-+	images/attacks/hammer.png \
-+	images/attacks/club.png \
-+	images/attacks/battleaxe.png \
-+	images/attacks/short-sword.png \
-+	images/attacks/lightbeam.png \
-+	images/attacks/thorns.png \
-+	images/attacks/lightingbolt.png \
-+	images/attacks/darts.png \
-+	images/attacks/beak.png \
-+	images/attacks/mace.png \
-+	images/attacks/dark-missile.png \
-+	images/attacks/baneblade.png \
-+	images/attacks/trident.png \
-+	images/attacks/entangle.png \
-+	images/attacks/crossbow.png \
-+	images/attacks/missile.png \
-+	images/attacks/hatchet.png \
-+	images/attacks/pike.png \
-+	images/attacks/wail.png \
-+	images/attacks/knife.png \
-+	images/attacks/fist.png \
-+	images/attacks/torch.png \
-+	images/attacks/woodensword.png \
-+	images/attacks/pistol.png \
-+	images/attacks/fireball.png \
-+	images/attacks/druidstaff.png \
-+	images/attacks/sword.png \
-+	images/attacks/fangs.png \
-+	images/attacks/staff.png \
-+	images/attacks/paladinsword.png \
-+	images/attacks/dagger.png \
-+	images/attacks/curse.png \
-+	images/attacks/spear.png \
-+	images/attacks/darkstaff.png \
-+	images/attacks/thunderstick.png \
-+	images/attacks/claws.png \
-+	images/attacks/web.png \
-+	images/attacks/faerie_touch.png \
-+	images/attacks/axe.png \
-+	images/attacks/waterspray.png \
-+	images/attacks/tentacle.png \
-+	images/attacks/halberd.png \
-+	images/attacks/ink.png \
-+	images/attacks/bow.png \
-+	images/attacks/lance.png \
-+	images/attacks/touch.png \
-+	images/attacks/rapier.png \
-+	images/attacks/gaze.png \
-+	images/attacks/longbow.png \
-+	images/attacks/sling.png \
-+	images/attacks/frenzy.png \
-+	images/elvish-hero-bow.png \
-+	images/dwarf-thunderer-attack1.png \
-+	images/item-potion2.png \
-+	images/item-potion3.png \
-+	images/item-potion4.png \
-+	images/elvish-druid-healing.png \
-+	images/dwarf-thunderguard.png \
-+	images/merman-defend.png \
-+	images/dwarf-lord-attack.png \
-+	images/wose-sapling.png \
-+	images/human-longbowman-attack-sword.png \
-+	images/human-dragoon-defend.png \
-+	images/elvish-avenger.png \
-+	images/drake-clasher-attack-sword1.png \
-+	images/goblin-direwolver.png \
-+	images/elvish-hero.png \
-+	images/drake-clasher-attack-sword2.png \
-+	images/drake-clasher-attack-sword3.png \
-+	images/drake-clasher-attack-sword4.png \
-+	images/item-barrel.png \
-+	images/elvish-marksman-defend.png \
-+	images/knight-attack.png \
-+	images/orcish-grunt-defend.png \
-+	images/undead-boneshooter-attack1.png \
-+	images/elvish-shaman-defend.png \
-+	images/undead-boneshooter-attack2.png \
-+	images/orc-archer-defend.png \
-+	images/dwarf-berserker-attack.png \
-+	images/elvish-rider-defend.png \
-+	images/orc-slayer-attack1.png \
-+	images/item-well.png \
-+	images/orc-slayer-attack2.png \
-+	images/dwarf-ulfserker-attack.png \
-+	images/undead-bloodbat-attack.png \
-+	images/undead-spectre.png \
-+	images/undead-skeleton-defend.png \
-+	images/elvish-marksman.png \
-+	images/elvish-shaman-attack2.png \
-+	images/orcish-shaman1.png \
-+	images/sea-orc-attack.png \
-+	images/elvish-shaman-healing.png \
-+	images/orcish-shaman2.png \
-+	images/orc-archer-attack2.png \
-+	images/elvish-scout.png \
-+	images/Dawn.png \
-+	images/drake-guard-defend.png \
-+	images/human-general-defend.png \
-+	images/seaserpent.png \
-+	images/white-mage-attack1.png \
-+	images/yeti-attack1.png \
-+	images/item-ball1.png \
-+	images/scorpion-pincers-attack.png \
-+	images/orcish-ruler.png \
-+	images/yeti-attack2.png \
-+	images/item-ball2.png \
-+	images/elvish-shyde-ranged.png \
-+	images/horseman-defend.png \
-+	images/undead-ghost-attack1.png \
-+	images/mage-defend.png \
-+	images/human-heavyinfantry-defend.png \
-+	images/elvish-druid-healing1.png \
-+	images/goblin-pillager-defend.png \
-+	images/elvish-rider-attack1.png \
-+	images/naga.png \
-+	images/elvish-druid-healing2.png \
-+	images/elvish-rider-attack2.png \
-+	images/elvish-druid-healing3.png \
-+	images/elvish-druid-healing4.png \
-+	images/drake-worker-defend.png \
-+	images/elvish-druid-healing5.png \
-+	images/human-duelist.png \
-+	images/orcish-warrior-defend.png \
-+	images/item-pine1.png \
-+	images/undead-zombie.png \
-+	images/item-pine2.png \
-+	images/drake-slave-attack1.png \
-+	images/drake-slave-attack2.png \
-+	images/elvish-scout-defend.png \
-+	images/white-cleric-defend.png \
-+	images/rogue-ranged.png \
-+	images/undead-necromancer-attack2.png \
-+	images/orc-xbowman-defend.png \
-+	images/undead-necromancer-attack.png \
-+	images/konrad-commander-ranged-defend.png \
-+	images/grand-knight.png \
-+	images/neutral-poacher-defend.png \
-+	images/cockatrice.png \
-+	images/undead-nightgaunt.png \
-+	images/undead-revenant-attack.png \
-+	images/drake-slasher-attack-mace1.png \
-+	images/drake-slasher-attack-mace2.png \
-+	images/drake-slasher.png \
-+	images/drake-burner-attack-close1.png \
-+	images/human-princess.png \
-+	images/drake-slave.png \
-+	images/drake-burner-attack-close2.png \
-+	images/human-longbowman-attack1.png \
-+	images/human-longbowman-attack2.png \
-+	images/silver-mage-melee.png \
-+	images/human-fencer-defend.png \
-+	images/elvish-hero-defend.png \
-+	images/Morning.png \
-+	images/elvish-outrider.png \
-+	images/neutral-thug-attack.png \
-+	images/drake-slasher-attack-blade1.png \
-+	images/undead-demilich-attack.png \
-+	images/item-leanto.png \
-+	images/drake-slasher-attack-blade2.png \
-+	images/drake-slasher-attack-blade3.png \
-+	images/human-fencer.png \
-+	images/drake-slasher-attack-blade4.png \
-+	images/elvish-lord-melee.png \
-+	images/elvish-champion-attack.png \
-+	images/item-flower1.png \
-+	images/item-flower2.png \
-+	images/undead-wraith.png \
-+	images/item-flower3.png \
-+	images/saurian-defend.png \
-+	images/item-flower4.png \
-+	images/assassin-attack.png \
-+	images/human-scout.png \
-+	images/white-mage.png \
-+	images/arch-mage-attack1.png \
-+	images/arch-mage-attack2.png \
-+	images/wose-sapling-defend.png \
-+	images/human-spearman-defend.png \
-+	images/paladin-healing.png \
-+	images/elvish-hero-bow-defend.png \
-+	images/human-bowman-defend.png \
-+	images/drake-warrior-attack-close1.png \
-+	images/human-lieutenant-leading.png \
-+	images/drake-warrior-attack-close2.png \
-+	images/great-mage-defend.png \
-+	images/human-lieutenant.png \
-+	images/human-dragoon-moving.png \
-+	images/elvish-captain-bow-defend.png \
-+	images/drake-beak.png \
-+	images/human-princess-leading.png \
-+	images/neutral-trapper-defend.png \
-+	images/konrad-commander-attack.png \
-+	images/human-longbowman-defend-close.png \
-+	images/buttons/scrollgroove-bottom.png \
-+	images/buttons/lite-active.png \
-+	images/buttons/lite.png \
-+	images/buttons/slider-selected.png \
-+	images/buttons/checkbox-pressed.png \
-+	images/buttons/downarrow-button-active.png \
-+	images/buttons/lite-pressed.png \
-+	images/buttons/downarrow-button.png \
-+	images/buttons/lite_small-pressed.png \
-+	images/buttons/checkbox-active.png \
-+	images/buttons/scrollmid.png \
-+	images/buttons/slider.png \
-+	images/buttons/uparrow-button-pressed.png \
-+	images/buttons/button.png \
-+	images/buttons/scrollmid-active.png \
-+	images/buttons/scrolltop.png \
-+	images/buttons/scrollgroove-mid.png \
-+	images/buttons/scrollbottom-active.png \
-+	images/buttons/lite_small-active.png \
-+	images/buttons/checkbox.png \
-+	images/buttons/uparrow-button-active.png \
-+	images/buttons/scrollbottom.png \
-+	images/buttons/scrollgroove-top.png \
-+	images/buttons/uparrow-button.png \
-+	images/buttons/lite_small.png \
-+	images/buttons/downarrow-button-pressed.png \
-+	images/buttons/button-pressed.png \
-+	images/buttons/scrolltop-active.png \
-+	images/buttons/button-active.png \
-+	images/buttons/checkbox-active-pressed.png \
-+	images/elvish-rider-moving.png \
-+	images/orc-archer.png \
-+	images/undead-ghost-attack.png \
-+	images/human-dragoon-range1.png \
-+	images/elvish-ranger-attack1.png \
-+	images/human-queen.png \
-+	images/human-dragoon-range2.png \
-+	images/elvish-ranger-attack2.png \
-+	images/elvish-captain-bow.png \
-+	images/elvish-druid.png \
-+	images/elvish-ranger-attack3.png \
-+	images/lightning-ne.png \
-+	images/undead-spectre-defend.png 
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff --git a/games/wesnoth/patches/patch-ae b/games/wesnoth/patches/patch-ae
deleted file mode 100644
index 5f6b91f6844..00000000000
--- a/games/wesnoth/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/07/14 13:20:28 manu Exp $
---- Makefile.in.orig	Tue Jul 13 22:43:06 2004
-+++ Makefile.in	Tue Jul 13 22:44:13 2004
-@@ -163,9 +163,9 @@
- 
- dist_noinst_DATA = @MANUAL_FILES@ copyright changelog wesnoth.dsp wesnoth.dsw \
- 	@UTIL_FILES@
- 
--nobase_dist_pkgdata_DATA = @DATA_FILES@ @FONT_FILES@ @IMAGE_FILES@ \
-+nobase_dist_pkgdata_DATA = ${DATA_FILES} @FONT_FILES@ ${IMAGE_FILES} \
- 	@MUSIC_FILES@ @SOUND_FILES@
- 
- dist_man6_MANS = doc/man/wesnoth.6 doc/man/wesnothd.6 doc/man/wesnoth_editor.6
- subdir = .